fix: 修复汇总表行点击展开细码并升至1.1.21

.env

@@ -1,5 +1,5 @@
 NODE_ENV = production
 VUE_APP_ENV_NAME = zhoushang环境
 VUE_APP_UPGRADE_NAME = erp_pda_zhoushang
-VUE_APP_PRODUCTION_API_URL = https://hcscmtest.zzfzyc.com/hcscm_weave/pda/v1
+VUE_APP_PRODUCTION_API_URL = https://zsfz.yushangfangzhi.com/hcscm/pda/v1
-VUE_APP_DEV_API_URL = https://hcscmtest.zzfzyc.com/hcscm_weave/pda/v1
+VUE_APP_DEV_API_URL = https://zsfz.yushangfangzhi.com/hcscm/pda/v1

.env.zhoushang

@@ -1,5 +1,5 @@
 NODE_ENV = production
 VUE_APP_ENV_NAME = zhoushang环境
 VUE_APP_UPGRADE_NAME = erp_pda_zhoushang
-VUE_APP_PRODUCTION_API_URL = https://hcscmtest.zzfzyc.com/hcscm_weave/pda/v1
+VUE_APP_PRODUCTION_API_URL = https://zsfz.yushangfangzhi.com/hcscm/pda/v1
-VUE_APP_DEV_API_URL = https://hcscmtest.zzfzyc.com/hcscm_weave/pda/v1
+VUE_APP_DEV_API_URL = https://zsfz.yushangfangzhi.com/hcscm/pda/v1

README.md

@@ -100,4 +100,39 @@ pack.json内容如下：详情可访问 [CLI uni-app发行 - Android/iOS云打
 }
 ```
 ### 云服务器走CICD 打包:
-需要下载 [Linux HBuilderX Cli](https://ask.dcloud.net.cn/article/41469) 
+需要下载 [Linux HBuilderX Cli](https://ask.dcloud.net.cn/article/41469)
+
+### 上传 PDA 安装包
+
+云打包得到 APK 后，用命令行上传，等价于 ERP「开发者资源上传」里的安装包上传。周尚环境的登录和签名走 `https://zsfz.yushangfangzhi.com/hcscm`，安装包进入 `zhoushang` 空间。
+
+先把 `src/manifest.json` 的 `versionName`、`versionCode` 改成新版本，再打包。安装包里的版本号必须和上传文件名一致，否则 PDA 会反复提示升级。
+
+```
+npm run upload:apk -- --file D:\path\你的.apk --target test
+npm run upload:apk -- --file D:\path\你的.apk --target prod
+```
+
+`npm` 后面的 `--` 只是分隔符，用来把 `--file`、`--target` 传给脚本。也可以不经过 npm：
+
+```
+node scripts/upload-apk.js --file D:\path\你的.apk --target test
+```
+
+运行后输入 ERP 手机号和密码获取 token。账号下有多个账套时，再按序号选一次。
+
+`--target` 只决定 APK 放到哪套 CDN，没有别的差别。生产环境的 PDA 也可以从测试 CDN 下载并安装。
+
+| 参数 | 说明 |
+|---|---|
+| `--target test` | 周尚环境固定上传到 `https://zsfzcdn.yushangfangzhi.com` |
+| `--target prod` | 其他环境的正式 CDN：`https://hcscm.cdn.zzfzyc.com` |
+| `--mode` | 默认 `zhoushang`。可选 `zhoushang`、`zhisheng`、`mes`、`cjt` |
+| `--version` | 可选。不传则用 `src/manifest.json` 的 `versionName` |
+
+场景值取对应 `.env.{mode}` 里的 `VUE_APP_UPGRADE_NAME`。保存路径为 `/version/{场景值}/{版本号}.apk`。版本包上传成功后，同一份安装包会再传到 `/version/{场景值}/latest.apk`。本分支默认场景是 `.env.zhoushang` 的 `erp_pda_zhoushang`，上传成功后会打印完整下载地址，例如：
+
+```
+https://zsfzcdn.yushangfangzhi.com/version/erp_pda_zhoushang/1.1.9.apk
+https://zsfzcdn.yushangfangzhi.com/version/erp_pda_zhoushang/latest.apk
+``` 

package.json

@@ -50,6 +50,7 @@
     "dev:quickapp-webview-huawei": "cross-env NODE_ENV=development UNI_PLATFORM=quickapp-webview-huawei vue-cli-service uni-build --watch",
     "dev:quickapp-webview-union": "cross-env NODE_ENV=development UNI_PLATFORM=quickapp-webview-union vue-cli-service uni-build --watch",
     "info": "node node_modules/@dcloudio/vue-cli-plugin-uni/commands/info.js",
+    "upload:apk": "node scripts/upload-apk.js",
     "serve:quickapp-native": "node node_modules/@dcloudio/uni-quickapp-native/bin/serve.js",
     "test:android": "cross-env UNI_PLATFORM=app-plus UNI_OS_NAME=android jest -i",
     "test:h5": "cross-env UNI_PLATFORM=h5 jest -i",

scripts/upload-apk.js

