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

package/src/views/wms/module/ReceiveAbnormal/index.vue

@@ -182,7 +182,7 @@
         v-if="showAddBtn"
         class="lw-global-model-box lw-global-flex-between"
       >
-        <div class="lw-global-value" style="font-size: 16px">
+        <div class="lw-global-value" style="font-size: 1.25rem">
           {{ $lwLanguage.get('wms_project.pda.module.receiveAbn.skuInfo','商品信息') }}
         </div>
 
@@ -203,7 +203,7 @@
 
         <div class="lw-global-row-start lw-global-flex-between">
 
-          <div class="lw-global-value" style="font-size: 16px">
+          <div class="lw-global-value" style="font-size: 1.25rem">
             {{ $lwLanguage.get('wms_project.pda.module.receiveAbn.skuInfo','商品信息') }}
           </div>
 
@@ -353,7 +353,7 @@
               <lw-input
                 style="width: 60px;padding: 0"
                 v-model="i.qty"
-                type="digit"
+                type="number"
                 :show-scan-icon="false"
                 input-align="center"
               />
@@ -365,14 +365,14 @@
 
 
         <lw-input
-          :title="$lwLanguage.get('wms_project.pda.module.receiveAbn.abnLocal','异常库位')"
+          :title="$lwLanguage.get('wms_project.pda.module.receiveAbn.abnLocal','异常目标库位')"
           v-model="skuInfo.abnLocationCode"
           :get-focus.sync="skuInfoFocus.abnormalLocationCode"
           input-align="right"
           required
           rule-prefix="receiveAbn"
           rule-key="abnLocation"
-          :create-rule="$lwScanRule.create('收货 - 收货异常组件 - 异常库位','LOCATION')"
+          :create-rule="$lwScanRule.create('收货 - 收货异常组件 - 异常目标库位','LOCATION')"
         />
 
         <lw-input
@@ -1044,7 +1044,7 @@ export default {
 
         this.skuInfoFocus.abnormalLocationCode = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.module.receiveAbn.localNull', '异常库位不能为空')
+          this.$lwLanguage.get('wms_project.pda.module.receiveAbn.localNull', '异常目标库位不能为空')
         )
         return false
       }

package/src/views/wms/module/ScanDataList/components/rowItem.vue

@@ -15,6 +15,8 @@
       :show-name="showName"
       :row-id="rowId"
       :row-type="rowType"
+      :row-prefix="rowPrefix"
+      v-bind="$attrs"
     />
 
     <div
@@ -43,6 +45,8 @@ export default {
     qty: null,
     showName: Boolean,
     rowId: String,
+    // 行数据id前缀，不传默认使用路由地址+ruleKey
+    rowPrefix: String,
     rowType: String,
     isChange: Boolean,
   },

package/src/views/wms/module/ScanDataList/components/rowTitle.vue

@@ -11,7 +11,10 @@
       {{ rowTitle || $lwLanguage.get('wms_project.pda.components.module.ScanDataList.pgbyfyml', '箱号/序列号') }}
     </div>
 
