完善车队

src/views/fleet/plans/AddOrUpdate.vue

@@ -593,7 +593,7 @@
               </el-table>
             </div>
           </el-collapse-item>
-          <el-collapse-item  name="2" v-if="userType == '00'">
+          <el-collapse-item name="2" v-if="userType == '00'">
             <template slot="title">
               <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
                 ><span
@@ -733,7 +733,7 @@
             </div>
           </el-collapse-item>
 
-          <el-collapse-item  name="3" v-if="userType == '00'">
+          <el-collapse-item name="3" v-if="userType == '00'">
             <template slot="title">
               <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
                 ><span
@@ -762,10 +762,10 @@
                 </div>
               </div>
               <el-table :data="DList">
-                <el-table-column label="结算单位" align="center" prop="fcorpid">
+                <el-table-column label="结算单位" align="center" prop="fCorpid">
                   <template slot-scope="scope">
                     <el-select
-                      v-model="scope.row.fcorpid"
+                      v-model="scope.row.fCorpid"
                       placeholder="结算单位"
                       :clearable="true"
                       filterable
@@ -781,10 +781,10 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="费用名称" align="center" prop="ffeeid">
+                <el-table-column label="费用名称" align="center" prop="fFeeid">
                   <template slot-scope="scope">
                     <el-select
-                      v-model="scope.row.ffeeid"
+                      v-model="scope.row.fFeeid"
                       placeholder="费用名称"
                       clearable
                       filterable
@@ -802,11 +802,11 @@
                 <el-table-column
                   label="计费单位"
                   align="center"
-                  prop="ffeeunitid"
+                  prop="fFeeunitid"
                 >
                   <template slot-scope="scope">
                     <el-select
-                      v-model="scope.row.ffeeunitid"
+                      v-model="scope.row.fFeeunitid"
                       placeholder="计费单位"
                       :disabled="disabled"
                     >
@@ -819,69 +819,69 @@
                     </el-select>
                   </template>
                 </el-table-column>
-                <el-table-column label="计费数量" align="center" prop="fqty">
+                <el-table-column label="计费数量" align="center" prop="fQty">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.fqty"
+                      v-model="scope.row.fQty"
                       placeholder="计费数量"
                       v-input-limit="0"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="单价" align="center" prop="funitprice">
+                <el-table-column label="单价" align="center" prop="fUnitprice">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.funitprice"
+                      v-model="scope.row.fUnitprice"
                       placeholder="单价"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="币种" align="center" prop="fcurrency">
+                <el-table-column label="币种" align="center" prop="fCurrency">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.fcurrency"
+                      v-model="scope.row.fCurrency"
                       placeholder="RMB"
-                      :disabled="disabled"
+                      :disabled="true"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="税率" align="center" prop="ftaxrate">
+                <el-table-column label="税率" align="center" prop="fTaxrate">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.ftaxrate"
+                      v-model="scope.row.fTaxrate"
                       placeholder="税率"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="金额" align="center" prop="famount">
+                <el-table-column label="金额" align="center" prop="fAmount">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.famount"
+                      v-model="scope.row.fAmount"
                       placeholder="金额"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="汇率" align="center" prop="fexrate">
+                <el-table-column label="汇率" align="center" prop="fExrate">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.fexrate"
+                      v-model="scope.row.fExrate"
                       placeholder="汇率"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="备注" align="center" prop="remark">
+                <el-table-column label="备注" align="center" prop="remarks">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.remark"
+                      v-model="scope.row.remarks"
                       placeholder="备注"
                       :disabled="disabled"
                     />
@@ -908,7 +908,7 @@
               </el-table>
             </div>
           </el-collapse-item>
-          <el-collapse-item  name="4" v-if="userType == '00'">
+          <el-collapse-item name="4" v-if="userType == '00'">
             <template slot="title">
               <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
                 ><span
@@ -937,10 +937,10 @@
                 </div>
               </div>
               <el-table :data="CList">
-                <el-table-column label="结算单位" align="center" prop="fcorpid">
+                <el-table-column label="结算单位" align="center" prop="fCorpid">
                   <template slot-scope="scope">
                     <el-select
