@logwire/logwire-wms-pda-ui 3.5.4 → 3.5.5-wat.2

package/src/views/wms/page/outbound/cancelPickLpn/action.vue

@@ -54,6 +54,7 @@
               />
 
               <abn-info
+                auth-code="/wms/pda/outbound/pick.btn.cancelPickAbnormal"
                 ref="lpnAbn"
                 :current-loc-code="lpnInfo[0]?.locList[0]?.locCode"
               />
@@ -178,6 +179,7 @@
         />
 
         <abn-info
+          auth-code="/wms/pda/outbound/pick.btn.cancelPickAbnormal"
           ref="skuAbn"
           :current-loc-code="skuCancelPopup.data.locCode"
         />

package/src/views/wms/page/outbound/cancelPickLpn/components/abnInfo.vue

@@ -4,7 +4,7 @@
   @date: 2024-04-11
 -->
 <template>
-  <div>
+  <div v-permissions="permissionCode">
     <div
       class="lw-global-flex-between"
       :class="[abnormal ? 'lw-global-row' : 'lw-global-row-end']"
@@ -57,7 +57,7 @@
       />
 
       <!-- 图片 -->
-      <div class="lw-global-title" style="padding: 8px 0">
+      <div class="lw-global-title" style="padding: 8px 0" :class="mustUploadImg ? 'lw-global-title lw-global-required' : 'lw-global-title' ">
         {{ $lwLanguage.get('', '图片') }}
       </div>
       <lw-img-upload v-model="imagesArr"/>
@@ -74,8 +74,20 @@ import {projectWmsMobileAbnormalDefaultLocation} from "../../../../api/common";
 export default {
   name: "abnInfo",
   props: {
+    authSuffixCode: {
+      type: String,
+      default: null,
+    },
+    authCode: {
+      type: String,
+      default: null,
+    },
     // 当前库位的编码
-    currentLocCode: String
+    currentLocCode: String,
+    mustUploadImg: {
+      type: Boolean,
+      default: false,
+    }
   },
   data() {
     return {
@@ -93,6 +105,9 @@ export default {
       remark: ''
     }
   },
+  mounted() {
+    this.mustUploadImg = this.$lwWarehouseConfig.get('systemConfig.WAREHOUSE_SUBMIT_ABNORMAL_MUST_UPLOAD_IMAGE') === 'true'
+  },
   methods: {
     // 异常上报开关变化
     abnormalChange() {
@@ -154,6 +169,18 @@ export default {
         }
       }
 
+      if (this.mustUploadImg) {
+        if (!this.imagesArr || this.imagesArr.length <= 0){
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('wms_project.pda.module.inboundAbn.abnImgArrNull','异常图片不能为空')
+          )
+          return {
+            success: false,
+            data: {}
+          }
+        }
+      }
+
       return {
         success: true,
         data: {
@@ -177,6 +204,15 @@ export default {
       this.remark = ''
       this.imagesArr = []
       this.abnormal = false
+    },
+    permissionCode() {
+      if (!this.authCode && !this.authSuffixCode) return
+      if (this.authCode) {
+        return this.authCode
+      }
+      if (this.authSuffixCode) {
+        return '/wms/pda' + this.$route.path + '.btn.' + this.authSuffixCode
+      }
     }
   }
 }

package/src/views/wms/page/outbound/components/pickMoreSkuAbnLackPopup.vue

@@ -144,7 +144,9 @@
       />
 
       <template #button>
-        <lw-button @click="lackConfirm">
+        <lw-button
+          auth-code="/wms/pda/outbound/pick.btn.pickLack"
+          @click="lackConfirm">
           {{ $lwLanguage.get('', '确认') }}
         </lw-button>
       </template>

package/src/views/wms/page/outbound/containerOut/index.vue

@@ -83,6 +83,7 @@
                         v-model="out.customerId"
                         input-align="right"
                         required
+                        init-list-only-one-selected
                         @confirm="customConfirm"
                         @clear="customClear"
                       />
@@ -94,7 +95,7 @@
                         v-if="addressList.length"
                         :title="$lwLanguage.get('', '地址')"
                         v-model="out.addressId"
-                        :columns="customerList"
+                        :columns="addressList"
                         required
                         value-key="id"
                         label-key="name"
@@ -110,6 +111,7 @@
                         v-model="out.addressId"
                         input-align="right"
                         required
+                        init-list-only-one-selected
                         @confirm="addressConfirm"
                         @clear="addressClear"
                       />
@@ -396,6 +398,13 @@ export default {
         if (this.out.carrierCode) {
           this.$nextTick(() => this.$refs.carrier.formatDataAndDisabled({}, res.carrierCode + '/' + res.carrierName))
         }
+
+        if (this.customerList.length === 1) {
+          this.out.customerId = this.customerList[0].id
+        }
+        if (this.addressList.length === 1) {
+          this.out.addressId = this.addressList[0].id
+        }
       })
     },
     // 运单号清空