@logwire/logwire-wms-pda-ui 3.5.3 → 3.5.5-wat.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logwire/logwire-wms-pda-ui",
-  "version": "3.5.3",
+  "version": "3.5.5-wat.1",
   "private": false,
   "author": "zhangwen",
   "description": "运匠科技wms-PDA基础组件库",
@@ -10,7 +10,6 @@
     "build": "vite build",
     "push": "npm publish",
     "getNPMHttp": "npm get registry",
-    "setLocalHttp": "npm config set registry http://192.168.0.12:8081/repository/npm-hosted/",
     "recoverHttp": "npm config set registry https://registry.npmjs.org/"
   },
   "files": [
@@ -23,23 +22,22 @@
     "wms"
   ],
   "dependencies": {
-    "@bundled-es-modules/axios": "^0.27.2",
-    "core-js": "^3.37.0",
+    "axios": "^1.6.8",
+    "core-js": "^3.39.0",
     "lodash": "^4.17.21",
     "luxon": "^3.4.4",
     "vant": "^2.12.48",
-    "vue": "^2.7.7",
-    "string-random": "^0.1.3"
+    "vue": "^2.7.16"
   },
   "devDependencies": {
-    "@vitejs/plugin-legacy": "^5.4.0",
+    "@vitejs/plugin-legacy": "^5.4.3",
     "@vitejs/plugin-vue2": "^2.3.1",
     "eslint": "8.22.0",
-    "eslint-plugin-vue": "^9.25.0",
+    "eslint-plugin-vue": "^9.30.0",
     "less": "^4.2.0",
     "rollup-plugin-copy": "^3.5.0",
-    "terser": "^5.31.0",
-    "vite": "^5.1.6"
+    "terser": "^5.36.0",
+    "vite": "^5.4.10"
   },
   "eslintConfig": {
     "root": true,

package/src/components/Button/index.vue

@@ -6,6 +6,7 @@
 -->
 <template>
   <button
+    v-permissions="permissionCode"
     ref="lwButton"
     :type="nativeType"
     :class="[
@@ -36,6 +37,14 @@ export default {
   name: "lwButton",
   props: {
     // 按钮类型 main、normal、last
+    authSuffixCode: {
+      type: String,
+      default: null,
+    },
+    authCode: {
+      type: String,
+      default: null,
+    },
     type: {
       type: String,
       default: 'main'
@@ -99,6 +108,15 @@ export default {
       }
       if (this.disabled) return
       this.$emit('click', ev)
+    },
+    permissionCode() {
+      if (!this.authCode && !this.authSuffixCode) return
+      if (this.authCode) {
+        return this.authCode
+      }
+      if (this.authSuffixCode) {
+        return '/wms/pda' + this.$route.path + '.btn.' + this.authSuffixCode
+      }
     }
   }
 }

package/src/components/DataLookItem/index.vue

@@ -6,14 +6,14 @@
 <template>
   <div class="lw-data-look-item-box">
     <div
-      :style="{color}"
+      :style="{color,fontSize:valSize}"
       class="lw-data-look-item-value"
       :class="{'lw-global-value-bold-red':subjectColor}"
     >
       {{ $lwCheckVal(value) }}
     </div>
     <div
-      :style="{color}"
+      :style="{color:titleColor}"
       class="lw-data-look-item-title"
       :class="{'lw-global-title':subjectColor}"
     >
@@ -32,7 +32,11 @@ export default {
     value: [String, Number],
     color: [String],
     // 是否使用主题色
-    subjectColor: Boolean
+    subjectColor: Boolean,
+    // 数据字体大小
+    valSize: String,
+    // 标题颜色
+    titleColor: String
   },
   computed: {},
   data() {

package/src/components/ImgUpload/request.js

@@ -1,5 +1,5 @@
 
-import {axios} from "@bundled-es-modules/axios";
+import axios from "axios";
 // create an axios instance
 const service = axios.create({
   baseURL: import.meta.env.VITE_APP_BASE_URL, // url = base url + request url

package/src/components/Popup/index.vue

@@ -50,7 +50,9 @@
         :color="btnColor"
         :plain="btnPlain"
         @click="offBtnClick"
-      >{{ offBtnText || $lwLanguage.get('wms_project.pda.components.ui.popup.off','关闭') }}</lw-button>
+      >
+        {{ offBtnText || $lwLanguage.get('wms_project.pda.components.ui.popup.off', '关闭') }}
+      </lw-button>
       <slot name="button"></slot>
     </div>
 

package/src/components/PopupCheckbox/index.vue

@@ -11,7 +11,13 @@
     :title="title"
     :height="height"
     :show-keyboard-placeholder="false"
-    :off-btn-text="$lwLanguage.get('wms_project.pda.common.cancel', '取消')"
+    :off-btn-text="offBtnText || $lwLanguage.get('wms_project.pda.common.cancel', '取消')"
+    v-bind="$attrs"
+    @open="$emit('open')"
+    @opened="$emit('opened')"
+    @close="$emit('close')"
+    @closed="$emit('closed')"
+    @clickCloseBtn="$emit('clickCloseBtn')"
   >
 
 
@@ -29,13 +35,15 @@
             plain
             type="last"
             @click="clearInp"
-          >{{ $lwLanguage.get('wms_project.pda.common.clear', '重置') }}
+          >
+            {{ $lwLanguage.get('wms_project.pda.common.clear', '重置') }}
           </lw-button>
           <lw-button
             mini
             round
             @click="searchFn"
-          >{{ $lwLanguage.get('wms_project.pda.common.search', '搜索') }}
+          >
+            {{ $lwLanguage.get('wms_project.pda.common.search', '搜索') }}
           </lw-button>
         </template>
       </lw-input>
@@ -81,7 +89,8 @@
       <lw-button
         v-if="selectDataInfo.length"
         @click="confirm"
-      >{{ $lwLanguage.get('wms_project.pda.common.confirm', '确定') }}
+      >
+        {{ $lwLanguage.get('wms_project.pda.common.confirm', '确定') }}
       </lw-button>
     </template>
   </lw-popup>
@@ -97,6 +106,8 @@ export default {
       type: Boolean,
       default: false
     },
+    // 取消按钮文字
+    offBtnText: String,
     // 标题
     title: String,
     // 提供选择的数据

package/src/directive/Permissions.js

@@ -4,32 +4,36 @@
 * @date  2022-02-14
 * */
 
-import {Permissions} from "../utils/Permissions";
-import {lwErrMsg} from "../components/ErrorMsg";
+import { Permissions } from '../utils/Permissions'
+import { lwErrMsg } from '../components/ErrorMsg'
+import {WarehouseConfig} from "../utils/WarehouseConfig";
 
 export default {
-  inserted(el, binding) {
-    const { value } = binding
+  inserted (el, binding) {
+    let value = binding.value
     const permissions = Permissions.get() || []
+    const btnPermissionEnabled = WarehouseConfig.get('systemConfig.WAREHOUSE_WMS_PDA_BUTTON_PERMISSION_ENABLED')
+    console.log('WAREHOUSE_WMS_PDA_BUTTON_PERMISSION_ENABLED', btnPermissionEnabled)
+    if (value) {
+      if (typeof value === 'function') {
+        const res = value()
+        if (!res) return
+        console.log(res)
+        if (res.indexOf(".btn.") > 0 && btnPermissionEnabled !== 'true') return
+        value = [res]
+      }
+      if (Array.isArray(value)) {
+        if (value.length === 0) return true
 
-    if (value && value instanceof Array) {
-
-      if(value.length === 0) return true
-
-      const permissionRoles = value
-
-      const hasPermission = permissions.some(role => {
-        return permissionRoles.includes(role)
-      })
-
-      if (!hasPermission) {
-        el.parentNode && el.parentNode.removeChild(el)
+        if (!permissions.some(role => value.includes(role))) {
+          el.parentNode && el.parentNode.removeChild(el)
+        }
+      } else {
+        lwErrMsg.show('权限校验失败，请检查传入数据是否正确')
+        throw new Error(
+          '权限校验失败，请检查传入数据是否正确! 像这样使用：<div v-permission="[\'admin\',\'editor\']"></div>'
+        )
       }
-    } else {
-      lwErrMsg.show('权限校验失败，请检查传入数据是否正确')
-      throw new Error(
-          "权限校验失败，请检查传入数据是否正确! 像这样使用：<div v-permission=\"['admin','editor']\"></div>"
-      )
     }
   }
 }

package/src/utils/Axios.js

@@ -5,7 +5,7 @@
 * @date 2022-02-10
 * */
 
-import {axios} from "@bundled-es-modules/axios";
+import axios from "axios";
 import {ApiUtils} from "./ApiUtils";
 import {Warehouse} from "./Warehouse";
 import {lwErrMsg} from "../components/ErrorMsg";

package/src/utils/DeepCopy.js

@@ -3,7 +3,7 @@
 * @author: 张文
 * @date  2022-02-16
 * */
-import cloneDeep from "lodash/cloneDeep";
+import {cloneDeep} from "lodash/lang";
 
 
 /**

package/src/utils/ProjectCustomHandler.js

@@ -20,7 +20,7 @@
 
 
 import {at, set} from "lodash/object";
-import isArray from "lodash/isArray";
+import {isArray} from "lodash/lang";
 
 
 class ProjectCustomHandler {

package/src/utils/ProjectCustomRender.js

@@ -6,7 +6,7 @@
 
 
 import {at, set} from "lodash/object";
-import isArray from "lodash/isArray";
+import {isArray} from "lodash/lang";
 /*
 * 用于存放自定义渲染函数
 * */

package/src/utils/StringRandom.js

@@ -0,0 +1,46 @@
+/*
+* 随机字符串
+* @author: 张文
+* @date  2024-09-05
+* */
+
+
+const numbers = '0123456789';
+const letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+const specials = '~!@#$%^*()_+-=[]{}|;:,./<>?';
+
+/**
+ * 获取随机字符串
+ * @param {Number} length 字符串的长度
+ * @param {Object} options - 配置项{number:是否允许数字，letters:是否允许字母，specials:是否需要符号，}
+ * @return {String}
+ */
+function random(length = 8, options) {
+
+  let chars = '';
+  let result = '';
+
+  if (!options || !Object.keys(options).length) {
+    chars = numbers + letters + specials;
+  } else {
+    if (options.numbers) {
+      chars += numbers;
+    }
+
+    if (options.letters) {
+      chars += letters;
+    }
+
+    if (options.specials) {
+      chars += specials;
+    }
+  }
+
+  while (length > 0) {
+    length--;
+    result += chars[Math.floor(Math.random() * chars.length)];
+  }
+  return result;
+}
+
+export default random;

package/src/utils/SystemConfig.js

@@ -6,7 +6,7 @@
 
 
 import {at, set} from "lodash/object";
-import isArray from "lodash/isArray";
+import {isArray} from "lodash/lang";
 import {DeepCopy} from "./DeepCopy";
 
 // 配置表

package/src/utils/index.js

@@ -41,6 +41,7 @@ import {LocalStaff} from "./LocalStaff";
 import {SystemConfig} from "./SystemConfig";
 import {ProjectCustomRender} from "./ProjectCustomRender";
 import ProjectCustomHandler from "./ProjectCustomHandler";
+import random from "./StringRandom";
 
 
 export const utils = (Vue) => {
@@ -84,4 +85,5 @@ export const utils = (Vue) => {
   Vue.prototype.$lwSystemConfig = SystemConfig
   Vue.prototype.$lwProjectCustomRender = ProjectCustomRender
   Vue.prototype.$lwProjectCustomHandler = new ProjectCustomHandler()
+  Vue.prototype.$lwStringRandom = random
 }

package/src/utils/windowGlobalData.js

@@ -5,7 +5,7 @@
 * */
 
 import {at, set} from "lodash/object";
-import isArray from "lodash/isArray";
+import {isArray} from "lodash/lang";
 import {DeepCopy} from "./DeepCopy";
 
 export function lwWindowGlobalData() {

package/src/views/common/module/SearchSelectPopup/index.vue

@@ -164,7 +164,9 @@ export default {
     // 初始化时回填的值，当isInitEchoData=true时无效
     initDefault: String,
     // 初始化时回填数据的索引，当 isInitEchoData=true 或 initDefault 有值时无效
-    initSelectedIndex: Number
+    initSelectedIndex: Number,
+    // 初始化时当数据只有一条时默认选中，当 isInitEchoData=true 或 initDefault、initSelectedIndex 有值时无效
+    initListOnlyOneSelected: Boolean,
 
   },
   computed: {
@@ -210,11 +212,16 @@ export default {
     } else if (this.initDefault) {
       this.formatDataAndDisabled({}, this.initDefault)
     } else if (this.initSelectedIndex !== undefined) {
-
       this.getData().then(({datas}) => {
-        const item = datas[0]
-        this.formatDataAndDisabled(item)
-        this.selectedVal = item[this.valueKey]
+        this.formatDataAndDisabled(datas[0])
+        this.selectedVal = datas[0][this.valueKey]
+      })
+    } else if (this.initListOnlyOneSelected) {
+      this.getData().then(({datas}) => {
+        if (datas.length === 1) {
+          this.formatDataAndDisabled(datas[0])
+          this.selectedVal = datas[0][this.valueKey]
+        }
       })
     }
   },

package/src/views/wms/api/inner/lotTransfer.js

@@ -14,6 +14,13 @@ export function wmsMobileInnerLotTransferGetLotDetail(data) {
   })
 }
 
+export function wmsMobileInnerLotTransferGetWholeContainerDetail(data) {
+  return lwAxios.action({
+    url: 'wmsMobileInnerLotTransferGetWholeContainerDetail',
+    data
+  })
+}
+
 
 // 按商品转移批次
 export function wmsMobileInnerLotTransferSubmitBySku(data) {

package/src/views/wms/api/inner/skuBatchToLpn.js

@@ -0,0 +1,43 @@
+/*
+* 商品批量打托
+* @author: 张文
+* @date  2024-09-19
+* */
+
+import lwAxios from "../../../../utils/Axios";
+
+
+// 获取列表
+export function wmsMobileSkuPalletQueryInventoryPageList(data) {
+  return lwAxios.action({
+    url: 'wmsMobileSkuPalletQueryInventoryPageList',
+    data
+  })
+}
+
+
+// 获取打托信息
+export function wmsMobileSkuPalletGetInventory(data) {
+  return lwAxios.action({
+    url: 'wmsMobileSkuPalletGetInventory',
+    data
+  })
+}
+
+
+// 批量打托
+export function wmsMobileSkuPalletSubmitBySkuBatch(data) {
+  return lwAxios.action({
+    url: 'wmsMobileSkuPalletSubmitBySkuBatch',
+    data
+  })
+}
+
+
+// 补打
+export function wmsMobileSkuPalletSubmitByInventory(data) {
+  return lwAxios.action({
+    url: 'wmsMobileSkuPalletSubmitByInventory',
+    data
+  })
+}

package/src/views/wms/api/outbound/delivery/action.js

@@ -116,12 +116,12 @@ export function projectDeliveryCompleteLoad(data) {
 
 
 // 检查发运单是否装载完成
-export function projectDeliveryQueryLoadSoInfo(data) {
+/*export function projectDeliveryQueryLoadSoInfo(data) {
   return lwAxios.action({
     url: 'projectDeliveryQueryLoadSoInfo',
     data
   })
-}
+}*/
 
 
 // 继续装车
@@ -188,3 +188,59 @@ export function projectDeliveryRelatedOrder(data) {
     data
   })
 }
+
+// 修改装车方式
+export function projectDeliveryUpdateLoadMethods(data) {
+  return lwAxios.action({
+    url: 'projectDeliveryUpdateLoadMethods',
+    data
+  })
+}
+
+// 获取关联的出库单
+export function projectDeliveryFindWaitLoadSoList(data) {
+  return lwAxios.action({
+    url: 'projectDeliveryFindWaitLoadSoList',
+    data
+  })
+}
+
+// 获取出库单信息
+export function projectDeliveryFindWaitLoadSoDetail(data) {
+  return lwAxios.action({
+    url: 'projectDeliveryFindWaitLoadSoDetail',
+    data
+  })
+}
+
+// 获取捆包箱信息
+export function projectDeliveryFindSoWaitLoadOnlyPacked(data) {
+  return lwAxios.action({
+    url: 'projectDeliveryFindSoWaitLoadOnlyPacked',
+    data
+  })
+}
+
+// 获取容器信息
+export function projectDeliveryFindSoWaitLoad(data) {
+  return lwAxios.action({
+    url: 'projectDeliveryFindSoWaitLoad',
+    data
+  })
+}
+
+// 获取商品信息
+export function projectWmsOutboundPDASoPickSkuPageV2(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundPDASoPickSkuPageV2',
+    data
+  })
+}
+
+// 完成装车并发运
+export function projectDeliveryCompleteLoadAndShip(data) {
+  return lwAxios.action({
+    url: 'projectDeliveryCompleteLoadAndShip',
+    data
+  })
+}

package/src/views/wms/api/outbound/orderDeliveryShip.js

@@ -102,6 +102,13 @@ export function wmsProjectDeliveryHasNoPickCheck(data) {
   })
 }
 
+export function wmsProjectDeliveryLoadShipCheck(data) {
+  return lwAxios.action({
+    url: 'wmsProjectDeliveryLoadShipCheck',
+    data
+  })
+}
+
 
 // 强制装车
 export function projectDeliveryForceLoad(data) {
@@ -146,3 +153,12 @@ export function wmsProjectDeliveryForceCheck(data) {
     data
   })
 }
+
+
+// 批量装载拣选托盘号
+export function projectDeliveryAddLpns(data) {
+  return lwAxios.action({
+    url: 'projectDeliveryAddLpns',
+    data
+  })
+}

package/src/views/wms/api/outbound/orderTaskDetails.js

@@ -0,0 +1,15 @@
+/*
+* 拣选单拣选
+* @author: 张文
+* @date  2023-08-22
+* */
+import lwAxios from '../../../../utils/Axios'
+
+
+// 通过拣选单获取拣选数据
+export function projectWmsOutboundTaskDetails(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundTaskDetails',
+    data
+  })
+}

package/src/views/wms/api/outbound/pick/notAlone.js

@@ -40,3 +40,12 @@ export function projectWmsOutboundPickPrint(data) {
     data
   })
 }
