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

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

@@ -8,22 +8,19 @@
 
     <lw-nav-bar :title="navTitle"/>
 
-    <div
-      v-if="initOver"
-      class="lw-global-page-box"
-    >
+    <lw-page-body-module v-if="initOver">
 
       <div class="lw-global-model-box lw-global-model-box-3px">
-        <lw-search-cell-popup
+        <lw-search-select-popup-module
+          ref="owner"
+          :api="$lwApi.common.searchOwner"
           :title="$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.rxruwjzr','货主')"
+          v-model="owner.id"
           :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"
@@ -84,67 +81,143 @@
 
       </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)
-            }}
+      <lw-tab-box style="margin-top: 10px">
+
+        <van-tabs
+          v-if="asnId"
+          type="card"
+          animated
+          v-model="tabActive"
+          @change="tabChange"
+        >
+
+          <van-tab
+            name="add"
+            :title="$lwLanguage.get('', '添加商品')"
+          >
+          </van-tab>
+          <van-tab
+            name="allSkuList"
+            :title="$lwLanguage.get('', '商品列表')"
+          >
+
+
+            <div
+              v-for="(i,k) in allSkuList.data"
+              :key="k"
+              class="lw-global-model-box"
+            >
+              <lw-sku-info-module
+                :sku-name="i.sku.name"
+                :sku-code="i.sku.code"
+              >
+
+                <van-icon
+                  size="18px"
+                  name="edit"
+                  color="rgb(0, 68, 208)"
+                  @click="allSkuListEdit(i)"
+                />
+              </lw-sku-info-module>
+
+              <div class="lw-global-flex-between">
+
+                <div
+                  class="lw-global-flex-start"
+                  style="flex: 1"
+                  v-for="(item,index) in i.qtyList"
+                  :key="'inner'+index"
+                >
+
+                  <div style="margin: 0 5px" v-if="index>0">/</div>
+                  <lw-title-value-cell
+                    :title="item.label"
+                    :value="item.qtyStr"
+                    :is-row="false"
+                    val-red
+                    val-bold
+                  />
+                </div>
+
+                <van-icon
+                  style="flex-shrink: 0"
+                  size="18px"
+                  color="#d50000"
+                  name="delete-o"
+                  @click="allSkuListDel(i)"
+                />
+              </div>
+
+            </div>
+            <lw-pagination
+              v-model="allSkuList.pageNum"
+              :page-size.sync="allSkuList.pageSize"
+              :page-total="allSkuList.pageTotal"
+              @change="getAllSkuList"
+            />
+            <lw-not-data v-if="!allSkuList.pageTotal"/>
+
+          </van-tab>
+        </van-tabs>
+
+      </lw-tab-box>
+
+      <template v-if="tabActive==='add'">
+        <div
+          style="padding-bottom: 3px"
+          class="lw-global-model-box"
+          v-for="(i,k) in skuList"
+          :key="k"
+        >
+
+          <div class="lw-global-flex-between lw-global-row-start">
+
+            <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-select-popup-module
+            :api="skuCodeConfirm"
+            :title="$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.jzmugrnhc','商品')"
+            :get-focus.sync="i.skuFocus"
+            :create-rule="$lwScanRule.create('收货控制台-创建到货通知单-商品编码','SKU')"
+            rule-key="skuCode"
+            required
+            @confirm="item=>selectPopupConfirm(item,k)"
+            @clear="selectPopupClear(k)"
+          />
+          <lw-get-qty-by-type
+            v-if="i.showQty"
+            :ref="i._time"
+            :sku-id="i.skuId"
+            :owner-id="owner.id"
+          />
 
+        </div>
+        <div
+          style="margin: 20px 0"
+          class="lw-global-flex-center"
+        >
           <van-icon
-            name="delete"
-            size="18"
-            color="#d50000"
-            @click="delSku(k)"
+            size="30px"
+            name="add"
+            color="#D50000"
+            @click="addSku"
           />
         </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"
-        />
+      </template>
 
-      </div>
-
-      <div
-        style="margin: 20px 0"
-        class="lw-global-flex-center"
-      >
-        <van-icon
-          size="30px"
-          name="add"
-          color="#D50000"
-          @click="addSku"
-        />
-      </div>
 
