@logwire/logwire-wms-pda-ui 3.1.3-zc-beta → 3.3.2

package/src/views/wms/page/process/prepare/index.vue

@@ -35,7 +35,8 @@
         </div>
         <lw-data-look-bg
           type="bottom"
-          :data="lookData"/>
+          :data="lookData"
+        />
       </template>
 
       <!-- tab -->

package/src/views/wms/page/receive/console/components/orderInfo.vue

@@ -45,9 +45,27 @@
         round
         @click.stop="orderBack"
       >
-        {{ $lwLanguage.get('wms_project.pda.wms.page.receive.console.components.orderInfo.iwrvduou','回单上传') }}
+        {{ $lwLanguage.get('wms_project.pda.wms.page.receive.console.components.orderInfo.iwrvduou', '回单上传') }}
       </lw-button>
 
+      <div v-if="this.item.billStatus === '100'">
+        <lw-button
+          mini
+          plain
+          type="last"
+          @click.stop="orderCancel"
+        >
+          {{ $lwLanguage.get('wms_project.pda.views.wms.page.receive.console.components.orderInfo.thehkiuy','取消') }}
+        </lw-button>
+
+        <lw-button
+          mini
+          @click.stop="orderConfirm"
+        >
+          {{ $lwLanguage.get('wms_project.pda.views.wms.page.receive.console.components.orderInfo.audaciph','确认') }}
+        </lw-button>
+      </div>
+
     </div>
 
     <lw-title-value-cell
@@ -59,14 +77,14 @@
     <div class="lw-global-flex-between">
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.components.orderInfo.qmfjorel','已收数量')"
-        :value="item.receiveQty+' / '+item.qty"
+        :value="$lwCheckVal(item.receiveQty,0)+' / '+$lwCheckVal(item.qty,0)"
         :is-row="false"
         val-bold
       />
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.components.orderInfo.jrajpyaf','已收托数')"
-        :value="item.receiveLpnCount+' / '+item.lpnCount"
+        :value="$lwCheckVal(item.receiveLpnCount,0)+' / '+$lwCheckVal(item.lpnCount,0)"
         :is-row="false"
         val-bold
       />
@@ -108,6 +126,8 @@
 <script>
 
 
+import {wmsMobileAutoConfirmAsn, wmsMobileCancelAsn} from "../../../../api/receive/console";
+
 export default {
   name: "orderInfo",
   props: {
@@ -183,11 +203,16 @@ export default {
             lwId: this.item.id
           }
         })
+        return
+      }
+      if (this.item.billStatus === '100') {
+        this.orderEdit()
+        return
       }
 
       if (!this.receiveType.length) {
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.wms.page.receive.console.components.orderInfo.ymjhuuwf','没有配置收货方式，请联系系统管理员')
+          this.$lwLanguage.get('wms_project.pda.wms.page.receive.console.components.orderInfo.ymjhuuwf', '没有配置收货方式，请联系系统管理员')
         )
         return
       }
@@ -210,6 +235,52 @@ export default {
       })
     },
 
