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

package/src/views/wms/page/outbound/pickConsole/createOrder/index.vue

@@ -4,525 +4,24 @@
   @date: 2023-04-02
 -->
 <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.wms.page.outbound.pickConsole.createOrder.index.ojhaiynn','货主')"
-          :get-focus.sync="owner.focus"
-          :create-rule="$lwScanRule.create('出库拣选控制台-创建出库单-货主','OWNER')"
-          rule-key="owner"
-          required
-          :api-fn="k=>ownerCustomerApi('owner',k)"
-          label-key="code,name"
-          :disabled="inputDisabled"
-          :init-val="owner.initVal"
-          input-align="right"
-          @confirm="item=>ownerCustomerPopupConfirm('owner',item)"
-          @clear="ownerCustomerPopupClear('owner')"
-        />
-
-        <lw-search-cell-popup
-          :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.sgmaukva','客户')"
-          :get-focus.sync="customer.focus"
-          :create-rule="$lwScanRule.create('出库拣选控制台-创建出库单-客户','CUSTOMER')"
-          rule-key="customer"
-          required
-          :api-fn="k=>ownerCustomerApi('customer',k)"
-          label-key="code,name"
-          :init-val="customer.initVal"
-          input-align="right"
-          @confirm="item=>ownerCustomerPopupConfirm('customer',item)"
-          @clear="ownerCustomerPopupClear('customer')"
-        />
-
-        <lw-cell-popup-radio
-          :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.kofamixk','订单类型')"
-          v-model="type"
-          dict-key="OutboundPlanOrderType"
-          required
-
-        />
-
-        <lw-cell-popup-date
-          :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.kuflwpth','计划出库时间')"
-          v-model="planTime"
-          type="datetime"
-        />
-
-        <lw-input
-          :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.wzcbykeh','外部单号')"
-          v-model="extSoNo"
-          :create-rule="$lwScanRule.create('出库拣选控制台-创建出库单-外部单号','ASN')"
-          rule-key="extSoNo"
-          required
-          input-align="right"
-          @confirm="extSoNoConfirm"
-        />
-
-        <lw-cell-popup-radio
-          v-if="showBackCell"
-          :title="$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.createOrder.index.rjczjkhm','退货方式')"
-          v-model="back.value"
-          dict-key="OutboundReturnMethod"
-        />
-
-        <lw-input
-          :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.wzcbykehc','备注')"
-          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.wms.page.outbound.pickConsole.createOrder.index.anfnbqbg', '商品') + (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.wms.page.outbound.pickConsole.createOrder.index.fkfggbxf','商品编码')"
-          :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-title-value-cell
-          :title="$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.createOrder.index.vjsebyga','可用库存数')"
-          :value="$lwCheckVal(i.abQty)"
-          val-bold
-        />
-        <lw-input
-          :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.itonmutj','出库数量')"
-          v-model="i.skuQty"
-          :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.wms.page.outbound.pickConsole.createOrder.index.ozvhjkcgv', '保存') }}
-      </lw-button>
-
-    </lw-bottom-bar>
-
-
-  </div>
+  <create-order-page
+    action-path="/outbound/pickConsole/lwOrderAction"
+  >
+  </create-order-page>
 </template>
 
 <script>
 
