qukaidi преди 4 години
родител
ревизия
938c6b7c62

+ 9 - 1
src/api/basicdata/corps.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询客户详情列表
 export function listCorps(query) {
   return request({
-    url: '/basicdata/corps/list',
+    url: '/basicdata/corps/selectCustomerDriverList',
     method: 'get',
     params: query
   })
@@ -63,3 +63,11 @@ export function exportCorps(query) {
     params: query
   })
 }
+
+//客户和司机
+export function selectCorpList(fId) {
+  return request({
+    url: '/basicdata/corps/selectCorpList/'+ fId,
+    method: 'get',
+  })
+}

+ 1 - 1
src/api/finance/charge.js

@@ -101,7 +101,7 @@ export function searchs(queryParameter) {
 // 查询客户详情列表
 export function listCorps(query) {
   return request({
-    url: '/basicdata/corps/list',
+    url: '/basicdata/corps/selectCustomerDriverList',
     method: 'get',
     params: query
   })

+ 1 - 1
src/api/finance/payment.js

@@ -111,7 +111,7 @@ export function searchs(queryParameter) {
 // 查询客户详情列表
 export function listCorps(query) {
   return request({
-    url: '/basicdata/corps/list',
+    url: '/basicdata/corps/selectCustomerDriverList',
     method: 'get',
     params: query
   })

+ 5 - 5
src/views/finance/charge/index.vue

@@ -2014,8 +2014,8 @@ export default {
       this.doNot = true;
       this.hide = true;
       for (let item in this.selection) {
-        this.pass.fAmtcr += Number(this.selection[item].fAmt);
-        this.pass.fAmtdr += Number(this.selection[item].fAmtdr.toFixed(2));
+        this.pass.fAmtcr += Number(this.selection[item].fAmt).toFixed(2);
+        this.pass.fAmtdr += Number(this.selection[item].fAmtdr).toFixed(2);
       }
       this.pass.fAmtcr.toFixed(2);
       if (this.state_s == true) {
@@ -2200,10 +2200,10 @@ export default {
       if (name == null || name === "") {
         return false;
       }
-      let queryParams = { pageNum: 1, pageSize: 10, fName: name, type: 1 };
+      let queryParams = { fName: name};
       listCorps(queryParams).then((response) => {
-        this.fMblnoOptions = response.rows;
-        this.KHblnoOptions = response.rows;
+        this.fMblnoOptions = response;
+        this.KHblnoOptions = response;
       });
     },
     /** 重置按钮操作 */

+ 6 - 6
src/views/finance/contrast/index.vue

@@ -1795,7 +1795,7 @@ export default {
         this.pass.fAmtcr = Number(this.pass.fAmtcr);
         this.pass.fAmtdr = Number(this.pass.fAmtdr);
         this.pass.fAmtcr += Number(this.selection[item].fAmt);
-        this.pass.fAmtdr += Number(this.selection[item].fAmtdr.toFixed(2));
+        this.pass.fAmtdr += Number(this.selection[item].fAmtdr).toFixed(2);
       }
       this.pass.fAmtcr.toFixed(2);
       if (this.state_s == true) {
@@ -2321,10 +2321,10 @@ export default {
       if (name == null || name === "") {
         return false;
       }
-      let queryParams = { pageNum: 1, pageSize: 10, fName: name, type: 1 };
+      let queryParams = {fName: name};
       listCorps(queryParams).then((response) => {
-        this.fMblnoOptions = response.rows;
-        this.KHblnoOptions = response.rows;
+        this.fMblnoOptions = response;
+        this.KHblnoOptions = response;
       });
     },
     /** 提交按钮 */
@@ -2364,8 +2364,8 @@ export default {
               this.pass.fAmtcr += Number(this.DzfeeList[item].fAmt);
               this.pass.fAmtdr += Number(this.DzfeeList[item].fAmtdr);
             }
-            this.queryParams.fAmtcr = Number(this.pass.fAmtcr.toFixed(2));
-            this.queryParams.fAmtdr = Number(this.pass.fAmtdr.toFixed(2));
+            this.queryParams.fAmtcr = Number(this.pass.fAmtcr).toFixed(2);
+            this.queryParams.fAmtdr = Number(this.pass.fAmtdr).toFixed(2);
             this.pass.fAmtcr.toFixed(2);
             this.queryParams.fBillstatus = "1";
             let formData = new window.FormData();

+ 11 - 10
src/views/finance/payment/index.vue

@@ -759,8 +759,8 @@
               multiple
             >
               <el-option
-                v-for="dict in businessTypeOption"
-                :key="dict.dictValue"
+                v-for="(dict,index) in businessTypeOption"
+                :key="index.dictValue"
                 :label="dict.dictLabel"
                 :value="dict.dictValue"
               >
@@ -1112,7 +1112,7 @@ export default {
       //打开内部弹窗
       innerVisible: false,
       chargeList_s: [],
-      selection: "",
+      selection:[],
       increase_s: [],
       cancelButton: true,
       // 选中数组
@@ -1717,9 +1717,10 @@ export default {
       this.doNot = true;
       this.hide = true;
       for (let item in this.selection) {
-        this.pass.fAmtcr += Number(this.selection[item].fAmt.toFixed(2));
-        this.pass.fAmtdr += Number(this.selection[item].fAmtdr.toFixed(2));
+        this.pass.fAmtcr += Number(this.selection[item].fAmt).toFixed(2);
+        this.pass.fAmtdr += Number(this.selection[item].fAmtdr).toFixed(2);
       }
+      console.log(this.pass.fAmtcr)
       if (this.state_s == true) {
         if (this.selection.length == "0") {
           this.$message.error("未选择导入行");
@@ -1899,10 +1900,10 @@ export default {
       if (name == null || name === "") {
         return false;
       }
-      let queryParams = { pageNum: 1, pageSize: 10, fName: name, type: 1 };
+      let queryParams = {fName: name};
       listCorps(queryParams).then((response) => {
-        this.fMblnoOptions = response.rows;
-        this.KHblnoOptions = response.rows;
+        this.fMblnoOptions = response;
+        this.KHblnoOptions = response;
       });
     },
     /** 重置按钮操作 */
@@ -2052,8 +2053,8 @@ export default {
               this.pass.fAmtcr += Number(this.increase_s[item].fAmt);
               this.pass.fAmtdr += Number(this.increase_s[item].fAmtdr);
             }
-            this.queryParams.fAmtcr = Number(this.pass.fAmtcr.toFixed(2));
-            this.queryParams.fAmtdr = Number(this.pass.fAmtdr.toFixed(2));
+            this.queryParams.fAmtcr = Number(this.pass.fAmtcr).toFixed(2);
+            this.queryParams.fAmtdr = Number(this.pass.fAmtdr).toFixed(2);
             this.pass.fAmtcr.toFixed(2);
 
             this.queryParams.fBillstatus = "1";