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

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

@@ -1,28 +1,49 @@
 <template>
-  <lw-popup v-model="showPop" :title="$lwLanguage.get('wms_project.pda.components.page.count.components.bobkappg', '随机盘点')" :show-off-btn="false">
+  <lw-popup
+    v-model="showPop"
+    :title="$lwLanguage.get('wms_project.pda.components.page.count.components.bobkappg', '随机盘点')"
+    @closed="popupOff"
+  >
     <div>
-      <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" @confirm="data.sku.focus = true"/>
-      <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.count.components.gpgarbgi', '商品')" v-model="data.sku.value"
-                required :get-focus.sync="data.sku.focus" @confirm="onSkuConfirm"/>
-      <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.count.components.ghmaydzj', '托盘')" v-model="data.lpn.value"
-                v-if="['LPN', 'CASE'].includes(grading)" :get-focus.sync="data.lpn.focus" @confirm="onLpnConfirm"/>
-      <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.count.components.bjorbmde', '箱号')" v-model="data.caseNum.value"
-                v-if="grading === 'CASE'" :get-focus.sync="data.caseNum.focus" @confirm="submit()"/>
+      <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"
+        @confirm="locConfirm"
+      />
+      <lw-input
+        v-if="['LPN', 'CASE'].includes(grading)"
+        :title="$lwLanguage.get('wms_project.pda.components.page.count.components.ghmaydzj', '托盘')"
+        v-model="data.lpn.value"
+        :get-focus.sync="data.lpn.focus"
+        @confirm="onLpnConfirm"
+      />
+      <lw-input
+        v-if="grading === 'CASE'"
+        :title="$lwLanguage.get('wms_project.pda.components.page.count.components.bjorbmde', '箱号')"
+        v-model="data.caseNum.value"
+        :get-focus.sync="data.caseNum.focus"
+        @confirm="data.sku.focus=true"
+      />
+
+      <lw-search-select-popup-module
+        v-if="showPop"
+        :api="skuSearchApi"
+        :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"
+      />
     </div>
     <template #button>
-      <lw-button plain @click="close">{{$lwLanguage.get('wms_project.pda.components.page.count.components.vmukrfob', '关闭')}}</lw-button>
-      <lw-button @click="submit()">{{$lwLanguage.get('wms_project.pda.components.page.count.components.cstbfjim', '确认')}}</lw-button>
+      <lw-button @click="submit">
+        {{ $lwLanguage.get('wms_project.pda.components.page.count.components.cstbfjim', '确认') }}
+      </lw-button>
     </template>
-    <lw-popup v-model="showOwners" :title="$lwLanguage.get('wms_project.pda.components.page.count.components.udsejdvj', '选择货主')" :show-off-btn="false">
-      <div class="lw-global-flex-between select-owner" v-for="o in owners" :key="o.id" @click="submit(o.id)">
-        <div>
-          <div>{{ o.code }}</div>
-          <div class="select-owner-name">{{ o.name }}</div>
-        </div>
-        <van-icon name="arrow"/>
-      </div>
-    </lw-popup>
+
   </lw-popup>
 </template>
 
