feat: 进仓等级可多选并提示改密，升至1.1.19

src/pages/storefabric/storeFabricManualIn.vue

@@ -109,6 +109,8 @@
 			title="选择等级"
 			placeholder="请输入等级名称"
 			:list="levelOptions"
+			multiple
+			:selected="detail.grey_fabric_level_id"
 			@confirm="onLevelConfirm"
 		/>
 		<SearchSelectPopup
@@ -199,7 +201,14 @@ export default {
 	},
 	computed: {
 		levelDisplayName() {
-			return this.detail.grey_fabric_level_name || '';
+			if (this.detail.grey_fabric_level_name) return this.detail.grey_fabric_level_name;
+			const ids = normalizeLevelIds(this.detail.grey_fabric_level_id);
+			if (!ids.length) return '';
+			const nameMap = {};
+			this.levelOptions.forEach((item) => {
+				nameMap[String(item.value)] = item.label;
+			});
+			return ids.map((id) => nameMap[String(id)]).filter(Boolean).join('、');
 		},
 	},
 	onLoad() {
@@ -272,10 +281,15 @@ export default {
 			}
 			this.levelPickerShow = true;
 		},
-		onLevelConfirm(item) {
-			if (!item) return;
-			this.detail.grey_fabric_level_id = [Number(item.value)];
-			this.detail.grey_fabric_level_name = item.label || '';
+		onLevelConfirm(items) {
+			const list = Array.isArray(items) ? items : (items ? [items] : []);
+			this.detail.grey_fabric_level_id = list
+				.map((item) => Number(item.value))
+				.filter((item) => Number.isFinite(item));
+			this.detail.grey_fabric_level_name = list
+				.map((item) => item.label)
+				.filter(Boolean)
+				.join('、');
 		},
 		async loadInspectorOptions() {
 			try {
@@ -338,6 +352,8 @@ export default {
 				this.detail = {
 					...emptyDetail(),
 					fabric_piece_code: code,
+					inspector_id: this.detail.inspector_id,
+					inspector_name: this.detail.inspector_name,
 				};
 				this.weightKg = '';
 			} finally {
@@ -347,6 +363,8 @@ export default {
 		applyScanDetail(res, fallbackCode) {
 			const data = res || {};
 			const levelIds = normalizeLevelIds(data.grey_fabric_level_id);
+			const hasIncomingInspector = data.inspector_id != null && data.inspector_id !== ''
+				|| String(data.inspector_name || '').trim();
 			this.detail = {
 				...emptyDetail(),
 				fabric_piece_code: data.fabric_piece_code || fallbackCode || '',
@@ -356,9 +374,15 @@ export default {
 				grey_fabric_code: data.grey_fabric_code || '',
 				inspection_weight: formatDisplayWeightKg(data.inspection_weight) ? data.inspection_weight : null,
 				grey_fabric_level_id: levelIds,
-				grey_fabric_level_name: data.grey_fabric_level_name || '',
-				inspector_id: data.inspector_id != null ? data.inspector_id : null,
-				inspector_name: data.inspector_name || '',
+				grey_fabric_level_name: Array.isArray(data.grey_fabric_level_name)
+					? data.grey_fabric_level_name.filter(Boolean).join('、')
+					: (data.grey_fabric_level_name || ''),
+				inspector_id: hasIncomingInspector && data.inspector_id != null && data.inspector_id !== ''
+					? data.inspector_id
+					: this.detail.inspector_id,
+				inspector_name: hasIncomingInspector
+					? (data.inspector_name || this.detail.inspector_name || '')
+					: (this.detail.inspector_name || ''),
 			};
 			this.weightKg = formatDisplayWeightKg(data.inspection_weight);
 			this.scanCode = this.detail.fabric_piece_code;
@@ -421,11 +445,15 @@ export default {
 			}
 		},
 		resetForNextScan() {
+			const inspectorId = this.detail.inspector_id;
+			const inspectorName = this.detail.inspector_name;
 			this.scanCode = '';
-			this.detail = emptyDetail();
+			this.detail = {
+				...emptyDetail(),
+				inspector_id: inspectorId,
+				inspector_name: inspectorName,
+			};
 			this.weightKg = '';
-			this.warehouseBinId = null;
-			this.warehouseBinName = '';
 			this.$nextTick(() => {
 				this.scanFocus = false;
 				this.$nextTick(() => {
@@ -525,6 +553,7 @@ export default {
 	text-align: right;
 	font-size: $pda-font-body;
 	color: #202328;
+	word-break: break-all;
 }
 
 .manual-in__unit {

src/pages/sys/login/index.vue

@@ -125,6 +125,15 @@ import md5 from '@/common/md5.js';
 import manifest from '@/manifest.json';
 import { mapState } from 'vuex'
 import app_upgrade from '@/uni_modules/app-upgrade/js_sdk/index.js'
+
+function isDefaultPassword(data) {
+	if (!data || typeof data !== 'object') return false;
+	const value = data.is_default_password != null
+		? data.is_default_password
+		: (data.user && data.user.is_default_password);
+	return value === true || value === 1 || value === '1' || value === 'true';
+}
+
 export default {
 	data() {
 		return {
@@ -356,9 +365,12 @@ export default {
 				getApp().globalData.StoreNameID = aLoginUserData.default_physical_warehouse_id;
 				getApp().globalData.StoreName = aLoginUserData.default_physical_warehouse_name;
 				getApp().globalData.StoreTypeNo = '';
+				const workbenchUrl = isDefaultPassword(aLoginUserData)
+					? '/pages/sys/workbench/index?defaultPassword=1'
+					: '/pages/sys/workbench/index';
 				setTimeout(() => {
 					uni.reLaunch({
-						url: '/pages/sys/workbench/index'
+						url: workbenchUrl
 					});
 				}, 500);
 

src/pages/sys/workbench/index.vue

@@ -76,9 +76,12 @@ export default {
     };
   },
 
-  onLoad() {
+  onLoad(options) {
     const sys = uni.getSystemInfoSync();
     this.statusBarHeight = sys.statusBarHeight || 20;
+    if (options && String(options.defaultPassword) === '1') {
+      this.promptChangePassword();
+    }
     // #ifdef APP-PLUS
     plus.runtime.getProperty(plus.runtime.appid, (inf) => {
       if (inf && inf.version) {
@@ -90,6 +93,20 @@ export default {
   },
 
   methods: {
+    promptChangePassword() {
+      setTimeout(() => {
+        uni.showModal({
+          title: '提示',
+          content: '当前使用的是默认密码，请修改密码',
+          confirmText: '去修改',
+          cancelText: '稍后',
+          success: (res) => {
+            if (!res.confirm) return;
+            uni.navigateTo({ url: '/pages/sys/user/pwd' });
+          },
+        });
+      }, 400);
+    },
     handleScanCode(scanResult) {
       const cleanResult = scanResult.trim().replace(/[\r\n]/g, '');
       uni.navigateTo({