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

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

@@ -11,13 +11,13 @@
         $lwLanguage.get('wms_project.pda.receive.receipt.title','收货回单') :
         $lwLanguage.get('wms_project.pda.advance.receive.return.title','预收货回单')"/>
 
-
-    <div class="lw-global-page-box">
+    <lw-page-body-module>
       <lw-tab-box>
         <van-tabs
           type="card"
           animated
           v-model="tabActive"
+          @change="tabChange"
         >
 
           <van-tab
@@ -25,83 +25,46 @@
             :key="k"
             :name="k"
             :title="i.orderNo"
-          >
-            <div class="lw-global-model-box">
-
-              <lw-title-value-cell
-                v-for="(inner,index) in i.content"
-                :key="index"
-                :title="index"
-                :value="inner"
-                :is-row="false"
-              />
-
-            </div>
-
-            <div class="lw-global-model-box" style="padding-bottom: 5px">
-              <div class="lw-global-title" style="margin-bottom: 5px">
-                {{
-                  $lwLanguage.get('wms_project.pda.components.page.receive.receipt.action.index.ekdftitf', '回单照片')
-                }}
-              </div>
-              <lw-img-upload v-model="i.lwImages"/>
-
-            </div>
-
-            <div
-              class="lw-global-model-box"
-              v-for="(item,key) in i.lines"
-              :key="key"
-            >
-              <div class="lw-global-flex-between" style="align-items: flex-start">
-                <div style="flex: 1">
-                  <div class="lw-global-value-bold">{{ item.sku.code }}</div>
-                  <div class="lw-global-title">{{ item.sku.name }}</div>
-                </div>
-
-                <lw-tag
-                  style="flex-shrink: 0"
-                  round
-                  plain
-                >
-                  {{ item.sku.skuUrgencyLabel }}
-                </lw-tag>
-
-              </div>
-
-              <div class="lw-global-flex-between" style="margin-top: 5px">
-
-                <lw-title-value-cell
-                  :title="$lwLanguage.get('wms_project.pda.receive.receipt.receiveQty', '收货量')"
-                  :value="item.receiveQty"
-                  val-bold
-                  :is-row="false"
-                />
-
-                <lw-title-value-cell
-                  :title="$lwLanguage.get('wms_project.pda.receive.receipt.abnQty', '异常量')"
-                  :value="item.abnormalQty"
-                  val-bold
-                  val-red
-                  :is-row="false"
-                />
-
-              </div>
-
-            </div>
-          </van-tab>
+          />
         </van-tabs>
       </lw-tab-box>
-
-
-    </div>
+      <!-- 单头数据 -->
+      <lw-label-value-group
+        :list="asnData.contentList"
+        show-model-style
+      />
+      <!-- 回单图片 -->
+      <div class="lw-global-model-box" style="padding-bottom: 5px">
+        <div class="lw-global-title" style="margin-bottom: 5px">
+          {{
+            $lwLanguage.get('wms_project.pda.components.page.receive.receipt.action.index.ekdftitf', '回单照片')
+          }}
+        </div>
+        <lw-img-upload v-model="images"/>
+
+      </div>
+      <!-- 商品信息 -->
+      <lw-label-value-group
+        v-for="(item,key) in skuData.list"
+        :key="key"
+        :list="item.contentList"
+        show-model-style
+      />
+      <lw-pagination
+        v-model="skuData.pageNum"
+        :page-size.sync="skuData.pageSize"
+        :page-total="skuData.pageTotal"
+        @change="getSkuData"
+      />
+    </lw-page-body-module>
 
     <lw-bottom-bar>
-      <lw-button v-if="receive" @click="confirmReceive">
-        {{ $lwLanguage.get('wms_project.pda.receive.receipt.confirmReceipt', '确认收货回单') }}
-      </lw-button>
-      <lw-button v-else @click="confirmAdvanceReceive">
-        {{ $lwLanguage.get('wms_project.pda.advance.receive.return.btn', '确认预收货回单') }}
+      <lw-button @click="confirmReceive">
+        {{
+          receive ?
+            $lwLanguage.get('wms_project.pda.receive.receipt.confirmReceipt', '确认收货回单') :
+            $lwLanguage.get('wms_project.pda.advance.receive.return.btn', '确认预收货回单')
+        }}
       </lw-button>
     </lw-bottom-bar>
 
