@logwire/logwire-wms-pda-ui 1.1.19 → 3.1.0

package/src/components/page/outbound/bale/components/planCollapse/index.vue

@@ -38,28 +38,28 @@
             <div class="lw-global-data-look-item">
               <div class="lw-global-value-bold">{{ item.customerCount }}</div>
               <div class="lw-global-title">
-                {{ $lwLanguage.get('', '店数') }}
+                {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.planCollapse.liphddnl','店数') }}
               </div>
             </div>
 
             <div class="lw-global-data-look-item">
               <div class="lw-global-value-bold">{{ item.pickRate }}</div>
               <div class="lw-global-title">
-                {{ $lwLanguage.get('', '拣选率') }}
+                {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.planCollapse.xqkntvxw','拣选率') }}
               </div>
             </div>
 
             <div class="lw-global-data-look-item">
               <div class="lw-global-value-bold">{{ item.packRate }}</div>
               <div class="lw-global-title">
-                {{ $lwLanguage.get('', '捆包率') }}
+                {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.planCollapse.srloewmg','捆包率') }}
               </div>
             </div>
 
             <div class="lw-global-data-look-item">
               <div class="lw-global-value-bold">{{ item.handoverRate }}</div>
               <div class="lw-global-title">
-                {{ $lwLanguage.get('', '交接率') }}
+                {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.planCollapse.ycmhppsy','交接率') }}
               </div>
             </div>
 
@@ -82,7 +82,7 @@
 
             <lw-title-value-cell
               class="lw-global-click-style"
-              :title="$lwLanguage.get('','拣选率')"
+              :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.planCollapse.kzaaakzq','拣选率')"
               :value="i.pickRate"
               val-red
               val-bold
@@ -92,7 +92,7 @@
 
             <lw-title-value-cell
               class="lw-global-click-style"
-              :title="$lwLanguage.get('','捆包率')"
+              :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.planCollapse.hcwareuy','捆包率')"
               :value="i.packRate"
               val-red
               val-bold
@@ -107,7 +107,7 @@
             <div
               style="flex-shrink: 0"
               class="lw-global-title"
-            >{{ $lwLanguage.get('','捆包容器') }}</div>
+            >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.planCollapse.indkbacj','捆包容器') }}</div>
 
             <div class="lw-global-value-bold">
 
@@ -141,12 +141,11 @@
       >
 
         <div class="lw-global-title">
-          {{ $lwLanguage.get('','商品列表') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.planCollapse.qsbvnrwl','商品列表') }}
         </div>
 
         <div class="lw-global-value-bold-red">
-          3
-          {{ $lwLanguage.get('','行') }}
+          {{ pickRatePopup.skuList.length + $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.planCollapse.hsadmxhd','行') }}
         </div>
 
       </div>
@@ -172,18 +171,18 @@
             round
             plain
             type="danger"
-          >{{ $lwLanguage.get('','未拣选') }}</lw-tag>
+          >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.planCollapse.teuyrrwa','未拣选') }}</lw-tag>
           <lw-tag
             v-if="i.status==='200'"
             round
             plain
-          >{{ $lwLanguage.get('','拣选中') }}</lw-tag>
+          >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.planCollapse.ooeybszv','拣选中') }}</lw-tag>
           <lw-tag
             v-if="i.status==='300'"
             round
             plain
             type="success"
-          >{{ $lwLanguage.get('','已拣选') }}</lw-tag>
+          >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.planCollapse.pfhkdcmz','已拣选') }}</lw-tag>
         </div>
 
       </lw-sku-info-module>
@@ -202,12 +201,11 @@
       >
 
         <div class="lw-global-title">
-          {{ $lwLanguage.get('','拣选容器列表') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.planCollapse.odehmpgi','拣选容器列表') }}
         </div>
 
         <div class="lw-global-value-bold-red">
-          3
-          {{ $lwLanguage.get('','行') }}
+          {{ baleRatePopup.container.length + $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.planCollapse.hsadmxhd','行') }}
         </div>
 
       </div>
@@ -251,12 +249,11 @@
       >
 
         <div class="lw-global-title">
-          {{ $lwLanguage.get('','商品列表') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.planCollapse.qsbvnrwl','商品列表') }}
         </div>
 
         <div class="lw-global-value-bold-red">
-          3
-          {{ $lwLanguage.get('','行') }}
+          {{ containerPopup.skuList.length + $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.planCollapse.hsadmxhd','行') }}
         </div>
 
       </div>
@@ -276,7 +273,7 @@
 <script>
 
 import {
-  projectWmsGetPackValueGroupKeyCustomterData
+  projectWmsGetPackValueGroupKeyCustomerData
 } from "../../../../../../api/outbound/bale/checkBale";
 
 export default {
@@ -323,12 +320,11 @@ export default {
   },
   methods: {
     // 打开折叠框
-    openCollapse(){
-      if (!this.activeCollapse.length) return
-
+    openCollapse(activeNames){
+      if (!activeNames.length) return
       this.store = []
 
-      projectWmsGetPackValueGroupKeyCustomterData({
+      projectWmsGetPackValueGroupKeyCustomerData({
         tabGroupKey: this.item.tabGroupKey,
         valueGroupKey: this.item.valueGroupKey,
       }).then(res=>{
@@ -347,7 +343,7 @@ export default {
 
     // 捆包率
     baleRate(item){
-      this.this.baleRatePopup.container = []
+      this.baleRatePopup.container = []
       this.baleRatePopup.title = item.customerCode +'-'+ item.customerName
       this.baleRatePopup.container = item.waitPackContainerList
       this.baleRatePopup.show = true

package/src/components/page/outbound/bale/components/repeatCheck/index.vue

@@ -0,0 +1,101 @@
+<!--
+  重新复核弹框
+  @author: 张文
+  @date: 2022-07-07
+-->
+<template>
+  <lw-popup
+    :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.repeatCheck.khjyyrjn','重新复核')"
+    v-model="show"
+    @closed="container.value=''"
+  >
+
+    <container-sku-qty
+      :box-no="boxData.boxNo"
+      :pack-qty="boxData.packQty"
+      :type-count="boxData.skuTypeCount"
+    />
+
+    <lw-input
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.repeatCheck.ofpiebcp','商品撤回容器')"
+      v-model="container.value"
+      :get-focus.sync="container.focus"
+      :show-bottom-border="false"
+      required
+      rule-prefix="baleComponentsRepeat"
+      rule-key="container"
+      @confirm="repeatConfirm"
+    />
+
+    <template #button>
+      <lw-button @click="repeatConfirm">
+        {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.repeatCheck.qnyxgfmu','确认重新复核') }}
+      </lw-button>
+    </template>
+
+  </lw-popup>
+</template>
+
+<script>
+import containerSkuQty from './../containerSkuQty/index.vue'
+
+export default {
+  name: "index",
+  components:{
+    containerSkuQty
+  },
+  props:{
+    boxData:{
+      type: Object,
+      default:()=>{}
+    },
+
+    value: Boolean
+  },
+  computed:{
+    show:{
+      get(){
+        return this.value
+      },
+      set(v){
+        this.$emit('input', v)
+      }
+    }
+  },
+  watch:{
+    show(n){
+      if (n){
+        this.$nextTick(()=>{
+          this.container.focus = true
+        })
+      }
+    }
+  },
+  data() {
+    return {
+      container:{
+        value: '',
+        focus: false
+      }
+    }
+  },
+  methods: {
+    repeatConfirm(){
+      const container = this.container.value
+      if (!container){
+        this.container.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.repeatCheck.gkdmdtun','商品撤回容器号不能为空')
+        )
+        return
+      }
+
+      this.$emit('repeatConfirm', container)
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/components/page/outbound/bale/components/storeInfo/index.vue

@@ -16,7 +16,7 @@
     <div class="lw-global-row-start lw-global-flex-start-start">
 
       <div style="flex-shrink:0" class="lw-global-title">
-        {{ $lwLanguage.get('','客户') }}
+        {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.storeInfo.apkawbmv','客户') }}
       </div>
 
       <div class="lw-global-value" style="flex: 1">
@@ -30,8 +30,8 @@
         mini
         @click="btnClick"
       >{{ isOver ?
-          $lwLanguage.get('','打印出货票') :
-          $lwLanguage.get('','继续捆包')
+          $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.storeInfo.kwcnkyii','打印出货票') :
+          $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.storeInfo.irkfzcod','继续捆包')
       }}</lw-button>
 
     </div>
@@ -39,7 +39,7 @@
     <div class="lw-global-flex-between lw-global-row">
 
       <lw-title-value-cell
-        :title="$lwLanguage.get('','捆包箱号')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.storeInfo.tghdfusy','捆包箱号')"
         :value="item.boxNo"
         val-bold
         :is-row="false"
@@ -52,13 +52,13 @@
 
     <lw-title-value-cell
       v-if="isOver"
-      :title="$lwLanguage.get('','捆包时间')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.storeInfo.xvkhnujv','捆包时间')"
       :value="$lwDate.format(item.boxTime, 'yyyy-MM-dd hh:mm')"
       val-bold
     />
     <lw-title-value-cell
       v-else
-      :title="$lwLanguage.get('','拣选容器号')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.storeInfo.twkmllty','拣选容器号')"
       :value="item.containerNo"
       val-bold
     />
@@ -74,10 +74,10 @@
             <div class="lw-global-flex-between">
 
               <div class="lw-global-title">
-                {{ $lwLanguage.get('','捆包箱商品列表') }}
+                {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.storeInfo.rqoquzyc','捆包箱商品列表') }}
               </div>
 
-              <div class="lw-global-value-bold-red">{{ item.skuList }}行</div>
+              <div class="lw-global-value-bold-red">{{ item.skuList.length }}行</div>
 
             </div>
           </template>
@@ -87,7 +87,7 @@
             :key="k"
             is-row
             v-bind="i"
-            :is-last="(k + 1) === item.skuList.length"
+            :is-row-last="(k + 1) === item.skuList.length"
           />
 
         </van-collapse-item>

package/src/components/page/outbound/bale/components/storeInfoSkuList/index.vue

@@ -15,37 +15,56 @@
         style="flex-shrink: 0"
         class="lw-global-title"
       >
-        {{ $lwLanguage.get('','客户') }}
+        {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.storeInfoSkuList.ziolexht','客户') }}
       </div>
 
       <div
         style="flex: 1"
-        class="lw-global-value"
+        class="lw-global-value lw-global-flex-between"
       >
-        <div class="lw-global-value-bold">{{ customerCode }}</div>
-        <div class="lw-global-title">{{ customerName }}</div>
+        <div style="flex: 1">
+          <div class="lw-global-value-bold">{{ customerCode }}</div>
+          <div class="lw-global-title">{{ customerName }}</div>
+        </div>
+
+        <slot name="customerBtn"></slot>
       </div>
     </div>
 
-    <template v-if="item">
+    <template v-if="item && Object.keys(item).length">
+
+      <div class="lw-global-row lw-global-flex-between">
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.storeInfoSkuList.ttwqjmgs','箱号')"
+          :value="item.boxNo"
+          val-bold
+          :is-row="false"
+        />
+
+        <lw-button
+          v-if="showPrint"
+          mini
+          round
+          @click="printClick"
+        >
+          {{$lwLanguage.get('','打印')}}
+        </lw-button>
+
 
-      <lw-title-value-cell
-        :title="$lwLanguage.get('','箱号')"
-        :value="item.boxNo"
-        val-bold
-      />
+      </div>
 
       <div class="lw-global-flex-between lw-global-row">
 
         <lw-title-value-cell
-          :title="$lwLanguage.get('','品种数')"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.storeInfoSkuList.zcfgcbij','品种数')"
           :value="item.skuTypeCount"
           val-bold
           :is-row="false"
         />
 
         <lw-title-value-cell
-          :title="$lwLanguage.get('','捆包数量')"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.storeInfoSkuList.iqhsablt','捆包数量')"
           :value="item.packQty"
           val-bold
           val-red
@@ -66,7 +85,7 @@
               <div class="lw-global-flex-between">
 
                 <div class="lw-global-title">
-                  {{ $lwLanguage.get('','捆包箱商品列表') }}
+                  {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.storeInfoSkuList.pajjnamb','捆包箱商品列表') }}
                 </div>
 
                 <div class="lw-global-value-bold-red">{{ item.skuList.length }}行</div>
@@ -79,7 +98,7 @@
               :key="k"
               is-row
               v-bind="i"
-              :is-last="(k + 1) === item.skuList.length"
+              :is-row-last="(k + 1) === item.skuList.length"
             />
 
           </van-collapse-item>
@@ -97,11 +116,16 @@
 export default {
   name: "index",
   props:{
-    item: Object,
+    item: {
+      type: Object,
+      default: () => {}
+    },
     // 客户编码
     customerCode: String,
     // 客户名称
     customerName: String,
+    // 是否显示打印按钮
+    showPrint: Boolean,
   },
   data() {
     return {
@@ -112,6 +136,9 @@ export default {
     }
   },
   methods: {
+    printClick(){
+      this.$emit('print')
+    }
   }
 }
 </script>

package/src/components/page/outbound/bale/components/suggestMaterial/index.vue

@@ -0,0 +1,107 @@
+<!--
+  推荐包材折叠栏
+  @author: 张文
+  @date: 2022-12-19
+-->
+<template>
+
+  <!-- 捆包包材 -->
+  <div
+    v-if="materialList.length"
+    style="margin-top: 10px;padding: 5px 10px"
+    class="lw-global-model-box lw-global-collapse-box"
+  >
+
+    <van-collapse
+      v-model="action"
+      :border="false"
+    >
+      <van-collapse-item name="1">
+
+        <template #title>
+
+          <div class="lw-global-flex-start">
+
+            <div class="lw-global-title" style="flex-shrink: 0">
+              {{$lwLanguage.get('','推荐包材')}}
+            </div>
+
+            <div class="lw-global-value-bold lw-global-text-overflow">
+              {{ materialList.map(item=>item.packMaterialCode).join(',') }}
+            </div>
+
+          </div>
+
+        </template>
+
+        <div
+          v-for="(i,k) in materialList"
+          :key="k"
+          :class="[
+            'lw-global-flex-between',
+            getRowClass(k,materialList.length)
+          ]"
+        >
+
+          <div class="lw-global-value-bold m-col-1">{{i.packMaterialCode}}</div>
+          <div class="m-col-2">{{i.packMaterialTexture}}</div>
+          <lw-tag
+            v-if="i.packMaterialType"
+            round
+            plain
+            class="m-col-3"
+          >{{i.packMaterialType}}</lw-tag>
+          <div class="lw-global-value-bold-red m-col-4">{{i.useQty}}</div>
+
+        </div>
+
+
+      </van-collapse-item>
+    </van-collapse>
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "index",
+  props:{
+    materialList:{
+      type: Array,
+      default:()=>[]
+    }
+  },
+  data() {
+    return {
+      action:[]
+    }
+  },
+  methods: {
+    // 获取行的class
+    getRowClass(k,len){
+      if (k===0) return 'lw-global-row-start'
+      if ((k+1) === len) return 'lw-global-row-end'
+      return 'lw-global-row'
+    },
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+
+.m-col-1{
+  width: 30%;
+}
+.m-col-2{
+  width: 40%;
+}
+.m-col-3{
+  width: 20%;
+}
+.m-col-4{
+  text-align: center;
+  width: 10%;
+}
+</style>