完善车队配载功能

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
@@ -823,7 +841,7 @@
                       type="text"
                       icon="el-icon-document-checked"
                       @click.native.prevent="selectStowage(scope.row)"
-                      v-if="schedulingList[0].transProp == '1'"
+                      v-if="schedulingList[0].transProp == '1' && scope.row.billStatus >= 6"
                       :disabled="scope.row.mBillNo"
                       v-hasPermi="['fleet:ftmsorderbillscars:edit']"
                       >配载</el-button
@@ -833,7 +851,7 @@
                       type="text"
                       icon="el-icon-document-delete"
                       @click.native.prevent="changeStowageRow(scope.row)"
-                      v-if="schedulingList[0].transProp == '1'"
+                      v-if="schedulingList[0].transProp == '1' && scope.row.billStatus >= 6"
                       :disabled="!scope.row.mBillNo"
                       v-hasPermi="['fleet:ftmsorderbillscars:edit']"
                       >撤销配载</el-button
@@ -1620,7 +1638,7 @@ export default {
       revokeStowage(row.id).then((response) => {
         if (response.code == 200) {
           this.msgSuccess("配载撤销成功");
-          this.$set(row, "mBillNo", response.data.mBillNo);
+          this.$set(row, "mBillNo", null);
           this.$set(row, "billKind", response.data.billKind);
         }
       });

src/views/warehouseBusiness/inStock/index.vue

@@ -2924,7 +2924,7 @@
                 clearable
               >
                 <el-option
-                  v-for="(dic, index) in jFeetunitOptions"
+                  v-for="(dict, index) in jFeetunitOptions"
                   :key="index.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"