-import {
-  projectWmsOutboundPDAGetReturnTypes, projectWmsOutboundPDAQuerySkuInvAbQty,
-  projectWmsOutboundPDASoCreate,
-  projectWmsOutboundPDASoQueryUpdateInfo,
-  projectWmsOutboundPDASoSubmitUpdateInfo,
-  wmsMobileGetOwnerSku,
-  wmsMobileGetWarehouseCustomer,
-  wmsMobileGetWarehouseOwner
-} from "../../../../api/outbound/pickConsole/orderPick";
+import createOrderPage from "./../../../../components/consoleAndPick/createOrderPage.vue";
 
 export default {
   name: "lwOutboundPickConsoleCreateOrder",
-  data() {
-    return {
-      initOver: false,
-
-      navTitle: '',
-
-      owner: {
-        focus: true,
-        code: '',
-        name: '',
-        id: '',
-
-        initVal: null
-      },
-
-      customer: {
-        focus: false,
-        code: '',
-        name: '',
-        id: '',
-
-        initVal: null
-      },
-
-      type: '',
-      planTime: '',
-      extSoNo: '',
-      remark: '',
-      // 退货
-      back: {
-        value: '',
-        list: []
-      },
-
-      skuList: [],
-      // 编辑时使用
-      oldSkuList: [],
-
-      skuPopup: {
-        show: false,
-        index: '',
-        search: '',
-        list: [],
-        result: ''
-      }
-    }
+  components: {
+    createOrderPage
   },
-  computed: {
-    inputDisabled() {
-      return this.skuList.some(item => item.skuCode)
-    },
-    // 是否显示退货方式
-    showBackCell() {
-      return this.back.list.includes(this.type)
-    }
-  },
-  created() {
-    this.init()
+  data() {
+    return {}
   },
-  methods: {
-    // 初始化
-    async init() {
-      projectWmsOutboundPDAGetReturnTypes().then(res => this.back.list = res || [])
-
-      if (this.$route.query.soId) {
-        await this.getEditData()
-      } else {
-        this.navTitle = this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.ozvhjkcg', '创建出库订单')
-      }
-      this.initOver = true
-    },
-
-    // 获取编辑数据
-    async getEditData() {
-      this.navTitle = this.$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.createOrder.index.ibfmbizz','修改出库订单')
-
-      try {
-        const res = await projectWmsOutboundPDASoQueryUpdateInfo({
-          soId: this.$route.query.soId
-        })
-
-        const {ownerCode, ownerName, customerCode, customerName} = res
-
-        this.owner = {
-          code: ownerCode,
-          name: ownerName,
-          id: res.ownerId,
-          focus: false,
-          initVal: {
-            code: ownerCode,
-            name: ownerName
-          }
-        }
-
-        this.customer = {
-          code: customerCode,
-          name: customerName,
-          focus: false,
-          initVal: {
-            code: customerCode,
-            name: customerName
-          }
-        }
-
-        this.type = res.type
-        this.planTime = res.planShipTime
-        this.extSoNo = res.extSoNo
-        this.remark = res.remark
-        this.back.value = res.returnMethod
-
-        this.skuList = res.skuList.map(item => {
-          return {
-            ...item,
-            initVal: {
-              code: item.skuCode,
-              name: item.skuName
-            },
-            txCode: 'U'
-          }
-        })
-
-        this.oldSkuList = res.skuList
-      } catch {
-        history.go(-1)
-      }
-    },
-
-    // 货主、客户 - 获取数据API
-    ownerCustomerApi(type, keyword) {
-      return type === 'owner' ?
-        wmsMobileGetWarehouseOwner({keyword}) :
-        wmsMobileGetWarehouseCustomer({keyword})
-
-    },
-
-    // 货主、客户 - 选择弹框 - 确认
-    ownerCustomerPopupConfirm(type, item) {
-      this[type].code = item.code
-      this[type].id = item.id
-      this[type].name = item.name
-
-      if (type === 'owner') {
-        this.customer.focus = true
-        !this.skuList.length && this.addSku()
-      }
-
-    },
-    // 货主、客户 - 选择弹框 - 清空
-    ownerCustomerPopupClear(type) {
-      this[type].code = ''
-      this[type].name = ''
-      this[type].id = ''
-
-      if (type === 'owner') {
-        this.skuList = []
-      }
-    },
-    // 校验单头数据是否填写完整
-    checkOrderInfo() {
-
-      if (!this.owner.id) {
-        this.owner.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.wvbyqhlj', '请选择货主')
-        )
-        return false
-      }
-      if (!this.customer.code) {
-        this.customer.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.tjpcxsqu', '请选择客户')
-        )
-        return false
-      }
-      const msg = {
-        type: this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.yvjdbqdb', '请选择订单类型'),
-        extSoNo: this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.pvxlzqar', '请输入外部单号'),
-      }
-
-      for (const i in msg) {
-        if (!this[i]) {
-          this.$lwShowErrorMsg(msg[i])
-          return false
-        }
-      }
-
-      return true
-
-    },
-
-    // 外部单号输入确认
-    extSoNoConfirm() {
-      if (this.skuList.length) {
-        const firstSku = this.skuList[0]
-        if (firstSku.skuCode) {
-          firstSku.qtyFocus = true
-        } else {
-          firstSku.skuFocus = true
-        }
-      }
-    },
-
-
-    // 增加商品
-    async addSku() {
-
-      if (!this.owner.id) {
-        this.owner.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.wvbyqhlj', '请选择货主')
-        )
-        return
-      }
-
-      this.skuList.push({
-        skuCode: '',
-        skuFocus: true,
-        skuName: '',
-        skuQty: '',
-        abQty: '',
-        qtyFocus: false,
-        skuId: '',
-        txCode: 'I'
-      })
-
-    },
-    // 删除商品
-    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*/
-
-      projectWmsOutboundPDAQuerySkuInvAbQty({
-        ownerId: this.owner.id,
-        skuId: item.id
-      }).then(res => {
-        this.skuList[index].skuCode = res.skuCode
-        this.skuList[index].skuName = res.skuName
-        this.skuList[index].skuId = res.skuId
-        this.skuList[index].abQty = res.abQty
-        this.skuList[index].qtyFocus = true
-      })
-
-    },
-    // 商品选择弹框 - 清除商品
-    selectPopupClear(index) {
-      this.skuList[index].skuCode = ''
-      this.skuList[index].skuName = ''
-      this.skuList[index].skuId = ''
-      this.skuList[index].skuQty = ''
-      this.skuList[index].abQty = ''
-    },
-
-    // 创建出库订单
-    async confirmCreate() {
-
-      if (!this.checkOrderInfo()) return
-
-      if (!this.skuList.length) {
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.zncbyvni', '请添加商品信息')
-        )
-        return
-      }
-
-      for (let i = 0; i < this.skuList.length; i++) {
-        if (!this.skuList[i].skuCode) {
-          this.$lwShowErrorMsg(
-            this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.glldehuz', '商品{num}，商品信息不能为空', {num: i + 1})
-          )
-          return
-        }
-        if (!Number(this.skuList[i].skuQty || 0)) {
-          this.$lwShowErrorMsg(
-            this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.rrxnqysp', '商品{num}，出库数量不能为空且应当是大于0的整数', {num: i + 1})
-          )
-          return
-        }
-      }
-
-      const soId = this.$route.query.soId
-      const api = soId ? projectWmsOutboundPDASoSubmitUpdateInfo : projectWmsOutboundPDASoCreate
-
-      let skuList = this.$lwDeepCopy(this.skuList)
-
-      if (soId) {
-        const newSku = this.skuList.filter(item => item.soLineId).map(item => item.soLineId)
-        this.oldSkuList.forEach(item => {
-          if (!newSku.includes(item.soLineId)) skuList.push({
-            ...item,
-            txCode: 'D'
-          })
-        })
-      }
-
-
-      const res = await api({
-        soId,
-        ownerId: this.owner.id,
-        customerCode: this.customer.code,
-        customerName: this.customer.name,
-        type: this.type,
-        planShipTime: this.planTime,
-        extSoNo: this.extSoNo,
-        remark: this.remark,
-        skuList,
-        returnMethod: this.back.value
-      })
-
-      const msg = soId ?
-        this.$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.createOrder.index.tzdgchkv','订单修改成功') :
-        this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.ynobrnrg', '订单创建成功')
-
-      this.$lwToast.success(msg)
-
-      if (soId) {
-        history.go(-1)
-        return
-      }
-
-      this.$router.push({
-        path: '/outbound/pickConsole/lwOrderAction',
-        query: {
-          lwOrderId: res.id,
-          lwBackStep: '2'
-        }
-      })
-    },
-
-  }
 }
 </script>
 