@@ -111,9 +74,11 @@
 <script>
 
 import {
-  wmsMobileQueryReturnReceiptOrder,
+  wmsMobileExtInQueryReturnOrder,
   wmsMobileReturnReceiptOrder,
-  wmsMobileReturnAdvanceReceiptOrder
+  wmsMobileReturnAdvanceReceiptOrder,
+  wmsMobileExtInGetReturnOrder,
+  wmsMobileExtInQueryReturnOrderSku
 } from "../../../../api/receive/receipt";
 
 export default {
@@ -122,28 +87,47 @@ export default {
     return {
       // tab激活项
       tabActive: '',
+      // 原tab激活项
+      oldTabActive: '',
+      // 到货安信息
+      asnData: [],
+      // 回单图片
+      images: [],
+      // 商品数据
+      skuData: {
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
+        list: []
+      },
 
       // 回单数据
       receiptData: [],
+      // 是否是收货回单
       receive: true,
     }
   },
+  computed: {
+    nowAsnData() {
+      if (!this.receiptData.length) return {}
+      return this.receiptData[this.oldTabActive]
+    }
+  },
   mounted() {
     const {lwOrder, lwDate, lwType} = this.$route.query
     this.receive = "receive" === lwType
 
-    wmsMobileQueryReturnReceiptOrder({
+    wmsMobileExtInQueryReturnOrder({
       no: lwOrder,
       time: lwDate
     }).then(res => {
 
-      this.receiptData = res
+      this.receiptData = res || []
 
       if (this.receiptData.length) {
         this.tabActive = 0
-        this.receiptData.forEach(item => {
-          item.lwImages = item.images ? item.images.split('|') : []
-        })
+        this.oldTabActive = 0
+        this.getAsnData()
         return
       }
 
@@ -156,42 +140,92 @@ export default {
 
   },
   methods: {
-    onConfirmAfter() {
-      // 删除当前提交的数据
-      this.receiptData.splice(this.tabActive, 1)
 
-      if (this.receiptData.length) {
-        this.tabActive = 0
-        this.$lwToast.success(
-          this.$lwLanguage.get('wms_project.pda.receive.receipt.changeSuccess', '操作成功')
-        )
+    // 清空数据，并重新获取数据
+    clearData() {
+      this.images = []
+      this.skuData.pageSize = 10
+      this.skuData.pageNum = 10
+      this.skuData.pageTotal = 0
+      this.skuData.list = []
+
+      this.getAsnData()
+    },
+
+    // tab切换
+    tabChange() {
+      if (this.images.length) {
+        this.$lwDialog.confirm({
+          type: 'warning',
+          title: this.$lwLanguage.get('', '警告'),
+          message: this.$lwLanguage.get('', '切换后当前页面数据将会被清空')
+        }).then(() => {
+          this.oldTabActive = this.tabActive
+          this.clearData()
+        }).catch(() => {
+          this.tabActive = this.oldTabActive
+        })
         return
       }
 
-      this.$lwToast.success(
-        this.$lwLanguage.get('wms_project.pda.receive.receipt.allOver', '当前订单已全部回单')
-      )
-      history.go(-1)
+      this.oldTabActive = this.tabActive
+      this.clearData()
+
     },
-    // 确认收货回单
-    confirmReceive() {
-      const data = this.receiptData[this.tabActive]
-      wmsMobileReturnReceiptOrder({
-        id: data.id,
-        images: data.lwImages.join('|')
-      }).then(() => {
-        this.onConfirmAfter()
+
+    // 获取订单信息X
+    getAsnData() {
+
+      wmsMobileExtInGetReturnOrder({id: this.nowAsnData.id}).then(res => {
+        this.asnData = res
+        this.images = res.images ? res.images.split('|') : []
       })
+
+      // 获取商品信息
+      this.getSkuData()
     },
-    confirmAdvanceReceive() {
-      const data = this.receiptData[this.tabActive]
-      wmsMobileReturnAdvanceReceiptOrder({
-        id: data.id,
-        images: data.lwImages.join('|')
+    // 商品页码改变
+    getSkuData() {
+      wmsMobileExtInQueryReturnOrderSku({
+        pageNum: this.skuData.pageNum,
+        pageSize: this.skuData.pageSize,
+        id: this.nowAsnData.id
+      }).then(res => {
+        this.skuData.pageTotal = res.total
+        this.skuData.list = res.datas
+      })
+    },
+
+    // 确认收货、预收货回单
+    confirmReceive() {
+      const api = this.receive ?
+        wmsMobileReturnReceiptOrder :
+        wmsMobileReturnAdvanceReceiptOrder
+
+      api({
+        id: this.nowAsnData.id,
+        images: this.images.join('|')
       }).then(() => {
-        this.onConfirmAfter()
+        // 删除当前提交的数据
+        this.receiptData.splice(this.tabActive, 1)
+
+        if (this.receiptData.length) {
+          if (this.receiptData.length < (this.tabActive + 1)) {
+            this.tabActive = 0
+          }
+
+          this.$lwToast.success(
+            this.$lwLanguage.get('wms_project.pda.receive.receipt.changeSuccess', '操作成功')
+          )
+          return
+        }
+
+        this.$lwToast.success(
+          this.$lwLanguage.get('wms_project.pda.receive.receipt.allOver', '当前订单已全部回单')
+        )
+        history.go(-1)
       })
-    }
+    },
   }
 }
 </script>

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

@@ -9,7 +9,7 @@
 
     <div class="lw-global-page-box">
 
-      <div class="lw-global-model-box">
+      <div class="lw-global-model-box lw-global-model-box-3px">
 
         <lw-input
           :title="$lwLanguage.get('wms_project.pda.receive.receipt.order','订单号')"
@@ -18,11 +18,13 @@
           input-align="right"
           required
           rule-key="order"
+          :create-rule="$lwScanRule.create('收货回单-起始页-订单号','ASN')"
         />
 
         <lw-cell-popup-date
           :title="$lwLanguage.get('wms_project.pda.receive.receipt.date','到货日期')"
           v-model="date"
+          :border="false"
         />
 
       </div>
@@ -35,14 +37,14 @@
         v-if="showWaitReceiptBtn"
         type="last"
         plain
-        @click="waitOrder"
+        @click="receiveOrder('advanceReceive')"
       >
         {{ $lwLanguage.get('wms_project.pda.receive.receipt.waitOrder','预收货回单') }}
       </lw-button>
 
       <lw-button
         v-if="showReceiptBtn"
-        @click="receiveOrder"
+        @click="receiveOrder('receive')"
       >
         {{ $lwLanguage.get('wms_project.pda.receive.receipt.qazwsxed','收货回单') }}
       </lw-button>
@@ -96,30 +98,16 @@ export default {
       return false
     },
 
-    // 预收货回单
-    waitOrder(){
-      if (!this.orderCheck()) return
-
-      this.$router.push({
-        path:'/receive/receipt/lwReceiptConfirm',
-        query:{
-          lwOrder: this.order.value,
-          lwDate: this.date,
-          lwType: "advanceReceive"
-        }
-      })
-    },
-
     // 收货回单按钮
-    receiveOrder(){
+    receiveOrder(lwType) {
       if (!this.orderCheck()) return
 
       this.$router.push({
-        path:'/receive/receipt/lwReceiptConfirm',
-        query:{
+        path: '/receive/receipt/lwReceiptConfirm',
+        query: {
           lwOrder: this.order.value,
           lwDate: this.date,
-          lwType: "receive"
+          lwType
         }
       })
     }