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

package/src/views/wms/module/ScanDataList/components/index.less

@@ -0,0 +1,17 @@
+.lw-scan-data-list-title {
+  flex: 1;
+}
+
+.lw-scan-data-list-num {
+  width: 80px;
+  flex-shrink: 0;
+  text-align: center;
+}
+
+
+.lw-scan-data-list-btn {
+  margin-left: 10px;
+  width: 50px;
+  flex-shrink: 0;
+  text-align: center;
+}

package/src/views/wms/module/ScanDataList/components/rowItem.vue

@@ -0,0 +1,60 @@
+<!--
+  行样式
+  @author: 张文
+  @date: 2023-08-15
+-->
+<template>
+
+  <div class="lw-global-row lw-global-flex-between">
+
+    <lw-code-name-qty-row
+      style="flex: 1"
+      :code="code"
+      :name="name"
+      :qty="qty"
+      :show-name="showName"
+      :row-id="rowId"
+      :row-type="rowType"
+    />
+
+    <div
+      v-if="isChange"
+      class="lw-scan-data-list-btn"
+    >
+      <van-icon
+        name="clear"
+        color="#d50000"
+        size="20px"
+        @click="$emit('del')"
+      />
+    </div>
+
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "rowItem",
+  props: {
+    code: null,
+    name: null,
+    qty: null,
+    showName: Boolean,
+    rowId: String,
+    rowType: String,
+    isChange: Boolean,
+  },
+  data() {
+    return {}
+  },
+  methods: {
+
+  }
+}
+</script>
+
+<style scoped lang="less">
+@import "./index.less";
+</style>

package/src/views/wms/module/ScanDataList/components/rowTitle.vue