@@ -44,9 +65,7 @@ export default {
   },
   data () {
     return {
-      sku: '',
       showPop: false,
-      showOwners: false,
       data: {
         loc: {
           value: '',
@@ -65,7 +84,6 @@ export default {
           focus: false,
         }
       },
-      owners: [],
     }
   },
   methods: {
@@ -77,49 +95,51 @@ export default {
       this.showPop = true
       this.data.loc.focus = true
     },
-    onSkuConfirm () {
+    locConfirm() {
       if (['LPN', 'CASE'].includes(this.grading)) {
         this.data.lpn.focus = true
       } else {
-        this.submit()
+        this.data.sku.focus = true
       }
     },
-    onLpnConfirm () {
+    onLpnConfirm() {
       if (this.grading === 'CASE') {
         this.data.caseNum.focus = true
       } else {
-        this.submit()
+        this.data.sku.focus = true
       }
     },
-    submit (ownerId = null) {
+    // 商品搜索api
+    skuSearchApi(data) {
+      return this.$lwApi.common.searchInventorySku({
+        ...data,
+        locationCode: this.data.loc.value,
+        lpn: this.data.lpn.value,
+        caseNum: this.data.caseNum.value
+      })
+    },
+    submit() {
       if (!this.data.loc.value) {
         this.data.loc.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '库位不能为空')
+        )
         return
       }
       if (!this.data.sku.value) {
         this.data.sku.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '商品不能为空')
+        )
         return
       }
       invCountLineCustom({
-        skuCode: this.data.sku.value,
-        ownerId,
+        skuId: this.data.sku.value,
         taskNo: this.countTaskNo,
         locationCode: this.data.loc.value,
         lpn: this.data.lpn.value,
         caseNum: this.data.caseNum.value,
       }).then(res => {
-        if (!ownerId && Array.isArray(res)) {
-          if (res.length === 1) {
-            this.submit(res[0].id)
-            return
-          }
-          if (res.length === 0) {
-            return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.count.components.qvqheoig', '获取商品货主信息失败'))
-          }
-          this.owners = res
-          this.showOwners = true
-          return
-        }
         if (!res.line) {
           return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.count.components.qvqheoig', '获取商品货主信息失败'))
         }
@@ -128,7 +148,6 @@ export default {
     },
     success (res) {
       this.showPop = false
-      this.showOwners = false
       if (['200', '300', '500'].includes(res.billStatus)) {
         this.$lwDialog.confirm({
           title: this.$lwLanguage.get('wms_project.pda.components.page.count.components.ssugjbbc', '提示'),
@@ -139,11 +158,17 @@ export default {
         })
       } 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}) })
+        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})
+        })
       }
     },
-    close () {
-      this.showPop = false
+    // 弹框关闭
+    popupOff() {
+      for (const k in this.data) {
+        this.data[k].value = ''
+      }
     }
   }
 }

package/src/views/wms/page/count/console/components/randomCountItem.vue

@@ -100,7 +100,7 @@
         block
         @click="$emit('start')"
       >
-        {{$lwLanguage.get('wms_project.pda.components.page.count.console.components.randomCountItem.eyjbeuli','随机盘点')}}
+        {{ $lwLanguage.get('wms_project.pda.components.page.count.console.components.randomCountItem.eyjbeuli', '执行盘点') }}
       </lw-button>
 
     </div>

package/src/views/wms/page/count/console/index/index.vue

@@ -122,14 +122,14 @@
       <template v-if="tabType.active === 'random'">
 
         <random-count-item
-          v-for="(i,k) in randomList"
+          v-for="(i,k) in random.data"
           :key="k"
           :item="i"
           @over="randomOver(i)"
           @start="randomStart(i)"
         />
 
-        <lw-not-data v-if="!randomList.length"/>
+        <lw-not-data v-if="!random.data.length"/>
 
       </template>
 
@@ -156,7 +156,7 @@
 
     <lw-bottom-bar v-if="tabType.active==='random'">
       <lw-button @click="addRandom">
