Merge branch 'pre-release'

src/views/ecw/box/shippingAir/nodePage/cabinet/startPacking.vue

@@ -67,6 +67,12 @@
                   </div>
                 </template>
               </el-table-column>
+              <el-table-column :label="$t('关联单')" align="center" prop="hasRelationOrder" width="120">
+                <template slot-scope="scope">
+                  <el-link type="primary" v-if="scope.row.hasRelationOrder" @click.native="showRelatedOrder(scope.row)">{{ $t('有') }}</el-link>
+                  <span v-else>{{ $t('无') }}</span>
+                </template>
+              </el-table-column>
               <el-table-column :label="$t('计划箱数')" align="center" prop="num">
                 <template slot-scope="scope">
                   {{getTotlContent(scope.row,['num'])}}
@@ -74,7 +80,7 @@
               </el-table-column>
               <el-table-column :label="$t('实装箱数')" align="center" prop="installNum">
                 <template slot-scope="scope">
-                  {{ scope.row.installNum }}{{$t('箱')}}
+                  {{ scope.row.installNum }}{{$t('箱')}}<span v-if="scope.row.mixStatus === 1">（{{$t('混箱')}}）</span>
                 </template>
               </el-table-column>
               <el-table-column :label="$t('体积')" align="center" prop="volume">
@@ -237,12 +243,15 @@
       <!-- 拆单 -->
       <splitOrder v-bind="$attrs" v-on="$listeners" :shipmentObj="shipmentObj" v-if="dialogConfig.type === 'splitOrder' && dialogConfig.dialogVisible" :currRow="currRow" @closeDialog2="closeDialog2" />
     </el-dialog>
+    <!-- 关联单 -->
+    <realated-order :orderItemId="showRelatedItemId" v-if="showRelatedItemId" @close="showRelatedItemId=null"></realated-order>
   </div>
 </template>
 
 <script>
 import dayjs from "dayjs";
 import supplementOrder from "./supplementOrder.vue";
+import RealatedOrder from "../../../shippingSea/nodePage/tally/realatedOrder.vue";
 import { getCabinetPage } from "@/api/ecw/cabinet";
 import { getbox } from "@/api/ecw/box";
 import {
@@ -280,12 +289,14 @@ export default {
     supplementOrder,
     splitOrder,
     WorkFlow,
+    RealatedOrder,
   },
   props: {
     shipmentObj: Object,
   },
   data() {
     return {
+      showRelatedItemId: null,
       // 表格数据
       listData: [],
       // 表格数据
@@ -524,6 +535,10 @@ export default {
         });
       }
     },
