Merge branch 'release' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into release

src/views/ecw/box/ladingBill/index.vue

@@ -195,14 +195,14 @@ export default {
         this.getBillList();
       }
     },
-    handleCommand(type, row) {
+    async handleCommand(type, row) {
       this.handleType = type;
       switch (type) {
         case "previewBill":
           this.getBill(row);
           break;
         case "makeBill":
-          this.makeBill(row);
+          await this.makeBill(row);
           break;
         case "queryBill":
           this.getBill(row);
@@ -236,9 +236,10 @@ export default {
       this.$set(this.dialogCfg, "width", "1200px");
       this.$set(this.dialogCfg, "visible", true);
     },
-    makeBill(row) {
+    async makeBill(row) {
       let api = this.type != 'air' ? makeBillService : makeAirBillService;
-      api({
+      let loading = this.$loading()
+      await api({
         orderId: row.orderId,
         shipmentId: this.shipmentObj.id,
       }).then((res) => {
@@ -249,6 +250,10 @@ export default {
           billContent,
           orderNo: this.currRow.orderNo,
         };
+      }).catch(() => {
+        throw new Error('制作提单失败')
+      }).finally(() => {
+        loading.close()
       });
     },
     getBill(row) {

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

@@ -38,7 +38,11 @@
           <el-row style="margin-top: 5px">
             <el-table border :data="pagList" max-height="600px">
               <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('箱号')" align="center" prop="pkgNum">
+                <template slot-scope="scope"> 
+                  <el-button type="text" @click="showPageOrder(scope.row)">{{scope.row.pkgNum}}</el-button>
+                </template>
+              </el-table-column>
               <el-table-column :label="$t('尺寸')" align="center">
                 <template slot-scope="scope"> {{ scope.row.pkgLength }}*{{ scope.row.pkgWidth }}*{{ scope.row.pkgHight }} </template>
               </el-table-column>
@@ -118,6 +122,16 @@
           <print-tag v-if="printdialogVisible" :tagData="tagData" />
         </el-dialog>
 
+        <!-- 查看已装箱订单 -->
+        <el-dialog :title="showPageTitle" :visible.sync="showPagedialogVisible" :fullscreen="true" :modal-append-to-body="false" append-to-body @close="pkgPageType=0">
+          <div class="flex">
+            <el-radio-group v-model="pkgPageType">
+              <el-radio-button :label="2">{{ $t('已装箱列表') }}</el-radio-button>
+            </el-radio-group>
+          </div>
+          <pkg-page :pkgData="showPkgData" :shipmentObj="shipmentObj" flag="show" @closeDialog="closeDialog" @reload="getList" />
+        </el-dialog>
+
         <el-row style="margin-top: 15px" class="operate-button">
           <el-button :disabled="shipmentObj.approvaling" size="small" type="primary" @click="finish">{{ $t('完成') }}</el-button>
           <el-button size="small" @click="$emit('closeDialog')">{{ $t('取消') }}</el-button>
@@ -186,7 +200,10 @@ export default {
       printdialogVisible: false,
       tagData: {},
       // 是否显示补单弹层
-      showPackDialog: false
+      showPackDialog: false,
+      showPagedialogVisible: false,
+      showPageTitle: '',
+      showPkgData: {}
     }
   },
   created() {
@@ -260,6 +277,11 @@ export default {
       this.pkgPageTitle = this.$t('合包箱号: ') + row.pkgNum
       this.pkgData = row
     },
+    showPageOrder(row) {
+      this.showPagedialogVisible = true
+      this.showPageTitle = this.$t('合包箱号: ') + row.pkgNum
+      this.showPkgData = row
+    },
     printTag(id) {
       getMergeTagById(id).then(res=>{
         this.tagData = res.data

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

 <template>
   <div>
     <el-row style="margin-top: 25px">
-      <el-row>
+      <el-row v-if="flag == 'edit'">
         <el-button size="small" type="primary" @click="removeBatch">{{ $t('批量移出合包') }}</el-button>
         <el-button size="small" type="primary" @click="sealBox">{{ $t('封箱') }}</el-button>
       </el-row>
@@ -137,6 +137,10 @@ export default {
   props: {
     pkgData: Object,
     shipmentObj: Object,
+    flag: {
+      type: String,
+      default: 'edit'
+    }
   },
   components: {
     printTag