@logwire/logwire-wms-pda-ui 3.3.2 → 3.3.4

package/src/views/vin/page/maintain/task/scan.vue

@@ -99,31 +99,39 @@
 
       <lw-button
         :disabled="btnNum.disabled"
-        @click="overTask"
+        @click="overTask()"
       >
         {{ $lwLanguage.get('', '完成维护 ( {has} / {all} ) ', {...btnNum}) }}
       </lw-button>
 
     </lw-bottom-bar>
 
+    <move-popup
+      v-model="showMovePopup"
+      :location-code="locationCode"
+      @confirm="movePopupConfirm"
+    />
+
   </div>
 </template>
 
 <script>
 
 import taskActionItem from "./../components/taskActionItem.vue";
+import movePopup from "./components/movePopup.vue";
 import {action} from "./mixins/action.js";
 import {wmsVinMobileMaintainGetTask, wmsVinMobileMaintainSubmitTask} from "./../../../api/maintain/task";
 
 export default {
   name: "lwVinMaintainScanIndex",
   components: {
-    taskActionItem
+    taskActionItem,
+    movePopup,
   },
   mixins: [action],
   data() {
     return {
-      
+
       vin: {
         value: '',
         focus: true,
@@ -132,7 +140,11 @@ export default {
       // 是否显示维护填写项
       showModel: false,
 
-      taskList: []
+      taskList: [],
+
+      // 是否移位
+      showMovePopup: false,
+      locationCode: '',
     }
   },
   mounted() {
@@ -158,18 +170,23 @@ export default {
         this.vin.copy = vin
         this.showModel = true
         this.taskList = res.groupList
+        this.locationCode = res.locationCode || ''
+        this.hasMove = res.hasMove
       })
     },
 
     // 完成维护点击
-    overTask() {
+    overTask(locationCode) {
       const {success, data} = this.getResultData()
       if (!success) return
 
+      if (this.hasMove) return this.showMovePopup = true
+
       wmsVinMobileMaintainSubmitTask({
         vin: this.vin.copy,
         staffList: this.staffCodeList,
-        itemList: data
+        itemList: data,
+        locationCode
       }).then(() => {
 
         this.$lwToast.success(
@@ -180,8 +197,14 @@ export default {
         this.taskList = []
         this.vin.value = ''
         this.vin.focus = true
+        this.showMovePopup = false
 
       })
+    },
+
+    movePopupConfirm(loc) {
+      this.hasMove = false
+      this.overTask(loc)
     }
   }
 }

package/src/views/vin/page/outbound/delivery/action.vue

@@ -182,7 +182,7 @@
         :columns="changeInfoPopup.carrierList"
         label-key="carrierCode"
         value-key="carrierCode"
-        @confirm="item => changeInfoPopup.form.carrierId = item.carrierId"
+        @confirm="carrierConfirm"
         @clear="changeInfoPopup.form.carrierId = ''"
       />
       <lw-input
@@ -322,6 +322,11 @@ export default {
         this.changeInfoPopup.show = true
       })
     },
+    // 修改信息弹框 - 承运商确认
+    carrierConfirm(item) {
+      this.changeInfoPopup.form.carrierId = item.carrierId
+      this.changeInfoPopup.form.carrierName = item.carrierName
+    },
     // 修改信息弹框 - 提交数据
     changeInfoPopupSubmit() {
       projectVinPDAOutboundDeliveryUpdate({
@@ -329,7 +334,7 @@ export default {
         ...this.changeInfoPopup.form
       }).then(() => {
         this.$lwToast.success(
-          this.$lwLanguage.get('wms_project.pda.vin.page.outbound.delivery.action.kfivawyx','已修改')
+          this.$lwLanguage.get('wms_project.pda.vin.page.outbound.delivery.action.kfivawyx', '已修改')
         )
         this.changeInfoPopup.show = false
         this.getOrderData()