@logwire/logwire-wms-pda-ui 3.3.2 → 3.3.3

package/src/components/CellSearchSelectDel/index.vue

@@ -0,0 +1,414 @@
+<!--
+  行搜索选择删除组件
+  @author: 张文
+  @date: 2023-06-06
+-->
+<template>
+  <div
+    :class="[
+      (isRow && (!isRowStart && !isRowEnd)) && 'lw-global-row',
+      isRowStart && 'lw-global-row-start',
+      isRowEnd && 'lw-global-row-end',
+    ]"
+  >
+
+    <!-- 显示的行 -->
+    <div class="lw-global-flex-between" style="align-items: flex-start">
+
+      <div
+        :class="[
+          selectList.length ? 'lw-global-flex-start-start':'lw-global-flex-start'
+        ]"
+        style="flex: 1"
+      >
+
+        <!-- 标题 -->
+        <div
+          style="flex-shrink: 0;"
+          :class="[
+            'lw-global-title',
+            required && 'lw-global-required'
+          ]"
+        >
+          {{ title }}
+        </div>
+
+        <!-- 结果和输入框 -->
+        <div class="lw-global-flex-start" style="flex: 1;flex-wrap: wrap;margin-left: 5px">
+          <!-- 选中的结果 -->
+          <lw-tag
+            v-for="(i,k) in selectList"
+            :key="k"
+            :closeable="!i.disabled"
+            size="medium"
+            type="primary"
+            color="#888"
+            @close="delOption(k)"
+          >
+            {{ labelMsg(i) }}
+          </lw-tag>
+
+          <!-- 外部搜索框 -->
+          <lw-input
+            style="width: 100%;padding: 0;margin-left: 4px"
+            v-model="outSearch"
+            :get-focus.sync="outSearchFocus"
+            :placeholder="$lwLanguage.get('wms_project.pda.components.CellSearchSelectDel.index.kwqsjoha','搜索关键字')"
+            :show-bottom-border="false"
+            :create-rule="createRule"
+            :rule-key="ruleKey"
+            @confirm="outSearchConfirm"
+          >
+
+            <template #button>
+
+              <van-icon
+                style="flex-shrink: 0"
+                :name="icon"
+                size="22"
+                :color="iconColor"
+                @click="popup.show = true"
+              />
+
+            </template>
+
+          </lw-input>
+        </div>
+
+      </div>
+
+    </div>
+
+    <!-- 弹框 -->
+    <lw-popup
+      :title="$lwLanguage.get('wms_project.pda.components.CellSearchSelectDel.index.xhwwalvy','请选择') + title"
+      v-model="popup.show"
+      @open="popupOpen"
+      @closed="popupOff"
+    >
+      <!-- 搜索 -->
+      <lw-input
+        v-model="popup.search"
+        :placeholder="$lwLanguage.get('wms_project.pda.components.CellSearchSelectDel.index.kwqsjoha','搜索关键字')"
+        :create-rule="createRule"
+        :rule-key="ruleKey"
+        @confirm="popupSearch"
+      >
+        <template #button>
+          <lw-button
+            mini
+            round
+            @click="popupSearch"
+          >
+            {{ $lwLanguage.get('wms_project.pda.components.CellSearchSelectDel.index.rkerufrd', '搜索') }}
+          </lw-button>
+        </template>
+      </lw-input>
+
+      <div class="select-box">
+        <van-checkbox-group v-model="popup.result">
+          <van-checkbox
+            v-for="i in popup.list"
+            :key="i[valueKey]"
+            :name="i[valueKey]"
+          >
+            {{ labelMsg(i) }}
+          </van-checkbox>
+        </van-checkbox-group>
+      </div>
+
+      <lw-pagination
+        v-if="apiFn && needPage"
+        v-model="popup.pageNum"
+        :page-size.sync="popup.pageSize"
+        :page-total="popup.pageTotal"
+        @change="pageChange"
+      />
+
+      <lw-not-data
+        v-if="!popup.list.length"
+        :content="$lwLanguage.get('wms_project.pda.components.CellSearchSelectDel.index.nepyjhvj','没有可供选择的数据')"
+      />
+
+
+      <template #button>
+        <lw-button
+          @click="popupConfirm"
+        >{{ $lwLanguage.get('wms_project.pda.components.CellSearchSelectDel.index.ftjsrrcv', '确定') }}
+        </lw-button>
+      </template>
+    </lw-popup>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "lwCellSearchSelectDel",
+  props: {
+    // 标题
+    title: String,
+
+    // 选中的值
+    value: {
+      type: Array,
+      default: () => []
+    },
+
+    // 条码解析id
+    createRule: Object,
+    // 扫码解析规则
+    ruleKey: String,
+
+    // 按钮旁边的图标，仅支持 vant UI库图标
+    icon: {
+      type: String,
+      default: 'add-o'
+    },
+    // 按钮旁边的图标颜色
+    iconColor: {
+      type: String,
+      default: '#333333'
+    },
+    //是否必填
+    required: {
+      type: Boolean,
+      default: true
+    },
+    focus: {
+      type: Boolean,
+      default: false
+    },
+
+    // 是否显示行样式
+    isRow: {
+      type: Boolean,
+      default: true
+    },
+    // 是否是行起始
+    isRowStart: {
+      type: Boolean,
+      default: false
+    },
+    // 是否是行结尾
+    isRowEnd: {
+      type: Boolean,
+      default: false
+    },
+
+    // 获取数据的api 应当是异步函数，最优先
+    apiFn: Function,
+    // 提供选择的数据，优先
+    columns: Array,
+    // 字典键值，次优先
+    dictKey: String,
+
+    // 显示的键值名，允许使用多个key，用英文逗号隔开
+    labelKey: {
+      type: String,
+      default: 'label'
+    },
+    // 取值的键值名
+    valueKey: {
+      type: String,
+      default: 'value'
+    },
+    // 最大可选数
+    max: {
+      type: Number,
+      default: 0
+    },
+
+    // 是否需要分页，当 apiFn 为真时有效
+    needPage: Boolean,
+    // 函数调用时的数据取值key
+    apiDataKey: {
+      type: String,
+      default: 'datas'
+    },
+    // 函数调用时的总条数取值key
+    apiDataTotalKey: {
+      type: String,
+      default: 'total'
+    },
+  },
+  data() {
+    return {
+
+      // 外部输入框搜索
+      outSearch: '',
+
+      popup: {
+        show: false,
+        search: '',
+        result: [],
+        list: [],
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
+      }
+    }
+  },
+  computed: {
+    selectList: {
+      get() {
+        return this.value
+      },
+      set(v) {
+        this.$emit('input', v)
+      }
+    },
+    outSearchFocus: {
+      get() {
+        return this.focus
+      },
+      set(v) {
+        this.$emit('update:focus', v)
+      }
+    },
+  },
+  methods: {
+
+    // 显示值格式化
+    labelMsg(item) {
+      const k = this.labelKey.split(',')
+      let msg = ''
+      k.forEach(i => {
+        msg += `/ ${item[i]}`
+      })
+      return msg.substring(2)
+    },
+
+    // 获取数据
+    getData(keyword) {
+      if (this.apiFn) {
+        return this.apiFn({
+          keyword,
+          pageNum: this.popup.pageNum,
+          pageSize: this.popup.pageSize
+        })
+      }
+
+      let data = []
+      if (this.columns && this.columns.length) {
+        data = this.columns
+      } else if (this.dictKey) {
+        data = this.$lwDict.get(this.dictKey)
+      }
+      return data.filter(item => this.labelMsg(item).includes(keyword))
+    },
+
+    // 删除已选择项
+    delOption(index) {
+      this.selectList.splice(index, 1)
+    },
+
+    // 校验是否超过最大可选值
+    checkMax(num, selectNum) {
+      if (this.max > 0 && num > this.max) {
+        this.$lwToast.fail(
+          this.$lwLanguage.get('wms_project.pda.components.CellSearchSelectDel.index.ftjsrrcve', '超过最大可选量{num}，当前已选{selectNum}', {
+            num: this.max,
+            selectNum: selectNum || num
+          })
+        )
+        return false
+      }
+      return true
+    },
+
+    // 外部输入框搜索确认
+    async outSearchConfirm() {
+      if (!this.checkMax(this.selectList.length)) return
+
+      let res = await this.getData(this.outSearch)
+      if (this.apiFn) {
+        res = res[this.apiDataKey]
+      }
+
+      if (res.length === 1) {
+        this.selectList.push(res[0])
+        this.outSearch = ''
+        return
+      }
+
+      this.popup.search = this.outSearch
+      this.popup.show = true
+
+    },
+
+    // 弹框 - 打开
+    popupOpen() {
+      this.popup.pageNum = 1
+      this.popup.pageSize = 10
+      this.pageChange()
+    },
+    // 弹框 - 搜索
+    popupSearch() {
+      this.popupOpen()
+    },
+    // 弹框 - 页码改变
+    async pageChange() {
+      this.popup.result = []
+      let res = await this.getData(this.popup.search)
+      if (this.apiFn) {
+        res = res[this.apiDataKey]
+        this.needPage ? this.popup.pageTotal = res[this.apiDataTotalKey] : ''
+      }
+
+      this.popup.list = res
+    },
+    // 弹框 - 确认
+    popupConfirm() {
+
+      // 去重
+      for (let i = 0; i < this.selectList.length; i++) {
+        const k = this.popup.result.indexOf(this.selectList[i][this.valueKey])
+        if (k >= 0) {
+          this.popup.result.splice(k, 1)
+        }
+      }
+
+      const selectNum = this.selectList.length
+      if (!this.checkMax((selectNum + this.popup.result.length), selectNum)) return
+
+      this.popup.list.forEach(item => {
+        if (this.popup.result.includes(item[this.valueKey])) {
+          this.selectList.push(item)
+        }
+      })
+
+      this.popup.show = false
+    },
+    // 弹框 - 关闭
+    popupOff() {
+      this.outSearch = ''
+      this.outSearchFocus = true
+      this.popup.search = ''
+      this.popup.pageNum = 1
+      this.popup.pageSize = 10
+      this.popup.list = []
+      this.popup.result = []
+    },
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+@import "../../assets/css/var.less";
+
+.select-box {
+
+  /deep/ .van-checkbox {
+    padding: 5px;
+    font-size: 14px;
+
+    & + .van-checkbox {
+      //margin-top: 5px;
+      border-top: solid 1px @borderColor;
+    }
+  }
+
+}
+</style>

package/src/components/PopupCheckbox/index.vue

@@ -102,7 +102,7 @@ export default {
     columns: Array,
     // 字典键值
     dictKey: String,
-    // 显示的键值名，运行使用多个key，用英文逗号隔开
+    // 显示的键值名，允许使用多个key，用英文逗号隔开
     labelKey: {
       type: String,
       default: 'label'

package/src/components/index.js

@@ -70,6 +70,8 @@ import lwButtonCheckbox from "./ButtonCheckbox";
 import lwSearchCellPopup from "./SearchCellPopup";
 // 键盘弹出占位
 import lwKeyboardOpenPlaceholder from "./KeyboardOpenPlaceholder";
+// 行搜索选择删除组件
+import lwCellSearchSelectDel from "./CellSearchSelectDel";
 
 
 export default [
@@ -106,4 +108,5 @@ export default [
   lwButtonCheckbox,
   lwSearchCellPopup,
   lwKeyboardOpenPlaceholder,
+  lwCellSearchSelectDel,
 ]

package/src/utils/Init.js

@@ -6,7 +6,10 @@
 
 
 export function Init(that) {
-  that.$router.push({
-    path: '/lwInit',
-  })
+  if (!window.location.href.includes('/lwInit')) {
+    that.$router.push({
+      path: '/lwInit',
+    })
+  }
+
 }

package/src/views/vin/page/keyRoom/components/vinInfo.vue

@@ -27,11 +27,19 @@
     />
 
     <lw-title-value-cell
+      v-if="type==='over'"
       :title="$lwLanguage.get('wms_project.pda.vin.page.keyRoom.components.vinInfo.fhcugifr','库位')"
       :value="$lwCheckVal(item.toActLocationCode || item.locationCode)"
       val-bold
       :is-row="false"
     />
+    <lw-title-value-cell
+      v-else
+      :title="$lwLanguage.get('wms_project.pda.vin.page.keyRoom.components.vinInfo.fhcugifrV','VIN库位')"
+      :value="$lwCheckVal(item.vinActLocationCode)"
+      val-bold
+      :is-row="false"
+    />
 
     <slot name="footer"></slot>
 
@@ -51,6 +59,10 @@ export default {
     isModel: {
       type: Boolean,
       default: true
+    },
+    type: {
+      type: String,
+      default: 'over'
     }
   },
   data() {

package/src/views/vin/page/keyRoom/inbound/index.vue

@@ -151,6 +151,7 @@
                 v-for="i in noInLines"
                 :key="i.vin"
                 :item="i"
+                type="wait"
               />
               <lw-not-data v-if="!noInLines.length"/>
             </van-tab>

package/src/views/vin/page/maintain/task/scan.vue

@@ -99,31 +99,39 @@
 
       <lw-button
         :disabled="btnNum.disabled"
-        @click="overTask"
+        @click="overTask()"
       >
         {{ $lwLanguage.get('', '完成维护 ( {has} / {all} ) ', {...btnNum}) }}
       </lw-button>
 
     </lw-bottom-bar>
 
+    <move-popup
+      v-model="showMovePopup"
+      :location-code="locationCode"
+      @confirm="movePopupConfirm"
+    />
+
   </div>
 </template>
 
 <script>
 
 import taskActionItem from "./../components/taskActionItem.vue";
+import movePopup from "./components/movePopup.vue";
 import {action} from "./mixins/action.js";
 import {wmsVinMobileMaintainGetTask, wmsVinMobileMaintainSubmitTask} from "./../../../api/maintain/task";
 
 export default {
   name: "lwVinMaintainScanIndex",
   components: {
-    taskActionItem
+    taskActionItem,
+    movePopup,
   },
   mixins: [action],
   data() {
     return {
-      
+
       vin: {
         value: '',
         focus: true,
@@ -132,7 +140,11 @@ export default {
       // 是否显示维护填写项
       showModel: false,
 
-      taskList: []
+      taskList: [],
+
+      // 是否移位
+      showMovePopup: false,
+      locationCode: '',
     }
   },
   mounted() {
@@ -158,18 +170,23 @@ export default {
         this.vin.copy = vin
         this.showModel = true
         this.taskList = res.groupList
+        this.locationCode = res.locationCode || ''
+        this.hasMove = res.hasMove
       })
     },
 
     // 完成维护点击
-    overTask() {
+    overTask(locationCode) {
       const {success, data} = this.getResultData()
       if (!success) return
 
+      if (this.hasMove) return this.showMovePopup = true
+
       wmsVinMobileMaintainSubmitTask({
         vin: this.vin.copy,
         staffList: this.staffCodeList,
-        itemList: data
+        itemList: data,
+        locationCode
       }).then(() => {
 
         this.$lwToast.success(
@@ -180,8 +197,14 @@ export default {
         this.taskList = []
         this.vin.value = ''
         this.vin.focus = true
+        this.showMovePopup = false
 
       })
+    },
+
+    movePopupConfirm(loc) {
+      this.hasMove = false
+      this.overTask(loc)
     }
   }
 }

package/src/views/vin/page/outbound/delivery/action.vue

@@ -182,7 +182,7 @@
         :columns="changeInfoPopup.carrierList"
         label-key="carrierCode"
         value-key="carrierCode"
-        @confirm="item => changeInfoPopup.form.carrierId = item.carrierId"
+        @confirm="carrierConfirm"
         @clear="changeInfoPopup.form.carrierId = ''"
       />
       <lw-input
@@ -322,6 +322,11 @@ export default {
         this.changeInfoPopup.show = true
       })
     },
+    // 修改信息弹框 - 承运商确认
+    carrierConfirm(item) {
+      this.changeInfoPopup.form.carrierId = item.carrierId
+      this.changeInfoPopup.form.carrierName = item.carrierName
+    },
     // 修改信息弹框 - 提交数据
     changeInfoPopupSubmit() {
       projectVinPDAOutboundDeliveryUpdate({
@@ -329,7 +334,7 @@ export default {
         ...this.changeInfoPopup.form
       }).then(() => {
         this.$lwToast.success(
-          this.$lwLanguage.get('wms_project.pda.vin.page.outbound.delivery.action.kfivawyx','已修改')
+          this.$lwLanguage.get('wms_project.pda.vin.page.outbound.delivery.action.kfivawyx', '已修改')
         )
         this.changeInfoPopup.show = false
         this.getOrderData()