@@ -0,0 +1,47 @@
+<!--
+  行标题
+  @author: 张文
+  @date: 2023-08-15
+-->
+<template>
+
+  <div class="lw-global-row lw-global-flex-between">
+
+    <div class="lw-global-title lw-scan-data-list-title">
+      {{ rowTitle || $lwLanguage.get('wms_project.pda.components.module.ScanDataList.pgbyfyml', '箱号/序列号') }}
+    </div>
+
+    <div class="lw-global-title lw-scan-data-list-num">
+      {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.rtppuhwl', '数量') }}
+    </div>
+
+    <div
+      v-if="isChange"
+      class="lw-global-title lw-scan-data-list-btn"
+    >
+      {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.kuvraqkd', '操作') }}
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "rowTitle",
+  props: {
+    isChange: Boolean,
+    // 列标题
+    rowTitle: String,
+  },
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+@import "./index.less";
+</style>

package/src/views/wms/module/ScanDataList/index.vue

@@ -9,7 +9,10 @@
     <!-- 标题 -->
     <div class="lw-global-flex-between">
 
-      <div class="lw-global-title" style="flex-shrink: 0">
+      <div
+        class="lw-global-title"
+        style="flex-shrink: 0"
+      >
         {{ title || $lwLanguage.get('wms_project.pda.components.module.ScanDataList.scan', '扫描统计') }}
       </div>
 
@@ -40,56 +43,27 @@
     >
 
       <!-- 列表头 -->
-      <div class="lw-global-row lw-global-flex-between">
-
-        <div class="lw-global-title lw-scan-data-list-title">
-          {{ rowTitle ||  $lwLanguage.get('wms_project.pda.components.module.ScanDataList.pgbyfyml','箱号/序列号') }}
-        </div>
-
-        <div class="lw-global-title lw-scan-data-list-num">
-          {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.rtppuhwl','数量') }}
-        </div>
-
-        <div
-          v-if="isChange"
-          class="lw-global-title lw-scan-data-list-btn"
-        >
-          {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.kuvraqkd','操作') }}
-        </div>
-
-      </div>
+      <row-title
+        :is-change="isChange"
+        :row-title="rowTitle"
+      />
 
       <!-- 前三条数据 -->
-      <div
-        class="lw-global-row lw-global-flex-between"
+      <row-item
         v-for="(i,k) in scanList.slice(0, showListNum)"
         :key="k"
-      >
-
-        <div class="lw-global-value-bold lw-scan-data-list-title">{{ i[snKey] }}</div>
-
-        <div class="lw-global-value-bold-red lw-scan-data-list-num">{{ i[qtyKey] }}</div>
-
-        <div
-          v-if="isChange"
-          class="lw-scan-data-list-btn"
-        >
-          <van-icon
-            name="clear"
-            color="#d50000"
-            size="20px"
-            @click="del(k)"
-          />
-<!--          <lw-button
-            mini
-            round
-            @click="del(k)"
-          >
-            {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.ihocngtf','删除') }}
-          </lw-button>-->
-        </div>
-
-      </div>
+        :class="[
+          (startBright && k === 0) && 'lw-scan-data-list-bright'
+        ]"
+        :code="i[snKey]"
+        :qty="i[qtyLabelKey || qtyKey]"
+        :name="i[nameKey]"
+        :is-change="isChange"
+        :show-name="showName"
+        :row-id="dataRowId"
+        :row-type="rowType"
+        @del="del(k)"
+      />
 
       <!-- 显示更多 -->
       <div
@@ -129,48 +103,25 @@
 
       <!-- 列表头 -->
       <template v-if="popup.list.length">
-        <div class="lw-global-row lw-global-flex-between">
-
-          <div class="lw-global-title lw-scan-data-list-title">
-            {{ rowTitle || $lwLanguage.get('wms_project.pda.components.module.ScanDataList.pgbyfyml','箱号/序列号') }}
-          </div>
-
-          <div class="lw-global-title lw-scan-data-list-num">
-            {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.rtppuhwl','数量') }}
-          </div>
-
-          <div
-            v-if="isChange"
-            class="lw-global-title lw-scan-data-list-btn"
-          >
-            {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.kuvraqkd','操作') }}
-          </div>
-
-        </div>
-        <div
-          class="lw-global-row lw-global-flex-between lw-global-animation-out"
+        <row-title
+          :is-change="isChange"
+          :row-title="rowTitle"
+        />
+
+        <row-item
+          class="lw-global-animation-out"
           v-for="(i,k) in popup.list"
           :key="k"
           :style="{animationDelay: 50 * k + 'ms'}"
-        >
-
-          <div class="lw-global-value-bold lw-scan-data-list-title">{{ i[snKey] }}</div>
-
-          <div class="lw-global-value-bold-red lw-scan-data-list-num">{{ i[qtyKey] }}</div>
-
-          <div
-            v-if="isChange"
-            class="lw-scan-data-list-btn"
-          >
-            <van-icon
-              name="clear"
-              color="#d50000"
-              size="20px"
-              @click="popupDel(i,k)"
-            />
-          </div>
-
-        </div>
+          :code="i[snKey]"
+          :qty="i[qtyLabelKey || qtyKey]"
+          :name="i[nameKey]"
+          :is-change="isChange"
+          :show-name="showName"
+          :row-id="dataRowId"
+          :row-type="rowType"
+          @del="popupDel(i,k)"
+        />
       </template>
       <lw-not-data v-else/>
 
@@ -187,47 +138,80 @@
 </template>
 
 <script>
+import rowItem from "./components/rowItem.vue";
+import rowTitle from "./components/rowTitle.vue";
 
 export default {
   name: "lwScanDataListModule",
-  props:{
+  components: {
+    rowItem,
+    rowTitle,
+  },
+  props: {
     // 标题
     title: String,
     // 列标题
     rowTitle: String,
 
     // 扫描的数据
-    value:{
+    value: {
       type: Array,
       default: () => []
     },
 
     // 箱号、序列号数据取值的key
-    snKey:{
+    snKey: {
       type: String,
       default: 'sn'
     },
 
     // 数量取值的key
-    qtyKey:{
+    qtyKey: {
       type: String,
       default: 'qty'
     },
+    // 数量显示的key
+    qtyLabelKey: String,
+
+    // 总量计算的方法
+    totalFn: Function,
 
     // 没展开之前显示的条数
-    showListNum:{
+    showListNum: {
       type: Number,
       default: 3
     },
 
     // 是否允许编辑
-    isChange:{
+    isChange: {
       type: Boolean,
       default: true
     },
 
     // 底部更多显示的文字
-    editText: String
+    editText: String,
+
+    // 首行是否高亮
+    startBright: Boolean,
+
+    // 是否显示名称
+    showName: Boolean,
+    // 显示名称的key
+    nameKey: {
+      type: String,
+      default: 'skuName'
+    },
+
+    // 行数据类型
+    rowType: String,
+    // 行数据id
+    rowId: String,
+    // 行数据id前缀，不传默认使用路由地址+ruleKey
+    rowPrefix: String,
+    // 总量数据类型
+    totalType: String,
+    // 总量数据id
+    totalTypeId: String,
 
   },
   computed:{
@@ -241,13 +225,33 @@ export default {
       }
     },
 
-    // 总数量
-    total(){
-      let num = 0
-      this.scanList.forEach(item=>{
-        num = num + Number(item[this.qtyKey] || 0)
-      })
-      return num
+    // 总数量，项目自定义渲染优先，其次是代码配置，最后是计算的纯数字
+    total() {
+      const total = this.scanList.reduce((t, i) => Number(i[this.qtyKey] || 0) + t, 0)
+      const customData = this.$lwProjectCustomRender.getRenderData(
+        'totalLabelRender',
+        {
+          list: this.scanList,
+          total,
+          type: this.totalType,
+          id: this.totalTypeId,
+        }
+      )
+
+      if (customData.success) {
+        return customData.data.totalLabel
+      }
+
+
+      if (this.totalFn) return this.totalFn(total)
+
+      return total
+
+    },
+
+    // 数据显示的索引
+    dataRowId() {
+      return this.rowId ? (this.rowPrefix || this.$route.path) + '/' + this.rowId : ''
     }
   },
   data() {
@@ -255,28 +259,38 @@ export default {
       // 弹出层
       popup:{
         show: false,
-        seoVal:'',
+        seoVal: '',
         // 原始的数据
-        rootList:[],
+        rootList: [],
         // 用于展示的数据
-        list:[],
-      }
-
+        list: [],
+        // 被删除的数据
+        delList: [],
+      },
     }
   },
   methods: {
+    // 获取总量
+    /*getTotal() {
+      let num = 0
+      this.scanList.forEach(item => {
+        num = num + Number(item[this.qtyKey] || 0)
+      })
+      return num
+    },*/
     // 外部的删除
-    del(index){
+    del(index) {
 
       const sn = this.scanList[index][this.snKey]
       this.$lwDialog.confirm({
-        title: this.$lwLanguage.get('wms_project.pda.components.module.ScanDataList.vwfdbaxc','警告'),
-        message: this.$lwLanguage.get('wms_project.pda.components.module.ScanDataList.msnpyznm','确认删除:') + sn,
-      }).then(()=>{
+        title: this.$lwLanguage.get('wms_project.pda.components.module.ScanDataList.vwfdbaxc', '警告'),
+        message: this.$lwLanguage.get('wms_project.pda.components.module.ScanDataList.msnpyznm', '确认删除:') + sn,
+      }).then(() => {
         const item = this.scanList.splice(index, 1)
-        this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.module.ScanDataList.olgsxjea','删除成功'))
-        this.$emit('del',item[0])
-      }).catch(()=>{})
+        this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.module.ScanDataList.olgsxjea', '删除成功'))
+        this.$emit('del', item[0])
+      }).catch(() => {
+      })
     },
 
     // 查看编辑
@@ -302,7 +316,7 @@ export default {
     popupDel(item, key){
       for (let i = 0; i < this.popup.rootList.length; i++) {
         if (this.popup.rootList[i][this.snKey] === item[this.snKey]){
-          this.popup.rootList.splice(i, 1)
+          this.popup.delList.push(this.popup.rootList.splice(i, 1)[0])
           this.popup.list.splice(key, 1)
           break
         }
@@ -314,39 +328,21 @@ export default {
       const change = this.scanList.length !== this.popup.rootList.length
       this.scanList = this.popup.rootList
       this.popup.show = false
-      this.$emit('confirm',change)
+      this.$emit('confirm', change, this.popup.delList)
     },
     // 弹窗关闭
     popupOff(){
       this.popup.seoVal = ''
       this.popup.list = []
-    }
+      this.popup.dellist = []
+    },
   }
 }
 </script>
 
 <style scoped lang="less">
 
-
-.lw-scan-data-list-title{
-  flex: 1;
-}
-
-.lw-scan-data-list-num{
-  width: 40px;
-  flex-shrink: 0;
-  text-align: center;
-  margin-right: 10px;
-}
-
-.lw-scan-data-list-btn{
-  width: 50px;
-  flex-shrink: 0;
-  text-align: center;
-}
-
-
-.lw-scan-data-list-look-edit{
+.lw-scan-data-list-look-edit {
   width: 100%;
   font-size: 14px;
   color: #888;
@@ -355,4 +351,8 @@ export default {
   cursor: pointer;
 }
 
+.lw-scan-data-list-bright {
+  background: rgb(233, 255, 79);
+}
+
 </style>

package/src/views/wms/module/SkuInfo/index.vue

@@ -11,6 +11,7 @@
       isRow && (!isRowLast && !isRowFirst) ? 'lw-global-row' : '',
       isRowLast ? 'lw-global-row-end' : ''
     ]"
+    @click="$emit('click')"
   >
     <div style="flex: 1">
       <div class="lw-global-value-bold">{{ skuCode }}</div>

package/src/views/wms/module/SnSearchSku/index.vue

@@ -13,31 +13,13 @@
       @confirm="skuConfirm"
     />
 
-    <lw-popup
-      :title="popupTitle || $lwLanguage.get('wms_project.pda.components.module.SnSearchSku.index.rylvpgem','选择')"
+    <lw-select-row-popup
       v-model="showPopup"
-      :off-btn-fn="offPopup"
-    >
-
-      <div
-        v-for="(i,k) in skuList"
-        :key="k"
-        :class="[
-          'lw-global-flex-between',
-          'lw-global-click-style',
-          getClassName(k)
-        ]"
-        @click="selectSku(i)"
-      >
-        <div style="flex: 1">
-          <div class="lw-global-value-bold">{{ i.skuCode }}</div>
-          <div class="lw-global-title">{{ i.skuName }}</div>
-        </div>
-
-        <van-icon name="arrow" size="20px" color="#999"/>
-      </div>
-
-    </lw-popup>
+      :title="popupTitle"
+      :list="skuList"
+      @selected="selectSku"
+      @closed="offPopup"
+    />
 
   </div>
 </template>
@@ -91,17 +73,6 @@ export default {
     }
   },
   methods: {
-    // 获取class名
-    getClassName(index){
-      if (index===0){
-        if (this.skuList.length === 1) return 'lw-global-row-end'
-        return 'lw-global-row-start'
-      }
-
-      if ((index+1) === this.skuList.length) return 'lw-global-row-end'
-
-      return 'lw-global-row'
-    },
 
     // 输入框回车
     skuConfirm(){
@@ -131,13 +102,11 @@ export default {
     // 确认选择
     selectSku(item){
       this.skuCode = item.skuCode
-      this.showPopup = false
       this.$emit('confirm', item)
     },
 
     // 关闭弹窗
     offPopup(){
-      this.showPopup = false
       this.skuCode = ''
       this.skuFocus = true
     }

package/src/views/wms/module/index.js

@@ -22,6 +22,10 @@ import lwBoxInfoModule from "./BoxInfo/index.js";
 import lwAbnormalInputModule from "./AbnormalInput/index.js";
 // 通过序列号搜索商品号
 import lwSnSearchSkuModule from "./SnSearchSku/index.js";
+// 选择行弹框
+import lwSelectRowPopup from "./selectRowPopup/index.js";
+// 根据类型填写商品
+import lwGetQtyByType from "./GetQtyByType/index.js";
 
 export default [
   lwLotModule,
@@ -33,4 +37,6 @@ export default [
   lwBoxInfoModule,
   lwAbnormalInputModule,
   lwSnSearchSkuModule,
+  lwSelectRowPopup,
+  lwGetQtyByType,
 ]

package/src/views/wms/module/selectRowPopup/index.js

@@ -0,0 +1,12 @@
+/*
+* 选择行弹框
+* @author: 张文
+* @date  2023-08-28
+* */
+
+import lwSelectRowPopup from "./index.vue";
+
+lwSelectRowPopup.install = Vue => Vue.component(lwSelectRowPopup.name, lwSelectRowPopup)
+
+export default lwSelectRowPopup
+