修改车队中禅道的问题

src/api/finance/contrast.js

@@ -162,3 +162,11 @@ export function confirmFleet(data) {
     data:data
   })
 }
+// 查询客户详情列表
+export function listCorps(query) {
+  return request({
+    url: '/basicdata/corps/selectCustomerDriverList',
+    method: 'get',
+    params: query
+  })
+}

src/views/finance/contrast/index.vue

@@ -778,8 +778,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"
               >
@@ -1004,8 +1004,9 @@ import {
   delFleet,
   detailFleet,
   confirmFleet,
+  listCorps
 } from "@/api/finance/contrast";
-import { listCorps } from "@/api/basicdata/corps";
+// import { listCorps } from "@/api/basicdata/corps";
 import { listFees } from "@/api/basicdata/fees";
 import AddOrUpdate from "@/views/viewApproval";
 import { queryUserVal } from "@/api/warehouseBusiness/agreement";

src/views/index.vue

@@ -484,7 +484,7 @@
           iconName="el-icon-s-cooperation"
           :More="true"
         >
-          <div slot="content" style="height: 312px">
+          <div slot="content" style="height: 260px">
             <div
               style="padding: 5px 5px 0 5px; font-size: 14px"
               v-for="(item, index) in tableDataTwo"
@@ -887,7 +887,9 @@ export default {
     getList() {
       this.loading = true;
       listCorps(this.queryParams).then((response) => {
-        this.tableDataTwo = response.rows;
+        if(response.rows.length>0){
+          this.tableDataTwo = response.rows.slice(0, 10);
+        } 
       });
     },
     //查询仓库
@@ -1272,7 +1274,7 @@ export default {
   }
   .upper-right2 {
     padding: 10px 0;
-    height: 130px;
+    height: 104px;
   }
 }
 .single_line {

src/views/track/singleCost/AddOrUpdate.vue

@@ -491,7 +491,7 @@
               filterable
               size="mini"
               style="width: 160px"
-              :disabled="scope.row.actId == 1080 || disabled"
+              :disabled="disabled"
             >
               <el-option
                 v-for="(dict, index) in fMblnoOptions"
@@ -512,7 +512,7 @@
             <el-select
               v-model="scope.row.fFeeid"
               filterable
-              :disabled="scope.row.actId == 1080 || disabled"
+              :disabled="disabled"
               remote
               placeholder="费用名称"
             >
@@ -530,7 +530,7 @@
             <el-select
               v-model="scope.row.fDc"
               placeholder="请选择"
-              :disabled="scope.row.actId == 1080 || disabled"
+              :disabled="disabled"
             >
               <el-option label="收" value="D"></el-option>
               <el-option label="付" value="C"></el-option>
@@ -547,7 +547,7 @@
             <el-select
               v-model="scope.row.fFeeunitid"
               placeholder="请选择计费单位"
-              :disabled="scope.row.actId == 1080 || disabled"
+              :disabled="disabled"
               clearable
             >
               <el-option
@@ -568,7 +568,7 @@
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.fBillingQty"
-              :disabled="scope.row.actId == 1080 || disabled"
+              :disabled="disabled"
               placeholder="请输入内容"
               @input="total(scope.row)"
               v-input-limit="2"
@@ -584,7 +584,7 @@
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.fUnitprice"
-              :disabled="scope.row.actId == 1080 || disabled"
+              :disabled="disabled"
               placeholder="请输入内容"
               @input="total(scope.row)"
               v-input-limit="2"
@@ -600,7 +600,7 @@
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.fCurrency"
-              :disabled="scope.row.actId == 1080 || disabled"
+              :disabled="disabled"
               placeholder="请输入内容"
             ></el-input>
           </template>
@@ -609,7 +609,7 @@
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.fExrate"
-              :disabled="scope.row.actId == 1080 || disabled"
+              :disabled="disabled"
               placeholder="请输入内容"
             ></el-input>
           </template>
@@ -618,7 +618,7 @@
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.fAmount"
-              :disabled="scope.row.actId == 1080 || disabled"
+              :disabled="disabled"
               placeholder="请输入内容"
             ></el-input>
           </template>
@@ -632,7 +632,7 @@
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.fTaxrate"
-              :disabled="scope.row.actId == 1080 || disabled"
+              :disabled="disabled"
               placeholder="请输入内容"
             ></el-input>
           </template>
@@ -889,22 +889,9 @@ export default {
       if (this.form.oilAmt > 0) {
         this.feesList.push({
           actId: "1080",
-          fCorpid: this.form.fCorpId,
-          fFeeid: 52,
-          fDc: "C",
-          fFeeunitid: "6",
-          fBillingQty: 1,
-          fUnitprice: this.form.oilAmt,
-          fCurrency: "RMB",
-          fTaxrate: 3,
-          fAmount: this.form.oilAmt,
-          fExrate: 1,
-          remarks: "",
-        },{
-          actId: "1080",
           fCorpid: this.form.driverUserId,
           fFeeid: 52,
-          fDc: "D",
+          fDc: "C",
           fFeeunitid: "6",
           fBillingQty: 1,
           fUnitprice: this.form.oilAmt,
@@ -912,28 +899,15 @@ export default {
           fTaxrate: 3,
           fAmount: this.form.oilAmt,
           fExrate: 1,
-          remarks: "",
+          remarks: this.form.costRemarks,
         });
       }
       if (this.form.driverbonus > 0) {
         this.feesList.push({
           actId: "1080",
-          fCorpid: this.form.fCorpId,
-          fFeeid: 53,
-          fDc: "C",
-          fFeeunitid: "6",
-          fBillingQty: 1,
-          fUnitprice: this.form.driverbonus,
-          fCurrency: "RMB",
-          fTaxrate: 3,
-          fAmount: this.form.driverbonus,
-          fExrate: 1,
-          remarks: "",
-        },{
-          actId: "1080",
           fCorpid: this.form.driverUserId,
           fFeeid: 53,
-          fDc: "D",
+          fDc: "C",
           fFeeunitid: "6",
           fBillingQty: 1,
           fUnitprice: this.form.driverbonus,
@@ -941,28 +915,15 @@ export default {
           fTaxrate: 3,
           fAmount: this.form.driverbonus,
           fExrate: 1,
-          remarks: "",
+          remarks: this.form.costRemarks,
         });
       }
       if (this.form.costOth > 0) {
         this.feesList.push({
           actId: "1080",
-          fCorpid: this.form.fCorpId,
-          fFeeid: 54,
-          fDc: "C",
-          fFeeunitid: "6",
-          fBillingQty: 1,
-          fUnitprice: this.form.costOth,
-          fCurrency: "RMB",
-          fTaxrate: 3,
-          fAmount: this.form.costOth,
-          fExrate: 1,
-          remarks: "",
-        },{
-          actId: "1080",
           fCorpid: this.form.driverUserId,
           fFeeid: 54,
-          fDc: "D",
+          fDc: "C",
           fFeeunitid: "6",
           fBillingQty: 1,
           fUnitprice: this.form.costOth,
@@ -970,7 +931,7 @@ export default {
           fTaxrate: 3,
           fAmount: this.form.costOth,
           fExrate: 1,
-          remarks: "",
+          remarks: this.form.costRemarks,
         });
       }
       if (this.form.costomAmt03 > 0) {
@@ -978,7 +939,7 @@ export default {
           actId: "1080",
           fCorpid: this.form.fCorpId,
           fFeeid: 55,
-          fDc: "C",
+          fDc: "D",
           fFeeunitid: "6",
           fBillingQty: 1,
           fUnitprice: this.form.costomAmt03,
@@ -986,12 +947,12 @@ export default {
           fTaxrate: 3,
           fAmount: this.form.costomAmt03,
           fExrate: 1,
-          remarks: "",
+          remarks:this.form.costomStr02,
         },{
           actId: "1080",
           fCorpid: this.form.driverUserId,
           fFeeid: 55,
-          fDc: "D",
+          fDc: "C",
           fFeeunitid: "6",
           fBillingQty: 1,
           fUnitprice: this.form.costomAmt03,
@@ -999,7 +960,7 @@ export default {
           fTaxrate: 3,
           fAmount: this.form.costomAmt03,
           fExrate: 1,
-          remarks: "",
+          remarks: this.form.costomStr02,
         });
       }
       if (this.form.costomAmt04 > 0) {
@@ -1007,7 +968,7 @@ export default {
           actId: "1080",
           fCorpid: this.form.fCorpId,
           fFeeid: 56,
-          fDc: "C",
+          fDc: "D",
           fFeeunitid: "6",
           fBillingQty: 1,
           fUnitprice: this.form.costomAmt04,
@@ -1015,12 +976,12 @@ export default {
           fTaxrate: 3,
           fAmount: this.form.costomAmt04,
           fExrate: 1,
-          remarks: "",
+          remarks: this.form.costomStr02,
         },{
           actId: "1080",
           fCorpid: this.form.driverUserId,
           fFeeid: 56,
-          fDc: "D",
+          fDc: "C",
           fFeeunitid: "6",
           fBillingQty: 1,
           fUnitprice: this.form.costomAmt04,
@@ -1028,7 +989,7 @@ export default {
           fTaxrate: 3,
           fAmount: this.form.costomAmt04,
           fExrate: 1,
-          remarks: "",
+          remarks: this.form.costomStr02,
         });
       }
       if (this.form.costomAmt02 > 0) {
@@ -1036,7 +997,7 @@ export default {
           actId: "1080",
           fCorpid: this.form.fCorpId,
           fFeeid: 57,
-          fDc: "C",
+          fDc: "D",
           fFeeunitid: "6",
           fBillingQty: 1,
           fUnitprice: this.form.costomAmt02,
@@ -1044,12 +1005,12 @@ export default {
           fTaxrate: 3,
           fAmount: this.form.costomAmt02,
           fExrate: 1,
-          remarks: "",
+          remarks: this.form.costomStr02,
         },{
           actId: "1080",
           fCorpid: this.form.driverUserId,
           fFeeid: 57,
-          fDc: "D",
+          fDc: "C",
           fFeeunitid: "6",
           fBillingQty: 1,
           fUnitprice: this.form.costomAmt02,
@@ -1057,7 +1018,7 @@ export default {
           fTaxrate: 3,
           fAmount: this.form.costomAmt02,
           fExrate: 1,
-          remarks: "",
+          remarks: this.form.costomStr02,
         });
       }
       if (this.form.costomAmt05 > 0) {
@@ -1065,7 +1026,7 @@ export default {
           actId: "1080",
           fCorpid: this.form.fCorpId,
           fFeeid: 58,
-          fDc: "C",
+          fDc: "D",
           fFeeunitid: "6",
           fBillingQty: 1,
           fUnitprice: this.form.costomAmt05,
@@ -1073,12 +1034,12 @@ export default {
           fTaxrate: 3,
           fAmount: this.form.costomAmt05,
           fExrate: 1,
-          remarks: "",
+          remarks: this.form.costomStr01,
         },{
           actId: "1080",
           fCorpid: this.form.driverUserId,
           fFeeid: 58,
-          fDc: "D",
+          fDc: "C",
           fFeeunitid: "6",
           fBillingQty: 1,
           fUnitprice: this.form.costomAmt05,
@@ -1086,7 +1047,7 @@ export default {
           fTaxrate: 3,
           fAmount: this.form.costomAmt05,
           fExrate: 1,
-          remarks: "",
+          remarks: this.form.costomStr01,
         });
       }
       if (this.form.costomAmt06 > 0) {
@@ -1094,7 +1055,7 @@ export default {
           actId: "1080",
           fCorpid: this.form.fCorpId,
           fFeeid: 59,
-          fDc: "C",
+          fDc: "D",
           fFeeunitid: "6",
           fBillingQty: 1,
           fUnitprice: this.form.costomAmt06,
@@ -1102,12 +1063,12 @@ export default {
           fTaxrate: 3,
           fAmount: this.form.costomAmt06,
           fExrate: 1,
-          remarks: "",
+          remarks: this.form.costomStr01,
         },{
           actId: "1080",
           fCorpid: this.form.driverUserId,
           fFeeid: 59,
-          fDc: "D",
+          fDc: "C",
           fFeeunitid: "6",
           fBillingQty: 1,
           fUnitprice: this.form.costomAmt06,
@@ -1115,7 +1076,7 @@ export default {
           fTaxrate: 3,
           fAmount: this.form.costomAmt06,
           fExrate: 1,
-          remarks: "",
+          remarks: this.form.costomStr01,
         });
       }
       if (this.form.costomAmt01 > 0) {
@@ -1123,7 +1084,7 @@ export default {
           actId: "1080",
           fCorpid: this.form.fCorpId,
           fFeeid: 60,
-          fDc: "C",
+          fDc: "D",
           fFeeunitid: "6",
           fBillingQty: 1,
           fUnitprice: this.form.costomAmt01,
@@ -1131,12 +1092,12 @@ export default {
           fTaxrate: 3,
           fAmount: this.form.costomAmt01,
           fExrate: 1,
-          remarks: "",
+          remarks: this.form.costomStr01,
         },{
           actId: "1080",
           fCorpid: this.form.driverUserId,
           fFeeid: 60,
-          fDc: "D",
+          fDc: "C",
           fFeeunitid: "6",
           fBillingQty: 1,
           fUnitprice: this.form.costomAmt01,
@@ -1144,7 +1105,7 @@ export default {
           fTaxrate: 3,
           fAmount: this.form.costomAmt01,
           fExrate: 1,
-          remarks: "",
+          remarks: this.form.costomStr01,
         });
       }
     },