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

package/src/views/wms/page/receive/abnormal/action/index.vue

@@ -11,6 +11,9 @@
 
       <lw-receive-abnormal-module
         :asn-no="asnNo"
+        :sn-value="sn.value"
+        :sn-qty="sn.qty"
+        :sku-code="skuCode"
         @success="abnSuccess"
       />
 
@@ -25,11 +28,23 @@ export default {
   name: "lwReceiveAbnormalActionPage",
   data() {
     return {
-      asnNo:''
+      asnNo: '',
+      sn: {
+        value: '',
+        qty: '',
+        abnormalLocationId: '',
+        remark: ''
+      },
+      skuCode: ''
     }
   },
   created() {
-    this.asnNo = this.$route.query.lwOrder
+    const {lwOrder, snData} = this.$route.query
+    const sn = JSON.parse(snData || '{}')
+    this.asnNo = lwOrder
+    this.sn.value = sn.sn || ''
+    this.sn.qty = sn.qty || ''
+    this.skuCode = sn.skuCode || ''
   },
   methods: {
     // 上报异常成功

package/src/views/wms/page/receive/abnormal/index/index.vue

@@ -7,60 +7,161 @@
   <div>
     <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.receive.abn.title','收货异常')"/>
 
-    <div class="lw-global-page-box">
+    <lw-page-body-module>
 
-      <div class="lw-global-model-box">
+      <div class="lw-global-model-box" style="padding-top: 3px">
 
         <lw-input
           :title="$lwLanguage.get('wms_project.pda.receive.abn.order','订单号')"
           v-model="order.value"
           :get-focus.sync="order.focus"
           rule-key="order"
+          :create-rule="$lwScanRule.create('收货异常-起始页-单号','ASN')"
           @confirm="orderConfirm"
         />
 
         <lw-button
+          style="margin-top: 10px"
           block
           @click="orderConfirm"
         >
-          {{ $lwLanguage.get('wms_project.pda.receive.abn.seo','查询') }}
+          {{ $lwLanguage.get('wms_project.pda.receive.abn.seo', '查询') }}
         </lw-button>
 
       </div>
 
-    </div>
+    </lw-page-body-module>
+
+    <lw-popup
+      :title="$lwLanguage.get('wms_project.pda.wms.page.receive.abnormal.index.index.eupvxffs', '请选择单据')"
+      v-model="selectAsnPopup.show"
+      :show-keyboard-placeholder="false"
+      background="#f0f0f0"
+    >
+
+      <div
+        class="lw-global-model-box lw-global-click-style"
+        v-for="(i,k) in selectAsnPopup.list"
+        :key="k"
+        @click="selectAsnPopupChecked(i)"
+      >
+
+        <lw-label-value-group
+          :list="i.contentList"
+          :show-end-row-style="false"
+        />
+
+        <div
+          class="lw-global-row-end lw-global-flex-start"
+          style="flex-wrap: wrap"
+        >
+          <template v-for="(a,b) in i.qtyList">
+            <lw-title-value-cell
+              :key="b"
+              :title="a.label"
+              :value="a.qtyLabel"
+              :is-row="false"
+              val-bold
+              val-red
+            />
+            <div
+              v-if="(b+1)!==i.qtyList.length"
+              :key="'icon'+b"
+              class="lw-global-value-bold"
+              style="margin: 3px 4px 0"
+            >
+              /
+            </div>
+
+          </template>
+        </div>
+
+      </div>
+
+    </lw-popup>
 
   </div>
 </template>
 
 <script>
 
+import {wmsMobileExtInQueryAsnListV2} from "./../../../../api/receive/abnormal";
+
 export default {
   name: "lwReceiveAbnormalPage",
   data() {
     return {
       // 订单
-      order:{
-        value:'',
+      order: {
+        value: '',
         focus: true
+      },
+
+      // 选择单据弹框
+      selectAsnPopup: {
+        show: false,
+        list: []
       }
     }
   },
   methods: {
     // 确认上报异常
-    orderConfirm(){
-      if (!this.order.value){
+    orderConfirm() {
+      const no = this.order.value
+      if (!no) {
         this.order.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.receive.abn.orderNull','订单号不能为空')
+          this.$lwLanguage.get('wms_project.pda.receive.abn.orderNull', '订单号不能为空')
         )
         return
       }
 
+      wmsMobileExtInQueryAsnListV2({
+        no
+      }).then(res => {
+        if (!res || !res.length) {
+          this.jumpPage({asnNo: no})
+          return;
+        }
+
+        if (res.length === 1) {
+          this.jumpPage(res[0])
+          return
+        }
+
+        this.selectAsnPopup.list = res
+        this.selectAsnPopup.show = true
+      })
+
+    },
+
+    // 确认选择
+    selectAsnPopupChecked(item) {
+      this.selectAsnPopup.show = false
+      this.jumpPage(item)
+    },
+
+    // 页面跳转
+    jumpPage(item) {
+
+      const {customData, asnNo} = item
+
+      let param = {}
+      if (customData && Object.keys(customData).length) {
+        param = {
+          skuCode: customData.sn.skuCode,
+          skuName: customData.sn.skuName,
+          sn: customData.sn.sn,
+          qty: customData.sn.qty,
+        }
+      }
+
+
       this.$router.push({
         path: '/receive/abnormal/lwAction',
-        query:{
-          lwOrder: this.order.value
+        query: {
+          lwOrder: asnNo,
+          snData: JSON.stringify(param)
         }
       })
     }

package/src/views/wms/page/receive/arrivalPlan/index.vue

@@ -0,0 +1,319 @@
+<!--
+  到货计划 - 起始页
+  @author: 张文
+  @date: 2024-08-12
+-->
+<template>
+  <div>
+    <lw-nav-bar :title="$lwLanguage.get('', '到货计划')"/>
+
+    <lw-page-body-module>
+
+      <div
+        style="padding-top: 3px"
+        class="lw-global-model-box"
+      >
+        <lw-input
+          :title="$lwLanguage.get('', '单号')"
+          v-model="search.searchKey"
+          input-align="right"
+          :create-rule="$lwScanRule.create('到货计划-单号','ASN')"
+          rule-key="asn"
+        />
+
+        <lw-cell-popup-date
+          :title="$lwLanguage.get('','计划到货时间(起)')"
+          v-model="search.beginArrivalTime"
+          type="datetime"
+        />
+        <lw-cell-popup-date
+          :title="$lwLanguage.get('','计划到货时间(止)')"
+          v-model="search.endArrivalTime"
+          type="datetime"
+        />
+        <lw-car-plate
+          :title="$lwLanguage.get('', '车牌号')"
+          v-model="search.plateNum"
+        />
+
+        <div class="lw-global-row-end lw-global-flex-between">
+          <lw-button
+            style="margin-right: 10px"
+            type="last"
+            plain
+            block
+            @click="reset"
+          >
+            {{ $lwLanguage.get('', '重置') }}
+          </lw-button>
+          <lw-button
+            block
+            @click="searchConfirm"
+          >
+            {{ $lwLanguage.get('', '查询') }}
+          </lw-button>
+        </div>
+      </div>
+      <lw-tab-box style="margin-top: 10px">
+
+        <van-tabs
+          type="card"
+          animated
+          v-model="tabActive"
+        >
+
+          <van-tab name="pending">
+            <template #title>
+              <lw-tip
+                :title="$lwLanguage.get('', '已计划')"
+                :tip="pending.pageTotal"
+              />
+            </template>
+
+            <div
+              class="lw-global-click-style lw-global-animation-out lw-global-model-box"
+              v-for="(i,k) in pending.datas"
+              :key="k"
+              :style="{animationDelay:50*k+'ms'}"
+              @click="itemClick(i)"
+            >
+              <div class="lw-global-row-start lw-global-flex-between">
+                <lw-title-value-cell
+                  :title="$lwLanguage.get('', '作业号')"
+                  :value="i.taskNo"
+                  val-bold
+                  :is-row="false"
+                />
+
+                <lw-tag
+                  plain
+                  type="danger"
+                >
+                  {{ i.typeLabel }}
+                </lw-tag>
+              </div>
+              <lw-label-value-group
+                class="lw-global-row-end"
+                :list="i.contentList"
+                :show-row-style="false"
+              />
+            </div>
+            <lw-pagination
+              v-model="pending.pageNum"
+              :page-size.sync="pending.pageSize"
+              :page-total="pending.pageTotal"
+              @change="pageChange('pending')"
+            />
+            <lw-not-data v-if="!pending.datas.length"/>
+          </van-tab>
+
+          <van-tab name="doing">
+            <template #title>
+              <lw-tip
+                :title="$lwLanguage.get('', '作业中')"
+                :tip="doing.pageTotal"
+              />
+            </template>
+
+            <div
+              class="lw-global-click-style lw-global-animation-out lw-global-model-box"
+              v-for="(i,k) in doing.datas"
+              :key="k"
+              :style="{animationDelay:50*k+'ms'}"
+              @click="itemClick(i)"
+            >
+              <div class="lw-global-row-start lw-global-flex-between">
+                <lw-title-value-cell
+                  :title="$lwLanguage.get('', '作业号')"
+                  :value="i.taskNo"
+                  val-bold
+                  :is-row="false"
+                />
+
+                <lw-tag
+                  plain
+                  type="danger"
+                >
+                  {{ i.typeLabel }}
+                </lw-tag>
+              </div>
+              <lw-label-value-group
+                class="lw-global-row-end"
+                :list="i.contentList"
+                :show-row-style="false"
+              />
+            </div>
+            <lw-pagination
+              v-model="doing.pageNum"
+              :page-size.sync="doing.pageSize"
+              :page-total="doing.pageTotal"
+              @change="pageChange('doing')"
+            />
+            <lw-not-data v-if="!doing.datas.length"/>
+
+          </van-tab>
+
+          <van-tab name="complete">
+            <template #title>
+              <lw-tip
+                :title="$lwLanguage.get('', '已完成')"
+                :tip="complete.pageTotal"
+              />
+            </template>
+
+            <div
+              class="lw-global-model-box lw-global-animation-out"
+              v-for="(i,k) in complete.datas"
+              :key="k"
+              :style="{animationDelay:50*k+'ms'}"
+            >
+              <div class="lw-global-row-start lw-global-flex-between">
+                <lw-title-value-cell
+                  :title="$lwLanguage.get('', '作业号')"
+                  :value="i.taskNo"
+                  val-bold
+                  :is-row="false"
+                />
+
+                <lw-tag
+                  plain
+                  type="danger"
+                >
+                  {{ i.typeLabel }}
+                </lw-tag>
+              </div>
+              <lw-label-value-group
+                class="lw-global-row-end"
+                :list="i.contentList"
+                :show-row-style="false"
+              />
+            </div>
+            <lw-pagination
+              v-model="complete.pageNum"
+              :page-size.sync="complete.pageSize"
+              :page-total="complete.pageTotal"
+              @change="pageChange('complete')"
+            />
+            <lw-not-data v-if="!complete.datas.length"/>
+          </van-tab>
+
+
+        </van-tabs>
+      </lw-tab-box>
+
+
+    </lw-page-body-module>
+  </div>
+</template>
+
+<script>
+
+import {wmsInboundAdvanceReceiptQueryPage} from "../../../api/receive/arrivalPlan";
+
+const tabKey = ['pending', 'doing', 'complete']
+
+export default {
+  name: "lwReceiveArrivalPlanIndex",
+  data() {
+    return {
+      search: {
+        searchKey: '',
+        beginArrivalTime: '',
+        endArrivalTime: '',
+        plateNum: ''
+      },
+      tabActive: 'pending',
+
+      pending: {
+        datas: [],
+        pageTotal: 0,
+        pageNum: 1,
+        pageSize: 10,
+      },
+      doing: {
+        datas: [],
+        pageTotal: 0,
+        pageNum: 1,
+        pageSize: 10,
+      },
+      complete: {
+        datas: [],
+        pageTotal: 0,
+        pageNum: 1,
+        pageSize: 10,
+      },
+    }
+  },
+  mounted() {
+
+    const {search, pageNum, pageSize, tabActive} = this.$route.query
+    if (tabActive) {
+      this.tabActive = tabActive
+      this[tabActive].pageNum = Number(pageNum || 1)
+      this[tabActive].pageSize = Number(pageSize || 10)
+      this.search = JSON.parse(search)
+    }
+
+    this.searchConfirm()
+  },
+  methods: {
+    // 重置
+    reset() {
+      for (const k in this.search) {
+        this.search[k] = ''
+      }
+      this.searchConfirm()
+    },
+    searchConfirm() {
+      tabKey.forEach(k => {
+        this[k].pageNum = 1
+        this.pageChange(k)
+      })
+
+    },
+
+    pageChange(key) {
+      wmsInboundAdvanceReceiptQueryPage({
+        pageNum: this[key].pageNum,
+        pageSize: this[key].pageSize,
+        ...this.search,
+        status: key.toUpperCase()
+      }).then(res => {
+        this[key].datas = res.datas || []
+        this[key].pageTotal = res.total || 0
+      })
+    },
+
+    // 页面跳转前
+    beforeJump() {
+      this.$router.replace({
+        path: '/receive/arrivalPlan/index',
+        query: {
+          search: JSON.stringify(this.search),
+          pageNum: this[this.tabActive].pageNum,
+          pageSize: this[this.tabActive].pageSize,
+          tabActive: this.tabActive,
+          _time: Date.now()
+        }
+      })
+    },
+
+    // 已计划详情点击
+    itemClick(item) {
+      this.beforeJump()
+      this.$router.push({
+        path: '/receive/consoleV2/lwLook',
+        query: {
+          asnId: item.asnId,
+          asnNo: item.asnNo,
+          receiveOrderId: item.id
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/wms/page/receive/byContainer/index.js

@@ -0,0 +1,19 @@
+/*
+* 按容器收货 - 组件导出
+* @author: 张文
+* @date  2024-01-15
+* */
+
+
+import lwReceiveByContainerIndex from "./index.vue";
+
+
+const components = [
+  lwReceiveByContainerIndex,
+]
+
+
+export default components.map(item => {
+  item.install = Vue => Vue.component(item.name, item)
+  return item
+})