-
-    </div>
+    </lw-page-body-module>
 
     <lw-bottom-bar>
 
@@ -155,25 +228,74 @@
     </lw-bottom-bar>
 
 
+    <!-- 商品编辑弹框 -->
+    <lw-popup
+      :title="$lwLanguage.get('', '编辑商品')"
+      v-model="editPopup.show"
+      @opened="editPopupOpen"
+    >
+
+      <!--      <lw-search-select-popup-module
+              ref="editSku"
+              v-model="editPopup.skuId"
+              :title="$lwLanguage.get('','商品编码')"
+              :get-focus.sync="editPopup.skuFocus"
+              :create-rule="$lwScanRule.create('收货控制台-到货通知单-编辑商品','SKU')"
+              rule-key="skuCode"
+              required
+              show-bottom-border
+              :owner-id="owner.id"
+              :api="skuCodeConfirm"
+              @confirm="editPopup.qtyFocus=true"
+              @clear="editPopupSkuClear"
+            />-->
+      <lw-title-value-cell
+        :title="$lwLanguage.get('','商品编码')"
+        :value="editPopup.skuInitData.code + ' / ' + editPopup.skuInitData.name"
+      />
+      <lw-get-qty-by-type
+        ref="editPopupQty"
+        :sku-id="editPopup.skuId"
+        :owner-id="owner.id"
+      />
+      <!--      <lw-input
+              :title="$lwLanguage.get('','入库数量')"
+              v-model="editPopup.qty"
+              :get-focus.sync="editPopup.qtyFocus"
+              type="digit"
+              required
+            />-->
+
+      <template #button>
+
+        <lw-button @click="editPopupConfirm">
+          {{ $lwLanguage.get('', '保存') }}
+        </lw-button>
+
+      </template>
+
+    </lw-popup>
   </div>
 </template>
 
 <script>
 
 import {
-  wmsMobileGetOwnerSku,
-  wmsMobileGetWarehouseOwner
-} from "../../../../api/outbound/pickConsole/orderPick";
-import {
-  wmsMobileEditAsnBySku,
+  wmsMobileConsoleInAsnByCreateV2,
+  wmsMobileConsoleInAsnByEditV2,
+  wmsMobileConsoleInAsnGetDetailByEdit,
+  wmsMobileConsoleInAsnLineByAddV2, wmsMobileConsoleInAsnLineByDeleteV2, wmsMobileConsoleInAsnLineByEditV2,
+  wmsMobileConsoleInAsnQuerySkuPageListByEdit,
   wmsMobileGetAsnReturnType,
-  wmsMobileInboundGetAsnDetailByNew
 } from "../../../../api/receive/console";
 
 export default {
   name: "lwReceiveConsoleCreateEditOrder",
   data() {
     return {
+      asnId: '',
+      // tab激活项
+      tabActive: 'add',
       initOver: false,
 
       navTitle: '',
@@ -184,8 +306,6 @@ export default {
         code: '',
         name: '',
         id: '',
-
-        initVal: null
       },
       // 订单类型
       type: '',
@@ -210,21 +330,31 @@ export default {
       },
 
       skuList: [],
-      // 编辑时使用
-      oldSkuList: [],
+      // 商品列表
+      allSkuList: {
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
+        data: []
+      },
 
-      skuPopup: {
+      // 编辑商品弹框
+      editPopup: {
         show: false,
-        index: '',
-        search: '',
-        list: [],
-        result: ''
-      }
+        skuId: '',
+        soLineId: '',
+        skuFocus: false,
+        skuInitData: {},
+        abQty: '',
+        qty: '',
+        qtyFocus: false,
+      },
+
     }
   },
   computed: {
     inputDisabled() {
-      return this.skuList.some(item => item.skuCode)
+      return this.skuList.some(item => item.skuCode) || !!this.allSkuList.pageTotal
     },
 
     // 是否显示退货原因
@@ -233,6 +363,7 @@ export default {
     }
   },
   created() {
+    this.asnId = this.$route.query.asnId || ''
     this.init()
   },
   methods: {
@@ -243,34 +374,38 @@ export default {
 
       wmsMobileGetAsnReturnType().then(res => this.returnReason.list = res)
 
-      if (this.$route.query.asnId) {
+      if (this.asnId) {
         await this.getEditData()
+        this.getAllSkuList()
       } else {
-        this.navTitle = this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.fyocgqtf','创建到货通知单')
+        this.navTitle = this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.fyocgqtf', '创建到货通知单')
       }
       this.initOver = true
+
+      this.$nextTick(() => {
+        this.$route.query.asnId && this.$refs.owner.initEchoData(true)
+      })
+    },
+
+    // tab切换
+    tabChange() {
+      if (this.tabActive === 'allSkuList' && !this.allSkuList.pageTotal) this.getAllSkuList()
     },
 
     // 获取编辑数据
     async getEditData() {
-      this.navTitle = this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.pbqrggcm','修改到货通知单')
+      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 res = await wmsMobileConsoleInAsnGetDetailByEdit({
+          asnId: this.asnId
         })
 
-        const {ownerCode, ownerName} = res
-
         this.owner = {
-          code: ownerCode,
-          name: ownerName,
+          code: res.ownerCode,
+          name: res.ownerName,
           id: res.ownerId,
           focus: false,
-          initVal: {
-            code: ownerCode,
-            name: ownerName
-          }
         }
 
         this.type = res.type
@@ -279,21 +414,6 @@ export default {
         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)
@@ -311,10 +431,7 @@ export default {
       }
       return true
     },
-    // 货主 - 获取数据API
-    getOwnerData(keyword) {
-      return wmsMobileGetWarehouseOwner({keyword})
-    },
+
     // 货主 - 选择弹框 - 确认
     ownerPopupConfirm(item) {
       this.owner.code = item.code
@@ -373,6 +490,8 @@ export default {
         qty: '',
         skuFocus: true,
         qtyFocus: false,
+        showQty: false,
+        _time: Date.now()
       })
 
     },
@@ -381,12 +500,85 @@ export default {
       this.skuList.splice(index, 1)
     },
 
+    // 商品列表 - 编辑
+    allSkuListEdit(item) {
+      this.editPopup.skuInitData = {
+        code: item.sku.code,
+        name: item.sku.name
+      }
+      this.editPopup.qty = item.qty
+      this.editPopup.skuId = item.sku.id
+      this.editPopup.show = true
+    },
+    // 商品列表 - 编辑 - 商品删除
+    editPopupSkuClear() {
+      this.editPopup.skuId = ''
+      this.editPopup.skuFocus = true
+      this.editPopup.qty = ''
+    },
+    // 商品列表 - 编辑 - 商品保存
+    editPopupConfirm() {
+      const {skuId} = this.editPopup
+
+      if (!skuId) {
+        this.editPopup.skuFocus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '商品信息不能为空')
+        )
+        return
+      }
+      const qty = this.$refs.editPopupQty?.getQty()
+
+      if (!qty) {
+        this.editPopup.skuFocus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '入库数量不能为空，且应当是大于0的正整数')
+        )
+        return
+      }
+
+      wmsMobileConsoleInAsnLineByEditV2({
+        asnId: this.asnId,
+        skuId,
+        qty
+      }).then(() => {
+        this.$lwToast.success(
+          this.$lwLanguage.get('', '操作成功')
+        )
+        this.getAllSkuList()
+        this.editPopup.show = false
+      })
+
+    },
+    // 商品列表 - 删除
+    allSkuListDel(item) {
+      this.$lwDialog.confirm({
+        type: 'warning',
+        title: this.$lwLanguage.get('', '提示'),
+        message: this.$lwLanguage.get('', '确认删除商品{name}?', {name: item.sku.name}),
+      }).then(() => {
+        wmsMobileConsoleInAsnLineByDeleteV2({
+          asnId: this.asnId,
+          skuId: item.sku.id
+        }).then(() => {
+          this.$lwToast.success(
+            this.$lwLanguage.get('', '已删除')
+          )
+          this.getAllSkuList()
+        })
+
+      })
+    },
+    // 商品列表 - 弹框打开
+    editPopupOpen() {
+      this.$refs.editPopupQty.init(this.editPopup.qty, true)
+    },
 
     // 搜索商品