-                      v-model="scope.row.fcorpid"
+                      v-model="scope.row.fCorpid"
                       placeholder="结算单位"
                       :clearable="true"
                       filterable
@@ -956,10 +956,10 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="费用名称" align="center" prop="ffeeid">
+                <el-table-column label="费用名称" align="center" prop="fFeeid">
                   <template slot-scope="scope">
                     <el-select
-                      v-model="scope.row.ffeeid"
+                      v-model="scope.row.fFeeid"
                       placeholder="费用名称"
                       clearable
                       filterable
@@ -977,11 +977,11 @@
                 <el-table-column
                   label="计费单位"
                   align="center"
-                  prop="ffeeunitid"
+                  prop="fFeeunitid"
                 >
                   <template slot-scope="scope">
                     <el-select
-                      v-model="scope.row.ffeeunitid"
+                      v-model="scope.row.fFeeunitid"
                       placeholder="计费单位"
                       :disabled="disabled"
                     >
@@ -994,69 +994,69 @@
                     </el-select>
                   </template>
                 </el-table-column>
-                <el-table-column label="计费数量" align="center" prop="fqty">
+                <el-table-column label="计费数量" align="center" prop="fQty">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.fqty"
+                      v-model="scope.row.fQty"
                       placeholder="计费数量"
                       v-input-limit="0"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="单价" align="center" prop="funitprice">
+                <el-table-column label="单价" align="center" prop="fUnitprice">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.funitprice"
+                      v-model="scope.row.fUnitprice"
                       placeholder="单价"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="币种" align="center" prop="fcurrency">
+                <el-table-column label="币种" align="center" prop="fCurrency">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.fcurrency"
+                      v-model="scope.row.fCurrency"
                       placeholder="RMB"
-                      :disabled="disabled"
+                      :disabled="true"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="税率" align="center" prop="ftaxrate">
+                <el-table-column label="税率" align="center" prop="fTaxrate">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.ftaxrate"
+                      v-model="scope.row.fTaxrate"
                       placeholder="税率"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="金额" align="center" prop="famount">
+                <el-table-column label="金额" align="center" prop="fAmount">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.famount"
+                      v-model="scope.row.fAmount"
                       placeholder="金额"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="汇率" align="center" prop="fexrate">
+                <el-table-column label="汇率" align="center" prop="fExrate">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.fexrate"
+                      v-model="scope.row.fExrate"
                       placeholder="汇率"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="备注" align="center" prop="remark">
+                <el-table-column label="备注" align="center" prop="remarks">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.remark"
+                      v-model="scope.row.remarks"
                       placeholder="备注"
                       :disabled="disabled"
                     />
@@ -1074,7 +1074,7 @@
                       size="mini"
                       type="text"
                       icon="el-icon-delete"
-                      @click.native.prevent="deleteRow(scope.$index, CList)"
+                      @click.native.prevent="deleteRow(scope.$index, DList)"
                       :disabled="disabled"
                       >删除</el-button
                     >
@@ -1083,7 +1083,7 @@
               </el-table>
             </div>
           </el-collapse-item>
-          <el-collapse-item  name="5">
+          <el-collapse-item name="5">
             <template slot="title">
               <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
                 ><span