+    // 订单 - 取消
+    orderCancel() {
+
+      this.$lwDialog.confirm({
+        title: this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.components.orderInfo.pyutvacr','提示'),
+        message: this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.components.orderInfo.bjtcchoe','确认取消当前到货通知单？')
+      }).then(() => {
+        wmsMobileCancelAsn({
+          asnId: this.item.id
+        }).then(() => {
+          this.$lwToast.success(
+            this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.components.orderInfo.ljxbivku','已取消')
+          )
+          this.$emit('orderCancel')
+        })
+      }).catch(() => {
+      })
+
+    },
+    // 订单 - 编辑
+    orderEdit() {
+      this.$router.push({
+        path: '/receive/console/lwCreateEditOrder',
+        query: {
+          asnId: this.item.id,
+        }
+      })
+    },
+    // 订单 - 确认
+    orderConfirm() {
+      this.$lwDialog.confirm({
+        title: this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.components.orderInfo.pyutvacr','提示'),
+        message: this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.components.orderInfo.genqakvh','确认当前到货通知单？')
+      }).then(() => {
+        wmsMobileAutoConfirmAsn({
+          asnId: this.item.id
+        }).then(() => {
+          this.$lwToast.success(
+            this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.components.orderInfo.kugiwetn','已确认')
+          )
+          this.$emit('orderConfirm')
+        })
+      }).catch(() => {
+      })
+    },
+
     // 跳转页面
     goPage(path) {
       this.$router.push({path, query: {asnNo: this.item.asnNo}})

package/src/views/wms/page/receive/console/createEditOrder/index.js

@@ -0,0 +1,12 @@
+/*
+* 创建、修改收货单
+* @author: 张文
+* @date  2023-05-10
+* */
+
+
+import lwReceiveConsoleCreateEditOrder from "./index.vue";
+
+lwReceiveConsoleCreateEditOrder.install = Vue => Vue.component(lwReceiveConsoleCreateEditOrder.name, lwReceiveConsoleCreateEditOrder)
+
+export default lwReceiveConsoleCreateEditOrder

package/src/views/wms/page/receive/console/createEditOrder/index.vue

@@ -0,0 +1,497 @@
+<!--
+  创建、修改收货单
+  @author: 张文
+  @date: 2023-05-10
+-->
+<template>
+  <div>
+
+    <lw-nav-bar :title="navTitle"/>
+
+    <div
+      v-if="initOver"
+      class="lw-global-page-box"
+    >
+
+      <div class="lw-global-model-box lw-global-model-box-3px">
+        <lw-search-cell-popup
+          :title="$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.rxruwjzr','货主')"
+          :get-focus.sync="owner.focus"
+          :create-rule="$lwScanRule.create('收货-创建到货通知单-货主','OWNER')"
+          rule-key="owner"
+          required
+          :api-fn="getOwnerData"
+          label-key="code,name"
+          :disabled="inputDisabled"
+          :init-val="owner.initVal"
+          input-align="right"
+          @confirm="ownerPopupConfirm"
+          @clear="ownerPopupClear"
+        />
+
+        <lw-cell-popup-radio
+          :title="$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.libvkufv','订单类型')"
+          v-model="type"
+          dict-key="biz_asn_type"
+          required
+          @confirm="asnTypeConfirm"
+          @clear="asnTypeClear"
+        />
+
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.qdcrzzzg','优先级')"
+          v-model="priority.value"
+          :get-focus.sync="priority.focus"
+          input-align="right"
+          required
+          type="digit"
+          @confirm="priorityConfirm"
+        />
+
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.gwjllfoc','外部单号')"
+          v-model="extSoNo.value"
+          :get-focus.sync="extSoNo.focus"
+          :create-rule="$lwScanRule.create('收货控制台-创建到货通知单-外部单号','ASN')"
+          rule-key="extSoNo"
+          input-align="right"
+        />
+
+        <lw-cell-popup-date
+          :title="$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.llfvdryw','计划到货时间')"
+          v-model="planTime"
+          type="datetime"
+          required
+          @confirm="planTimeConfirm"
+        />
+
+        <lw-cell-popup-radio
+          v-if="showReturnReason"
+          :title="$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.yelcuuhb','退货原因')"
+          v-model="returnReason.value"
+          dict-key="InboundAsnReturnReasonType"
+          @confirm="returnReasonConfirm"
+        />
+
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.yelcuuhbc','备注')"
+          v-model="remark"
+          :show-bottom-border="false"
+          input-align="right"
+          type="textarea"
+          :rows="4"
+        />
+
+      </div>
+
+      <div
+        style="padding-bottom: 3px"
+        class="lw-global-model-box"
+        v-for="(i,k) in skuList"
+        :key="k"
+      >
+
+        <div class="lw-global-flex-between">
+
+          <div class="lw-global-value-bold">
+            {{
+              $lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.gggdnjtz','商品') + (k + 1)
+            }}
+          </div>
+
+          <van-icon
+            name="delete"
+            size="18"
+            color="#d50000"
+            @click="delSku(k)"
+          />
+        </div>
+        <lw-search-cell-popup
+          :title="$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.jzmugrnh','商品编码')"
+          :get-focus.sync="i.skuFocus"
+          :create-rule="$lwScanRule.create('收货控制台-创建到货通知单-商品编码','SKU')"
+          rule-key="skuCode"
+          required
+          show-bottom-border
+          :api-fn="s=>skuCodeConfirm(s,k)"
+          label-key="code,name"
+          :init-auto-select="false"
+          :init-val="i.initVal"
+          @confirm="item=>selectPopupConfirm(item,k)"
+          @clear="selectPopupClear(k)"
+        />
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.ixnbaxnw','入库数量')"
+          v-model="i.qty"
+          :get-focus.sync="i.qtyFocus"
+          type="digit"
+          required
+          :show-bottom-border="false"
+        />
+
+      </div>
+
+      <div
+        style="margin: 20px 0"
+        class="lw-global-flex-center"
+      >
+        <van-icon
+          size="30px"
+          name="add"
+          color="#D50000"
+          @click="addSku"
+        />
+      </div>
+
+
+    </div>
+
+    <lw-bottom-bar>
+
+      <lw-button @click="confirmCreate">
+        {{ $lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.fyocgqtfv', '保存') }}
+      </lw-button>
+
+    </lw-bottom-bar>
+
+
+  </div>
+</template>
+
+<script>
+
+import {
+  wmsMobileGetOwnerSku,
+  wmsMobileGetWarehouseOwner
+} from "../../../../api/outbound/pickConsole/orderPick";
+import {
+  wmsMobileEditAsnBySku,
+  wmsMobileGetAsnReturnType,
+  wmsMobileInboundGetAsnDetailByNew
+} from "../../../../api/receive/console";
+
+export default {
+  name: "lwReceiveConsoleCreateEditOrder",
+  data() {
+    return {
+      initOver: false,
+
+      navTitle: '',
+
+      // 货主
+      owner: {
+        focus: true,
+        code: '',
+        name: '',
+        id: '',
+
+        initVal: null
+      },
+      // 订单类型
+      type: '',
+      // 优先级
+      priority: {
+        value: '1',
+        focus: false
+      },
+      // 外部单号
+      extSoNo: {
+        value: '',
+        focus: false
+      },
+      // 计划时间
+      planTime: '',
+      remark: '',
+      // 退货原因
+      returnReason: {
+        show: false,
+        list: [],
+        value: ''
+      },
+
+      skuList: [],
+      // 编辑时使用
+      oldSkuList: [],
+
+      skuPopup: {
+        show: false,
+        index: '',
+        search: '',
+        list: [],
+        result: ''
+      }
+    }
+  },
+  computed: {
+    inputDisabled() {
+      return this.skuList.some(item => item.skuCode)
+    },
+
+    // 是否显示退货原因
+    showReturnReason() {
+      return this.returnReason.list.includes(this.type)
+    }
+  },
+  created() {
+    this.init()
+  },
+  methods: {
+    // 初始化
+    async init() {
+      const nowTime = this.$lwTimezone.getTimezoneDate({format: 'yyyy-MM-dd hh:mm'})
+      this.planTime = this.$lwTimezone.timezoneToUTC({date: nowTime})
+
+      wmsMobileGetAsnReturnType().then(res => this.returnReason.list = res)
+
+      if (this.$route.query.asnId) {
+        await this.getEditData()
+      } else {
+        this.navTitle = this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.fyocgqtf','创建到货通知单')
+      }
+      this.initOver = true
+    },
+
+    // 获取编辑数据
+    async getEditData() {
+      this.navTitle = this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.pbqrggcm','修改到货通知单')
+
+      try {
+        const res = await wmsMobileInboundGetAsnDetailByNew({
+          id: this.$route.query.asnId
+        })
+
+        const {ownerCode, ownerName} = res
+
+        this.owner = {
+          code: ownerCode,
+          name: ownerName,
+          id: res.ownerId,
+          focus: false,
+          initVal: {
+            code: ownerCode,
+            name: ownerName
+          }
+        }
+
+        this.type = res.type
+        this.planTime = res.planArrivalTime
+        this.remark = res.remark
+        this.extSoNo.value = res.extNo
+        this.returnReason.value = res.returnReason
+
+        this.skuList = res.lines.map(item => {
+          const {sku} = item
+          return {
+            skuCode: sku.code,
+            skuName: sku.name,
+            skuId: sku.id,
+            qty: item.qty,
+            skuFocus: false,
+            qtyFocus: false,
+            initVal: {
+              code: sku.code,
+              name: sku.name
+            }
+          }
+        })
+
+      } catch {
+        history.go(-1)
+      }
+    },
+
+    // 货主 - 必填校验
+    ownerCheck() {
+      if (!this.owner.id) {
+        this.owner.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.buzupwby','请选择货主')
+        )
+        return false
+      }
+      return true
+    },
+    // 货主 - 获取数据API
+    getOwnerData(keyword) {
+      return wmsMobileGetWarehouseOwner({keyword})
+    },
+    // 货主 - 选择弹框 - 确认
+    ownerPopupConfirm(item) {
+      this.owner.code = item.code
+      this.owner.id = item.id
+      this.owner.name = item.name
+      !this.skuList.length && this.addSku()
+    },
+    // 货主 - 选择弹框 - 清空
+    ownerPopupClear() {
+      this.owner.code = ''
+      this.owner.name = ''
+      this.owner.id = ''
+      this.skuList = []
+    },
+
+    // 订单类型选择 - 确认
+    asnTypeConfirm() {
+      if (!this.showReturnReason) this.returnReason.value = ''
+    },
+    // 订单类型选择 - 删除
+    asnTypeClear() {
+      this.returnReason.value = ''
+    },
+
+    // 优先级必填校验
+    priorityCheck() {
+      return !!this.priority.value
+    },
+    // 优先级确认
+    priorityConfirm() {
+      this.priorityCheck() ? this.extSoNo.focus = true : ''
+    },
+
+    // 计划到货时间确认
+    planTimeConfirm() {
+      !this.showReturnReason && this.returnReasonConfirm()
+    },
+
+    // 退货原因确认
+    returnReasonConfirm() {
+      if (this.skuList.length) {
+        this.skuList[0].skuFocus = true
+      }
+    },
+
+
+    // 增加商品
+    async addSku() {
+
+      if (!this.ownerCheck()) return
+
+      this.skuList.push({
+        skuId: '',
+        skuCode: '',
+        skuName: '',
+        qty: '',
+        skuFocus: true,
+        qtyFocus: false,
+      })
+
+    },
+    // 删除商品
+    delSku(index) {
+      this.skuList.splice(index, 1)
+    },
+
+
+    // 搜索商品
+    skuCodeConfirm(keyword) {
+      return wmsMobileGetOwnerSku({
+        ownerId: this.owner.id,
+        keyword
+      })
+    },
+    // 商品选择弹框 - 确认选择
+    selectPopupConfirm(item, index) {
+
+      const {code, name, id} = item
+      this.skuList[index].skuCode = code
+      this.skuList[index].skuName = name
+      this.skuList[index].skuId = id
+
+      this.skuList[index].qtyFocus = true
+
+    },
+    // 商品选择弹框 - 清除商品
+    selectPopupClear(index) {
+      this.skuList[index].skuCode = ''
+      this.skuList[index].skuName = ''
+      this.skuList[index].skuId = ''
+      this.skuList[index].qty = ''
+    },
+
+
+    // 校验单头数据是否填写完整
+    checkOrderInfo() {
+
+
+      if (!this.ownerCheck()) return false
+
+      if (!this.type) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.higbklsv','请选择订单类型')
+        )
+        return false
+      }
+
+      if (!this.priorityCheck()) {
+        this.priority.focus = true
+        return false
+      }
+
+      if (!this.planTime) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.ejguupps', '计划到货时间不能为空')
+        )
+        return false
+      }
+
+
+      return true
+
+    },
+    // 创建到货通知单
+    async confirmCreate() {
+
+      if (!this.checkOrderInfo()) return
+
+      if (!this.skuList.length) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.qbpjvtzs','请添加商品信息')
+        )
+        return
+      }
+
+      for (let i = 0; i < this.skuList.length; i++) {
+        if (!this.skuList[i].skuCode) {
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.mehmfqfg','商品{num}，商品信息不能为空', {num: i + 1})
+          )
+          return
+        }
+        if (!Number(this.skuList[i].qty || 0)) {
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.tjotcezp','商品{num}，入库数量不能为空且应当是大于0的整数', {num: i + 1})
+          )
+          return
+        }
+      }
+
+      const asnId = this.$route.query.asnId || null
+
+      await wmsMobileEditAsnBySku({
+        asnId,
+        ownerId: this.owner.id,
+        type: this.type,
+        planArrivalTime: this.planTime,
+        remark: this.remark,
+        priority: this.priority.value,
+        extNo: this.extSoNo.value,
+        returnReason: this.returnReason.value,
+        lines: this.skuList
+      })
+
+      const msg = asnId ?
+        this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.qcizelmg','到货通知单修改成功') :
+        this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.hepzbczg','到货通知单创建成功')
+
+      this.$lwToast.success(msg)
+
+      history.go(-1)
+    },
+
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

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

