修复空运的一些bug

src/views/ecw/box/shippingAir/nodePage/mergePkg/index.vue

@@ -34,14 +34,14 @@
           </el-row>
           <el-row style="margin-top: 5px">
             <el-table border :data="pagList" max-height="600px">
-              <el-table-column align="center" :label="$t('序号')" width="50" prop="tidanNum" />
+              <el-table-column align="center" :label="$t('序号')" width="50" type="index" />
               <el-table-column :label="$t('箱号')" align="center" prop="pkgNum" />
-              <el-table-column :label="$t('尺寸')" width="250px" align="center">
+              <el-table-column :label="$t('尺寸')" align="center">
                 <template slot-scope="scope"> {{ scope.row.pkgLength }}*{{ scope.row.pkgWidth }}*{{ scope.row.pkgHight }} </template>
               </el-table-column>
-              <el-table-column :label="$t('订单数')" width="250px" align="center" prop="orderCount" />
-              <el-table-column :label="$t('箱数')" width="250px" align="center" prop="sumCount" />
-              <el-table-column :label="$t('入仓体积')" width="250px" align="center" prop="sumVolume" />
+              <el-table-column :label="$t('订单数')" align="center" prop="orderCount" />
+              <el-table-column :label="$t('箱数')" align="center" prop="sumCount" />
+              <el-table-column :label="$t('入仓体积')" align="center" prop="sumVolume" />
               <el-table-column :label="$t('入仓重量')" align="center" prop="sumWeight" />
               <el-table-column :label="$t('入仓数量（个）')" align="center" prop="sumQuantity" />
               <el-table-column :label="$t('状态')" align="center" prop="tallyStatus">
@@ -49,12 +49,12 @@
                   {{ statusData[scope.row.status] }}
                 </template>
               </el-table-column>
-              <el-table-column :label="$t('创建时间')" align="center">
+              <el-table-column :label="$t('创建时间')" align="center" width="200px">
                 <template slot-scope="scope">
                   {{ formatDate(scope.row.createTime, 'YYYY-MM-DD HH:mm:ss') }}
                 </template>
               </el-table-column>
-              <el-table-column :label="$t('操作')" align="center" width="260" class-name="small-padding fixed-width">
+              <el-table-column :label="$t('操作')" align="center" width="260" class-name="small-padding fixed-width" fixed="right">
                 <template slot-scope="scope">
                   <el-button v-if="scope.row.status == 1" type="text" size="small" @click="editMerge(scope.row)">{{ $t('编辑') }}</el-button>
                   <el-button type="text" size="small" @click="pkgPage(scope.row)">{{ $t('装箱') }}</el-button>
@@ -63,6 +63,8 @@
                 </template>
               </el-table-column>
             </el-table>
+            <!-- 分页组件 -->
+            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows" @pagination="getList" />
           </el-row>
         </el-row>
         <!-- 新增合包箱 -->
@@ -76,18 +78,18 @@
             </el-form-item>
             <el-row>
               <el-col :span="8">
-                <el-form-item :label="$t('长')" prop="pkgLength">
-                  <el-input-number v-model="addMergeForm.pkgLength" :controls="false" :precision="2" style="width: 100px" />
+                <el-form-item :label="$t('长')" prop="pkgLength" :rules="[{ validator: validatorPositiveNumber, message: $t('格式错误'), trigger: 'blur'}]">
+                  <el-input v-model="addMergeForm.pkgLength" style="width: 100px" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item :label="$t('宽')" prop="pkgWidth">
-                  <el-input-number v-model="addMergeForm.pkgWidth" :controls="false" :precision="2" style="width: 100px" />
+                <el-form-item :label="$t('宽')" prop="pkgWidth" :rules="[{ validator: validatorPositiveNumber, message: $t('格式错误'), trigger: 'blur'}]">
+                  <el-input v-model="addMergeForm.pkgWidth" style="width: 100px" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item :label="$t('高')" prop="pkgHight">
-                  <el-input-number v-model="addMergeForm.pkgHight" :controls="false" :precision="2" style="width: 100px" />
+                <el-form-item :label="$t('高')" prop="pkgHight" :rules="[{ validator: validatorPositiveNumber, message: $t('格式错误'), trigger: 'blur'}]">
+                  <el-input v-model="addMergeForm.pkgHight" style="width: 100px" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -133,7 +135,16 @@ export default {
     printTag
   },
   data() {
+    let validatorPositiveNumber = (rule, value, callback) => {
+        if(!value || value == '')return callback();
+        if (!value) return callback(new Error('请输入数字'))
+        if (!Number(value)) return callback(new Error('请输入有效数字'))
+        let reg = /((^[1-9]\d*)|^0)(\.\d*){0,1}$/;
+        if (!reg.test(value)) return callback(new Error('请输入有效数字'));
+        callback();
+    }
     return {
+      validatorPositiveNumber,
       pagList: [],
       statusData: ['', '未装箱', '装箱中', '已封箱'],
       // 查询参数
@@ -142,6 +153,7 @@ export default {
         rows: 10,
         shipmentId: this.$attrs.shipmentObj.id
       },
+      total: 0,
       // 出货信息
       shipmentObj: this.$attrs.shipmentObj,
       addMergedialogVisible: false,
@@ -173,6 +185,7 @@ export default {
     getList() {
       getMergePkgList(this.queryParams).then((res) => {
         this.pagList = res.data.list
+        this.total = res.data.total
       })
     },
     editMerge(row) {

src/views/ecw/box/shippingAir/seaProcess.vue

@@ -139,7 +139,7 @@ export default {
     },
     /** 节点点击 */
     nodeClick(currIndex, node) {
-      if (!checkPermi(['box:'+node.type+':action'])) {
+      if (!checkPermi(['boxAir:'+node.type+':action'])) {
         this.$message.error(this.$t("没有此操作的权限"));
         return;
       }
@@ -240,6 +240,11 @@ export default {
             continue;
           }
 
+          //合包非必须步骤
+          if (type === "mergePkg"){
+            ++nodeIndex;
+          }
+
           const { start, wait, end } = status;
 
           if (start.includes(val[keyName])) {