Browse Source

首付款

qukaidi 4 years ago
parent
commit
e420b33a1c

+ 7 - 4
src/views/finance/charge/index.vue

@@ -251,9 +251,6 @@
         prop="createTime"
         width="120"
       >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
-        </template>
       </el-table-column>
       <el-table-column
         label="收费日期"
@@ -2017,7 +2014,8 @@ export default {
         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);
+      console.log(this.pass.fAmtcr)
+      // this.pass.fAmtcr.toFixed(2);
       if (this.state_s == true) {
         if (this.selection.length == "0") {
           this.$message.error("未选择导入行");
@@ -2083,6 +2081,11 @@ export default {
         //车队
         listCharges(this.tableFilter).then((response) => {
           console.log(response);
+          response.rows.map((e) => {
+            if (e.createTime) {
+              e.createTime = e.createTime.substring(0, 10);
+            }
+          });
           this.chargeList = response.rows;
           this.total = response.total;
           this.loading = false;

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

@@ -2366,7 +2366,7 @@ export default {
             }
             this.queryParams.fAmtcr = Number(this.pass.fAmtcr).toFixed(2);
             this.queryParams.fAmtdr = Number(this.pass.fAmtdr).toFixed(2);
-            this.pass.fAmtcr.toFixed(2);
+            // this.pass.fAmtcr.toFixed(2);
             this.queryParams.fBillstatus = "1";
             let formData = new window.FormData();
             formData.append("tFee", JSON.stringify(this.queryParams));

+ 6 - 4
src/views/finance/payment/index.vue

@@ -166,9 +166,6 @@
         prop="createTime"
         width="120"
       >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
-        </template>
       </el-table-column>
       <el-table-column label="付费日期" align="center" sortable width="120">
         <template slot-scope="scope">
@@ -1784,6 +1781,11 @@ export default {
       } else if (Cookies.get("sysType") == 2) {
         //车队
         listCharges(this.tableFilter).then((response) => {
+             response.rows.map((e) => {
+            if (e.createTime) {
+              e.createTime = e.createTime.substring(0, 10);
+            }
+          });
           this.chargeList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -2055,7 +2057,7 @@ export default {
             }
             this.queryParams.fAmtcr = Number(this.pass.fAmtcr).toFixed(2);
             this.queryParams.fAmtdr = Number(this.pass.fAmtdr).toFixed(2);
-            this.pass.fAmtcr.toFixed(2);
+            // this.pass.fAmtcr.toFixed(2);
 
             this.queryParams.fBillstatus = "1";
             let formData = new window.FormData();

+ 123 - 5
src/views/track/singleCost/AddOrUpdate.vue

@@ -692,7 +692,7 @@
 import { removeFtmsorderbillscars } from "@/api/fleet/ftmsorderbillscars";
 import { query, submit } from "@/api/track/singleCost";
 import { listGoods } from "@/api/basicdata/goods";
-import { listCorps } from "@/api/basicdata/corps";
+import { selectCorpList } from "@/api/basicdata/corps";
 import { listFees } from "@/api/basicdata/fees";
 import UploadFile from "@/components/Uploadfile";
 import Cookies from "js-cookie";
@@ -804,9 +804,6 @@ export default {
     this.getDicts("data_priceType").then((response) => {
       this.priceTypeList = response.data;
     });
-    listCorps().then((response) => {
-      this.fMblnoOptions = response.rows;
-    });
     listGoods().then((response) => {
       this.goodsOptions = response.rows;
     });
@@ -822,6 +819,10 @@ export default {
     },
     init() {
       this.showDialog = true;
+      // console.log(this.fname.id)
+      selectCorpList(this.fname.id).then((response) => {
+         this.fMblnoOptions = response;
+      });
       query(this.fname.id).then((data) => {
         if (data.data.billType) {
           data.data.billType = data.data.billType.toString();
@@ -883,7 +884,7 @@ export default {
         arr2.push(e.fFeeid);
       });
       if (arr2.length > 0) {
-        return this.msgSuccess("费用已导入,请勿重复导入");
+        return this.$message.error("费用已导入,请勿重复导入");
       }
       if (this.form.oilAmt > 0) {
         this.feesList.push({
@@ -899,6 +900,19 @@ export default {
           fAmount: this.form.oilAmt,
           fExrate: 1,
           remarks: "",
+        },{
+          actId: "1080",
+          fCorpid: this.form.driverUserId,
+          fFeeid: 52,
+          fDc: "D",
+          fFeeunitid: "6",
+          fBillingQty: 1,
+          fUnitprice: this.form.oilAmt,
+          fCurrency: "RMB",
+          fTaxrate: 3,
+          fAmount: this.form.oilAmt,
+          fExrate: 1,
+          remarks: "",
         });
       }
       if (this.form.driverbonus > 0) {
@@ -915,6 +929,19 @@ export default {
           fAmount: this.form.driverbonus,
           fExrate: 1,
           remarks: "",
+        },{
+          actId: "1080",
+          fCorpid: this.form.driverUserId,
+          fFeeid: 53,
+          fDc: "D",
+          fFeeunitid: "6",
+          fBillingQty: 1,
+          fUnitprice: this.form.driverbonus,
+          fCurrency: "RMB",
+          fTaxrate: 3,
+          fAmount: this.form.driverbonus,
+          fExrate: 1,
+          remarks: "",
         });
       }
       if (this.form.costOth > 0) {
@@ -931,6 +958,19 @@ export default {
           fAmount: this.form.costOth,
           fExrate: 1,
           remarks: "",
+        },{
+          actId: "1080",
+          fCorpid: this.form.driverUserId,
+          fFeeid: 54,
+          fDc: "D",
+          fFeeunitid: "6",
+          fBillingQty: 1,
+          fUnitprice: this.form.costOth,
+          fCurrency: "RMB",
+          fTaxrate: 3,
+          fAmount: this.form.costOth,
+          fExrate: 1,
+          remarks: "",
         });
       }
       if (this.form.costomAmt03 > 0) {
@@ -947,6 +987,19 @@ export default {
           fAmount: this.form.costomAmt03,
           fExrate: 1,
           remarks: "",
+        },{
+          actId: "1080",
+          fCorpid: this.form.driverUserId,
+          fFeeid: 55,
+          fDc: "D",
+          fFeeunitid: "6",
+          fBillingQty: 1,
+          fUnitprice: this.form.costomAmt03,
+          fCurrency: "RMB",
+          fTaxrate: 3,
+          fAmount: this.form.costomAmt03,
+          fExrate: 1,
+          remarks: "",
         });
       }
       if (this.form.costomAmt04 > 0) {
@@ -963,6 +1016,19 @@ export default {
           fAmount: this.form.costomAmt04,
           fExrate: 1,
           remarks: "",
+        },{
+          actId: "1080",
+          fCorpid: this.form.driverUserId,
+          fFeeid: 56,
+          fDc: "D",
+          fFeeunitid: "6",
+          fBillingQty: 1,
+          fUnitprice: this.form.costomAmt04,
+          fCurrency: "RMB",
+          fTaxrate: 3,
+          fAmount: this.form.costomAmt04,
+          fExrate: 1,
+          remarks: "",
         });
       }
       if (this.form.costomAmt02 > 0) {
@@ -979,6 +1045,19 @@ export default {
           fAmount: this.form.costomAmt02,
           fExrate: 1,
           remarks: "",
+        },{
+          actId: "1080",
+          fCorpid: this.form.driverUserId,
+          fFeeid: 57,
+          fDc: "D",
+          fFeeunitid: "6",
+          fBillingQty: 1,
+          fUnitprice: this.form.costomAmt02,
+          fCurrency: "RMB",
+          fTaxrate: 3,
+          fAmount: this.form.costomAmt02,
+          fExrate: 1,
+          remarks: "",
         });
       }
       if (this.form.costomAmt05 > 0) {
@@ -995,6 +1074,19 @@ export default {
           fAmount: this.form.costomAmt05,
           fExrate: 1,
           remarks: "",
+        },{
+          actId: "1080",
+          fCorpid: this.form.driverUserId,
+          fFeeid: 58,
+          fDc: "D",
+          fFeeunitid: "6",
+          fBillingQty: 1,
+          fUnitprice: this.form.costomAmt05,
+          fCurrency: "RMB",
+          fTaxrate: 3,
+          fAmount: this.form.costomAmt05,
+          fExrate: 1,
+          remarks: "",
         });
       }
       if (this.form.costomAmt06 > 0) {
@@ -1011,6 +1103,19 @@ export default {
           fAmount: this.form.costomAmt06,
           fExrate: 1,
           remarks: "",
+        },{
+          actId: "1080",
+          fCorpid: this.form.driverUserId,
+          fFeeid: 59,
+          fDc: "D",
+          fFeeunitid: "6",
+          fBillingQty: 1,
+          fUnitprice: this.form.costomAmt06,
+          fCurrency: "RMB",
+          fTaxrate: 3,
+          fAmount: this.form.costomAmt06,
+          fExrate: 1,
+          remarks: "",
         });
       }
       if (this.form.costomAmt01 > 0) {
@@ -1027,6 +1132,19 @@ export default {
           fAmount: this.form.costomAmt01,
           fExrate: 1,
           remarks: "",
+        },{
+          actId: "1080",
+          fCorpid: this.form.driverUserId,
+          fFeeid: 60,
+          fDc: "D",
+          fFeeunitid: "6",
+          fBillingQty: 1,
+          fUnitprice: this.form.costomAmt01,
+          fCurrency: "RMB",
+          fTaxrate: 3,
+          fAmount: this.form.costomAmt01,
+          fExrate: 1,
+          remarks: "",
         });
       }
     },