Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -738,6 +738,24 @@
                   prop="orderNo"
                   width="100"
                 />
+                 <el-table-column
+                  label="单据类型"
+                  align="center"
+                  prop="billKind"
+                  width="100"
+                 >
+                   <template slot-scope="scope">
+                    <span v-if="scope.row.billKind === 'NN'">直单</span>
+                    <span v-if="scope.row.billKind === 'MM'">主单</span>
+                    <span v-if="scope.row.billKind === 'MH'">从单</span>
+                   </template>
+                 </el-table-column>
+                 <el-table-column
+                  label="主单号"
+                  align="center"
+                  prop="mBillNo"
+                  width="100"
+                />
                 <el-table-column label="备注" align="center" prop="remarks">
                   <template slot-scope="scope">
                     <el-input
@@ -1811,8 +1829,8 @@ export default {
           });
           for (let li in this.vehicleList) {
             if (
-              this.vehicleList[li].billStatus < 6 &&
-              this.vehicleList[li].billStatus != 3
+              this.vehicleList[li].billStatus != 3 &&
+              this.vehicleList[li].billStatus < 6
             ) {
               return this.$message.error("车辆安排存在未提交的数据");
             }

src/views/track/cabinet/AddOrUpdate.vue

@@ -470,7 +470,7 @@
 
         <el-row>
           <el-col :span="6">
-            <el-form-item label="油气费" prop="oilAmt">
+            <el-form-item label="油气费" prop="oilAmt" v-if="form.billKind !== 'MH'">
               <el-input
                 v-model="form.oilAmt"
                 placeholder="请输入油气费"
@@ -482,7 +482,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="单趟提成" prop="driverbonus">
+            <el-form-item label="单趟提成" prop="driverbonus" v-if="form.billKind !== 'MH'">
               <el-input
                 v-model="form.driverbonus"
                 placeholder="请输入单趟提成"
@@ -494,7 +494,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="其他费用" prop="costOth">
+            <el-form-item label="其他费用" prop="costOth" v-if="form.billKind !== 'MH'">
               <el-input
                 v-model="form.costOth"
                 placeholder="请输入其他费用"
@@ -506,7 +506,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="花销备注" prop="costRemarks">
+            <el-form-item label="花销备注" prop="costRemarks" v-if="form.billKind !== 'MH'">
               <el-input
                 v-model="form.costRemarks"
                 placeholder="请输入备注"
@@ -1384,7 +1384,7 @@ export default {
       }
     },
     addRelevt3() {
-      if (this.form.oilAmt > 0) {
+      if (this.form.oilAmt > 0 && this.form.billKind !== 'MH') {
         this.fFeeid52 = true;
         this.chiFeesList.map((e) => {
           if (e.fFeeid == 52 && e.actId == 1080) {
@@ -1408,7 +1408,7 @@ export default {
           });
         }
       }
-      if (this.form.driverbonus > 0) {
+      if (this.form.driverbonus > 0 && this.form.billKind !== 'MH') {
         this.fFeeid53 = true;
         this.chiFeesList.map((e) => {
           if (e.fFeeid == 53 && e.actId == 1080) {
@@ -1432,7 +1432,7 @@ export default {
           });
         }
       }
-      if (this.form.costOth > 0) {
+      if (this.form.costOth > 0 && this.form.billKind !== 'MH') {
         this.fFeeid54 = true;
         this.chiFeesList.map((e) => {
           if (e.fFeeid == 54 && e.actId == 1080) {

src/views/track/cabinet/index.vue

@@ -764,6 +764,20 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "37",
+          label: "mBillNo",
+          name: "主单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "38",
+          label: "billKind",
+          name: "单据类型",
+          checked: 0,
+          width: 100,
+        },
       ],
       allCheck: false,
       title: "",