@@ -36,9 +36,11 @@
       </div>
 
       <order-info
-        v-for="(i,k) in orderList"
-        :key="k"
+        v-for="i in orderList"
+        :key="i.id"
         :item="i"
+        @orderCancel="pageChange"
+        @orderConfirm="pageChange"
       />
       <lw-not-data v-if="!orderList.length"/>
 
@@ -77,15 +79,20 @@ export default {
       pageSize: 10,
       pageTotal: 0,
       orderList: [],
-      btnList: [],
+      btnList: [
+        {
+          text: this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.index.index.xklasaia','创建到货通知单'),
+          click: () => this.bottomClick('/receive/console/lwCreateEditOrder')
+        }
+      ],
 
       jumpPagePath: {
         sku: {
-          text: this.$lwLanguage.get('wms_project.pda.wms.page.receive.console.index.index.xquoclbc','按商品收货'),
+          text: this.$lwLanguage.get('wms_project.pda.wms.page.receive.console.index.index.xquoclbc', '按商品收货'),
           click: () => this.bottomClick('/inbound/receive/lwIndex')
         },
         case: {
-          text: this.$lwLanguage.get('wms_project.pda.wms.page.receive.console.index.index.udqqvjty','整箱收货'),
+          text: this.$lwLanguage.get('wms_project.pda.wms.page.receive.console.index.index.udqqvjty', '整箱收货'),
           click: () => this.bottomClick('/inbound/receive/lwIndex?type=case')
         },
         lpn: {