阿伏兔 4 лет назад
Родитель
Сommit
0bd78323e9

+ 1 - 1
src/api/track/singleCost.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询订单调度列表
 export function listFtmsorderbillsplans(query) {
   return request({
-    url: 'fleet/ftmsorderbillscars/list',
+    url: 'fleet/ftmsorderbillscars/query',
     method: 'get',
     params: query
   })

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

@@ -831,6 +831,16 @@
                 <span v-else-if="scope.row.fBilltype == 'CKDB'">调拨</span>
                 <span v-else-if="scope.row.fBilltype == 'HQZY'">货权转移</span>
                 <span v-else-if="scope.row.fBilltype == 'JSCCF'">仓储费</span>
+                <span v-else-if="scope.row.fBilltype == '1000'">计划下达</span>
+                <span v-else-if="scope.row.fBilltype == '1010'">业务调度</span>
+                <span v-else-if="scope.row.fBilltype == '1020'">车队派车</span>
+                <span v-else-if="scope.row.fBilltype == '1030'">司机接单</span>
+                <span v-else-if="scope.row.fBilltype == '1080'">司机出车</span>
+                <span v-else-if="scope.row.fBilltype == '1040'">司机提箱</span>
+                <span v-else-if="scope.row.fBilltype == '1050'">司机装卸柜</span>
+                <span v-else-if="scope.row.fBilltype == '1060'">司机还卸柜</span>
+                <span v-else-if="scope.row.fBilltype == '1070'">司机回单</span>
+                <span v-else-if="scope.row.fBilltype == '1090'">费用补充</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -1856,7 +1866,6 @@ export default {
     // },
     // 导入搜索
     searchFee(type) {
-      console.log(type);
       this.feeList = [];
       this.$refs["feeListRules"].validate((valid) => {
         if (valid) {
@@ -1870,6 +1879,7 @@ export default {
                 for (let item in this.feeList) {
                   this.totAL += Number(this.feeList[item].fAmt);
                   this.Ttime += Number(this.feeList[item].fAmtdr);
+                  this.$set(this.feeList[item], 'fBsdate', this.feeList[item].fBsdate.substring(0, 10))
                 }
               } else {
                 this.$message.error("暂无数据");
@@ -1885,6 +1895,7 @@ export default {
                 for (let item in this.feeList) {
                   this.totAL += Number(this.feeList[item].fAmt);
                   this.Ttime += Number(this.feeList[item].fAmtdr);
+                  this.$set(this.feeList[item], 'fBsdate', this.feeList[item].fBsdate.substring(0, 10))
                 }
               } else {
                 this.$message.error("暂无数据");

+ 21 - 9
src/views/track/singleCost/AddOrUpdate.vue

@@ -299,7 +299,7 @@
             filterable
             size="mini"
             style="width: 160px"
-            :disabled="scope.row.actId != '1090' ? true : false || disabled"
+            disabled
           >
                 <el-option
                   v-for="(dict, index) in fMblnoOptions"
@@ -625,17 +625,16 @@ export default {
     addRelevt() {
       this.feesList.push({
         actId:'1090',
-        fPid:this.feesList[0].fPid,
-        fCorpid:'',
+        fCorpid: this.form.corpId,
         fFeeid:'',
         fDc:'',
         fFeeunitid:"1",
-        fBillingQty:'',
-        fUnitprice:'',
-        fCurrency:'',
-        fTaxrate:'',
-        fAmount:'',
-        fExrate:'',
+        fBillingQty: 0,
+        fUnitprice: 0,
+        fCurrency:'RMB',
+        fTaxrate: null,
+        fAmount: 0,
+        fExrate:1,
         remarks:''
       })
     },
@@ -669,6 +668,17 @@ export default {
     submitForm() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
+          let formDatae = new window.FormData()
+          formDatae.append('status', 6)
+          formDatae.append('cars', JSON.stringify(this.form))
+          formDatae.append('ftmsorderbillsfees', JSON.stringify(this.feesList))
+          submit(formDatae).then(data=>{
+            this.feesList = data.data.ftmsorderbillsfeesList
+            for (let item in this.feesList){
+              this.feesList[item].fFeeunitid = this.feesList[item].fFeeunitid + ""
+            }
+            this.$message.success('保存成功');
+          })
         }
       })
     },
@@ -682,6 +692,8 @@ export default {
     //保存
     submitSave() {
       let formDatae = new window.FormData()
+      formDatae.append('status', 2)
+      formDatae.append('cars', JSON.stringify(this.form))
       formDatae.append('ftmsorderbillsfees', JSON.stringify(this.feesList))
       submit(formDatae).then(data=>{
         this.feesList = data.data.ftmsorderbillsfeesList