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

src/views/fleet/plans/index.vue

@@ -173,7 +173,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['fleet:plans:add']"
+          v-hasPermi="['fleet:ftmsorderbills:add']"
           >新增</el-button
         >
       </el-col>
@@ -184,7 +184,7 @@
           size="mini"
           :disabled="true"
           @click="handleUpdate"
-          v-hasPermi="['fleet:plans:edit']"
+          v-hasPermi="['fleet:ftmsorderbills:edit']"
           >修改</el-button
         >
       </el-col>
@@ -195,7 +195,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['fleet:plans:remove']"
+          v-hasPermi="['fleet:ftmsorderbills:remove']"
           >删除</el-button
         >
       </el-col>
@@ -205,7 +205,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['fleet:plans:export']"
+          v-hasPermi="['fleet:ftmsorderbills:export']"
           >导出</el-button
         >
       </el-col>
@@ -346,7 +346,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['fleet:plans:edit']"
+            v-hasPermi="['fleet:ftmsorderbills:edit']"
             >修改</el-button
           > -->
           <el-button
@@ -354,7 +354,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['fleet:plans:remove']"
+            v-hasPermi="['fleet:ftmsorderbills:remove']"
             >删除</el-button
           >
         </template>

src/views/fleet/scheduling/index.vue

@@ -174,7 +174,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['fleet:plans:add']"
+          v-hasPermi="['fleet:ftmsorderbillsplans:add']"
           >新增</el-button
         >
       </el-col> -->
@@ -185,7 +185,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['fleet:plans:edit']"
+          v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
           >修改</el-button
         >
       </el-col>
@@ -195,7 +195,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['fleet:plans:export']"
+          v-hasPermi="['fleet:ftmsorderbillsplans:export']"
           >导出</el-button
         >
       </el-col>
@@ -329,7 +329,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['fleet:plans:edit']"
+            v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
             >修改</el-button
           > -->
         </template>

src/views/fleet/sendcar/index.vue

@@ -513,53 +513,53 @@ export default {
         },
         {
           surface: "12",
-          label: "cntrDesc",
-          name: "箱型箱量",
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "13",
-          label: "qtyDisPatch",
+          label: "carQty",
           name: "已安排箱量",
           checked: 0,
           width: 100,
         },
         {
-          surface: "14",
+          surface: "13",
           label: "cntrName",
           name: "箱型",
           checked: 0,
           width: 100,
         },
         {
-          surface: "15",
+          surface: "14",
           label: "carnolist",
           name: "车号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "16",
+          surface: "15",
           label: "carcorPid",
           name: "车队名称",
           checked: 0,
           width: 100,
         },
         {
-          surface: "17",
+          surface: "16",
           label: "billStatus",
           name: "状态",
           checked: 0,
           width: 100,
         },
         {
-          surface: "18",
+          surface: "17",
           label: "remarks",
           name: "备注",
           checked: 0,
           width: 100,
         },
+        {
+          surface: "18",
+          label: "cntrQty",
+          name: "调度数量",
+          checked: 0,
+          width: 100,
+        },
       ],
       getRowList: [
         {
@@ -642,53 +642,53 @@ export default {
         },
         {
           surface: "12",
-          label: "cntrDesc",
-          name: "箱型箱量",
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "13",
-          label: "qtyDisPatch",
+          label: "carQty",
           name: "已安排箱量",
           checked: 0,
           width: 100,
         },
         {
-          surface: "14",
+          surface: "13",
           label: "cntrName",
           name: "箱型",
           checked: 0,
           width: 100,
         },
         {
-          surface: "15",
+          surface: "14",
           label: "carnolist",
           name: "车号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "16",
+          surface: "15",
           label: "carcorPid",
           name: "车队名称",
           checked: 0,
           width: 100,
         },
         {
-          surface: "17",
+          surface: "16",
           label: "billStatus",
           name: "状态",
           checked: 0,
           width: 100,
         },
         {
-          surface: "18",
+          surface: "17",
           label: "remarks",
           name: "备注",
           checked: 0,
           width: 100,
         },
+        {
+          surface: "18",
+          label: "cntrQty",
+          name: "调度数量",
+          checked: 0,
+          width: 100,
+        },
       ],
       allCheck: false,
       title: "",

src/views/track/meetSingle/index.vue

@@ -71,7 +71,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-      
+
       </el-row>
       <el-collapse-transition>
         <div v-show="show">
@@ -93,7 +93,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-            
+
             <el-col :span="6">
               <el-form-item label-width="100px" label="货品名称" prop="goodsId">
                 <el-select
@@ -468,7 +468,7 @@ export default {
         {
           surface: "7",
           label: "mblno",
-          name: "运单号",
+          name: "提单号",
           checked: 0,
           width: 100,
            fixed: "left",
@@ -550,6 +550,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
       ],
       getRowList: [
         {
@@ -597,7 +604,7 @@ export default {
         {
           surface: "7",
           label: "mblno",
-          name: "运单号",
+          name: "提单号",
           checked: 0,
           width: 100,
            fixed: "left",
@@ -679,6 +686,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
       ],
       allCheck: false,
       title: "",