package/src/views/wms/page/outbound/pickConsole/index/index.vue

@@ -4,149 +4,29 @@
   @date: 2023-04-02
 -->
 <template>
-  <div>
-
-    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.index.index.aadtefah','拣选控制台')"/>
-
-    <div class="lw-global-page-box">
-
-      <div class="lw-global-model-box lw-global-model-box-3px">
-
-        <lw-input
-          :placeholder="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.index.index.xvjhwdvb','可输入单号/外部单号进行搜索')"
-          v-model="searchVal"
-          :create-rule="$lwScanRule.create('出库拣选控制台-搜索','ASN')"
-          rule-key="asn"
-          :show-bottom-border="false"
-          @confirm="searchConfirm"
-        >
-
-          <template #button>
-
-            <lw-button
-              round
-              mini
-              @click="searchConfirm"
-            >
-              {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.index.index.jcszcygo','搜索') }}
-            </lw-button>
-
-          </template>
-
-        </lw-input>
-
-      </div>
-
-      <order-info
-        v-for="(i,k) in orderList"
-        :key="k"
-        :item="i"
-        @click="orderItemClick(i)"
-      />
-
-      <lw-not-data v-if="!orderList.length"/>
-      <lw-pagination
-        v-model="pageNum"
-        :page-total="pageTotal"
-        :page-size.sync="pageSize"
-        @change="pageChange"
-      />
-
-    </div>
-
-    <lw-bottom-bar>
-
-      <lw-button @click="createOrder">
-        {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.index.index.xnwgfzrf','创建出库订单') }}
-      </lw-button>
-
-    </lw-bottom-bar>
-
-  </div>
+  <index-page
+    :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.index.index.aadtefah','拣选控制台')"
+    now-path="/outbound/pickConsole/lwIndex"
+    action-path="/outbound/pickConsole/lwOrderAction"
+    create-path="/outbound/pickConsole/lwCreateOrder"
+  >
+  </index-page>
 </template>
 
 <script>
 
-import orderInfo from "./../components/orderInfo.vue";
-import {projectWmsOutboundPDASoPickQuery} from "../../../../api/outbound/pickConsole/orderPick";
+import indexPage from "./../../../../components/consoleAndPick/indexPage.vue";
 
 export default {
   name: "lwOutboundPickConsoleIndex",
   components: {
-    orderInfo
+    indexPage
   },
   data() {
     return {
-      searchVal: '',
 
-      orderList: [],
-      pageNum: 1,
-      pageSize: 10,
-      pageTotal: 0,
     }
   },
-  mounted() {
-
-    const {keyword, pageNum, pageSize} = this.$route.query
-
-    this.searchVal = this.$lwCheckVal(keyword, '')
-    this.pageNum = Number(pageNum) || 1
-    this.pageSize = Number(pageSize) || 10
-
-    this.pageChange()
-  },
-  methods: {
-    // 搜索
-    searchConfirm() {
-      this.pageNum = 1
-      this.pageChange()
-    },
-
-    // 获取数据
-    pageChange() {
-      projectWmsOutboundPDASoPickQuery({
-        keyword: this.searchVal,
-        pageNum: this.pageNum,
-        pageSize: this.pageSize
-      }).then(res => {
-        this.pageTotal = res.total
-        this.orderList = res.datas || []
-      })
-    },
-
-    // 记录当前的页码信息
-    savePageInfo() {
-      this.$router.replace({
-        path: '/outbound/pickConsole/lwIndex',
-        query: {
-          keyword: this.searchVal,
-          pageNum: this.pageNum,
-          pageSize: this.pageSize,
-          _time: Date.now()
-        }
-      })
-    },
-
-    // 订单项目点击
-    orderItemClick(item) {
-      this.savePageInfo()
-      this.$router.push({
-        path: '/outbound/pickConsole/lwOrderAction',
-        query: {
-          lwOrderId: item.soId
-        }
-      })
-    },
-
-    // 创建出库订单
-    createOrder() {
-      this.savePageInfo()
-      this.$router.push({
-        path: '/outbound/pickConsole/lwCreateOrder'
-      })
-    }
-
-  }
 }
 </script>