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

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,21 @@ export default {
   name: "lwReceiveAbnormalActionPage",
   data() {
     return {
-      asnNo:''
+      asnNo: '',
+      sn: {
+        value: '',
+        qty: ''
+      },
+      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('','请选择单据')"
+      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/console/components/orderInfo.vue

@@ -8,101 +8,119 @@
     class="lw-global-model-box lw-global-row-box"
     @click="modelClick"
   >
-
-    <div class="lw-global-flex-between">
-
-      <div class="lw-global-value-bold">{{ item.asnNo }}</div>
-
-      <lw-tag
-        plain
-        round
-        :type="tagType"
-      >
-        {{ item.billStatusLabel }}
-      </lw-tag>
-
-    </div>
-
-    <lw-title-value-cell
-      :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.components.orderInfo.edamqzhk','外部单号')"
-      :value="$lwCheckVal(item.extNo)"
-      val-bold
-      :is-row="false"
-    />
-
-    <div class="lw-global-flex-between">
-
-      <lw-title-value-cell
-        :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.components.orderInfo.vqxjllve','订单类型')"
-        :value="item.typeLabel"
-        val-bold
-        :is-row="false"
-      />
-
+    <!-- 使用LV模式 2023-12-15 弃用 -->
+    <!--    <div class="lw-global-flex-between">
+
+          <div class="lw-global-value-bold">{{ item.asnNo }}</div>
+
+          <lw-tag
+            v-if="item.billStatusLabel"
+            plain
+            round
+            :type="tagType"
+          >
+            {{ item.billStatusLabel }}
+          </lw-tag>
+
+        </div>
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.components.orderInfo.edamqzhk','外部单号')"
+          :value="$lwCheckVal(item.extNo)"
+          val-bold
+          :is-row="false"
+        />
+
+        <div class="lw-global-flex-between">
+
+          <lw-title-value-cell
+            :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.components.orderInfo.vqxjllve','订单类型')"
+            :value="item.typeLabel"
+            val-bold
+            :is-row="false"
+          />
+
+        </div>
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.components.orderInfo.brecitqd','货主')"
+          :value="$lwCheckVal(item.ownerCode)+' / '+$lwCheckVal(item.ownerName)"
+          :is-row="false"
+        />
+
+        <div class="lw-global-flex-between">
+          <lw-title-value-cell
+            :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.components.orderInfo.qmfjorel','已收数量')"
+            :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="$lwCheckVal(item.receiveLpnCount,0)+' / '+$lwCheckVal(item.lpnCount,0)"
+            :is-row="false"
+            val-bold
+          />
+        </div>
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.components.orderInfo.btipdyjw','创建时间')"
+          :value="$lwDate.format(item.insertDate,'yyyy-MM-dd hh:mm:ss')"
+          :is-row="false"
+        />
+
+        <lw-title-value-cell
+          v-if="item.endReceiveTime"
+          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.components.orderInfo.acheydhw','完成时间')"
+          :value="$lwDate.format(item.endReceiveTime,'yyyy-MM-dd hh:mm:ss')"
+          :is-row="false"
+        />-->
+
+    <lw-label-value-group :list="item.contentList"/>
+
+    <div class="lw-global-bottom-border" style="margin-top: 5px"></div>
+
+    <div
+      style="text-align: right"
+      class="lw-global-row-end btn-box"
+    >
       <lw-button
         v-if="item.returnOrderCount > 0"
-        mini
-        round
+        small
+        type="last"
         @click.stop="orderBack"
       >
         {{ $lwLanguage.get('wms_project.pda.wms.page.receive.console.components.orderInfo.iwrvduou', '回单上传') }}
       </lw-button>
 
-      <div v-if="this.item.billStatus === '100'">
+      <lw-button
+        v-if="item.billStatus !== '100' && item.billStatus !== '500'"
+        small
+        @click.stop="receiveClick"
+      >
+        {{ $lwLanguage.get('', '收货') }}
+      </lw-button>
+
+      <template v-if="item.billStatus === '100'">
         <lw-button
-          mini
+          small
           plain
           type="last"
           @click.stop="orderCancel"
         >
-          {{ $lwLanguage.get('wms_project.pda.views.wms.page.receive.console.components.orderInfo.thehkiuy','取消') }}
+          {{ $lwLanguage.get('wms_project.pda.views.wms.page.receive.console.components.orderInfo.thehkiuy', '取消') }}
         </lw-button>
 
         <lw-button
-          mini
+          small
           @click.stop="orderConfirm"
         >
-          {{ $lwLanguage.get('wms_project.pda.views.wms.page.receive.console.components.orderInfo.audaciph','确认') }}
+          {{ $lwLanguage.get('wms_project.pda.views.wms.page.receive.console.components.orderInfo.audaciph', '确认') }}
         </lw-button>
-      </div>
-
-    </div>
-
-    <lw-title-value-cell
-      :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.components.orderInfo.brecitqd','货主')"
-      :value="$lwCheckVal(item.ownerCode)+' / '+$lwCheckVal(item.ownerName)"
-      :is-row="false"
-    />
-
-    <div class="lw-global-flex-between">
-      <lw-title-value-cell
-        :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.components.orderInfo.qmfjorel','已收数量')"
-        :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="$lwCheckVal(item.receiveLpnCount,0)+' / '+$lwCheckVal(item.lpnCount,0)"
-        :is-row="false"
-        val-bold
-      />
+      </template>
     </div>
 
-    <lw-title-value-cell
-      :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.components.orderInfo.btipdyjw','创建时间')"
-      :value="$lwDate.format(item.insertDate,'yyyy-MM-dd hh:mm:ss')"
-      :is-row="false"
-    />
-
-    <lw-title-value-cell
-      v-if="item.endReceiveTime"
-      :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.components.orderInfo.acheydhw','完成时间')"
-      :value="$lwDate.format(item.endReceiveTime,'yyyy-MM-dd hh:mm:ss')"
-      :is-row="false"
-    />
-
     <lw-popup
       :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.components.orderInfo.esloubqu','选择收货方式')"
       v-model="selectTypePopup.show"
@@ -135,6 +153,12 @@ export default {
       type: Object,
       default: () => {
       }
+    },
+    // 页面跳转前的回调函数
+    pageJumpFn: {
+      type: Function,
+      default: () => {
+      }
     }
   },
   computed: {
@@ -196,20 +220,32 @@ export default {
   methods: {
     // 模块点击
     modelClick() {
-      if (this.item.billStatus === '500') {
-        this.$router.push({
-          path: '/receive/console/lwLook',
-          query: {
-            lwId: this.item.id
-          }
-        })
-        return
-      }
       if (this.item.billStatus === '100') {
         this.orderEdit()
         return
       }
 
+      this.pageJumpFn()
+      this.$router.push({
+        path: '/receive/console/lwLook',
+        query: {
+          lwId: this.item.id
+        }
+      })
+    },
+    // 收货回单按钮点击
+    orderBack() {
+      this.pageJumpFn()
+      this.$router.push({
+        path: '/receive/receipt/lwReceiptConfirm',
+        query: {
+          lwOrder: this.item.asnNo,
+          lwType: "receive"
+        }
+      })
+    },
+    // 收货按钮点击
+    receiveClick() {
       if (!this.receiveType.length) {
         this.$lwShowErrorMsg(
           this.$lwLanguage.get('wms_project.pda.wms.page.receive.console.components.orderInfo.ymjhuuwf', '没有配置收货方式，请联系系统管理员')
@@ -224,23 +260,13 @@ export default {
 
       this.selectTypePopup.show = true
     },
-    // 收货回单按钮点击
-    orderBack() {
-      this.$router.push({
-        path: '/receive/receipt/lwReceiptConfirm',
-        query: {
-          lwOrder: this.item.asnNo,
-          lwType: "receive"
-        }
-      })
-    },
 
     // 订单 - 取消
     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','确认取消当前到货通知单？')
+        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
@@ -256,6 +282,7 @@ export default {
     },
     // 订单 - 编辑
     orderEdit() {
+      this.pageJumpFn()
       this.$router.push({
         path: '/receive/console/lwCreateEditOrder',
         query: {
@@ -283,6 +310,7 @@ export default {
 
     // 跳转页面
     goPage(path) {
+      this.pageJumpFn()
       this.$router.push({path, query: {asnNo: this.item.asnNo}})
     }
   }
@@ -290,5 +318,9 @@ export default {
 </script>
 
 <style scoped lang="less">
-
+.btn-box {
+  > .lw-button {
+    width: 23%;
+  }
+}
 </style>