修复到财务管理

1

src/views/businessManager/orderManager/financeManager-taoqi.vue

@@ -132,6 +132,8 @@
             class="multiple"
             v-model.trim="searchForm.routingOrganId"
             filterable
+            multiple
+            collapse-tags
             clearable
             @clear="onClear('routingOrganId')"
             placeholder="请选择分部"
@@ -247,10 +249,13 @@
               scope.row.type | orderType
             }}</template>
           </el-table-column>
-                    <el-table-column align="center" prop="expectAmount" label="订单金额">
+          <el-table-column align="center" prop="expectAmount" label="订单金额">
             <template slot-scope="scope">
               <div>
-                {{ (scope.row.couponRemitFee+scope.row.expectAmount) | moneyFormat }}
+                {{
+                  (scope.row.couponRemitFee + scope.row.expectAmount)
+                    | moneyFormat
+                }}
               </div>
             </template>
           </el-table-column>
@@ -731,7 +736,7 @@ export default {
         orderEndDate: null,
         paymentStatus: "SUCCESS",
         paymentType: null,
-        routingOrganId: null,
+        routingOrganId: [],
         actualAmount: null,
         balancePaymentAmount: null,
         orderNo: null,
@@ -851,7 +856,7 @@ export default {
       } else if (type == "paymentStatus") {
         this.searchForm.paymentStatus = null;
       } else if (type == "routingOrganId") {
-        this.searchForm.routingOrganId = null;
+        this.searchForm.routingOrganId = [];
       }
     },
     onOrderSubmit(formName) {
@@ -923,7 +928,7 @@ export default {
         balancePaymentAmount: searchForm.balancePaymentAmount,
         paymentStatus: searchForm.paymentStatus,
         paymentType: searchForm.paymentType,
-        routingOrganId: searchForm.routingOrganId,
+        routingOrganId: this.searchForm.routingOrganId.join(','),
         lessBalancePaymentAmount: searchForm.lessBalancePaymentAmount,
         lessActualAmount: searchForm.lessActualAmount,
         ...this.extraQuery,
@@ -993,6 +998,7 @@ export default {
       let data = {
         ...this.extraQuery,
       };
+       data.routingOrganId= this.searchForm.routingOrganId.join(',')
       if (this.searchForm.orderDate && this.searchForm.orderDate.length > 0) {
         data.startTime = this.searchForm.orderDate[0];
         data.endTime = this.searchForm.orderDate[1];
@@ -1058,6 +1064,7 @@ export default {
       params.balancePaymentAmount = params.balancePaymentAmount
         ? params.balancePaymentAmount
         : null;
+        params.routingOrganId= this.searchForm.routingOrganId.join(',')
       if (this.searchForm.orderDate && this.searchForm.orderDate.length > 0) {
         params.orderStartDate = this.searchForm.orderDate[0];
         params.orderEndDate = this.searchForm.orderDate[1];
@@ -1104,7 +1111,7 @@ export default {
         orderEndDate: null,
         paymentStatus: "SUCCESS",
         paymentType: null,
-        routingOrganId: null,
+        routingOrganId: [],
         actualAmount: null,
         balancePaymentAmount: null,
         orderNo: null,

src/views/businessManager/orderManager/financeManager.vue

@@ -733,7 +733,7 @@ export default {
         orderEndDate: null,
         paymentStatus: "SUCCESS",
         paymentType: null,
-        routingOrganId: null,
+        routingOrganId: [],
         actualAmount: null,
         balancePaymentAmount: null,
         orderNo: null,
@@ -853,7 +853,7 @@ export default {
       } else if (type == "paymentStatus") {
         this.searchForm.paymentStatus = null;
       } else if (type == "routingOrganId") {
-        this.searchForm.routingOrganId = null;
+        this.searchForm.routingOrganId = [];
       }
     },
     onOrderSubmit(formName) {
@@ -915,6 +915,7 @@ export default {
       // 报表导出
       let url = "/api-web/export/routeOrderList";
       let searchForm = this.searchForm;
+
       let data = {
         orderType: 3,
         search: searchForm.search,
@@ -930,6 +931,7 @@ export default {
         lessActualAmount: searchForm.lessActualAmount,
         ...this.extraQuery,
       };
+        data.routingOrganId= this.searchForm.routingOrganId.join(',')
 
       if (this.searchForm.orderDate && this.searchForm.orderDate.length > 0) {
         data.orderStartDate = this.searchForm.orderDate[0];
@@ -995,6 +997,7 @@ export default {
       let data = {
         ...this.extraQuery,
       };
+      data.routingOrganId= this.searchForm.routingOrganId.join(',')
       if (this.searchForm.orderDate && this.searchForm.orderDate.length > 0) {
         data.startTime = this.searchForm.orderDate[0];
         data.endTime = this.searchForm.orderDate[1];
@@ -1060,6 +1063,7 @@ export default {
       params.balancePaymentAmount = params.balancePaymentAmount
         ? params.balancePaymentAmount
         : null;
+        params.routingOrganId= this.searchForm.routingOrganId.join(',')
       if (this.searchForm.orderDate && this.searchForm.orderDate.length > 0) {
         params.orderStartDate = this.searchForm.orderDate[0];
         params.orderEndDate = this.searchForm.orderDate[1];
@@ -1106,7 +1110,7 @@ export default {
         orderEndDate: null,
         paymentStatus: "SUCCESS",
         paymentType: null,
-        routingOrganId: null,
+        routingOrganId: [],
         actualAmount: null,
         balancePaymentAmount: null,
         orderNo: null,

src/views/businessManager/orderManager/income.vue

@@ -93,7 +93,9 @@
             class="multiple"
             v-model.trim="searchForm.organId"
             filterable
+              collapse-tags
             clearable
+            multiple
             @clear="onClear('organId')"
             placeholder="请选择分部"
           >
@@ -235,7 +237,10 @@
           <el-table-column align="center" prop="expectAmount" label="订单金额">
             <template slot-scope="scope">
               <div>
-                {{ (scope.row.couponRemitFee+scope.row.expectAmount) | moneyFormat }}
+                {{
+                  (scope.row.couponRemitFee + scope.row.expectAmount)
+                    | moneyFormat
+                }}
               </div>
             </template>
           </el-table-column>
@@ -359,7 +364,7 @@ export default {
         orderEndDate: null,
         paymentStatus: "SUCCESS",
         paymentType: null,
-        organId: null,
+        organId: [],
         actualAmount: null,
         balancePaymentAmount: null,
         orderNo: null,
@@ -422,7 +427,7 @@ export default {
       } else if (type == "paymentStatus") {
         this.searchForm.paymentStatus = null;
       } else if (type == "organId") {
-        this.searchForm.organId = null;
+        this.searchForm.organId = [];
       }
     },
     onOrderExport() {
@@ -439,7 +444,7 @@ export default {
         balancePaymentAmount: searchForm.balancePaymentAmount,
         paymentStatus: searchForm.paymentStatus,
         paymentType: searchForm.paymentType,
-        organId: searchForm.organId,
+        organId: searchForm.organId.join(','),
         lessBalancePaymentAmount: searchForm.lessBalancePaymentAmount,
         lessActualAmount: searchForm.lessActualAmount,
       };
@@ -496,9 +501,10 @@ export default {
       this.getList();
     },
     getList() {
-      let { orderDate, ...rest } = this.searchForm;
+      let { orderDate, organId, ...rest } = this.searchForm;
       let params = {
         ...rest,
+        organId: organId.join(","),
         page: this.pageInfo.page,
         rows: this.pageInfo.limit,
         ...getTimes(orderDate, ["orderStartDate", "orderEndDate"]),
@@ -561,7 +567,7 @@ export default {
         orderEndDate: null,
         paymentStatus: "SUCCESS",
         paymentType: null,
-        organId: null,
+        organId: [],
         actualAmount: null,
         balancePaymentAmount: null,
         orderNo: null,

src/views/businessManager/orderManager/orderAudit-taoqi/index.vue

@@ -18,6 +18,8 @@
           <el-select class="multiple"
                      v-model.trim="searchForm.organId"
                      filterable
+                     multiple
+                     collapse-tags
                      clearable
                      placeholder="请选择分部">
             <el-option
@@ -204,7 +206,7 @@ export default {
     return {
       searchForm: {
         transNo: null,
-        organId: null,
+        organId: [],
         auditStatus: 'ING',
         type: null,
       },
@@ -259,16 +261,17 @@ export default {
     onReSet() {
       this.searchForm = {
         transNo: null,
-        organId: null,
+        organId: [],
         auditStatus: 'ING',
         type: null,
       };
       this.search();
     },
     getList() {
-      let params = this.searchForm;
+      let params = {...this.searchForm};
       params.rows = this.rules.limit;
       params.page = this.rules.page;
+       params.organId =this.searchForm.organId.join(",")
       getRouteOrderList(params).then((res) => {
         if (res.code == 200) {
           this.tableList = res.data.rows;

src/views/businessManager/orderManager/orderAudit/index.vue

@@ -26,6 +26,8 @@
             class="multiple"
             v-model.trim="searchForm.organId"
             filterable
+            multiple
+            collapse-tags
             clearable
             placeholder="请选择分部"
           >
@@ -233,7 +235,7 @@ export default {
     return {
       searchForm: {
         transNo: null,
-        organId: null,
+        organId: [],
         auditStatus: "ING",
         type: null,
       },
@@ -288,17 +290,18 @@ export default {
     onReSet() {
       this.searchForm = {
         transNo: null,
-        organId: null,
+        organId: [],
         auditStatus: "ING",
         type: null,
       };
       this.search();
     },
     getList() {
-      let params = this.searchForm;
+      let params = {...this.searchForm};
       params.rows = this.rules.limit;
       params.page = this.rules.page;
       params.noneTqType = 1
+      params.organId =this.searchForm.organId.join(",")
       getRouteOrderList(params).then((res) => {
         if (res.code == 200) {
           this.tableList = res.data.rows;

src/views/withdrawal-application/index.vue

@@ -524,6 +524,7 @@ export default {
             try {
               const res = await batchQuitMusicGroup(objList);
               this.$message.success("审批成功");
+              this.getList()
               done();
             } catch (e) {
               console.log(e);
@@ -540,6 +541,7 @@ export default {
             try {
               const res = await batchQuitMusicGroup(objList);
               this.$message.success("审批成功");
+              this.getList()
               done();
             } catch (e) {
               console.log(e);