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

package/src/views/wms/page/outbound/delivery/action/index.vue

@@ -7,7 +7,7 @@
   <div>
     <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.shipTitle','装车发运')"/>
 
-    <div class="lw-global-page-box">
+    <lw-page-body-module>
 
       <!-- 发运单信息 -->
       <order-content-title
@@ -18,16 +18,18 @@
 
       <template v-if="!isAbn">
         <!-- tab -->
-        <lw-tab-box
-          v-if="orderContent.billStatus!=='300'"
-          style="margin-top: 10px"
-        >
+        <lw-tab-box style="margin-top: 10px">
           <van-tabs
             type="card"
             animated
             v-model="tabActive"
             @change="tabChange()"
           >
+            <van-tab
+              :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.shipByBox','按箱装车')"
+              name="box"
+            ></van-tab>
+
             <van-tab
               :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.shipByOrder','按单装车')"
               name="so"
@@ -38,10 +40,6 @@
               name="lpn"
             ></van-tab>
 
-            <van-tab
-              :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.shipByBox','按箱装车')"
-              name="box"
-            ></van-tab>
           </van-tabs>
         </lw-tab-box>
 
@@ -88,27 +86,30 @@
         <template v-if="tabActive==='so'">
 
           <!-- 输入框 -->
-          <div class="lw-global-model-box">
-            <div>
-              <lw-input
-                v-model="so.value"
-                :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.soNo', '出库单号')"
-                :get-focus.sync="so.focus"
-                :placeholder="$lwLanguage.get('wms_project.pda.outbound.delivery.action.inputOrderNo','出库单号/外部单号/客户单号')"
-                required
-                rule-key="order"
-                @confirm="soConfirm"
-              >
-                <template #button>
-                  <lw-button
-                    round
-                    mini
-                    @click="soConfirm"
-                  >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.loadCar', '装车') }}
-                  </lw-button>
-                </template>
-              </lw-input>
-            </div>
+          <div
+            v-if="orderContent.billStatus!=='300'"
+            class="lw-global-model-box lw-global-model-box-3px"
+          >
+
+            <lw-input
+              v-model="so.value"
+              :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.soNo', '出库单号')"
+              :get-focus.sync="so.focus"
+              :placeholder="$lwLanguage.get('wms_project.pda.outbound.delivery.action.inputOrderNo','出库单号/外部单号/客户单号')"
+              required
+              rule-key="order"
+              :show-bottom-border="false"
+              @confirm="soConfirm"
+            >
+              <template #button>
+                <lw-button
+                  round
+                  mini
+                  @click="soConfirm"
+                >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.loadCar', '装车') }}
+                </lw-button>
+              </template>
+            </lw-input>
 
           </div>
 
@@ -118,6 +119,7 @@
             :key="i.soNo"
             :index="k"
             :item="i"
+            :show-del="orderContent.billStatus!=='300'"
             @del="soDel"
           />
 
@@ -127,13 +129,17 @@
         <template v-if="tabActive==='lpn'">
 
           <!-- 输入框 -->
-          <div class="lw-global-model-box">
+          <div
+            v-if="orderContent.billStatus!=='300'"
+            class="lw-global-model-box lw-global-model-box-3px"
+          >
             <lw-input
               :title="$lwLanguage.get('wms_project.pda.outbound.delivery.action.lpn','托盘号')"
               v-model="lpn.value"
               :get-focus.sync="lpn.focus"
               required
               rule-key="lpn"
+              :show-bottom-border="false"
               @confirm="lpnConfirm"
             >
               <template #button>
@@ -148,20 +154,20 @@
           </div>
 
           <!-- 已装车托盘 -->
-
           <so-and-lpn-item
             v-for="(i,k) in lpn.list"
             :key="i.palletNo"
             :index="k"
             :item="i"
             type="lpn"
+            :show-del="orderContent.billStatus!=='300'"
             @del="lpnDel"
           />
 
         </template>
       </template>
 
-    </div>
+    </lw-page-body-module>
 
     <template v-if="!isAbn">
       <lw-bottom-bar v-if="orderContent.billStatus!=='300'">
@@ -170,7 +176,8 @@
           type="last"
           plain
           @click="openSoBatchOp"
