修改订单

pages/main/index/orders.vue

@@ -3,26 +3,26 @@
     <section class="top">
       <!-- <h3>交易订单中心</h3> -->
       <section>
-        <div class="type-boxs">
+        <div class="type-boxes">
           <span class="vsub">订单类型:</span>
           <div class="inlineb">
             <el-checkbox-group v-model="productType" @change="changeOrder" size="mini">
               <el-checkbox-button v-for="itm in TypeList" :label="itm.id" :key="itm.id">{{itm.name}}</el-checkbox-button>
             </el-checkbox-group>
           </div>
-          <div class="inlineb vsub">
-            <span>交易类型：</span>
-            <el-select v-model="orderTypes" placeholder="交易类型">
-              <el-option
-                v-for="item of orderTypesOption"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </div>
         </div>
-        <div class="type-boxs">
+        <div class="type-boxes">
+          <span>交易类型：</span>
+          <el-select v-model="orderTypes" placeholder="交易类型">
+            <el-option
+              v-for="item of orderTypesOption"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </div>
+        <div class="type-boxes">
           <span class="vsub">支付方式:</span>
           <div class="inlineb">
             <el-checkbox-group v-model="payType" @change="changePay" size="mini">
@@ -30,7 +30,7 @@
             </el-checkbox-group>
           </div>
         </div>
-        <div class="type-boxs">
+        <div class="type-boxes">
           <div class="inlineb">
             <span class>时间范围：</span>
             <el-date-picker
@@ -70,7 +70,7 @@
           </div>
           <el-checkbox v-model="checked">人工财务</el-checkbox>
         </div>
-        <div class="type-boxs">
+        <div class="type-boxes">
           <div class="inlineb">
             <span class>编号:</span>
             <div class="inlineb">
@@ -93,30 +93,59 @@
           <el-button type="primary" @click="getFinanceList">筛选</el-button>
           <el-button @click="downFinanceList">导出报表</el-button>
         </div>
-        <div class="type-boxs">
-          <div>
-            <span>订单数量：{{totalCount}}(成功{{successCount}}),</span>
-            <span>
-              收入金额：
-              <span class="green">{{totalHave}}元(成功{{totalSuccess}}元)</span>
-            </span>
-            ,
-            <span>
-              支出金额：
-              <span class="orange">{{PayCount}}元(成功{{paySuccess}}元)</span>
-            </span>
-            ,
-            <span>
-              冻结金额：
-              <span class="">{{frozenSum}}元(成功{{frozenSuccessSum}}元)</span>
-            </span>
-          </div>
+        <div class="type-boxes">
+            <el-tabs v-model="activeName"  type="border-card" @tab-click="changeTab">
+              <el-tab-pane label="全部" name="all">
+                <div class="inlineb tab-item">
+                  <div class="text-title">收入</div>
+                  <div class="text-num green">+ {{totalSuccess}}元</div>
+                  <div class="count">共{{incomeCount}}笔</div>
+                </div>
+                <div class="inlineb tab-item">
+                  <div class="text-title">支出</div>
+                  <div class="text-num orange">- {{paySuccess}}元</div>
+                  <div class="count">共{{outcomeCount}}笔</div>
+                </div>
+                <div class="inlineb tab-item">
+                  <div class="text-title">内部流转</div>
+                  <div class="inner-text">+ {{innerIncomeSum}}元</div>
+                  <div class="inner-text">- {{innerOutcomeSum}}元</div>
+                  <div class="count">共{{innerCount}}笔</div>
+                </div>
+                <div class="inlineb tab-item">
+                  <div class="text-title">冻结订单</div>
+                  <div class="text-num">{{frozenSuccessSum}}元</div>
+                  <div class="count">共{{frozenCount}}笔</div>
+                </div>
+              </el-tab-pane>
+              <el-tab-pane label="平台收入" name="income">
+                <div class="inlineb tab-item">
+                  <div class="text-title">收入</div>
+                  <div class="text-num green">+ {{totalSuccess}}元</div>
+                  <div class="count">共{{incomeCount}}笔</div>
+                </div>
+              </el-tab-pane>
+              <el-tab-pane label="平台支出" name="outcome">
+                <div class="inlineb tab-item">
+                  <div class="text-title">支出</div>
+                  <div class="text-num orange">- {{paySuccess}}元</div>
+                  <div class="count">共{{outcomeCount}}笔</div>
+                </div>
+              </el-tab-pane>
+              <el-tab-pane label="内部流转" name="inner">
+                <div class="inlineb tab-item">
+                  <div class="text-title">内部流转</div>
+                  <div class="inner-text">+ {{innerIncomeSum}}元</div>
+                  <div class="inner-text">- {{innerOutcomeSum}}元</div>
+                  <div class="count">共{{innerCount}}笔</div>
+                </div>
+              </el-tab-pane>
+            </el-tabs>
         </div>
       </section>
     </section>
 
     <div class="trcenter changeheight" width="100%">