+
+
+// 获取托盘的拣选任务
+export function projectDeliveryListLpnPickTask(data) {
+  return lwAxios.action({
+    url: 'projectDeliveryListLpnPickTask',
+    data
+  })
+}

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

@@ -98,7 +98,7 @@
     />
 
     <!-- 图片 -->
-    <div class="lw-global-title" style="padding: 8px 0">
+    <div class="lw-global-title" style="padding: 8px 0" :class="mustUploadImg ? 'lw-global-title lw-global-required' : 'lw-global-title' ">
       {{ $lwLanguage.get('wms_project.pda.module.inboundAbn.img','图片') }}
     </div>
     <lw-img-upload v-model="abnormal.abnImgArr"/>
@@ -149,7 +149,11 @@ export default {
     },
 
     // 当前库位的编码
-    currentLocCode: String
+    currentLocCode: String,
+    mustUploadImg: {
+      type: Boolean,
+      default: false,
+    }
 
   },
   data() {
@@ -197,6 +201,7 @@ export default {
     } else {
       this.abnTypeList = abnTypeList
     }
+    this.mustUploadImg = this.$lwWarehouseConfig.get('systemConfig.WAREHOUSE_SUBMIT_ABNORMAL_MUST_UPLOAD_IMAGE') === 'true'
 
     this.getAbnLocCode()
   },
@@ -319,6 +324,15 @@ export default {
 
       if (!this.abnLpnCheck()) return
 
+      if (this.mustUploadImg) {
+        if (!this.abnormal.abnImgArr || this.abnormal.abnImgArr.length <= 0){
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('wms_project.pda.module.inboundAbn.abnImgArrNull','异常图片不能为空')
+          )
+          return false
+        }
+      }
+
       return true
     },
     // 获取填写的异常数据

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

@@ -349,7 +349,7 @@ export default {
      * @param {Number} qty 需要回显的EA数
      * */
     setQty(qty) {
-      let numQty = qty || this.qty
+      let numQty = qty === undefined ? this.qty : qty
 
       // 判断当前包装信息是否加载完成
       if (!this.packDataRendered) {