-        >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.addSo', '添加出库单') }}
+        >
+          {{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.addSo', '添加出库单') }}
         </lw-button>
 
         <lw-button
@@ -185,13 +192,6 @@
         </lw-button>
       </lw-bottom-bar>
       <lw-bottom-bar v-else>
-        <lw-button
-          v-if="tabActive==='so'"
-          type="last"
-          plain
-          @click="openSoBatchOp"
-        >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.addSo', '添加出库单') }}
-        </lw-button>
 
         <lw-button
           type="normal"
@@ -344,7 +344,7 @@ export default {
   data() {
     return {
       // 发运id
-      deliveryId:'',
+      deliveryId: '',
 
       // 折叠面板展开项目
       activeNames: [],
@@ -352,7 +352,7 @@ export default {
       orderContent: {},
 
       // tab集货数据
-      tabActive: 'so',
+      tabActive: 'box',
 
       // 按箱
       box: {
@@ -627,12 +627,11 @@ export default {
       this.$lwDialog.confirm({
         title: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.notify', '提示'),
         message: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.isDelivery', '装车完成，是否发运'),
-        confirmButtonText: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.ship', '发运'),
-        cancelButtonText: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.return', '返回')
+        confirmButtonText: this.$lwLanguage.get('wms_project.pda.outbound.delivery.action.ship', '发运')
       }).then(() => {
         this.transportSubmit()
       }).catch(() => {
-        history.go(-1)
+        this.init()
       })
     },
 

package/src/views/wms/page/outbound/delivery/components/boxItem/index.vue

@@ -82,9 +82,11 @@
       </div>
 
       <!-- 装箱数据 -->
-      <div class="lw-global-row">
+      <div class="lw-global-row-end">
       <span class="lw-global-title">
-        {{ $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.boxItem.ntxqnhxs', '装箱数据') }}
+        {{
+          $lwLanguage.get('wms_project.pda.components.page.outbound.delivery.components.boxItem.ntxqnhxs', '装箱数据')
+        }}
       </span>
         <span>
         <span class="lw-global-value">

package/src/views/wms/page/outbound/delivery/components/soAndLpnItem/index.vue

@@ -73,6 +73,7 @@
 
         <slot>
           <lw-button
+            v-if="showDel"
             style="flex-shrink: 0"
             round
             mini
@@ -116,8 +117,10 @@
       </div>
 
       <!-- 装箱数据 -->
-      <div class="lw-global-row">
-      <span class="lw-global-title">
+      <div
+        :class="[item.extDataList ? 'lw-global-row' : 'lw-global-row-end']"
+      >
+        <span class="lw-global-title">
         {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.boxData', '装箱数据') }}
       </span>
         <span>
@@ -143,7 +146,6 @@
           class="lw-global-value-bold"
         >{{ item.boxCount }}</span>
       </span>
-
       </div>
 
       <!-- 其他数据 -->
@@ -180,6 +182,12 @@ export default {
       default: 0
     },
 
+    // 是否显示删除按钮
+    showDel: {
+      type: Boolean,
+      default: true
+    }
+
   },
   data() {
     return {}

package/src/views/wms/page/outbound/index.js

@@ -115,6 +115,10 @@ import reprintBox from "./reprint-box"
 import stockoutList from "./stockout"
 // 拦截
 import block from './block'
+// 拣选分货
+import sort from './sort'
+// 指定整托拣选
+import assignLpnPick from "./assignLpnPick";
 
 export const outbound = [
   lwOutboundSummaryLpnIndexPage,
@@ -182,4 +186,6 @@ export const outbound = [
   reprintBox,
   ...stockoutList,
   ...block,
+  ...sort,
+  ...assignLpnPick,
 ]

package/src/views/wms/page/outbound/pick/alone/index.vue

@@ -358,7 +358,7 @@ export default {
       if (data.qty) {
         this.qty.disabled = true
         this.qty.value = data.qty
-        this.pickConfirm()
+        // this.pickConfirm()
         return
       }
 
@@ -401,7 +401,7 @@ export default {
       if (qty % item.uomQty !== 0) {
         this.qty.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.sicaarrb', '拣选数量应当为') + item.uomLabel.top + this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.gqzzynli', '的倍数')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.sicaarrb', '拣选数量应当为{num}的倍数', {num: item.uomLabel.top})
         )
         this.qty.value = ''
         return false

package/src/views/wms/page/outbound/pick/components/dataLookAndChange/index.vue

@@ -37,6 +37,7 @@
     </div>
 
     <div :style="{height: hasPrint ? '50px' : 0}"></div>
+    <!-- TODO -->
     <div
       :style="{height: hasPrint ? '50px' : 0}"
       class="lw-global-flex-between lw-data-loot-adn-change-print"
@@ -307,16 +308,16 @@
     <!-- 非独立件 -->
     <lw-popup
       :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.ocnaieum','拣选完成')"
-      v-model="notAloneShow"
+      v-model="notAlone.show"
       @closed="backPage"
     >
 
       <div class="lw-global-row lw-data-loot-adn-change-success">
-        {{notAloneMsg}}
+        {{ notAlone.msg }}
       </div>
 
       <div
-        v-if="!notAloneMsg"
+        v-if="!notAlone.msg"
         class="lw-global-row lw-data-loot-adn-change-success"
       >
         {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.usntgvja','当前任务已拣选完成，请移动到捆包区:') }}
@@ -334,8 +335,55 @@
       </div>
 
       <!-- 独立捆包件不显示 -->
+      <template v-if="pickData.pickMethod !== 'ALONE_PACK'">
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.adpgbpey','拣选容器号')"
+          :value="pickContainer"
+          val-red
+          val-bold
+          :val-size="16"
+        />
+
+        <lw-title-value-cell
+          v-if="notAlone.collectLoc"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.adpgbspey','集货库位')"
+          :value="notAlone.collectLoc"
+          val-red
+          val-bold
+          :val-size="16"
+        />
+      </template>
+
+
+      <template
+        v-if="notAlone.collectLoc"
+        #button
+      >
+
+        <lw-button @click="goCollect">
+          {{
+            $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.afdpgbpey', '去集货')
+          }}
+        </lw-button>
+
+      </template>
+
+
+    </lw-popup>
+
+    <!-- 拣选分货 -->
+    <lw-popup
+      :title="$lwLanguage.get('','拣选完成')"
+      v-model="distributePopupShow"
+      @closed="backPage"
+    >
+
+      <div class="lw-global-row lw-data-loot-adn-change-success">
+        {{ $lwLanguage.get('', '当前任务已拣选完成，请执行分货') }}
+      </div>
+
       <lw-title-value-cell
-        v-if="pickData.pickMethod !== 'ALONE_PACK'"
         :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.adpgbpey','拣选容器号')"
         :value="pickContainer"
         val-red
@@ -343,6 +391,16 @@
         :val-size="16"
       />
 
+
+      <template #button>
+
+        <lw-button @click="goDistribute">
+          {{ $lwLanguage.get('', '去分货') }}
+        </lw-button>
+
+      </template>
+
+
     </lw-popup>
 
 
@@ -467,14 +525,21 @@ export default {
       aloneShow: false,
 
       // 非独立件
-      notAloneShow: false,
-      notAloneMsg: '',
+      notAlone: {
+        show: false,
+        msg: '',
+        // 集货库位
+        collectLoc: ''
+      },
+
+      // 拣选分货弹框
+      distributePopupShow: false,
 
       // 有无打印数据
       hasPrint: false,
 
       // 打印机信息
-      printData:{}
+      printData: {},
     }
   },
   mounted() {
@@ -505,28 +570,41 @@ export default {
     },
     // 拣选完成的弹出框
     openPickSuccessPopup(res){
-      this.notAloneMsg = ''
+      this.notAlone.msg = ''
 
+      // 是否需要播种
       if (this.pickData.sowCode){
         this.sowShow = true
         return
       }
 
-      if (this.pickData.summaryCode){
+      // 是否需要集合
+      if (this.pickData.summaryCode) {
         this.summaryShow = true
         return
       }
 
-      if (this.pickData.pickPackType === 'ALONE'){
+      // 是否需要拣选分货
+      if (this.pickData.pickMethod === '500') {
+        this.distributePopupShow = true
+        return
+      }
+
+      // 独立件
+      if (this.pickData.pickPackType === 'ALONE') {
         this.aloneShow = true
         return
       }
 
-      if (res && res.packBoxNo){
-        this.notAloneMsg = this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.index.zizejnxr','当前任务已拣选完成，并且已经捆包')
+      // 是否自动捆包完成
+      if (res && res.packBoxNo) {
+        this.notAlone.msg = this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.index.zizejnxr', '当前任务已拣选完成，并且已经捆包')
+
+        this.notAlone.collectLoc = res.collectLocation || ''
       }
 
-      this.notAloneShow = true
+      // 其他
+      this.notAlone.show = true
     },
 
 
@@ -709,13 +787,34 @@ export default {
     },
 
     // 提总拣选完成 - 播种集货
-    goSowCollect(){
+    goSowCollect() {
       this.$router.replace({
-        path:'/outbound/sowCollect/lwIndex',
-        query:{
+        path: '/outbound/sowCollect/lwIndex',
+        query: {
           pickContainer: this.pickContainer
         }
       })
+    },
+
+
+    // 去集货
+    goCollect() {
+      this.$router.replace({
+        path: '/outbound/summary/lpn/lwAction',
+        query: {
+          lwLpn: this.pickContainer
+        }
+      })
+    },
+
+    // 去分货
+    goDistribute() {
+      this.$router.replace({
+        path: '/outbound/sort/lwAction',
+        query: {
+          lwContainer: this.pickContainer
+        }
+      })
     }
 
   }

package/src/views/wms/page/outbound/pick/components/taskInfo.vue

@@ -23,14 +23,29 @@
             style="margin-left: 0"
             plain
             round
-          >{{ item.pickPackTypeLabel }}</lw-tag>
+          >
+            {{ item.pickPackTypeLabel }}
+          </lw-tag>
+
           <!-- 拣选方式 -->
           <lw-tag
             v-if="item.pickMethodLabel"
             type="warning"
             plain
             round
-          >{{ pickMethod }}</lw-tag>
+          >
+            {{ item.pickMethodLabel }}
+          </lw-tag>
+
+          <!-- 拣选方式 -->
+          <lw-tag
+            v-if="pickMethod"
+            type="success"
+            plain
+            round
+          >
+            {{ pickMethod }}
+          </lw-tag>
         </div>
 
       </div>
@@ -100,13 +115,13 @@ export default {
     // 拣选方式
     pickMethod(){
       if (this.item.pickUom === 'CASE'){
-        return this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.gjxccjvg','按箱拣选')
+        return this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.gjxccjvg', '按箱拣')
       }
       if (this.item.pickUom === 'LPN'){
-        return this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.htxwnpou','整托盘拣选')
+        return this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.htxwnpou', '整托盘拣')
       }
 
-      return this.item.pickMethodLabel
+      return ''
     }
   },
   data() {

package/src/views/wms/page/outbound/pick/mixin/all.js

@@ -159,7 +159,7 @@ export const all = {
       if (this.hasLpn) clearArr.push('lpn')
 
       hasBox && clearArr.push('box')
-      console.log(clearArr, 999)
+
       return clearArr
     }
   }

package/src/views/wms/page/outbound/pick/notAlone/index.vue

@@ -491,11 +491,11 @@ export default {
         newQty = Number(this.nowPickData.uomQty)
         this.qty.value = Number(this.qty.value || 0) + newQty
 
-        const waitQty = Number(this.nowPickData.totalQty || 0) - Number(this.nowPickData.pickQty || 0)
+        /*const waitQty = Number(this.nowPickData.totalQty || 0) - Number(this.nowPickData.pickQty || 0)
         if (this.qty.value === waitQty) {
           this.pickConfirm()
           return;
-        }
+        }*/
 
         this.sku.value = ''
         this.sku.focus = true

package/src/views/wms/page/outbound/pick/sow/index.vue

@@ -1083,11 +1083,12 @@ export default {
 
       this.qty.value = Number(this.qty.value || 0) + newQty
 
-      const waitQty = Number(this.nowPickData.totalQty || 0) - Number(this.nowPickData.pickQty || 0)
+      /*const waitQty = Number(this.nowPickData.totalQty || 0) - Number(this.nowPickData.pickQty || 0)
       if (this.qty.value === waitQty) {
         this.pickConfirm()
         return;
-      }
+      }*/
+      
       this.sku.focus = true
       this.sku.value = ''
     },
@@ -1160,7 +1161,7 @@ export default {
         ['sku', 'qty']
       )
       this.nowSkuCode = ''
-      
+
       this.tabActive === 'ing' ? this[focus].focus = true : ''
     },