-      <!-- height="250" -->
       <el-table :data="financeList" border height="100%" width="100%">
         <el-table-column label="订单名称">
           <template slot-scope="scope">
@@ -130,12 +159,23 @@
         </el-table-column>
         <el-table-column label="实际金额">
           <template slot-scope="scope">
-            <div v-if="scope.row.order_type!=6">
-              <span v-if="parseInt(scope.row.real_amount)>=0" class="green">+{{(scope.row.real_amount/100).toFixed(2)}}</span>
-              <span v-else class="orange">{{(scope.row.real_amount/100).toFixed(2)}}</span>
+            <div v-if="scope.row.order_type!=6 && scope.row.channel != 'balance' && scope.row.channel != 'admin_confirm'">
+                <span v-if="parseInt(scope.row.real_amount)>=0" class="green">+{{(scope.row.real_amount/100).toFixed(2)}}</span>
+                <span v-else class="orange">{{(scope.row.real_amount/100).toFixed(2)}}</span>
+            </div>
+            <div v-else-if="scope.row.channel =='admin_confirm'">
+              <div v-if="scope.row.operator_uid==41266">
+                <span v-if="parseInt(scope.row.real_amount)>=0">+{{(scope.row.real_amount/100).toFixed(2)}}</span>
+                <span v-else>{{(scope.row.real_amount/100).toFixed(2)}}</span>
+              </div>
+              <div v-else>
+                <span v-if="parseInt(scope.row.real_amount)>=0" class="green">+{{(scope.row.real_amount/100).toFixed(2)}}</span>
+                <span v-else class="orange">{{(scope.row.real_amount/100).toFixed(2)}}</span>
+              </div>
             </div>
             <div v-else>
-              <span>{{(scope.row.real_amount/100).toFixed(2)}}</span>
+              <span v-if="parseInt(scope.row.real_amount)>=0">+{{(scope.row.real_amount/100).toFixed(2)}}</span>
+              <span v-else>{{(scope.row.real_amount/100).toFixed(2)}}</span>
             </div>
           </template>
         </el-table-column>
@@ -162,11 +202,6 @@
         <el-table-column width="100" label="订单类型">
           <template slot-scope="scope">
             {{scope.row.product_type_name}}
-            <!-- order_type -->
-            <!-- <span v-if="scope.row.state==1" class="state-success state-border">成功</span>
-            <span v-if="scope.row.state==2" class="state-wait state-border">待提交</span>
-            <span v-if="scope.row.state==3" class="state-load state-border">提交中</span>
-            <span v-if="scope.row.state==4" class="state-faile state-border">失败</span>-->
           </template>
         </el-table-column>
         <el-table-column prop="order_type_name" label="交易类型">
