@logwire/logwire-wms-pda-ui 3.4.0 → 3.5.0

package/src/views/wms/page/inner/disposeAbnormal/components/abnInfo/index.vue

@@ -54,7 +54,7 @@
     <div class="lw-global-row lw-global-flex-between">
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.oflhtikg','上报数量')"
-        :value="item.qty"
+        :value="item.qtyLabel"
         val-bold
         :is-row="false"
         val-size="16px"
@@ -62,7 +62,7 @@
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.ktpjecnw','确认数量')"
-        :value="item.confirmQty"
+        :value="item.confirmQtyLabel"
         val-bold
         val-red
         :is-row="false"
@@ -71,7 +71,7 @@
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.ylkiggkg','问题区数量')"
-        :value="item.abnormalQty"
+        :value="item.abnormalQtyLabel"
         val-bold
         :is-row="false"
         val-size="16px"
@@ -110,7 +110,7 @@
       />
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.gxnkpiwj','发现人')"
-        :value="item.discoveryOpName || '-'"
+        :value="$lwCheckVal(item.discoveryOpName)"
         val-bold
         :is-row="false"
       />
@@ -123,7 +123,7 @@
       />
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.idwnuutg','确认人')"
-        :value="item.confirmName || '-'"
+        :value="$lwCheckVal(item.confirmName)"
         val-bold
         :is-row="false"
       />
@@ -136,7 +136,7 @@
       />
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.icurnmsi','处理人')"
-        :value="item.handleOpName || '-'"
+        :value="$lwCheckVal(item.handleOpName)"
         val-bold
         :is-row="false"
       />
@@ -147,7 +147,7 @@
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.musumpjv','货主')"
-        :value="item.ownerCode + '-' + item.ownerName"
+        :value="$lwCheckVal(item.ownerCode) + '-' + $lwCheckVal(item.ownerName)"
         val-bold
         :is-row="false"
       />
@@ -182,7 +182,7 @@
     <!-- 当前批次号 -->
     <div style="margin-top: 8px">
 
-      <div style="border: solid 1px #f0f0f0;border-radius: 5px">
+      <div style="border: solid 1px #f0f0f0;border-radius: 5px;padding: 5px">
         <lw-lot-look-module
           :columns="item.currentLotAttribute.items"
           hidden-last-border
@@ -194,7 +194,7 @@
     <!-- 原批次号 -->
     <div v-if="!lotEq" style="margin-top: 8px">
 
-      <div style="border: solid 1px #f0f0f0;border-radius: 5px">
+      <div style="border: solid 1px #f0f0f0;border-radius: 5px;padding: 5px">
         <lw-lot-look-module
           :columns="item.originaLotAttribute.items"
           hidden-last-border
@@ -207,63 +207,63 @@
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.jxclqprv','仓库')"
-        :value="(item.warehouseCode || '') + '-' + (item.warehouseName || '')"
+        :value="$lwCheckVal(item.warehouseCode) + '-' + $lwCheckVal(item.warehouseName)"
         val-bold
         :is-row="false"
       />
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.vkhgxdob','原库位')"
-        :value="item.originalLocationCode || '-'"
+        :value="$lwCheckVal(item.originalLocationCode)"
         val-bold
         :is-row="false"
       />
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.lanljmhw','原LPN')"
-        :value="item.originalLpn || '-'"
+        :value="$lwCheckVal(item.originalLpn)"
         val-bold
         :is-row="false"
       />
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.pelyxilo','原箱号')"
-        :value="item.originalCaseNum || '-'"
+        :value="$lwCheckVal(item.originalCaseNum)"
         val-bold
         :is-row="false"
       />
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.xnonkvtw','上报异常库位')"
-        :value="item.abnormalLocationCode || '-'"
+        :value="$lwCheckVal(item.abnormalLocationCode)"
         val-bold
         :is-row="false"
       />
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.jojqwohf','上报异常LPN')"
-        :value="item.abnormalLpn || '-'"
+        :value="$lwCheckVal(item.abnormalLpn)"
         val-bold
         :is-row="false"
       />
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.rusmjipo','当前库位')"
-        :value="item.currentLocationCode || '-'"
+        :value="$lwCheckVal(item.currentLocationCode)"
         val-bold
         :is-row="false"
       />
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.yhjfqeij','当前LPN')"
-        :value="item.lpn || '-'"
+        :value="$lwCheckVal(item.lpn)"
         val-bold
         :is-row="false"
       />
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.fkodukiu','当前箱号')"
-        :value="item.caseNum || '-'"
+        :value="$lwCheckVal(item.caseNum)"
         val-bold
         :is-row="false"
       />
