修改bug

src/page/index/tags.vue

@@ -306,6 +306,9 @@ export default {
         if (tag.label == "销售订单(N)") {
           this.$store.commit("DOMXS_OUT_DETAIL");
         }
+        if (tag.label == "代理订单(N)") {
+          this.$store.commit("DOMXS_OUT_DETAIL");
+        }
         if (tag.label == "锁定订单明细") {
           this.$store.commit("DOMKC_OUT_DETAIL");
         }

src/views/businessManagement/proxyOrder/index.vue

@@ -482,7 +482,7 @@ export default {
       if (JSON.stringify(this.$route.query) != "{}") {
         this.$router.$avueRouter.closeTag();
         this.$router.push({
-          path: "/businessManagement/salesOrder/index"
+          path: "/businessManagement/proxyOrder/index"
         });
       }
       this.dataList.forEach(item => {

src/views/reimbursement/detail.vue

@@ -71,7 +71,7 @@
               :props="props" check-strictly :emit-path="false" :show-all-levels="false"
               @change="moldChange($event, row, dicArea)" @clear="row.feeList = feesOption" placeholder="请选择">
             </avue-cascader>
-            <span v-else="!row.$cellEdit">{{ row.mold }}</span>
+            <span v-else>{{ row.mold }}</span>
           </template>
           <template slot="detailId" slot-scope="{ row }">
             <el-select v-if="row.$cellEdit" v-model="row.detailId" filterable clearable @change="detailChange(row)"
@@ -87,13 +87,13 @@
           </template>
           <template slot="payMethod" slot-scope="{ row, index }">
             <el-select v-model="row.payMethod" size="small" placeholder="请选择" clearable :disabled="!row.$cellEdit">
-              <el-option v-for="(item, index) in paymentOption" :key="item.dictKey" :label="item.dictValue"
+              <el-option v-for="(item, index) in paymentOption" :key="index" :label="item.dictValue"
                 :value="item.dictKey"></el-option>
             </el-select>
           </template>
           <template slot="amount" slot-scope="{ row, index }">
             <el-input-number v-if="row.$cellEdit" v-model="row.amount" size="small" :controls="false" :precision="2"
-              style="width: 100%" placeholder="金额"></el-input-number>
+              style="width: 100%" placeholder="金额"></el-input-number> 
             <span v-else>{{ row.amount }}</span>
           </template>
         </avue-crud>

src/views/statisticAnalysis/commissionStatistics/index.vue

@@ -5,10 +5,10 @@
         :cell-style="cellStyle" @search-change="searchChange" @current-change="currentChange" @size-change="sizeChange"
         @refresh-change="refreshChange" @on-load="onLoad" :table-loading="loading" @saveColumn="saveColumn"
         @resetColumn="resetColumn" @search-criteria-switch="searchCriteriaSwitch">
-        <!-- <template slot="menuLeft">
+        <template slot="menuLeft">
           <el-button type="info" size="small" @click="outExport">导出
           </el-button>
-        </template> -->
+        </template>
         <template slot="userNameSearch">
           <user-select v-model="search.userName" :configuration="UConfiguration">
           </user-select>
@@ -65,6 +65,13 @@ export default {
         delBtn: false,
         searchIcon: true,
         menu: false,
+        showSummary: true,
+        summaryText: "合计",
+        sumColumnList: [
+          {
+            name: "commission",
+            type: "sum"
+          }],
         column: [
           {
             label: "承做人",
@@ -174,18 +181,21 @@ export default {
     },
     outExport() {
       let queryParams = this.search
-      if (queryParams.arrivalTime) {
-        queryParams.beginCreateTime = queryParams.careteTime[0]
-        queryParams.endCreateTime = queryParams.careteTime[1]
-        delete queryParams.careteTime
+      if (queryParams.actualDate) {
+        queryParams.actualDateStart = queryParams.actualDate[0]
+        queryParams.actualDateEnd = queryParams.actualDate[1]
+        delete queryParams.actualDate
       }
       const routeData = this.$router.resolve({
-        path: '/api/blade-land/order/acct-export',      //跳转目标窗口的地址
+        path: '/api/trade-project/project/statisticsExport',      //跳转目标窗口的地址
         query: {
+          "Blade-Auth": getToken(),
+          type: "TC",
+          branch: "Y",
           ...queryParams    //括号内是要传递给新窗口的参数
         }
       })
-      window.open(routeData.href.slice(1, routeData.href.length - 1) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+      window.open(routeData.href.slice(1, routeData.href.length - 1));
     }
   }
 };

src/views/statisticAnalysis/taskStatistics/index.vue

@@ -5,10 +5,10 @@
         :cell-style="cellStyle" @search-change="searchChange" @current-change="currentChange" @size-change="sizeChange"
         @refresh-change="refreshChange" @on-load="onLoad" :table-loading="loading" @saveColumn="saveColumn"
         @resetColumn="resetColumn" @search-criteria-switch="searchCriteriaSwitch">
-        <!-- <template slot="menuLeft">
+        <template slot="menuLeft">
           <el-button type="info" size="small" @click="outExport">导出
           </el-button>
-        </template> -->
+        </template>
         <template slot="userNameSearch">
           <user-select v-model="search.userName" :configuration="UConfiguration">
           </user-select>
@@ -98,7 +98,7 @@ export default {
             search: true,
             type: "select",
             overHidden: true,
-            dataType:'number',
+            dataType: 'number',
             dicData: [],
             props: {
               label: "dictValue",
@@ -195,21 +195,21 @@ export default {
     },
     outExport() {
       let queryParams = this.search
-
-      if (queryParams.arrivalTime) {
-        queryParams.beginCreateTime = queryParams.careteTime[0]
-        queryParams.endCreateTime = queryParams.careteTime[1]
-        delete queryParams.careteTime
+      if (queryParams.beginTime) {
+        queryParams.beginTimeStart = queryParams.beginTime[0]
+        queryParams.beginTimeEnd = queryParams.beginTime[1]
+        delete queryParams.beginTime
       }
-      console.log(queryParams)
-      // const routeData = this.$router.resolve({
-      //   path: '/api/blade-land/order/acct-export',      //跳转目标窗口的地址
-      //   query: {
-      //     ...queryParams    //括号内是要传递给新窗口的参数
-      //   }
-      // })
-      // window.open(routeData.href.slice(1, routeData.href.length - 1) + '&' + `${this.website.tokenHeader}=${getToken()}`);
-      // window.open(`/api/blade-land/order/acct-export?${this.website.tokenHeader}=${getToken()}&cname=${this.search.cname}`);
+      const routeData = this.$router.resolve({
+        path: '/api/trade-project/project/statisticsExport',      //跳转目标窗口的地址
+        query: {
+          "Blade-Auth": getToken(),
+          type: "RW",
+          branch: "Y",
+          ...queryParams    //括号内是要传递给新窗口的参数
+        }
+      })
+      window.open(routeData.href.slice(1, routeData.href.length - 1));
     }
   }
 };