@@ -215,6 +250,14 @@
 export default {
   data() {
     return {
+        tabShow:true,
+      innerIncomeSum:0,
+      innerOutcomeSum:0,
+      incomeCount:0,
+      innerCount:0,
+      outcomeCount:0,
+      frozenCount:0,
+      activeName: 'all',
       hasAuth:1,
       frozenSuccessSum:0,
       frozenSum:0,
@@ -237,8 +280,8 @@ export default {
       tradeType: [0],
       payType: [0],
       timeType: 2,
-        payListPop:[],
-        productTypePop:[],
+      payListPop:[],
+      productTypePop:[],
       timeOptions: [
         {
           value: 1,
@@ -249,64 +292,9 @@ export default {
           label: "创建时间"
         }
       ],
-      TypeList: [
-        {
-          id: 0,
-          type: "全部"
-        },
-        {
-          id: 1,
-          type: "整包项目"
-        },
-        {
-          id: 2,
-          type: "云端工作"
-        },
-        {
-          id: 3,
-          type: "雇佣工作"
-        }
-      ],
-      tradeList: [
-        {
-          id: 0,
-          type: "全部"
-        },
-        {
-          id: 1,
-          type: "充值"
-        },
-        {
-          id: 2,
-          type: "提现"
-        },
-        {
-          id: 3,
-          type: "购买"
-        },
-        {
-          id: 4,
-          type: "购买"
-        }
-      ],
-      payList: [
-        {
-          id: 1,
-          type: "充值"
-        },
-        {
-          id: 2,
-          type: "提现"
-        },
-        {
-          id: 3,
-          type: "购买"
-        },
-        {
-          id: 4,
-          type: "购买"
-        }
-      ],
+      TypeList: [],
+      tradeList: [],
+      payList: [],
       pickerOptions2: {
         shortcuts: [
           {
@@ -337,7 +325,7 @@ export default {
           {
             text: "本周",
             onClick(picker) {
-              var week = new Date().getDay() - 1;
+              let week = new Date().getDay() - 1;
               if (week == -1) {
                 week = 6;
               }
@@ -350,9 +338,9 @@ export default {
           {
             text: "本月",
             onClick(picker) {
-              var month = new Date().getMonth + 1;
-              var year = new Date().getFullYear();
-              var day = new Date().getDate() - 1;
+              let month = new Date().getMonth + 1;
+              let year = new Date().getFullYear();
+              let day = new Date().getDate() - 1;
 
               const end = new Date();
               const start = new Date();
@@ -363,14 +351,14 @@ export default {
           {
             text: "本年",
             onClick(picker) {
-              var month = new Date().getMonth + 1;
-              var year = new Date().getFullYear();
-              var day = new Date().getDate() - 1;
-              var firstDay = new Date(year, 0, 1);
-              var dateDiff = new Date() - firstDay;
-              var msPerDay = 1000 * 60 * 60 * 24;
+              let month = new Date().getMonth + 1;
+              let year = new Date().getFullYear();
+              let day = new Date().getDate() - 1;
+              let firstDay = new Date(year, 0, 1);
+              let dateDiff = new Date() - firstDay;
+              let msPerDay = 1000 * 60 * 60 * 24;
               //计算天数
-              var diffDays = Math.ceil(dateDiff / msPerDay) - 1;
+              let diffDays = Math.ceil(dateDiff / msPerDay) - 1;
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * diffDays);
@@ -382,51 +370,7 @@ export default {
       timeRange: [firstDayOfThisMonth, new Date()],
       arriveTime: "",
       searchId: "",
-      tableData3: [
-        {
-          date: "2016-05-03",
-          name: "王小虎",
-          money: "200",
-          state: 1
-        },
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          money: "-100",
-          state: 2
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          money: "-100",
-          state: 3
-        },
-        {
-          date: "2016-05-01",
-          name: "王小虎",
-          money: "-100",
-          state: 4
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          money: "2100",
-          state: 1
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          money: "-1200",
-          state: 4
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          money: "-100",
-          state: 1
-        }
-      ],
-
+      tableData3: [],
       // 下发的总数据
       totalData: {},
       // 项目ID
@@ -444,13 +388,6 @@ export default {
       totalCount: 0,
       currentPage: 1,
       currentPageSize: 20,
-      // 列表宽度
-      // tableWidths,
-      // 列表头显示内容
-      // tableHeaders,
-      // 列表头字段
-      // tableProps,
-      // 列表数据
       tableData: [],
       localData: {
         env: "test"
@@ -472,25 +409,22 @@ export default {
     }
   },
   mounted() {
-    this.getAllChice();
+    this.getAllChoice();
     // this.getTableData();
     this.getFinanceList();
   },
   methods: {
-    handleOrderClick(id) {
-      this.$router.push(`/main/bills/${id}`);
-    },
     formatDate(time) {
       if (time === '0') {
         return '--'
       }
-      var now = new Date(time * 1000);
-      var year = now.getFullYear();
-      var month = now.getMonth() + 1;
-      var date = now.getDate();
-      var hour = now.getHours();
-      var minute = now.getMinutes();
-      var second = now.getSeconds();
+      let now = new Date(time * 1000);
+      let year = now.getFullYear();
+      let month = now.getMonth() + 1;
+      let date = now.getDate();
+      let hour = now.getHours();
+      let minute = now.getMinutes();
+      let second = now.getSeconds();
       if (hour < 10) {
         hour = "0" + hour;
       }
@@ -516,8 +450,8 @@ export default {
     },
     // 改变订单类型
     changeOrder() {
-      var haveAll = false;
-      for (var i = 0; i < this.productType.length; i++) {
+      let haveAll = false;
+      for (let i = 0; i < this.productType.length; i++) {
         if (this.productType[i] == 0) {
           haveAll = true;
         }
@@ -526,7 +460,7 @@ export default {
         if(this.productType.indexOf('扩展') > -1){
             this.productType.pop();
             this.TypeList.pop()
-            for (var i=9;i>=0;i--){
+            for (let i=9;i>=0;i--){
                 this.TypeList.push(this.productTypePop.pop());
             }
             this.TypeList.push({
@@ -537,7 +471,7 @@ export default {
         if(this.productType.indexOf('缩进') > -1){
             this.productType.pop();
             this.TypeList.pop();
-            for (var i=0;i<10;i++){
+            for (let i=0;i<10;i++){
                 this.productTypePop[i]=this.TypeList.pop();
             }
             this.TypeList.push({
@@ -551,8 +485,8 @@ export default {
         this.productType[0] == 0 &&
         1 < this.productType.length < this.TypeList.length
       ) {
-        var arr = [];
-        for (var i = 0; i < this.productType.length; i++) {
+        let arr = [];
+        for (let i = 0; i < this.productType.length; i++) {
           if (this.productType[i] != 0) {
             arr.push(this.productType[i]);
           }
@@ -574,8 +508,8 @@ export default {
 
     // 改变支付方式
     changePay() {
-      var haveAll = false;
-      for (var i = 0; i < this.payType.length; i++) {
+      let haveAll = false;
+      for (let i = 0; i < this.payType.length; i++) {
         if (this.payType[i] == 0) {
           haveAll = true;
         }
@@ -608,8 +542,8 @@ export default {
         this.payType[0] == 0 &&
         1 < this.payType.length < this.payList.length
       ) {
-        var arr = [];
-        for (var i = 0; i < this.payType.length; i++) {
+        let arr = [];
+        for (let i = 0; i < this.payType.length; i++) {
           if (this.payType[i] != 0) {
             arr.push(this.payType[i]);
           }
@@ -709,7 +643,6 @@ export default {
      */
     clickSearchConfirm() {
       this.currentPage = 1;
-      // this.getTableData();
     },
     changePageSize(pageSize) {
       this.currentPageSize = pageSize;
@@ -717,31 +650,31 @@ export default {
     },
 
     async downFinanceList() {
-      var checkedTF = 0;
+      let checkedTF = 0;
       if (this.checked) {
         checkedTF = 1;
       }
-      var arr1 = [];
+      let arr1 = [];
       if (this.productType[0] == 0) {
         arr1 = "";
       } else {
         arr1 = this.productType.toString();
       }
-      var arr2 = [];
+      let arr2 = [];
       if (this.payType[0] == 0) {
         arr2 = "";
       } else {
         arr2 = this.payType.toString();
       }
 
-      var time = 1;
+      let time = 1;
       if (this.timeType == "") {
         time = "";
       } else {
         time = this.timeType;
       }
-      var starTime = "";
-      var endTime = "";
+      let starTime = "";
+      let endTime = "";
       if (this.timeRange.length > 0) {
         starTime = this.formatDate(this.timeRange[0] / 1000);
         endTime = this.formatDate(this.timeRange[1] / 1000);
@@ -750,25 +683,7 @@ export default {
         endTime = "";
       }
 
-      let body = {
-        // 1111
-        product_type: arr1,
-        order_type: this.orderTypes,
-        channel: arr2,
-        start_time: starTime,
-        end_time: endTime,
-        date_type: time,
-        status: this.orderState,
-        artificial_mark: checkedTF,
-        order: this.searchId,
-        user: this.checkUser,
-        // this.productTypes
-        product_id: this.productId,
-
-        page: this.currentPage,
-        page_size: this.currentPageSize
-      };
-      var url =
+      let url =
         window.location.host +
         "/api/admin/order/export?product_type=" +
         arr1 +
@@ -794,35 +709,41 @@ export default {
         this.productId;
       window.location.href = "http://" + url;
     },
-    async getFinanceList() {
+
+    changeTab(){
+        this.orderTypes='';
+        this.getFinanceList();
+    },
+    getFinanceList() {
+
       if (this.$router.currentRoute.query.user) {
         this.checkUser = this.$router.currentRoute.query.user;
       }
-      var checkedTF = 0;
+      let checkedTF = 0;
       if (this.checked) {
         checkedTF = 1;
       }
-      var arr1 = [];
+      let arr1 = [];
       if (this.productType[0] == 0) {
         arr1 = "";
       } else {
         arr1 = this.productType.toString();
       }
-      var arr2 = [];
+      let arr2 = [];
       if (this.payType[0] == 0) {
         arr2 = "";
       } else {
         arr2 = this.payType.toString();
       }
 
-      var time = 1;
+      let time = 1;
       if (this.timeType == "") {
         time = "";
       } else {
         time = this.timeType;
       }
-      var starTime = "";
-      var endTime = "";
+      let starTime = "";
+      let endTime = "";
 
       if (this.timeRange) {
         if (this.timeRange.length > 0) {
@@ -830,7 +751,7 @@ export default {
             (this.timeRange[0] / 1000) * 1000 ==
             (this.timeRange[1] / 1000) * 1000
           ) {
-            var changeEnd =
+            let changeEnd =
               (this.timeRange[1] / 1000) * 1000 + 24 * 60 * 60 * 1000;
             starTime = this.formatDate(this.timeRange[0] / 1000);
             endTime = this.formatDate(changeEnd / 1000);
@@ -846,7 +767,6 @@ export default {
         starTime = "";
         endTime = "";
       }
-
       let body = {
         view:'platform',
         product_type: arr1,
@@ -859,33 +779,41 @@ export default {
         artificial_mark: checkedTF,
         order: this.searchId,
         user: this.checkUser,
-        // this.productTypes
         product_id: this.productId,
-
         page: this.currentPage,
         page_size: this.currentPageSize
       };
-      const res = await this.$post("/api/admin/order/get_orders", body);
-      var data = res.data;
-      if (res.status === 0)this.hasAuth=0;
-      if (res.status === 1){
-        this.financeList = data.orders;
-        this.totalCount = Number(data.count);
-        this.successCount = data.successCount;
-        this.totalHave = data.income_sum;
-        this.totalSuccess = data.income_success_sum;
-        this.PayCount = data.expense_sum;
-        // this.totalCount = data.count;
-        this.paySuccess = data.expense_success_sum;
-        this.frozenSum=data.frozen_sum;
-        this.frozenSuccessSum=data.frozen_success_sum;
-      }
-
+        if (this.orderTypes==''){
+            body.active_name=this.activeName;
+        }else{
+            this.activeName='all';
+        }
+      this.$post("/api/admin/order/get_orders", body).then(res=>{
+          let data = res.data;
+          if (res.status === 0)this.hasAuth=0;
+          if (res.status === 1) {
+              this.financeList = data.orders;
+              this.totalCount = data.count;
+              this.successCount = data.successCount;
+              this.totalHave = data.income_sum;
+              this.totalSuccess = data.income_success_sum;
+              this.PayCount = data.expense_sum;
+              this.paySuccess = data.expense_success_sum;
+              this.frozenSum = data.frozen_sum;
+              this.frozenSuccessSum = data.frozen_success_sum;
+              this.innerOutcomeSum = data.inner_outcome_sum;
+              this.innerIncomeSum = data.inner_income_sum;
+              this.innerCount = data.inner_count;
+              this.incomeCount = data.income_count;
+              this.outcomeCount = data.outcome_count;
+              this.frozenCount = data.frozen_count;
+          }
+      });
     },
-    async getAllChice() {
+    async getAllChoice() {
       let body = {};
       const res = await this.$post("/api/admin/order/get_all_choice");
-      var data = res.data;
+      let data = res.data;
       this.orderTypesOption = data.order_types;
       this.orderTypesOption.unshift({
         id: "",
@@ -909,7 +837,7 @@ export default {
         id: 0,
         name: "全部"
       });
-      for (var i=0;i<10;i++){
+      for (let i=0;i<10;i++){
           this.productTypePop[i]=this.TypeList.pop();
       }
         this.TypeList.push({
@@ -944,7 +872,7 @@ export default {
   display: flex;
   flex-direction: column;
   justify-content: center;
-  height: 270px;
+  height: 400px;
 }
 .selector-box {
   /* margin-top: 10px; */
@@ -971,7 +899,7 @@ export default {
 .vsub {
   vertical-align: sub;
 }
-.type-boxs {
+.type-boxes {
   margin-bottom: 10px;
 }
 .green {
@@ -1005,4 +933,27 @@ export default {
   text-align: center;
   border: 1px solid rgb(229, 28, 35);
 }
+  .tab-item{
+    padding: 5px;
+    margin-left: 20px;
+    margin-right: 20px;
+    width: 100px;
+  }
+  .text-num{
+    padding: 3px;
+  }
+
+  .text-title{
+    font-size: 14px;
+    font-weight: bold;
+  }
+
+  .inner-text{
+    font-size: 10px;
+  }
+
+  .count{
+    font-size: 12px;
+    color: #5a5e66;
+  }
 </style>