@@ -274,63 +274,63 @@
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.pzbwnxet','ERP单号')"
-        :value="item.erpOrderNo || '-'"
+        :value="$lwCheckVal(item.erpOrderNo)"
         val-bold
         :is-row="false"
       />
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.abwdmtpe','凭证单号')"
-        :value="item.evidenceNo || '-'"
+        :value="$lwCheckVal(item.evidenceNo)"
         val-bold
         :is-row="false"
       />
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.skpztgoe','WMS单据类型')"
-        :value="item.bizOrderTypeLabel || '-'"
+        :value="$lwCheckVal(item.bizOrderTypeLabel)"
         val-bold
         :is-row="false"
       />
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.lzfhgjdg','WMS单据号')"
-        :value="item.bizOrderNo || '-'"
+        :value="$lwCheckVal(item.bizOrderNo)"
         val-bold
         :is-row="false"
       />
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.pahtbivy','外部业务单号')"
-        :value="item.extBizNo || '-'"
+        :value="$lwCheckVal(item.extBizNo)"
         val-bold
         :is-row="false"
       />
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.abzplybt','外部业务单号2')"
-        :value="item.extBizNo2 || '-'"
+        :value="$lwCheckVal(item.extBizNo2)"
         val-bold
         :is-row="false"
       />
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.yejryqnd','外部业务单号3')"
-        :value="item.extBizNo3 || '-'"
+        :value="$lwCheckVal(item.extBizNo3)"
         val-bold
         :is-row="false"
       />
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.wgejcxmd','供应商')"
-        :value="item.supplierCode + '-' + item.supplierName"
+        :value="$lwCheckVal(item.supplierCode,'') + '-' + $lwCheckVal(item.supplierName,'')"
         val-bold
         :is-row="false"
       />
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.dulchusg','承运商信息')"
-        :value="(item.carrierName || '') + '-' + (item.plateNumber || '')"
+        :value="$lwCheckVal(item.carrierName,'') + '-' + $lwCheckVal(item.plateNumber,'')"
         val-bold
         :is-row="false"
       />
@@ -348,7 +348,8 @@
         <div
           style="flex: 1"
           class="lw-global-value"
-        >{{ item.remark || '-' }}</div>
+        >{{ $lwCheckVal(item.remark) }}
+        </div>
 
       </div>
 
@@ -381,7 +382,8 @@
       <div
         style="flex: 1"
         class="lw-global-value"
-      >{{ item.confirmRemark || '-' }}</div>
+      >{{ $lwCheckVal(item.confirmRemark) }}
+      </div>
 
     </div>
 
@@ -389,7 +391,7 @@
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.mgpvyotp','反馈人')"
-        :value="item.feedbackOpName || '-'"
+        :value="$lwCheckVal(item.feedbackOpName)"
         val-bold
         :is-row="false"
       />
@@ -410,7 +412,8 @@
         <div
           style="flex: 1"
           class="lw-global-value"
-        >{{ item.feedbackRemark }}</div>
+        >{{ $lwCheckVal(item.feedbackRemark) }}
+        </div>
 
       </div>
     </div>
@@ -419,7 +422,7 @@
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.riuhwwma','处理方式')"
-        :value="item.handleMethodLabel || '-'"
+        :value="$lwCheckVal(item.handleMethodLabel)"
         val-bold
         :is-row="false"
       />
@@ -433,7 +436,9 @@
         <div
           style="flex: 1"
           class="lw-global-value"
-        >{{ item.handleRemark  || '-' }}</div>
+        >
+          {{ $lwCheckVal(item.handleRemark) }}
+        </div>
 
       </div>
     </div>