-    skuCodeConfirm(keyword) {
-      return wmsMobileGetOwnerSku({
+    skuCodeConfirm(data) {
+      return this.$lwApi.common.searchSku({
+        ...data,
         ownerId: this.owner.id,
-        keyword
       })
     },
     // 商品选择弹框 - 确认选择
@@ -396,8 +588,12 @@ export default {
       this.skuList[index].skuCode = code
       this.skuList[index].skuName = name
       this.skuList[index].skuId = id
+      this.skuList[index].showQty = true
 
-      this.skuList[index].qtyFocus = true
+      this.$nextTick(() => {
+        const ref = this.skuList[index]._time
+        this.$refs[ref][0].init(0, true)
+      })
 
     },
     // 商品选择弹框 - 清除商品
@@ -407,17 +603,48 @@ export default {
       this.skuList[index].skuId = ''
       this.skuList[index].qty = ''
     },
+    // 商品信息校验
+    skuCheck(need) {
+
+      if (!this.skuList.length) {
+        if (!need) return true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.qbpjvtzs', '请添加商品信息')
+        )
+        return false
+      }
+
+      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 false
+        }
+
+        const ref = this.skuList[i]._time
+        const qty = this.$refs[ref][0].getQty()
+        if (!qty) {
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.tjotcezp', '商品{num}，入库数量不能为空且应当是大于0的整数', {num: i + 1})
+          )
+          return false
+        }
+        this.skuList[i].qty = qty
+      }
+
+      return true
+    },
 
 
     // 校验单头数据是否填写完整
     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','请选择订单类型')