+    // 显示关联单
+    showRelatedOrder(row) {
+      this.showRelatedItemId = row.orderId
+    },
     /* 移出 */
     moveOut(row) {
       let params = {

src/views/ecw/box/shippingAir/nodePage/cabinet/supplementOrder.vue

@@ -354,6 +354,7 @@ export default {
       createSection({
         shipmentId: this.$attrs.shipmentObj.id,
         isCover: 1,
+        isTally: this.$attrs.shipmentObj.isTally
       }).then((res) => {
         serviceMsg(res, this).then(() => {
           this.getSecGoods();

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

@@ -132,6 +132,7 @@
               </el-table-column>
               <el-table-column :label="$t('操作')" align="center" width="160" class-name="small-padding fixed-width" fixed="right">
                 <template slot-scope="scope">
+                  <el-button type="text" size="small" @click="supplementClick('supplementOrder',$t('补单'))">{{$t('补单')}}</el-button>
                   <el-button :disabled="shipmentObj.approvaling" type="text" size="small" @click="tallyClick('single',scope.row)">{{$t('理货')}}</el-button>
                   <el-button :disabled="shipmentObj.approvaling" type="text" size="small" @click="removeClick('single',scope.row)">{{$t('移出')}}</el-button>
                   <el-button type="text" size="small" @click="currentTurnExceptionOrder=scope.row">{{$t('转异')}}</el-button>
@@ -149,7 +150,9 @@
     </el-row>
     <!-- 对话框 -->
     <el-dialog custom-class="shipping-dialog" :title="dialogConfig.title" :visible.sync="dialogConfig.dialogVisible" :fullscreen="dialogConfig.fullscreen" :width="dialogConfig.width" :modal-append-to-body=false append-to-body>
-      <batchTally v-if="dialogConfig.dialogVisible" v-bind="$attrs" @closeDialog="closeDialog" :type="dialogConfig.type" :tallyRows="tallyRows" :shipmentObj="shipmentObj" />
+      <!-- 补单 -->
+      <supplementOrder v-if="dialogConfig.type === 'supplementOrder' && dialogConfig.dialogVisible" v-bind="$attrs" :shipmentObj="shipmentObj" @supplementFinish="supplementFinish" />
+      <batchTally v-if="dialogConfig.type !== 'supplementOrder' && dialogConfig.dialogVisible" v-bind="$attrs" @closeDialog="closeDialog" :type="dialogConfig.type" :tallyRows="tallyRows" :shipmentObj="shipmentObj" />
     </el-dialog>
     <warehouse-detail :order="order" :orderItemId="showWarehouseInItemId" v-if="showWarehouseInItemId" @close="showWarehouseInItemId=null" />
     <exception
@@ -241,6 +244,7 @@
 </template>
 
 <script>
+import supplementOrder from "../cabinet/supplementOrder.vue";
 import batchTally from "./batchTally.vue";
 import { getTallyList, tallyRemove, tallyCommit, getOrderDetailByBoxNo } from "@/api/ecw/boxSea";
 import { checkInfoSingleCreate, checkInfoBatchCreate, getOrderTagList, checkInfoSingleDelete, checkInfoBatchDelete } from "@/api/ecw/boxAir";
@@ -255,6 +259,7 @@ export default {
   inheritAttrs: false,
   components: {
     Exception,
+    supplementOrder,
     batchTally,
     WarehouseDetail,
     RealatedOrder,
@@ -397,6 +402,15 @@ export default {
     checkboxSelect(selection) {
       this.selectedRows = selection;
     },
+    /** 点击补单 */
+    supplementClick(type, title) {
+      this.shipmentObj.isTally = 1
+      this.showDialog(type);
+    },
+    /* 补单完成 */
+    supplementFinish() {
+      this.closeDialog();
+    },
     // 理货点击
     tallyClick(type, data) {
         if(this.shipmentObj.approvaling){
@@ -486,11 +500,17 @@ export default {
     // 打开弹窗
     showDialog(type) {
       switch (type) {
+        case "supplementOrder":
+          this.$set(this.dialogConfig, "fullscreen", true);
+          this.$set(this.dialogConfig, "title", this.$t("补单"));
+          break;
         case "batchTally":
+        this.$set(this.dialogConfig, "fullscreen", false);
           this.$set(this.dialogConfig, "title", this.$t("批量理货"));
           this.$set(this.dialogConfig, "width", "500px");
           break;
         case "singleTally":
+          this.$set(this.dialogConfig, "fullscreen", false);
           this.$set(this.dialogConfig, "title", this.$t("理货确认"));
           this.$set(this.dialogConfig, "width", "500px");
           break;

src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue

@@ -67,6 +67,12 @@
                   </div>
                 </template>
               </el-table-column>
+              <el-table-column :label="$t('关联单')" align="center" prop="hasRelationOrder" width="120">
+                <template slot-scope="scope">
+                  <el-link type="primary" v-if="scope.row.hasRelationOrder" @click.native="showRelatedOrder(scope.row)">{{ $t('有') }}</el-link>
+                  <span v-else>{{ $t('无') }}</span>
+                </template>
+              </el-table-column>
               <el-table-column :label="$t('计划箱数')" align="center" prop="num">
                 <template slot-scope="scope">
                   {{getTotlContent(scope.row,['num'])}}
@@ -74,7 +80,7 @@
               </el-table-column>
               <el-table-column :label="$t('实装箱数')" align="center" prop="installNum">
                 <template slot-scope="scope">
-                  {{ scope.row.installNum }}{{$t('箱')}}
+                  {{ scope.row.installNum }}{{$t('箱')}}<span v-if="scope.row.mixStatus === 1">（{{$t('混箱')}}）</span>
                 </template>
               </el-table-column>
               <el-table-column :label="$t('体积')" align="center" prop="volume">
@@ -237,12 +243,15 @@
       <!-- 拆单 -->
       <splitOrder v-bind="$attrs" v-on="$listeners" :shipmentObj="shipmentObj" v-if="dialogConfig.type === 'splitOrder' && dialogConfig.dialogVisible" :currRow="currRow" @closeDialog2="closeDialog2" />
     </el-dialog>
+    <!-- 关联单 -->
+    <realated-order :orderItemId="showRelatedItemId" v-if="showRelatedItemId" @close="showRelatedItemId=null"></realated-order>
   </div>
 </template>
 
 <script>
 import dayjs from "dayjs";
 import supplementOrder from "./supplementOrder.vue";
+import RealatedOrder from "../tally/realatedOrder.vue";
 import { getCabinetPage } from "@/api/ecw/cabinet";
 import { getbox } from "@/api/ecw/box";
 import {
@@ -280,12 +289,14 @@ export default {
     supplementOrder,
     splitOrder,
     WorkFlow,
+    RealatedOrder,
   },
   props: {
     shipmentObj: Object,
   },
   data() {
     return {
+      showRelatedItemId: null,
       // 表格数据
       listData: [],
       // 表格数据
@@ -524,6 +535,10 @@ export default {
         });
       }
     },
+    // 显示关联单
+    showRelatedOrder(row) {
+      this.showRelatedItemId = row.orderId
+    },
     /* 移出 */
     moveOut(row) {
       let params = {

src/views/ecw/box/shippingSea/nodePage/cabinet/supplementOrder.vue

@@ -387,6 +387,7 @@ export default {
       createSection({
         shipmentId: this.$attrs.shipmentObj.id,
         isCover: 1,
+        isTally: this.$attrs.shipmentObj.isTally
       }).then((res) => {
         serviceMsg(res, this).then(() => {
           this.getSecGoods();

src/views/ecw/box/shippingSea/nodePage/tally/index.vue

@@ -120,6 +120,7 @@
               </el-table-column>
               <el-table-column :label="$t('操作')" align="center" width="160" class-name="small-padding fixed-width" fixed="right">
                 <template slot-scope="scope">
+                  <el-button type="text" size="small" @click="supplementClick('supplementOrder',scope.row)">{{$t('补单')}}</el-button>
                   <el-button type="text" size="small" @click="tallyClick('single',scope.row)">{{$t('理货')}}</el-button>
                   <el-button type="text" size="small" @click="removeClick('single',scope.row)">{{$t('移出')}}</el-button>
                 </template>
@@ -136,14 +137,17 @@
     </el-row>
     <!-- 对话框 -->
     <el-dialog custom-class="shipping-dialog" :title="dialogConfig.title" :visible.sync="dialogConfig.dialogVisible" :fullscreen="dialogConfig.fullscreen" :width="dialogConfig.width" :modal-append-to-body=false append-to-body>
-      <batchTally v-if="dialogConfig.dialogVisible" v-bind="$attrs" @closeDialog="closeDialog" :type="dialogConfig.type" :tallyRows="tallyRows" :shipmentObj="shipmentObj" />
+      <!-- 补单 -->
+      <supplementOrder v-if="dialogConfig.type === 'supplementOrder' && dialogConfig.dialogVisible" v-bind="$attrs" :shipmentObj="shipmentObj" @supplementFinish="supplementFinish" />
+      <batchTally v-if="dialogConfig.type !== 'supplementOrder' && dialogConfig.dialogVisible" v-bind="$attrs" @closeDialog="closeDialog" :type="dialogConfig.type" :tallyRows="tallyRows" :shipmentObj="shipmentObj" />
     </el-dialog>
     <warehouse-detail :order="order" :orderItemId="showWarehouseInItemId" v-if="showWarehouseInItemId" @close="showWarehouseInItemId=null" />
-    <realated-order :order="order" :orderItemId="showRelatedItemId" v-if="showRelatedItemId" @close="showRelatedItemId=null"></realated-order>
+    <realated-order :orderItemId="showRelatedItemId" v-if="showRelatedItemId" @close="showRelatedItemId=null"></realated-order>
   </div>
 </template>
 
 <script>
+import supplementOrder from "../cabinet/supplementOrder.vue";
 import batchTally from "./batchTally.vue";
 import { getTallyList, tallyRemove, tallyCommit } from "@/api/ecw/boxSea";
 import { formatDate, serviceMsg } from "../../utils";
@@ -155,6 +159,7 @@ export default {
   name: "tally",
   inheritAttrs: false,
   components: {
+    supplementOrder,
     batchTally,
     WarehouseDetail,
     RealatedOrder,
@@ -253,6 +258,15 @@ export default {
     checkboxSelect(selection) {
       this.selectedRows = selection;
     },
+    /** 点击补单 */
+    supplementClick(type, title) {
+      this.shipmentObj.isTally = 1
+      this.showDialog(type);
+    },
+    /* 补单完成 */
+    supplementFinish() {
+      this.closeDialog();
+    },
     // 理货点击
     tallyClick(type, data) {
       if (type === "batch") {
@@ -339,11 +353,17 @@ export default {
     // 打开弹窗
     showDialog(type) {
       switch (type) {
+        case "supplementOrder":
+          this.$set(this.dialogConfig, "fullscreen", true);
+          this.$set(this.dialogConfig, "title", this.$t("补单"));
+          break;
         case "batchTally":
+          this.$set(this.dialogConfig, "fullscreen", false);
           this.$set(this.dialogConfig, "title", this.$t("批量理货"));
           this.$set(this.dialogConfig, "width", "500px");
           break;
         case "singleTally":
+          this.$set(this.dialogConfig, "fullscreen", false);
           this.$set(this.dialogConfig, "title", this.$t("理货确认"));
           this.$set(this.dialogConfig, "width", "500px");
           break;