-        {{ $lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.vigguqiy','新随机盘点') }}
+        {{ $lwLanguage.get('', '新增随机盘点') }}
       </lw-button>
     </lw-bottom-bar>
 
@@ -250,88 +250,6 @@
 
     </lw-popup>
 
-    <!-- 随机盘点 - 开始随机盘点弹框 -->
-    <lw-popup
-      :title="$lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.hmqxyvzd','随机盘点')"
-      v-model="randomStartPopup.show"
-      @closed="randomStartOff"
-    >
-      <lw-input
-        :title="$lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.kytlbxeg','库位编码')"
-        v-model="randomStartPopup.loc.value"
-        :get-focus.sync="randomStartPopup.loc.focus"
-        rule-key="randomStartLoc"
-        :create-rule="$lwScanRule.create('盘点控制台 - 开始随机盘点弹框 - 库位编码','LOCATION')"
-        @confirm="randomStartLocConfirm"
-      />
-
-      <lw-input
-        :title="$lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.lortexqr','商品条码')"
-        v-model="randomStartPopup.sku.value"
-        :get-focus.sync="randomStartPopup.sku.focus"
-        rule-key="randomStartSku"
-        :create-rule="$lwScanRule.create('盘点控制台 - 开始随机盘点弹框 - 商品条码','SKU')"
-        @confirm="randomStartSkuConfirm"
-      >
-
-        <template #button>
-
-          <lw-button
-            round
-            mini
-            @click="randomStartSkuConfirm"
-          >
-            {{ $lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.psfsgdnh','搜索') }}
-          </lw-button>
-
-        </template>
-
-      </lw-input>
-
-      <template v-if="randomStartPopup.skuList.length">
-
-        <lw-sku-info-module
-          :sku-code="randomStartPopup.skuList[0].skuCode"
-          :sku-name="randomStartPopup.skuList[0].skuName"
-          :show-right="false"
-          is-row
-        />
-
-        <div class="lw-global-flex-between lw-global-row-end">
-
-          <lw-title-value-cell
-            :title="$lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.vecgcfxu','库存量')"
-            :value="
-              randomStartPopup.data.blind ?
-                $lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.zqhlsfsa','盲盘') :
-                (randomStartPopup.skuList[0].invQty || 0)
-            "
-            val-bold
-            :is-row="false"
-          />
-
-          <lw-title-value-cell
-            :title="$lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.nkekpjhs','锁定量')"
-            :value="randomStartPopup.skuList[0].lockedQty || 0"
-            val-bold
-            val-red
-            :is-row="false"
-          />
-
-        </div>
-
-      </template>
-
-      <template #button>
-
-        <lw-button @click="randomStartConfirm">
-          {{ $lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.vbxrzjux','开始盘点') }}
-        </lw-button>
-
-      </template>
-
-    </lw-popup>
-
     <!-- 新建随机盘点弹框 -->
     <lw-popup
       :title="$lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.pkizdnhe','随机盘点 - 新增盘点单')"
@@ -344,73 +262,42 @@
         :get-focus.sync="addRandomPopup.loc.focus"
         rule-key="addRandomLoc"
         :create-rule="$lwScanRule.create('盘点控制台 - 新增盘点单 - 库位编码','LOCATION')"
+        required
         @confirm="addRandomLocConfirm"
       />
 
-      <lw-input
+      <lw-search-select-popup-module
         :title="$lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.lortexqr','商品条码')"
         v-model="addRandomPopup.sku.value"
         :get-focus.sync="addRandomPopup.sku.focus"
         rule-key="addRandomSku"
         :create-rule="$lwScanRule.create('盘点控制台 - 新增盘点单 - 商品条码','SKU')"
+        :api="addRandomSkuApi"
+        type="sku"
+        required
         @confirm="addRandomSkuConfirm"
-      >
-
-        <template #button>
-
-          <lw-button
-            round
-            mini
-            @click="addRandomSkuConfirm"
-          >
-            {{ $lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.psfsgdnh','搜索') }}
-          </lw-button>
+      />
 
-        </template>
+      <template v-if="Object.keys(addRandomPopup.skuData).length">
 
-      </lw-input>
+        <div class="lw-global-flex-between">
 
-      <template v-if="addRandomPopup.skuList.length">
-        <van-radio-group
-          v-model="addRandomPopup.skuInfo"
-          class="add-random-radio-box"
-        >
-          <van-radio
-            v-for="(i,k) in addRandomPopup.skuList"
-            :key="k"
-            :name="k"
-          >
-            <div style="flex: 1">
-              <div>
-                <span class="lw-global-value-bold">{{ i.ownerCode }} - </span>
-                <span class="lw-global-title">{{ i.ownerName }}</span>
-              </div>
-              <div style="margin: 3px 0">
-                <span class="lw-global-value-bold">{{ i.skuCode }} - </span>
-                <span class="lw-global-title">{{ i.skuName }}</span>
-              </div>
-              <div class="lw-global-flex-between">
-
-                <lw-title-value-cell
-                  :title="$lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.vecgcfxu','库存量')"
-                  :value="i.invQty"
-                  val-bold
-                  :is-row="false"
-                />
-
-                <lw-title-value-cell
-                  :title="$lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.nkekpjhs','锁定量')"
-                  :value="i.lockedQty"
-                  val-bold
-                  val-red
-                  :is-row="false"
-                />
+          <lw-title-value-cell
+            :title="$lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.vecgcfxu','库存量')"
+            :value="addRandomPopup.skuData.invQtyLabel"
+            val-bold
+            :is-row="false"
+          />
 
-              </div>
-            </div>
-          </van-radio>
+          <lw-title-value-cell
+            :title="$lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.nkekpjhs','锁定量')"
+            :value="addRandomPopup.skuData.lockedQtyLabel"
+            val-bold
+            val-red
+            :is-row="false"
+          />
 
-        </van-radio-group>
+        </div>
 
         <lw-title-value-cell
           :title="$lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.xmpcopng','类型')"
@@ -431,8 +318,11 @@
 
       <template #button>
 
-        <lw-button @click="addRandomConfirm">
-          {{ $lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.vbxrzjux','开始盘点') }}
+        <lw-button
+          :disabled="!Object.keys(addRandomPopup.skuData).length"
+          @click="addRandomConfirm"
+        >
+          {{ $lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.vbxrzjux', '开始盘点') }}
         </lw-button>
 
       </template>
@@ -448,8 +338,8 @@ import lookTaskContentPopup from "../../../../../common/page/Task/components/loo
 import randomCountItem from "../components/randomCountItem.vue";
 import {
   wmsInnerCountHandle,
-  wmsInnerRandomCountAppendInOrder,
-  wmsInnerRandomCountGetConsoleInfo, wmsInnerRandomGenerateOrder,
+  wmsInnerRandomCountGetConsoleInfo,
+  wmsInnerRandomGenerateOrder,
   wmsInnerRandomGetCountOrders,
   wmsInnerRandomQueryLocSkuInv
 } from "../../../../api/inner/count/console";
@@ -481,7 +371,12 @@ export default {
       },
 
       // 随机任务列表
-      randomList: [],
+      random: {
+        data: [],
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0
+      },
 
       // 看板数据
       lookData: {
@@ -517,20 +412,6 @@ export default {
         blind: false
       },
       // 随机盘点 - 开始随机盘点
-      randomStartPopup: {
-        show: false,
-        loc: {
-          value: '',
-          focus: false
-        },
-        sku: {
-          value: '',
-          focus: false
-        },
-        data: {},
-        skuList: []
-      },
-      // 随机盘点 - 开始随机盘点
       addRandomPopup: {
         show: false,
         loc: {
@@ -542,9 +423,9 @@ export default {
           focus: false
         },
         skuList: [],
+        skuData: {},
         type: '',
         remark: '',
-        skuInfo: '',
       }
     }
   },
@@ -608,7 +489,7 @@ export default {
 
     // 判断当前任务的子类型
     taskNextType(item) {
-      
+
       this.tabChild.list = this.getTaskSubType(item)
 
       this.tabChild.active = this.tabChild.active || this.tabChild.list[0].type
@@ -618,39 +499,26 @@ export default {
 
     // 获取子集的数据
     getChildData() {
-      // 找到当前任务类型的数据值
-      let item = this.tabType.list.filter(item => item.type === this.tabType.active)[0]
-
-      // 分页总条数
-      switch (this.tabChild.active) {
-        case 0:
-          this.tabChild.pageTotal = item.waitAcceptTaskCount || 0
-          break;
-        case 1:
-          this.tabChild.pageTotal = item.unClaimTaskCount || 0
-          break;
-        case 2:
-          this.tabChild.pageTotal = item.receivedTaskCount || 0
-          break;
-        default:
-          this.tabChild.pageTotal = item.receivedTaskCount || 0
-          break;
-      }
 
       this.$lwApi.task.getTaskList({
         type: this.tabType.active,
         queryType: this.tabChild.active,
-        pageNum: this.tabChild.pageNum - 1,
+        pageNum: this.tabChild.pageNum,
         pageSize: this.tabChild.pageSize
       }).then(res => {
-        this.tabChild.data = res
+        this.tabChild.data = res.datas || []
+        this.tabChild.pageTotal = res.total || 0
       })
     },
 
     // 获取随机盘点单
     getRandomData() {
-      wmsInnerRandomGetCountOrders().then(res => {
-        this.randomList = res
+      wmsInnerRandomGetCountOrders({
+        pageNum: this.random.pageNum,
+        pageSize: this.random.pageSize,
+      }).then(res => {
+        this.random.data = res.datas || []
+        this.random.pageTotal = res.total
       })
     },
 
@@ -751,56 +619,14 @@ export default {
 
     // 随机任务 - 开始随机盘点 - 项目点击
     randomStart(item) {
-      this.randomStartPopup.show = true
-      this.randomStartPopup.data = item
-      this.$nextTick(() => this.randomStartPopup.loc.focus = true)
-    },
-    // 随机任务 - 开始随机盘点 - 弹框关闭
-    randomStartOff() {
-      this.randomStartPopup.loc.value = ''
-      this.randomStartPopup.sku.value = ''
-      this.randomStartPopup.data = {}
-    },
-    // 随机任务 - 开始随机盘点 - 库位编码确认
-    randomStartLocConfirm() {
-      if (this.locCheck('randomStartPopup')) this.randomStartPopup.sku.focus = true
-    },
-    // 随机任务 - 开始随机盘点 - 商品号确认
-    randomStartSkuConfirm() {
-      if (!this.locCheck('randomStartPopup') || !this.skuCheck('randomStartPopup')) return
-      this.randomStartPopup.skuList = []
-      wmsInnerRandomQueryLocSkuInv({
-        locationCode: this.randomStartPopup.loc.value,
-        skuCode: this.randomStartPopup.sku.value,
-        ownerId: this.randomStartPopup.data.ownerId
-      }).then(res => {
-        this.randomStartPopup.skuList = res || []
-      })
-    },
-    // 随机任务 - 开始随机盘点 - 开始盘点
-    randomStartConfirm() {
-
-      if (!this.randomStartPopup.skuList.length) {
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.bzlupzjz','请确认需要盘点的商品')
-        )
-        return
-      }
-
-      const data = this.randomStartPopup
-      wmsInnerRandomCountAppendInOrder({
-        countId: data.data.countId,
-        ownerId: data.data.ownerId,
-        skuId: data.skuList[0].skuId,
-        locationId: data.skuList[0].locationId,
-      }).then(res => {
-        this.$router.push({
-          path: res[0].task.taskPage,
-          query: {
-            lwTaskId: res[0].taskId,
-            lwTaskNo: res[0].task.taskNo
-          }
-        })
+      console.log(item, 9090)
+      // TODO 需要接口支持
+      this.$router.push({
+        path: item.task.taskPage,
+        query: {
+          lwTaskId: item.taskId,
+          lwTaskNo: item.task.taskNo
+        }
       })
     },
 
@@ -813,36 +639,36 @@ export default {
     addRandomOff() {
       this.addRandomPopup.loc.value = ''
       this.addRandomPopup.sku.value = ''
-      this.addRandomPopup.skuList = []
-      this.addRandomPopup.skuInfo = ''
+      this.addRandomPopup.skuData = {}
     },
     // 新建随机盘点 - 库位编码确认
     addRandomLocConfirm() {
       if (this.locCheck('addRandomPopup')) this.addRandomPopup.sku.focus = true
     },
+    // 新建随机盘点 - 商品号搜索api
+    addRandomSkuApi(data) {
+      return this.$lwApi.common.searchInventorySku({
+        ...data,
+        locationCode: this.addRandomPopup.loc.value
+      })
+    },
     // 新建随机盘点 - 商品号确认
     addRandomSkuConfirm() {
-      if (!this.locCheck('addRandomPopup') || !this.locCheck('addRandomPopup')) return
+      if (!this.locCheck('addRandomPopup') || !this.skuCheck('addRandomPopup')) return
+
+      this.addRandomPopup.skuData = {}
 
-      this.addRandomPopup.skuList = []
-      this.addRandomPopup.skuInfo = ''
       wmsInnerRandomQueryLocSkuInv({
         locationCode: this.addRandomPopup.loc.value,
-        skuCode: this.addRandomPopup.sku.value,
+        skuId: this.addRandomPopup.sku.value,
       }).then(res => {
-        this.addRandomPopup.skuList = res
+        this.addRandomPopup.skuData = res[0]
       })
     },
     // 新建随机盘点 - 开始盘点
     addRandomConfirm() {
-      if (this.addRandomPopup.skuInfo === '') {
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.wms.page.count.console.index.index.hmpqljoi','请选择需要盘点的商品')
-        )
-        return
-      }
 
-      const data = this.addRandomPopup.skuList[this.addRandomPopup.skuInfo]
+      const data = this.addRandomPopup.skuData
       wmsInnerRandomGenerateOrder({
         ownerId: data.ownerId,
         skuId: data.skuId,