@@ -1352,7 +1352,7 @@ export default {
       goodsOptions: [],
       fWbuOptions: [],
       ffeeunitidList: [],
-      collapses2:[]
+      collapses2: [],
     };
   },
   created() {
@@ -1467,15 +1467,26 @@ export default {
         if (valid) {
           let arr = this.schedulingList.filter((e) => e.billStatus == 6);
           if (this.schedulingList.length == arr.length) {
-            if (this.form.billStatus != 50) {
-              this.form["billStatus"] = "40";
-            }
+            this.form["billStatus"] = "6";
             this.DList.map((e) => {
               return (e.fDc = "D");
             });
             this.CList.map((e) => {
               return (e.fDc = "C");
             });
+            if (this.planList) {
+              let arr2 = [];
+              this.planList.map((e) => {
+                let arr = this.cntrIdList.filter(
+                  (item) => item.dictValue == e.cntrId
+                );
+                arr.map((a) => {
+                  arr2.push(a.dictLabel + "*" + e.cntrQty);
+                });
+              });
+              this.cntrDesc = [...new Set(arr2)].join(",");
+            }
+            this.form["cntrDesc"] = this.cntrDesc;
             let formData = new window.FormData();
             formData.append("tmsorder", JSON.stringify(this.form));
             formData.append(
@@ -1509,7 +1520,7 @@ export default {
     },
     //保存
     submitSave() {
-      this.form["billStatus"] = "20";
+      this.form["billStatus"] = "2";
       this.DList.map((e) => {
         return (e.fDc = "D");
       });
@@ -1527,7 +1538,7 @@ export default {
           this.msgSuccess("保存成功");
           this.$parent.getList();
           this.$parent.getSave(response);
-          console.log(response)
+          console.log(response);
         } else {
           this.msgSuccess("保存失败");
         }
@@ -1535,7 +1546,7 @@ export default {
     },
     //撤回
     submitRetreat() {
-      if (this.form.billStatus <= 50) {
+      if (this.form.billStatus <= 3) {
         const data = { id: this.form.id };
         RetreatFtmsorderbills(data).then((response) => {
           if (response.code == 200) {
@@ -1668,9 +1679,9 @@ export default {
     planList(val) {
       this.showSure(val);
     },
-    collapses(){
-      this.collapses2=this.collapses
-    }
+    collapses() {
+      this.collapses2 = this.collapses;
+    },
   },
 };
 </script>

src/views/fleet/plans/index.vue

@@ -516,8 +516,15 @@ export default {
           checked: 0,
           width: 100,
         },
-        {
+           {
           surface: "13",
+          label: "billStatus",
+          name: "状态",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "14",
           label: "remarks",
           name: "备注",
           checked: 0,
@@ -609,8 +616,15 @@ export default {
           checked: 0,
           width: 100,
         },
-        {
+           {
           surface: "13",
+          label: "billStatus",
+          name: "状态",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "14",
           label: "remarks",
           name: "备注",
           checked: 0,
@@ -719,6 +733,30 @@ export default {
           if (e.createTime) {
             e.createTime = e.createTime.substring(0, 10);
           }
+          if (e.loadDate) {
+            e.loadDate = e.loadDate.substring(0, 10);
+          }
+          if (e.billStatus == 1) {
+            e.billStatus = "新建";
+          }
+          if (e.billStatus == 2) {
+            e.billStatus = "暂存";
+          }
+          if (e.billStatus == 3) {
+            e.billStatus = "撤回";
+          }
+           if (e.billStatus == 6) {
+            e.billStatus = "提交";
+          }
+          if (e.billStatus == 20) {
+            e.billStatus = "调度暂存";
+          }
+          if (e.billStatus == 30) {
+            e.billStatus = "调度撤回";
+          }
+          if (e.billStatus == 60) {
+            e.billStatus = "调度提交";
+          }
         });
         this.ftmsorderbillsList = response.rows;
         this.total = response.total;
@@ -810,8 +848,9 @@ export default {
           response.data.tmsorder.billType = response.data.tmsorder.billType.toString();
         }
         if (response.data.scntrs.length != 0) {
-          response.data.scntrs.cntrId = response.data.scntrs.map((e) => {
-            return (e.cntrId = e.cntrId.toString());
+          response.data.scntrs.map((e) => {
+            e.cntrId = e.cntrId.toString();
+            e.priceType = e.priceType.toString();
           });
         }
         if (response.data.plans.length != 0) {
@@ -822,9 +861,9 @@ export default {
           });
         }
         if (response.data.fees.length != 0) {
-          response.data.fees.ffeeunitid = response.data.fees.map((e) => {
-            if (e.ffeeunitid != null) {
-              return (e.ffeeunitid = e.ffeeunitid.toString());
+          response.data.fees.map((e) => {
+            if (e.fFeeunitid != null) {
+              return (e.fFeeunitid = e.fFeeunitid.toString());
             }
           });
         }
@@ -834,8 +873,8 @@ export default {
         this.form = response.data.tmsorder;
         this.planList = response.data.scntrs;
         if (response.data.fees.length) {
-          this.DList = response.data.fees.filter((e) => e.fdc == "D");
-          this.CList = response.data.fees.filter((e) => e.fdc == "C");
+          this.DList = response.data.fees.filter((e) => e.fDc == "D");
+          this.CList = response.data.fees.filter((e) => e.fDc == "C");
         } else {
           this.DList = [];
           this.CList = [];
@@ -846,13 +885,14 @@ export default {
     },
     //获取到保存并复制
     getSave(data) {
-      console.log(data)
+      console.log(data);
       if (data.data.tmsorder.billType != null) {
         data.data.tmsorder.billType = data.data.tmsorder.billType.toString();
       }
-      if (data.data.scntrs.length != 0) {
-        data.data.scntrs.cntrId = data.data.scntrs.map((e) => {
-          return (e.cntrId = e.cntrId.toString());
+      if (response.data.scntrs.length != 0) {
+        response.data.scntrs.map((e) => {
+          e.cntrId = e.cntrId.toString();
+          e.priceType = e.priceType.toString();
         });
       }
       if (data.data.plans.length != 0) {

src/views/fleet/scheduling/AddOrUpdate.vue

@@ -129,6 +129,73 @@
             </el-form-item>
           </el-col>
         </el-row>
+         <el-row>
+          <el-col :span="6">
+            <el-form-item
+              v-if="form.billType == 1"
+              label="卸货地点"
+              prop="mdLoadAddr"
+            >
+              <el-input
+                v-model="form.mdLoadAddr"
+                placeholder="请输入装卸货地点"
+                :disabled="disabled"
+                size="mini"
+                style="width: 180px"
+              />
+            </el-form-item>
+            <el-form-item
+              v-if="form.billType == 2"
+              label="装货地点"
+              prop="mdLoadAddr"
+            >
+              <el-input
+                v-model="form.mdLoadAddr"
+                placeholder="请输入装货地点"
+                :disabled="disabled"
+                size="mini"
+                style="width: 180px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" v-if="form.billType == 1 || form.billType == 2">
+            <el-form-item label="计划时间" prop="mdLoadDate">
+              <el-date-picker
+                clearable
+                size="mini"
+                style="width: 180px"
+                v-model="form.mdLoadDate"
+                type="datetime"
+                placeholder="选择计划装卸货时间"
+                :disabled="disabled"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" v-if="form.billType == 1 || form.billType == 2">
+            <el-form-item label="联系人" prop="mdLoadAttn">
+              <el-input
+                v-model="form.mdLoadAttn"
+                placeholder="请输入装卸货联系人"
+                :disabled="disabled"
+                size="mini"
+                style="width: 180px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" v-if="form.billType == 1 || form.billType == 2">
+            <el-form-item label="联系电话" prop="mdLoadAttnTel">
+              <el-input
+                v-model="form.mdLoadAttnTel"
+                placeholder="请输入装卸货联系电话"
+                :disabled="disabled"
+                v-input-limit="0"
+                size="mini"
+                style="width: 180px"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="6">
             <el-form-item label="卸车地点" prop="unLoadAddr">
@@ -681,10 +748,10 @@
                 </div>
               </div>
               <el-table :data="DList">
-                <el-table-column label="结算单位" align="center" prop="fcorpid">
+                <el-table-column label="结算单位" align="center" prop="fCorpid">
                   <template slot-scope="scope">
                     <el-select
-                      v-model="scope.row.fcorpid"
+                      v-model="scope.row.fCorpid"
                       placeholder="结算单位"
                       :clearable="true"
                       filterable
@@ -700,10 +767,10 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="费用名称" align="center" prop="ffeeid">
+                <el-table-column label="费用名称" align="center" prop="fFeeid">
                   <template slot-scope="scope">
                     <el-select
-                      v-model="scope.row.ffeeid"
+                      v-model="scope.row.fFeeid"
                       placeholder="费用名称"
                       clearable
                       filterable
@@ -721,11 +788,11 @@
                 <el-table-column
                   label="计费单位"
                   align="center"
-                  prop="ffeeunitid"
+                  prop="fFeeunitid"
                 >
                   <template slot-scope="scope">
                     <el-select
-                      v-model="scope.row.ffeeunitid"
+                      v-model="scope.row.fFeeunitid"
                       placeholder="计费单位"
                       :disabled="disabled"
                     >
@@ -738,69 +805,69 @@
                     </el-select>
                   </template>
                 </el-table-column>
-                <el-table-column label="计费数量" align="center" prop="fqty">
+                <el-table-column label="计费数量" align="center" prop="fQty">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.fqty"
+                      v-model="scope.row.fQty"
                       placeholder="计费数量"
                       v-input-limit="0"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="单价" align="center" prop="funitprice">
+                <el-table-column label="单价" align="center" prop="fUnitprice">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.funitprice"
+                      v-model="scope.row.fUnitprice"
                       placeholder="单价"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="币种" align="center" prop="fcurrency">
+                <el-table-column label="币种" align="center" prop="fCurrency">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.fcurrency"
+                      v-model="scope.row.fCurrency"
                       placeholder="RMB"
-                      :disabled="disabled"
+                      :disabled="true"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="税率" align="center" prop="ftaxrate">
+                <el-table-column label="税率" align="center" prop="fTaxrate">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.ftaxrate"
+                      v-model="scope.row.fTaxrate"
                       placeholder="税率"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="金额" align="center" prop="famount">
+                <el-table-column label="金额" align="center" prop="fAmount">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.famount"
+                      v-model="scope.row.fAmount"
                       placeholder="金额"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="汇率" align="center" prop="fexrate">
+                <el-table-column label="汇率" align="center" prop="fExrate">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.fexrate"
+                      v-model="scope.row.fExrate"
                       placeholder="汇率"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="备注" align="center" prop="remark">
+                <el-table-column label="备注" align="center" prop="remarks">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.remark"
+                      v-model="scope.row.remarks"
                       placeholder="备注"
                       :disabled="disabled"
                     />
@@ -856,10 +923,10 @@
                 </div>
               </div>
               <el-table :data="CList">
-                <el-table-column label="结算单位" align="center" prop="fcorpid">
+                <el-table-column label="结算单位" align="center" prop="fCorpid">
                   <template slot-scope="scope">
                     <el-select
-                      v-model="scope.row.fcorpid"
+                      v-model="scope.row.fCorpid"
                       placeholder="结算单位"
                       :clearable="true"
                       filterable
@@ -875,10 +942,10 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="费用名称" align="center" prop="ffeeid">
+                <el-table-column label="费用名称" align="center" prop="fFeeid">
                   <template slot-scope="scope">
                     <el-select
-                      v-model="scope.row.ffeeid"
+                      v-model="scope.row.fFeeid"
                       placeholder="费用名称"
                       clearable
                       filterable
@@ -896,11 +963,11 @@
                 <el-table-column
                   label="计费单位"
                   align="center"
-                  prop="ffeeunitid"
+                  prop="fFeeunitid"
                 >
                   <template slot-scope="scope">
                     <el-select
-                      v-model="scope.row.ffeeunitid"
+                      v-model="scope.row.fFeeunitid"
                       placeholder="计费单位"
                       :disabled="disabled"
                     >
@@ -913,69 +980,69 @@
                     </el-select>
                   </template>
                 </el-table-column>
-                <el-table-column label="计费数量" align="center" prop="fqty">
+                <el-table-column label="计费数量" align="center" prop="fQty">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.fqty"
+                      v-model="scope.row.fQty"
                       placeholder="计费数量"
                       v-input-limit="0"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="单价" align="center" prop="funitprice">
+                <el-table-column label="单价" align="center" prop="fUnitprice">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.funitprice"
+                      v-model="scope.row.fUnitprice"
                       placeholder="单价"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="币种" align="center" prop="fcurrency">
+                <el-table-column label="币种" align="center" prop="fCurrency">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.fcurrency"
+                      v-model="scope.row.fCurrency"
                       placeholder="RMB"
-                      :disabled="disabled"
+                      :disabled="true"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="税率" align="center" prop="ftaxrate">
+                <el-table-column label="税率" align="center" prop="fTaxrate">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.ftaxrate"
+                      v-model="scope.row.fTaxrate"
                       placeholder="税率"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="金额" align="center" prop="famount">
+                <el-table-column label="金额" align="center" prop="fAmount">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.famount"
+                      v-model="scope.row.fAmount"
                       placeholder="金额"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="汇率" align="center" prop="fexrate">
+                <el-table-column label="汇率" align="center" prop="fExrate">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.fexrate"
+                      v-model="scope.row.fExrate"
                       placeholder="汇率"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="备注" align="center" prop="remark">
+                <el-table-column label="备注" align="center" prop="remarks">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.remark"
+                      v-model="scope.row.remarks"
                       placeholder="备注"
                       :disabled="disabled"
                     />
@@ -993,7 +1060,7 @@
                       size="mini"
                       type="text"
                       icon="el-icon-delete"
-                      @click.native.prevent="deleteRow(scope.$index, CList)"
+                      @click.native.prevent="deleteRow(scope.$index, DList)"
                       :disabled="disabled"
                       >删除</el-button
                     >
@@ -1391,7 +1458,7 @@ export default {
         if (valid) {
           let arr = this.schedulingList.filter((e) => e.billStatus == 6);
           if (this.schedulingList.length == arr.length) {
-            this.form["billStatus"] = "80";
+            this.form["billStatus"] = "6";
             this.DList.map((e) => {
               return (e.fDc = "D");
             });
@@ -1423,7 +1490,7 @@ export default {
     },
     //保存
     submitSave() {
-      this.form["billStatus"] = "50";
+      this.form["billStatus"] = "2";
       this.DList.map((e) => {
         return (e.fDc = "D");
       });

src/views/fleet/scheduling/index.vue

@@ -516,6 +516,13 @@ export default {
         },
         {
           surface: "13",
+          label: "billStatus",
+          name: "状态",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "14",
           label: "remarks",
           name: "备注",
           checked: 0,
@@ -609,6 +616,13 @@ export default {
         },
         {
           surface: "13",
+          label: "billStatus",
+          name: "状态",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "14",
           label: "remarks",
           name: "备注",
           checked: 0,
@@ -718,6 +732,30 @@ export default {
           if (e.createTime) {
             e.createTime = e.createTime.substring(0, 10);
           }
+          if (e.loadDate) {
+            e.loadDate = e.loadDate.substring(0, 10);
+          }
+                if (e.billStatus == 1) {
+            e.billStatus = "新建";
+          }
+          if (e.billStatus == 2) {
+            e.billStatus = "暂存";
+          }
+          if (e.billStatus == 3) {
+            e.billStatus = "撤销";
+          }
+          if (e.billStatus == 6) {
+            e.billStatus = "提交";
+          }
+          if (e.billStatus == 20) {
+            e.billStatus = "派车暂存";
+          }
+          if (e.billStatus == 30) {
+            e.billStatus = "派车撤回";
+          }
+          if (e.billStatus == 60) {
+            e.billStatus = "派车提交";
+          }
         });
         this.ftmsorderbillsList = response.rows;
         this.total = response.total;
@@ -809,8 +847,9 @@ export default {
           response.data.tmsorder.billType = response.data.tmsorder.billType.toString();
         }
         if (response.data.scntrs.length != 0) {
-          response.data.scntrs.cntrId = response.data.scntrs.map((e) => {
-            return (e.cntrId = e.cntrId.toString());
+          response.data.scntrs.map((e) => {
+            e.cntrId = e.cntrId.toString();
+            e.priceType = e.priceType.toString();
           });
         }
         if (response.data.plans.length != 0) {
@@ -818,7 +857,7 @@ export default {
             if (e.cntrId) {
               e.cntrId = e.cntrId.toString();
             }
-            if (e.billStatus>=6) {
+            if (e.billStatus >= 6) {
               e.disabled = true;
             }
           });
@@ -832,8 +871,13 @@ export default {
         this.form = response.data.tmsorder;
         this.planList = response.data.scntrs;
         if (response.data.fees.length) {
-          this.DList = response.data.fees.filter((e) => e.fdc == "D");
-          this.CList = response.data.fees.filter((e) => e.fdc == "C");
+          response.data.fees.map((e) => {
+            if (e.fFeeunitid != null) {
+              return (e.fFeeunitid = e.fFeeunitid.toString());
+            }
+          });
+          this.DList = response.data.fees.filter((e) => e.fDc == "D");
+          this.CList = response.data.fees.filter((e) => e.fDc == "C");
         } else {
           this.DList = [];
           this.CList = [];

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -722,17 +722,17 @@
                     type="primary"
                     icon="el-icon-plus"
                     size="mini"
-                    @click="addRow(DList)"
+                    @click="addDListRow(DList)"
                     :disabled="disabled"
                     >添加</el-button
                   >
                 </div>
               </div>
               <el-table :data="DList">
-                <el-table-column label="结算单位" align="center" prop="fcorpid">
+                <el-table-column label="结算单位" align="center" prop="fCorpid">
                   <template slot-scope="scope">
                     <el-select
-                      v-model="scope.row.fcorpid"
+                      v-model="scope.row.fCorpid"
                       placeholder="结算单位"
                       :clearable="true"
                       filterable
@@ -748,10 +748,10 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="费用名称" align="center" prop="ffeeid">
+                <el-table-column label="费用名称" align="center" prop="fFeeid">
                   <template slot-scope="scope">
                     <el-select
-                      v-model="scope.row.ffeeid"
+                      v-model="scope.row.fFeeid"
                       placeholder="费用名称"
                       clearable
                       filterable
@@ -769,11 +769,11 @@
                 <el-table-column
                   label="计费单位"
                   align="center"
-                  prop="ffeeunitid"
+                  prop="fFeeunitid"
                 >
                   <template slot-scope="scope">
                     <el-select
-                      v-model="scope.row.ffeeunitid"
+                      v-model="scope.row.fFeeunitid"
                       placeholder="计费单位"
                       :disabled="disabled"
                     >
@@ -786,74 +786,75 @@
                     </el-select>
                   </template>
                 </el-table-column>
-                <el-table-column label="计费数量" align="center" prop="fqty">
+                <el-table-column label="计费数量" align="center" prop="fQty">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.fqty"
+                      v-model="scope.row.fQty"
                       placeholder="计费数量"
                       v-input-limit="0"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="单价" align="center" prop="funitprice">
+                <el-table-column label="单价" align="center" prop="fUnitprice">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.funitprice"
+                      v-model="scope.row.fUnitprice"
                       placeholder="单价"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="币种" align="center" prop="fcurrency">
+                <el-table-column label="币种" align="center" prop="fCurrency">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.fcurrency"
+                      v-model="scope.row.fCurrency"
                       placeholder="RMB"
                       :disabled="true"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="税率" align="center" prop="ftaxrate">
+                <el-table-column label="税率" align="center" prop="fTaxrate">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.ftaxrate"
+                      v-model="scope.row.fTaxrate"
                       placeholder="税率"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="金额" align="center" prop="famount">
+                <el-table-column label="金额" align="center" prop="fAmount">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.famount"
+                      v-model="scope.row.fAmount"
                       placeholder="金额"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="汇率" align="center" prop="fexrate">
+                <el-table-column label="汇率" align="center" prop="fExrate">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.fexrate"
+                      v-model="scope.row.fExrate"
                       placeholder="汇率"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="备注" align="center" prop="remark">
+                <el-table-column label="备注" align="center" prop="remarks">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.remark"
+                      v-model="scope.row.remarks"
                       placeholder="备注"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
+
                 <el-table-column
                   label="操作"
                   align="center"
@@ -896,17 +897,17 @@
                     type="primary"
                     icon="el-icon-plus"
                     size="mini"
-                    @click="addRow(CList)"
+                    @click="addDListRow(CList)"
                     :disabled="disabled"
                     >添加</el-button
                   >
                 </div>
               </div>
               <el-table :data="CList">
-                <el-table-column label="结算单位" align="center" prop="fcorpid">
+                <el-table-column label="结算单位" align="center" prop="fCorpid">
                   <template slot-scope="scope">
                     <el-select
-                      v-model="scope.row.fcorpid"
+                      v-model="scope.row.fCorpid"
                       placeholder="结算单位"
                       :clearable="true"
                       filterable
@@ -922,10 +923,10 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="费用名称" align="center" prop="ffeeid">
+                <el-table-column label="费用名称" align="center" prop="fFeeid">
                   <template slot-scope="scope">
                     <el-select
-                      v-model="scope.row.ffeeid"
+                      v-model="scope.row.fFeeid"
                       placeholder="费用名称"
                       clearable
                       filterable
@@ -943,11 +944,11 @@
                 <el-table-column
                   label="计费单位"
                   align="center"
-                  prop="ffeeunitid"
+                  prop="fFeeunitid"
                 >
                   <template slot-scope="scope">
                     <el-select
-                      v-model="scope.row.ffeeunitid"
+                      v-model="scope.row.fFeeunitid"
                       placeholder="计费单位"
                       :disabled="disabled"
                     >
@@ -960,69 +961,69 @@
                     </el-select>
                   </template>
                 </el-table-column>
-                <el-table-column label="计费数量" align="center" prop="fqty">
+                <el-table-column label="计费数量" align="center" prop="fQty">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.fqty"
+                      v-model="scope.row.fQty"
                       placeholder="计费数量"
                       v-input-limit="0"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="单价" align="center" prop="funitprice">
+                <el-table-column label="单价" align="center" prop="fUnitprice">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.funitprice"
+                      v-model="scope.row.fUnitprice"
                       placeholder="单价"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="币种" align="center" prop="fcurrency">
+                <el-table-column label="币种" align="center" prop="fCurrency">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.fcurrency"
+                      v-model="scope.row.fCurrency"
                       placeholder="RMB"
                       :disabled="true"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="税率" align="center" prop="ftaxrate">
+                <el-table-column label="税率" align="center" prop="fTaxrate">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.ftaxrate"
+                      v-model="scope.row.fTaxrate"
                       placeholder="税率"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="金额" align="center" prop="famount">
+                <el-table-column label="金额" align="center" prop="fAmount">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.famount"
+                      v-model="scope.row.fAmount"
                       placeholder="金额"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="汇率" align="center" prop="fexrate">
+                <el-table-column label="汇率" align="center" prop="fExrate">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.fexrate"
+                      v-model="scope.row.fExrate"
                       placeholder="汇率"
                       v-input-limit="2"
                       :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="备注" align="center" prop="remark">
+                <el-table-column label="备注" align="center" prop="remarks">
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.remark"
+                      v-model="scope.row.remarks"
                       placeholder="备注"
                       :disabled="disabled"
                     />
@@ -1040,7 +1041,7 @@
                       size="mini"
                       type="text"
                       icon="el-icon-delete"
-                      @click.native.prevent="deleteRow(scope.$index, CList)"
+                      @click.native.prevent="deleteRow(scope.$index, DList)"
                       :disabled="disabled"
                       >删除</el-button
                     >

src/views/fleet/sendcar/index.vue

@@ -513,6 +513,13 @@ export default {
         },
         {
           surface: "13",
+          label: "billStatus",
+          name: "状态",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "14",
           label: "remarks",
           name: "备注",
           checked: 0,
@@ -606,6 +613,13 @@ export default {
         },
         {
           surface: "13",
+          label: "billStatus",
+          name: "状态",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "14",
           label: "remarks",
           name: "备注",
           checked: 0,
@@ -714,6 +728,21 @@ export default {
           if (e.createTime) {
             e.createTime = e.createTime.substring(0, 10);
           }
+          if (e.loadDate) {
+            e.loadDate = e.loadDate.substring(0, 10);
+          }
+          if (e.billStatus == 1) {
+            e.billStatus = "新建";
+          }
+          if (e.billStatus == 2) {
+            e.billStatus = "暂存";
+          }
+          if (e.billStatus == 3) {
+            e.billStatus = "撤销";
+          }
+          if (e.billStatus == 6) {
+            e.billStatus = "提交";
+          }
         });
         this.ftmsorderbillsList = response.rows;
         this.total = response.total;