-    <div class="lw-global-title lw-scan-data-list-num">
+    <div
+      v-if="showQty"
+      class="lw-global-title lw-scan-data-list-num"
+    >
       {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.rtppuhwl', '数量') }}
     </div>
 
@@ -33,6 +36,11 @@ export default {
     isChange: Boolean,
     // 列标题
     rowTitle: String,
+    // 是否显示数量栏
+    showQty: {
+      type: Boolean,
+      default: true
+    }
   },
   data() {
     return {}

package/src/views/wms/module/ScanDataList/index.vue

@@ -25,9 +25,9 @@
         </span>
       </div>
 
-      <div>
+      <div v-if="showTotal">
         <span class="lw-global-value">
-          {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.bmldqjbt','总数量') }}
+          {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.bmldqjbt', '总数量') }}
         </span>
         <span class="lw-global-value-bold-red">
           {{ total }}
@@ -46,6 +46,7 @@
       <row-title
         :is-change="isChange"
         :row-title="rowTitle"
+        v-bind="$attrs"
       />
 
       <!-- 前三条数据 -->
@@ -60,8 +61,10 @@
         :name="i[nameKey]"
         :is-change="isChange"
         :show-name="showName"
-        :row-id="dataRowId"
+        :row-id="rowId"
+        :row-prefix="rowPrefix"
         :row-type="rowType"
+        v-bind="$attrs"
         @del="del(k)"
       />
 
@@ -102,10 +105,11 @@
       </lw-input>
 
       <!-- 列表头 -->
-      <template v-if="popup.list.length">
+      <template v-if="popup.list?.length">
         <row-title
           :is-change="isChange"
           :row-title="rowTitle"
+          v-bind="$attrs"
         />
 
         <row-item
@@ -118,8 +122,10 @@
           :name="i[nameKey]"
           :is-change="isChange"
           :show-name="showName"
-          :row-id="dataRowId"
+          :row-id="rowId"
+          :row-prefix="rowPrefix"
           :row-type="rowType"
+          v-bind="$attrs"
           @del="popupDel(i,k)"
         />
       </template>
@@ -153,6 +159,12 @@ export default {
     // 列标题
     rowTitle: String,
 
+    // 是否显示总数量统计
+    showTotal: {
+      type: Boolean,
+      default: true
+    },
+
     // 扫描的数据
     value: {
       type: Array,
@@ -239,7 +251,7 @@ export default {
       )
 
       if (customData.success) {
-        return customData.data.totalLabel
+        return customData.data.totalLabel || customData.data.total
       }
 
 
@@ -249,10 +261,6 @@ export default {
 
     },
 
-    // 数据显示的索引
-    dataRowId() {
-      return this.rowId ? (this.rowPrefix || this.$route.path) + '/' + this.rowId : ''
-    }
   },
   data() {
     return {
@@ -344,7 +352,7 @@ export default {
 
 .lw-scan-data-list-look-edit {
   width: 100%;
-  font-size: 14px;
+  font-size: 1rem;
   color: #888;
   text-align: center;
   margin-top: 10px;

package/src/views/wms/module/SkuInfo/index.vue

@@ -20,10 +20,7 @@
 
     <slot v-if="showRight">
       <div style="flex-shrink: 0;text-align: center">
-        <div
-          style="font-size: 16px"
-          class="lw-global-value-bold-red"
-        >{{ qty }}</div>
+        <div class="lw-global-value-bold-red">{{ qty }}</div>
         <div class="lw-global-title">
           {{ qtyText || $lwLanguage.get('wms_project.pda.components.module.SkuInfo.index.xjtkybxc','数量') }}
         </div>
@@ -38,9 +35,9 @@ export default {
   name: "lwSkuInfoModule",
   props: {
     // 商品编码
-    skuCode: String,
+    skuCode: [String, Number],
     // 商品名称
-    skuName: String,
+    skuName: [String, Number],
     // 商品数量
     qty: [String, Number],
     // 是否使用全局行样式

package/src/views/wms/page/config/masterLocation/masterLocationConfig/action/index.vue

@@ -6,7 +6,7 @@
 <template>
   <div>
 
-    <lw-nav-bar :title="$lwLanguage.get('', '库位分配')"/>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.wms.page.config.masterLocation.masterLocationConfig.action.index.xefwxacb', '库位分配')"/>
 
     <div class="lw-global-page-box">
       <div class="lw-global-model-box ">
@@ -338,7 +338,7 @@
 
     <lw-popup
       v-model="choseMasterLocationShow"
-      :title="$lwLanguage.get('', '选择主库位')"
+      :title="$lwLanguage.get('wms_project.pda.wms.page.config.masterLocation.masterLocationConfig.action.index.ggunoxqn', '选择主库位')"
     >
 
       <template>
@@ -446,7 +446,7 @@
 
     <lw-popup
       v-model="spillZoneShow"
-      :title="$lwLanguage.get('', '选择溢出区')">
+      :title="$lwLanguage.get('wms_project.pda.wms.page.config.masterLocation.masterLocationConfig.action.index.vqjszgjk', '选择溢出区')">
 
       <template>
 

package/src/views/wms/page/config/masterLocation/masterLocationConfig/index/index.vue

@@ -14,7 +14,7 @@
         <lw-search-select-popup-module
           ref="skuSearch"
           :api="searchSku"
-          :title="$lwLanguage.get('','商品条码')"
+          :title="$lwLanguage.get('wms_project.pda.wms.page.config.masterLocation.masterLocationConfig.index.index.hgbjawzd', '商品条码')"
           required
           v-model="skuCode"
           :get-focus.sync="skuCodeFocus"

package/src/views/wms/page/config/masterLocation/masterLocationQuery/action/queryByLocationCode.vue

@@ -53,7 +53,7 @@
               round
               @click="searchBtnClick"
             >
-              {{ $lwLanguage.get('', '搜索') }}
+              {{ $lwLanguage.get('wms_project.pda.wms.page.config.masterLocation.masterLocationQuery.action.queryByLocationCode.lolkkasp', '搜索') }}
             </lw-button>
           </template>
 
@@ -69,7 +69,7 @@
         <div class="lw-global-flex-between">
 
           <lw-title-value-cell
-            :title="$lwLanguage.get('', '分仓')"
+            :title="$lwLanguage.get('wms_project.pda.wms.page.config.masterLocation.masterLocationQuery.action.queryByLocationCode.joxedepa', '分仓')"
             :value="i.belongCompanyCode"
             :is-row="false"
             val-bold
@@ -87,7 +87,7 @@
         <div class="lw-global-flex-start">
 
           <div class="lw-global-title">
-            {{ $lwLanguage.get('', '货主') }}
+            {{ $lwLanguage.get('wms_project.pda.wms.page.config.masterLocation.masterLocationQuery.action.queryByLocationCode.ylssyzoq', '货主') }}
           </div>
           <div class="lw-global-value">
             <span class="lw-global-value-bold">{{ $lwCheckVal(i.ownerCode) }} / </span>
@@ -99,7 +99,7 @@
         <div class="lw-global-flex-start-start">
 
           <div class="lw-global-title">
-            {{ $lwLanguage.get('', '商品') }}
+            {{ $lwLanguage.get('wms_project.pda.wms.page.config.masterLocation.masterLocationQuery.action.queryByLocationCode.ywfkcpxb', '商品') }}
           </div>
           <div style="margin-top: 2px" class="lw-global-value">
             <div class="lw-global-value-bold">{{ i.skuCode }}</div>
@@ -159,7 +159,7 @@ export default {
     wmsProjectMobileLocationQuery({locationCode}).then(res => {
       if (!res || !res.extendFieldData) {
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('', '没有查询到库位【{loc}】的任何数据，请检查库位是否输入正确，或联系系统管理员', {loc: locationCode})
+          this.$lwLanguage.get('wms_project.pda.wms.page.config.masterLocation.masterLocationQuery.action.queryByLocationCode.wrnkoyex', '没有查询到库位【{loc}】的任何数据，请检查库位是否输入正确，或联系系统管理员', {loc: locationCode})
         )
         history.go(-1)
         return

package/src/views/wms/page/config/masterLocation/masterLocationQuery/action/queryBySkuCode.vue

@@ -153,7 +153,7 @@ export default {
       }).then(res => {
         if (!res || !res.length) {
           this.$lwShowErrorMsg(
-            this.$lwLanguage.get('', '没有查询到商品【{sku}】的任何数据，请检查商品信息是否输入正确，或联系系统管理员', {sku: lwSkuCode})
+            this.$lwLanguage.get('wms_project.pda.wms.page.config.masterLocation.masterLocationQuery.action.queryBySkuCode.vyagxjwh', '没有查询到商品【{sku}】的任何数据，请检查商品信息是否输入正确，或联系系统管理员', {sku: lwSkuCode})
           )
           history.go(-1)
           return

package/src/views/wms/page/config/newProject/action/index.vue

@@ -1187,7 +1187,7 @@
 
       <template #button>
         <lw-bottom-bar>
-          <lw-button @click="saveQualityCard">{{ $lwLanguage.get('', '保存品检卡') }}</lw-button>
+          <lw-button @click="saveQualityCard">{{ $lwLanguage.get('wms_project.pda.wms.page.config.newProject.action.index.hqiyfobw', '保存品检卡') }}</lw-button>
         </lw-bottom-bar>
 
       </template>

package/src/views/wms/page/config/newProject/index/index.vue

@@ -7,7 +7,7 @@
 <template>
   <div>
 
-    <lw-nav-bar :title="$lwLanguage.get('', '商品配置')"/>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.wms.page.config.newProject.index.index.wiyihfpd', '商品配置')"/>
 
     <lw-page-body-module>
 
@@ -16,7 +16,7 @@
           ref="skuSearch"
           :api="$lwApi.common.searchSku"
           v-model="skuCode.value"
-          :title="$lwLanguage.get('', '商品编码')"
+          :title="$lwLanguage.get('wms_project.pda.wms.page.config.newProject.index.index.oyynhhub', '商品编码')"
           :show-bottom-border="false"
           rule-key="sku"
           :create-rule="$lwScanRule.create('商品配置-起始页-查询商品','SKU')"
@@ -30,7 +30,7 @@
           block
           @click="searchSku"
         >
-          {{ $lwLanguage.get('', '搜索') }}
+          {{ $lwLanguage.get('wms_project.pda.wms.page.config.newProject.index.index.medqfxwl', '搜索') }}
         </lw-button>
 
 

package/src/views/wms/page/container/components/backStatusRow.vue

@@ -71,7 +71,7 @@ export default {
 <style scoped lang="less">
 .radio-box{
   /deep/.van-radio__label{
-    font-size: 14px;
+    font-size: 1rem;
   }
 }
 </style>

package/src/views/wms/page/container/repairBack/aciton/index.vue

@@ -379,7 +379,7 @@ export default {
 <style scoped lang="less">
 .repair-result{
   /deep/.van-radio__label{
-    font-size: 14px;
+    font-size: 1rem;
   }
 }
 </style>

package/src/views/wms/page/container/scrapRecord/index/index.vue

@@ -140,7 +140,6 @@ export default {
 
     // 新增报废单
     async confirmAdd(obj){
-      console.log(obj)
       await projectWmsPDAContainerScrapOrderSave(obj)
       this.$lwToast.success(
         this.$lwLanguage.get('wms_project.pda.components.page.container.scrapRecord.index.index.wfeuklov','新增报废单成功')

package/src/views/wms/page/count/components/CountBoard.vue

@@ -64,7 +64,8 @@ export default {
 
 <style lang="less">
 .count-task-board {
-  font-size: 0.9em;
+  font-size: 0.9rem;
+
   &-top {
     display: flex;
     justify-content: space-between;
@@ -76,13 +77,13 @@ export default {
     }
 
     &-l2 {
-      font-size: 1.1em;
+      font-size: 1.1rem;
       flex: 2 0 0;
       padding: 0 10px;
     }
 
     &-l3 {
-      font-size: 1.1em;
+      font-size: 1.1rem;
       color: #0f90dd;
     }
   }
@@ -98,7 +99,7 @@ export default {
 
     & > div {
       & > div:first-child {
-        font-size: 1.6em;
+        font-size: 1.6rem;
       }
       & > div:last-child {
         margin-top: 5px;
@@ -116,7 +117,7 @@ export default {
     }
     &-l2 {
       margin-left: 10px;
-      font-size: 1.1em;
+      font-size: 1.1rem;
       white-space: nowrap;
       text-overflow: ellipsis;
       overflow: hidden;

package/src/views/wms/page/count/components/RandomCount.vue

@@ -8,8 +8,11 @@
       <lw-input
         :title="$lwLanguage.get('wms_project.pda.components.page.count.components.fdimjwgw', '库位')"
         v-model="data.loc.value"
-        required
         :get-focus.sync="data.loc.focus"
+        required
+        rule-prefix="randomCountPopup"
+        :create-rule="$lwScanRule.create('随机盘点弹框-库位','LOCATION')"
+        rule-key="loc"
         @confirm="locConfirm"
       />
       <lw-input
@@ -17,6 +20,9 @@
         :title="$lwLanguage.get('wms_project.pda.components.page.count.components.ghmaydzj', '托盘')"
         v-model="data.lpn.value"
         :get-focus.sync="data.lpn.focus"
+        rule-prefix="randomCountPopup"
+        :create-rule="$lwScanRule.create('随机盘点弹框-托盘','LPN')"
+        rule-key="lpn"
         @confirm="onLpnConfirm"
       />
       <lw-input
@@ -24,22 +30,28 @@
         :title="$lwLanguage.get('wms_project.pda.components.page.count.components.bjorbmde', '箱号')"
         v-model="data.caseNum.value"
         :get-focus.sync="data.caseNum.focus"
+        rule-prefix="randomCountPopup"
+        :create-rule="$lwScanRule.create('随机盘点弹框-箱号','CASE')"
+        rule-key="case"
         @confirm="data.sku.focus=true"
       />
 
       <lw-search-select-popup-module
         v-if="showPop"
-        :api="skuSearchApi"
+        :api="$lwApi.common.searchSku"
         :title="$lwLanguage.get('wms_project.pda.components.page.count.components.gpgarbgi', '商品')"
         v-model="data.sku.value"
         required
         :get-focus.sync="data.sku.focus"
         type="sku"
-        @confirm="submit"
+        rule-prefix="randomCountPopup"
+        :create-rule="$lwScanRule.create('随机盘点弹框-商品','SKU')"
+        rule-key="sku"
+        @confirm="submit()"
       />
     </div>
     <template #button>
-      <lw-button @click="submit">
+      <lw-button @click="submit()">
         {{ $lwLanguage.get('wms_project.pda.components.page.count.components.cstbfjim', '确认') }}
       </lw-button>
     </template>
@@ -62,6 +74,8 @@ export default {
       required: true,
     },
     warehouseId: String,
+    // 初始库位
+    initLoc: String,
   },
   data () {
     return {
@@ -89,11 +103,19 @@ export default {
   methods: {
     show () {
       this.data.sku.value = ''
-      this.data.loc.value = ''
+      this.data.loc.value = this.initLoc || ''
       this.data.lpn.value = ''
       this.data.caseNum.value = ''
       this.showPop = true
-      this.data.loc.focus = true
+      if (this.data.loc.value) {
+        if (this.grading === 'LPN') {
+          this.data.lpn.focus = true
+        } else {
+          this.data.caseNum.focus = true
+        }
+      } else {
+        this.data.loc.focus = true
+      }
     },
     locConfirm() {
       if (['LPN', 'CASE'].includes(this.grading)) {
@@ -110,26 +132,26 @@ export default {
       }
     },
     // 商品搜索api
-    skuSearchApi(data) {
+    /*skuSearchApi(data) {
       return this.$lwApi.common.searchInventorySku({
         ...data,
         locationCode: this.data.loc.value,
         lpn: this.data.lpn.value,
         caseNum: this.data.caseNum.value
       })
-    },
-    submit() {
+    },*/
+    submit(reCount = false) {
       if (!this.data.loc.value) {
         this.data.loc.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('', '库位不能为空')
+          this.$lwLanguage.get('wms_project.pda.wms.page.count.components.RandomCount.urxjssnx', '库位不能为空')
         )
         return
       }
       if (!this.data.sku.value) {
         this.data.sku.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('', '商品不能为空')
+          this.$lwLanguage.get('wms_project.pda.wms.page.count.components.RandomCount.ebnzggez', '商品不能为空')
         )
         return
       }
@@ -139,6 +161,7 @@ export default {
         locationCode: this.data.loc.value,
         lpn: this.data.lpn.value,
         caseNum: this.data.caseNum.value,
+        reCount
       }).then(res => {
         if (!res.line) {
           return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.count.components.qvqheoig', '获取商品货主信息失败'))
@@ -147,22 +170,35 @@ export default {
       })
     },
     success (res) {
-      this.showPop = false
-      if (['200', '300', '500'].includes(res.billStatus)) {
+
+      if (['400', '600'].includes(res.billStatus)) {
         this.$lwDialog.confirm({
+          title: this.$lwLanguage.get('', '提示'),
+          message: this.$lwLanguage.get('', '该任务已存在且为已盘点，是否重盘？'),
+          confirmButtonText: this.$lwLanguage.get('', '重盘')
+        }).then(() => {
+          this.submit(true)
+        }).catch(() => {
+        })
+        return;
+      }
+
+      if (['200', '300', '500'].includes(res.billStatus)) {
+        this.showPop = false
+        this.$lwDialog.alert({
           title: this.$lwLanguage.get('wms_project.pda.components.page.count.components.ssugjbbc', '提示'),
           message: this.$lwLanguage.get('wms_project.pda.components.page.count.components.vvbcytuy', '操作成功，是否跳转至该条任务？'),
           confirmButtonText: this.$lwLanguage.get('wms_project.pda.components.page.count.components.kyucaquy', '跳转')
         }).then(() => {
           this.$emit('jump', res)
         })
-      } else {
-        const status = this.$lwDict.getDictLabel('InnerCountStatus', res.billStatus)
-        this.$lwDialog.alert({
-          title: this.$lwLanguage.get('wms_project.pda.components.page.count.components.ssugjbbc', '提示'),
-          message: this.$lwLanguage.get('wms_project.pda.components.page.count.components.lpkcaheg', '操作失败，该任务已存在，且状态为：{status}', {status: status})
-        })
+        return
       }
+
+      this.$lwDialog.alert({
+        title: this.$lwLanguage.get('wms_project.pda.components.page.count.components.ssugjbbc', '提示'),
+        message: this.$lwLanguage.get('wms_project.pda.components.page.count.components.lpkcaheg', '操作失败，该任务已存在，且状态为：{status}', {status: this.$lwDict.getDictLabel('InnerCountStatus', res.billStatus)})
+      })
     },
     // 弹框关闭
     popupOff() {
@@ -186,7 +222,7 @@ export default {
   }
 
   &-name {
-    font-size: 0.9em;
+    font-size: 0.9rem;
     color: gray;
   }
 }