@@ -442,7 +447,7 @@
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.qabnchxw','系统处理方式')"
-        :value="item.systemHandleMethodLabel || '-'"
+        :value="$lwCheckVal(item.systemHandleMethodLabel)"
         val-bold
         :is-row="false"
       />
@@ -456,7 +461,9 @@
         <div
           style="flex: 1"
           class="lw-global-value"
-        >{{ item.systemHandleRemark  || '-' }}</div>
+        >
+          {{ $lwCheckVal(item.systemHandleRemark) }}
+        </div>
 
       </div>
     </div>
@@ -465,7 +472,7 @@
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.cqugrlrk','单据处理方式')"
-        :value="item.orderHandleMethodLabel || '-'"
+        :value="$lwCheckVal(item.orderHandleMethodLabel)"
         val-bold
         :is-row="false"
       />
@@ -479,7 +486,9 @@
         <div
           style="flex: 1"
           class="lw-global-value"
-        >{{ item.orderHandleRemark  || '-' }}</div>
+        >
+          {{ $lwCheckVal(item.orderHandleRemark) }}
+        </div>
 
       </div>
     </div>
@@ -488,7 +497,7 @@
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.swxwnzat','实物处理方式')"
-        :value="item.actualHandleMethodLabel || '-'"
+        :value="$lwCheckVal(item.actualHandleMethodLabel)"
         val-bold
         :is-row="false"
       />
@@ -502,7 +511,9 @@
         <div
           style="flex: 1"
           class="lw-global-value"
-        >{{ item.actualHandleRemark  || '-' }}</div>
+        >
+          {{ $lwCheckVal(item.actualHandleRemark) }}
+        </div>
 
       </div>
     </div>
@@ -511,7 +522,7 @@
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.fycqrhea','实物库存处理方式')"
-        :value="item.inventoryHandleMethodLabel || '-'"
+        :value="$lwCheckVal(item.inventoryHandleMethodLabel)"
         val-bold
         :is-row="false"
       />
@@ -525,7 +536,9 @@
         <div
           style="flex: 1"
           class="lw-global-value"
-        >{{ item.inventoryHandleRemark  || '-' }}</div>
+        >
+          {{ $lwCheckVal(item.inventoryHandleRemark) }}
+        </div>
 
       </div>
     </div>
@@ -534,7 +547,7 @@
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.abnInfo.qpfbcyfi','完结人')"
-        :value="item.closeOpName || '-'"
+        :value="$lwCheckVal(item.closeOpName)"
         val-bold
         :is-row="false"
       />
@@ -555,7 +568,9 @@
         <div
           style="flex: 1"
           class="lw-global-value"
-        >{{ item.closeRemark || '-' }}</div>
+        >
+          {{ $lwCheckVal(item.closeRemark) }}
+        </div>
 
       </div>
     </div>

package/src/views/wms/page/inner/disposeAbnormal/components/disposePopup/index.vue

@@ -35,6 +35,9 @@
         :placeholder="$lwLanguage.get('输入/扫描商品序列号','输入/扫描商品序列号')"
         :create-rule="$lwScanRule.create('异常记录-SN','SN')"
         rule-key="sn"
+        input-align="right"
+        :owner-id="abnormal.ownerId"
+        :rule-serve-query="abnormal"
         @confirm="scanSnConfirm"
       />
       <!-- 序列号显示 -->

package/src/views/wms/page/inner/disposeAbnormal/components/listItem/index.vue

@@ -77,7 +77,7 @@
           v-if="type==='waitConfirm'"
           style="flex-shrink: 0;text-align: center"
         >