+          this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.higbklsv', '请选择订单类型')
         )
         return false
       }
@@ -438,37 +665,34 @@ export default {
       return true
 
     },
-    // 创建到货通知单
+    // 保存按钮
     async confirmCreate() {
 
-      if (!this.checkOrderInfo()) return
+      if (!this.checkOrderInfo() || !this.skuCheck(!this.asnId)) return
 
-      if (!this.skuList.length) {
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.qbpjvtzs','请添加商品信息')
-        )
-        return
+      let msg, res
+      if (this.asnId) {
+        res = await this.editAsnApi()
+        this.skuList.length && await this.editAddSku()
+        msg = this.$lwLanguage.get('', '已保存')
+      } else {
+        msg = this.$lwLanguage.get('wms_project.pda.views.wms.page.receive.console.createEditOrder.index.hepzbczg', '到货通知单创建成功')
+        res = await this.createAsnApi(this.skuList)
       }
 
-      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
-        }
-      }
+      this.$lwToast.success(msg)
+
+      this.skuList = []
+      this.asnId = res.id
 
-      const asnId = this.$route.query.asnId || null
+      this.allSkuList.pageNum = 1
+      this.getAllSkuList()
 
-      await wmsMobileEditAsnBySku({
-        asnId,
+    },
+    // 到货单单头数据
+    getAsnData() {
+      return {
+        asnId: this.asnId,
         ownerId: this.owner.id,
         type: this.type,
         planArrivalTime: this.planTime,
@@ -476,18 +700,40 @@ export default {
         priority: this.priority.value,
         extNo: this.extSoNo.value,
         returnReason: this.returnReason.value,
-        lines: this.skuList
+        comeFrom: 'INPUT',
+      }
+    },
+    // 创建到货单api
+    createAsnApi(lines) {
+      return wmsMobileConsoleInAsnByCreateV2({
+        ...this.getAsnData(),
+        lines
+      })
+    },
+    // 编辑到货单
+    editAsnApi() {
+      return wmsMobileConsoleInAsnByEditV2(this.getAsnData())
+    },
+    // 编辑时 - 添加商品
+    editAddSku() {
+      return wmsMobileConsoleInAsnLineByAddV2({
+        lines: this.skuList,
+        asnId: this.asnId
       })
-
-      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)
     },
 
+    // 获取全部商品列表
+    getAllSkuList() {
+      wmsMobileConsoleInAsnQuerySkuPageListByEdit({
+        asnId: this.asnId,
+        pageNum: this.allSkuList.pageNum,
+        pageSize: this.allSkuList.pageSize,
+      }).then(res => {
+        this.allSkuList.data = res.datas || []
+        this.allSkuList.pageTotal = res.total || 0
+      })
+    }
+
   }
 }
 </script>