@@ -0,0 +1,334 @@
+/**
+ * 上传已打包的 PDA APK，等价于 ERP「开发者资源上传」里的安装包上传。
+ *
+ * 用法：
+ *   npm run upload:apk -- --file D:\path\app.apk --target test
+ *   npm run upload:apk -- --file D:\path\app.apk --target prod
+ *   npm run upload:apk -- --file D:\path\app.apk --target test --mode zhisheng
+ *
+ * --target 只决定 APK 放到哪套 CDN：
+ *   test  测试 CDN
+ *   prod  正式 CDN
+ * 两者没有别的差别。生产环境的 PDA 也可以从测试 CDN 下载并安装。
+ *
+ * 版本号取 src/manifest.json 的 versionName。
+ * 场景值取对应 .env 的 VUE_APP_UPGRADE_NAME，拼成 /version/{upgradeName}/{version}.apk。
+ * 版本包上传成功后，再把同一份安装包上传为 /version/{upgradeName}/latest.apk。
+ * 运行时输入 ERP 手机号和密码获取 token。多个账套时再选择一次。
+ */
+const fs = require('fs');
+const path = require('path');
+const readline = require('readline');
+
+const ROOT = path.resolve(__dirname, '..');
+const UPYUN_API = 'https://v0.api.upyun.com';
+const DEFAULT_API_BASE = 'https://hcscmtest.zzfzyc.com/hcscm';
+const DEFAULT_CDN_HOST = {
+  test: 'https://testhcscm.cdn.zzfzyc.com',
+  prod: 'https://hcscm.cdn.zzfzyc.com',
+};
+/** 周尚环境的安装包签到 zhoushang 空间，下载域名是 zsfzcdn */
+const MODE_UPLOAD = {
+  zhoushang: {
+    apiBase: 'https://zsfz.yushangfangzhi.com/hcscm',
+    cdnHost: 'https://zsfzcdn.yushangfangzhi.com',
+    /** 该环境只有 status=1 返回了 zhoushang 空间，正式状态没有可用 bucket */
+    status: 1,
+  },
+};
+
+const MODE_ENV = {
+  zhoushang: '.env.zhoushang',
+  zhisheng: '.env.zhisheng',
+  mes: '.env.mes',
+  cjt: '.env.cjt',
+};
+
+function parseArgs(argv) {
+  const args = { mode: 'zhoushang' };
+  for (let i = 0; i < argv.length; i += 1) {
+    const key = argv[i];
+    const value = argv[i + 1];
+    if (key === '--file' || key === '--target' || key === '--mode' || key === '--version' || key === '--phone' || key === '--password' || key === '--tenant') {
+      args[key.slice(2)] = value;
+      i += 1;
+    }
+  }
+  return args;
+}
+
+function readEnvValue(filePath, name) {
+  const text = fs.readFileSync(filePath, 'utf8');
+  const line = text.split(/\r?\n/).find((item) => item.trim().startsWith(`${name}`));
+  if (!line) return '';
+  const raw = line.slice(line.indexOf('=') + 1).trim();
+  return raw.replace(/^['"]|['"]$/g, '');
+}
+
+function readManifestVersion() {
+  const manifest = JSON.parse(fs.readFileSync(path.join(ROOT, 'src/manifest.json'), 'utf8'));
+  return String(manifest.versionName || '').trim();
+}
+
+function ask(question) {
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  return new Promise((resolve) => {
+    rl.question(question, (answer) => {
+      rl.close();
+      resolve(String(answer || '').trim());
+    });
+  });
+}
+
+function askPassword(question) {
+  return new Promise((resolve) => {
+    const stdin = process.stdin;
+    const stdout = process.stdout;
+    if (!stdin.isTTY || typeof stdin.setRawMode !== 'function') {
+      ask(question).then(resolve);
+      return;
+    }
+    stdout.write(question);
+    stdin.setRawMode(true);
+    stdin.resume();
+    stdin.setEncoding('utf8');
+    let value = '';
+    const onData = (char) => {
+      switch (char) {
+        case '\n':
+        case '\r':
+        case '\u0004':
+          stdin.setRawMode(false);
+          stdin.pause();
+          stdin.removeListener('data', onData);
+          stdout.write('\n');
+          resolve(value);
+          break;
+        case '\u0003':
+          process.exit();
+          break;
+        case '\u007f':
+        case '\b':
+          value = value.slice(0, -1);
+          break;
+        default:
+          value += char;
+          break;
+      }
+    };
+    stdin.on('data', onData);
+  });
+}
+
+async function apiJson(apiBase, urlPath, { method = 'GET', token, body } = {}) {
+  const headers = { Platform: '1' };
+  if (token) headers.Authorization = token;
+  if (body) headers['Content-Type'] = 'application/json';
+  const res = await fetch(`${apiBase}${urlPath}`, {
+    method,
+    headers,
+    body: body ? JSON.stringify(body) : undefined,
+  });
+  const data = await res.json().catch(() => ({}));
+  if (!res.ok || data.code !== 0) {
+    throw new Error(data.msg || `请求失败（HTTP ${res.status}）`);
+  }
+  return data.data || {};
+}
+
+async function login(apiBase, { phone: phoneArg, password: passwordArg, tenant: tenantArg } = {}) {
+  const phone = phoneArg || await ask('手机号: ');
+  const password = passwordArg || await askPassword('密码: ');
+  if (!phone || !password) {
+    throw new Error('请输入手机号和密码');
+  }
+  console.log('正在登录...');
+  const first = await apiJson(apiBase, '/admin/v1/login', {
+    method: 'POST',
+    body: { phone, password },
+  });
+  const tempToken = first.token;
+  if (!tempToken) throw new Error('登录未返回 token');
+
+  const dropdown = await apiJson(apiBase, '/admin/v1/tenantManagement/dropdownList', {
+    token: tempToken,
+  });
+  const tenants = dropdown.list || [];
+  if (!tenants.length) return tempToken;
+
+  let tenant = tenants[0];
+  if (tenants.length > 1) {
+    if (tenantArg) {
+      const picked = Number(tenantArg);
+      tenant = tenants[picked - 1];
+      if (!tenant) throw new Error('账套序号无效');
+    } else {
+      console.log('请选择账套:');
+      tenants.forEach((item, index) => {
+        const name = item.company_name || item.database_name || item.tenant_contacts || item.tenant_management_id;
+        console.log(`  ${index + 1}. ${name}`);
+      });
+      const picked = Number(await ask('序号: '));
+      tenant = tenants[picked - 1];
+      if (!tenant) throw new Error('账套序号无效');
+    }
+  }
+
+  const second = await apiJson(apiBase, '/admin/v1/login', {
+    method: 'POST',
+    token: tempToken,
+    body: {
+      token: tempToken,
+      tenant_management_id: tenant.tenant_management_id,
+    },
+  });
+  if (!second.token) throw new Error('选择账套后未返回 token');
+  return second.token;
+}
+
+async function getCdnSign({ apiBase, token, saveKey, status }) {
+  const url = new URL(`${apiBase}/admin/v1/cdn/token`);
+  url.searchParams.set('method', 'post');
+  url.searchParams.set('save_key', saveKey);
+  url.searchParams.set('status', String(status));
+  const res = await fetch(url, {
+    headers: {
+      Authorization: token,
+      Platform: '1',
+    },
+  });
+  const body = await res.json();
+  if (!res.ok || body.code !== 0) {
+    throw new Error(body.msg || `获取签名失败（HTTP ${res.status}）`);
+  }
+  return body.data || {};
+}
+
+async function uploadToUpyun({ bucket, authorization, policy, filePath, fileName }) {
+  const buf = fs.readFileSync(filePath);
+  const form = new FormData();
+  form.append('authorization', authorization);
+  form.append('policy', policy);
+  form.append('file', new Blob([buf], { type: 'application/vnd.android.package-archive' }), fileName);
+  const res = await fetch(`${UPYUN_API}/${bucket}`, {
+    method: 'POST',
+    body: form,
+  });
+  const text = await res.text();
+  let body = {};
+  try {
+    body = JSON.parse(text);
+  } catch (e) {
+    body = { raw: text };
+  }
+  if (!res.ok || (body.code != null && Number(body.code) !== 200)) {
+    throw new Error(body.message || body.msg || body.raw || `上传失败（HTTP ${res.status}）`);
+  }
+  return body;
+}
+
+function toPublicUrl(cdnHost, saveKey, uploaded) {
+  if (uploaded.url && String(uploaded.url).startsWith('http')) return uploaded.url;
+  return `${cdnHost}${saveKey}`;
+}
+
+async function uploadApkFile({ apiBase, token, apkPath, saveKey, fileName, status }) {
+  console.log(`场景路径: ${saveKey}`);
+  console.log('正在获取签名...');
+  const sign = await getCdnSign({
+    apiBase,
+    token,
+    saveKey,
+    status,
+  });
+  if (!sign.bucket || !sign.authorization || !sign.policy) {
+    throw new Error('签名返回缺少 bucket、authorization 或 policy');
+  }
+  console.log(`空间: ${sign.bucket}`);
+  console.log(`正在上传 ${fileName}...`);
+  const uploaded = await uploadToUpyun({
+    bucket: sign.bucket,
+    authorization: sign.authorization,
+    policy: sign.policy,
+    filePath: apkPath,
+    fileName,
+  });
+  console.log('上传成功');
+  return uploaded;
+}
+
+async function main() {
+  const args = parseArgs(process.argv.slice(2));
+  if (!args.file || !args.target) {
+    console.error('用法: npm run upload:apk -- --file <apk路径> --target test|prod [--mode zhoushang]');
+    console.error('--target 只切换 APK 的 CDN：test 测试 CDN，prod 正式 CDN。生产环境也可以从测试 CDN 下载安装。');
+    process.exit(1);
+  }
+  if (args.target !== 'test' && args.target !== 'prod') {
+    console.error('--target 只能是 test 或 prod。两者只是 APK 的 CDN 环境不同，生产环境也可以从测试 CDN 下载安装。');
+    process.exit(1);
+  }
+  const envFile = MODE_ENV[args.mode];
+  if (!envFile) {
+    console.error(`不支持的 --mode：${args.mode}，可选 zhoushang、zhisheng、mes、cjt`);
+    process.exit(1);
+  }
+  const apkPath = path.resolve(args.file);
+  if (!fs.existsSync(apkPath)) {
+    console.error(`找不到 APK：${apkPath}`);
+    process.exit(1);
+  }
+
+  const version = args.version || readManifestVersion();
+  if (!version) {
+    console.error('manifest.json 里没有 versionName');
+    process.exit(1);
+  }
+  const upgradeName = readEnvValue(path.join(ROOT, envFile), 'VUE_APP_UPGRADE_NAME');
+  if (!upgradeName) {
+    console.error(`${envFile} 里没有 VUE_APP_UPGRADE_NAME`);
+    process.exit(1);
+  }
+
+  const modeUpload = MODE_UPLOAD[args.mode];
+  const status = modeUpload ? modeUpload.status : (args.target === 'prod' ? 2 : 1);
+  const fileName = `${version}.apk`;
+  const saveKey = `/version/${upgradeName}/${fileName}`;
+  const latestFileName = 'latest.apk';
+  const latestSaveKey = `/version/${upgradeName}/${latestFileName}`;
+  const apiBase = modeUpload ? modeUpload.apiBase : DEFAULT_API_BASE;
+  const cdnHost = modeUpload ? modeUpload.cdnHost : DEFAULT_CDN_HOST[args.target];
+  const token = await login(apiBase, {
+    phone: args.phone,
+    password: args.password,
+    tenant: args.tenant,
+  });
+
+  console.log(`版本号: ${version}`);
+  console.log(`签名接口: ${apiBase}`);
+  console.log(`CDN: ${cdnHost}`);
+  const uploaded = await uploadApkFile({
+    apiBase,
+    token,
+    apkPath,
+    saveKey,
+    fileName,
+    status,
+  });
+  console.log(toPublicUrl(cdnHost, saveKey, uploaded));
+
+  const latestUploaded = await uploadApkFile({
+    apiBase,
+    token,
+    apkPath,
+    saveKey: latestSaveKey,
+    fileName: latestFileName,
+    status,
+  });
+  console.log(toPublicUrl(cdnHost, latestSaveKey, latestUploaded));
+}
+
+main().catch((error) => {
+  console.error(error.message || error);
+  process.exit(1);
+});

src/App.vue

@@ -6,7 +6,8 @@ import { audioManager } from '@/utils/audioManager'
 
 	import util from '@/common/util.js';
 	import md5 from '@/common/md5.js';
-	import { restoreUserSession } from '@/common/userSession.js';
+	import { getLoginData, restoreUserSession } from '@/common/userSession.js';
+	import { ensureScanConfigAfterLogin } from '@/common/scanAutoConfig.js';
 	export default {
 		globalData: {
 			AppName: '',
@@ -32,6 +33,14 @@ import { audioManager } from '@/utils/audioManager'
 			audioManager.init();
 			// 初始化通知系统
 			this.$store.dispatch('initNotification');
+
+			// 已登录且本地无扫码配置时，自动匹配一次
+			const loginData = getLoginData();
+			if (loginData && loginData.token && this.$u && this.$u.api) {
+				ensureScanConfigAfterLogin(this.$u.api).catch((error) => {
+					console.log('启动时自动匹配扫码设置失败', error);
+				});
+			}
 		}
 	}
 </script>

src/common/config.js

@@ -21,14 +21,14 @@ const config = {
 	isDevelopment: isDevelopment,
 
 	// 生产环境API URL（服务名段 hcscm）
-	productionApiUrl: process.env.VUE_APP_PRODUCTION_API_URL || 'https://www.haotopai.com/hcscm/pda/v1',
+	productionApiUrl: process.env.VUE_APP_PRODUCTION_API_URL,
 
 	// 开发环境API URL选项（服务名段 hcscm）
 	devApiUrlOptions: [
 		{ label: '测试环境', value: 'https://hcscmtest.zzfzyc.com/hcscm/pda/v1' },
 		{ label: '本地环境', value: 'http://192.168.1.66:7010/hcscm/pda/v1' },
 		{ label: '本地穿透', value: 'https://2yd52gx88533.vicp.fun/hcscm/pda/v1' },
-		{ label: '正式环境', value: process.env.VUE_APP_DEV_API_URL || 'https://www.haotopai.com/hcscm/pda/v1' },
+		{ label: '正式环境', value: process.env.VUE_APP_PRODUCTION_API_URL },
 		{ label: '自定义', value: 'custom' }
 	]
 

src/common/http.api.js

@@ -142,6 +142,8 @@ const install = (Vue, vm) => {
 		// PDA登录接口
 		pdaLogin: (params = {}) => vm.$u.postJson('/login', params),
 		pdaLogout: (params = {}) => vm.$u.postJson('/logout', params),
+		// 修改密码：PUT pda/v1/user/updatePassword
+		updatePassword: (params = {}) => vm.$u.putJson('/user/updatePassword', params),
 		// 登录后获取当前用户信息、菜单与按钮权限
 		pdaGetInformation: (params = {}) => vm.$u.get('/information', params),
 		// 获取配布单列表

src/common/list-filter.scss

@@ -0,0 +1,149 @@
+@import '@/common/pda-typography.scss';
+
+page { background-color: #F8F8F8; }
+.filterBar { display: flex; align-items: center; padding: 16rpx 20rpx; background: #fff; gap: 16rpx; }
+.filterBtn {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	min-width: 88rpx;
+	min-height: 76rpx;
+	padding: 8rpx 10rpx;
+	border: 2rpx solid transparent;
+	border-radius: 12rpx;
+	box-sizing: border-box;
+	font-size: $pda-font-nav-sub;
+	line-height: 1.2;
+	color: #666;
+	background: #f5f6f8;
+}
+.filter-active {
+	color: #2979ff !important;
+	background: #d6e8ff !important;
+	border-color: #2979ff !important;
+}
+.filterBtn__icon {
+	position: relative;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+.filterBtn__badge {
+	position: absolute;
+	top: -8rpx;
+	right: -10rpx;
+	width: 18rpx;
+	height: 18rpx;
+	border: 4rpx solid #fff;
+	border-radius: 50%;
+	background: #ff4d4f;
+	box-sizing: content-box;
+}
+.filterPanel {
+	min-height: 100%;
+	padding: 32rpx 28rpx;
+	box-sizing: border-box;
+}
+.filterTitle {
+	margin-bottom: 30rpx;
+	font-size: $pda-font-popup-title;
+	font-weight: bold;
+	color: #202328;
+}
+.filterItem { margin-bottom: 28rpx; }
+.filterLabel {
+	display: block;
+	margin-bottom: 14rpx;
+	font-size: $pda-font-body;
+	line-height: 1.35;
+	color: #555b66;
+}
+.filterInput {
+	display: flex;
+	align-items: center;
+	min-height: $pda-row-min-height;
+	padding: 0 18rpx;
+	background: #f5f6f8;
+	border-radius: 8rpx;
+	box-sizing: border-box;
+}
+::v-deep .filterInput .u-input__input {
+	font-size: $pda-font-body !important;
+	color: #202328;
+}
+::v-deep .filterInput .u-input__input::placeholder {
+	font-size: $pda-font-placeholder;
+	color: #aeb4bf;
+}
+.filterValue {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	min-height: $pda-row-min-height;
+	padding: 0 18rpx;
+	background: #f5f6f8;
+	border-radius: 8rpx;
+	box-sizing: border-box;
+	font-size: $pda-font-body;
+	color: #202328;
+}
+.dateRow {
+	display: flex;
+	align-items: center;
+	gap: 10rpx;
+}
+.datePicker {
+	flex: 1;
+	min-width: 0;
+}
+.dateInput {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	min-height: $pda-row-min-height;
+	padding: 0 8rpx;
+	background: #f5f6f8;
+	border-radius: 8rpx;
+	box-sizing: border-box;
+	font-size: $pda-font-body;
+	color: #202328;
+	text-align: center;
+	white-space: nowrap;
+}
+.dateInput--placeholder {
+	font-size: $pda-font-placeholder;
+	color: #7d8490;
+}
+.dateSeparator {
+	flex-shrink: 0;
+	font-size: $pda-font-body;
+	color: #555b66;
+}
+.filterActions {
+	display: flex;
+	gap: 20rpx;
+	margin-top: 40rpx;
+}
+.filterActions .u-btn {
+	flex: 1;
+	height: $pda-button-height !important;
+	line-height: $pda-button-height !important;
+	padding: 0 !important;
+	font-size: $pda-font-button !important;
+}
+::v-deep .pdaSelect .u-select__header {
+	height: $pda-row-min-height;
+}
+::v-deep .pdaSelect .u-select__header__btn,
+::v-deep .pdaSelect .u-select__header__title,
+::v-deep .pdaSelect .u-select__body__picker-view__item {
+	font-size: $pda-font-popup-item !important;
+}
+::v-deep .pdaSelect .u-select__search__input {
+	font-size: $pda-font-body !important;
+}
+::v-deep .pdaSelect .u-select__loading,
+::v-deep .pdaSelect .u-select__empty {
+	font-size: $pda-font-popup-sub !important;
+}

src/common/listFilter.js

@@ -0,0 +1,49 @@
+export function hasFilterValue(value) {
+	if (value === '' || value === null || value === undefined) return false;
+	if (typeof value === 'string') return value.trim() !== '';
+	return true;
+}
+
+export function normalizeAuditStatus(value) {
+	if (!hasFilterValue(value) && value !== 0) return '';
+	const status = Number(value);
+	return Number.isNaN(status) ? '' : status;
+}
+
+export function isActiveFilterState(filters) {
+	if (!filters) return false;
+	return Object.keys(filters).some((key) => {
+		if (/_name$/.test(key)) return false;
+		return hasFilterValue(filters[key]);
+	});
+}
+
+export function normalizeFilterState(value, defaults) {
+	const filters = { ...defaults };
+	if (!value || typeof value !== 'object' || Array.isArray(value)) return filters;
+
+	Object.keys(filters).forEach((key) => {
+		if (key === 'audit_status') return;
+		if (typeof value[key] === 'string' || typeof value[key] === 'number') {
+			filters[key] = value[key];
+		}
+	});
+	Object.keys(filters).forEach((key) => {
+		if (!key.endsWith('_id') || hasFilterValue(filters[key])) return;
+		const nameKey = `${key.slice(0, -3)}_name`;
+		if (nameKey in filters) filters[nameKey] = '';
+	});
+	if (Object.prototype.hasOwnProperty.call(value, 'audit_status')) {
+		filters.audit_status = normalizeAuditStatus(value.audit_status);
+	}
+	return filters;
+}
+
+export function withSelectedOption(list, selectedValue, selectedLabel) {
+	const rows = Array.isArray(list) ? list.slice() : [];
+	const exists = rows.some((item) => String(item.value) === String(selectedValue));
+	if (hasFilterValue(selectedValue) && !exists) {
+		rows.unshift({ value: selectedValue, label: selectedLabel || String(selectedValue) });
+	}
+	return [{ value: '', label: '全部' }].concat(rows);
+}

src/common/pda-typography.scss

@@ -0,0 +1,19 @@
+/**
+ * PDA 小屏字号标准（以手动进仓页为准）
+ * 业务页请优先引用这些变量，避免字号再次变小。
+ */
+
+$pda-font-body: 36rpx;
+$pda-font-placeholder: 34rpx;
+$pda-font-action: 34rpx;
+$pda-font-unit: 32rpx;
+$pda-font-nav-sub: 32rpx;
+$pda-font-button: 36rpx;
+$pda-font-popup-title: 36rpx;
+$pda-font-popup-item: 36rpx;
+$pda-font-popup-sub: 34rpx;
+
+$pda-row-min-height: 100rpx;
+$pda-scan-input-height: 100rpx;
+$pda-button-height: 92rpx;
+$pda-label-width: 200rpx;

src/common/scanAutoConfig.js

@@ -0,0 +1,43 @@
+/**
+ * 登录后 / 冷启动：拉取扫码字典并在本地无配置时自动匹配写入
+ */
+import {
+	DICTIONARY_TYPE_SCANNER,
+	autoConfigureScanSettings,
+} from '@/common/scanConfig.js';
+
+function extractDictionaryList(res) {
+	if (Array.isArray(res)) return res;
+	if (res && Array.isArray(res.list)) return res.list;
+	return [];
+}
+
+/**
+ * @param {object} api - this.$u.api
+ * @returns {Promise<{saved:boolean,skipped:boolean,config:object|null,reason?:string}>}
+ */
+export async function ensureScanConfigAfterLogin(api) {
+	if (!api || !api.dictionary || !api.dictionary.getDetailEnumList) {
+		return autoConfigureScanSettings({ remoteConfigs: [] });
+	}
+
+	let remoteConfigs = [];
+	try {
+		const res = await api.dictionary.getDetailEnumList({
+			dictionary_id: DICTIONARY_TYPE_SCANNER,
+		});
+		remoteConfigs = extractDictionaryList(res);
+	} catch (error) {
+		console.log('拉取扫码字典失败，改用内置配置自动匹配', error);
+	}
+
+	const result = autoConfigureScanSettings({ remoteConfigs });
+	if (result.skipped) {
+		console.log('本地已有扫码设置，跳过自动匹配', result.config && result.config.name);
+	} else if (result.saved) {
+		console.log('已自动写入扫码设置', result.config && result.config.name);
+	} else {
+		console.log('自动匹配扫码设置未写入', result.reason);
+	}
+	return result;
+}

src/common/scanConfig.js

@@ -10,6 +10,103 @@ export const PHONE_SCAN_CONFIG = {
 	isPhoneScan: true,
 };
 
+/** 内置扫码配置：补 needSetup，并在字典拉不到时兜底 */
+export const BUILTIN_SCANNER_CONFIGS = [
+	{
+		brand: 'newland',
+		name: '东大集成',
+		action: 'com.android.server.scannerservice.broadcast',
+		dataKey: 'scannerdata',
+		needSetup: true,
+		setupAction: 'com.android.scanner.service_settings',
+		setupParams: {
+			action_barcode_broadcast: 'com.android.server.scannerservice.broadcast',
+			key_barcode_broadcast: 'scannerdata',
+			endchar: 'ENTER',
+		},
+	},
+	{
+		brand: 'sunmi',
+		name: '商米',
+		action: 'com.sunmi.scanner.ACTION_DATA_CODE_RECEIVED',
+		dataKey: 'data',
+		needSetup: false,
+	},
+	{
+		brand: 'nlscan',
+		name: '新大陆',
+		action: 'nlscan.action.SCANNER_RESULT',
+		dataKey: 'SCAN_BARCODE1',
+		needSetup: false,
+	},
+	{
+		brand: 'urovo',
+		name: '优博讯',
+		action: 'android.intent.ACTION_DECODE_DATA',
+		dataKey: 'barcode_string',
+		needSetup: false,
+	},
+	{
+		brand: 'idata',
+		name: '盈达',
+		action: 'android.intent.action.SCANRESULT',
+		dataKey: 'value',
+		needSetup: false,
+	},
+	{
+		brand: 'iData',
+		name: '海雅达',
+		action: 'com.android.scanner.broadcast',
+		dataKey: 'scandata',
+		needSetup: false,
+	},
+	{ ...PHONE_SCAN_CONFIG },
+];
+
+/** 设备关键词 / 常见扫码相关包名，用于自动识别 */
+const DETECT_RULES = [
+	{
+		matchNames: ['商米'],
+		matchActions: ['com.sunmi.scanner.ACTION_DATA_CODE_RECEIVED'],
+		keywords: ['sunmi'],
+		packages: ['com.sunmi.scanner', 'woyou.aidlservice.jiuiv5'],
+	},
+	{
+		matchNames: ['新大陆'],
+		matchActions: ['nlscan.action.SCANNER_RESULT'],
+		keywords: ['newland', 'nls', 'nlscan'],
+		packages: ['com.nlscan.barcodescanner', 'com.newland'],
+	},
+	{
+		matchNames: ['优博讯'],
+		matchActions: ['android.intent.ACTION_DECODE_DATA'],
+		keywords: ['urovo'],
+		packages: ['com.urovo', 'com.ubx'],
+	},
+	{
+		matchNames: ['盈达'],
+		matchActions: ['android.intent.action.SCANRESULT'],
+		keywords: ['idata', 'yingda'],
+		packages: ['com.idata', 'com.android.scanner'],
+	},
+	{
+		matchNames: ['海雅达'],
+		matchActions: ['com.android.scanner.broadcast'],
+		keywords: ['iData', 'seui', 'haiyada'],
+		packages: ['com.android.scanner'],
+	},
+	{
+		matchNames: ['东大集成', '东集'],
+		matchActions: ['com.android.server.scannerservice.broadcast'],
+		keywords: ['seuic', 'eastcom', 'newland', 'nls'],
+		packages: ['com.android.scanner', 'com.seuic.scanner'],
+	},
+];
+
+const PDA_DEVICE_KEYWORDS = [
+	'newland', 'nls', 'sunmi', 'urovo', 'honeywell', 'idata', 'seuic', 'zebra', 'ubx',
+];
+
 const NO_SETUP_HINT_KEY = 'pda_scan_config_hint_shown';
 
 export function isPhoneScanConfig(config) {
@@ -33,13 +130,13 @@ function enrichFromBuiltinConfig(config, builtinConfigs = []) {
 
 	return {
 		...config,
-		needSetup: builtin.needSetup,
+		needSetup: config.needSetup != null ? config.needSetup : builtin.needSetup,
-		setupAction: builtin.setupAction || '',
+		setupAction: config.setupAction || builtin.setupAction || '',
-		setupParams: builtin.setupParams || null,
+		setupParams: config.setupParams || builtin.setupParams || null,
 	};
 }
 
-export function normalizeConfig(raw, builtinConfigs = []) {
+export function normalizeConfig(raw, builtinConfigs = BUILTIN_SCANNER_CONFIGS) {
 	if (!raw || typeof raw !== 'object') return null;
 
 	const brand = String(raw.brand || raw.id || raw.dictionary_detail_id || raw.name || '');
@@ -66,11 +163,11 @@ export function normalizeConfig(raw, builtinConfigs = []) {
 	return config;
 }
 
-export function mapDictionaryToScannerConfig(raw, builtinConfigs = []) {
+export function mapDictionaryToScannerConfig(raw, builtinConfigs = BUILTIN_SCANNER_CONFIGS) {
 	return normalizeConfig(raw, builtinConfigs);
 }
 
-export function getScanConfig(builtinConfigs = []) {
+export function getScanConfig(builtinConfigs = BUILTIN_SCANNER_CONFIGS) {
 	try {
 		const data = uni.getStorageSync(STORAGE_KEY);
 		return normalizeConfig(data, builtinConfigs);
@@ -80,6 +177,10 @@ export function getScanConfig(builtinConfigs = []) {
 	}
 }
 
+export function hasLocalScanConfig(builtinConfigs = BUILTIN_SCANNER_CONFIGS) {
+	return !!getScanConfig(builtinConfigs);
+}
+
 export function saveScanConfig(config) {
 	const normalized = normalizeConfig(config);
 	if (!normalized) {
@@ -109,3 +210,175 @@ export function markNoConfigHintShown() {
 		console.log('记录扫码枪提示状态失败', e);
 	}
 }
+
+export function mergeScannerConfigs(remoteConfigs = []) {
+	const configMap = new Map();
+	BUILTIN_SCANNER_CONFIGS.forEach((item) => {
+		if (!isPhoneScanConfig(item)) {
+			configMap.set(item.action || item.brand, item);
+		}
+	});
+	(remoteConfigs || []).forEach((raw) => {
+		const normalized = mapDictionaryToScannerConfig(raw);
+		if (!normalized || isPhoneScanConfig(normalized)) return;
+		configMap.set(normalized.action || normalized.brand, normalized);
+	});
+	const list = Array.from(configMap.values());
+	list.push({ ...PHONE_SCAN_CONFIG });
+	return list;
+}
+
+export function getDeviceIdentity() {
+	// #ifdef APP-PLUS
+	try {
+		const Build = plus.android.importClass('android.os.Build');
+		return {
+			manufacturer: String(Build.MANUFACTURER || '').toLowerCase(),
+			model: String(Build.MODEL || '').toLowerCase(),
+			brand: String(Build.BRAND || '').toLowerCase(),
+		};
+	} catch (e) {
+		console.log('读取设备信息失败', e);
+	}
+	// #endif
+	return { manufacturer: '', model: '', brand: '' };
+}
+
+export function isPdaDevice() {
+	const identity = getDeviceIdentity();
+	const text = `${identity.manufacturer} ${identity.model} ${identity.brand}`;
+	return PDA_DEVICE_KEYWORDS.some((keyword) => text.includes(keyword.toLowerCase()));
+}
+
+function findDetectRule(config) {
+	return DETECT_RULES.find((rule) => {
+		if (rule.matchNames.includes(config.name)) return true;
+		if (rule.matchActions.includes(config.action)) return true;
+		return false;
+	}) || null;
+}
+
+function isPackageInstalled(packageName) {
+	// #ifdef APP-PLUS
+	try {
+		const main = plus.android.runtimeMainActivity();
+		const pm = main.getPackageManager();
+		plus.android.importClass(pm);
+		pm.getPackageInfo(packageName, 0);
+		return true;
+	} catch (e) {
+		return false;
+	}
+	// #endif
+	return false;
+}
+
+function canResolveBroadcast(action) {
+	if (!action) return false;
+	// #ifdef APP-PLUS
+	try {
+		const main = plus.android.runtimeMainActivity();
+		const Intent = plus.android.importClass('android.content.Intent');
+		const pm = main.getPackageManager();
+		plus.android.importClass(pm);
+		const intent = new Intent(action);
+		const list = pm.queryBroadcastReceivers(intent, 0);
+		return !!(list && list.size && list.size() > 0);
+	} catch (e) {
+		console.log('探测广播接收方失败', action, e);
+		return false;
+	}
+	// #endif
+	return false;
+}
+
+function scoreScannerConfig(config, identity) {
+	if (!config || isPhoneScanConfig(config)) {
+		return 0;
+	}
+
+	let score = 0;
+	const rule = findDetectRule(config);
+	const deviceText = `${identity.manufacturer} ${identity.model} ${identity.brand}`;
+
+	if (canResolveBroadcast(config.action)) {
+		score += 100;
+	}
+
+	if (rule) {
+		if ((rule.packages || []).some((pkg) => isPackageInstalled(pkg))) {
+			score += 60;
+		}
+		if ((rule.keywords || []).some((keyword) => deviceText.includes(String(keyword).toLowerCase()))) {
+			score += 40;
+		}
+	}
+
+	return score;
+}
+
+/**
+ * 在候选配置中选出最匹配当前设备的一项；非 PDA 且无命中则回落手机扫码
+ */
+export function matchBestScanConfig(candidateConfigs = []) {
+	const configs = (candidateConfigs || [])
+		.map((item) => normalizeConfig(item))
+		.filter(Boolean);
+	const pdaConfigs = configs.filter((item) => !isPhoneScanConfig(item));
+	const identity = getDeviceIdentity();
+
+	let best = null;
+	let bestScore = 0;
+	pdaConfigs.forEach((config) => {
+		const score = scoreScannerConfig(config, identity);
+		if (score > bestScore) {
+			bestScore = score;
+			best = config;
+		}
+	});
+
+	if (best && bestScore > 0) {
+		return best;
+	}
+
+	if (!isPdaDevice()) {
+		return { ...PHONE_SCAN_CONFIG };
+	}
+
+	return pdaConfigs[0] || { ...PHONE_SCAN_CONFIG };
+}
+
+/**
+ * 仅本地没有有效配置时，自动匹配并写入扫描设置
+ * @returns {{ saved: boolean, config: object|null, skipped: boolean, reason?: string }}
+ */
+export function autoConfigureScanSettings({ remoteConfigs = [] } = {}) {
+	const existing = getScanConfig();
+	if (existing) {
+		return {
+			saved: false,
+			skipped: true,
+			config: existing,
+			reason: 'local_exists',
+		};
+	}
+
+	const candidates = mergeScannerConfigs(remoteConfigs);
+	const matched = matchBestScanConfig(candidates);
+	if (!matched) {
+		return {
+			saved: false,
+			skipped: false,
+			config: null,
+			reason: 'no_match',
+		};
+	}
+
+	const saved = saveScanConfig(matched);
+	return {
+		saved,
+		skipped: false,
+		config: matched,
+		reason: saved ? 'saved' : 'save_failed',
+	};
+}

src/common/scanMixin.js

@@ -1,18 +1,16 @@
 // common/scanMixin.js
 // 多厂商PDA扫码器兼容方案 - 策略模式 + 配置表驱动
 import {
+	BUILTIN_SCANNER_CONFIGS,
 	getScanConfig,
 	hasShownNoConfigHint,
+	isPdaDevice as detectPdaDevice,
 	isPhoneScanConfig,
 	markNoConfigHintShown,
 	normalizeConfig,
 	PHONE_SCAN_CONFIG,
 } from '@/common/scanConfig.js';
 
-const PDA_DEVICE_KEYWORDS = [
-	'newland', 'nls', 'sunmi', 'urovo', 'zebra', 'honeywell', 'idata', 'seuic',
-];
-
 export default {
   data() {
     return {
@@ -21,42 +19,14 @@ export default {
       registeredBrands: [],
       remoteScannerConfigs: [],
       usePhoneScanFallback: false,
+      phoneScanPanelOpen: false,
       _scanCallback: null,
     }
   },
   
   methods: {
     getScannerConfigs() {
-      return [
+      return BUILTIN_SCANNER_CONFIGS.map((item) => ({ ...item }));
-        {
-          brand: 'newland',
-          name: '东集',
-          action: 'com.android.server.scannerservice.broadcast',
-          dataKey: 'scannerdata',
-          needSetup: true,
-          setupAction: 'com.android.scanner.service_settings',
-          setupParams: {
-            action_barcode_broadcast: 'com.android.server.scannerservice.broadcast',
-            key_barcode_broadcast: 'scannerdata',
-            endchar: 'ENTER'
-          }
-        },
-        {
-          brand: 'sunmi',
-          name: '商米',
-          action: 'com.sunmi.scanner.ACTION_DATA_CODE_RECEIVED',
-          dataKey: 'data',
-          needSetup: false
-        },
-        {
-          brand: 'nlscan',
-          name: '新大陆',
-          action: 'nlscan.action.SCANNER_RESULT',
-          dataKey: 'SCAN_BARCODE1',
-          needSetup: false
-        },
-        { ...PHONE_SCAN_CONFIG },
-      ];
     },
 
     getPhoneScanConfig() {
@@ -64,20 +34,7 @@ export default {
     },
 
     isPdaDevice() {
-      // #ifdef APP-PLUS
+      return detectPdaDevice();
-      try {
-        const Build = plus.android.importClass('android.os.Build');
-        const manufacturer = String(Build.MANUFACTURER || '').toLowerCase();
-        const model = String(Build.MODEL || '').toLowerCase();
-        return PDA_DEVICE_KEYWORDS.some((keyword) => {
-          return manufacturer.includes(keyword) || model.includes(keyword);
-        });
-      } catch (error) {
-        console.log('检测设备类型失败', error);
-        return false;
-      }
-      // #endif
-      return false;
     },
 
     shouldUsePhoneScan() {
@@ -116,6 +73,15 @@ export default {
       return configs.length ? configs[0] : null;
     },
 
+    closePhoneScanPanel() {
+      this.phoneScanPanelOpen = false;
+    },
+
+    /** 半屏连续扫：再次点击同一入口则收起 */
+    togglePhoneScanPanel() {
+      this.phoneScanPanelOpen = !this.phoneScanPanelOpen;
+    },
+
     openPhoneScan(options = {}) {
       const callback = options.callback || this._scanCallback;
       // #ifdef APP-PLUS || MP-WEIXIN
@@ -361,10 +327,12 @@ export default {
   
   onHide() {
     this.isPageActive = false;
+    this.closePhoneScanPanel();
   },
   
   onUnload() {
     this.isPageActive = false;
+    this.closePhoneScanPanel();
     this.unregisterScanBroadcast();
   }
 }

src/common/status-tag.scss

@@ -0,0 +1,15 @@
+@import '@/common/pda-typography.scss';
+
+.statusTag {
+	flex-shrink: 0;
+	font-size: $pda-font-body;
+	line-height: 1.25;
+	padding: 10rpx 22rpx;
+	border-radius: 10rpx;
+	font-weight: bold;
+}
+.status-0 { background: #d9d9d9; color: #434343; }
+.status-1 { background: #fa8c16; color: #fff; }
+.status-2 { background: #52c41a; color: #fff; }
+.status-3 { background: #f5222d; color: #fff; }
+.status-4 { background: #8c8c8c; color: #fff; }

src/common/storeFabricBusinessOut.js

@@ -18,6 +18,13 @@ export const AUDIT_STATUS = {
 export const DRAFT_AUDIT_STATUS = 0;
 export const DRAFT_AUDIT_STATUS_NAME = '待保存';
 
+/** 将接口状态统一为数字，避免字符串导致按钮判断失效 */
+export function toAuditStatus(status) {
+	const n = Number(status);
+	return Number.isFinite(n) ? n : DRAFT_AUDIT_STATUS;
+}
+
+
 export const AUDIT_STATUS_MAP = {
 	1: '待审核',
 	2: '已审核',
@@ -117,8 +124,8 @@ export function normalizeOrder(order) {
 	return {
 		id: order.id,
 		order_no: order.order_no || '',
-		audit_status: order.audit_status,
+		audit_status: toAuditStatus(order.audit_status),
-		audit_status_name: order.audit_status_name || AUDIT_STATUS_MAP[order.audit_status] || '',
+		audit_status_name: order.audit_status_name || AUDIT_STATUS_MAP[toAuditStatus(order.audit_status)] || '',
 		// 表头
 		sale_system_id: order.sale_system_id || '',
 		sale_system_name: order.sale_system_name || '',
@@ -470,11 +477,13 @@ export function formatDisplayTime(value, format = 'YYYY-MM-DD') {
 }
 
 export function canScanAtStatus(status) {
-	return [AUDIT_STATUS.PENDING, AUDIT_STATUS.REJECTED].includes(status);
+	const s = toAuditStatus(status);
+	return s === AUDIT_STATUS.PENDING || s === AUDIT_STATUS.REJECTED;
 }
 
 export function isLockedOrderStatus(status) {
-	return [AUDIT_STATUS.APPROVED, AUDIT_STATUS.VOIDED].includes(status);
+	const s = toAuditStatus(status);
+	return s === AUDIT_STATUS.APPROVED || s === AUDIT_STATUS.VOIDED;
 }
 
 /** 分页拉取全部列表（直至末页） */
@@ -491,7 +500,12 @@ export function fetchAllOrderList(listFn, params = {}, pageSize = LIST_PAGE_SIZE
 
 /** 新增/编辑页底部：审核、作废 */
 export function getFormStatusActionButtons(headerSaved, orderId, status) {
-	if (!headerSaved || !orderId || !canScanAtStatus(status)) return [];
+	if (!headerSaved || !orderId) return [];
+	const s = toAuditStatus(status);
+	if (s === AUDIT_STATUS.APPROVED) {
+		return [{ label: '消审', action: 'unapprove' }];
+	}
+	if (!canScanAtStatus(s)) return [];
 	return [
 		{ label: '审核', action: 'approve' },
 		{ label: '作废', action: 'void' },
@@ -500,14 +514,15 @@ export function getFormStatusActionButtons(headerSaved, orderId, status) {
 
 /** 查看页底部：编辑、审核、作废 / 消审 */
 export function getViewStatusActionButtons(status) {
-	if (status === AUDIT_STATUS.PENDING || status === AUDIT_STATUS.REJECTED) {
+	const s = toAuditStatus(status);
+	if (s === AUDIT_STATUS.PENDING || s === AUDIT_STATUS.REJECTED) {
 		return [
 			{ label: '编辑', action: 'edit' },
 			{ label: '审核', action: 'approve' },
 			{ label: '作废', action: 'void' },
 		];
 	}
-	if (status === AUDIT_STATUS.APPROVED) {
+	if (s === AUDIT_STATUS.APPROVED) {
 		return [{ label: '消审', action: 'unapprove' }];
 	}
 	return [];

src/common/storeGoodsProcessIn.js

@@ -15,6 +15,13 @@ export const AUDIT_STATUS = {
 export const DRAFT_AUDIT_STATUS = 0;
 export const DRAFT_AUDIT_STATUS_NAME = '待保存';
 
+/** 将接口状态统一为数字，避免字符串导致按钮判断失效 */
+export function toAuditStatus(status) {
+	const n = Number(status);
+	return Number.isFinite(n) ? n : DRAFT_AUDIT_STATUS;
+}
+
+
 export const AUDIT_STATUS_MAP = {
 	1: '待审核',
 	2: '已审核',
@@ -98,8 +105,8 @@ export function normalizeOrder(order) {
 	return {
 		id: order.id,
 		order_no: order.order_no || '',
-		audit_status: order.audit_status,
+		audit_status: toAuditStatus(order.audit_status),
-		audit_status_name: order.audit_status_name || AUDIT_STATUS_MAP[order.audit_status] || '',
+		audit_status_name: order.audit_status_name || AUDIT_STATUS_MAP[toAuditStatus(order.audit_status)] || '',
 		process_unit_id: order.process_unit_id || '',
 		process_name: order.process_name || '',
 		warehouse_id: order.warehouse_id || '',
@@ -272,6 +279,7 @@ export function buildScanDetailFromScanResponse(res) {
 			: '',
 		product_code: res.product_code || '',
 		product_color_code: res.product_color_code || '',
+		// 本单匹数/数量：整单合计（扫码后会再以详情 total_* 覆盖）
 		order_roll: formatRoll(res.order_roll != null ? res.order_roll : res.total_roll),
 		item_roll: formatRoll(res.item_roll != null ? res.item_roll : res.roll),
 		order_weight: formatWeightKg(res.order_weight != null ? res.order_weight : res.total_weight),
@@ -332,11 +340,13 @@ export function formatDisplayTime(value, format = 'YYYY-MM-DD') {
 }
 
 export function canScanAtStatus(status) {
-	return [AUDIT_STATUS.PENDING, AUDIT_STATUS.REJECTED].includes(status);
+	const s = toAuditStatus(status);
+	return s === AUDIT_STATUS.PENDING || s === AUDIT_STATUS.REJECTED;
 }
 
 export function isLockedOrderStatus(status) {
-	return [AUDIT_STATUS.APPROVED, AUDIT_STATUS.VOIDED].includes(status);
+	const s = toAuditStatus(status);
+	return s === AUDIT_STATUS.APPROVED || s === AUDIT_STATUS.VOIDED;
 }
 
 export function fetchAllOrderList(listFn, params = {}, pageSize = LIST_PAGE_SIZE) {
@@ -371,7 +381,12 @@ export function fetchAllOrderList(listFn, params = {}, pageSize = LIST_PAGE_SIZE
 }
 
 export function getFormStatusActionButtons(headerSaved, orderId, status) {
-	if (!headerSaved || !orderId || !canScanAtStatus(status)) return [];
+	if (!headerSaved || !orderId) return [];
+	const s = toAuditStatus(status);
+	if (s === AUDIT_STATUS.APPROVED) {
+		return [{ label: '消审', action: 'unapprove' }];
+	}
+	if (!canScanAtStatus(s)) return [];
 	return [
 		{ label: '审核', action: 'approve' },
 		{ label: '作废', action: 'void' },
@@ -379,14 +394,15 @@ export function getFormStatusActionButtons(headerSaved, orderId, status) {
 }
 
 export function getViewStatusActionButtons(status) {
-	if (status === AUDIT_STATUS.PENDING || status === AUDIT_STATUS.REJECTED) {
+	const s = toAuditStatus(status);
+	if (s === AUDIT_STATUS.PENDING || s === AUDIT_STATUS.REJECTED) {
 		return [
 			{ label: '编辑', action: 'edit' },
 			{ label: '审核', action: 'approve' },
 			{ label: '作废', action: 'void' },
 		];
 	}
-	if (status === AUDIT_STATUS.APPROVED) {
+	if (s === AUDIT_STATUS.APPROVED) {
 		return [{ label: '消审', action: 'unapprove' }];
 	}
 	return [];

src/common/storeGoodsProcessOut.js

@@ -15,6 +15,13 @@ export const AUDIT_STATUS = {
 export const DRAFT_AUDIT_STATUS = 0;
 export const DRAFT_AUDIT_STATUS_NAME = '待保存';
 
+/** 将接口状态统一为数字，避免字符串导致按钮判断失效 */
+export function toAuditStatus(status) {
+	const n = Number(status);
+	return Number.isFinite(n) ? n : DRAFT_AUDIT_STATUS;
+}
+
+
 export const AUDIT_STATUS_MAP = {
 	1: '待审核',
 	2: '已审核',
@@ -78,8 +85,8 @@ export function normalizeOrder(order) {
 	return {
 		id: order.id,
 		order_no: order.order_no || '',
-		audit_status: order.audit_status,
+		audit_status: toAuditStatus(order.audit_status),
-		audit_status_name: order.audit_status_name || AUDIT_STATUS_MAP[order.audit_status] || '',
+		audit_status_name: order.audit_status_name || AUDIT_STATUS_MAP[toAuditStatus(order.audit_status)] || '',
 		process_unit_id: order.process_unit_id || '',
 		process_name: order.process_name || '',
 		warehouse_id: order.warehouse_id || '',
@@ -237,6 +244,7 @@ export function buildScanDetailFromScanResponse(res) {
 			: '',
 		product_code: res.product_code || '',
 		product_color_code: res.product_color_code || '',
+		// 本单匹数/数量：整单合计（扫码后会再以详情 total_* 覆盖）
 		order_roll: formatRoll(res.order_roll != null ? res.order_roll : res.total_roll),
 		item_roll: formatRoll(res.item_roll != null ? res.item_roll : res.roll),
 		order_weight: formatWeightKg(res.order_weight != null ? res.order_weight : res.total_weight),
@@ -274,11 +282,13 @@ export function formatDisplayTime(value, format = 'YYYY-MM-DD') {
 }
 
 export function canScanAtStatus(status) {
-	return [AUDIT_STATUS.PENDING, AUDIT_STATUS.REJECTED].includes(status);
+	const s = toAuditStatus(status);
+	return s === AUDIT_STATUS.PENDING || s === AUDIT_STATUS.REJECTED;
 }
 
 export function isLockedOrderStatus(status) {
-	return [AUDIT_STATUS.APPROVED, AUDIT_STATUS.VOIDED].includes(status);
+	const s = toAuditStatus(status);
+	return s === AUDIT_STATUS.APPROVED || s === AUDIT_STATUS.VOIDED;
 }
 
 export function fetchAllOrderList(listFn, params = {}, pageSize = LIST_PAGE_SIZE) {
@@ -313,7 +323,12 @@ export function fetchAllOrderList(listFn, params = {}, pageSize = LIST_PAGE_SIZE
 }
 
 export function getFormStatusActionButtons(headerSaved, orderId, status) {
-	if (!headerSaved || !orderId || !canScanAtStatus(status)) return [];
+	if (!headerSaved || !orderId) return [];
+	const s = toAuditStatus(status);
+	if (s === AUDIT_STATUS.APPROVED) {
+		return [{ label: '消审', action: 'unapprove' }];
+	}
+	if (!canScanAtStatus(s)) return [];
 	return [
 		{ label: '审核', action: 'approve' },
 		{ label: '作废', action: 'void' },
@@ -321,14 +336,15 @@ export function getFormStatusActionButtons(headerSaved, orderId, status) {
 }
 
 export function getViewStatusActionButtons(status) {
-	if (status === AUDIT_STATUS.PENDING || status === AUDIT_STATUS.REJECTED) {
+	const s = toAuditStatus(status);
+	if (s === AUDIT_STATUS.PENDING || s === AUDIT_STATUS.REJECTED) {
 		return [
 			{ label: '编辑', action: 'edit' },
 			{ label: '审核', action: 'approve' },
 			{ label: '作废', action: 'void' },
 		];
 	}
-	if (status === AUDIT_STATUS.APPROVED) {
+	if (s === AUDIT_STATUS.APPROVED) {
 		return [{ label: '消审', action: 'unapprove' }];
 	}
 	return [];

src/common/storeGoodsProcessReturnIn.js

@@ -15,6 +15,13 @@ export const AUDIT_STATUS = {
 export const DRAFT_AUDIT_STATUS = 0;
 export const DRAFT_AUDIT_STATUS_NAME = '待保存';
 
+/** 将接口状态统一为数字，避免字符串导致按钮判断失效 */
+export function toAuditStatus(status) {
+	const n = Number(status);
+	return Number.isFinite(n) ? n : DRAFT_AUDIT_STATUS;
+}
+
+
 export const AUDIT_STATUS_MAP = {
 	1: '待审核',
 	2: '已审核',
@@ -74,8 +81,8 @@ export function normalizeOrder(order) {
 	return {
 		id: order.id,
 		order_no: order.order_no || '',
-		audit_status: order.audit_status,
+		audit_status: toAuditStatus(order.audit_status),
-		audit_status_name: order.audit_status_name || AUDIT_STATUS_MAP[order.audit_status] || '',
+		audit_status_name: order.audit_status_name || AUDIT_STATUS_MAP[toAuditStatus(order.audit_status)] || '',
 		process_unit_id: order.process_unit_id || order.biz_unit_id || '',
 		process_name: order.process_name || order.biz_unit_name || '',
 		warehouse_id: order.warehouse_id || '',
@@ -233,6 +240,7 @@ export function buildScanDetailFromScanResponse(res) {
 			: '',
 		product_code: res.product_code || '',
 		product_color_code: res.product_color_code || '',
+		// 本单匹数/数量：整单合计（扫码后会再以详情 total_* 覆盖）
 		order_roll: formatRoll(res.order_roll != null ? res.order_roll : res.total_roll),
 		item_roll: formatRoll(res.item_roll != null ? res.item_roll : res.roll),
 		order_weight: formatWeightKg(res.order_weight != null ? res.order_weight : res.total_weight),
@@ -270,11 +278,13 @@ export function formatDisplayTime(value, format = 'YYYY-MM-DD') {
 }
 
 export function canScanAtStatus(status) {
-	return [AUDIT_STATUS.PENDING, AUDIT_STATUS.REJECTED].includes(status);
+	const s = toAuditStatus(status);
+	return s === AUDIT_STATUS.PENDING || s === AUDIT_STATUS.REJECTED;
 }
 
 export function isLockedOrderStatus(status) {
-	return [AUDIT_STATUS.APPROVED, AUDIT_STATUS.VOIDED].includes(status);
+	const s = toAuditStatus(status);
+	return s === AUDIT_STATUS.APPROVED || s === AUDIT_STATUS.VOIDED;
 }
 
 export function fetchAllOrderList(listFn, params = {}, pageSize = LIST_PAGE_SIZE) {
@@ -309,7 +319,12 @@ export function fetchAllOrderList(listFn, params = {}, pageSize = LIST_PAGE_SIZE
 }
 
 export function getFormStatusActionButtons(headerSaved, orderId, status) {
-	if (!headerSaved || !orderId || !canScanAtStatus(status)) return [];
+	if (!headerSaved || !orderId) return [];
+	const s = toAuditStatus(status);
+	if (s === AUDIT_STATUS.APPROVED) {
+		return [{ label: '消审', action: 'unapprove' }];
+	}
+	if (!canScanAtStatus(s)) return [];
 	return [
 		{ label: '审核', action: 'approve' },
 		{ label: '作废', action: 'void' },
@@ -317,14 +332,15 @@ export function getFormStatusActionButtons(headerSaved, orderId, status) {
 }
 
 export function getViewStatusActionButtons(status) {
-	if (status === AUDIT_STATUS.PENDING || status === AUDIT_STATUS.REJECTED) {
+	const s = toAuditStatus(status);
+	if (s === AUDIT_STATUS.PENDING || s === AUDIT_STATUS.REJECTED) {
 		return [
 			{ label: '编辑', action: 'edit' },
 			{ label: '审核', action: 'approve' },
 			{ label: '作废', action: 'void' },
 		];
 	}
-	if (status === AUDIT_STATUS.APPROVED) {
+	if (s === AUDIT_STATUS.APPROVED) {
 		return [{ label: '消审', action: 'unapprove' }];
 	}
 	return [];

src/common/storeGoodsPurchaseIn.js

@@ -15,6 +15,13 @@ export const AUDIT_STATUS = {
 export const DRAFT_AUDIT_STATUS = 0;
 export const DRAFT_AUDIT_STATUS_NAME = '待保存';
 
+/** 将接口状态统一为数字，避免字符串导致按钮判断失效 */
+export function toAuditStatus(status) {
+	const n = Number(status);
+	return Number.isFinite(n) ? n : DRAFT_AUDIT_STATUS;
+}
+
+
 export const AUDIT_STATUS_MAP = {
 	1: '待审核',
 	2: '已审核',
@@ -111,8 +118,8 @@ export function normalizeOrder(order) {
 	return {
 		id: order.id,
 		order_no: order.order_no || '',
-		audit_status: order.audit_status,
+		audit_status: toAuditStatus(order.audit_status),
-		audit_status_name: order.audit_status_name || AUDIT_STATUS_MAP[order.audit_status] || '',
+		audit_status_name: order.audit_status_name || AUDIT_STATUS_MAP[toAuditStatus(order.audit_status)] || '',
 		biz_unit_id: order.biz_unit_id || '',
 		biz_unit_name: order.biz_unit_name || '',
 		warehouse_id: order.warehouse_id || '',
@@ -288,6 +295,7 @@ export function buildScanDetailFromScanResponse(res) {
 			: '',
 		product_code: res.product_code || '',
 		product_color_code: res.product_color_code || '',
+		// 本单匹数/数量：整单合计（扫码后会再以详情 total_* 覆盖）
 		order_roll: formatRoll(res.order_roll != null ? res.order_roll : res.total_roll),
 		item_roll: formatRoll(res.item_roll != null ? res.item_roll : res.roll),
 		order_weight: formatWeightKg(res.order_weight != null ? res.order_weight : res.total_weight),
@@ -348,11 +356,13 @@ export function formatDisplayTime(value, format = 'YYYY-MM-DD') {
 }
 
 export function canScanAtStatus(status) {
-	return [AUDIT_STATUS.PENDING, AUDIT_STATUS.REJECTED].includes(status);
+	const s = toAuditStatus(status);
+	return s === AUDIT_STATUS.PENDING || s === AUDIT_STATUS.REJECTED;
 }
 
 export function isLockedOrderStatus(status) {
-	return [AUDIT_STATUS.APPROVED, AUDIT_STATUS.VOIDED].includes(status);
+	const s = toAuditStatus(status);
+	return s === AUDIT_STATUS.APPROVED || s === AUDIT_STATUS.VOIDED;
 }
 
 export function fetchAllOrderList(listFn, params = {}, pageSize = LIST_PAGE_SIZE) {
@@ -387,7 +397,12 @@ export function fetchAllOrderList(listFn, params = {}, pageSize = LIST_PAGE_SIZE
 }
 
 export function getFormStatusActionButtons(headerSaved, orderId, status) {
-	if (!headerSaved || !orderId || !canScanAtStatus(status)) return [];
+	if (!headerSaved || !orderId) return [];
+	const s = toAuditStatus(status);
+	if (s === AUDIT_STATUS.APPROVED) {
+		return [{ label: '消审', action: 'unapprove' }];
+	}
+	if (!canScanAtStatus(s)) return [];
 	return [
 		{ label: '审核', action: 'approve' },
 		{ label: '作废', action: 'void' },
@@ -395,14 +410,15 @@ export function getFormStatusActionButtons(headerSaved, orderId, status) {
 }
 
 export function getViewStatusActionButtons(status) {
-	if (status === AUDIT_STATUS.PENDING || status === AUDIT_STATUS.REJECTED) {
+	const s = toAuditStatus(status);
+	if (s === AUDIT_STATUS.PENDING || s === AUDIT_STATUS.REJECTED) {
 		return [
 			{ label: '编辑', action: 'edit' },
 			{ label: '审核', action: 'approve' },
 			{ label: '作废', action: 'void' },
 		];
 	}
-	if (status === AUDIT_STATUS.APPROVED) {
+	if (s === AUDIT_STATUS.APPROVED) {
 		return [{ label: '消审', action: 'unapprove' }];
 	}
 	return [];

src/common/util.js

@@ -2,6 +2,7 @@
  * 通用公共js库，主要定义api接口，auth apikey 常量值和通用函数
  */
 import store from '@/store/index.js';
+import { speak } from './tts.js';
  
 // var apiurl = 'http://192.168.1.66:50002/hcscm/pda/v1/';  //开发环境 添
 // var apiurl = 'http://192.168.1.55:50002/hcscm/pda/v1/';  //开发环境 添
@@ -332,7 +333,56 @@ function createAudio(src) {
 let successAudio = undefined;
 let errorAudio = undefined;
 
-function playSuccessAudio() {
+/** 审核类操作成功时的固定播报 */
+function statusSuccessVoice(action) {
+	const map = {
+		approve: '审核成功',
+		void: '作废成功',
+		unapprove: '消审成功',
+	};
+	return map[action] || '操作成功';
+}
+
+/** 成功/失败提示音约 0.9 秒，播完再朗读，避免提示音抢走语音 */
+let speakFeedbackTimer = null;
+
+function voiceContent(text, fallback) {
+	let content = String(text == null ? '' : text)
+		.replace(/[\r\n\t]/g, '')
+		.replace(/[！!。．.？?；;，,、]/g, '')
+		.trim();
+	if (!content || content.length > 32) content = fallback;
+	return content;
+}
+
+function clearSpeakFeedbackTimer() {
+	if (!speakFeedbackTimer) return;
+	clearTimeout(speakFeedbackTimer);
+	speakFeedbackTimer = null;
+}
+
+function speakFeedback(text, fallback) {
+	const content = voiceContent(text, fallback);
+	clearSpeakFeedbackTimer();
+	speakFeedbackTimer = setTimeout(() => {
+		speakFeedbackTimer = null;
+		speak(content);
+	}, 1100);
+}
+
+/** 只播人声，不播提示音 */
+function speakNow(text, fallback) {
+	clearSpeakFeedbackTimer();
+	if (successAudio) successAudio.stop();
+	speak(voiceContent(text, fallback));
+}
+
+function playSuccessAudio(text, options) {
+	if (options && options.voiceOnly) {
+		speakNow(text, '成功');
+		return;
+	}
+	speakFeedback(text, '成功');
 	if (!successAudio) {
 		//console.log("create success");
 		successAudio = createAudio('/static/audio/appright.wav');
@@ -349,7 +399,8 @@ function playSuccessAudio() {
 	successAudio.play();
 }
 
-function playErrorAudio() {
+function playErrorAudio(text) {
+	speakFeedback(text, '失败');
 	if (!errorAudio) {
 		//console.log("create error");
 		errorAudio = createAudio('/static/audio/apperror.wav');
@@ -378,4 +429,5 @@ export default {
 	parGetData,
 	playSuccessAudio,
 	playErrorAudio,
+	statusSuccessVoice,
 };

src/components/card/storeFabricBusinessOutItem.vue

@@ -46,21 +46,15 @@ export default {
 };
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+@import '@/common/status-tag.scss';
+
 .cardTopName {
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
+	gap: 16rpx;
+	overflow: visible;
+	white-space: normal;
 }
-.statusTag {
-	font-size: 24rpx;
-	padding: 4rpx 12rpx;
-	border-radius: 6rpx;
-	font-weight: normal;
-}
-.status-0 { background: #f0f0f0; color: #666; }
-.status-1 { background: #fff7e6; color: #fa8c16; }
-.status-2 { background: #f6ffed; color: #52c41a; }
-.status-3 { background: #fff1f0; color: #f5222d; }
-.status-4 { background: #f5f5f5; color: #999; }
 </style>

src/components/card/storeGoodsProcessInItem.vue

@@ -47,21 +47,15 @@ export default {
 };
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+@import '@/common/status-tag.scss';
+
 .cardTopName {
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
+	gap: 16rpx;
+	overflow: visible;
+	white-space: normal;
 }
-.statusTag {
-	font-size: 24rpx;
-	padding: 4rpx 12rpx;
-	border-radius: 6rpx;
-	font-weight: normal;
-}
-.status-0 { background: #f0f0f0; color: #666; }
-.status-1 { background: #fff7e6; color: #fa8c16; }
-.status-2 { background: #f6ffed; color: #52c41a; }
-.status-3 { background: #fff1f0; color: #f5222d; }
-.status-4 { background: #f5f5f5; color: #999; }
 </style>

src/components/card/storeGoodsProcessOutItem.vue

@@ -51,21 +51,15 @@ export default {
 };
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+@import '@/common/status-tag.scss';
+
 .cardTopName {
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
+	gap: 16rpx;
+	overflow: visible;
+	white-space: normal;
 }
-.statusTag {
-	font-size: 24rpx;
-	padding: 4rpx 12rpx;
-	border-radius: 6rpx;
-	font-weight: normal;
-}
-.status-0 { background: #f0f0f0; color: #666; }
-.status-1 { background: #fff7e6; color: #fa8c16; }
-.status-2 { background: #f6ffed; color: #52c41a; }
-.status-3 { background: #fff1f0; color: #f5222d; }
-.status-4 { background: #f5f5f5; color: #999; }
 </style>

src/components/card/storeGoodsProcessReturnInItem.vue

@@ -47,21 +47,15 @@ export default {
 };
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+@import '@/common/status-tag.scss';
+
 .cardTopName {
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
+	gap: 16rpx;
+	overflow: visible;
+	white-space: normal;
 }
-.statusTag {
-	font-size: 24rpx;
-	padding: 4rpx 12rpx;
-	border-radius: 6rpx;
-	font-weight: normal;
-}
-.status-0 { background: #f0f0f0; color: #666; }
-.status-1 { background: #fff7e6; color: #fa8c16; }
-.status-2 { background: #f6ffed; color: #52c41a; }
-.status-3 { background: #fff1f0; color: #f5222d; }
-.status-4 { background: #f5f5f5; color: #999; }
 </style>

src/components/card/storeGoodsPurchaseInItem.vue

@@ -47,21 +47,15 @@ export default {
 };
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+@import '@/common/status-tag.scss';
+
 .cardTopName {
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
+	gap: 16rpx;
+	overflow: visible;
+	white-space: normal;
 }
-.statusTag {
-	font-size: 24rpx;
-	padding: 4rpx 12rpx;
-	border-radius: 6rpx;
-	font-weight: normal;
-}
-.status-0 { background: #f0f0f0; color: #666; }
-.status-1 { background: #fff7e6; color: #fa8c16; }
-.status-2 { background: #f6ffed; color: #52c41a; }
-.status-3 { background: #fff1f0; color: #f5222d; }
-.status-4 { background: #f5f5f5; color: #999; }
 </style>

src/components/common/PlusBarcodePanel.vue

@@ -0,0 +1,286 @@
+<template>
+	<view v-show="visible" class="plus-barcode-panel">
+		<view class="plus-barcode-panel__toolbar">
+			<text class="plus-barcode-panel__tip">{{ tipText }}</text>
+			<text class="plus-barcode-panel__close" @click.stop="close">收起</text>
+		</view>
+		<!-- #ifdef APP-PLUS -->
+		<view :id="barcodeViewId" class="plus-barcode-panel__holder" />
+		<!-- #endif -->
+		<!-- #ifndef APP-PLUS -->
+		<view class="plus-barcode-panel__fallback">
+			<text>当前环境不支持半屏扫码，请使用输入框或系统扫码</text>
+		</view>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+const DEFAULT_FILTERS = [0, 1, 2, 8, 10]; // QR EAN13 EAN8 CODE39 CODE128
+let barcodeSeq = 0;
+
+export default {
+	name: 'PlusBarcodePanel',
+	props: {
+		visible: { type: Boolean, default: false },
+		hintText: { type: String, default: '将条码放入框内，可连续扫' },
+		scanTimeSpace: { type: Number, default: 1200 },
+		filters: { type: Array, default: () => DEFAULT_FILTERS.slice() },
+	},
+	data() {
+		barcodeSeq += 1;
+		return {
+			barcodeViewId: `plusBarcodeView_${barcodeSeq}`,
+			_barcode: null,
+			_restartTimer: null,
+			_active: false,
+			_creating: false,
+		};
+	},
+	computed: {
+		tipText() {
+			return this.hintText || '将条码放入框内，可连续扫';
+		},
+	},
+	watch: {
+		visible(val) {
+			if (val) {
+				this.$nextTick(() => {
+					this.openNative();
+				});
+			} else {
+				this.destroyNative();
+			}
+		},
+	},
+	beforeDestroy() {
+		this.destroyNative();
+	},
+	methods: {
+		open() {
+			if (this.visible) {
+				this.$nextTick(() => this.openNative());
+				return;
+			}
+			this.$emit('update:visible', true);
+		},
+		close() {
+			this.destroyNative();
+			if (this.visible) {
+				this.$emit('update:visible', false);
+			}
+			this.$emit('close');
+		},
+		getCurrentWebview() {
+			// #ifdef APP-PLUS
+			try {
+				const pages = getCurrentPages();
+				const page = pages[pages.length - 1];
+				const vm = page && (page.$vm || page);
+				const scope = (vm && vm.$scope) || (page && page.$scope);
+				if (scope && typeof scope.$getAppWebview === 'function') {
+					return scope.$getAppWebview();
+				}
+				if (page && typeof page.$getAppWebview === 'function') {
+					return page.$getAppWebview();
+				}
+			} catch (e) {
+				console.warn('PlusBarcodePanel getCurrentWebview failed', e);
+			}
+			// #endif
+			return null;
+		},
+		openNative() {
+			// #ifdef APP-PLUS
+			if (!this.visible || this._creating) return;
+			if (this._barcode) {
+				this.resumeScan();
+				return;
+			}
+			this._creating = true;
+			this._active = true;
+			// 等占位节点挂到页面后再创建，避免 view 层报 Not Found: Page[-1]
+			setTimeout(() => {
+				if (!this.visible || !this._active) {
+					this._creating = false;
+					return;
+				}
+				this.measureHolder(0);
+			}, 200);
+			// #endif
+		},
+		measureHolder(attempt) {
+			// #ifdef APP-PLUS
+			const query = uni.createSelectorQuery().in(this);
+			query.select(`#${this.barcodeViewId}`)
+				.boundingClientRect((rect) => {
+					if (!this.visible || !this._active) {
+						this._creating = false;
+						return;
+					}
+					if (!rect || !rect.width || !rect.height) {
+						if (attempt < 8) {
+							setTimeout(() => this.measureHolder(attempt + 1), 150);
+							return;
+						}
+						const sys = uni.getSystemInfoSync();
+						this._creating = false;
+						this.createBarcode({
+							top: (sys.statusBarHeight || 0) + 44,
+							left: 0,
+							width: sys.windowWidth || 300,
+							height: 220,
+						});
+						return;
+					}
+					this._creating = false;
+					this.createBarcode(rect);
+				})
+				.exec();
+			// #endif
+		},
+		createBarcode(rect) {
+			// #ifdef APP-PLUS
+			const webview = this.getCurrentWebview();
+			if (!webview || typeof plus === 'undefined' || !plus.barcode) {
+				uni.showToast({ title: '当前环境不支持扫码', icon: 'none' });
+				return;
+			}
+			this.destroyNative(false);
+			const width = Math.max(Math.round(rect.width), 1);
+			const height = Math.max(Math.round(rect.height), 1);
+			const top = Math.max(0, Math.round(rect.top || 0));
+			const left = Math.max(0, Math.round(rect.left || 0));
+			try {
+				// 使用独立 id 覆盖在占位区域上，避免和页面节点 id 冲突导致 Not Found
+				const barcode = plus.barcode.create(
+					`plusBarcodeNative_${Date.now()}`,
+					this.filters && this.filters.length ? this.filters : DEFAULT_FILTERS,
+					{
+						top: `${top}px`,
+						left: `${left}px`,
+						width: `${width}px`,
+						height: `${height}px`,
+						position: 'absolute',
+						background: '#000000',
+						frameColor: '#2979ff',
+						scanbarColor: '#2979ff',
+					},
+				);
+				barcode.onmarked = (type, code) => {
+					this.onMarked(type, code);
+				};
+				barcode.onerror = (err) => {
+					console.error('PlusBarcodePanel onerror', err);
+				};
+				webview.append(barcode);
+				this._barcode = barcode;
+				this._active = true;
+				barcode.start({
+					vibrate: true,
+					sound: 'default',
+				});
+			} catch (e) {
+				console.error('PlusBarcodePanel create failed', e);
+				uni.showToast({ title: '打开扫码失败', icon: 'none' });
+				this._barcode = null;
+			}
+			// #endif
+		},
+		onMarked(type, code) {
+			const result = String(code || '').trim();
+			if (!result || !this._active) return;
+			try {
+				if (this._barcode) this._barcode.cancel();
+			} catch (e) {
+				// ignore
+			}
+			this.$emit('success', result, type);
+			clearTimeout(this._restartTimer);
+			const gap = Number(this.scanTimeSpace) > 0 ? Number(this.scanTimeSpace) : 1200;
+			this._restartTimer = setTimeout(() => {
+				this.resumeScan();
+			}, gap);
+		},
+		resumeScan() {
+			// #ifdef APP-PLUS
+			if (!this.visible || !this._active || !this._barcode) return;
+			try {
+				this._barcode.start({
+					vibrate: true,
+					sound: 'default',
+				});
+			} catch (e) {
+				console.warn('PlusBarcodePanel resume failed', e);
+			}
+			// #endif
+		},
+		destroyNative(clearActive = true) {
+			clearTimeout(this._restartTimer);
+			this._restartTimer = null;
+			if (clearActive) this._active = false;
+			// #ifdef APP-PLUS
+			const barcode = this._barcode;
+			this._barcode = null;
+			if (!barcode) return;
+			try {
+				barcode.cancel();
+			} catch (e) {
+				// ignore
+			}
+			try {
+				barcode.close();
+			} catch (e) {
+				// ignore
+			}
+			// #endif
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+@import '@/common/pda-typography.scss';
+
+.plus-barcode-panel {
+	background: #000;
+	margin-top: 16rpx;
+}
+.plus-barcode-panel__toolbar {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	min-height: 72rpx;
+	padding: 12rpx 26rpx;
+	background: #1f1f1f;
+	box-sizing: border-box;
+}
+.plus-barcode-panel__tip {
+	flex: 1;
+	color: #ffffff;
+	font-size: $pda-font-action;
+	padding-right: 16rpx;
+}
+.plus-barcode-panel__close {
+	color: #2979ff;
+	font-size: $pda-font-action;
+	flex-shrink: 0;
+}
+.plus-barcode-panel__holder {
+	width: 100%;
+	height: 420rpx;
+	background: #000;
+}
+.plus-barcode-panel__fallback {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	height: 420rpx;
+	padding: 24rpx;
+	box-sizing: border-box;
+	background: #333;
+	color: #fff;
+	font-size: $pda-font-body;
+	text-align: center;
+}
+</style>

src/components/storefabric/FabricOutDetailList.vue

@@ -1,36 +1,135 @@
 <template>
 	<view>
-		<view class="fabric-out-sectionTitle">{{ title }}</view>
+		<view class="summary-title">{{ title }}</view>
 		<slot name="before-list" />
-		<view class="fabric-out-detailList">
+		<view class="summary-wrap">
-			<view
+			<scroll-view scroll-x class="summary-scroll">
-				v-for="row in list"
+				<t-table v-if="list.length" border="1" border-color="#e5e5e5" :style="{ width: tableWidth }">
-				:key="row.group_key || row.id"
+					<t-tr class="summary-head" font-size="18" color="#666666" align="left">
-				class="fabric-out-detailCard"
+						<t-th v-for="col in columns" :key="col.key" :style="cellStyle(col)">{{ col.label }}</t-th>
-			>
+					</t-tr>
-				<view class="fabric-out-detailRow" @click="$emit('fabric-info', row)">
+					<t-tr
-					<text>{{ row.grey_fabric_code }}#{{ row.grey_fabric_name }}</text>
+						v-for="row in list"
-					<u-icon name="arrow-right" size="32" color="#888" />
+						:key="row.group_key || row.id"
-				</view>
+						font-size="18"
-				<view class="fabric-out-detailMeta">
+						color="#333333"
-					<text>匹数：{{ row.roll }}</text>
+						align="left"
-					<text>重量：{{ row.weight }}KG</text>
+						@click="$emit('fabric-info', row)"
-					<u-button type="primary" size="mini" @click="$emit('fine-code', row)">细码</u-button>
+					>
-				</view>
+						<t-td :style="cellStyle(columns[0])">{{ row.grey_fabric_code || '-' }}</t-td>
-			</view>
+						<t-td :style="cellStyle(columns[1])">{{ row.grey_fabric_name || '-' }}</t-td>
+						<t-td :style="cellStyle(columns[2])">{{ displayNum(row.roll) }}</t-td>
+						<t-td :style="cellStyle(columns[3])">{{ displayNum(row.weight) }}</t-td>
+						<t-td class="summary-action" :style="cellStyle(columns[4])" @click.stop="$emit('fine-code', row)">细码</t-td>
+					</t-tr>
+					<t-tr class="summary-total" font-size="18" color="#333333" align="left">
+						<t-td :style="cellStyle(columns[0])">合计</t-td>
+						<t-td :style="cellStyle(columns[1])"></t-td>
+						<t-td :style="cellStyle(columns[2])">{{ totalRoll }}</t-td>
+						<t-td :style="cellStyle(columns[3])">{{ totalWeight }}</t-td>
+						<t-td :style="cellStyle(columns[4])"></t-td>
+					</t-tr>
+				</t-table>
+				<view v-else class="summary-empty">暂无出仓明细</view>
+			</scroll-view>
 		</view>
 	</view>
 </template>
 
 <script>
+import tTable from '@/components/t-table/t-table.vue';
+import tTh from '@/components/t-table/t-th.vue';
+import tTr from '@/components/t-table/t-tr.vue';
+import tTd from '@/components/t-table/t-td.vue';
+
+const COLUMNS = [
+	{ key: 'grey_fabric_code', label: '坯布编号', width: 220 },
+	{ key: 'grey_fabric_name', label: '坯布名称', width: 260 },
+	{ key: 'roll', label: '匹数', width: 140 },
+	{ key: 'weight', label: '重量', width: 160 },
+	{ key: 'action', label: '操作', width: 140 },
+];
+
 export default {
+	components: { tTable, tTh, tTr, tTd },
 	props: {
 		list: { type: Array, default: () => [] },
 		title: { type: String, default: '出仓细码' },
 	},
+	computed: {
+		columns() {
+			return COLUMNS;
+		},
+		tableWidth() {
+			const total = COLUMNS.reduce((sum, col) => sum + col.width, 0);
+			return `${total}rpx`;
+		},
+		totalRoll() {
+			return this.sumField('roll');
+		},
+		totalWeight() {
+			return this.sumField('weight');
+		},
+	},
+	methods: {
+		cellStyle(col) {
+			const width = `${col.width}rpx`;
+			return {
+				width,
+				minWidth: width,
+				maxWidth: width,
+				flex: `0 0 ${width}`,
+			};
+		},
+		displayNum(val) {
+			if (val === 0) return '0';
+			return val != null && val !== '' ? val : '-';
+		},
+		sumField(key) {
+			const total = (this.list || []).reduce((sum, row) => sum + Number(row[key] || 0), 0);
+			return Number(total.toFixed(2));
+		},
+	},
 };
 </script>
 
 <style scoped lang="scss">
-@import '@/pages/storefabric/storeFabricBusinessOutPage.scss';
+@import '@/common/pda-typography.scss';
+
+.summary-title {
+	font-size: $pda-font-body;
+	font-weight: bold;
+	padding: 24rpx 26rpx 12rpx;
+	border-left: 6rpx solid #007AFF;
+	margin: 20rpx 26rpx 0;
+}
+.summary-wrap {
+	margin: 0 26rpx 16rpx;
+	background: #fff;
+	border-radius: 12rpx;
+	overflow: hidden;
+}
+.summary-scroll {
+	width: 100%;
+}
+::v-deep .t-th,
+::v-deep .t-td {
+	box-sizing: border-box;
+	min-height: $pda-row-min-height;
+	word-break: break-all;
+}
+::v-deep .summary-head {
+	background: #f7f8fa;
+}
+::v-deep .summary-total {
+	background: #fff7e6;
+}
+::v-deep .summary-action {
+	color: #2979ff;
+}
+.summary-empty {
+	padding: 28rpx 16rpx;
+	font-size: $pda-font-placeholder;
+	color: #999;
+}
 </style>

src/components/storefabric/FabricOutScanBar.vue

@@ -10,8 +10,13 @@
 				@input="$emit('input', $event.detail.value)"
 				@confirm="$emit('scan')"
 			/>
+			<view
+				v-if="showPhoneScan && scanning"
+				class="fabric-out-scanClose"
+				@click.stop="$emit('phone-scan')"
+			>关闭扫码</view>
 			<u-icon
-				v-if="showPhoneScan"
+				v-else-if="showPhoneScan"
 				class="fabric-out-phoneScanIcon"
 				name="scan"
 				size="44"
@@ -38,15 +43,32 @@ export default {
 		message: { type: String, default: '' },
 		disabledTip: { type: String, default: '当前状态不可扫码' },
 		showPhoneScan: { type: Boolean, default: false },
+		scanning: { type: Boolean, default: false },
 	},
 };
 </script>
 
 <style scoped lang="scss">
 @import '@/pages/storefabric/storeFabricBusinessOutPage.scss';
+@import '@/common/pda-typography.scss';
 
 .fabric-out-phoneScanIcon {
 	margin-left: 16rpx;
 	flex-shrink: 0;
 }
+.fabric-out-scanClose {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-left: 8rpx;
+	padding: 0 16rpx;
+	height: 72rpx;
+	border-radius: 8rpx;
+	border: 1rpx solid #2979ff;
+	background: #eaf2ff;
+	color: #2979ff;
+	font-size: $pda-font-action;
+	flex-shrink: 0;
+	white-space: nowrap;
+}
 </style>

src/components/storefabric/OrderHeaderFold.vue

@@ -0,0 +1,60 @@
+<template>
+	<view class="order-header-fold">
+		<view class="order-header-fold__bar" @click="toggle">
+			<text class="order-header-fold__title">单据信息</text>
+			<text v-if="summary" class="order-header-fold__summary">{{ summary }}</text>
+			<text class="order-header-fold__action">{{ value ? '展开' : '收起' }}</text>
+		</view>
+		<view v-show="!value">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	props: {
+		value: { type: Boolean, default: false },
+		summary: { type: String, default: '' },
+	},
+	methods: {
+		toggle() {
+			this.$emit('input', !this.value);
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+@import '@/common/pda-typography.scss';
+
+.order-header-fold__bar {
+	display: flex;
+	align-items: center;
+	min-height: $pda-row-min-height;
+	margin: 16rpx 26rpx 0;
+	padding: 0 24rpx;
+	background: #fff;
+	border-radius: 12rpx;
+}
+.order-header-fold__title {
+	font-size: $pda-font-body;
+	font-weight: bold;
+	color: #1a1a1a;
+}
+.order-header-fold__summary {
+	flex: 1;
+	margin-left: 16rpx;
+	font-size: $pda-font-action;
+	color: #666;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+.order-header-fold__action {
+	margin-left: auto;
+	padding-left: 16rpx;
+	font-size: $pda-font-action;
+	color: #2979ff;
+}
+</style>

src/components/storefabric/OrderStatusBar.vue

@@ -22,7 +22,9 @@ export default {
 };
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+@import '@/common/status-tag.scss';
+
 .statusRow {
 	display: flex;
 	align-items: center;
@@ -32,18 +34,7 @@ export default {
 	border-bottom: 1rpx solid #f5f5f5;
 }
 .statusLabel {
-	font-size: 28rpx;
+	font-size: $pda-font-body;
 	color: #333;
 }
-.statusTag {
-	font-size: 24rpx;
-	padding: 4rpx 12rpx;
-	border-radius: 6rpx;
-	font-weight: normal;
-}
-.status-0 { background: #f0f0f0; color: #666; }
-.status-1 { background: #fff7e6; color: #fa8c16; }
-.status-2 { background: #f6ffed; color: #52c41a; }
-.status-3 { background: #fff1f0; color: #f5222d; }
-.status-4 { background: #f5f5f5; color: #999; }
 </style>

src/components/storegoods/FineCodeSummaryTable.vue

@@ -0,0 +1,294 @@
+<template>
+	<view>
+		<view class="summary-title">{{ title }}</view>
+		<slot name="before-list" />
+		<view class="summary-wrap">
+			<scroll-view scroll-x class="summary-scroll">
+				<t-table v-if="rows.length" border="1" border-color="#e5e5e5" :style="{ width: tableWidth }">
+					<t-tr class="summary-head" font-size="18" color="#666666" align="left">
+						<t-th v-for="col in columns" :key="col.key" :style="cellStyle(col)">{{ col.label }}</t-th>
+					</t-tr>
+					<t-tr
+						v-for="row in rows"
+						:key="row.group_key"
+						font-size="18"
+						color="#333333"
+						align="left"
+						:class="{ 'summary-row--open': expandedKey === row.group_key }"
+						@click="toggleRow(row.group_key)"
+					>
+						<t-td v-for="col in columns" :key="col.key" :style="cellStyle(col)">{{ formatCell(row, col.key) }}</t-td>
+					</t-tr>
+					<t-tr class="summary-total" font-size="18" color="#333333" align="left">
+						<t-td v-for="col in columns" :key="col.key" :style="cellStyle(col)">{{ totalCell(col.key) }}</t-td>
+					</t-tr>
+				</t-table>
+				<view v-else class="summary-empty">{{ emptyText }}</view>
+			</scroll-view>
+
+			<view v-if="expandedRow" class="summary-fine">
+				<view class="summary-fineTitle">
+					细码（{{ expandedRow.fine_codes.length }}）
+					<text class="summary-fineHint">{{ expandedKey ? '点击行收起' : '' }}</text>
+				</view>
+				<view v-if="!expandedRow.fine_codes.length" class="summary-empty">暂无细码</view>
+				<scroll-view v-else scroll-x class="summary-scroll">
+					<t-table border="1" border-color="#e5e5e5" :style="{ width: fineTableWidth }">
+						<t-tr class="summary-head" font-size="18" color="#666666" align="left">
+							<t-th v-for="col in fineCols" :key="col.key" :style="cellStyle(col)">{{ col.label }}</t-th>
+						</t-tr>
+						<t-tr
+							v-for="(fc, fcIndex) in expandedRow.fine_codes"
+							:key="fc.id || fcIndex"
+							font-size="18"
+							color="#333333"
+							align="left"
+						>
+							<t-td
+								v-for="col in fineCols"
+								:key="col.key"
+								:class="{ 'summary-action': col.key === 'action' }"
+								:style="cellStyle(col)"
+								@click="onFineCellTap(col.key, fc)"
+							>{{ formatFineCell(fc, col.key) }}</t-td>
+						</t-tr>
+					</t-table>
+				</scroll-view>
+				<view v-if="deletable && expandedRow.fine_codes.length" class="summary-tip">
+					点击「删除」移除对应细码
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import tTable from '@/components/t-table/t-table.vue';
+import tTh from '@/components/t-table/t-th.vue';
+import tTr from '@/components/t-table/t-tr.vue';
+import tTd from '@/components/t-table/t-td.vue';
+
+const SUMMARY_COLUMNS = [
+	{ label: '成品编号', key: 'product_code', width: 260 },
+	{ label: '色号', key: 'product_color_code', width: 220 },
+	{ label: '匹数', key: 'roll', width: 140 },
+	{ label: '数量', key: 'weight', width: 160 },
+	{ label: '染整单', key: 'quote_order_no', width: 260 },
+	{ label: '缸号', key: 'dye_factory_dyelot_number', width: 220 },
+];
+
+const FINE_COLUMNS = [
+	{ label: '卷号', key: 'volume_number', width: 140 },
+	{ label: '外部卷号', key: 'extern_volume_number', width: 180 },
+	{ label: '匹数', key: 'roll', width: 120 },
+	{ label: '数量', key: 'weight', width: 150 },
+	{ label: '仓位', key: 'warehouse_bin_name', width: 180 },
+	{ label: '缸号', key: 'dye_factory_dyelot_number', width: 200 },
+];
+
+const TARE_COLUMNS = [
+	{ label: '纸筒重量', key: 'paper_tube_weight', width: 180 },
+	{ label: '包装重量', key: 'package_weight', width: 180 },
+];
+
+export default {
+	components: { tTable, tTh, tTr, tTd },
+	props: {
+		groups: { type: Array, default: () => [] },
+		title: { type: String, default: '明细' },
+		emptyText: { type: String, default: '暂无明细' },
+		rollKey: { type: String, default: 'in_roll' },
+		weightKey: { type: String, default: 'in_weight' },
+		deletable: { type: Boolean, default: false },
+		showTareColumns: { type: Boolean, default: false },
+		showBarCode: { type: Boolean, default: false },
+	},
+	data() {
+		return {
+			expandedKey: '',
+		};
+	},
+	computed: {
+		columns() {
+			return SUMMARY_COLUMNS;
+		},
+		rows() {
+			const rows = [];
+			(this.groups || []).forEach((product) => {
+				(product.colors || []).forEach((color) => {
+					rows.push({
+						group_key: color.group_key,
+						product_code: product.product_code || '',
+						product_name: product.product_name || '',
+						product_color_code: color.product_color_code || '',
+						product_color_name: color.product_color_name || '',
+						quote_order_no: color.quote_order_no || '',
+						dye_factory_dyelot_number: color.dye_factory_dyelot_number || '',
+						roll: color[this.rollKey],
+						weight: color[this.weightKey],
+						fine_codes: color.fine_codes || [],
+					});
+				});
+			});
+			return rows;
+		},
+		expandedRow() {
+			return this.rows.find((row) => row.group_key === this.expandedKey) || null;
+		},
+		fineCols() {
+			const cols = [...FINE_COLUMNS];
+			if (this.showBarCode) {
+				const idx = cols.findIndex((col) => col.key === 'weight');
+				cols.splice(idx + 1, 0, { label: '条码', key: 'bar_code', width: 280 });
+			}
+			if (this.showTareColumns) {
+				const idx = cols.findIndex((col) => col.key === 'weight');
+				cols.splice(idx + 1, 0, ...TARE_COLUMNS);
+			}
+			if (this.deletable) {
+				cols.push({ label: '操作', key: 'action', width: 120 });
+			}
+			return cols;
+		},
+		tableWidth() {
+			return this.sumWidth(this.columns);
+		},
+		fineTableWidth() {
+			return this.sumWidth(this.fineCols);
+		},
+		totalRoll() {
+			return this.sumField('roll');
+		},
+		totalWeight() {
+			return this.sumField('weight');
+		},
+	},
+	watch: {
+		rows() {
+			if (this.expandedKey && !this.rows.some((row) => row.group_key === this.expandedKey)) {
+				this.expandedKey = '';
+			}
+		},
+	},
+	methods: {
+		sumWidth(cols) {
+			const total = cols.reduce((sum, col) => sum + (col.width || 120), 0);
+			return `${total}rpx`;
+		},
+		sumField(key) {
+			const total = this.rows.reduce((sum, row) => sum + Number(row[key] || 0), 0);
+			return Number(total.toFixed(2));
+		},
+		cellStyle(col) {
+			const width = `${col.width}rpx`;
+			return {
+				width,
+				minWidth: width,
+				maxWidth: width,
+				flex: `0 0 ${width}`,
+			};
+		},
+		joinName(code, name) {
+			const main = code || '-';
+			return name ? `${main} ${name}` : main;
+		},
+		formatCell(row, key) {
+			if (key === 'product_code') return this.joinName(row.product_code, row.product_name);
+			if (key === 'product_color_code') return this.joinName(row.product_color_code, row.product_color_name);
+			if (key === 'roll' || key === 'weight') {
+				const val = row[key];
+				if (val === 0) return '0';
+				return val != null && val !== '' ? val : '-';
+			}
+			const val = row[key];
+			if (val === 0) return '0';
+			return val != null && val !== '' ? val : '-';
+		},
+		totalCell(key) {
+			if (key === 'product_code') return '合计';
+			if (key === 'roll') return this.totalRoll;
+			if (key === 'weight') return this.totalWeight;
+			return '';
+		},
+		toggleRow(key) {
+			this.expandedKey = this.expandedKey === key ? '' : key;
+		},
+		formatFineCell(fc, key) {
+			if (key === 'action') return '删除';
+			const val = fc[key];
+			if (val === 0) return '0';
+			return val != null && val !== '' ? val : '-';
+		},
+		onFineCellTap(key, fc) {
+			if (!this.deletable || key !== 'action') return;
+			this.$emit('delete', fc);
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+@import '@/common/pda-typography.scss';
+
+.summary-title {
+	font-size: $pda-font-body;
+	font-weight: bold;
+	padding: 24rpx 26rpx 12rpx;
+	border-left: 6rpx solid #007AFF;
+	margin: 20rpx 26rpx 0;
+}
+.summary-wrap {
+	margin: 0 26rpx 16rpx;
+	background: #fff;
+	border-radius: 12rpx;
+	overflow: hidden;
+}
+.summary-scroll {
+	width: 100%;
+}
+::v-deep .t-th,
+::v-deep .t-td {
+	box-sizing: border-box;
+	min-height: $pda-row-min-height;
+	word-break: break-all;
+}
+::v-deep .summary-head {
+	background: #f7f8fa;
+}
+::v-deep .summary-row--open {
+	background: #f0f7ff;
+}
+::v-deep .summary-total {
+	background: #fff7e6;
+}
+::v-deep .summary-action {
+	color: #f5222d;
+}
+.summary-empty {
+	padding: 28rpx 16rpx;
+	font-size: $pda-font-placeholder;
+	color: #999;
+}
+.summary-fine {
+	padding: 8rpx 0 16rpx;
+}
+.summary-fineTitle {
+	display: flex;
+	justify-content: space-between;
+	padding: 12rpx 16rpx 8rpx;
+	font-size: $pda-font-action;
+	color: #2979ff;
+}
+.summary-fineHint {
+	color: #999;
+	font-size: $pda-font-popup-sub;
+}
+.summary-action {
+	color: #f5222d;
+}
+.summary-tip {
+	padding: 8rpx 16rpx 0;
+	font-size: $pda-font-popup-sub;
+	color: #999;
+}
+</style>

src/components/storegoods/ProcessInBinBar.vue

@@ -11,8 +11,13 @@
 				@confirm="$emit('confirm')"
 			/>
 			<text v-if="name" class="process-in-binName">{{ name }}</text>
+			<view
+				v-if="showPhoneScan && scanning"
+				class="fabric-out-scanClose"
+				@click.stop="$emit('phone-scan')"
+			>关闭扫码</view>
 			<u-icon
-				v-if="showPhoneScan"
+				v-else-if="showPhoneScan"
 				class="fabric-out-phoneScanIcon"
 				name="scan"
 				size="44"
@@ -34,6 +39,7 @@ export default {
 		code: { type: String, default: '' },
 		name: { type: String, default: '' },
 		showPhoneScan: { type: Boolean, default: false },
+		scanning: { type: Boolean, default: false },
 		showDisabledTip: { type: Boolean, default: true },
 		disabledTip: { type: String, default: '请先提交保存后再扫仓位' },
 	},
@@ -42,6 +48,7 @@ export default {
 
 <style scoped lang="scss">
 @import '@/pages/storefabric/storeFabricBusinessOutPage.scss';
+@import '@/common/pda-typography.scss';
 
 .process-in-binRow {
 	background: #fff;
@@ -53,6 +60,21 @@ export default {
 	margin-left: 16rpx;
 	flex-shrink: 0;
 }
+.fabric-out-scanClose {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-left: 8rpx;
+	padding: 0 16rpx;
+	height: 72rpx;
+	border-radius: 8rpx;
+	border: 1rpx solid #2979ff;
+	background: #eaf2ff;
+	color: #2979ff;
+	font-size: $pda-font-action;
+	flex-shrink: 0;
+	white-space: nowrap;
+}
 .process-in-binName {
 	margin-left: 12rpx;
 	font-size: 28rpx;

src/components/storegoods/ProcessInDetailList.vue

@@ -1,261 +1,35 @@
 <template>
-	<view>
+	<FineCodeSummaryTable
-		<view class="fabric-out-sectionTitle">{{ title }}</view>
+		:groups="groups"
-		<slot name="before-list" />
+		:title="title"
-		<view class="fabric-out-detailList">
+		:empty-text="emptyText"
-			<dataNull
+		roll-key="in_roll"
-				v-if="!groups.length"
+		weight-key="in_weight"
-				src="/src/static/img/chahua/gjNull.png"
+		:deletable="deletable"
-				title="暂无进仓明细"
+		:show-tare-columns="showTareColumns"
-				title1="扫码后将在此展示"
+		@delete="$emit('delete', $event)"
-			/>
+	>
-			<view
+		<slot name="before-list" slot="before-list" />
-				v-for="product in groups"
+	</FineCodeSummaryTable>
-				:key="product.group_key"
-				class="fabric-out-detailCard process-in-productCard"
-			>
-				<view class="process-in-productHead">
-					<text class="process-in-productTitle">
-						{{ product.product_code || '-' }}<text v-if="product.product_name" class="process-in-subText">{{ ' ' + product.product_name }}</text>
-					</text>
-					<text class="process-in-productSum">
-						匹数 {{ product.in_roll }} / 数量 {{ product.in_weight }}
-					</text>
-				</view>
-
-				<view
-					v-for="color in product.colors"
-					:key="color.group_key"
-					class="process-in-colorBlock"
-				>
-					<view class="process-in-colorHead">
-						<text class="process-in-colorTitle">
-							色号 {{ color.product_color_code || '-' }}<text v-if="color.product_color_name" class="process-in-subText">{{ ' ' + color.product_color_name }}</text>
-						</text>
-						<text class="process-in-colorSum">
-							匹数 {{ color.in_roll }} / 数量 {{ color.in_weight }}
-						</text>
-					</view>
-					<view class="process-in-colorMeta">
-						<text>染整单：{{ color.quote_order_no || '-' }}</text>
-						<text>缸号：{{ color.dye_factory_dyelot_number || '-' }}</text>
-					</view>
-
-					<view class="process-in-fcTitle">细码（{{ color.fine_codes.length }}）</view>
-					<view v-if="!color.fine_codes.length" class="process-in-fcEmpty">暂无细码</view>
-					<scroll-view v-else scroll-x class="process-in-fcScroll">
-						<view class="process-in-fcTable" :style="{ width: fineTableWidth }">
-							<view class="process-in-fcRow process-in-fcHead">
-								<view
-									v-for="col in fineColumns"
-									:key="col.key"
-									class="process-in-fcCell"
-									:style="cellStyle(col)"
-								>{{ col.label }}</view>
-							</view>
-							<view
-								v-for="(fc, fcIndex) in color.fine_codes"
-								:key="fc.id || fcIndex"
-								class="process-in-fcRow"
-							>
-								<view
-									v-for="col in fineColumns"
-									:key="col.key"
-									class="process-in-fcCell"
-									:class="{ 'process-in-fcAction': col.key === 'action' }"
-									:style="cellStyle(col)"
-									@click="onCellTap(col.key, fc)"
-								>{{ formatFineCell(fc, col.key) }}</view>
-							</view>
-						</view>
-					</scroll-view>
-					<view v-if="deletable && color.fine_codes.length" class="process-in-fcTip">
-						勾选上方「删除」后扫码，或点击「删除」列移除细码
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
 </template>
 
 <script>
+import FineCodeSummaryTable from '@/components/storegoods/FineCodeSummaryTable.vue';
 import { buildItemGroups } from '@/common/storeGoodsProcessIn';
 
-const FINE_COLUMNS = [
-	{ label: '卷号', key: 'volume_number', width: 110 },
-	{ label: '外部卷号', key: 'extern_volume_number', width: 140 },
-	{ label: '匹数', key: 'roll', width: 100 },
-	{ label: '数量', key: 'weight', width: 130 },
-	{ label: '仓位', key: 'warehouse_bin_name', width: 140 },
-	{ label: '缸号', key: 'dye_factory_dyelot_number', width: 160 },
-];
-
-const TARE_COLUMNS = [
-	{ label: '纸筒重量', key: 'paper_tube_weight', width: 140 },
-	{ label: '包装重量', key: 'package_weight', width: 140 },
-];
-
 export default {
+	components: { FineCodeSummaryTable },
 	props: {
 		list: { type: Array, default: () => [] },
 		title: { type: String, default: '进仓明细' },
+		emptyText: { type: String, default: '暂无进仓明细' },
 		deletable: { type: Boolean, default: false },
-		/** 加工/采购进仓：细码行展示扫码时提交的纸筒、包装重量 */
 		showTareColumns: { type: Boolean, default: false },
 	},
 	computed: {
 		groups() {
 			return buildItemGroups(this.list);
 		},
-		fineColumns() {
-			const cols = [...FINE_COLUMNS];
-			if (this.showTareColumns) {
-				const idx = cols.findIndex((col) => col.key === 'weight');
-				cols.splice(idx + 1, 0, ...TARE_COLUMNS);
-			}
-			if (this.deletable) {
-				cols.push({ label: '操作', key: 'action', width: 100 });
-			}
-			return cols;
-		},
-		fineTableWidth() {
-			const total = this.fineColumns.reduce((sum, col) => sum + (col.width || 100), 0);
-			return `${total}rpx`;
-		},
-	},
-	methods: {
-		cellStyle(col) {
-			return {
-				width: `${col.width}rpx`,
-				minWidth: `${col.width}rpx`,
-				maxWidth: `${col.width}rpx`,
-			};
-		},
-		formatFineCell(fc, key) {
-			if (key === 'action') return '删除';
-			const val = fc[key];
-			if (val === 0) return '0';
-			return val != null && val !== '' ? val : '-';
-		},
-		onCellTap(key, fc) {
-			if (!this.deletable || key !== 'action') return;
-			this.$emit('delete', fc);
-		},
 	},
 };
 </script>
-
-<style scoped lang="scss">
-@import '@/pages/storefabric/storeFabricBusinessOutPage.scss';
-
-.process-in-productCard {
-	padding: 0;
-	overflow: hidden;
-}
-.process-in-productHead {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	padding: 20rpx;
-	background: #f0f7ff;
-	border-bottom: 1rpx solid #e6f0ff;
-}
-.process-in-productTitle {
-	font-size: 32rpx;
-	font-weight: bold;
-	color: #1a1a1a;
-	flex: 1;
-	padding-right: 16rpx;
-}
-.process-in-productSum,
-.process-in-colorSum {
-	font-size: 28rpx;
-	color: #666;
-	flex-shrink: 0;
-}
-.process-in-subText {
-	font-weight: normal;
-	color: #666;
-	font-size: 28rpx;
-}
-.process-in-colorBlock {
-	padding: 16rpx 20rpx 20rpx;
-	border-bottom: 1rpx solid #f0f0f0;
-}
-.process-in-colorBlock:last-child {
-	border-bottom: none;
-}
-.process-in-colorHead {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	margin-bottom: 8rpx;
-}
-.process-in-colorTitle {
-	font-size: 30rpx;
-	font-weight: bold;
-	color: #333;
-	flex: 1;
-	padding-right: 12rpx;
-}
-.process-in-colorMeta {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 16rpx 24rpx;
-	font-size: 28rpx;
-	color: #888;
-	margin-bottom: 12rpx;
-}
-.process-in-fcTitle {
-	font-size: 28rpx;
-	color: #2979ff;
-	margin-bottom: 8rpx;
-}
-.process-in-fcEmpty {
-	font-size: 28rpx;
-	color: #bbb;
-	padding: 8rpx 0;
-}
-.process-in-fcScroll {
-	width: 100%;
-}
-.process-in-fcTable {
-	border: 1rpx solid #eee;
-	border-radius: 8rpx;
-	overflow: hidden;
-}
-.process-in-fcRow {
-	display: flex;
-	align-items: stretch;
-	border-bottom: 1rpx solid #f0f0f0;
-}
-.process-in-fcRow:last-child {
-	border-bottom: none;
-}
-.process-in-fcHead {
-	background: #fafafa;
-}
-.process-in-fcCell {
-	box-sizing: border-box;
-	padding: 14rpx 10rpx;
-	font-size: 28rpx;
-	color: #333;
-	border-right: 1rpx solid #f0f0f0;
-	word-break: break-all;
-}
-.process-in-fcHead .process-in-fcCell {
-	font-weight: bold;
-	color: #666;
-}
-.process-in-fcCell:last-child {
-	border-right: none;
-}
-.process-in-fcAction {
-	color: #f5222d;
-}
-.process-in-fcTip {
-	margin-top: 8rpx;
-	font-size: 26rpx;
-	color: #999;
-}
-</style>

src/components/storegoods/ProcessOutDetailList.vue

@@ -1,97 +1,24 @@
 <template>
-	<view>
+	<FineCodeSummaryTable
-		<view class="fabric-out-sectionTitle">{{ title }}</view>
+		:groups="groups"
-		<slot name="before-list" />
+		:title="title"
-		<view class="fabric-out-detailList">
+		empty-text="暂无出仓明细"
-			<dataNull
+		roll-key="out_roll"
-				v-if="!groups.length"
+		weight-key="out_weight"
-				src="/src/static/img/chahua/gjNull.png"
+		:deletable="deletable"
-				title="暂无出仓明细"
+		show-bar-code
-				title1="扫码后将在此展示"
+		@delete="$emit('delete', $event)"
-			/>
+	>
-			<view
+		<slot name="before-list" slot="before-list" />
-				v-for="product in groups"
+	</FineCodeSummaryTable>
-				:key="product.group_key"
-				class="fabric-out-detailCard process-in-productCard"
-			>
-				<view class="process-in-productHead">
-					<text class="process-in-productTitle">
-						{{ product.product_code || '-' }}<text v-if="product.product_name" class="process-in-subText">{{ ' ' + product.product_name }}</text>
-					</text>
-					<text class="process-in-productSum">
-						匹数 {{ product.out_roll }} / 数量 {{ product.out_weight }}
-					</text>
-				</view>
-
-				<view
-					v-for="color in product.colors"
-					:key="color.group_key"
-					class="process-in-colorBlock"
-				>
-					<view class="process-in-colorHead">
-						<text class="process-in-colorTitle">
-							色号 {{ color.product_color_code || '-' }}<text v-if="color.product_color_name" class="process-in-subText">{{ ' ' + color.product_color_name }}</text>
-						</text>
-						<text class="process-in-colorSum">
-							匹数 {{ color.out_roll }} / 数量 {{ color.out_weight }}
-						</text>
-					</view>
-					<view class="process-in-colorMeta">
-						<text>染整单：{{ color.quote_order_no || '-' }}</text>
-						<text>缸号：{{ color.dye_factory_dyelot_number || '-' }}</text>
-					</view>
-
-					<view class="process-in-fcTitle">细码（{{ color.fine_codes.length }}）</view>
-					<view v-if="!color.fine_codes.length" class="process-in-fcEmpty">暂无细码</view>
-					<scroll-view v-else scroll-x class="process-in-fcScroll">
-						<view class="process-in-fcTable" :style="{ width: fineTableWidth }">
-							<view class="process-in-fcRow process-in-fcHead">
-								<view
-									v-for="col in fineColumns"
-									:key="col.key"
-									class="process-in-fcCell"
-									:style="cellStyle(col)"
-								>{{ col.label }}</view>
-							</view>
-							<view
-								v-for="(fc, fcIndex) in color.fine_codes"
-								:key="fc.id || fcIndex"
-								class="process-in-fcRow"
-							>
-								<view
-									v-for="col in fineColumns"
-									:key="col.key"
-									class="process-in-fcCell"
-									:class="{ 'process-in-fcAction': col.key === 'action' }"
-									:style="cellStyle(col)"
-									@click="onCellTap(col.key, fc)"
-								>{{ formatFineCell(fc, col.key) }}</view>
-							</view>
-						</view>
-					</scroll-view>
-					<view v-if="deletable && color.fine_codes.length" class="process-in-fcTip">
-						勾选上方「删除」后扫码，或点击「删除」列移除细码
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
 </template>
 
 <script>
+import FineCodeSummaryTable from '@/components/storegoods/FineCodeSummaryTable.vue';
 import { buildItemGroups } from '@/common/storeGoodsProcessOut';
 
-const FINE_COLUMNS = [
-	{ label: '卷号', key: 'volume_number', width: 110 },
-	{ label: '外部卷号', key: 'extern_volume_number', width: 140 },
-	{ label: '匹数', key: 'roll', width: 100 },
-	{ label: '数量', key: 'weight', width: 130 },
-	{ label: '条码', key: 'bar_code', width: 260 },
-	{ label: '仓位', key: 'warehouse_bin_name', width: 140 },
-	{ label: '缸号', key: 'dye_factory_dyelot_number', width: 160 },
-];
-
 export default {
+	components: { FineCodeSummaryTable },
 	props: {
 		list: { type: Array, default: () => [] },
 		title: { type: String, default: '出仓明细' },
@@ -101,148 +28,6 @@ export default {
 		groups() {
 			return buildItemGroups(this.list);
 		},
-		fineColumns() {
-			if (!this.deletable) return FINE_COLUMNS;
-			return [...FINE_COLUMNS, { label: '操作', key: 'action', width: 100 }];
-		},
-		fineTableWidth() {
-			const total = this.fineColumns.reduce((sum, col) => sum + (col.width || 100), 0);
-			return `${total}rpx`;
-		},
-	},
-	methods: {
-		cellStyle(col) {
-			return {
-				width: `${col.width}rpx`,
-				minWidth: `${col.width}rpx`,
-				maxWidth: `${col.width}rpx`,
-			};
-		},
-		formatFineCell(fc, key) {
-			if (key === 'action') return '删除';
-			const val = fc[key];
-			if (val === 0) return '0';
-			return val != null && val !== '' ? val : '-';
-		},
-		onCellTap(key, fc) {
-			if (!this.deletable || key !== 'action') return;
-			this.$emit('delete', fc);
-		},
 	},
 };
 </script>
-
-<style scoped lang="scss">
-@import '@/pages/storefabric/storeFabricBusinessOutPage.scss';
-
-.process-in-productCard {
-	padding: 0;
-	overflow: hidden;
-}
-.process-in-productHead {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	padding: 20rpx;
-	background: #f0f7ff;
-	border-bottom: 1rpx solid #e6f0ff;
-}
-.process-in-productTitle {
-	font-size: 32rpx;
-	font-weight: bold;
-	color: #1a1a1a;
-	flex: 1;
-	padding-right: 16rpx;
-}
-.process-in-productSum,
-.process-in-colorSum {
-	font-size: 28rpx;
-	color: #666;
-	flex-shrink: 0;
-}
-.process-in-subText {
-	font-weight: normal;
-	color: #666;
-	font-size: 28rpx;
-}
-.process-in-colorBlock {
-	padding: 16rpx 20rpx 20rpx;
-	border-bottom: 1rpx solid #f0f0f0;
-}
-.process-in-colorBlock:last-child {
-	border-bottom: none;
-}
-.process-in-colorHead {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	margin-bottom: 8rpx;
-}
-.process-in-colorTitle {
-	font-size: 30rpx;
-	font-weight: bold;
-	color: #333;
-	flex: 1;
-	padding-right: 12rpx;
-}
-.process-in-colorMeta {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 16rpx 24rpx;
-	font-size: 28rpx;
-	color: #888;
-	margin-bottom: 12rpx;
-}
-.process-in-fcTitle {
-	font-size: 28rpx;
-	color: #2979ff;
-	margin-bottom: 8rpx;
-}
-.process-in-fcEmpty {
-	font-size: 28rpx;
-	color: #bbb;
-	padding: 8rpx 0;
-}
-.process-in-fcScroll {
-	width: 100%;
-}
-.process-in-fcTable {
-	border: 1rpx solid #eee;
-	border-radius: 8rpx;
-	overflow: hidden;
-}
-.process-in-fcRow {
-	display: flex;
-	align-items: stretch;
-	border-bottom: 1rpx solid #f0f0f0;
-}
-.process-in-fcRow:last-child {
-	border-bottom: none;
-}
-.process-in-fcHead {
-	background: #fafafa;
-}
-.process-in-fcCell {
-	box-sizing: border-box;
-	padding: 14rpx 10rpx;
-	font-size: 28rpx;
-	color: #333;
-	border-right: 1rpx solid #f0f0f0;
-	word-break: break-all;
-}
-.process-in-fcHead .process-in-fcCell {
-	font-weight: bold;
-	color: #666;
-}
-.process-in-fcCell:last-child {
-	border-right: none;
-}
-.process-in-fcAction {
-	color: #f5222d;
-}
-.process-in-fcTip {
-	margin-top: 8rpx;
-	font-size: 26rpx;
-	color: #999;
-}
-</style>

src/components/t-table/t-table.vue

@@ -0,0 +1,86 @@
+<template>
+	<view class="t-table" :style="{ 'border-width': border + 'px', 'border-color': borderColor }">
+		<slot />
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			border: {
+				type: String,
+				default: '1'
+			},
+			borderColor: {
+				type: String,
+				default: '#d0dee5'
+			},
+			isCheck: {
+				type: Boolean,
+				default: false
+			}
+		},
+		provide() {
+			return {
+				table: this
+			};
+		},
+		data() {
+			return {};
+		},
+		created() {
+			this.childrens = [];
+			this.index = 0;
+		},
+		methods: {
+			fire(e, index, len) {
+				let childrens = this.childrens;
+				console.log(childrens);
+				// 全选
+				if (index === 0) {
+					childrens.map((vm, index) => {
+						vm.checkboxData.checked = e;
+						return vm;
+					});
+				} else {
+					let isAll = childrens.find((n, ids) => ids !== 0 && !n.checkboxData.checked);
+					childrens[0].checkboxData.checked = isAll ? false : true;
+				}
+
+				let fireArr = [];
+				for (let i = 0; i < childrens.length; i++) {
+					if (childrens[i].checkboxData.checked && i !== 0) {
+						fireArr.push(childrens[i].checkboxData.value - 1);
+					}
+				}
+				this.$emit('change', {
+					detail: fireArr
+				});
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	.t-table {
+		width: 100%;
+		border: 1px #d0dee5 solid;
+		border-left: none;
+		border-top: none;
+		box-sizing: border-box;
+	}
+
+	.t-table>>>t-tr {
+		display: flex;
+	}
+
+	.t-table>>>t-tr:nth-child(2n) {
+		background: #f5f5f5;
+	}
+
+	/* #ifdef H5 */
+	.t-table>>>.t-tr:nth-child(2n) {
+		background: #f5f5f5;
+	}
+	/* #endif */
+</style>

src/components/t-table/t-td.vue

@@ -0,0 +1,71 @@
+<template>
+	<view class="t-td" :style="{ 'border-width': thBorder + 'px','border-color':borderColor ,'font-size':fontSize+'px' ,'color':color,'justify-content':tdAlignCpd}" @click="$emit('click', $event)">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			align: String
+		},
+		data() {
+			return {
+				thBorder: '1',
+				borderColor: '#d0dee5',
+				fontSize: '14',
+				color: '#555c60',
+				tdAlign: 'center'
+			};
+		},
+		inject: ['table', 'tr'],
+
+		created() {
+			this.thBorder = this.table.border;
+			this.borderColor = this.table.borderColor;
+			this.fontSize = this.tr.fontSize;
+			this.color = this.tr.color;
+			if (this.align) {
+				this.tdAlign = this.align;
+			} else {
+				this.tdAlign = this.tr.align
+			}
+		},
+		computed: {
+			tdAlignCpd() {
+				let nameAlign = '';
+				switch (this.tdAlign) {
+					case 'left':
+						nameAlign = 'flex-start'
+						break;
+					case 'center':
+						nameAlign = 'center'
+						break;
+					case 'right':
+						nameAlign = 'flex-end'
+						break;
+					default:
+						nameAlign = 'center'
+						break;
+				}
+				return nameAlign
+			}
+		}
+	};
+</script>
+
+<style>
+	.t-td {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		width: 100%;
+		padding: 14upx;
+		border-top: 1px #d0dee5 solid;
+		border-left: 1px #d0dee5 solid;
+		text-align: center;
+		color: #555c60;
+		font-size: 28upx;
+
+	}
+</style>

src/components/t-table/t-th.vue

@@ -0,0 +1,71 @@
+<template>
+	<view class="t-th" :style="{ 'border-width': thBorder + 'px' ,'border-color':borderColor,'font-size':fontSize+'px' ,'color':color,'justify-content':thAlignCpd}">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			align: String,
+		},
+		data() {
+			return {
+				thBorder: '1',
+				borderColor: '#d0dee5',
+				fontSize: '15',
+				color: '#3b4246',
+				thAlign: 'center'
+			};
+		},
+		inject: ['table', 'tr'],
+
+		created() {
+			this.thBorder = this.table.border;
+			this.borderColor = this.table.borderColor;
+			this.fontSize = this.tr.fontSize;
+			this.color = this.tr.color;
+			if (this.align) {
+				this.thAlign = this.align;
+			} else {
+				this.thAlign = this.tr.align
+			}
+		},
+
+		computed: {
+			thAlignCpd() {
+				let nameAlign = '';
+				switch (this.thAlign) {
+					case 'left':
+						nameAlign = 'flex-start'
+						break;
+					case 'center':
+						nameAlign = 'center'
+						break;
+					case 'right':
+						nameAlign = 'flex-end'
+						break;
+					default:
+						nameAlign = 'center'
+						break;
+				}
+				return nameAlign
+			}
+		}
+	};
+</script>
+
+<style>
+	.t-th {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		font-size: 30upx;
+		font-weight: bold;
+		text-align: center;
+		color: #3b4246;
+		border-left: 1px #d0dee5 solid;
+		border-top: 1px #d0dee5 solid;
+		padding: 15upx;
+	}
+</style>

src/components/t-table/t-tr.vue

@@ -0,0 +1,81 @@
+<template>
+	<view class="t-tr" @click="$emit('click', $event)">
+		<view v-if="isCheck" class="t-check-box" :style="{ 'border-width': thBorder + 'px' ,'border-color':borderColor}">
+			<checkbox-group @change="checkboxChange">
+				<checkbox :value="checkboxData.value + ''" :checked="checkboxData.checked" />
+			</checkbox-group>
+		</view>
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			fontSize: String,
+			color: String,
+			align: String
+		},
+		inject: ['table'],
+		provide() {
+			return {
+				tr: this
+			};
+		},
+		data() {
+			return {
+				isCheck: false,
+				checkboxData: {
+					value: 0,
+					checked: false
+				},
+				checked: false,
+				thBorder: '1',
+				borderColor: '#d0dee5'
+			};
+		},
+		created() {
+			this.thBorder = this.table.border;
+			this.borderColor = this.table.borderColor;
+			this.table.childrens.push(this);
+			this.checkboxData.value = this.table.index++;
+			this.isCheck = this.table.isCheck;
+
+		},
+		methods: {
+			checkboxChange(e) {
+				this.checkboxData.checked = !this.checkboxData.checked;
+				this.table.childrens[this.checkboxData.value] = this;
+				this.table.fire(e.detail.value[0] ? true : false, this.checkboxData.value, this.table.index);
+			}
+		}
+	};
+</script>
+
+<style>
+	.t-tr {
+		width: 100%;
+		display: flex;
+	}
+
+	.t-tr t-th,
+	.t-tr t-td {
+		display: flex;
+		flex: 1;
+	}
+
+	.t-tr .t-check-box {
+		flex-shrink: 0;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 80upx;
+		color: #3b4246;
+		border-left: 1px #d0dee5 solid;
+		border-top: 1px #d0dee5 solid;
+	}
+
+	.t-tr .t-check-box checkbox {
+		transform: scale(0.8);
+	}
+</style>

src/components/u-select/u-select.vue

@@ -46,20 +46,27 @@
 					></u-icon>
 				</view>
 				<view v-if="loading" class="u-select__loading">搜索中...</view>
-				<view class="u-select__body">
+				<view class="u-select__body" :style="hasCustomItemHeight ? bodyStyle : null">
 					<view v-if="isColumnEmpty && !loading" class="u-select__empty">无匹配选项</view>
 					<picker-view
 						v-else-if="value && !isColumnEmpty"
 						:key="pickerKey"
 						@change="columnChange"
 						class="u-select__body__picker-view"
+						:style="pickerViewStyle"
+						:indicator-style="indicatorStyle"
 						:value="defaultSelector"
 						@pickstart="pickstart"
 						@pickend="pickend"
 					>
 						<picker-view-column v-for="(item, index) in columnData" :key="'col-' + pickerKey + '-' + index">
-							<view class="u-select__body__picker-view__item" v-for="(item1, index1) in item" :key="item1[valueName] != null ? item1[valueName] : index1">
+							<view
-								<view class="u-line-1">{{ item1[labelName] }}</view>
+								class="u-select__body__picker-view__item"
+								:style="hasCustomItemHeight ? itemStyle : null"
+								v-for="(item1, index1) in item"
+								:key="item1[valueName] != null ? item1[valueName] : index1"
+							>
+								<view class="u-line-1" :style="hasCustomItemHeight ? itemStyle : null">{{ item1[labelName] }}</view>
 							</view>
 						</picker-view-column>
 					</picker-view>
@@ -172,6 +179,16 @@ export default {
 		debounce: {
 			type: Number,
 			default: 400
+		},
+		/** 选项行高（rpx）。App 端需与 indicator 同步，避免选中框错位 */
+		itemHeight: {
+			type: [Number, String],
+			default: 0
+		},
+		/** 可见行数，用于计算滚轮高度；需为奇数，选中行才能居中 */
+		visibleItemCount: {
+			type: [Number, String],
+			default: 5
 		}
 	},
 	data() {
@@ -225,7 +242,37 @@ export default {
 		},
 		isColumnEmpty() {
 			return !this.columnData || !this.columnData.length || !this.columnData[0] || !this.columnData[0].length;
-		}
+		},
+		hasCustomItemHeight() {
+			return Number(this.itemHeight) > 0;
+		},
+		itemHeightRpx() {
+			return Number(this.itemHeight) || 70;
+		},
+		itemHeightPx() {
+			return uni.upx2px(this.itemHeightRpx);
+		},
+		visibleCount() {
+			const n = Number(this.visibleItemCount) || 5;
+			return n % 2 === 0 ? n + 1 : n;
+		},
+		indicatorStyle() {
+			if (!this.hasCustomItemHeight) return '';
+			return `height: ${this.itemHeightPx}px;`;
+		},
+		itemStyle() {
+			return {
+				height: `${this.itemHeightPx}px`,
+				lineHeight: `${this.itemHeightPx}px`,
+			};
+		},
+		pickerViewStyle() {
+			if (!this.hasCustomItemHeight) return null;
+			return { height: `${this.itemHeightPx * this.visibleCount}px` };
+		},
+		bodyStyle() {
+			return this.pickerViewStyle;
+		},
 	},
 	methods: {
 		pickstart() {
@@ -308,7 +355,11 @@ export default {
 			this.setSelectValue();
 		},
 		setDefaultSelector() {
-			this.defaultSelector = Array(this.columnNum || 1).fill(0);
+			const columnNum = this.columnNum || 1;
+			const defaultValue = Array.isArray(this.defaultValue) ? this.defaultValue.slice() : [];
+			this.defaultSelector = defaultValue.length === columnNum
+				? defaultValue
+				: Array(columnNum).fill(0);
 			this.lastSelectIndex = this.defaultSelector.slice();
 		},
 		setColumnNum() {

src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "浩拓ERP",
     "appid" : "__UNI__F79F300",
     "description" : "浩拓ERP",
-    "versionName" : "1.1.6",
+    "versionName" : "1.1.21",
-    "versionCode" : 106,
+    "versionCode" : 121,
     "transformPx" : false,
     "app-plus" : {
         "optimization" : {

src/mixins/listFilterMixin.js

@@ -0,0 +1,119 @@
+import {
+	hasFilterValue,
+	normalizeAuditStatus,
+	isActiveFilterState,
+	normalizeFilterState,
+	withSelectedOption,
+} from '@/common/listFilter';
+
+export default {
+	data() {
+		return {
+			appliedFilters: null,
+		};
+	},
+	computed: {
+		hasActiveFilter() {
+			return isActiveFilterState(this.appliedFilters || this.filters);
+		},
+		filterIconColor() {
+			return this.hasActiveFilter ? '#2979ff' : '#666666';
+		},
+		statusSelectDefault() {
+			const list = this.statusSelectList || [];
+			const index = list.findIndex(
+				(item) => String(item.value) === String(this.filters && this.filters.audit_status)
+			);
+			return [index >= 0 ? index : 0];
+		},
+		unitSelectDefault() {
+			const selectedValue = this.getUnitSelectValue();
+			const index = (this.unitSelectList || []).findIndex(
+				(item) => String(item.value) === String(selectedValue)
+			);
+			return [index >= 0 ? index : 0];
+		},
+	},
+	methods: {
+		hasFilterValue,
+		getDefaultFilters() {
+			return typeof this.createDefaultFilters === 'function'
+				? this.createDefaultFilters()
+				: {};
+		},
+		getUnitSelectValue() {
+			const type = this.unitSelectType;
+			const filters = this.filters || {};
+			if (type === 'warehouse') return filters.warehouse_id;
+			if (type === 'delivery') return filters.delivery_unit_id;
+			if (type === 'business') return filters.business_unit_id;
+			if (type === 'supplier') return filters.supplier_id;
+			if (type === 'process') return filters.process_unit_id;
+			return filters.process_unit_id || filters.supplier_id || filters.business_unit_id || '';
+		},
+		getUnitSelectLabel() {
+			const type = this.unitSelectType;
+			const filters = this.filters || {};
+			if (type === 'warehouse') return filters.warehouse_name;
+			if (type === 'delivery') return filters.delivery_unit_name;
+			if (type === 'business') return filters.business_unit_name;
+			if (type === 'supplier') return filters.supplier_name;
+			if (type === 'process') return filters.process_name;
+			return filters.process_name || filters.supplier_name || filters.business_unit_name || '';
+		},
+		restoreFilterCache() {
+			const defaults = this.getDefaultFilters();
+			try {
+				const cached = this.filterStorageKey ? uni.getStorageSync(this.filterStorageKey) : null;
+				if (!cached || typeof cached !== 'object' || Array.isArray(cached)) {
+					this.filters = { ...defaults };
+					this.appliedFilters = { ...defaults };
+					this.saveFilterCache();
+					return;
+				}
+				const filters = normalizeFilterState(cached, defaults);
+				this.filters = { ...filters };
+				this.appliedFilters = { ...filters };
+			} catch (e) {
+				this.filters = { ...defaults };
+				this.appliedFilters = { ...defaults };
+			}
+		},
+		saveFilterCache() {
+			if (!this.filterStorageKey) return;
+			try {
+				uni.setStorageSync(this.filterStorageKey, { ...this.appliedFilters });
+			} catch (e) {
+				// 缓存失败不影响列表筛选
+			}
+		},
+		commitFilters() {
+			const filters = normalizeFilterState(this.filters, this.getDefaultFilters());
+			this.filters = { ...filters };
+			this.appliedFilters = { ...filters };
+			this.saveFilterCache();
+			this.loadList();
+		},
+		applySearch() {
+			this.commitFilters();
+		},
+		cancelFilterEdit() {
+			this.filters = { ...(this.appliedFilters || this.getDefaultFilters()) };
+		},
+		applyFilter() {
+			this.commitFilters();
+			this.filterShow = false;
+		},
+		resetFilter() {
+			this.filters = this.getDefaultFilters();
+		},
+		onStatusConfirm(e) {
+			this.filters.audit_status = normalizeAuditStatus((e[0] || {}).value);
+		},
+		applyUnitSelectList(list, preserveSelected = true) {
+			const selectedValue = preserveSelected ? this.getUnitSelectValue() : '';
+			const selectedLabel = preserveSelected ? this.getUnitSelectLabel() : '';
+			this.unitSelectList = withSelectedOption(list, selectedValue, selectedLabel);
+		},
+	},
+};

src/pages.json

@@ -915,12 +915,6 @@
 		"backgroundColor": "#ffffff",
 		"borderStyle": "white",
 		"list": [
-			 {
-				"pagePath": "pages/sys/msg/index",
-				"iconPath": "static/aidex/tabbar/msg_1.png",
-				"selectedIconPath": "static/aidex/tabbar/msg_2.png",
-				"text": "消息"
-			},
 			// {
 			// 	"pagePath": "pages/sys/home/index",
 			// 	"iconPath": "static/aidex/tabbar/home_1.png",
@@ -933,12 +927,6 @@
 				"selectedIconPath": "static/aidex/tabbar/apply_2.png",
 				"text": "工作台"
 			},
-			{
-				"pagePath": "pages/sys/book/index",
-				"iconPath": "static/aidex/tabbar/book_1.png",
-				"selectedIconPath": "static/aidex/tabbar/book_2.png",
-				"text": "通讯录"
-			},
 			{
 				"pagePath": "pages/sys/user/index",
 				"iconPath": "static/aidex/tabbar/my_1.png",

src/pages/common/aidex.scss

@@ -58,10 +58,11 @@
 			}
 			
 			.u-cell_title {
+				flex: 1;
+				min-width: 0;
 				overflow: hidden;
 				white-space: nowrap;
 				text-overflow: ellipsis;
-				min-width: 655rpx;
 			}
 			
 			.u-border-bottom:last-child:after {

src/pages/saleship/salepickscandetail.vue

@@ -15,10 +15,22 @@
       <u-form-item>
         <text class="title" style="width: 200px">备注内容：{{ BillRemark }}</text>
       </u-form-item>
+      <PlusBarcodePanel
+        v-if="usePhoneScanFallback"
+        :visible.sync="phoneScanPanelOpen"
+        hint-text="连续扫码配布，扫完可继续下一条"
+        :scan-time-space="1200"
+        @success="onPlusBarcodeSuccess"
+      />
       <u-form-item label-width="130" label="条码资料:">
         <input type="text" v-model="QRBarCode" maxlength="-1" style="width: 170px" @confirm="SalePickBillDetailScan" />
+        <text
+          v-if="usePhoneScanFallback && phoneScanPanelOpen"
+          class="phone-scan-close"
+          @click.stop="handlePhoneScan"
+        >关闭扫码</text>
         <u-icon
-          v-if="usePhoneScanFallback"
+          v-else-if="usePhoneScanFallback"
           name="scan"
           size="44"
           color="#2979ff"
@@ -83,8 +95,10 @@ import util, {
 } from "../../common/util";
 import wybTable from "@/components/wyb-table/wyb-table.vue";
 import scanMixin from "@/common/scanMixin.js";
+import PlusBarcodePanel from "@/components/common/PlusBarcodePanel.vue";
 let that = "";
 export default {
+  components: { PlusBarcodePanel },
   mixins: [scanMixin],
   data() {
     return {
@@ -215,14 +229,17 @@ export default {
 
   methods: {
     handlePhoneScan() {
-      this.openPhoneScan();
+      this.togglePhoneScanPanel();
+    },
+    onPlusBarcodeSuccess(scanResult) {
+      this.handleScanResult(scanResult, this._scanCallback);
     },
 
-    playSuccess() {
+    playSuccess(text) {
-      util.playSuccessAudio();
+      util.playSuccessAudio(text);
     },
-    playError() {
+    playError(text) {
-      util.playErrorAudio();
+      util.playErrorAudio(text);
     },
 
     handleAllCrockNoChange() {
@@ -289,7 +306,7 @@ export default {
     },
     // 添加通用错误提示方法
     showError(message) {
-      this.playError();
+      this.playError(message);
       uni.showModal({
         title: '提示',
         content: message,
@@ -298,7 +315,7 @@ export default {
     },
     // 添加成功提示方法
     showSuccess(message) {
-      this.playSuccess();
+      this.playSuccess(message);
       uni.showToast({
         title: message,
         icon: 'success'
@@ -364,7 +381,6 @@ export default {
 
           if (res.data.code == 0 && res.data.msg == "success") {
             var aResultData = res.data.data;
-            this.playSuccess();
             this.FabricGoodsNo = aResultData.product_code;
             this.FabricGoodsName = aResultData.product_name;
             this.GoodsCodeNo = aResultData.product_color_code;
@@ -401,7 +417,7 @@ export default {
     // 提交按钮方法
     submitBtnFun: function () {
       if (this.BillMasterID == 0) {
-        this.playError();
+        this.playError("单号为空，不能提交");
         this.BillDataMessage = "单号为空，不能提交";
         return;
       }
@@ -438,15 +454,15 @@ export default {
         console.log('outFpmArrangeOrder res', res)
         if (res) {
           this.BillDataMessage = "成功生成出仓单！";
-          this.playSuccess();
+          this.playSuccess("提交成功");
         } else {
-          this.playError();
+          this.playError("提交生成出仓单出错");
           this.BillDataMessage = "提交生成出仓单出错！" + res.msg;
           return;
         }
       }).catch(error => {
         this.submitLoading = false
-        this.playError();
+        this.playError("连接服务器出错");
         this.BillDataMessage = "连接服务器出错，请检查后台服务是否启动！";
       });
     },
@@ -455,6 +471,18 @@ export default {
 </script>
 
 <style>
+.phone-scan-close {
+  margin-left: 8px;
+  padding: 0 12px;
+  height: 36px;
+  line-height: 36px;
+  border: 1px solid #2979ff;
+  border-radius: 4px;
+  color: #2979ff;
+  background: #eaf2ff;
+  font-size: 34rpx;
+  white-space: nowrap;
+}
 page {
   background-color: #f8f8f8;
   padding-bottom: 260rpx;

src/pages/storefabric/storeFabricBusinessOutAdd.vue

@@ -2,18 +2,12 @@
 
 	<view class="fabric-out-page">
 
+		<OrderHeaderFold v-model="headerCollapsed" :summary="form.order_no || '保存后自动生成'">
+
 		<OrderStatusBar class="fabric-out-mt32" :status="displayAuditStatus" :name="displayAuditStatusName" />
 
 
 
-		<view class="flex-white-plr26 ptb10 bdb_f5">
-
-			<text class="mr26">出仓单号</text>
-
-			<u-input disabled placeholder="保存后自动生成" v-model="form.order_no" />
-
-		</view>
-
 		<view class="flex-white-plr26 ptb20 bdb_f5">
 
 			<text class="mr26">出仓类型</text>
@@ -60,6 +54,8 @@
 
 		</view>
 
+		</OrderHeaderFold>
+
 
 
 		<FabricOutDetailList
@@ -72,6 +68,13 @@
 
 		>
 
+			<PlusBarcodePanel
+				slot="before-list"
+				:visible.sync="phoneScanPanelOpen"
+				hint-text="连续扫码出仓，扫完可继续下一条"
+				:scan-time-space="1200"
+				@success="onPlusBarcodeSuccess"
+			/>
 			<FabricOutScanBar
 				slot="before-list"
 				:can-scan="canScan"
@@ -80,6 +83,7 @@
 				:message="BillDataMessage"
 				disabled-tip="请先提交保存后再扫码"
 				:show-phone-scan="usePhoneScanFallback"
+				:scanning="phoneScanPanelOpen"
 				@input="QRBarCode = $event"
 				@scan="handleScan"
 				@phone-scan="handlePhoneScan"
@@ -144,6 +148,8 @@ import FineCodePopup from '@/components/storefabric/FineCodePopup.vue';
 
 import OrderStatusBar from '@/components/storefabric/OrderStatusBar.vue';
 
+import OrderHeaderFold from '@/components/storefabric/OrderHeaderFold.vue';
+
 import FabricOutDetailList from '@/components/storefabric/FabricOutDetailList.vue';
 
 import FabricOutScanBar from '@/components/storefabric/FabricOutScanBar.vue';
@@ -152,18 +158,24 @@ import FabricOutScanDetail from '@/components/storefabric/FabricOutScanDetail.vu
 
 import FabricOutFooter from '@/components/storefabric/FabricOutFooter.vue';
 
+import PlusBarcodePanel from '@/components/common/PlusBarcodePanel.vue';
+
 
 
 export default {
 
 	components: {
 
+		PlusBarcodePanel,
+
 		FabricInfoPopup,
 
 		FineCodePopup,
 
 		OrderStatusBar,
 
+		OrderHeaderFold,
+
 		FabricOutDetailList,
 
 		FabricOutScanBar,

src/pages/storefabric/storeFabricBusinessOutEdit.vue

@@ -1,11 +1,7 @@
 <template>
 	<view class="fabric-out-page">
+		<OrderHeaderFold v-model="headerCollapsed" :summary="form.order_no">
 		<OrderStatusBar class="fabric-out-mt32" :status="displayAuditStatus" :name="displayAuditStatusName" />
-
-		<view class="flex-white-plr26 ptb10 bdb_f5">
-			<text class="mr26">出仓单号</text>
-			<text>{{ form.order_no }}</text>
-		</view>
 		<view class="flex-white-plr26 ptb20 bdb_f5">
 			<text class="mr26">出仓类型</text>
 			<text>{{ getBillTypeName() }}</text>
@@ -22,12 +18,20 @@
 			<text class="mr26">单据备注</text>
 			<text>{{ form.remark || '-' }}</text>
 		</view>
+		</OrderHeaderFold>
 
 		<FabricOutDetailList
 			:list="form.item_data"
 			@fabric-info="openFabricInfo"
 			@fine-code="openFineCode"
 		>
+			<PlusBarcodePanel
+				slot="before-list"
+				:visible.sync="phoneScanPanelOpen"
+				hint-text="连续扫码出仓，扫完可继续下一条"
+				:scan-time-space="1200"
+				@success="onPlusBarcodeSuccess"
+			/>
 			<FabricOutScanBar
 				slot="before-list"
 				:can-scan="canScan"
@@ -35,6 +39,7 @@
 				:delete-mode="BarCodeDelStatus"
 				:message="BillDataMessage"
 				:show-phone-scan="usePhoneScanFallback"
+				:scanning="phoneScanPanelOpen"
 				@input="QRBarCode = $event"
 				@scan="handleScan"
 				@phone-scan="handlePhoneScan"
@@ -62,22 +67,31 @@ import formMixin from './storeFabricBusinessOutMixin.js';
 import FabricInfoPopup from '@/components/storefabric/FabricInfoPopup.vue';
 import FineCodePopup from '@/components/storefabric/FineCodePopup.vue';
 import OrderStatusBar from '@/components/storefabric/OrderStatusBar.vue';
+import OrderHeaderFold from '@/components/storefabric/OrderHeaderFold.vue';
 import FabricOutDetailList from '@/components/storefabric/FabricOutDetailList.vue';
 import FabricOutScanBar from '@/components/storefabric/FabricOutScanBar.vue';
 import FabricOutScanDetail from '@/components/storefabric/FabricOutScanDetail.vue';
 import FabricOutFooter from '@/components/storefabric/FabricOutFooter.vue';
+import PlusBarcodePanel from '@/components/common/PlusBarcodePanel.vue';
 
 export default {
 	components: {
+		PlusBarcodePanel,
 		FabricInfoPopup,
 		FineCodePopup,
 		OrderStatusBar,
+		OrderHeaderFold,
 		FabricOutDetailList,
 		FabricOutScanBar,
 		FabricOutScanDetail,
 		FabricOutFooter,
 	},
 	mixins: [formMixin],
+	data() {
+		return {
+			headerCollapsed: true,
+		};
+	},
 	onLoad(e) {
 		uni.setNavigationBarTitle({ title: '编辑坯布出仓单' });
 		this.pageMode = 'edit';

src/pages/storefabric/storeFabricBusinessOutList.vue

@@ -1,9 +1,28 @@
 <template>
 	<view>
 		<view class="filterBar">
-			<u-search v-model="filters.order_no" placeholder="出仓单号" :show-action="false" @search="loadList" @custom="loadList" />
+			<u-search
-			<view class="filterBtn" @click="filterShow = true">
+				v-model="filters.order_no"
-				<u-icon name="list" size="40" color="#666"></u-icon>
+				placeholder="出仓单号"
+				:show-action="false"
+				@search="applySearch"
+				@custom="applySearch"
+				@clear="applySearch"
+			/>
+			<view
+				class="filterBtn"
+				:class="{ 'filter-active': hasActiveFilter }"
+				@click="filterShow = true"
+			>
+				<view class="filterBtn__icon">
+					<u-icon
+						:key="hasActiveFilter ? 'on' : 'off'"
+						name="list"
+						size="44"
+						:color="hasActiveFilter ? '#2979ff' : '#666'"
+					></u-icon>
+					<view v-if="hasActiveFilter" class="filterBtn__badge"></view>
+				</view>
 				<text>筛选</text>
 			</view>
 		</view>
@@ -20,22 +39,34 @@
 
 		<addBtn url="./storeFabricBusinessOutAdd"></addBtn>
 
-		<u-popup v-model="filterShow" mode="right" width="580rpx" :safe-area-inset-bottom="true">
+		<u-popup v-model="filterShow" mode="right" width="580rpx" :safe-area-inset-bottom="true" @close="cancelFilterEdit">
 			<view class="filterPanel">
 				<view class="filterTitle">筛选条件</view>
 				<view class="filterItem">
 					<text class="filterLabel">出仓单号</text>
-					<u-input v-model="filters.order_no" placeholder="请输入出仓单号" />
+					<view class="filterInput">
+						<u-input
+							v-model="filters.order_no"
+							placeholder="请输入出仓单号"
+							:height="100"
+							:custom-style="{ fontSize: '36rpx', color: '#202328' }"
+							placeholder-style="color: #aeb4bf; font-size: 34rpx;"
+						/>
+					</view>
 				</view>
 				<view class="filterItem">
 					<text class="filterLabel">出仓日期</text>
 					<view class="dateRow">
-						<picker mode="date" :value="filters.start_date" @change="e => filters.start_date = e.detail.value">
+						<picker class="datePicker" mode="date" :value="filters.start_date" @change="e => filters.start_date = e.detail.value">
-							<view class="dateInput">{{ filters.start_date || '开始日期' }}</view>
+							<view class="dateInput" :class="{ 'dateInput--placeholder': !filters.start_date }">
+								{{ filters.start_date || '开始日期' }}
+							</view>
 						</picker>
-						<text>~</text>
+						<text class="dateSeparator">~</text>
-						<picker mode="date" :value="filters.end_date" @change="e => filters.end_date = e.detail.value">
+						<picker class="datePicker" mode="date" :value="filters.end_date" @change="e => filters.end_date = e.detail.value">
-							<view class="dateInput">{{ filters.end_date || '结束日期' }}</view>
+							<view class="dateInput" :class="{ 'dateInput--placeholder': !filters.end_date }">
+								{{ filters.end_date || '结束日期' }}
+							</view>
 						</picker>
 					</view>
 				</view>
@@ -45,11 +76,11 @@
 <!--				</view>-->
 				<view class="filterItem" @click="openBusinessUnitSelect">
 					<text class="filterLabel">染厂</text>
-					<view class="filterValue">{{ businessUnitLabel || '全部' }} <u-icon name="arrow-right" size="28"></u-icon></view>
+					<view class="filterValue">{{ businessUnitLabel || '全部' }} <u-icon name="arrow-right" size="36"></u-icon></view>
 				</view>
 				<view class="filterItem" @click="openStatusSelect">
 					<text class="filterLabel">订单状态</text>
-					<view class="filterValue">{{ statusLabel || '全部' }} <u-icon name="arrow-right" size="28"></u-icon></view>
+					<view class="filterValue">{{ statusLabel || '全部' }} <u-icon name="arrow-right" size="36"></u-icon></view>
 				</view>
 				<view class="filterActions">
 					<u-button type="warning" size="medium" @click="resetFilter">重置</u-button>
@@ -58,8 +89,25 @@
 			</view>
 		</u-popup>
 
-		<u-select v-model="statusSelectShow" :list="statusSelectList" @confirm="onStatusConfirm"></u-select>
+		<u-select
-		<u-select v-model="unitSelectShow" :list="unitSelectList" remote :loading="selectSearching" @search="onUnitSearch" @confirm="onUnitConfirm"></u-select>
+			class="pdaSelect"
+			v-model="statusSelectShow"
+			title="选择订单状态"
+			:list="statusSelectList"
+			:default-value="statusSelectDefault"
+			@confirm="onStatusConfirm"
+		></u-select>
+		<u-select
+			class="pdaSelect"
+			v-model="unitSelectShow"
+			title="选择染厂"
+			:list="unitSelectList"
+			:default-value="unitSelectDefault"
+			remote
+			:loading="selectSearching"
+			@search="onUnitSearch"
+			@confirm="onUnitConfirm"
+		></u-select>
 	</view>
 </template>
 
@@ -68,6 +116,7 @@ import addBtn from '@/components/addBtn/addBtn.vue';
 import FabricOutItem from '@/components/card/storeFabricBusinessOutItem.vue';
 import {
 	getStatusOptions,
+	AUDIT_STATUS,
 	AUDIT_STATUS_MAP,
 	BILL_TYPES,
 	BUSINESS_UNIT_TYPE_DYE_FACTORY,
@@ -77,6 +126,45 @@ import {
 } from '@/common/storeFabricBusinessOut';
 import { withNameParam } from '@/common/remoteSelect';
 
+const FILTER_STORAGE_KEY = 'storeFabricBusinessOutListFilters_v2';
+
+const hasFilterValue = (value) => value !== '' && value !== null && value !== undefined;
+
+const normalizeAuditStatus = (value) => {
+	if (!hasFilterValue(value)) return '';
+	const status = Number(value);
+	return Number.isNaN(status) ? '' : status;
+};
+
+const createDefaultFilters = () => ({
+	order_no: '',
+	start_date: '',
+	end_date: '',
+	delivery_unit_id: '',
+	delivery_unit_name: '',
+	business_unit_id: '',
+	business_unit_name: '',
+	audit_status: AUDIT_STATUS.PENDING,
+});
+
+const normalizeFilters = (value) => {
+	const filters = createDefaultFilters();
+	if (!value || typeof value !== 'object' || Array.isArray(value)) return filters;
+
+	Object.keys(filters).forEach((key) => {
+		if (key === 'audit_status') return;
+		if (typeof value[key] === 'string' || typeof value[key] === 'number') {
+			filters[key] = value[key];
+		}
+	});
+	if (!filters.delivery_unit_id) filters.delivery_unit_name = '';
+	if (!filters.business_unit_id) filters.business_unit_name = '';
+	if (Object.prototype.hasOwnProperty.call(value, 'audit_status')) {
+		filters.audit_status = normalizeAuditStatus(value.audit_status);
+	}
+	return filters;
+};
+
 export default {
 	components: { addBtn, FabricOutItem },
 	data() {
@@ -95,16 +183,8 @@ export default {
 			unitSearchSeq: 0,
 			unitSelectList: [{ value: '', label: '全部' }],
 			billTypeName: (BILL_TYPES[0] || {}).label || '坯布其他出货单',
-			filters: {
+			filters: createDefaultFilters(),
-				order_no: '',
+			appliedFilters: createDefaultFilters(),
-				start_date: '',
-				end_date: '',
-				delivery_unit_id: '',
-				delivery_unit_name: '',
-				business_unit_id: '',
-				business_unit_name: '',
-				audit_status: '',
-			},
 			statusSelectList: [
 				{ value: '', label: '全部' },
 				...getStatusOptions(),
@@ -122,20 +202,85 @@ export default {
 		businessUnitLabel() {
 			return this.filters.business_unit_name || '';
 		},
+		statusSelectDefault() {
+			const index = this.statusSelectList.findIndex(
+				(item) => String(item.value) === String(this.filters.audit_status)
+			);
+			return [index >= 0 ? index : 0];
+		},
+		unitSelectDefault() {
+			const selectedValue = this.unitSelectType === 'delivery'
+				? this.filters.delivery_unit_id
+				: this.filters.business_unit_id;
+			const index = this.unitSelectList.findIndex(
+				(item) => String(item.value) === String(selectedValue)
+			);
+			return [index >= 0 ? index : 0];
+		},
+		hasActiveFilter() {
+			const filters = this.appliedFilters || {};
+			return Boolean(
+				String(filters.order_no || '').trim()
+				|| filters.start_date
+				|| filters.end_date
+				|| filters.delivery_unit_id
+				|| filters.business_unit_id
+				|| hasFilterValue(filters.audit_status)
+			);
+		},
 	},
 	onLoad() {
 		uni.setNavigationBarTitle({ title: '坯布出库列表' });
+		this.restoreFilterCache();
 		uni.getSystemInfo({
 			success: (res) => {
 				this.scrollHeight = `${res.windowHeight - 50}px`;
 			},
 		});
-		this.loadList();
 	},
 	onShow() {
 		this.loadList();
 	},
 	methods: {
+		restoreFilterCache() {
+			try {
+				const cached = uni.getStorageSync(FILTER_STORAGE_KEY);
+				if (!cached || typeof cached !== 'object' || Array.isArray(cached)) {
+					const filters = createDefaultFilters();
+					this.filters = { ...filters };
+					this.appliedFilters = { ...filters };
+					this.saveFilterCache();
+					return;
+				}
+				const filters = normalizeFilters(cached);
+				this.filters = { ...filters };
+				this.appliedFilters = { ...filters };
+			} catch (e) {
+				const filters = createDefaultFilters();
+				this.filters = { ...filters };
+				this.appliedFilters = { ...filters };
+			}
+		},
+		saveFilterCache() {
+			try {
+				uni.setStorageSync(FILTER_STORAGE_KEY, { ...this.appliedFilters });
+			} catch (e) {
+				// 缓存失败不影响列表筛选
+			}
+		},
+		commitFilters() {
+			const filters = normalizeFilters(this.filters);
+			this.filters = { ...filters };
+			this.appliedFilters = { ...filters };
+			this.saveFilterCache();
+			this.loadList();
+		},
+		applySearch() {
+			this.commitFilters();
+		},
+		cancelFilterEdit() {
+			this.filters = { ...this.appliedFilters };
+		},
 		loadDeliveryUnitOptions() {
 			if (this.deliveryUnitOptions.length) return Promise.resolve(this.deliveryUnitOptions);
 			return this.$u.api.businessUnit.list({})
@@ -160,8 +305,23 @@ export default {
 					return this.businessUnitOptions;
 				});
 		},
-		applyUnitSelectList(list) {
+		applyUnitSelectList(list, preserveSelected = true) {
 			const rows = Array.isArray(list) ? list.slice() : [];
+			if (preserveSelected) {
+				const isDelivery = this.unitSelectType === 'delivery';
+				const selectedValue = isDelivery
+					? this.filters.delivery_unit_id
+					: this.filters.business_unit_id;
+				const selectedLabel = isDelivery
+					? this.filters.delivery_unit_name
+					: this.filters.business_unit_name;
+				const selectedExists = rows.some(
+					(item) => String(item.value) === String(selectedValue)
+				);
+				if (selectedValue !== '' && selectedValue !== null && selectedValue !== undefined && !selectedExists) {
+					rows.unshift({ value: selectedValue, label: selectedLabel || String(selectedValue) });
+				}
+			}
 			this.unitSelectList = [{ value: '', label: '全部' }].concat(rows);
 		},
 		openUnitSelect(type) {
@@ -184,7 +344,7 @@ export default {
 						if (isDelivery) this.deliveryUnitOptions = list;
 						else this.businessUnitOptions = list;
 					}
-					this.applyUnitSelectList(list);
+					this.applyUnitSelectList(list, empty);
 				})
 				.catch((e) => {
 					if (seq !== this.unitSearchSeq) return;
@@ -213,10 +373,11 @@ export default {
 			}
 		},
 		loadList() {
+			const filters = this.appliedFilters;
 			const params = {};
-			if (this.filters.order_no) params.order_no = this.filters.order_no;
+			if (filters.order_no) params.order_no = filters.order_no;
-			if (this.filters.audit_status !== '' && this.filters.audit_status !== null) {
+			if (hasFilterValue(filters.audit_status)) {
-				params.audit_status = this.filters.audit_status;
+				params.audit_status = filters.audit_status;
 			}
 			fetchAllOrderList((p) => this.$u.api.gfmOtherDeliveryOrder.list(p), params)
 				.then((rows) => {
@@ -250,12 +411,13 @@ export default {
 		},
 		// 后端列表仅支持 单号/状态 过滤，出仓日期与单位在前端做本地过滤
 		matchClientFilter(item) {
-			if (this.filters.start_date && item.out_date < this.filters.start_date) return false;
+			const filters = this.appliedFilters;
-			if (this.filters.end_date && item.out_date > this.filters.end_date) return false;
+			if (filters.start_date && item.out_date < filters.start_date) return false;
-			if (this.filters.delivery_unit_id && String(item.delivery_unit_id) !== String(this.filters.delivery_unit_id)) {
+			if (filters.end_date && item.out_date > filters.end_date) return false;
+			if (filters.delivery_unit_id && String(item.delivery_unit_id) !== String(filters.delivery_unit_id)) {
 				return false;
 			}
-			if (this.filters.business_unit_id && String(item.business_unit_id) !== String(this.filters.business_unit_id)) {
+			if (filters.business_unit_id && String(item.business_unit_id) !== String(filters.business_unit_id)) {
 				return false;
 			}
 			return true;
@@ -268,37 +430,20 @@ export default {
 			uni.navigateTo({ url: `./storeFabricBusinessOutView?id=${item.id}` });
 		},
 		openStatusSelect() { this.statusSelectShow = true; },
-		onStatusConfirm(e) { this.filters.audit_status = e[0].value; },
+		onStatusConfirm(e) {
+			this.filters.audit_status = normalizeAuditStatus((e[0] || {}).value);
+		},
 		resetFilter() {
-			this.filters = {
+			this.filters = createDefaultFilters();
-				order_no: '',
-				start_date: '',
-				end_date: '',
-				delivery_unit_id: '',
-				delivery_unit_name: '',
-				business_unit_id: '',
-				business_unit_name: '',
-				audit_status: '',
-			};
 		},
 		applyFilter() {
+			this.commitFilters();
 			this.filterShow = false;
-			this.loadList();
 		},
 	},
 };
 </script>
 
-<style>
+<style lang="scss">
-page { background-color: #F8F8F8; }
+@import '@/common/list-filter.scss';
-.filterBar { display: flex; align-items: center; padding: 16rpx 20rpx; background: #fff; gap: 16rpx; }
-.filterBtn { display: flex; flex-direction: column; align-items: center; font-size: 22rpx; color: #666; min-width: 80rpx; }
-.filterPanel { padding: 30rpx; }
-.filterTitle { font-size: 32rpx; font-weight: bold; margin-bottom: 30rpx; }
-.filterItem { margin-bottom: 24rpx; }
-.filterLabel { display: block; font-size: 28rpx; color: #666; margin-bottom: 12rpx; }
-.filterValue { display: flex; align-items: center; justify-content: space-between; padding: 16rpx; background: #f5f5f5; border-radius: 8rpx; font-size: 28rpx; }
-.dateRow { display: flex; align-items: center; gap: 12rpx; }
-.dateInput { padding: 16rpx; background: #f5f5f5; border-radius: 8rpx; font-size: 26rpx; min-width: 200rpx; text-align: center; }
-.filterActions { display: flex; gap: 20rpx; margin-top: 40rpx; }
 </style>

src/pages/storefabric/storeFabricBusinessOutMixin.js

@@ -10,6 +10,7 @@
  */
 import util from '@/common/util';
 import scanMixin from '@/common/scanMixin.js';
+import PlusBarcodePanel from '@/components/common/PlusBarcodePanel.vue';
 import remoteSelectMixin from '@/common/remoteSelectMixin.js';
 import { withNameParam } from '@/common/remoteSelect';
 import { initTts, speak } from '@/common/tts.js';
@@ -38,6 +39,7 @@ import {
 } from '@/common/storeFabricBusinessOut';
 
 export default {
+	components: { PlusBarcodePanel },
 	mixins: [scanMixin, remoteSelectMixin],
 	data() {
 		return {
@@ -45,6 +47,7 @@ export default {
 			orderId: 0,
 			form: this.getEmptyForm(),
 			headerSaved: false,
+			headerCollapsed: false,
 			selectShow: false,
 			selectList: [],
 			selectType: '',
@@ -114,7 +117,15 @@ export default {
 	},
 	methods: {
 		handlePhoneScan() {
-			this.openPhoneScan();
+			if (!this.canScan) {
+				this.showError('请先提交保存后再扫码');
+				return;
+			}
+			this.togglePhoneScanPanel();
+		},
+		onPlusBarcodeSuccess(scanResult) {
+			this.QRBarCode = String(scanResult || '').trim().replace(/[\r\n]/g, '');
+			return this.handleScan();
 		},
 		registerOrderScanBroadcast() {
 			this.registerScanBroadcast((scanResult) => {
@@ -126,6 +137,7 @@ export default {
 			const nextCanScan = this.isEditable && canScanAtStatus(status);
 			if (this.canScan && !nextCanScan) {
 				this.unregisterScanBroadcast();
+				this.closePhoneScanPanel();
 			}
 			this.canScan = nextCanScan;
 		},
@@ -183,6 +195,7 @@ export default {
 					this.orderId = order.id;
 					this.auditStatus = order.audit_status;
 					this.headerSaved = true;
+					this.headerCollapsed = true;
 					this.form = orderToFormFields(order);
 					this.refreshScanDetailTotals(order);
 					this.syncCanScanFromStatus(order.audit_status);
@@ -247,8 +260,9 @@ export default {
 					const order = normalizeOrder(detail);
 					this.applyOrder(order);
 					this.headerSaved = true;
+					this.headerCollapsed = true;
 					this.syncCanScanFromStatus(order.audit_status);
-					this.showSuccess('保存成功，可以扫码');
+					this.showSuccess('保存成功，可以扫码', '保存成功', { voiceOnly: true });
 					this.registerOrderScanBroadcast();
 				})
 				.catch((e) => {
@@ -349,8 +363,8 @@ export default {
 					uni.hideLoading();
 					const message = e.message || (scanType === 2 ? '删除失败' : '扫码失败');
 					const mismatchVoice = resolveScanMismatchVoice(message);
-					if (mismatchVoice) speak(mismatchVoice);
+					speak(mismatchVoice || (scanType === 2 ? '删除失败' : '扫码失败'));
-					this.showError(message, { skipErrorAudio: !!mismatchVoice });
+					uni.showToast({ title: message, icon: 'none', duration: 2500 });
 					this.QRBarCode = '';
 				});
 		},
@@ -390,16 +404,16 @@ export default {
 						if (!order) return;
 						this.applyOrder(order);
 						this.syncCanScanFromStatus(order.audit_status);
-						this.showSuccess('操作成功');
+						this.showSuccess(util.statusSuccessVoice(action));
 					}),
 			});
 		},
 		showError(message, options = {}) {
-			if (!options.skipErrorAudio) util.playErrorAudio();
+			if (!options.skipErrorAudio) util.playErrorAudio(message);
 			uni.showModal({ title: '提示', content: message, showCancel: false });
 		},
-		showSuccess(message) {
+		showSuccess(message, voiceText, options) {
-			util.playSuccessAudio();
+			util.playSuccessAudio(voiceText || message, options);
 			uni.showToast({ title: message, icon: 'success' });
 		},
 		getBillTypeName() {

src/pages/storefabric/storeFabricBusinessOutView.vue

@@ -1,11 +1,7 @@
 <template>
 	<view class="fabric-out-page">
+		<OrderHeaderFold v-model="headerCollapsed" :summary="order.order_no">
 		<OrderStatusBar class="fabric-out-mt32" :status="order.audit_status" :name="order.audit_status_name" />
-
-		<view class="flex-white-plr26 ptb10 bdb_f5">
-			<text class="mr26">出仓单号</text>
-			<text>{{ order.order_no }}</text>
-		</view>
 		<view class="flex-white-plr26 ptb20 bdb_f5">
 			<text class="mr26">出仓类型</text>
 			<text>{{ billTypeName }}</text>
@@ -25,6 +21,7 @@
 		<view v-if="order.auditer_name" class="flex-white-plr26 ptb20 bdb_f5">
 			<text class="mr26">审核人</text><text>{{ order.auditer_name }} {{ formatTime(order.audit_time, 'YYYY-MM-DD') }}</text>
 		</view>
+		</OrderHeaderFold>
 
 		<FabricOutDetailList
 			:title="detailTitle"
@@ -45,6 +42,7 @@ import util from '@/common/util';
 import FabricInfoPopup from '@/components/storefabric/FabricInfoPopup.vue';
 import FineCodePopup from '@/components/storefabric/FineCodePopup.vue';
 import OrderStatusBar from '@/components/storefabric/OrderStatusBar.vue';
+import OrderHeaderFold from '@/components/storefabric/OrderHeaderFold.vue';
 import FabricOutDetailList from '@/components/storefabric/FabricOutDetailList.vue';
 import FabricOutFooter from '@/components/storefabric/FabricOutFooter.vue';
 import {
@@ -56,9 +54,10 @@ import {
 } from '@/common/storeFabricBusinessOut';
 
 export default {
-	components: { FabricInfoPopup, FineCodePopup, OrderStatusBar, FabricOutDetailList, FabricOutFooter },
+	components: { FabricInfoPopup, FineCodePopup, OrderStatusBar, OrderHeaderFold, FabricOutDetailList, FabricOutFooter },
 	data() {
 		return {
+			headerCollapsed: true,
 			orderId: 0,
 			order: {},
 			billTypeName: (BILL_TYPES[0] || {}).label || '坯布其他出货单',
@@ -118,18 +117,25 @@ export default {
 			confirmOrderStatusAction(this, {
 				orderId: this.orderId,
 				action,
-				onSuccess: () => this.$u.api.gfmOtherDeliveryOrder.detail({ id: this.orderId })
+				onSuccess: () => {
-					.then((res) => {
+					uni.hideLoading();
-						uni.hideLoading();
+					const voice = util.statusSuccessVoice(action);
-						const order = normalizeOrder(res);
+					util.playSuccessAudio(voice);
-						if (order) this.order = order;
+					uni.showToast({ title: voice, icon: 'success' });
-						util.playSuccessAudio();
+					if (action === 'unapprove') {
-						uni.showToast({ title: '操作成功', icon: 'success' });
+						uni.redirectTo({ url: `./storeFabricBusinessOutEdit?id=${this.orderId}` });
-					}),
+						return;
+					}
+					return this.$u.api.gfmOtherDeliveryOrder.detail({ id: this.orderId })
+						.then((res) => {
+							const order = normalizeOrder(res);
+							if (order) this.order = order;
+						});
+				},
 			});
 		},
 		showError(message) {
-			util.playErrorAudio();
+			util.playErrorAudio(message);
 			uni.showModal({ title: '提示', content: message, showCancel: false });
 		},
 	},

src/pages/storegoods/storeGoodsBusinessCheckAdd.vue

@@ -29,10 +29,22 @@
 				</view>
 				<u-input v-model="Remark" maxlength="-1" type="textarea" :border="true" :height="100" :auto-height="true" />
 			</view>
+			<PlusBarcodePanel
+				v-if="usePhoneScanFallback"
+				:visible.sync="phoneScanPanelOpen"
+				hint-text="连续扫码盘点，扫完可继续下一条"
+				:scan-time-space="1200"
+				@success="onPlusBarcodeSuccess"
+			/>
 			<u-form-item label-width="150" label="条码资料:">
 				<input type="text" maxlength="-1" v-model="QRBarCode" style="width:200px;" @confirm="GoodsCheckBillDetailScan" />
+				<text
+					v-if="usePhoneScanFallback && phoneScanPanelOpen"
+					class="phone-scan-close"
+					@click.stop="handlePhoneScan"
+				>关闭扫码</text>
 				<u-icon
-					v-if="usePhoneScanFallback"
+					v-else-if="usePhoneScanFallback"
 					name="scan"
 					size="44"
 					color="#2979ff"
@@ -106,8 +118,10 @@
 		playErrorAudio
 	} from '../../common/util';
 	import scanMixin from '@/common/scanMixin.js';
+	import PlusBarcodePanel from '@/components/common/PlusBarcodePanel.vue';
 	import wybTable from '@/components/wyb-table/wyb-table.vue';
 	export default {
+		components: { PlusBarcodePanel },
 		mixins: [scanMixin],
 		data() {
 			return {
@@ -245,12 +259,31 @@
 		},
 		methods: {
 			handlePhoneScan() {
-				this.openPhoneScan();
+				this.togglePhoneScanPanel();
+			},
+			onPlusBarcodeSuccess(scanResult) {
+				const code = String(scanResult || '').replace(/\s+/g, '').replace(/[\r\n]/g, '');
+				if (!code) return;
+				if (!this.StoreName) {
+					this.showError('请先选择仓库');
+					return;
+				}
+				if (!this.StoreStationNo) {
+					this.StoreStationNo = code;
+					this.$nextTick(() => this.GetStoreStationName());
+					return;
+				}
+				if (!this.GoodsCheckBillID) {
+					this.showError('请先提交');
+					return;
+				}
+				this.QRBarCode = code;
+				this.$nextTick(() => this.GoodsCheckBillDetailScan());
 			},
 
 			// 添加通用错误提示方法
 			showError(message) {
-				this.playError();
+				this.playError(message);
 				uni.showModal({
 					title: '提示',
 					content: message,
@@ -260,7 +293,7 @@
 
 			// 添加成功提示方法
 			showSuccess(message) {
-				this.playSuccess();
+				this.playSuccess(message);
 				uni.showToast({
 					title: message,
 					icon: 'success'
@@ -269,11 +302,11 @@
 
 			
 			
-			playSuccess() {
+			playSuccess(text) {
-				util.playSuccessAudio();
+				util.playSuccessAudio(text);
 			},
-			playError() {
+			playError(text) {
-				util.playErrorAudio();
+				util.playErrorAudio(text);
 			},
 
 			BarCodeDelChange: function() {
@@ -692,6 +725,18 @@
 </script>
 
 <style>
+.phone-scan-close {
+	margin-left: 8px;
+	padding: 0 12px;
+	height: 36px;
+	line-height: 36px;
+	border: 1px solid #2979ff;
+	border-radius: 4px;
+	color: #2979ff;
+	background: #eaf2ff;
+	font-size: 34rpx;
+	white-space: nowrap;
+}
 	page {
 		background-color: #F8F8F8;
 		padding-bottom: 260rpx;

src/pages/storegoods/storeGoodsBusinessCheckDetail.vue

@@ -9,11 +9,23 @@
 				<text class="title" style="width:200px;">仓库名称：{{ StoreName }}</text>
 				<text class="title" style="width:200px;">仓位名称：{{ StoreStationName }}</text>
 			</u-form-item>
+			<PlusBarcodePanel
+				v-if="usePhoneScanFallback"
+				:visible.sync="phoneScanPanelOpen"
+				hint-text="连续扫码盘点，扫完可继续下一条"
+				:scan-time-space="1200"
+				@success="onPlusBarcodeSuccess"
+			/>
 			<u-form-item label-width="150" label="条码资料:">
 				<input type="text" v-model="QRBarCode" maxlength="-1" style="width:200px;"
 					@confirm="GoodsCheckBillDetailScan" />
+				<text
+					v-if="usePhoneScanFallback && phoneScanPanelOpen"
+					class="phone-scan-close"
+					@click.stop="handlePhoneScan"
+				>关闭扫码</text>
 				<u-icon
-					v-if="usePhoneScanFallback"
+					v-else-if="usePhoneScanFallback"
 					name="scan"
 					size="44"
 					color="#2979ff"
@@ -78,9 +90,11 @@ import util, {
 	playErrorAudio
 } from '../../common/util';
 import scanMixin from '@/common/scanMixin.js';
+import PlusBarcodePanel from '@/components/common/PlusBarcodePanel.vue';
 import wybTable from '@/components/wyb-table/wyb-table.vue';
 //let that = '';
 export default {
+	components: { PlusBarcodePanel },
 	mixins: [scanMixin],
 	data() {
 		return {
@@ -178,12 +192,15 @@ export default {
 	},
 	methods: {
 		handlePhoneScan() {
-			this.openPhoneScan();
+			this.togglePhoneScanPanel();
+		},
+		onPlusBarcodeSuccess(scanResult) {
+			this.handleScanResult(scanResult, this._scanCallback);
 		},
 
 		// 添加通用错误提示方法
 		showError(message) {
-			this.playError();
+			this.playError(message);
 			uni.showModal({
 				title: '提示',
 				content: message,
@@ -191,11 +208,11 @@ export default {
 			});
 		},
 
-		playSuccess() {
+		playSuccess(text) {
-			util.playSuccessAudio();
+			util.playSuccessAudio(text);
 		},
-		playError() {
+		playError(text) {
-			util.playErrorAudio();
+			util.playErrorAudio(text);
 		},
 
 		BarCodeDelChange: function () {
@@ -375,6 +392,18 @@ export default {
 </script>
 
 <style>
+.phone-scan-close {
+	margin-left: 8px;
+	padding: 0 12px;
+	height: 36px;
+	line-height: 36px;
+	border: 1px solid #2979ff;
+	border-radius: 4px;
+	color: #2979ff;
+	background: #eaf2ff;
+	font-size: 34rpx;
+	white-space: nowrap;
+}
 page {
 	background-color: #F8F8F8;
 	padding-bottom: 260rpx;

src/pages/storegoods/storeGoodsBusinessStationMoveOnly.vue

@@ -23,11 +23,23 @@
 					<checkbox ref="checkBoxRef" :checked="AllStoreStationScanStatus">整架</checkbox>
 				</checkbox-group>
 			</u-form-item>
+			<PlusBarcodePanel
+				v-if="usePhoneScanFallback"
+				:visible.sync="phoneScanPanelOpen"
+				hint-text="连续扫码移仓，扫完可继续下一条"
+				:scan-time-space="1200"
+				@success="onPlusBarcodeSuccess"
+			/>
 			<u-form-item label-width="150" label="条码资料:" :class="{ 'input-highlight': shouldHighlightQR }">
 				<input type="text" v-model="QRBarCode" maxlength="-1" style="width:150px;"
 					@confirm="GoodsStoreStationMoveScan" />
+				<text
+					v-if="usePhoneScanFallback && phoneScanPanelOpen"
+					class="phone-scan-close"
+					@click.stop="handlePhoneScan"
+				>关闭扫码</text>
 				<u-icon
-					v-if="usePhoneScanFallback"
+					v-else-if="usePhoneScanFallback"
 					name="scan"
 					size="44"
 					color="#2979ff"
@@ -83,7 +95,9 @@ import util, {
 } from '../../common/util';
 import wybTable from '@/components/wyb-table/wyb-table.vue';
 import scanMixin from '@/common/scanMixin.js';
+import PlusBarcodePanel from '@/components/common/PlusBarcodePanel.vue';
 export default {
+	components: { PlusBarcodePanel },
 	mixins: [scanMixin],
 	data() {
 		return {
@@ -183,14 +197,17 @@ export default {
 	},
 	methods: {
 		handlePhoneScan() {
-			this.openPhoneScan();
+			this.togglePhoneScanPanel();
+		},
+		onPlusBarcodeSuccess(scanResult) {
+			this.handleScanResult(scanResult, this._scanCallback);
 		},
 
 		playSuccess() {
 			util.playSuccessAudio();
 		},
-		playError() {
+		playError(text) {
-			util.playErrorAudio();
+			util.playErrorAudio(text);
 		},
 
 		// 自定义扫码处理回调 - 处理本页面特有的扫码逻辑
@@ -268,7 +285,7 @@ export default {
 
 		// 添加一个通用的错误提示方法
 		showError(message) {
-			this.playError();
+			this.playError(message);
 			uni.showModal({
 				title: '提示',
 				content: message,
@@ -511,6 +528,18 @@ export default {
 </script>
 
 <style>
+.phone-scan-close {
+	margin-left: 8px;
+	padding: 0 12px;
+	height: 36px;
+	line-height: 36px;
+	border: 1px solid #2979ff;
+	border-radius: 4px;
+	color: #2979ff;
+	background: #eaf2ff;
+	font-size: 34rpx;
+	white-space: nowrap;
+}
 .first {
 	box-sizing: border-box;
 }

src/pages/storegoods/storeGoodsProcessInAdd.vue

@@ -1,11 +1,7 @@
 <template>
 	<view class="fabric-out-page">
+		<OrderHeaderFold v-model="headerCollapsed" :summary="form.order_no || '保存后自动生成'">
 		<OrderStatusBar class="fabric-out-mt32" :status="displayAuditStatus" :name="displayAuditStatusName" />
-
-		<view class="flex-white-plr26 ptb10 bdb_f5">
-			<text class="mr26">进仓单号</text>
-			<u-input disabled placeholder="保存后自动生成" v-model="form.order_no" />
-		</view>
 		<view @click="pickerSelectFun('进仓类型')" class="flex-white-plr26 ptb20 bdb_f5">
 			<text class="mr26">进仓类型<text class="redXingh">*</text></text>
 			<view :class="form.in_order_type_name ? '' : 'cBlack'">
@@ -62,13 +58,21 @@
 			<view style="margin-bottom: 8rpx;"><text>单据备注</text></view>
 			<u-input v-model="form.remark" :disabled="!headerEditable" type="textarea" :border="true" :height="100" :auto-height="true" />
 		</view>
+		</OrderHeaderFold>
 
+		<PlusBarcodePanel
+			:visible.sync="phoneScanPanelOpen"
+			:hint-text="phoneScanHint"
+			:scan-time-space="1200"
+			@success="onPlusBarcodeSuccess"
+		/>
 		<ProcessInBinBar
 			:can-scan="canScan"
 			:bin-id="warehouseBinId"
 			:code="warehouseBinCode"
 			:name="warehouseBinName"
 			:show-phone-scan="canScan"
+			:scanning="phoneScanPanelOpen && phoneScanTarget === 'bin'"
 			@code-input="warehouseBinCode = $event"
 			@confirm="resolveWarehouseBin"
 			@phone-scan="handleBinPhoneScan"
@@ -81,6 +85,7 @@
 			:message="BillDataMessage"
 			:disabled-tip="qrDisabledTip"
 			:show-phone-scan="canScanQr"
+			:scanning="phoneScanPanelOpen && phoneScanTarget === 'qr'"
 			@input="QRBarCode = $event"
 			@scan="handleScan"
 			@phone-scan="handlePhoneScan"
@@ -114,15 +119,19 @@
 <script>
 import formMixin from './storeGoodsProcessInMixin.js';
 import OrderStatusBar from '@/components/storefabric/OrderStatusBar.vue';
+import OrderHeaderFold from '@/components/storefabric/OrderHeaderFold.vue';
 import FabricOutScanBar from '@/components/storefabric/FabricOutScanBar.vue';
 import FabricOutFooter from '@/components/storefabric/FabricOutFooter.vue';
 import ProcessInScanDetail from '@/components/storegoods/ProcessInScanDetail.vue';
 import ProcessInDetailList from '@/components/storegoods/ProcessInDetailList.vue';
 import ProcessInBinBar from '@/components/storegoods/ProcessInBinBar.vue';
+import PlusBarcodePanel from '@/components/common/PlusBarcodePanel.vue';
 
 export default {
 	components: {
+		PlusBarcodePanel,
 		OrderStatusBar,
+		OrderHeaderFold,
 		FabricOutScanBar,
 		FabricOutFooter,
 		ProcessInScanDetail,

src/pages/storegoods/storeGoodsProcessInEdit.vue

@@ -1,11 +1,7 @@
 <template>
 	<view class="fabric-out-page">
+		<OrderHeaderFold v-model="headerCollapsed" :summary="form.order_no">
 		<OrderStatusBar class="fabric-out-mt32" :status="displayAuditStatus" :name="displayAuditStatusName" />
-
-		<view class="flex-white-plr26 ptb10 bdb_f5">
-			<text class="mr26">进仓单号</text>
-			<text>{{ form.order_no }}</text>
-		</view>
 		<view class="flex-white-plr26 ptb20 bdb_f5">
 			<text class="mr26">进仓类型</text>
 			<text>{{ form.in_order_type_name || '加工进仓单' }}</text>
@@ -50,13 +46,21 @@
 			<text class="mr26">单据备注</text>
 			<text>{{ form.remark || '-' }}</text>
 		</view>
+		</OrderHeaderFold>
 
+		<PlusBarcodePanel
+			:visible.sync="phoneScanPanelOpen"
+			:hint-text="phoneScanHint"
+			:scan-time-space="1200"
+			@success="onPlusBarcodeSuccess"
+		/>
 		<ProcessInBinBar
 			:can-scan="canScan"
 			:bin-id="warehouseBinId"
 			:code="warehouseBinCode"
 			:name="warehouseBinName"
 			:show-phone-scan="canScan"
+			:scanning="phoneScanPanelOpen && phoneScanTarget === 'bin'"
 			@code-input="warehouseBinCode = $event"
 			@confirm="resolveWarehouseBin"
 			@phone-scan="handleBinPhoneScan"
@@ -69,6 +73,7 @@
 			:message="BillDataMessage"
 			:disabled-tip="qrDisabledTip"
 			:show-phone-scan="canScanQr"
+			:scanning="phoneScanPanelOpen && phoneScanTarget === 'qr'"
 			@input="QRBarCode = $event"
 			@scan="handleScan"
 			@phone-scan="handlePhoneScan"
@@ -92,15 +97,19 @@
 <script>
 import formMixin from './storeGoodsProcessInMixin.js';
 import OrderStatusBar from '@/components/storefabric/OrderStatusBar.vue';
+import OrderHeaderFold from '@/components/storefabric/OrderHeaderFold.vue';
 import FabricOutScanBar from '@/components/storefabric/FabricOutScanBar.vue';
 import FabricOutFooter from '@/components/storefabric/FabricOutFooter.vue';
 import ProcessInScanDetail from '@/components/storegoods/ProcessInScanDetail.vue';
 import ProcessInDetailList from '@/components/storegoods/ProcessInDetailList.vue';
 import ProcessInBinBar from '@/components/storegoods/ProcessInBinBar.vue';
+import PlusBarcodePanel from '@/components/common/PlusBarcodePanel.vue';
 
 export default {
 	components: {
+		PlusBarcodePanel,
 		OrderStatusBar,
+		OrderHeaderFold,
 		FabricOutScanBar,
 		FabricOutFooter,
 		ProcessInScanDetail,
@@ -110,6 +119,7 @@ export default {
 	mixins: [formMixin],
 	data() {
 		return {
+			headerCollapsed: true,
 			weightInputStyle: {
 				fontSize: '36rpx',
 			},

src/pages/storegoods/storeGoodsProcessInList.vue

@@ -1,9 +1,12 @@
 <template>
 	<view>
 		<view class="filterBar">
-			<u-search v-model="filters.order_no" placeholder="进仓单号" :show-action="false" @search="loadList" @custom="loadList" />
+			<u-search v-model="filters.order_no" placeholder="进仓单号" :show-action="false" @search="applySearch" @custom="applySearch" @clear="applySearch" />
-			<view class="filterBtn" @click="filterShow = true">
+			<view class="filterBtn" :class="{ 'filter-active': hasActiveFilter }" @click="filterShow = true">
-				<u-icon name="list" size="40" color="#666"></u-icon>
+				<view class="filterBtn__icon">
+					<u-icon :key="filterIconColor" name="list" size="44" :color="filterIconColor"></u-icon>
+					<view v-if="hasActiveFilter" class="filterBtn__badge"></view>
+				</view>
 				<text>筛选</text>
 			</view>
 		</view>
@@ -20,24 +23,26 @@
 
 		<addBtn url="./storeGoodsProcessInAdd"></addBtn>
 
-		<u-popup v-model="filterShow" mode="right" width="580rpx" :safe-area-inset-bottom="true">
+		<u-popup v-model="filterShow" mode="right" width="580rpx" :safe-area-inset-bottom="true" @close="cancelFilterEdit">
 			<view class="filterPanel">
 				<view class="filterTitle">筛选条件</view>
 				<view class="filterItem">
 					<text class="filterLabel">进仓单号</text>
-					<u-input v-model="filters.order_no" placeholder="请输入进仓单号" />
+					<view class="filterInput">
+						<u-input v-model="filters.order_no" placeholder="请输入进仓单号" :height="100" :custom-style="{ fontSize: '36rpx', color: '#202328' }" placeholder-style="color: #aeb4bf; font-size: 34rpx;" />
+					</view>
 				</view>
 				<view class="filterItem" @click="openProcessUnitSelect">
 					<text class="filterLabel">加工单位</text>
-					<view class="filterValue">{{ processUnitLabel || '全部' }} <u-icon name="arrow-right" size="28"></u-icon></view>
+					<view class="filterValue">{{ processUnitLabel || '全部' }} <u-icon name="arrow-right" size="36"></u-icon></view>
 				</view>
 				<view class="filterItem" @click="openWarehouseSelect">
 					<text class="filterLabel">仓库</text>
-					<view class="filterValue">{{ warehouseLabel || '全部' }} <u-icon name="arrow-right" size="28"></u-icon></view>
+					<view class="filterValue">{{ warehouseLabel || '全部' }} <u-icon name="arrow-right" size="36"></u-icon></view>
 				</view>
 				<view class="filterItem" @click="openStatusSelect">
 					<text class="filterLabel">订单状态</text>
-					<view class="filterValue">{{ statusLabel || '全部' }} <u-icon name="arrow-right" size="28"></u-icon></view>
+					<view class="filterValue">{{ statusLabel || '全部' }} <u-icon name="arrow-right" size="36"></u-icon></view>
 				</view>
 				<view class="filterActions">
 					<u-button type="warning" size="medium" @click="resetFilter">重置</u-button>
@@ -46,8 +51,8 @@
 			</view>
 		</u-popup>
 
-		<u-select v-model="statusSelectShow" :list="statusSelectList" @confirm="onStatusConfirm"></u-select>
+		<u-select class="pdaSelect" v-model="statusSelectShow" title="选择订单状态" :list="statusSelectList" :default-value="statusSelectDefault" @confirm="onStatusConfirm"></u-select>
-		<u-select v-model="unitSelectShow" :list="unitSelectList" remote :loading="selectSearching" @search="onUnitSearch" @confirm="onUnitConfirm"></u-select>
+		<u-select class="pdaSelect" v-model="unitSelectShow" :list="unitSelectList" :default-value="unitSelectDefault" remote :loading="selectSearching" @search="onUnitSearch" @confirm="onUnitConfirm"></u-select>
 	</view>
 </template>
 
@@ -56,6 +61,7 @@ import addBtn from '@/components/addBtn/addBtn.vue';
 import ProcessInItem from '@/components/card/storeGoodsProcessInItem.vue';
 import {
 	getStatusOptions,
+	AUDIT_STATUS,
 	AUDIT_STATUS_MAP,
 	BUSINESS_UNIT_TYPE_PROCESS,
 	WAREHOUSE_TYPE_FINISHED,
@@ -64,9 +70,11 @@ import {
 	fetchAllOrderList,
 } from '@/common/storeGoodsProcessIn';
 import { withNameParam } from '@/common/remoteSelect';
+import listFilterMixin from '@/mixins/listFilterMixin';
 
 export default {
 	components: { addBtn, ProcessInItem },
+	mixins: [listFilterMixin],
 	data() {
 		return {
 			list: [],
@@ -83,13 +91,14 @@ export default {
 			selectSearching: false,
 			unitSearchSeq: 0,
 			unitSelectList: [{ value: '', label: '全部' }],
+			filterStorageKey: 'storeGoodsProcessInListFilters_v2',
 			filters: {
 				order_no: '',
 				process_unit_id: '',
 				process_name: '',
 				warehouse_id: '',
 				warehouse_name: '',
-				audit_status: '',
+				audit_status: AUDIT_STATUS.PENDING,
 			},
 			statusSelectList: [
 				{ value: '', label: '全部' },
@@ -111,6 +120,7 @@ export default {
 	},
 	onLoad() {
 		uni.setNavigationBarTitle({ title: '加工进仓列表' });
+		this.restoreFilterCache();
 		uni.getSystemInfo({
 			success: (res) => {
 				this.scrollHeight = `${res.windowHeight - 50}px`;
@@ -121,6 +131,16 @@ export default {
 		this.loadList();
 	},
 	methods: {
+		createDefaultFilters() {
+			return {
+				order_no: '',
+				process_unit_id: '',
+				process_name: '',
+				warehouse_id: '',
+				warehouse_name: '',
+				audit_status: AUDIT_STATUS.PENDING,
+			};
+		},
 		loadProcessUnitOptions() {
 			if (this.processUnitOptions.length) return Promise.resolve(this.processUnitOptions);
 			return this.$u.api.businessUnit.list({ unit_type_id: BUSINESS_UNIT_TYPE_PROCESS })
@@ -145,10 +165,6 @@ export default {
 					return this.warehouseOptions;
 				});
 		},
-		applyUnitSelectList(list) {
-			const rows = Array.isArray(list) ? list.slice() : [];
-			this.unitSelectList = [{ value: '', label: '全部' }].concat(rows);
-		},
 		openUnitSelect(type) {
 			this.unitSelectType = type;
 			const cache = type === 'warehouse' ? this.warehouseOptions : this.processUnitOptions;
@@ -170,7 +186,7 @@ export default {
 					if (type === 'warehouse') this.warehouseOptions = list;
 					else this.processUnitOptions = list;
 				}
-				this.applyUnitSelectList(list);
+				this.applyUnitSelectList(list, empty);
 			}).catch((e) => {
 				if (seq !== this.unitSearchSeq) return;
 				uni.showToast({ title: (e && e.message) || '搜索失败', icon: 'none' });
@@ -199,12 +215,13 @@ export default {
 		loadList() {
 			if (this.listLoading) return;
 			this.listLoading = true;
+			const filters = this.appliedFilters || this.filters;
 			const params = {};
-			if (this.filters.order_no) params.order_no = this.filters.order_no;
+			if (filters.order_no) params.order_no = filters.order_no;
-			if (this.filters.process_unit_id) params.process_unit_id = this.filters.process_unit_id;
+			if (filters.process_unit_id) params.process_unit_id = filters.process_unit_id;
-			if (this.filters.warehouse_id) params.warehouse_id = this.filters.warehouse_id;
+			if (filters.warehouse_id) params.warehouse_id = filters.warehouse_id;
-			if (this.filters.audit_status !== '' && this.filters.audit_status !== null) {
+			if (this.hasFilterValue(filters.audit_status)) {
-				params.audit_status = this.filters.audit_status;
+				params.audit_status = filters.audit_status;
 			}
 			fetchAllOrderList((p) => this.$u.api.fpmProcessInOrder.list(p), params)
 				.then((rows) => {
@@ -249,33 +266,10 @@ export default {
 			uni.navigateTo({ url: `./${page}?id=${item.id}` });
 		},
 		openStatusSelect() { this.statusSelectShow = true; },
-		onStatusConfirm(e) { this.filters.audit_status = e[0].value; },
-		resetFilter() {
-			this.filters = {
-				order_no: '',
-				process_unit_id: '',
-				process_name: '',
-				warehouse_id: '',
-				warehouse_name: '',
-				audit_status: '',
-			};
-		},
-		applyFilter() {
-			this.filterShow = false;
-			this.loadList();
-		},
 	},
 };
 </script>
 
-<style>
+<style lang="scss">
-page { background-color: #F8F8F8; }
+@import '@/common/list-filter.scss';
-.filterBar { display: flex; align-items: center; padding: 16rpx 20rpx; background: #fff; gap: 16rpx; }
-.filterBtn { display: flex; flex-direction: column; align-items: center; font-size: 22rpx; color: #666; min-width: 80rpx; }
-.filterPanel { padding: 30rpx; }
-.filterTitle { font-size: 32rpx; font-weight: bold; margin-bottom: 30rpx; }
-.filterItem { margin-bottom: 24rpx; }
-.filterLabel { display: block; font-size: 28rpx; color: #666; margin-bottom: 12rpx; }
-.filterValue { display: flex; align-items: center; justify-content: space-between; padding: 16rpx; background: #f5f5f5; border-radius: 8rpx; font-size: 28rpx; }
-.filterActions { display: flex; gap: 20rpx; margin-top: 40rpx; }
 </style>

src/pages/storegoods/storeGoodsProcessInMixin.js

@@ -8,6 +8,7 @@
  */
 import util from '@/common/util';
 import scanMixin from '@/common/scanMixin.js';
+import PlusBarcodePanel from '@/components/common/PlusBarcodePanel.vue';
 import remoteSelectMixin from '@/common/remoteSelectMixin.js';
 import { withNameParam } from '@/common/remoteSelect';
 import { initTts, speak } from '@/common/tts.js';
@@ -38,6 +39,7 @@ import {
 } from '@/common/storeGoodsProcessIn';
 
 export default {
+	components: { PlusBarcodePanel },
 	mixins: [scanMixin, remoteSelectMixin],
 	data() {
 		return {
@@ -45,6 +47,7 @@ export default {
 			orderId: 0,
 			form: this.getEmptyForm(),
 			headerSaved: false,
+			headerCollapsed: false,
 			selectShow: false,
 			selectList: [],
 			selectType: '',
@@ -109,6 +112,11 @@ export default {
 			if (!this.warehouseBinId && !this.BarCodeDelStatus) return '请先扫描仓位后再扫布匹二维码';
 			return '当前状态不可扫码';
 		},
+		phoneScanHint() {
+			return this.phoneScanTarget === 'bin'
+				? '请扫描仓位，成功后自动扫布飞'
+				: '连续扫描布飞二维码，扫完可继续下一条';
+		},
 	},
 	onShow() {
 		this.isPageActive = true;
@@ -133,6 +141,9 @@ export default {
 			this.warehouseBinCode = '';
 			this.warehouseBinName = '';
 			this.phoneContinuousScan = false;
+			this._phoneBinLocked = false;
+			this._pendingFabricCode = '';
+			if (this.phoneScanTarget === 'bin') this.closePhoneScanPanel();
 		},
 		/** 重扫仓位：先清空输入框再填入，避免残留旧码拼接 */
 		applyWarehouseBinScan(scanResult) {
@@ -144,19 +155,42 @@ export default {
 				this.$nextTick(() => this.resolveWarehouseBin());
 			});
 		},
+		openHalfScreenScan(target) {
+			if (this.phoneScanPanelOpen && this.phoneScanTarget === target) {
+				this.closePhoneScanPanel();
+				return;
+			}
+			this.phoneContinuousScan = false;
+			if (target === 'bin') this._phoneBinLocked = false;
+			this.phoneScanTarget = target;
+			this.phoneScanPanelOpen = true;
+		},
+		onPlusBarcodeSuccess(scanResult) {
+			const code = String(scanResult || '').trim().replace(/[\r\n]/g, '');
+			if (!code) return;
+			if (this.phoneScanTarget === 'bin') {
+				if (this._phoneBinLocked) {
+					if (!this.warehouseBinId) {
+						this._pendingFabricCode = code;
+						return;
+					}
+					this.phoneScanTarget = 'qr';
+				} else {
+					this._phoneBinLocked = true;
+					this._pendingFabricCode = '';
+					this.applyWarehouseBinScan(code);
+					return;
+				}
+			}
+			this.QRBarCode = code;
+			this.$nextTick(() => this.handleScan());
+		},
 		handleBinPhoneScan() {
 			if (!this.canScan || !this.orderId) {
 				this.showError('请先提交保存后再扫码');
 				return;
 			}
-			this.phoneContinuousScan = false;
+			this.openHalfScreenScan('bin');
-			this.phoneScanTarget = 'bin';
-			this.openPhoneScan({
-				callback: (scanResult) => {
-					this.applyWarehouseBinScan(scanResult);
-				},
-				fail: () => {},
-			});
 		},
 		handlePhoneScan() {
 			if (!this.canScan || !this.orderId) {
@@ -168,11 +202,10 @@ export default {
 				this.handleBinPhoneScan();
 				return;
 			}
-			this.phoneScanTarget = 'qr';
+			this.openHalfScreenScan('qr');
-			this.phoneContinuousScan = true;
-			this.openContinuousPhoneScan();
 		},
 		openContinuousPhoneScan() {
+			if (this.phoneScanPanelOpen) return;
 			if (!this.phoneContinuousScan || !this.canScanQr || !this.isPageActive) {
 				this.phoneContinuousScan = false;
 				return;
@@ -188,6 +221,7 @@ export default {
 			});
 		},
 		scheduleNextPhoneScan() {
+			if (this.phoneScanPanelOpen) return;
 			if (!this.phoneContinuousScan || !this.canScanQr || !this.isPageActive) {
 				this.phoneContinuousScan = false;
 				return;
@@ -245,9 +279,19 @@ export default {
 					this.BillDataMessage = '';
 					speak('仓位成功');
 					uni.showToast({ title: '仓位识别成功', icon: 'success' });
+					if (this.phoneScanPanelOpen) this.phoneScanTarget = 'qr';
+					this._phoneBinLocked = false;
+					const pending = this._pendingFabricCode;
+					this._pendingFabricCode = '';
+					if (pending && this.phoneScanPanelOpen) {
+						this.QRBarCode = pending;
+						this.$nextTick(() => this.handleScan());
+					}
 				})
 				.catch((e) => {
 					uni.hideLoading();
+					this._phoneBinLocked = false;
+					this._pendingFabricCode = '';
 					this.warehouseBinId = 0;
 					this.warehouseBinCode = '';
 					this.warehouseBinName = '';
@@ -258,6 +302,7 @@ export default {
 			const nextCanScan = this.isEditable && canScanAtStatus(status);
 			if (this.canScan && !nextCanScan) {
 				this.phoneContinuousScan = false;
+				this.closePhoneScanPanel();
 				this.unregisterScanBroadcast();
 			}
 			this.canScan = nextCanScan;
@@ -407,6 +452,7 @@ export default {
 					this.orderId = order.id;
 					this.auditStatus = order.audit_status;
 					this.headerSaved = true;
+					this.headerCollapsed = true;
 					this.form = orderToFormFields(order);
 					this.clearWarehouseBin();
 					this.syncCanScanFromStatus(order.audit_status);
@@ -494,9 +540,10 @@ export default {
 					const order = normalizeOrder(detail);
 					this.applyOrder(order, { keepWeights: true });
 					this.headerSaved = true;
+					this.headerCollapsed = true;
 					this.clearWarehouseBin();
 					this.syncCanScanFromStatus(order.audit_status);
-					this.showSuccess('保存成功，请先扫描仓位');
+					this.showSuccess('保存成功，请先扫描仓位', '保存成功', { voiceOnly: true });
 					this.registerOrderScanBroadcast();
 				})
 				.catch((e) => {
@@ -610,6 +657,12 @@ export default {
 							if (order) {
 								this.form.item_data = order.item_data;
 								this.auditStatus = order.audit_status;
+								// 本单匹数/本单数量：取这张单的总匹数、总数量
+								this.scanDetail = {
+									...this.scanDetail,
+									order_roll: order.total_roll,
+									order_weight: order.total_weight,
+								};
 							}
 						})
 						.catch(() => null);
@@ -622,7 +675,8 @@ export default {
 					uni.hideLoading();
 					this.phoneContinuousScan = false;
 					const message = e.message || (isDelete ? '删除失败' : '扫码失败');
-					this.showError(message);
+					speak(isDelete ? '删除失败' : '扫码失败');
+					uni.showToast({ title: message, icon: 'none', duration: 2500 });
 					this.QRBarCode = '';
 				});
 		},
@@ -637,16 +691,16 @@ export default {
 						if (!order) return;
 						this.applyOrder(order);
 						this.syncCanScanFromStatus(order.audit_status);
-						this.showSuccess('操作成功');
+						this.showSuccess(util.statusSuccessVoice(action));
 					}),
 			});
 		},
 		showError(message) {
-			util.playErrorAudio();
+			util.playErrorAudio(message);
 			uni.showModal({ title: '提示', content: message, showCancel: false });
 		},
-		showSuccess(message) {
+		showSuccess(message, voiceText, options) {
-			util.playSuccessAudio();
+			util.playSuccessAudio(voiceText || message, options);
 			uni.showToast({ title: message, icon: 'success' });
 		},
 	},

src/pages/storegoods/storeGoodsProcessInView.vue

@@ -1,11 +1,7 @@
 <template>
 	<view class="fabric-out-page">
+		<OrderHeaderFold v-model="headerCollapsed" :summary="order.order_no">
 		<OrderStatusBar class="fabric-out-mt32" :status="order.audit_status" :name="order.audit_status_name" />
-
-		<view class="flex-white-plr26 ptb10 bdb_f5">
-			<text class="mr26">进仓单号</text>
-			<text>{{ order.order_no }}</text>
-		</view>
 		<view class="flex-white-plr26 ptb20 bdb_f5">
 			<text class="mr26">进仓类型</text>
 			<text>{{ order.in_order_type_name || '加工进仓单' }}</text>
@@ -44,6 +40,7 @@
 			<text class="mr26">审核人</text>
 			<text>{{ order.auditor_name }} {{ formatTime(order.audit_time, 'YYYY-MM-DD') }}</text>
 		</view>
+		</OrderHeaderFold>
 
 		<ProcessInDetailList
 			:title="detailTitle"
@@ -58,6 +55,7 @@
 <script>
 import util from '@/common/util';
 import OrderStatusBar from '@/components/storefabric/OrderStatusBar.vue';
+import OrderHeaderFold from '@/components/storefabric/OrderHeaderFold.vue';
 import FabricOutFooter from '@/components/storefabric/FabricOutFooter.vue';
 import ProcessInDetailList from '@/components/storegoods/ProcessInDetailList.vue';
 import {
@@ -68,10 +66,11 @@ import {
 } from '@/common/storeGoodsProcessIn';
 
 export default {
-	components: { OrderStatusBar, FabricOutFooter, ProcessInDetailList },
+	components: { OrderStatusBar, OrderHeaderFold, FabricOutFooter, ProcessInDetailList },
 	data() {
 		return {
 			orderId: 0,
+			headerCollapsed: true,
 			order: { item_data: [] },
 		};
 	},
@@ -117,18 +116,25 @@ export default {
 			confirmOrderStatusAction(this, {
 				orderId: this.orderId,
 				action,
-				onSuccess: () => this.$u.api.fpmProcessInOrder.detail({ id: this.orderId })
+				onSuccess: () => {
-					.then((res) => {
+					uni.hideLoading();
-						uni.hideLoading();
+					const voice = util.statusSuccessVoice(action);
-						const order = normalizeOrder(res);
+					util.playSuccessAudio(voice);
-						if (order) this.order = order;
+					uni.showToast({ title: voice, icon: 'success' });
-						util.playSuccessAudio();
+					if (action === 'unapprove') {
-						uni.showToast({ title: '操作成功', icon: 'success' });
+						uni.redirectTo({ url: `./storeGoodsProcessInEdit?id=${this.orderId}` });
-					}),
+						return;
+					}
+					return this.$u.api.fpmProcessInOrder.detail({ id: this.orderId })
+						.then((res) => {
+							const order = normalizeOrder(res);
+							if (order) this.order = order;
+						});
+				},
 			});
 		},
 		showError(message) {
-			util.playErrorAudio();
+			util.playErrorAudio(message);
 			uni.showModal({ title: '提示', content: message, showCancel: false });
 		},
 	},

src/pages/storegoods/storeGoodsProcessOutAdd.vue

@@ -1,11 +1,7 @@
 <template>
 	<view class="fabric-out-page">
+		<OrderHeaderFold v-model="headerCollapsed" :summary="form.order_no || '保存后自动生成'">
 		<OrderStatusBar class="fabric-out-mt32" :status="displayAuditStatus" :name="displayAuditStatusName" />
-
-		<view class="flex-white-plr26 ptb10 bdb_f5">
-			<text class="mr26">出仓单号</text>
-			<u-input disabled placeholder="保存后自动生成" v-model="form.order_no" />
-		</view>
 		<view @click="pickerSelectFun('出仓类型')" class="flex-white-plr26 ptb20 bdb_f5">
 			<text class="mr26">出仓类型<text class="redXingh">*</text></text>
 			<view :class="form.out_order_type_name ? '' : 'cBlack'">
@@ -31,7 +27,14 @@
 			<view style="margin-bottom: 8rpx;"><text>单据备注</text></view>
 			<u-input v-model="form.remark" :disabled="!headerEditable" type="textarea" :border="true" :height="100" :auto-height="true" />
 		</view>
+		</OrderHeaderFold>
 
+		<PlusBarcodePanel
+			:visible.sync="phoneScanPanelOpen"
+			hint-text="连续扫码出仓，扫完可继续下一条"
+			:scan-time-space="1200"
+			@success="onPlusBarcodeSuccess"
+		/>
 		<FabricOutScanBar
 			:can-scan="showQrScanBar"
 			:value="QRBarCode"
@@ -39,6 +42,7 @@
 			:message="BillDataMessage"
 			:disabled-tip="qrDisabledTip"
 			:show-phone-scan="canScanQr"
+			:scanning="phoneScanPanelOpen"
 			@input="QRBarCode = $event"
 			@scan="handleScan"
 			@phone-scan="handlePhoneScan"
@@ -71,14 +75,18 @@
 <script>
 import formMixin from './storeGoodsProcessOutMixin.js';
 import OrderStatusBar from '@/components/storefabric/OrderStatusBar.vue';
+import OrderHeaderFold from '@/components/storefabric/OrderHeaderFold.vue';
 import FabricOutScanBar from '@/components/storefabric/FabricOutScanBar.vue';
 import FabricOutFooter from '@/components/storefabric/FabricOutFooter.vue';
 import ProcessOutScanDetail from '@/components/storegoods/ProcessOutScanDetail.vue';
 import ProcessOutDetailList from '@/components/storegoods/ProcessOutDetailList.vue';
+import PlusBarcodePanel from '@/components/common/PlusBarcodePanel.vue';
 
 export default {
 	components: {
+		PlusBarcodePanel,
 		OrderStatusBar,
+		OrderHeaderFold,
 		FabricOutScanBar,
 		FabricOutFooter,
 		ProcessOutScanDetail,

src/pages/storegoods/storeGoodsProcessOutEdit.vue

@@ -1,11 +1,7 @@
 <template>
 	<view class="fabric-out-page">
+		<OrderHeaderFold v-model="headerCollapsed" :summary="form.order_no">
 		<OrderStatusBar class="fabric-out-mt32" :status="displayAuditStatus" :name="displayAuditStatusName" />
-
-		<view class="flex-white-plr26 ptb10 bdb_f5">
-			<text class="mr26">出仓单号</text>
-			<text>{{ form.order_no }}</text>
-		</view>
 		<view class="flex-white-plr26 ptb20 bdb_f5">
 			<text class="mr26">出仓类型</text>
 			<text>{{ form.out_order_type_name || '正常加工出仓' }}</text>
@@ -22,7 +18,14 @@
 			<text class="mr26">单据备注</text>
 			<text>{{ form.remark || '-' }}</text>
 		</view>
+		</OrderHeaderFold>
 
+		<PlusBarcodePanel
+			:visible.sync="phoneScanPanelOpen"
+			hint-text="连续扫码出仓，扫完可继续下一条"
+			:scan-time-space="1200"
+			@success="onPlusBarcodeSuccess"
+		/>
 		<FabricOutScanBar
 			:can-scan="showQrScanBar"
 			:value="QRBarCode"
@@ -30,6 +33,7 @@
 			:message="BillDataMessage"
 			:disabled-tip="qrDisabledTip"
 			:show-phone-scan="canScanQr"
+			:scanning="phoneScanPanelOpen"
 			@input="QRBarCode = $event"
 			@scan="handleScan"
 			@phone-scan="handlePhoneScan"
@@ -52,20 +56,29 @@
 <script>
 import formMixin from './storeGoodsProcessOutMixin.js';
 import OrderStatusBar from '@/components/storefabric/OrderStatusBar.vue';
+import OrderHeaderFold from '@/components/storefabric/OrderHeaderFold.vue';
 import FabricOutScanBar from '@/components/storefabric/FabricOutScanBar.vue';
 import FabricOutFooter from '@/components/storefabric/FabricOutFooter.vue';
 import ProcessOutScanDetail from '@/components/storegoods/ProcessOutScanDetail.vue';
 import ProcessOutDetailList from '@/components/storegoods/ProcessOutDetailList.vue';
+import PlusBarcodePanel from '@/components/common/PlusBarcodePanel.vue';
 
 export default {
 	components: {
+		PlusBarcodePanel,
 		OrderStatusBar,
+		OrderHeaderFold,
 		FabricOutScanBar,
 		FabricOutFooter,
 		ProcessOutScanDetail,
 		ProcessOutDetailList,
 	},
 	mixins: [formMixin],
+	data() {
+		return {
+			headerCollapsed: true,
+		};
+	},
 	onLoad(e) {
 		uni.setNavigationBarTitle({ title: '编辑加工出仓单' });
 		this.pageMode = 'edit';

src/pages/storegoods/storeGoodsProcessOutList.vue

@@ -1,9 +1,12 @@
 <template>
 	<view>
 		<view class="filterBar">
-			<u-search v-model="filters.order_no" placeholder="出仓单号" :show-action="false" @search="loadList" @custom="loadList" />
+			<u-search v-model="filters.order_no" placeholder="出仓单号" :show-action="false" @search="applySearch" @custom="applySearch" @clear="applySearch" />
-			<view class="filterBtn" @click="filterShow = true">
+			<view class="filterBtn" :class="{ 'filter-active': hasActiveFilter }" @click="filterShow = true">
-				<u-icon name="list" size="40" color="#666"></u-icon>
+				<view class="filterBtn__icon">
+					<u-icon :key="filterIconColor" name="list" size="44" :color="filterIconColor"></u-icon>
+					<view v-if="hasActiveFilter" class="filterBtn__badge"></view>
+				</view>
 				<text>筛选</text>
 			</view>
 		</view>
@@ -20,24 +23,26 @@
 
 		<addBtn url="./storeGoodsProcessOutAdd"></addBtn>
 
-		<u-popup v-model="filterShow" mode="right" width="580rpx" :safe-area-inset-bottom="true">
+		<u-popup v-model="filterShow" mode="right" width="580rpx" :safe-area-inset-bottom="true" @close="cancelFilterEdit">
 			<view class="filterPanel">
 				<view class="filterTitle">筛选条件</view>
 				<view class="filterItem">
 					<text class="filterLabel">出仓单号</text>
-					<u-input v-model="filters.order_no" placeholder="请输入出仓单号" />
+					<view class="filterInput">
+						<u-input v-model="filters.order_no" placeholder="请输入出仓单号" :height="100" :custom-style="{ fontSize: '36rpx', color: '#202328' }" placeholder-style="color: #aeb4bf; font-size: 34rpx;" />
+					</view>
 				</view>
 				<view class="filterItem" @click="openProcessUnitSelect">
 					<text class="filterLabel">加工单位</text>
-					<view class="filterValue">{{ processUnitLabel || '全部' }} <u-icon name="arrow-right" size="28"></u-icon></view>
+					<view class="filterValue">{{ processUnitLabel || '全部' }} <u-icon name="arrow-right" size="36"></u-icon></view>
 				</view>
 				<view class="filterItem" @click="openWarehouseSelect">
 					<text class="filterLabel">仓库</text>
-					<view class="filterValue">{{ warehouseLabel || '全部' }} <u-icon name="arrow-right" size="28"></u-icon></view>
+					<view class="filterValue">{{ warehouseLabel || '全部' }} <u-icon name="arrow-right" size="36"></u-icon></view>
 				</view>
 				<view class="filterItem" @click="openStatusSelect">
 					<text class="filterLabel">订单状态</text>
-					<view class="filterValue">{{ statusLabel || '全部' }} <u-icon name="arrow-right" size="28"></u-icon></view>
+					<view class="filterValue">{{ statusLabel || '全部' }} <u-icon name="arrow-right" size="36"></u-icon></view>
 				</view>
 				<view class="filterActions">
 					<u-button type="warning" size="medium" @click="resetFilter">重置</u-button>
@@ -46,8 +51,8 @@
 			</view>
 		</u-popup>
 
-		<u-select v-model="statusSelectShow" :list="statusSelectList" @confirm="onStatusConfirm"></u-select>
+		<u-select class="pdaSelect" v-model="statusSelectShow" title="选择订单状态" :list="statusSelectList" :default-value="statusSelectDefault" @confirm="onStatusConfirm"></u-select>
-		<u-select v-model="unitSelectShow" :list="unitSelectList" remote :loading="selectSearching" @search="onUnitSearch" @confirm="onUnitConfirm"></u-select>
+		<u-select class="pdaSelect" v-model="unitSelectShow" :list="unitSelectList" :default-value="unitSelectDefault" remote :loading="selectSearching" @search="onUnitSearch" @confirm="onUnitConfirm"></u-select>
 	</view>
 </template>
 
@@ -56,6 +61,7 @@ import addBtn from '@/components/addBtn/addBtn.vue';
 import ProcessOutItem from '@/components/card/storeGoodsProcessOutItem.vue';
 import {
 	getStatusOptions,
+	AUDIT_STATUS,
 	AUDIT_STATUS_MAP,
 	BUSINESS_UNIT_TYPE_PROCESS,
 	WAREHOUSE_TYPE_FINISHED,
@@ -64,9 +70,11 @@ import {
 	fetchAllOrderList,
 } from '@/common/storeGoodsProcessOut';
 import { withNameParam } from '@/common/remoteSelect';
+import listFilterMixin from '@/mixins/listFilterMixin';
 
 export default {
 	components: { addBtn, ProcessOutItem },
+	mixins: [listFilterMixin],
 	data() {
 		return {
 			list: [],
@@ -83,13 +91,14 @@ export default {
 			selectSearching: false,
 			unitSearchSeq: 0,
 			unitSelectList: [{ value: '', label: '全部' }],
+			filterStorageKey: 'storeGoodsProcessOutListFilters_v2',
 			filters: {
 				order_no: '',
 				process_unit_id: '',
 				process_name: '',
 				warehouse_id: '',
 				warehouse_name: '',
-				audit_status: '',
+				audit_status: AUDIT_STATUS.PENDING,
 			},
 			statusSelectList: [
 				{ value: '', label: '全部' },
@@ -111,6 +120,7 @@ export default {
 	},
 	onLoad() {
 		uni.setNavigationBarTitle({ title: '加工出仓列表' });
+		this.restoreFilterCache();
 		uni.getSystemInfo({
 			success: (res) => {
 				this.scrollHeight = `${res.windowHeight - 50}px`;
@@ -121,6 +131,16 @@ export default {
 		this.loadList();
 	},
 	methods: {
+		createDefaultFilters() {
+			return {
+				order_no: '',
+				process_unit_id: '',
+				process_name: '',
+				warehouse_id: '',
+				warehouse_name: '',
+				audit_status: AUDIT_STATUS.PENDING,
+			};
+		},
 		loadProcessUnitOptions() {
 			if (this.processUnitOptions.length) return Promise.resolve(this.processUnitOptions);
 			return this.$u.api.businessUnit.list({ unit_type_id: BUSINESS_UNIT_TYPE_PROCESS })
@@ -145,10 +165,6 @@ export default {
 					return this.warehouseOptions;
 				});
 		},
-		applyUnitSelectList(list) {
-			const rows = Array.isArray(list) ? list.slice() : [];
-			this.unitSelectList = [{ value: '', label: '全部' }].concat(rows);
-		},
 		openUnitSelect(type) {
 			this.unitSelectType = type;
 			const cache = type === 'warehouse' ? this.warehouseOptions : this.processUnitOptions;
@@ -170,7 +186,7 @@ export default {
 					if (type === 'warehouse') this.warehouseOptions = list;
 					else this.processUnitOptions = list;
 				}
-				this.applyUnitSelectList(list);
+				this.applyUnitSelectList(list, empty);
 			}).catch((e) => {
 				if (seq !== this.unitSearchSeq) return;
 				uni.showToast({ title: (e && e.message) || '搜索失败', icon: 'none' });
@@ -199,12 +215,13 @@ export default {
 		loadList() {
 			if (this.listLoading) return;
 			this.listLoading = true;
+			const filters = this.appliedFilters || this.filters;
 			const params = {};
-			if (this.filters.order_no) params.order_no = this.filters.order_no;
+			if (filters.order_no) params.order_no = filters.order_no;
-			if (this.filters.process_unit_id) params.process_unit_id = this.filters.process_unit_id;
+			if (filters.process_unit_id) params.process_unit_id = filters.process_unit_id;
-			if (this.filters.warehouse_id) params.warehouse_id = this.filters.warehouse_id;
+			if (filters.warehouse_id) params.warehouse_id = filters.warehouse_id;
-			if (this.filters.audit_status !== '' && this.filters.audit_status !== null) {
+			if (this.hasFilterValue(filters.audit_status)) {
-				params.audit_status = this.filters.audit_status;
+				params.audit_status = filters.audit_status;
 			}
 			fetchAllOrderList((p) => this.$u.api.fpmProcessOutOrder.list(p), params)
 				.then((rows) => {
@@ -251,33 +268,10 @@ export default {
 			uni.navigateTo({ url: `./${page}?id=${item.id}` });
 		},
 		openStatusSelect() { this.statusSelectShow = true; },
-		onStatusConfirm(e) { this.filters.audit_status = e[0].value; },
-		resetFilter() {
-			this.filters = {
-				order_no: '',
-				process_unit_id: '',
-				process_name: '',
-				warehouse_id: '',
-				warehouse_name: '',
-				audit_status: '',
-			};
-		},
-		applyFilter() {
-			this.filterShow = false;
-			this.loadList();
-		},
 	},
 };
 </script>
 
-<style>
+<style lang="scss">
-page { background-color: #F8F8F8; }
+@import '@/common/list-filter.scss';
-.filterBar { display: flex; align-items: center; padding: 16rpx 20rpx; background: #fff; gap: 16rpx; }
-.filterBtn { display: flex; flex-direction: column; align-items: center; font-size: 22rpx; color: #666; min-width: 80rpx; }
-.filterPanel { padding: 30rpx; }
-.filterTitle { font-size: 32rpx; font-weight: bold; margin-bottom: 30rpx; }
-.filterItem { margin-bottom: 24rpx; }
-.filterLabel { display: block; font-size: 28rpx; color: #666; margin-bottom: 12rpx; }
-.filterValue { display: flex; align-items: center; justify-content: space-between; padding: 16rpx; background: #f5f5f5; border-radius: 8rpx; font-size: 28rpx; }
-.filterActions { display: flex; gap: 20rpx; margin-top: 40rpx; }
 </style>

src/pages/storegoods/storeGoodsProcessOutMixin.js

@@ -7,6 +7,7 @@
  */
 import util from '@/common/util';
 import scanMixin from '@/common/scanMixin.js';
+import PlusBarcodePanel from '@/components/common/PlusBarcodePanel.vue';
 import remoteSelectMixin from '@/common/remoteSelectMixin.js';
 import { withNameParam } from '@/common/remoteSelect';
 import { initTts, speak } from '@/common/tts.js';
@@ -34,6 +35,7 @@ import {
 } from '@/common/storeGoodsProcessOut';
 
 export default {
+	components: { PlusBarcodePanel },
 	mixins: [scanMixin, remoteSelectMixin],
 	data() {
 		return {
@@ -41,6 +43,7 @@ export default {
 			orderId: 0,
 			form: this.getEmptyForm(),
 			headerSaved: false,
+			headerCollapsed: false,
 			selectShow: false,
 			selectList: [],
 			selectType: '',
@@ -113,10 +116,15 @@ export default {
 				this.showError('请先提交保存后再扫码');
 				return;
 			}
-			this.phoneContinuousScan = true;
+			this.phoneContinuousScan = false;
-			this.openContinuousPhoneScan();
+			this.togglePhoneScanPanel();
+		},
+		onPlusBarcodeSuccess(scanResult) {
+			this.QRBarCode = String(scanResult || '').trim().replace(/[\r\n]/g, '');
+			this.$nextTick(() => this.handleScan());
 		},
 		openContinuousPhoneScan() {
+			if (this.phoneScanPanelOpen) return;
 			if (!this.phoneContinuousScan || !this.canScanQr || !this.isPageActive) {
 				this.phoneContinuousScan = false;
 				return;
@@ -132,6 +140,7 @@ export default {
 			});
 		},
 		scheduleNextPhoneScan() {
+			if (this.phoneScanPanelOpen) return;
 			if (!this.phoneContinuousScan || !this.canScanQr || !this.isPageActive) {
 				this.phoneContinuousScan = false;
 				return;
@@ -152,6 +161,7 @@ export default {
 			const nextCanScan = this.isEditable && canScanAtStatus(status);
 			if (this.canScan && !nextCanScan) {
 				this.phoneContinuousScan = false;
+				this.closePhoneScanPanel();
 				this.unregisterScanBroadcast();
 			}
 			this.canScan = nextCanScan;
@@ -274,6 +284,7 @@ export default {
 					this.orderId = order.id;
 					this.auditStatus = order.audit_status;
 					this.headerSaved = true;
+					this.headerCollapsed = true;
 					this.form = orderToFormFields(order);
 					this.syncCanScanFromStatus(order.audit_status);
 					if (this.canScan) this.registerOrderScanBroadcast();
@@ -366,8 +377,9 @@ export default {
 					const order = normalizeOrder(detail);
 					this.applyOrder(order);
 					this.headerSaved = true;
+					this.headerCollapsed = true;
 					this.syncCanScanFromStatus(order.audit_status);
-					this.showSuccess('保存成功，请开始扫码');
+					this.showSuccess('保存成功，请开始扫码', '保存成功', { voiceOnly: true });
 					this.registerOrderScanBroadcast();
 				})
 				.catch((e) => {
@@ -453,6 +465,12 @@ export default {
 							if (order) {
 								this.form.item_data = order.item_data;
 								this.auditStatus = order.audit_status;
+								// 本单匹数/本单数量：取这张单的总匹数、总数量
+								this.scanDetail = {
+									...this.scanDetail,
+									order_roll: order.total_roll,
+									order_weight: order.total_weight,
+								};
 							}
 						})
 						.catch(() => null);
@@ -465,7 +483,8 @@ export default {
 					uni.hideLoading();
 					this.phoneContinuousScan = false;
 					const message = e.message || (isDelete ? '删除失败' : '扫码失败');
-					this.showError(message);
+					speak(isDelete ? '删除失败' : '扫码失败');
+					uni.showToast({ title: message, icon: 'none', duration: 2500 });
 					this.QRBarCode = '';
 				});
 		},
@@ -480,16 +499,16 @@ export default {
 						if (!order) return;
 						this.applyOrder(order);
 						this.syncCanScanFromStatus(order.audit_status);
-						this.showSuccess('操作成功');
+						this.showSuccess(util.statusSuccessVoice(action));
 					}),
 			});
 		},
 		showError(message) {
-			util.playErrorAudio();
+			util.playErrorAudio(message);
 			uni.showModal({ title: '提示', content: message, showCancel: false });
 		},
-		showSuccess(message) {
+		showSuccess(message, voiceText, options) {
-			util.playSuccessAudio();
+			util.playSuccessAudio(voiceText || message, options);
 			uni.showToast({ title: message, icon: 'success' });
 		},
 	},

src/pages/storegoods/storeGoodsProcessOutView.vue

@@ -1,11 +1,7 @@
 <template>
 	<view class="fabric-out-page">
+		<OrderHeaderFold v-model="headerCollapsed" :summary="order.order_no">
 		<OrderStatusBar class="fabric-out-mt32" :status="order.audit_status" :name="order.audit_status_name" />
-
-		<view class="flex-white-plr26 ptb10 bdb_f5">
-			<text class="mr26">出仓单号</text>
-			<text>{{ order.order_no }}</text>
-		</view>
 		<view class="flex-white-plr26 ptb20 bdb_f5">
 			<text class="mr26">出仓类型</text>
 			<text>{{ order.out_order_type_name || '正常加工出仓' }}</text>
@@ -30,6 +26,7 @@
 			<text class="mr26">审核人</text>
 			<text>{{ order.auditor_name }} {{ formatTime(order.audit_time, 'YYYY-MM-DD') }}</text>
 		</view>
+		</OrderHeaderFold>
 
 		<ProcessOutDetailList
 			:title="detailTitle"
@@ -43,6 +40,7 @@
 <script>
 import util from '@/common/util';
 import OrderStatusBar from '@/components/storefabric/OrderStatusBar.vue';
+import OrderHeaderFold from '@/components/storefabric/OrderHeaderFold.vue';
 import FabricOutFooter from '@/components/storefabric/FabricOutFooter.vue';
 import ProcessOutDetailList from '@/components/storegoods/ProcessOutDetailList.vue';
 import {
@@ -53,10 +51,11 @@ import {
 } from '@/common/storeGoodsProcessOut';
 
 export default {
-	components: { OrderStatusBar, FabricOutFooter, ProcessOutDetailList },
+	components: { OrderStatusBar, OrderHeaderFold, FabricOutFooter, ProcessOutDetailList },
 	data() {
 		return {
 			orderId: 0,
+			headerCollapsed: true,
 			order: { item_data: [] },
 		};
 	},
@@ -102,18 +101,25 @@ export default {
 			confirmOrderStatusAction(this, {
 				orderId: this.orderId,
 				action,
-				onSuccess: () => this.$u.api.fpmProcessOutOrder.detail({ id: this.orderId })
+				onSuccess: () => {
-					.then((res) => {
+					uni.hideLoading();
-						uni.hideLoading();
+					const voice = util.statusSuccessVoice(action);
-						const order = normalizeOrder(res);
+					util.playSuccessAudio(voice);
-						if (order) this.order = order;
+					uni.showToast({ title: voice, icon: 'success' });
-						util.playSuccessAudio();
+					if (action === 'unapprove') {
-						uni.showToast({ title: '操作成功', icon: 'success' });
+						uni.redirectTo({ url: `./storeGoodsProcessOutEdit?id=${this.orderId}` });
-					}),
+						return;
+					}
+					return this.$u.api.fpmProcessOutOrder.detail({ id: this.orderId })
+						.then((res) => {
+							const order = normalizeOrder(res);
+							if (order) this.order = order;
+						});
+				},
 			});
 		},
 		showError(message) {
-			util.playErrorAudio();
+			util.playErrorAudio(message);
 			uni.showModal({ title: '提示', content: message, showCancel: false });
 		},
 	},

src/pages/storegoods/storeGoodsProcessReturnInAdd.vue

@@ -1,11 +1,7 @@
 <template>
 	<view class="fabric-out-page">
+		<OrderHeaderFold v-model="headerCollapsed" :summary="form.order_no || '保存后自动生成'">
 		<OrderStatusBar class="fabric-out-mt32" :status="displayAuditStatus" :name="displayAuditStatusName" />
-
-		<view class="flex-white-plr26 ptb10 bdb_f5">
-			<text class="mr26">进仓单号</text>
-			<u-input disabled placeholder="保存后自动生成" v-model="form.order_no" />
-		</view>
 		<view class="flex-white-plr26 ptb20 bdb_f5">
 			<text class="mr26">进仓类型</text>
 			<view>加工退货进仓单</view>
@@ -28,13 +24,21 @@
 			<view style="margin-bottom: 8rpx;"><text>单据备注</text></view>
 			<u-input v-model="form.remark" :disabled="!headerEditable" type="textarea" :border="true" :height="100" :auto-height="true" />
 		</view>
+		</OrderHeaderFold>
 
+		<PlusBarcodePanel
+			:visible.sync="phoneScanPanelOpen"
+			:hint-text="phoneScanHint"
+			:scan-time-space="1200"
+			@success="onPlusBarcodeSuccess"
+		/>
 		<ProcessInBinBar
 			:can-scan="canScan"
 			:bin-id="warehouseBinId"
 			:code="warehouseBinCode"
 			:name="warehouseBinName"
 			:show-phone-scan="canScan"
+			:scanning="phoneScanPanelOpen && phoneScanTarget === 'bin'"
 			@code-input="warehouseBinCode = $event"
 			@confirm="resolveWarehouseBin"
 			@phone-scan="handleBinPhoneScan"
@@ -47,6 +51,7 @@
 			:message="BillDataMessage"
 			:disabled-tip="qrDisabledTip"
 			:show-phone-scan="canScanQr"
+			:scanning="phoneScanPanelOpen && phoneScanTarget === 'qr'"
 			@input="QRBarCode = $event"
 			@scan="handleScan"
 			@phone-scan="handlePhoneScan"
@@ -79,15 +84,19 @@
 <script>
 import formMixin from './storeGoodsProcessReturnInMixin.js';
 import OrderStatusBar from '@/components/storefabric/OrderStatusBar.vue';
+import OrderHeaderFold from '@/components/storefabric/OrderHeaderFold.vue';
 import FabricOutScanBar from '@/components/storefabric/FabricOutScanBar.vue';
 import FabricOutFooter from '@/components/storefabric/FabricOutFooter.vue';
 import ProcessInScanDetail from '@/components/storegoods/ProcessInScanDetail.vue';
 import ProcessInDetailList from '@/components/storegoods/ProcessInDetailList.vue';
 import ProcessInBinBar from '@/components/storegoods/ProcessInBinBar.vue';
+import PlusBarcodePanel from '@/components/common/PlusBarcodePanel.vue';
 
 export default {
 	components: {
+		PlusBarcodePanel,
 		OrderStatusBar,
+		OrderHeaderFold,
 		FabricOutScanBar,
 		FabricOutFooter,
 		ProcessInScanDetail,

src/pages/storegoods/storeGoodsProcessReturnInEdit.vue

@@ -1,11 +1,7 @@
 <template>
 	<view class="fabric-out-page">
+		<OrderHeaderFold v-model="headerCollapsed" :summary="form.order_no">
 		<OrderStatusBar class="fabric-out-mt32" :status="displayAuditStatus" :name="displayAuditStatusName" />
-
-		<view class="flex-white-plr26 ptb10 bdb_f5">
-			<text class="mr26">进仓单号</text>
-			<text>{{ form.order_no }}</text>
-		</view>
 		<view class="flex-white-plr26 ptb20 bdb_f5">
 			<text class="mr26">进仓类型</text>
 			<text>加工退货进仓单</text>
@@ -22,13 +18,21 @@
 			<text class="mr26">单据备注</text>
 			<text>{{ form.remark || '-' }}</text>
 		</view>
+		</OrderHeaderFold>
 
+		<PlusBarcodePanel
+			:visible.sync="phoneScanPanelOpen"
+			:hint-text="phoneScanHint"
+			:scan-time-space="1200"
+			@success="onPlusBarcodeSuccess"
+		/>
 		<ProcessInBinBar
 			:can-scan="canScan"
 			:bin-id="warehouseBinId"
 			:code="warehouseBinCode"
 			:name="warehouseBinName"
 			:show-phone-scan="canScan"
+			:scanning="phoneScanPanelOpen && phoneScanTarget === 'bin'"
 			@code-input="warehouseBinCode = $event"
 			@confirm="resolveWarehouseBin"
 			@phone-scan="handleBinPhoneScan"
@@ -41,6 +45,7 @@
 			:message="BillDataMessage"
 			:disabled-tip="qrDisabledTip"
 			:show-phone-scan="canScanQr"
+			:scanning="phoneScanPanelOpen && phoneScanTarget === 'qr'"
 			@input="QRBarCode = $event"
 			@scan="handleScan"
 			@phone-scan="handlePhoneScan"
@@ -63,15 +68,19 @@
 <script>
 import formMixin from './storeGoodsProcessReturnInMixin.js';
 import OrderStatusBar from '@/components/storefabric/OrderStatusBar.vue';
+import OrderHeaderFold from '@/components/storefabric/OrderHeaderFold.vue';
 import FabricOutScanBar from '@/components/storefabric/FabricOutScanBar.vue';
 import FabricOutFooter from '@/components/storefabric/FabricOutFooter.vue';
 import ProcessInScanDetail from '@/components/storegoods/ProcessInScanDetail.vue';
 import ProcessInDetailList from '@/components/storegoods/ProcessInDetailList.vue';
 import ProcessInBinBar from '@/components/storegoods/ProcessInBinBar.vue';
+import PlusBarcodePanel from '@/components/common/PlusBarcodePanel.vue';
 
 export default {
 	components: {
+		PlusBarcodePanel,
 		OrderStatusBar,
+		OrderHeaderFold,
 		FabricOutScanBar,
 		FabricOutFooter,
 		ProcessInScanDetail,
@@ -79,6 +88,11 @@ export default {
 		ProcessInBinBar,
 	},
 	mixins: [formMixin],
+	data() {
+		return {
+			headerCollapsed: true,
+		};
+	},
 	onLoad(e) {
 		uni.setNavigationBarTitle({ title: '编辑加工退货进仓单' });
 		this.pageMode = 'edit';

src/pages/storegoods/storeGoodsProcessReturnInList.vue

@@ -1,9 +1,12 @@
 <template>
 	<view>
 		<view class="filterBar">
-			<u-search v-model="filters.order_no" placeholder="进仓单号" :show-action="false" @search="loadList" @custom="loadList" />
+			<u-search v-model="filters.order_no" placeholder="进仓单号" :show-action="false" @search="applySearch" @custom="applySearch" @clear="applySearch" />
-			<view class="filterBtn" @click="filterShow = true">
+			<view class="filterBtn" :class="{ 'filter-active': hasActiveFilter }" @click="filterShow = true">
-				<u-icon name="list" size="40" color="#666"></u-icon>
+				<view class="filterBtn__icon">
+					<u-icon :key="filterIconColor" name="list" size="44" :color="filterIconColor"></u-icon>
+					<view v-if="hasActiveFilter" class="filterBtn__badge"></view>
+				</view>
 				<text>筛选</text>
 			</view>
 		</view>
@@ -20,24 +23,26 @@
 
 		<addBtn url="./storeGoodsProcessReturnInAdd"></addBtn>
 
-		<u-popup v-model="filterShow" mode="right" width="580rpx" :safe-area-inset-bottom="true">
+		<u-popup v-model="filterShow" mode="right" width="580rpx" :safe-area-inset-bottom="true" @close="cancelFilterEdit">
 			<view class="filterPanel">
 				<view class="filterTitle">筛选条件</view>
 				<view class="filterItem">
 					<text class="filterLabel">进仓单号</text>
-					<u-input v-model="filters.order_no" placeholder="请输入进仓单号" />
+					<view class="filterInput">
+						<u-input v-model="filters.order_no" placeholder="请输入进仓单号" :height="100" :custom-style="{ fontSize: '36rpx', color: '#202328' }" placeholder-style="color: #aeb4bf; font-size: 34rpx;" />
+					</view>
 				</view>
 				<view class="filterItem" @click="openProcessUnitSelect">
 					<text class="filterLabel">加工单位</text>
-					<view class="filterValue">{{ processUnitLabel || '全部' }} <u-icon name="arrow-right" size="28"></u-icon></view>
+					<view class="filterValue">{{ processUnitLabel || '全部' }} <u-icon name="arrow-right" size="36"></u-icon></view>
 				</view>
 				<view class="filterItem" @click="openWarehouseSelect">
 					<text class="filterLabel">仓库</text>
-					<view class="filterValue">{{ warehouseLabel || '全部' }} <u-icon name="arrow-right" size="28"></u-icon></view>
+					<view class="filterValue">{{ warehouseLabel || '全部' }} <u-icon name="arrow-right" size="36"></u-icon></view>
 				</view>
 				<view class="filterItem" @click="openStatusSelect">
 					<text class="filterLabel">订单状态</text>
-					<view class="filterValue">{{ statusLabel || '全部' }} <u-icon name="arrow-right" size="28"></u-icon></view>
+					<view class="filterValue">{{ statusLabel || '全部' }} <u-icon name="arrow-right" size="36"></u-icon></view>
 				</view>
 				<view class="filterActions">
 					<u-button type="warning" size="medium" @click="resetFilter">重置</u-button>
@@ -46,8 +51,8 @@
 			</view>
 		</u-popup>
 
-		<u-select v-model="statusSelectShow" :list="statusSelectList" @confirm="onStatusConfirm"></u-select>
+		<u-select class="pdaSelect" v-model="statusSelectShow" title="选择订单状态" :list="statusSelectList" :default-value="statusSelectDefault" @confirm="onStatusConfirm"></u-select>
-		<u-select v-model="unitSelectShow" :list="unitSelectList" remote :loading="selectSearching" @search="onUnitSearch" @confirm="onUnitConfirm"></u-select>
+		<u-select class="pdaSelect" v-model="unitSelectShow" :list="unitSelectList" :default-value="unitSelectDefault" remote :loading="selectSearching" @search="onUnitSearch" @confirm="onUnitConfirm"></u-select>
 	</view>
 </template>
 
@@ -56,6 +61,7 @@ import addBtn from '@/components/addBtn/addBtn.vue';
 import ProcessReturnInItem from '@/components/card/storeGoodsProcessReturnInItem.vue';
 import {
 	getStatusOptions,
+	AUDIT_STATUS,
 	AUDIT_STATUS_MAP,
 	BUSINESS_UNIT_TYPE_PROCESS,
 	WAREHOUSE_TYPE_FINISHED,
@@ -64,9 +70,11 @@ import {
 	fetchAllOrderList,
 } from '@/common/storeGoodsProcessReturnIn';
 import { withNameParam } from '@/common/remoteSelect';
+import listFilterMixin from '@/mixins/listFilterMixin';
 
 export default {
 	components: { addBtn, ProcessReturnInItem },
+	mixins: [listFilterMixin],
 	data() {
 		return {
 			list: [],
@@ -83,13 +91,14 @@ export default {
 			selectSearching: false,
 			unitSearchSeq: 0,
 			unitSelectList: [{ value: '', label: '全部' }],
+			filterStorageKey: 'storeGoodsProcessReturnInListFilters_v2',
 			filters: {
 				order_no: '',
 				process_unit_id: '',
 				process_name: '',
 				warehouse_id: '',
 				warehouse_name: '',
-				audit_status: '',
+				audit_status: AUDIT_STATUS.PENDING,
 			},
 			statusSelectList: [
 				{ value: '', label: '全部' },
@@ -111,6 +120,7 @@ export default {
 	},
 	onLoad() {
 		uni.setNavigationBarTitle({ title: '加工退货进仓列表' });
+		this.restoreFilterCache();
 		uni.getSystemInfo({
 			success: (res) => {
 				this.scrollHeight = `${res.windowHeight - 50}px`;
@@ -121,6 +131,16 @@ export default {
 		this.loadList();
 	},
 	methods: {
+		createDefaultFilters() {
+			return {
+				order_no: '',
+				process_unit_id: '',
+				process_name: '',
+				warehouse_id: '',
+				warehouse_name: '',
+				audit_status: AUDIT_STATUS.PENDING,
+			};
+		},
 		loadProcessUnitOptions() {
 			if (this.processUnitOptions.length) return Promise.resolve(this.processUnitOptions);
 			return this.$u.api.businessUnit.list({ unit_type_id: BUSINESS_UNIT_TYPE_PROCESS })
@@ -145,10 +165,6 @@ export default {
 					return this.warehouseOptions;
 				});
 		},
-		applyUnitSelectList(list) {
-			const rows = Array.isArray(list) ? list.slice() : [];
-			this.unitSelectList = [{ value: '', label: '全部' }].concat(rows);
-		},
 		openUnitSelect(type) {
 			this.unitSelectType = type;
 			const cache = type === 'warehouse' ? this.warehouseOptions : this.processUnitOptions;
@@ -170,7 +186,7 @@ export default {
 					if (type === 'warehouse') this.warehouseOptions = list;
 					else this.processUnitOptions = list;
 				}
-				this.applyUnitSelectList(list);
+				this.applyUnitSelectList(list, empty);
 			}).catch((e) => {
 				if (seq !== this.unitSearchSeq) return;
 				uni.showToast({ title: (e && e.message) || '搜索失败', icon: 'none' });
@@ -199,12 +215,13 @@ export default {
 		loadList() {
 			if (this.listLoading) return;
 			this.listLoading = true;
+			const filters = this.appliedFilters || this.filters;
 			const params = {};
-			if (this.filters.order_no) params.order_no = this.filters.order_no;
+			if (filters.order_no) params.order_no = filters.order_no;
-			if (this.filters.process_unit_id) params.supplier_id = this.filters.process_unit_id;
+			if (filters.process_unit_id) params.supplier_id = filters.process_unit_id;
-			if (this.filters.warehouse_id) params.warehouse_id = this.filters.warehouse_id;
+			if (filters.warehouse_id) params.warehouse_id = filters.warehouse_id;
-			if (this.filters.audit_status !== '' && this.filters.audit_status !== null) {
+			if (this.hasFilterValue(filters.audit_status)) {
-				params.audit_status = this.filters.audit_status;
+				params.audit_status = filters.audit_status;
 			}
 			fetchAllOrderList((p) => this.$u.api.fpmProcessReturnInOrder.list(p), params)
 				.then((rows) => {
@@ -249,33 +266,10 @@ export default {
 			uni.navigateTo({ url: `./${page}?id=${item.id}` });
 		},
 		openStatusSelect() { this.statusSelectShow = true; },
-		onStatusConfirm(e) { this.filters.audit_status = e[0].value; },
-		resetFilter() {
-			this.filters = {
-				order_no: '',
-				process_unit_id: '',
-				process_name: '',
-				warehouse_id: '',
-				warehouse_name: '',
-				audit_status: '',
-			};
-		},
-		applyFilter() {
-			this.filterShow = false;
-			this.loadList();
-		},
 	},
 };
 </script>
 
-<style>
+<style lang="scss">
-page { background-color: #F8F8F8; }
+@import '@/common/list-filter.scss';
-.filterBar { display: flex; align-items: center; padding: 16rpx 20rpx; background: #fff; gap: 16rpx; }
-.filterBtn { display: flex; flex-direction: column; align-items: center; font-size: 22rpx; color: #666; min-width: 80rpx; }
-.filterPanel { padding: 30rpx; }
-.filterTitle { font-size: 32rpx; font-weight: bold; margin-bottom: 30rpx; }
-.filterItem { margin-bottom: 24rpx; }
-.filterLabel { display: block; font-size: 28rpx; color: #666; margin-bottom: 12rpx; }
-.filterValue { display: flex; align-items: center; justify-content: space-between; padding: 16rpx; background: #f5f5f5; border-radius: 8rpx; font-size: 28rpx; }
-.filterActions { display: flex; gap: 20rpx; margin-top: 40rpx; }
 </style>

src/pages/storegoods/storeGoodsProcessReturnInMixin.js

@@ -8,6 +8,7 @@
  */
 import util from '@/common/util';
 import scanMixin from '@/common/scanMixin.js';
+import PlusBarcodePanel from '@/components/common/PlusBarcodePanel.vue';
 import remoteSelectMixin from '@/common/remoteSelectMixin.js';
 import { withNameParam } from '@/common/remoteSelect';
 import { initTts, speak } from '@/common/tts.js';
@@ -33,6 +34,7 @@ import {
 } from '@/common/storeGoodsProcessReturnIn';
 
 export default {
+	components: { PlusBarcodePanel },
 	mixins: [scanMixin, remoteSelectMixin],
 	data() {
 		return {
@@ -40,6 +42,7 @@ export default {
 			orderId: 0,
 			form: this.getEmptyForm(),
 			headerSaved: false,
+			headerCollapsed: false,
 			selectShow: false,
 			selectList: [],
 			selectType: '',
@@ -98,6 +101,11 @@ export default {
 			if (!this.warehouseBinId && !this.BarCodeDelStatus) return '请先扫描仓位后再扫布匹二维码';
 			return '当前状态不可扫码';
 		},
+		phoneScanHint() {
+			return this.phoneScanTarget === 'bin'
+				? '请扫描仓位，成功后自动扫布飞'
+				: '连续扫描布飞二维码，扫完可继续下一条';
+		},
 	},
 	onShow() {
 		this.isPageActive = true;
@@ -122,6 +130,9 @@ export default {
 			this.warehouseBinCode = '';
 			this.warehouseBinName = '';
 			this.phoneContinuousScan = false;
+			this._phoneBinLocked = false;
+			this._pendingFabricCode = '';
+			if (this.phoneScanTarget === 'bin') this.closePhoneScanPanel();
 		},
 		/** 重扫仓位：先清空输入框再填入，避免残留旧码拼接 */
 		applyWarehouseBinScan(scanResult) {
@@ -133,19 +144,42 @@ export default {
 				this.$nextTick(() => this.resolveWarehouseBin());
 			});
 		},
+		openHalfScreenScan(target) {
+			if (this.phoneScanPanelOpen && this.phoneScanTarget === target) {
+				this.closePhoneScanPanel();
+				return;
+			}
+			this.phoneContinuousScan = false;
+			if (target === 'bin') this._phoneBinLocked = false;
+			this.phoneScanTarget = target;
+			this.phoneScanPanelOpen = true;
+		},
+		onPlusBarcodeSuccess(scanResult) {
+			const code = String(scanResult || '').trim().replace(/[\r\n]/g, '');
+			if (!code) return;
+			if (this.phoneScanTarget === 'bin') {
+				if (this._phoneBinLocked) {
+					if (!this.warehouseBinId) {
+						this._pendingFabricCode = code;
+						return;
+					}
+					this.phoneScanTarget = 'qr';
+				} else {
+					this._phoneBinLocked = true;
+					this._pendingFabricCode = '';
+					this.applyWarehouseBinScan(code);
+					return;
+				}
+			}
+			this.QRBarCode = code;
+			this.$nextTick(() => this.handleScan());
+		},
 		handleBinPhoneScan() {
 			if (!this.canScan || !this.orderId) {
 				this.showError('请先提交保存后再扫码');
 				return;
 			}
-			this.phoneContinuousScan = false;
+			this.openHalfScreenScan('bin');
-			this.phoneScanTarget = 'bin';
-			this.openPhoneScan({
-				callback: (scanResult) => {
-					this.applyWarehouseBinScan(scanResult);
-				},
-				fail: () => {},
-			});
 		},
 		handlePhoneScan() {
 			if (!this.canScan || !this.orderId) {
@@ -157,11 +191,10 @@ export default {
 				this.handleBinPhoneScan();
 				return;
 			}
-			this.phoneScanTarget = 'qr';
+			this.openHalfScreenScan('qr');
-			this.phoneContinuousScan = true;
-			this.openContinuousPhoneScan();
 		},
 		openContinuousPhoneScan() {
+			if (this.phoneScanPanelOpen) return;
 			if (!this.phoneContinuousScan || !this.canScanQr || !this.isPageActive) {
 				this.phoneContinuousScan = false;
 				return;
@@ -177,6 +210,7 @@ export default {
 			});
 		},
 		scheduleNextPhoneScan() {
+			if (this.phoneScanPanelOpen) return;
 			if (!this.phoneContinuousScan || !this.canScanQr || !this.isPageActive) {
 				this.phoneContinuousScan = false;
 				return;
@@ -234,9 +268,19 @@ export default {
 					this.BillDataMessage = '';
 					speak('仓位成功');
 					uni.showToast({ title: '仓位识别成功', icon: 'success' });
+					if (this.phoneScanPanelOpen) this.phoneScanTarget = 'qr';
+					this._phoneBinLocked = false;
+					const pending = this._pendingFabricCode;
+					this._pendingFabricCode = '';
+					if (pending && this.phoneScanPanelOpen) {
+						this.QRBarCode = pending;
+						this.$nextTick(() => this.handleScan());
+					}
 				})
 				.catch((e) => {
 					uni.hideLoading();
+					this._phoneBinLocked = false;
+					this._pendingFabricCode = '';
 					this.warehouseBinId = 0;
 					this.warehouseBinCode = '';
 					this.warehouseBinName = '';
@@ -247,6 +291,7 @@ export default {
 			const nextCanScan = this.isEditable && canScanAtStatus(status);
 			if (this.canScan && !nextCanScan) {
 				this.phoneContinuousScan = false;
+				this.closePhoneScanPanel();
 				this.unregisterScanBroadcast();
 			}
 			this.canScan = nextCanScan;
@@ -345,6 +390,7 @@ export default {
 					this.orderId = order.id;
 					this.auditStatus = order.audit_status;
 					this.headerSaved = true;
+					this.headerCollapsed = true;
 					this.form = orderToFormFields(order);
 					this.clearWarehouseBin();
 					this.syncCanScanFromStatus(order.audit_status);
@@ -417,9 +463,10 @@ export default {
 					const order = normalizeOrder(detail);
 					this.applyOrder(order);
 					this.headerSaved = true;
+					this.headerCollapsed = true;
 					this.clearWarehouseBin();
 					this.syncCanScanFromStatus(order.audit_status);
-					this.showSuccess('保存成功，请先扫描仓位');
+					this.showSuccess('保存成功，请先扫描仓位', '保存成功', { voiceOnly: true });
 					this.registerOrderScanBroadcast();
 				})
 				.catch((e) => {
@@ -510,6 +557,12 @@ export default {
 							if (order) {
 								this.form.item_data = order.item_data;
 								this.auditStatus = order.audit_status;
+								// 本单匹数/本单数量：取这张单的总匹数、总数量
+								this.scanDetail = {
+									...this.scanDetail,
+									order_roll: order.total_roll,
+									order_weight: order.total_weight,
+								};
 							}
 						})
 						.catch(() => null);
@@ -522,7 +575,8 @@ export default {
 					uni.hideLoading();
 					this.phoneContinuousScan = false;
 					const message = e.message || (isDelete ? '删除失败' : '扫码失败');
-					this.showError(message);
+					speak(isDelete ? '删除失败' : '扫码失败');
+					uni.showToast({ title: message, icon: 'none', duration: 2500 });
 					this.QRBarCode = '';
 				});
 		},
@@ -537,16 +591,16 @@ export default {
 						if (!order) return;
 						this.applyOrder(order);
 						this.syncCanScanFromStatus(order.audit_status);
-						this.showSuccess('操作成功');
+						this.showSuccess(util.statusSuccessVoice(action));
 					}),
 			});
 		},
 		showError(message) {
-			util.playErrorAudio();
+			util.playErrorAudio(message);
 			uni.showModal({ title: '提示', content: message, showCancel: false });
 		},
-		showSuccess(message) {
+		showSuccess(message, voiceText, options) {
-			util.playSuccessAudio();
+			util.playSuccessAudio(voiceText || message, options);
 			uni.showToast({ title: message, icon: 'success' });
 		},
 	},

src/pages/storegoods/storeGoodsProcessReturnInView.vue

@@ -1,11 +1,7 @@
 <template>
 	<view class="fabric-out-page">
+		<OrderHeaderFold v-model="headerCollapsed" :summary="order.order_no">
 		<OrderStatusBar class="fabric-out-mt32" :status="order.audit_status" :name="order.audit_status_name" />
-
-		<view class="flex-white-plr26 ptb10 bdb_f5">
-			<text class="mr26">进仓单号</text>
-			<text>{{ order.order_no }}</text>
-		</view>
 		<view class="flex-white-plr26 ptb20 bdb_f5">
 			<text class="mr26">进仓类型</text>
 			<text>{{ order.in_order_type_name || '加工退货进仓单' }}</text>
@@ -30,6 +26,7 @@
 			<text class="mr26">审核人</text>
 			<text>{{ order.auditor_name }} {{ formatTime(order.audit_time, 'YYYY-MM-DD') }}</text>
 		</view>
+		</OrderHeaderFold>
 
 		<ProcessInDetailList
 			:title="detailTitle"
@@ -43,6 +40,7 @@
 <script>
 import util from '@/common/util';
 import OrderStatusBar from '@/components/storefabric/OrderStatusBar.vue';
+import OrderHeaderFold from '@/components/storefabric/OrderHeaderFold.vue';
 import FabricOutFooter from '@/components/storefabric/FabricOutFooter.vue';
 import ProcessInDetailList from '@/components/storegoods/ProcessInDetailList.vue';
 import {
@@ -53,10 +51,11 @@ import {
 } from '@/common/storeGoodsProcessReturnIn';
 
 export default {
-	components: { OrderStatusBar, FabricOutFooter, ProcessInDetailList },
+	components: { OrderStatusBar, OrderHeaderFold, FabricOutFooter, ProcessInDetailList },
 	data() {
 		return {
 			orderId: 0,
+			headerCollapsed: true,
 			order: { item_data: [] },
 		};
 	},
@@ -102,18 +101,25 @@ export default {
 			confirmOrderStatusAction(this, {
 				orderId: this.orderId,
 				action,
-				onSuccess: () => this.$u.api.fpmProcessReturnInOrder.detail({ id: this.orderId })
+				onSuccess: () => {
-					.then((res) => {
+					uni.hideLoading();
-						uni.hideLoading();
+					const voice = util.statusSuccessVoice(action);
-						const order = normalizeOrder(res);
+					util.playSuccessAudio(voice);
-						if (order) this.order = order;
+					uni.showToast({ title: voice, icon: 'success' });
-						util.playSuccessAudio();
+					if (action === 'unapprove') {
-						uni.showToast({ title: '操作成功', icon: 'success' });
+						uni.redirectTo({ url: `./storeGoodsProcessReturnInEdit?id=${this.orderId}` });
-					}),
+						return;
+					}
+					return this.$u.api.fpmProcessReturnInOrder.detail({ id: this.orderId })
+						.then((res) => {
+							const order = normalizeOrder(res);
+							if (order) this.order = order;
+						});
+				},
 			});
 		},
 		showError(message) {
-			util.playErrorAudio();
+			util.playErrorAudio(message);
 			uni.showModal({ title: '提示', content: message, showCancel: false });
 		},
 	},

src/pages/storegoods/storeGoodsPurchaseInAdd.vue

@@ -1,11 +1,7 @@
 <template>
 	<view class="fabric-out-page">
+		<OrderHeaderFold v-model="headerCollapsed" :summary="form.order_no || '保存后自动生成'">
 		<OrderStatusBar class="fabric-out-mt32" :status="displayAuditStatus" :name="displayAuditStatusName" />
-
-		<view class="flex-white-plr26 ptb10 bdb_f5">
-			<text class="mr26">进仓单号</text>
-			<u-input disabled placeholder="保存后自动生成" v-model="form.order_no" />
-		</view>
 		<view @click="pickerSelectFun('供应商')" class="flex-white-plr26 ptb20 bdb_f5">
 			<text class="mr26">供应商<text class="redXingh">*</text></text>
 			<view :class="form.biz_unit_name ? '' : 'cBlack'">
@@ -62,13 +58,21 @@
 			<view style="margin-bottom: 8rpx;"><text>单据备注</text></view>
 			<u-input v-model="form.remark" :disabled="!headerEditable" type="textarea" :border="true" :height="100" :auto-height="true" />
 		</view>
+		</OrderHeaderFold>
 
+		<PlusBarcodePanel
+			:visible.sync="phoneScanPanelOpen"
+			:hint-text="phoneScanHint"
+			:scan-time-space="1200"
+			@success="onPlusBarcodeSuccess"
+		/>
 		<ProcessInBinBar
 			:can-scan="canScan"
 			:bin-id="warehouseBinId"
 			:code="warehouseBinCode"
 			:name="warehouseBinName"
 			:show-phone-scan="canScan"
+			:scanning="phoneScanPanelOpen && phoneScanTarget === 'bin'"
 			@code-input="warehouseBinCode = $event"
 			@confirm="resolveWarehouseBin"
 			@phone-scan="handleBinPhoneScan"
@@ -81,6 +85,7 @@
 			:message="BillDataMessage"
 			:disabled-tip="qrDisabledTip"
 			:show-phone-scan="canScanQr"
+			:scanning="phoneScanPanelOpen && phoneScanTarget === 'qr'"
 			@input="QRBarCode = $event"
 			@scan="handleScan"
 			@phone-scan="handlePhoneScan"
@@ -114,15 +119,19 @@
 <script>
 import formMixin from './storeGoodsPurchaseInMixin.js';
 import OrderStatusBar from '@/components/storefabric/OrderStatusBar.vue';
+import OrderHeaderFold from '@/components/storefabric/OrderHeaderFold.vue';
 import FabricOutScanBar from '@/components/storefabric/FabricOutScanBar.vue';
 import FabricOutFooter from '@/components/storefabric/FabricOutFooter.vue';
 import ProcessInScanDetail from '@/components/storegoods/ProcessInScanDetail.vue';
 import ProcessInDetailList from '@/components/storegoods/ProcessInDetailList.vue';
 import ProcessInBinBar from '@/components/storegoods/ProcessInBinBar.vue';
+import PlusBarcodePanel from '@/components/common/PlusBarcodePanel.vue';
 
 export default {
 	components: {
+		PlusBarcodePanel,
 		OrderStatusBar,
+		OrderHeaderFold,
 		FabricOutScanBar,
 		FabricOutFooter,
 		ProcessInScanDetail,

src/pages/storegoods/storeGoodsPurchaseInEdit.vue

@@ -1,11 +1,7 @@
 <template>
 	<view class="fabric-out-page">
+		<OrderHeaderFold v-model="headerCollapsed" :summary="form.order_no">
 		<OrderStatusBar class="fabric-out-mt32" :status="displayAuditStatus" :name="displayAuditStatusName" />
-
-		<view class="flex-white-plr26 ptb10 bdb_f5">
-			<text class="mr26">进仓单号</text>
-			<text>{{ form.order_no }}</text>
-		</view>
 		<view class="flex-white-plr26 ptb20 bdb_f5">
 			<text class="mr26">供应商</text>
 			<text>{{ form.biz_unit_name || '-' }}</text>
@@ -50,13 +46,21 @@
 			<text class="mr26">单据备注</text>
 			<text>{{ form.remark || '-' }}</text>
 		</view>
+		</OrderHeaderFold>
 
+		<PlusBarcodePanel
+			:visible.sync="phoneScanPanelOpen"
+			:hint-text="phoneScanHint"
+			:scan-time-space="1200"
+			@success="onPlusBarcodeSuccess"
+		/>
 		<ProcessInBinBar
 			:can-scan="canScan"
 			:bin-id="warehouseBinId"
 			:code="warehouseBinCode"
 			:name="warehouseBinName"
 			:show-phone-scan="canScan"
+			:scanning="phoneScanPanelOpen && phoneScanTarget === 'bin'"
 			@code-input="warehouseBinCode = $event"
 			@confirm="resolveWarehouseBin"
 			@phone-scan="handleBinPhoneScan"
@@ -69,6 +73,7 @@
 			:message="BillDataMessage"
 			:disabled-tip="qrDisabledTip"
 			:show-phone-scan="canScanQr"
+			:scanning="phoneScanPanelOpen && phoneScanTarget === 'qr'"
 			@input="QRBarCode = $event"
 			@scan="handleScan"
 			@phone-scan="handlePhoneScan"
@@ -92,15 +97,19 @@
 <script>
 import formMixin from './storeGoodsPurchaseInMixin.js';
 import OrderStatusBar from '@/components/storefabric/OrderStatusBar.vue';
+import OrderHeaderFold from '@/components/storefabric/OrderHeaderFold.vue';
 import FabricOutScanBar from '@/components/storefabric/FabricOutScanBar.vue';
 import FabricOutFooter from '@/components/storefabric/FabricOutFooter.vue';
 import ProcessInScanDetail from '@/components/storegoods/ProcessInScanDetail.vue';
 import ProcessInDetailList from '@/components/storegoods/ProcessInDetailList.vue';
 import ProcessInBinBar from '@/components/storegoods/ProcessInBinBar.vue';
+import PlusBarcodePanel from '@/components/common/PlusBarcodePanel.vue';
 
 export default {
 	components: {
+		PlusBarcodePanel,
 		OrderStatusBar,
+		OrderHeaderFold,
 		FabricOutScanBar,
 		FabricOutFooter,
 		ProcessInScanDetail,
@@ -110,6 +119,7 @@ export default {
 	mixins: [formMixin],
 	data() {
 		return {
+			headerCollapsed: true,
 			weightInputStyle: {
 				fontSize: '36rpx',
 			},

src/pages/storegoods/storeGoodsPurchaseInList.vue

@@ -1,9 +1,12 @@
 <template>
 	<view>
 		<view class="filterBar">
-			<u-search v-model="filters.order_no" placeholder="进仓单号" :show-action="false" @search="loadList" @custom="loadList" />
+			<u-search v-model="filters.order_no" placeholder="进仓单号" :show-action="false" @search="applySearch" @custom="applySearch" @clear="applySearch" />
-			<view class="filterBtn" @click="filterShow = true">
+			<view class="filterBtn" :class="{ 'filter-active': hasActiveFilter }" @click="filterShow = true">
-				<u-icon name="list" size="40" color="#666"></u-icon>
+				<view class="filterBtn__icon">
+					<u-icon :key="filterIconColor" name="list" size="44" :color="filterIconColor"></u-icon>
+					<view v-if="hasActiveFilter" class="filterBtn__badge"></view>
+				</view>
 				<text>筛选</text>
 			</view>
 		</view>
@@ -20,24 +23,26 @@
 
 		<addBtn url="./storeGoodsPurchaseInAdd"></addBtn>
 
-		<u-popup v-model="filterShow" mode="right" width="580rpx" :safe-area-inset-bottom="true">
+		<u-popup v-model="filterShow" mode="right" width="580rpx" :safe-area-inset-bottom="true" @close="cancelFilterEdit">
 			<view class="filterPanel">
 				<view class="filterTitle">筛选条件</view>
 				<view class="filterItem">
 					<text class="filterLabel">进仓单号</text>
-					<u-input v-model="filters.order_no" placeholder="请输入进仓单号" />
+					<view class="filterInput">
+						<u-input v-model="filters.order_no" placeholder="请输入进仓单号" :height="100" :custom-style="{ fontSize: '36rpx', color: '#202328' }" placeholder-style="color: #aeb4bf; font-size: 34rpx;" />
+					</view>
 				</view>
 				<view class="filterItem" @click="openSupplierSelect">
 					<text class="filterLabel">供应商</text>
-					<view class="filterValue">{{ supplierLabel || '全部' }} <u-icon name="arrow-right" size="28"></u-icon></view>
+					<view class="filterValue">{{ supplierLabel || '全部' }} <u-icon name="arrow-right" size="36"></u-icon></view>
 				</view>
 				<view class="filterItem" @click="openWarehouseSelect">
 					<text class="filterLabel">仓库</text>
-					<view class="filterValue">{{ warehouseLabel || '全部' }} <u-icon name="arrow-right" size="28"></u-icon></view>
+					<view class="filterValue">{{ warehouseLabel || '全部' }} <u-icon name="arrow-right" size="36"></u-icon></view>
 				</view>
 				<view class="filterItem" @click="openStatusSelect">
 					<text class="filterLabel">订单状态</text>
-					<view class="filterValue">{{ statusLabel || '全部' }} <u-icon name="arrow-right" size="28"></u-icon></view>
+					<view class="filterValue">{{ statusLabel || '全部' }} <u-icon name="arrow-right" size="36"></u-icon></view>
 				</view>
 				<view class="filterActions">
 					<u-button type="warning" size="medium" @click="resetFilter">重置</u-button>
@@ -46,8 +51,8 @@
 			</view>
 		</u-popup>
 
-		<u-select v-model="statusSelectShow" :list="statusSelectList" @confirm="onStatusConfirm"></u-select>
+		<u-select class="pdaSelect" v-model="statusSelectShow" title="选择订单状态" :list="statusSelectList" :default-value="statusSelectDefault" @confirm="onStatusConfirm"></u-select>
-		<u-select v-model="unitSelectShow" :list="unitSelectList" remote :loading="selectSearching" @search="onUnitSearch" @confirm="onUnitConfirm"></u-select>
+		<u-select class="pdaSelect" v-model="unitSelectShow" :list="unitSelectList" :default-value="unitSelectDefault" remote :loading="selectSearching" @search="onUnitSearch" @confirm="onUnitConfirm"></u-select>
 	</view>
 </template>
 
@@ -56,6 +61,7 @@ import addBtn from '@/components/addBtn/addBtn.vue';
 import PurchaseInItem from '@/components/card/storeGoodsPurchaseInItem.vue';
 import {
 	getStatusOptions,
+	AUDIT_STATUS,
 	AUDIT_STATUS_MAP,
 	BUSINESS_UNIT_TYPE_PRODUCT_SUPPLIER,
 	WAREHOUSE_TYPE_FINISHED,
@@ -64,9 +70,11 @@ import {
 	fetchAllOrderList,
 } from '@/common/storeGoodsPurchaseIn';
 import { withNameParam } from '@/common/remoteSelect';
+import listFilterMixin from '@/mixins/listFilterMixin';
 
 export default {
 	components: { addBtn, PurchaseInItem },
+	mixins: [listFilterMixin],
 	data() {
 		return {
 			list: [],
@@ -83,13 +91,14 @@ export default {
 			selectSearching: false,
 			unitSearchSeq: 0,
 			unitSelectList: [{ value: '', label: '全部' }],
+			filterStorageKey: 'storeGoodsPurchaseInListFilters_v2',
 			filters: {
 				order_no: '',
 				supplier_id: '',
 				supplier_name: '',
 				warehouse_id: '',
 				warehouse_name: '',
-				audit_status: '',
+				audit_status: AUDIT_STATUS.PENDING,
 			},
 			statusSelectList: [
 				{ value: '', label: '全部' },
@@ -111,6 +120,7 @@ export default {
 	},
 	onLoad() {
 		uni.setNavigationBarTitle({ title: '成品采购进仓' });
+		this.restoreFilterCache();
 		uni.getSystemInfo({
 			success: (res) => {
 				this.scrollHeight = `${res.windowHeight - 50}px`;
@@ -121,6 +131,16 @@ export default {
 		this.loadList();
 	},
 	methods: {
+		createDefaultFilters() {
+			return {
+				order_no: '',
+				supplier_id: '',
+				supplier_name: '',
+				warehouse_id: '',
+				warehouse_name: '',
+				audit_status: AUDIT_STATUS.PENDING,
+			};
+		},
 		loadSupplierOptions() {
 			if (this.supplierOptions.length) return Promise.resolve(this.supplierOptions);
 			return this.$u.api.businessUnit.list({ unit_type_id: BUSINESS_UNIT_TYPE_PRODUCT_SUPPLIER })
@@ -145,10 +165,6 @@ export default {
 					return this.warehouseOptions;
 				});
 		},
-		applyUnitSelectList(list) {
-			const rows = Array.isArray(list) ? list.slice() : [];
-			this.unitSelectList = [{ value: '', label: '全部' }].concat(rows);
-		},
 		openUnitSelect(type) {
 			this.unitSelectType = type;
 			const cache = type === 'warehouse' ? this.warehouseOptions : this.supplierOptions;
@@ -170,7 +186,7 @@ export default {
 					if (type === 'warehouse') this.warehouseOptions = list;
 					else this.supplierOptions = list;
 				}
-				this.applyUnitSelectList(list);
+				this.applyUnitSelectList(list, empty);
 			}).catch((e) => {
 				if (seq !== this.unitSearchSeq) return;
 				uni.showToast({ title: (e && e.message) || '搜索失败', icon: 'none' });
@@ -199,12 +215,13 @@ export default {
 		loadList() {
 			if (this.listLoading) return;
 			this.listLoading = true;
+			const filters = this.appliedFilters || this.filters;
 			const params = {};
-			if (this.filters.order_no) params.order_no = this.filters.order_no;
+			if (filters.order_no) params.order_no = filters.order_no;
-			if (this.filters.supplier_id) params.supplier_id = this.filters.supplier_id;
+			if (filters.supplier_id) params.supplier_id = filters.supplier_id;
-			if (this.filters.warehouse_id) params.warehouse_id = this.filters.warehouse_id;
+			if (filters.warehouse_id) params.warehouse_id = filters.warehouse_id;
-			if (this.filters.audit_status !== '' && this.filters.audit_status !== null) {
+			if (this.hasFilterValue(filters.audit_status)) {
-				params.audit_status = this.filters.audit_status;
+				params.audit_status = filters.audit_status;
 			}
 			fetchAllOrderList((p) => this.$u.api.fpmPrcInOrder.list(p), params)
 				.then((rows) => {
@@ -249,33 +266,10 @@ export default {
 			uni.navigateTo({ url: `./${page}?id=${item.id}` });
 		},
 		openStatusSelect() { this.statusSelectShow = true; },
-		onStatusConfirm(e) { this.filters.audit_status = e[0].value; },
-		resetFilter() {
-			this.filters = {
-				order_no: '',
-				supplier_id: '',
-				supplier_name: '',
-				warehouse_id: '',
-				warehouse_name: '',
-				audit_status: '',
-			};
-		},
-		applyFilter() {
-			this.filterShow = false;
-			this.loadList();
-		},
 	},
 };
 </script>
 
-<style>
+<style lang="scss">
-page { background-color: #F8F8F8; }
+@import '@/common/list-filter.scss';
-.filterBar { display: flex; align-items: center; padding: 16rpx 20rpx; background: #fff; gap: 16rpx; }
-.filterBtn { display: flex; flex-direction: column; align-items: center; font-size: 22rpx; color: #666; min-width: 80rpx; }
-.filterPanel { padding: 30rpx; }
-.filterTitle { font-size: 32rpx; font-weight: bold; margin-bottom: 30rpx; }
-.filterItem { margin-bottom: 24rpx; }
-.filterLabel { display: block; font-size: 28rpx; color: #666; margin-bottom: 12rpx; }
-.filterValue { display: flex; align-items: center; justify-content: space-between; padding: 16rpx; background: #f5f5f5; border-radius: 8rpx; font-size: 28rpx; }
-.filterActions { display: flex; gap: 20rpx; margin-top: 40rpx; }
 </style>

src/pages/storegoods/storeGoodsPurchaseInMixin.js

@@ -8,6 +8,7 @@
  */
 import util from '@/common/util';
 import scanMixin from '@/common/scanMixin.js';
+import PlusBarcodePanel from '@/components/common/PlusBarcodePanel.vue';
 import remoteSelectMixin from '@/common/remoteSelectMixin.js';
 import { withNameParam } from '@/common/remoteSelect';
 import { initTts, speak } from '@/common/tts.js';
@@ -40,6 +41,7 @@ import {
 } from '@/common/storeGoodsPurchaseIn';
 
 export default {
+	components: { PlusBarcodePanel },
 	mixins: [scanMixin, remoteSelectMixin],
 	data() {
 		return {
@@ -47,6 +49,7 @@ export default {
 			orderId: 0,
 			form: this.getEmptyForm(),
 			headerSaved: false,
+			headerCollapsed: false,
 			selectShow: false,
 			selectList: [],
 			selectType: '',
@@ -111,6 +114,11 @@ export default {
 			if (!this.warehouseBinId && !this.BarCodeDelStatus) return '请先扫描仓位后再扫布匹二维码';
 			return '当前状态不可扫码';
 		},
+		phoneScanHint() {
+			return this.phoneScanTarget === 'bin'
+				? '请扫描仓位，成功后自动扫布飞'
+				: '连续扫描布飞二维码，扫完可继续下一条';
+		},
 	},
 	onShow() {
 		this.isPageActive = true;
@@ -135,6 +143,9 @@ export default {
 			this.warehouseBinCode = '';
 			this.warehouseBinName = '';
 			this.phoneContinuousScan = false;
+			this._phoneBinLocked = false;
+			this._pendingFabricCode = '';
+			if (this.phoneScanTarget === 'bin') this.closePhoneScanPanel();
 		},
 		/** 重扫仓位：先清空输入框再填入，避免残留旧码拼接 */
 		applyWarehouseBinScan(scanResult) {
@@ -146,19 +157,42 @@ export default {
 				this.$nextTick(() => this.resolveWarehouseBin());
 			});
 		},
+		openHalfScreenScan(target) {
+			if (this.phoneScanPanelOpen && this.phoneScanTarget === target) {
+				this.closePhoneScanPanel();
+				return;
+			}
+			this.phoneContinuousScan = false;
+			if (target === 'bin') this._phoneBinLocked = false;
+			this.phoneScanTarget = target;
+			this.phoneScanPanelOpen = true;
+		},
+		onPlusBarcodeSuccess(scanResult) {
+			const code = String(scanResult || '').trim().replace(/[\r\n]/g, '');
+			if (!code) return;
+			if (this.phoneScanTarget === 'bin') {
+				if (this._phoneBinLocked) {
+					if (!this.warehouseBinId) {
+						this._pendingFabricCode = code;
+						return;
+					}
+					this.phoneScanTarget = 'qr';
+				} else {
+					this._phoneBinLocked = true;
+					this._pendingFabricCode = '';
+					this.applyWarehouseBinScan(code);
+					return;
+				}
+			}
+			this.QRBarCode = code;
+			this.$nextTick(() => this.handleScan());
+		},
 		handleBinPhoneScan() {
 			if (!this.canScan || !this.orderId) {
 				this.showError('请先提交保存后再扫码');
 				return;
 			}
-			this.phoneContinuousScan = false;
+			this.openHalfScreenScan('bin');
-			this.phoneScanTarget = 'bin';
-			this.openPhoneScan({
-				callback: (scanResult) => {
-					this.applyWarehouseBinScan(scanResult);
-				},
-				fail: () => {},
-			});
 		},
 		handlePhoneScan() {
 			if (!this.canScan || !this.orderId) {
@@ -170,11 +204,10 @@ export default {
 				this.handleBinPhoneScan();
 				return;
 			}
-			this.phoneScanTarget = 'qr';
+			this.openHalfScreenScan('qr');
-			this.phoneContinuousScan = true;
-			this.openContinuousPhoneScan();
 		},
 		openContinuousPhoneScan() {
+			if (this.phoneScanPanelOpen) return;
 			if (!this.phoneContinuousScan || !this.canScanQr || !this.isPageActive) {
 				this.phoneContinuousScan = false;
 				return;
@@ -190,6 +223,7 @@ export default {
 			});
 		},
 		scheduleNextPhoneScan() {
+			if (this.phoneScanPanelOpen) return;
 			if (!this.phoneContinuousScan || !this.canScanQr || !this.isPageActive) {
 				this.phoneContinuousScan = false;
 				return;
@@ -247,9 +281,19 @@ export default {
 					this.BillDataMessage = '';
 					speak('仓位成功');
 					uni.showToast({ title: '仓位识别成功', icon: 'success' });
+					if (this.phoneScanPanelOpen) this.phoneScanTarget = 'qr';
+					this._phoneBinLocked = false;
+					const pending = this._pendingFabricCode;
+					this._pendingFabricCode = '';
+					if (pending && this.phoneScanPanelOpen) {
+						this.QRBarCode = pending;
+						this.$nextTick(() => this.handleScan());
+					}
 				})
 				.catch((e) => {
 					uni.hideLoading();
+					this._phoneBinLocked = false;
+					this._pendingFabricCode = '';
 					this.warehouseBinId = 0;
 					this.warehouseBinCode = '';
 					this.warehouseBinName = '';
@@ -260,6 +304,7 @@ export default {
 			const nextCanScan = this.isEditable && canScanAtStatus(status);
 			if (this.canScan && !nextCanScan) {
 				this.phoneContinuousScan = false;
+				this.closePhoneScanPanel();
 				this.unregisterScanBroadcast();
 			}
 			this.canScan = nextCanScan;
@@ -411,6 +456,7 @@ export default {
 					this.orderId = order.id;
 					this.auditStatus = order.audit_status;
 					this.headerSaved = true;
+					this.headerCollapsed = true;
 					this.form = orderToFormFields(order);
 					this.clearWarehouseBin();
 					this.syncCanScanFromStatus(order.audit_status);
@@ -499,9 +545,10 @@ export default {
 					const order = normalizeOrder(detail);
 					this.applyOrder(order, { keepWeights: true });
 					this.headerSaved = true;
+					this.headerCollapsed = true;
 					this.clearWarehouseBin();
 					this.syncCanScanFromStatus(order.audit_status);
-					this.showSuccess('保存成功，请先扫描仓位');
+					this.showSuccess('保存成功，请先扫描仓位', '保存成功', { voiceOnly: true });
 					this.registerOrderScanBroadcast();
 				})
 				.catch((e) => {
@@ -615,6 +662,12 @@ export default {
 							if (order) {
 								this.form.item_data = order.item_data;
 								this.auditStatus = order.audit_status;
+								// 本单匹数/本单数量：取这张单的总匹数、总数量
+								this.scanDetail = {
+									...this.scanDetail,
+									order_roll: order.total_roll,
+									order_weight: order.total_weight,
+								};
 							}
 						})
 						.catch(() => null);
@@ -627,7 +680,8 @@ export default {
 					uni.hideLoading();
 					this.phoneContinuousScan = false;
 					const message = e.message || (isDelete ? '删除失败' : '扫码失败');
-					this.showError(message);
+					speak(isDelete ? '删除失败' : '扫码失败');
+					uni.showToast({ title: message, icon: 'none', duration: 2500 });
 					this.QRBarCode = '';
 				});
 		},
@@ -642,16 +696,16 @@ export default {
 						if (!order) return;
 						this.applyOrder(order);
 						this.syncCanScanFromStatus(order.audit_status);
-						this.showSuccess('操作成功');
+						this.showSuccess(util.statusSuccessVoice(action));
 					}),
 			});
 		},
 		showError(message) {
-			util.playErrorAudio();
+			util.playErrorAudio(message);
 			uni.showModal({ title: '提示', content: message, showCancel: false });
 		},
-		showSuccess(message) {
+		showSuccess(message, voiceText, options) {
-			util.playSuccessAudio();
+			util.playSuccessAudio(voiceText || message, options);
 			uni.showToast({ title: message, icon: 'success' });
 		},
 	},

src/pages/storegoods/storeGoodsPurchaseInView.vue

@@ -1,11 +1,7 @@
 <template>
 	<view class="fabric-out-page">
+		<OrderHeaderFold v-model="headerCollapsed" :summary="order.order_no">
 		<OrderStatusBar class="fabric-out-mt32" :status="order.audit_status" :name="order.audit_status_name" />
-
-		<view class="flex-white-plr26 ptb10 bdb_f5">
-			<text class="mr26">进仓单号</text>
-			<text>{{ order.order_no }}</text>
-		</view>
 		<view class="flex-white-plr26 ptb20 bdb_f5">
 			<text class="mr26">供应商</text>
 			<text>{{ order.biz_unit_name || '-' }}</text>
@@ -44,6 +40,7 @@
 			<text class="mr26">审核人</text>
 			<text>{{ order.auditor_name }} {{ formatTime(order.audit_time, 'YYYY-MM-DD') }}</text>
 		</view>
+		</OrderHeaderFold>
 
 		<ProcessInDetailList
 			:title="detailTitle"
@@ -58,6 +55,7 @@
 <script>
 import util from '@/common/util';
 import OrderStatusBar from '@/components/storefabric/OrderStatusBar.vue';
+import OrderHeaderFold from '@/components/storefabric/OrderHeaderFold.vue';
 import FabricOutFooter from '@/components/storefabric/FabricOutFooter.vue';
 import ProcessInDetailList from '@/components/storegoods/ProcessInDetailList.vue';
 import {
@@ -68,10 +66,11 @@ import {
 } from '@/common/storeGoodsPurchaseIn';
 
 export default {
-	components: { OrderStatusBar, FabricOutFooter, ProcessInDetailList },
+	components: { OrderStatusBar, OrderHeaderFold, FabricOutFooter, ProcessInDetailList },
 	data() {
 		return {
 			orderId: 0,
+			headerCollapsed: true,
 			order: { item_data: [] },
 		};
 	},
@@ -117,18 +116,25 @@ export default {
 			confirmOrderStatusAction(this, {
 				orderId: this.orderId,
 				action,
-				onSuccess: () => this.$u.api.fpmPrcInOrder.detail({ id: this.orderId })
+				onSuccess: () => {
-					.then((res) => {
+					uni.hideLoading();
-						uni.hideLoading();
+					const voice = util.statusSuccessVoice(action);
-						const order = normalizeOrder(res);
+					util.playSuccessAudio(voice);
-						if (order) this.order = order;
+					uni.showToast({ title: voice, icon: 'success' });
-						util.playSuccessAudio();
+					if (action === 'unapprove') {
-						uni.showToast({ title: '操作成功', icon: 'success' });
+						uni.redirectTo({ url: `./storeGoodsPurchaseInEdit?id=${this.orderId}` });
-					}),
+						return;
+					}
+					return this.$u.api.fpmPrcInOrder.detail({ id: this.orderId })
+						.then((res) => {
+							const order = normalizeOrder(res);
+							if (order) this.order = order;
+						});
+				},
 			});
 		},
 		showError(message) {
-			util.playErrorAudio();
+			util.playErrorAudio(message);
 			uni.showModal({ title: '提示', content: message, showCancel: false });
 		},
 	},

src/pages/sys/login/index.vue

@@ -4,6 +4,7 @@
 		<view class="haotoplogo">
 			<image src="/static/haotop/image/logo/Start.jpg" mode="aspectFit" class="logoimg"></image>
 		</view>
+		<view class="app-name">{{ appName }}</view>
 		<!--		<div v-if="loginType === 'currentPhone'">-->
 		<!-- <u-tabs :list="list" :is-scroll="false" :current="current" @change="onClickItem"></u-tabs> -->
 		<!-- <view v-if="current === 0"> -->
@@ -103,7 +104,8 @@
 		<!--				</view>-->
 		<!--			</view>-->
 		<!--		</div>-->
-		<u-select class="login-env-picker" v-model="showApiUrlPicker" :list="apiUrlList" title="选择服务器"
+		<u-select class="login-env-picker" v-model="showApiUrlPicker" :list="apiUrlList" :default-value="apiUrlDefaultIndex"
+			title="选择服务器" :show-search="false" :item-height="88" :visible-item-count="5"
 			@confirm="onApiUrlConfirm" @cancel="showApiUrlPicker = false"></u-select>
 		<!-- 版本信息显示 -->
 		<view class="version-info">
@@ -124,6 +126,7 @@ import manifest from '@/manifest.json';
 import { mapState } from 'vuex'
 import app_upgrade from '@/uni_modules/app-upgrade/js_sdk/index.js'
 import { applyLoginData, applyUserInformation } from '@/common/userSession.js'
+import { ensureScanConfigAfterLogin } from '@/common/scanAutoConfig.js'
 export default {
 	data() {
 		return {
@@ -135,10 +138,8 @@ export default {
 				password: ""
 			},
 			showApiUrlPicker: false,
-			// 暂时在打包后也展示服务器选项；生产包默认正式环境
+			// 登录默认正式环境，本地已选过的地址仍会在 onShow 里恢复
-			selectedApiUrl: config.isDevelopment
+			selectedApiUrl: (config.devApiUrlOptions.find(item => item.label === '正式环境') || {}).value || config.productionApiUrl,
-				? config.devApiUrlOptions[0].value
-				: ((config.devApiUrlOptions.find(item => item.label === '正式环境') || {}).value || config.productionApiUrl),
 			customApiUrl: 'http://192.168.1.66:50002/hcscm/pda/v1',
 			apiUrlList: config.devApiUrlOptions,
 			phoneNo: '',
@@ -160,11 +161,20 @@ export default {
 		};
 	},
 	computed: {
+		appName() {
+			return manifest.name || '';
+		},
 		appVersion() {
 			return manifest.versionName;
 		},
 		envName() {
 			return process.env.VUE_APP_ENV_NAME || '';
+		},
+		apiUrlDefaultIndex() {
+			const list = this.apiUrlList || [];
+			let index = list.findIndex(item => item.value === this.selectedApiUrl);
+			if (index < 0) index = list.findIndex(item => item.label === '正式环境');
+			return [index >= 0 ? index : 0];
 		}
 	},
 
@@ -292,6 +302,16 @@ export default {
 					}
 				});
 		},
+		isDefaultPassword(loginData) {
+			const value = loginData && loginData.is_default_password;
+			return value === true || value === 1 || value === '1' || value === 'true';
+		},
+		enterWorkbench(openPasswordPage) {
+			const url = openPasswordPage
+				? '/pages/sys/workbench/index?changePassword=1'
+				: '/pages/sys/workbench/index';
+			uni.reLaunch({ url });
+		},
 		submit(loginType = '1') {
 			uni.showLoading({
 				title: '登录中...'
@@ -345,31 +365,47 @@ export default {
 					console.log('information error', infoError);
 				}
 
-				setTimeout(() => {
+				try {
-					uni.reLaunch({
+					await ensureScanConfigAfterLogin(this.$u.api);
-						url: '/pages/sys/workbench/index'
+				} catch (scanError) {
-					});
+					console.log('自动匹配扫码设置失败', scanError);
-				}, 500);
+				}
 
-				var that = this
+				if (this.remember == true) {
-				if (that.remember == true) {
 					if ((this.login.username.length > 0) && (this.login.password.length > 0)) {
 						uni.setStorage({
 							key: 'UserInfo',
-							data: that.login
+							data: this.login
 						})
 					}
+				}
 
+				this.$store.dispatch('initNotification');
+				uni.hideLoading();
+
+				if (this.isDefaultPassword(aLoginUserData)) {
+					uni.showModal({
+						title: '提示',
+						content: '当前使用的是默认密码，请及时修改密码',
+						confirmText: '去修改',
+						cancelText: '稍后',
+						success: (modalRes) => {
+							this.enterWorkbench(!!(modalRes && modalRes.confirm));
+						},
+						fail: () => {
+							this.enterWorkbench(false);
+						}
+					});
+					return;
 				}
 
 				uni.showToast({
 					icon: 'none',
 					title: '登录成功!'
 				});
-				this.$store.dispatch('initNotification');
+				setTimeout(() => {
-				setTimeout(function () {
+					this.enterWorkbench(false);
-					uni.hideLoading();
+				}, 500);
-				}, 1000);
 			}).catch((error) => {
 				console.log('login error', error)
 				uni.showToast({
@@ -391,45 +427,42 @@ export default {
 		qqLogin() {
 			this.$u.toast('QQ 登录');
 		},
-		// 自动检查版本更新
+		// 自动检查版本更新（有新版本才弹窗，已是最新不提示）
 		autoCheckUpgrade() {
-			console.log('autoCheckUpgrade 开始执行');
+			this.runUpgradeCheck({ silentWhenLatest: true });
+		},
+		runUpgradeCheck({ silentWhenLatest }) {
 			const self = this;
-
+			app_upgrade(async () => {
-			app_upgrade(async (versionCode) => {
-				console.log('app_upgrade 回调被执行, versionCode:', versionCode);
 				try {
-					// 获取应用信息
 					const appInfo = await new Promise((resolve) => {
 						plus.runtime.getProperty(plus.runtime.appid, (inf) => {
 							resolve(inf);
 						});
 					});
-					console.log('appInfo:', appInfo);
-
 					const res = await self.$u.api.upgradeCheck({
 						app_name: config.upgradeName,
 						current_version: appInfo.version
 					});
-
-					console.log('自动检查版本更新结果:', res);
-
 					if (!res || !res.download_url) {
-						// 当前已是最新版本，不提示
+						if (!silentWhenLatest) {
-						console.log('当前已是最新版本');
+							self.$u.toast('当前版本已是最新版');
+						}
 						return { status: 0 };
 					}
-
 					return {
 						changelog: res.message + '，最新版本：' + res.latest_version,
-						status: res.need_update ? 1 : 0, // 0 无新版本 | 1 有新版本
+						status: res.need_update ? 1 : 0,
-						path: res.download_url // 新apk地址
+						path: res.download_url
 					};
 				} catch (error) {
 					console.log('检查版本更新失败:', error);
+					if (!silentWhenLatest) {
+						self.$u.toast('检查更新失败，请稍后重试');
+					}
 					return { status: 0 };
 				}
-			}, 1); // 使用 type=1 强制检查，跳过时间戳检查
+			}, 1);
 		},
 
 		handleBlurInputUrl(e) {
@@ -483,7 +516,16 @@ export default {
 	height: 150rpx;
 	// max-width: 5%;
 	// max-height: 5%;
-	margin: 10rpx auto 10rpx auto;
+	margin: 10rpx auto 0 auto;
+}
+
+.app-name {
+	margin: 8rpx 0 24rpx;
+	color: #242820;
+	font-size: 40rpx;
+	font-weight: 700;
+	line-height: 1.3;
+	text-align: center;
 }
 
 .logoimg {
@@ -569,15 +611,16 @@ export default {
 	justify-content: center;
 	align-items: center;
 	flex-wrap: wrap;
+	padding: 0 24rpx 20rpx;
 }
 
 .version-text {
-	font-size: 24rpx;
+	font-size: 32rpx;
 	color: #999999;
 }
 
 .env-text {
-	font-size: 24rpx;
+	font-size: 32rpx;
 	color: #5473e8;
 	margin-left: 10rpx;
 }
@@ -590,15 +633,13 @@ export default {
 		font-size: 36rpx;
 	}
 
-	::v-deep .u-select__body {
+	::v-deep .u-select__header__title {
-		height: 560rpx;
+		font-size: 36rpx;
 	}
 
 	::v-deep .u-select__body__picker-view__item,
 	::v-deep .u-line-1 {
-		height: 88rpx;
 		font-size: 40rpx;
-		line-height: 88rpx;
 	}
 }
 </style>

src/pages/sys/user/index.vue

@@ -36,21 +36,25 @@
 			!-->
 		</view>
 		<view class="list">
-			<view>
+			<u-gap height="20" bg-color="#f5f5f5"></u-gap>
-				<u-cell-group class="personal-list">
+			<u-cell-group class="personal-list" :border="false">
-					<u-gap height="20" bg-color="#f5f5f5"></u-gap>
+				<u-cell-item icon="question-circle" :iconStyle="{ color: '#ff8d06' }" title="常见问题" :center="true" @click="navTo('problem')"></u-cell-item>
-					<u-cell-item icon="question-circle" :iconStyle="{ color: '#ff8d06' }" title="常见问题" @click="navTo('problem')"></u-cell-item>
+				<u-cell-item icon="kefu-ermai" :iconStyle="{ color: '#5f8dff' }" title="意见反馈" :center="true" @click="navTo('comment')"></u-cell-item>
-					<u-cell-item icon="kefu-ermai" :iconStyle="{ color: '#5f8dff' }" title="意见反馈" @click="navTo('comment')"></u-cell-item>
+				<u-cell-item icon="lock" :iconStyle="{ color: '#316ede' }" title="修改密码" :center="true" @click="navTo('pwd')"></u-cell-item>
-					<u-cell-item icon="map" :iconStyle="{ color: '#316ede' }" title="账号安全" @click="navTo('pwd')"></u-cell-item>
+				<u-cell-item icon="scan" :iconStyle="{ color: '#36cfc9' }" title="扫描设置" :center="true" @click="navTo('scan-settings')"></u-cell-item>
-					<u-cell-item icon="scan" :iconStyle="{ color: '#36cfc9' }" title="扫描设置" @click="navTo('scan-settings')"></u-cell-item>
+				<u-cell-item icon="order" :iconStyle="{ color: '#59bdf9' }" title="清除缓存" :center="true" @click="navTo('clear-cache')"></u-cell-item>
-					<u-cell-item icon="order" :iconStyle="{ color: '#59bdf9' }" title="清除缓存" @click="navTo('clear-cache')"></u-cell-item>
+			</u-cell-group>
-					<!--<u-cell-item icon="account" :iconStyle="{ color: '#27c0dc' }" title="关于我们" @click="navTo('about')"></u-cell-item> 
+			<u-gap height="20" bg-color="#f5f5f5"></u-gap>
-					<u-cell-item icon="kefu-ermai" :iconStyle="{ color: '#ff8a00' }" title="联系客服" @click="navTo('service')"></u-cell-item>!-->
+			<u-cell-group class="personal-list" :border="false">
-					<u-gap height="20" bg-color="#f5f5f5"></u-gap>
+				<u-cell-item icon="reload" :iconStyle="{ color: '#19be6b' }" title="版本更新" :center="true" @click="upgrade"></u-cell-item>
-					<u-cell-item icon="reload" :iconStyle="{ color: '#19be6b' }" title="版本更新" @click="upgrade"></u-cell-item>
+				<u-cell-item icon="setting" :iconStyle="{ color: '#2767dc' }" title="系统设置" :center="true" @click="navTo('setting')"></u-cell-item>
-					<u-cell-item icon="setting" :iconStyle="{ color: '#2767dc' }" title="系统设置" @click="navTo('setting')"></u-cell-item>
+			</u-cell-group>
-				</u-cell-group>
+			<u-gap height="20" bg-color="#f5f5f5"></u-gap>
-			</view>
+			<u-button class="sign-out logout-btn" @click="logout" :hair-line="false">退出登录</u-button>
+		</view>
+		<view class="app-meta">
+			<text class="app-name">{{ appName }}</text>
+			<text class="app-version">版本 {{ appVersion }}</text>
 		</view>
 	</view>
 </template>
@@ -58,6 +62,8 @@
 		import CommonNavbar from "@/components/common-navbar/index";
 		import app_upgrade from '@/uni_modules/app-upgrade/js_sdk/index.js';
 		import config from '@/common/config.js';
+		import { clearUserSession } from '@/common/userSession.js';
+		import manifest from '@/manifest.json';
 /**
  * Copyright (c) 2013-Now http://aidex.vip All rights reserved.
  */
@@ -76,6 +82,12 @@ export default {
 	},
 
 	computed: {
+		appName() {
+			return manifest.name || '';
+		},
+		appVersion() {
+			return manifest.versionName || '';
+		},
 		avatarUrl() {
 			// let url = this.vuex_user.avatarUrl || '/ctxPath/static/images/user1.jpg';
 			// url = url.replace('/ctxPath/', this.vuex_config.baseUrl + '/');
@@ -91,16 +103,17 @@ export default {
 			});
 		},
 		logout() {
-			this.$u.api.logout().then(res => {
+			const goLogin = () => {
-				this.$u.toast(res.msg);
+				clearUserSession();
-				if (res.code == '200' || res.code == '401') {
+				uni.reLaunch({
-					let self = this;
+					url: '/pages/sys/login/index'
-					setTimeout(() => {
+				});
-						uni.reLaunch({
+			};
-							url: '/pages/sys/login/index'
+			this.$u.api.pdaLogout().then(() => {
-						});
+				goLogin();
-					}, 500);
+			}).catch((error) => {
-				}
+				console.log('logout error', error);
+				goLogin();
 			});
 		},
 		upgrade(){
@@ -134,22 +147,77 @@ export default {
 };
 </script>
 <style lang="scss">
+@import '@/common/pda-typography.scss';
 @import 'index.scss';
 page {
 	background-color: #f5f5f5;
 }
-.wrap .u-cell-box .u-cell_title{
+.header {
-	color:#202328;
+	.userinfo {
+		position: relative;
+		padding: 20rpx 30rpx 24rpx;
+		align-items: center;
+	}
+	.info {
+		flex: 1;
+		min-width: 0;
+		align-items: center;
+	}
+	.username {
+		font-size: $pda-font-body;
+		line-height: 1.3;
+	}
+}
+.list {
+	.personal-list {
+		::v-deep .u-cell {
+			min-height: $pda-row-min-height;
+			padding: 24rpx 30rpx;
+			box-sizing: border-box;
+		}
+		::v-deep .u-cell_title {
+			color: #202328;
+			font-size: $pda-font-body;
+			line-height: 1.3;
+		}
+		::v-deep .u-cell__left-icon-wrap {
+			margin-right: 20rpx;
+		}
+		::v-deep .u-cell__right-icon-wrap {
+			flex-shrink: 0;
+		}
+	}
 }
 .sign-in-images{
 	width: 125rpx;
 	height:50rpx;
-	position: absolute;
+	flex-shrink: 0;
-	right: 0;
+	uni-image, image {
-	top:5px;
-	uni-image{
 		width: 125rpx;
 		height:50rpx;
 	}
 }
+.app-meta {
+	padding: 48rpx 30rpx 40rpx;
+	text-align: center;
+}
+.app-name {
+	display: block;
+	color: #242820;
+	font-size: $pda-font-body;
+	font-weight: 700;
+	line-height: 1.4;
+}
+.app-version {
+	display: block;
+	margin-top: 8rpx;
+	color: #8a8f86;
+	font-size: $pda-font-nav-sub;
+	line-height: 1.3;
+}
+.logout-btn {
+	min-height: $pda-row-min-height;
+	font-size: $pda-font-body;
+	line-height: $pda-row-min-height;
+}
 </style>

src/pages/sys/user/pwd.vue

@@ -33,7 +33,7 @@ export default {
 			model: {
 				oldPassword: '',
 				newPassword: '',
-				confirmNewPassword: ''
+				confirmPassword: ''
 			},
 			rules: {
 				oldPassword: [
@@ -79,26 +79,27 @@ export default {
 		submit() {
 			this.$refs.uForm.validate(valid => {
 				if (valid) {
-					this.$u.api.user.infoSavePwd({
+					this.$u.api.updatePassword({
-						oldPassword: this.model.oldPassword,
+						old_password: this.model.oldPassword,
-						newPassword: this.model.newPassword
+						new_password: this.model.newPassword
-					}).then(res => {
+					}).then(() => {
-						if(res.code == '200'){
+						const saved = uni.getStorageSync('UserInfo');
-							uni.showModal({
+						if (saved && typeof saved === 'object') {
-								title: '提示',
+							uni.setStorageSync('UserInfo', {
-								content: res.msg,
+								...saved,
-								showCancel: false,
+								password: this.model.newPassword
-								success: function () {
-									uni.navigateBack();
-								}
-							});
-						}else{
-							uni.showModal({
-								title: '提示',
-								content: res.msg,
-								showCancel: false
 							});
 						}
+						uni.showModal({
+							title: '提示',
+							content: '密码修改成功',
+							showCancel: false,
+							success: function () {
+								uni.navigateBack();
+							}
+						});
+					}).catch((error) => {
+						console.log('updatePassword error', error);
 					});
 				} else {
 					this.$u.toast('您填写的信息有误，请根据提示修正。');
@@ -112,15 +113,31 @@ export default {
 };
 </script>
 <style lang="scss">
+@import '@/common/pda-typography.scss';
 page{
 	background: #f5f5f5;
 }
 .u-form{
 	background: #fff;
-	padding: 0px 15px;
+	padding: 0 30rpx;
 }
 .remind-text{
 	padding: 20rpx 30rpx;
 	color: #666666;
+	font-size: $pda-font-popup-sub;
+	line-height: 1.4;
+}
+.form-footer {
+	padding: 40rpx 30rpx;
+}
+::v-deep .u-form-item--left__content__label {
+	font-size: $pda-font-body;
+}
+::v-deep .u-input__input {
+	font-size: $pda-font-body;
+}
+::v-deep .u-btn {
+	height: $pda-button-height;
+	font-size: $pda-font-button;
 }
 </style>

src/pages/sys/user/setting.vue

@@ -7,17 +7,12 @@
 			<u-cell-item title="隐私政策" @click="navTo('')" :arrow="true"></u-cell-item>
 			<u-cell-item title="用户协议" @click="navTo('')" :arrow="true"></u-cell-item>
 		</u-cell-group>
-		<u-gap height="20" bg-color="#f5f5f5"></u-gap>
-		<view>
-			<u-button class="sign-out"  @click="logout" :hair-line="false">退出登录</u-button>
-		</view>
 	</view>
 </template>
 <script>
 /**
  * Copyright (c) 2013-Now http://aidex.vip All rights reserved.
  */
-import { clearUserSession } from '@/common/userSession.js';
 
 export default {
 	data() {
@@ -49,20 +44,6 @@ export default {
 			// #ifndef APP-PLUS
 			this.$u.toast('小程序端或H5端已是最新版，无需检查更新！');
 			// #endif
-		},
-		logout() {
-			const goLogin = () => {
-				clearUserSession();
-				uni.reLaunch({
-					url: '/pages/sys/login/index'
-				});
-			};
-			this.$u.api.pdaLogout().then(() => {
-				goLogin();
-			}).catch(error => {
-				console.log('error',error)
-				goLogin();
-			});
 		}
 	}
 };

src/pages/sys/workbench/index.vue

@@ -26,7 +26,8 @@
         hover-class="menu-card--active"
         @click="navTo(item.url)"
       >
-        <image class="card-background" :src="item.backgroundImage" mode="aspectFill"></image>
+        <image class="card-background" :src="staticSrc(item.backgroundImage)" mode="aspectFit"></image>
+        <view class="card-scrim"></view>
         <text class="card-mark">“</text>
         <view class="card-content">
           <view class="card-title">{{ item.name }}</view>
@@ -123,8 +124,15 @@ export default {
     };
   },
 
-  onLoad() {
+  onLoad(options) {
     this.registerScanBroadcast(this.handleScanCode);
+    if (options && String(options.changePassword) === '1') {
+      setTimeout(() => {
+        uni.navigateTo({
+          url: '/pages/sys/user/pwd'
+        });
+      }, 300);
+    }
   },
   // onUnload, onHide, onShow 已由 scanMixin 自动处理
 
@@ -147,6 +155,13 @@ export default {
     }
   },
   methods: {
+    staticSrc(path) {
+      let base = '';
+      // #ifdef H5
+      base = (process.env.BASE_URL || '/').replace(/\/$/, '');
+      // #endif
+      return `${base}${path}`;
+    },
     // 自定义扫码处理回调 - 处理本页面特有的扫码逻辑
     handleScanCode(scanResult) {
       console.log('工作台-扫码结果:', scanResult);
@@ -327,16 +342,29 @@ page {
 
 .card-background {
   position: absolute;
+  z-index: 0;
+  top: 18rpx;
+  right: -4rpx;
+  width: 150rpx;
+  height: 120rpx;
+  opacity: 0.72;
+  pointer-events: none;
+}
+
+.card-scrim {
+  position: absolute;
+  z-index: 1;
   top: 0;
   right: 0;
-  width: 100%;
+  bottom: 0;
-  height: 100%;
+  left: 0;
-  opacity: 0.72;
+  background: linear-gradient(105deg, rgba(0, 0, 0, 0.16) 0%, rgba(0, 0, 0, 0.02) 58%);
   pointer-events: none;
 }
 
 .card-mark {
   position: absolute;
+  z-index: 2;
   top: 10rpx;
   left: 18rpx;
   color: rgba(255, 255, 255, 0.2);
@@ -348,7 +376,7 @@ page {
 
 .card-content {
   position: absolute;
-  z-index: 1;
+  z-index: 2;
   right: 16rpx;
   bottom: 42rpx;
   left: 22rpx;
@@ -374,7 +402,7 @@ page {
 
 .card-arrow {
   position: absolute;
-  z-index: 2;
+  z-index: 3;
   right: 0;
   bottom: 0;
   display: flex;

src/store/index.js

@@ -19,26 +19,14 @@ try{
 	
 }
 
-// 本分支统一使用 hcscm 服务前缀
-function normalizeApiUrl(url) {
-	return String(url || '').replace(/hcscm_weave/g, 'hcscm');
-}
-
 // 初始化API URL
 function initApiUrl() {
-	const fallbackUrl = config.isDevelopment
+	const fallbackUrl = (config.devApiUrlOptions.find(item => item.label === '正式环境') || {}).value || config.productionApiUrl;
-		? config.devApiUrlOptions[0].value
-		: ((config.devApiUrlOptions.find(item => item.label === '正式环境') || {}).value || config.productionApiUrl);
 	try {
-		const savedApiUrl = uni.getStorageSync('ApiUrl');
+		return uni.getStorageSync('ApiUrl') || fallbackUrl;
-		const url = normalizeApiUrl(savedApiUrl || fallbackUrl);
-		if (savedApiUrl && url !== savedApiUrl) {
-			uni.setStorageSync('ApiUrl', url);
-		}
-		return url;
 	} catch (e) {
 		console.log('读取存储的 apiurl 失败', e);
-		return normalizeApiUrl(fallbackUrl);
+		return fallbackUrl;
 	}
 }
 
@@ -111,9 +99,8 @@ const store = new Vuex.Store({
       state.vuex_notificationAudio = audio;
     },
 		SET_API_URL(state, url) {
-      const nextUrl = normalizeApiUrl(url);
+      state.apiurl = url
-      state.apiurl = nextUrl
+      uni.setStorageSync('ApiUrl', url)
-      uni.setStorageSync('ApiUrl', nextUrl)
     }
 	},