-          <div class="lw-global-value-bold-red" style="font-size: 16px">{{item.qty}}</div>
+          <div class="lw-global-value-bold-red" style="font-size: 16px">{{ item.qtyLabel }}</div>
           <div class="lw-global-title">{{$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.zyyrsbfu','数量')}}</div>
         </div>
 
@@ -110,7 +110,7 @@
 
         <lw-title-value-cell
           :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.osbchiqv','上报数量')"
-          :value="item.qty"
+          :value="item.qtyLabel"
           val-bold
           :is-row="false"
           val-size="16px"
@@ -118,7 +118,7 @@
 
         <lw-title-value-cell
           :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.itkreqsg','确认数量')"
-          :value="item.confirmQty"
+          :value="item.confirmQtyLabel"
           val-bold
           val-red
           :is-row="false"
@@ -128,7 +128,7 @@
         <lw-title-value-cell
           v-if="type==='dispose'"
           :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.cfrdfzzx','处理数量')"
-          :value="item.handleQty"
+          :value="item.handleQtyLabel"
           val-bold
           :is-row="false"
           val-size="16px"
@@ -137,7 +137,7 @@
         <lw-title-value-cell
           v-if="type === 'waitDispose'"
           :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.listItem.index.avopyhzb','问题区数量')"
-          :value="item.abnormalQty"
+          :value="item.abnormalQtyLabel"
           val-bold
           :is-row="false"
           val-size="16px"

package/src/views/wms/page/inner/disposeAbnormal/components/searchBar/index.vue

@@ -14,6 +14,7 @@
         v-model="searchBox"
         :placeholder="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.components.searchBar.whpmtmge','通过异常编号、商品条码、库位编码')"
         rule-key="order"
+        rule-prefix="disposeAbnormalSearchBar"
         @confirm="searchBoxClick"
         @clear="searchBoxClear"
       >
@@ -67,6 +68,7 @@
         v-model="moreSearchInput.abnormalNo"
         input-align="right"
         rule-key="abnormalNo"
+        rule-prefix="disposeAbnormalSearchBar"
       />
 
       <!-- 商品条码 -->
@@ -75,6 +77,7 @@
         v-model="moreSearchInput.skuCode"
         input-align="right"
         rule-key="sku"
+        rule-prefix="disposeAbnormalSearchBar"
       />
 
       <!-- 库位编码 -->
@@ -83,6 +86,7 @@
         v-model="moreSearchInput.locationCode"
         input-align="right"
         rule-key="location"
+        rule-prefix="disposeAbnormalSearchBar"
       />
 
       <!-- 异常类型 -->
@@ -171,10 +175,10 @@ export default {
       }
 
       if (this.showAbnArea){
-        return '359px'
+        return '305px'
       }
 
-      return '315px'
+      return '275px'
     }
   },
   data() {

package/src/views/wms/page/inner/disposeAbnormal/index/index.vue

@@ -36,10 +36,10 @@
                 type="waitConfirm"
               />
 
-              <lw-pages
+              <lw-pagination
                 v-model="waitConfirm.pageNum"
                 :page-total="waitConfirm.total"
-                force-ellipses
+                :page-size.sync="waitConfirm.pageSize"
                 @change="getWaitConfirmData"
               />
             </template>
@@ -67,10 +67,10 @@
                 type="waitDispose"
               />
 
-              <lw-pages
+              <lw-pagination
                 v-model="waitDispose.pageNum"
                 :page-total="waitDispose.total"
-                force-ellipses
+                :page-size.sync="waitDispose.pageSize"
                 @change="getWaitDisposeData"
               />
             </template>
@@ -95,10 +95,10 @@
                 type="dispose"
               />
 
-              <lw-pages
+              <lw-pagination
                 v-model="dispose.pageNum"
                 :page-total="dispose.total"
-                force-ellipses
+                :page-size.sync="dispose.pageSize"
                 @change="getDisposeData"
               />
 
@@ -137,27 +137,30 @@ export default {
       tabActive:'waitConfirm',
 
       // 待确认的显示数据
-      waitConfirm:{
-        list:[],
+      waitConfirm: {
+        list: [],
         pageNum: 1,
+        pageSize: 10,
         total: 0,
-        searchData:{}
+        searchData: {}
       },
 
       // 待处理的显示数据
-      waitDispose:{
-        list:[],
+      waitDispose: {
+        list: [],
         pageNum: 1,
         total: 0,
-        searchData:{}
+        pageSize: 10,
+        searchData: {}
       },
 
       // 已处理的显示数据
-      dispose:{
-        list:[],
+      dispose: {
+        list: [],
         pageNum: 1,
         total: 0,
-        searchData:{}
+        pageSize: 10,
+        searchData: {}
       },
 
     }