chore: 去掉上传脚本的本地配置文件

Co-authored-by: Cursor <cursoragent@cursor.com>

.cursor/rules/pda-typography.mdc

@@ -0,0 +1,37 @@
+---
+description: PDA 小屏界面字号与排版标准（以手动进仓页为准）
+alwaysApply: true
+---
+
+# PDA 字号标准
+
+本项目面向工业 PDA 小屏。新增/改版业务页时，**以后台手动进仓页**（`storeFabricManualIn.vue`）的字号为准，不要用偏小的默认字号。
+
+共用变量：`@import '@/common/pda-typography.scss';`（或等价路径）。
+
+## 字号（rpx）
+
+| 用途 | 字号 | 变量 |
+|------|------|------|
+| 表单标签 / 正文 / 输入值 | **36** | `$pda-font-body` |
+| 扫码输入框 | **36** | `$pda-font-body` |
+| 占位提示 | **34** | `$pda-font-placeholder` |
+| 行内操作（取消/修改） | **34** | `$pda-font-action` |
+| 单位角标（如 KG） | **32** | `$pda-font-unit` |
+| 顶栏次要文字（设置等） | **32** | `$pda-font-nav-sub` |
+| 主按钮文字 | **36** | `$pda-font-button` |
+| 弹层标题 / 选项 | **36** | `$pda-font-popup-title` / `$pda-font-popup-item` |
+| 弹层取消 / 空态 | **34** | `$pda-font-popup-sub` |
+
+## 行高与触控
+
+- 列表行最小高度约 **100rpx**，可略加上下 padding
+- 扫码输入框高度约 **100rpx**
+- 主按钮高度约 **92rpx**
+- 标签列宽约 **200rpx**（中文四字标签）
+
+## 注意
+
+- 登录环境选择、出仓明细等已放大过的页面，新改动保持不低于上表
+- 不要为了“好看”再缩小字号；宁可少露内容、可滚动，也要可读
+- 选择类弹层（如 `SearchSelectPopup`）与表单页使用同一套字号

.env

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

.env.devlocal

@@ -1,5 +0,0 @@
-NODE_ENV = development
-VUE_APP_ENV_NAME = 本地穿透环境
-VUE_APP_UPGRADE_NAME = erp_pda_dev
-VUE_APP_PRODUCTION_API_URL = https://2yd52gx88533.vicp.fun/hcscm/pda/v1
-VUE_APP_DEV_API_URL = https://2yd52gx88533.vicp.fun/hcscm/pda/v1

.env.zhisheng

@@ -1,5 +1,5 @@
 NODE_ENV = development
 VUE_APP_ENV_NAME = zhisheng环境
 VUE_APP_UPGRADE_NAME = erp_pda_pre
-VUE_APP_PRODUCTION_API_URL = https://hcscmpre.zzfzyc.com/hcscm/pda/v1
+VUE_APP_PRODUCTION_API_URL = https://hcscmpre.zzfzyc.com/hcscm_weave/pda/v1
-VUE_APP_DEV_API_URL = https://hcscmpre.zzfzyc.com/hcscm/pda/v1
+VUE_APP_DEV_API_URL = https://hcscmpre.zzfzyc.com/hcscm_weave/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_UPGRADE_NAME = erp_pda_zhoushang_zhichang
-VUE_APP_PRODUCTION_API_URL = https://zsfz.yushangfangzhi.com/hcscm/pda/v1
+VUE_APP_PRODUCTION_API_URL = https://www.haotopai.com/hcscm_weave/mes/server/pda/v1
-VUE_APP_DEV_API_URL = https://zsfz.yushangfangzhi.com/hcscm/pda/v1
+VUE_APP_DEV_API_URL = https://www.haotopai.com/hcscm_weave/mes/server/pda/v1

README.md

@@ -100,39 +100,4 @@ 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

@@ -10,7 +10,6 @@
     "build:app-plus:zhisheng": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build --mode zhisheng",
     "build:app-plus:zhoushang": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build --mode zhoushang",
     "build:app-plus:mes": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build --mode mes",
-    "build:app-plus:devlocal": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build --mode devlocal",
     "build:custom": "cross-env NODE_ENV=production uniapp-cli custom",
     "build:h5": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build",
     "build:mp-360": "cross-env NODE_ENV=production UNI_PLATFORM=mp-360 vue-cli-service uni-build",
@@ -31,7 +30,6 @@
     "dev:app-plus": "cross-env NODE_ENV=development UNI_PLATFORM=app-plus vue-cli-service uni-build --watch",
     "dev:app-plus:zhisheng": "cross-env NODE_ENV=development UNI_PLATFORM=app-plus vue-cli-service uni-build --watch --mode zhisheng",
     "dev:app-plus:mes": "cross-env NODE_ENV=development UNI_PLATFORM=app-plus vue-cli-service uni-build --watch --mode mes",
-    "dev:app-plus:devlocal": "cross-env NODE_ENV=development UNI_PLATFORM=app-plus vue-cli-service uni-build --watch --mode devlocal",
     "dev:custom": "cross-env NODE_ENV=development uniapp-cli custom",
     "dev:h5": "cross-env NODE_ENV=development UNI_PLATFORM=h5 vue-cli-service uni-serve",
     "dev:mp-360": "cross-env NODE_ENV=development UNI_PLATFORM=mp-360 vue-cli-service uni-build --watch",

scripts/upload-apk.js

@@ -13,7 +13,6 @@
  *
  * 版本号取 src/manifest.json 的 versionName。
  * 场景值取对应 .env 的 VUE_APP_UPGRADE_NAME，拼成 /version/{upgradeName}/{version}.apk。
- * 版本包上传成功后，再把同一份安装包上传为 /version/{upgradeName}/latest.apk。
  * 运行时输入 ERP 手机号和密码获取 token。多个账套时再选择一次。
  */
 const fs = require('fs');
@@ -21,21 +20,12 @@ const path = require('path');
 const readline = require('readline');
 
 const ROOT = path.resolve(__dirname, '..');
+const API_BASE = 'https://hcscmtest.zzfzyc.com/hcscm_weave';
 const UPYUN_API = 'https://v0.api.upyun.com';
-const DEFAULT_API_BASE = 'https://hcscmtest.zzfzyc.com/hcscm';
+const CDN_HOST = {
-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',
@@ -49,7 +39,7 @@ function parseArgs(argv) {
   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') {
+    if (key === '--file' || key === '--target' || key === '--mode' || key === '--version') {
       args[key.slice(2)] = value;
       i += 1;
     }
@@ -136,9 +126,9 @@ async function apiJson(apiBase, urlPath, { method = 'GET', token, body } = {}) {
   return data.data || {};
 }
 
-async function login(apiBase, { phone: phoneArg, password: passwordArg, tenant: tenantArg } = {}) {
+async function login(apiBase) {
-  const phone = phoneArg || await ask('手机号: ');
+  const phone = await ask('手机号: ');
-  const password = passwordArg || await askPassword('密码: ');
+  const password = await askPassword('密码: ');
   if (!phone || !password) {
     throw new Error('请输入手机号和密码');
   }
@@ -158,20 +148,14 @@ async function login(apiBase, { phone: phoneArg, password: passwordArg, tenant:
 
   let tenant = tenants[0];
   if (tenants.length > 1) {
-    if (tenantArg) {
+    console.log('请选择账套:');
-      const picked = Number(tenantArg);
+    tenants.forEach((item, index) => {
-      tenant = tenants[picked - 1];
+      const name = item.company_name || item.database_name || item.tenant_contacts || item.tenant_management_id;
-      if (!tenant) throw new Error('账套序号无效');
+      console.log(`  ${index + 1}. ${name}`);
-    } else {
+    });
-      console.log('请选择账套:');
+    const picked = Number(await ask('序号: '));
-      tenants.forEach((item, index) => {
+    tenant = tenants[picked - 1];
-        const name = item.company_name || item.database_name || item.tenant_contacts || item.tenant_management_id;
+    if (!tenant) throw new Error('账套序号无效');
-        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', {
@@ -227,36 +211,6 @@ async function uploadToUpyun({ bucket, authorization, policy, filePath, fileName
   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) {
@@ -290,42 +244,40 @@ async function main() {
     process.exit(1);
   }
 
-  const modeUpload = MODE_UPLOAD[args.mode];
+  const status = args.target === 'prod' ? 2 : 1;
-  const status = modeUpload ? modeUpload.status : (args.target === 'prod' ? 2 : 1);
   const fileName = `${version}.apk`;
   const saveKey = `/version/${upgradeName}/${fileName}`;
-  const latestFileName = 'latest.apk';
+  const apiBase = API_BASE;
-  const latestSaveKey = `/version/${upgradeName}/${latestFileName}`;
+  const token = await login(apiBase);
-  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(`场景路径: ${saveKey}`);
-  console.log(`CDN: ${cdnHost}`);
+  const cdnLabel = args.target === 'prod' ? '正式 CDN' : '测试 CDN';
-  const uploaded = await uploadApkFile({
+  console.log(`CDN: ${cdnLabel}（只影响下载地址，生产环境也可以从测试 CDN 安装）`);
+  console.log('正在获取签名...');
+  const sign = await getCdnSign({
     apiBase,
     token,
-    apkPath,
     saveKey,
-    fileName,
     status,
   });
-  console.log(toPublicUrl(cdnHost, saveKey, uploaded));
+  if (!sign.bucket || !sign.authorization || !sign.policy) {
+    throw new Error('签名返回缺少 bucket、authorization 或 policy');
+  }
 
-  const latestUploaded = await uploadApkFile({
+  console.log('正在上传 APK...');
-    apiBase,
+  const uploaded = await uploadToUpyun({
-    token,
+    bucket: sign.bucket,
-    apkPath,
+    authorization: sign.authorization,
-    saveKey: latestSaveKey,
+    policy: sign.policy,
-    fileName: latestFileName,
+    filePath: apkPath,
-    status,
+    fileName,
   });
-  console.log(toPublicUrl(cdnHost, latestSaveKey, latestUploaded));
+  console.log('上传成功');
+  const pathUrl = uploaded.url && String(uploaded.url).startsWith('http')
+    ? uploaded.url
+    : `${CDN_HOST[args.target]}${saveKey}`;
+  console.log(pathUrl);
 }
 
 main().catch((error) => {

src/App.vue

@@ -6,8 +6,6 @@ import { audioManager } from '@/utils/audioManager'
 
 	import util from '@/common/util.js';
 	import md5 from '@/common/md5.js';
-	import { getLoginData, restoreUserSession } from '@/common/userSession.js';
-	import { ensureScanConfigAfterLogin } from '@/common/scanAutoConfig.js';
 	export default {
 		globalData: {
 			AppName: '',
@@ -27,20 +25,11 @@ import { audioManager } from '@/utils/audioManager'
 
 		onLaunch() {
 			console.log('App Launch');
-			restoreUserSession();
 
 			// 初始化音频管理器
 			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>
@@ -69,7 +58,7 @@ import { audioManager } from '@/utils/audioManager'
 	.textCenter {
 		width: 100%;
 		text-align: center;
-		font-size: 16px;
+		font-size: 15px;
 		color: #808080;
 		margin-top: 88rpx;
 	}
@@ -116,7 +105,7 @@ import { audioManager } from '@/utils/audioManager'
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		font-size: 16px;
+		font-size: 15px;
 	}
 
 	.flex-white-plr26-column {
@@ -125,7 +114,7 @@ import { audioManager } from '@/utils/audioManager'
 		padding-right: 26rpx;
 		display: flex;
 		flex-direction: column;
-		font-size: 16px;
+		font-size: 15px;
 	}
 
 	.bdb_f5 {
@@ -166,12 +155,12 @@ import { audioManager } from '@/utils/audioManager'
 
 	.redXingh {
 		color: #FF0000;
-		font-size: 15px;
+		font-size: 14px;
 	}
 
 	.bluecolor {
 		color: #0000FF;
-		font-size: 17px;
+		font-size: 16px;
 	}
 
 	.udropdown {
@@ -185,7 +174,7 @@ import { audioManager } from '@/utils/audioManager'
 	.width276 {
 		width: 546rpx;
 		color: #c5c5c5;
-		font-size: 15px;
+		font-size: 14px;
 	}
 
 	.cBlack {
@@ -196,7 +185,7 @@ import { audioManager } from '@/utils/audioManager'
 		margin-bottom: -10rpx;
 		margin-top: 16rpx;
 		padding-left: 26rpx;
-		font-size: 32rpx;
+		font-size: 30rpx;
 		color: #555555;
 		font-weight: bold;
 	}
@@ -204,7 +193,7 @@ import { audioManager } from '@/utils/audioManager'
 	.width242 {
 		width: 484rpx;
 		color: #c5c5c5;
-		font-size: 15px;
+		font-size: 14px;
 	}
 
 	.myCard {
@@ -222,7 +211,7 @@ import { audioManager } from '@/utils/audioManager'
 	.cardRow {
 		display: flex;
 		align-items: center;
-		font-size: 15px;
+		font-size: 14px;
 		margin-bottom: 8rpx;
 	}
 
@@ -242,7 +231,7 @@ import { audioManager } from '@/utils/audioManager'
 	}
 
 	.cardTopName {
-		font-size: 17px;
+		font-size: 16px;
 		margin-bottom: 8rpx;
 		color: #000000;
 		overflow: hidden;
@@ -276,7 +265,7 @@ import { audioManager } from '@/utils/audioManager'
 		display: flex;
 		align-items: center;
 		justify-content: flex-end;
-		font-size: 16px;
+		font-size: 15px;
 		color: #007AFF;
 		margin-top: 12rpx;
 		margin-bottom: 16rpx;
@@ -290,7 +279,7 @@ import { audioManager } from '@/utils/audioManager'
 		position: absolute;
 		right: 26rpx;
 		bottom: 80rpx;
-		font-size: 16px;
+		font-size: 15px;
 	}
 
 	.fzrLeft {
@@ -370,32 +359,4 @@ import { audioManager } from '@/utils/audioManager'
 		height: 32rpx;
 		background-color: #EEEEEE;
 	}
-
-	/* PDA：放大 u-select 确认/取消按钮点击区域 */
-	.u-select__header {
-		height: 110rpx !important;
-		padding: 0 16rpx !important;
-	}
-
-	.u-select__header__btn {
-		font-size: 36rpx !important;
-		line-height: 110rpx !important;
-		padding: 0 40rpx !important;
-		min-width: 140rpx;
-		text-align: center;
-		box-sizing: border-box;
-	}
-
-	.u-select__search,
-	.u-action-sheet-search,
-	.u-dropdown-item__search {
-		height: 88rpx !important;
-	}
-
-	.u-select__search__input,
-	.u-action-sheet-search__input,
-	.u-dropdown-item__search__input {
-		font-size: 32rpx !important;
-		height: 88rpx !important;
-	}
 </style>

src/common/config.js

@@ -9,7 +9,7 @@ const config = {
 	upgradeName: process.env.VUE_APP_UPGRADE_NAME || 'erp_pda',
 
 	// 产品名称
-	productName: '浩拓ERP',
+	productName: '浩拓技术',
 
 	// 公司名称
 	companyName: '浩拓科技',
@@ -20,21 +20,22 @@ const config = {
 	// 环境判断
 	isDevelopment: isDevelopment,
 
-	// 生产环境API URL（服务名段 hcscm）
+	// 生产环境API URL（服务名段 hcscm_weave）
-	productionApiUrl: process.env.VUE_APP_PRODUCTION_API_URL,
+	productionApiUrl: process.env.VUE_APP_PRODUCTION_API_URL || 'https://www.haotopai.com/hcscm_weave/mes/server/pda/v1',
 
-	// 开发环境API URL选项（服务名段 hcscm）
+	// 开发环境API URL选项（仅替换 //域名/ 后第一个路径段 hcscm → hcscm_weave，不改域名）
 	devApiUrlOptions: [
-		{ label: '测试环境', value: 'https://hcscmtest.zzfzyc.com/hcscm/pda/v1' },
+		{ label: '测试环境', value: 'https://hcscmtest.zzfzyc.com/hcscm_weave/pda/v1' },
-		{ label: '本地环境', value: 'http://192.168.1.66:7010/hcscm/pda/v1' },
+		{ label: '正式环境', value: process.env.VUE_APP_DEV_API_URL || process.env.VUE_APP_PRODUCTION_API_URL || 'https://www.haotopai.com/hcscm_weave/mes/server/pda/v1' },
-		{ label: '本地穿透', value: 'https://2yd52gx88533.vicp.fun/hcscm/pda/v1' },
+		{ label: '本地环境', value: 'http://192.168.1.66:7010/hcscm_weave/pda/v1' },
-		{ label: '正式环境', value: process.env.VUE_APP_PRODUCTION_API_URL },
 		{ label: '自定义', value: 'custom' }
 	]
 
 }
 
-// 设置后台接口服务的基础地址 - 使用动态API URL
+export function getTestApiUrl() {
-// config.baseUrl = 'https://aidex.vip/api'; // 注释掉固定的baseUrl
+	const test = config.devApiUrlOptions.find(item => item.label === '测试环境');
+	return (test && test.value) || 'https://hcscmtest.zzfzyc.com/hcscm_weave/pda/v1';
+}
 
 export default config;

src/common/http.api.js

@@ -8,26 +8,13 @@ const install = (Vue, vm) => {
 	const config = vm.vuex_config;
 	console.log('install u',config)
 
-	// 接口前缀统一走 hcscm（apiurl 已在 config.js 配置为 hcscm 服务）
+	// 坯布出仓单接口前缀（apiurl 已在 config.js 统一配置为 hcscm_weave 服务）
-	const getApiUrl = () => String(vm.$store.state.apiurl || '');
-
 	const GFM_OTHER_DELIVERY_PREFIX = '/grey_fabric_manage/gfmOtherDeliveryOrder/';
-	const gfmOtherDeliveryUrl = (name) => getApiUrl() + GFM_OTHER_DELIVERY_PREFIX + name;
+	const gfmOtherDeliveryUrl = (name) => (vm.$store.state.apiurl || '') + GFM_OTHER_DELIVERY_PREFIX + name;
 
+	// 坯布库存接口前缀
 	const GFM_WAREHOUSE_PREFIX = '/grey_fabric_manage/gfmWarehouse/';
-	const gfmWarehouseUrl = (name) => getApiUrl() + GFM_WAREHOUSE_PREFIX + name;
+	const gfmWarehouseUrl = (name) => (vm.$store.state.apiurl || '') + GFM_WAREHOUSE_PREFIX + name;
-
-	const FPM_PROCESS_IN_PREFIX = '/product/fpmProcessInOrder/';
-	const fpmProcessInUrl = (name) => getApiUrl() + FPM_PROCESS_IN_PREFIX + name;
-
-	const FPM_PROCESS_RETURN_IN_PREFIX = '/product/fpmProcessReturnInOrder/';
-	const fpmProcessReturnInUrl = (name) => getApiUrl() + FPM_PROCESS_RETURN_IN_PREFIX + name;
-
-	const FPM_PROCESS_OUT_PREFIX = '/product/fpmProcessOutOrder/';
-	const fpmProcessOutUrl = (name) => getApiUrl() + FPM_PROCESS_OUT_PREFIX + name;
-
-	const FPM_PRC_IN_PREFIX = '/product/fpmPrcInOrder/';
-	const fpmPrcInUrl = (name) => getApiUrl() + FPM_PRC_IN_PREFIX + name;
 
 	// 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
 	vm.$u.api = {
@@ -59,76 +46,27 @@ const install = (Vue, vm) => {
 			detailList: (params = {}) => vm.$u.get(gfmWarehouseUrl('getGfmWarehouseList'), params),
 		},
 
-		// 加工进仓单
+		// PDA 生产进仓（排产单细码扫码进仓）
-		fpmProcessInOrder: {
+		productionScheduleOrder: {
-			list: (params = {}) => vm.$u.get(fpmProcessInUrl('getFpmProcessInOrderList'), params),
+			getScanFineCodeDetail: (params = {}) => vm.$u.get('/produce/productionScheduleOrder/getScanFineCodeDetail', params),
-			detail: (params = {}) => vm.$u.get(fpmProcessInUrl('getFpmProcessInOrder'), params),
+			scanInWarehouseFineCode: (params = {}) => vm.$u.putJson('/produce/productionScheduleOrder/scanInWarehouseFineCode', params),
-			add: (params = {}) => vm.$u.postJson(fpmProcessInUrl('addFpmProcessInOrder'), params),
-			scanUpdate: (params = {}) => vm.$u.putJson(fpmProcessInUrl('updateFpmProcessInOrder'), params),
-			statusPass: (params = {}) => vm.$u.putJson(fpmProcessInUrl('updateFpmProcessInOrderStatusPass'), params),
-			statusWait: (params = {}) => vm.$u.putJson(fpmProcessInUrl('updateFpmProcessInOrderStatusWait'), params),
-			statusReject: (params = {}) => vm.$u.putJson(fpmProcessInUrl('updateFpmProcessInOrderStatusReject'), params),
-			statusCancel: (params = {}) => vm.$u.putJson(fpmProcessInUrl('updateFpmProcessInOrderStatusCancel'), params),
 		},
 
-		// 加工退货进仓单
+		// 营销体系下拉（路径相对 apiurl：.../pda/v1/saleSystem/getSaleSystemDropdownList）
-		fpmProcessReturnInOrder: {
-			list: (params = {}) => vm.$u.get(fpmProcessReturnInUrl('getFpmProcessReturnInOrderList'), params),
-			detail: (params = {}) => vm.$u.get(fpmProcessReturnInUrl('getFpmProcessReturnInOrder'), params),
-			add: (params = {}) => vm.$u.postJson(fpmProcessReturnInUrl('addFpmProcessReturnInOrder'), params),
-			scanUpdate: (params = {}) => vm.$u.putJson(fpmProcessReturnInUrl('updateFpmProcessReturnInOrder'), params),
-			statusPass: (params = {}) => vm.$u.putJson(fpmProcessReturnInUrl('updateFpmProcessReturnInOrderStatusPass'), params),
-			statusWait: (params = {}) => vm.$u.putJson(fpmProcessReturnInUrl('updateFpmProcessReturnInOrderStatusWait'), params),
-			statusReject: (params = {}) => vm.$u.putJson(fpmProcessReturnInUrl('updateFpmProcessReturnInOrderStatusReject'), params),
-			statusCancel: (params = {}) => vm.$u.putJson(fpmProcessReturnInUrl('updateFpmProcessReturnInOrderStatusCancel'), params),
-		},
-
-		// 加工出仓单
-		fpmProcessOutOrder: {
-			list: (params = {}) => vm.$u.get(fpmProcessOutUrl('getFpmProcessOutOrderList'), params),
-			detail: (params = {}) => vm.$u.get(fpmProcessOutUrl('getFpmProcessOutOrder'), params),
-			add: (params = {}) => vm.$u.postJson(fpmProcessOutUrl('addFpmProcessOutOrder'), params),
-			scanUpdate: (params = {}) => vm.$u.putJson(fpmProcessOutUrl('updateFpmProcessOutOrder'), params),
-			statusPass: (params = {}) => vm.$u.putJson(fpmProcessOutUrl('updateFpmProcessOutOrderStatusPass'), params),
-			statusWait: (params = {}) => vm.$u.putJson(fpmProcessOutUrl('updateFpmProcessOutOrderStatusWait'), params),
-			statusReject: (params = {}) => vm.$u.putJson(fpmProcessOutUrl('updateFpmProcessOutOrderStatusReject'), params),
-			statusCancel: (params = {}) => vm.$u.putJson(fpmProcessOutUrl('updateFpmProcessOutOrderStatusCancel'), params),
-			/** 加工出仓类型枚举：正常加工出仓 / 回修加工出仓 */
-			getOutTypeEnum: (params = {}) => vm.$u.get(getApiUrl() + '/product/enum/getProcessOutTypeTypeEnum', params),
-		},
-
-		// 成品采购进仓单
-		fpmPrcInOrder: {
-			list: (params = {}) => vm.$u.get(fpmPrcInUrl('getFpmPrcInOrderList'), params),
-			detail: (params = {}) => vm.$u.get(fpmPrcInUrl('getFpmPrcInOrder'), params),
-			add: (params = {}) => vm.$u.postJson(fpmPrcInUrl('addFpmPrcInOrder'), params),
-			scanUpdate: (params = {}) => vm.$u.putJson(fpmPrcInUrl('updateFpmPrcInOrder'), params),
-			statusPass: (params = {}) => vm.$u.putJson(fpmPrcInUrl('updateFpmPrcInOrderStatusPass'), params),
-			statusWait: (params = {}) => vm.$u.putJson(fpmPrcInUrl('updateFpmPrcInOrderStatusWait'), params),
-			statusReject: (params = {}) => vm.$u.putJson(fpmPrcInUrl('updateFpmPrcInOrderStatusReject'), params),
-			statusCancel: (params = {}) => vm.$u.putJson(fpmPrcInUrl('updateFpmPrcInOrderStatusCancel'), params),
-		},
-
-		// 物理仓库下拉
-		physicalWarehouse: {
-			getDropdownList: (params = {}) => vm.$u.get('/warehouse/physicalWarehouse/getPhysicalWarehouseDropdownList', params),
-		},
-
-		// 仓位查询（Request: qr_code / warehouse_id / name；Response: GetPhysicalWarehouseBinData）
-		warehouseBin: {
-			getByQrCode: (params = {}) => vm.$u.get('/warehouse/warehouseBin/getWarehouseBin', params),
-		},
-
-		// 营销体系下拉
 		saleSystem: {
-			getDropdownList: (params = {}) => vm.$u.get(getApiUrl() + '/saleSystem/getSaleSystemDropdownList', params),
+			getDropdownList: (params = {}) => vm.$u.get('/saleSystem/getSaleSystemDropdownList', params),
 		},
 
-		// 往来单位列表
+		// 往来单位列表（路径相对 apiurl：.../pda/v1/business_unit/list）
 		businessUnit: {
 			list: (params = {}) => vm.$u.get('/business_unit/list', params),
 		},
 
+		// 员工枚举（路径相对 apiurl：.../pda/v1/employee/list_enum）
+		employee: {
+			listEnum: (params = {}) => vm.$u.get('/employee/list_enum', params),
+		},
+
 		// 字典明细枚举（路径相对 apiurl：.../pda/v1/dictionaryDetail/getDictionaryDetailEnumList）
 		dictionary: {
 			getDetailEnumList: (params = {}) => vm.$u.get('/dictionaryDetail/getDictionaryDetailEnumList', params),
@@ -142,10 +80,6 @@ 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),
 		// 获取配布单列表
 		getFpmArrangeOrderList: (params = {}) => vm.$u.get('/product/fpmArrangeOrder/getFpmArrangeOrderList', params),
 		// 获取成品配布单详情

src/common/http.interceptor.js

@@ -2,8 +2,6 @@
  * Copyright (c) 2013-Now http://aidex.vip All rights reserved.
  */
 // 此处第二个参数vm，就是我们在页面使用的this，你可以通过vm获取vuex等操作
-import { clearUserSession } from '@/common/userSession.js';
-
 const install = (Vue, vm) => {
 	// 通用请求头设定
 	const ajaxHeader = 'x-ajax';
@@ -24,16 +22,9 @@ const install = (Vue, vm) => {
 	
 	// 请求拦截，配置Token等参数
 	Vue.prototype.$u.http.interceptor.request = (req) => {
-		const reqUrl = req && req.url ? String(req.url) : '';
+		console.log('request', req);
-		const isAbsolute = /^https?:\/\//i.test(reqUrl);
+		console.log('baseUrl', vm.$store.state.apiurl);
-		const fullUrl = isAbsolute ? reqUrl : (vm.$store.state.apiurl + reqUrl);
+		console.log('完整URL', vm.$store.state.apiurl + req.url);
-		// 用 JSON 字符串输出，避免 HBuilderX 控制台对象被截断、点击 URL 跳浏览器
-		console.log('request => ' + JSON.stringify({
-			url: fullUrl,
-			method: req.method,
-			data: req.data,
-			header: req.header
-		}, null, 2));
 		// #ifdef APP-PLUS
 		// Android 5.x 等老 PDA 不信任 Let's Encrypt 新证书链，关闭校验证书
 		req.sslVerify = false;
@@ -49,9 +40,8 @@ const install = (Vue, vm) => {
 		}
 		
 		// 设定传递 Token 认证参数 aidex
-		if (!req.header[sessionIdHeader]){
+		if (!req.header[sessionIdHeader] && vm.vuex_token){
-			const loginData = uni.getStorageSync('RemoteTokenData');
+			req.header[sessionIdHeader] = vm.vuex_token;
-			req.header[sessionIdHeader] = vm.vuex_token || (loginData && loginData.token) || '';
 		}
 		
 		// 为节省流量，记住我数据不是每次都发送的，当会话失效后，尝试重试登录 aidex
@@ -72,27 +62,24 @@ const install = (Vue, vm) => {
 		// 处理401未授权状态码
 		if (res.statusCode === 401) {
 			vm.$u.toast('登录已过期，请重新登录');
-			clearUserSession();
+			// 清除token和用户信息
+			uni.removeStorageSync('token');
+			vm.$u.vuex('vuex_token', '');
+			vm.$u.vuex('vuex_user', {});
+			// 跳转到登录页面
 			uni.reLaunch({
 				url: '/pages/sys/login/index'
 			});
 			return false;
 		}
-		// 非业务 JSON（如 404 page not found）
-		if (res.statusCode && res.statusCode !== 200) {
-			const msg = (res.data && res.data.msg) || `请求失败(${res.statusCode})`;
-			vm.$u.toast(msg);
-			return Promise.reject(new Error(msg));
-		}
 		console.log('res',res)
 		if (!(res.data)){
-			vm.$u.toast('未连接到服务器')
+			const errMsg = String((res && res.errMsg) || '');
-			return Promise.reject(new Error('未连接到服务器'));
+			const isNetworkError = res.statusCode === -1
-		}
+				|| /Unable to resolve host|Failed to connect|request:fail|timeout|网络/i.test(errMsg);
-		if (typeof res.data !== 'object') {
+			const message = isNetworkError ? '当前没有网络，请检查网络后重试' : '未连接到服务器';
-			const msg = '接口返回异常';
+			vm.$u.toast(message)
-			vm.$u.toast(msg);
+			return Promise.reject(new Error(message));
-			return Promise.reject(new Error(msg));
 		}
 		
 		if(res.data.code !== 0) {

src/common/list-filter.scss

@@ -1,149 +0,0 @@
-@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

@@ -1,49 +0,0 @@
-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/remoteSelect.js

@@ -1,46 +0,0 @@
-/**
- * 从往来单位等列表接口中取出数组。
- * 兼容拦截器解包后的 { list, total }，以及完整响应
- * { data: { code, data: { list, total } } }。
- */
-export function extractList(data, depth = 0) {
-	if (!data || depth > 6) return [];
-	if (Array.isArray(data)) return data;
-	if (Array.isArray(data.list)) return data.list;
-	if (Array.isArray(data.items)) return data.items;
-	if (Array.isArray(data.records)) return data.records;
-	if (data.data && typeof data.data === 'object') return extractList(data.data, depth + 1);
-	return [];
-}
-
-/** 将下拉/列表接口响应转为 u-select 所需的 { value, label } */
-export function mapToSelectOptions(data) {
-	return extractList(data).filter((item) => item && typeof item === 'object').map((item) => ({
-		value: item.id != null ? item.id : item.value,
-		label: item.name || item.label || item.code || (item.id != null ? String(item.id) : ''),
-	}));
-}
-
-/**
- * 下拉远程搜索：把关键字写入接口常用的 name 参数。
- * 空关键字时不带 name，让后端返回默认列表。
- */
-export function withNameParam(params, keyword) {
-	const next = Object.assign({}, params || {});
-	const name = String(keyword || '').trim();
-	if (name) next.name = name;
-	else delete next.name;
-	return next;
-}
-
-export const REMOTE_SELECT_TYPES = [
-	'染厂',
-	'加工单位',
-	'供应商',
-	'仓库名称',
-	'营销体系',
-];
-
-export function isRemoteSelectType(type) {
-	return REMOTE_SELECT_TYPES.indexOf(type) !== -1;
-}

src/common/remoteSelectMixin.js

@@ -1,54 +0,0 @@
-import { isRemoteSelectType } from '@/common/remoteSelect';
-
-/**
- * 表单页远程下拉搜索。
- * 使用方需实现 fetchRemoteSelectOptions(type, keyword)，返回 { value, label }[]。
- *
- * 注意：不要用 `_` / `$` 前缀的 data 字段名——Vue2 不会代理到 this，
- * `++this._xxx` 会得到 NaN，导致列表不更新、loading 不关。
- */
-export default {
-	data() {
-		return {
-			selectSearching: false,
-			selectSearchSeq: 0,
-		};
-	},
-	computed: {
-		isRemoteSelect() {
-			return isRemoteSelectType(this.selectType);
-		},
-	},
-	methods: {
-		isRemoteSelectType,
-		openSelectPicker(type, cachedList) {
-			this.selectType = type;
-			this.selectList = Array.isArray(cachedList) ? cachedList.slice() : [];
-			this.selectShow = true;
-		},
-		onSelectSearch(keyword) {
-			if (!isRemoteSelectType(this.selectType)) return;
-			if (typeof this.fetchRemoteSelectOptions !== 'function') return;
-			const seq = ++this.selectSearchSeq;
-			this.selectSearching = true;
-			const finish = () => {
-				if (seq === this.selectSearchSeq) this.selectSearching = false;
-			};
-			Promise.resolve()
-				.then(() => this.fetchRemoteSelectOptions(this.selectType, keyword))
-				.then((list) => {
-					if (seq !== this.selectSearchSeq) return;
-					this.selectList = Array.isArray(list) ? list.slice() : [];
-				})
-				.catch((e) => {
-					if (seq !== this.selectSearchSeq) return;
-					if (typeof this.showError === 'function') {
-						this.showError((e && e.message) || '搜索失败');
-					} else {
-						uni.showToast({ title: (e && e.message) || '搜索失败', icon: 'none' });
-					}
-				})
-				.then(finish, finish);
-		},
-	},
-};

src/common/scanAutoConfig.js

@@ -1,43 +0,0 @@
-/**
- * 登录后 / 冷启动：拉取扫码字典并在本地无配置时自动匹配写入
- */
-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

@@ -4,115 +4,43 @@ export const DICTIONARY_TYPE_SCANNER = 10046;
 
 export const PHONE_SCAN_BRAND = 'phone';
 
+// 历史误用 brand=newland 表示东集；真正的新大陆是 nlscan
+const LEGACY_SEUIC_BRANDS = ['newland', '东集', 'idata'];
+
 export const PHONE_SCAN_CONFIG = {
 	brand: PHONE_SCAN_BRAND,
 	name: '手机扫码',
 	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) {
 	return !!(config && (config.isPhoneScan || config.brand === PHONE_SCAN_BRAND));
 }
 
+function migrateLegacySeuicBrand(config) {
+	if (!config || isPhoneScanConfig(config)) {
+		return config;
+	}
+	const brand = String(config.brand || '');
+	const name = String(config.name || '');
+	const action = String(config.action || '');
+	// 历史内置配置把东集误标成 brand=newland；真正的新大陆是 nlscan
+	const isLegacySeuicLabel = LEGACY_SEUIC_BRANDS.includes(brand) || name === '东集';
+	if (!isLegacySeuicLabel) {
+		return config;
+	}
+	if (action.includes('nlscan')) {
+		return config;
+	}
+	return {
+		...config,
+		brand: 'seuic',
+		name: (!name || name === '东集') ? '东大集成(AUTOID)' : name,
+	};
+}
+
 function enrichFromBuiltinConfig(config, builtinConfigs = []) {
 	if (!config || !builtinConfigs.length) {
 		return config;
@@ -121,7 +49,13 @@ function enrichFromBuiltinConfig(config, builtinConfigs = []) {
 	const builtin = builtinConfigs.find((item) => {
 		return item.action === config.action
 			|| item.name === config.name
-			|| item.brand === config.brand;
+			|| item.brand === config.brand
+			|| (item.brand === 'seuic' && (
+				String(config.name || '').includes('东大')
+				|| String(config.name || '').includes('东集')
+				|| String(config.name || '').includes('AUTOID')
+				|| String(config.action || '').includes('scannerservice.broadcast')
+			));
 	});
 
 	if (!builtin) {
@@ -130,13 +64,13 @@ function enrichFromBuiltinConfig(config, builtinConfigs = []) {
 
 	return {
 		...config,
-		needSetup: config.needSetup != null ? config.needSetup : builtin.needSetup,
+		needSetup: builtin.needSetup,
-		setupAction: config.setupAction || builtin.setupAction || '',
+		setupAction: builtin.setupAction || '',
-		setupParams: config.setupParams || builtin.setupParams || null,
+		setupParams: builtin.setupParams || null,
 	};
 }
 
-export function normalizeConfig(raw, builtinConfigs = BUILTIN_SCANNER_CONFIGS) {
+export function normalizeConfig(raw, builtinConfigs = []) {
 	if (!raw || typeof raw !== 'object') return null;
 
 	const brand = String(raw.brand || raw.id || raw.dictionary_detail_id || raw.name || '');
@@ -146,7 +80,7 @@ export function normalizeConfig(raw, builtinConfigs = BUILTIN_SCANNER_CONFIGS) {
 		return { ...PHONE_SCAN_CONFIG };
 	}
 
-	const config = enrichFromBuiltinConfig({
+	let config = {
 		brand,
 		name: raw.name || '',
 		action: raw.action || raw.code || '',
@@ -154,7 +88,10 @@ export function normalizeConfig(raw, builtinConfigs = BUILTIN_SCANNER_CONFIGS) {
 		needSetup: raw.needSetup != null ? raw.needSetup : !!raw.need_setup,
 		setupAction: raw.setupAction || raw.setup_action || '',
 		setupParams: raw.setupParams || raw.setup_params || null,
-	}, builtinConfigs);
+	};
+
+	config = migrateLegacySeuicBrand(config);
+	config = enrichFromBuiltinConfig(config, builtinConfigs);
 
 	if (!config.brand || !config.action || !config.dataKey) {
 		return null;
@@ -163,24 +100,29 @@ export function normalizeConfig(raw, builtinConfigs = BUILTIN_SCANNER_CONFIGS) {
 	return config;
 }
 
-export function mapDictionaryToScannerConfig(raw, builtinConfigs = BUILTIN_SCANNER_CONFIGS) {
+export function mapDictionaryToScannerConfig(raw, builtinConfigs = []) {
 	return normalizeConfig(raw, builtinConfigs);
 }
 
-export function getScanConfig(builtinConfigs = BUILTIN_SCANNER_CONFIGS) {
+export function getScanConfig(builtinConfigs = []) {
 	try {
 		const data = uni.getStorageSync(STORAGE_KEY);
-		return normalizeConfig(data, builtinConfigs);
+		const normalized = normalizeConfig(data, builtinConfigs);
+		// 旧 brand=newland(东集) 迁移后写回，避免下次仍读到错误 brand
+		if (normalized && data && String(data.brand || '') !== String(normalized.brand || '')) {
+			try {
+				uni.setStorageSync(STORAGE_KEY, normalized);
+			} catch (e) {
+				console.log('迁移扫码枪配置写回失败', e);
+			}
+		}
+		return normalized;
 	} catch (e) {
 		console.log('读取扫码枪配置失败', e);
 		return null;
 	}
 }
 
-export function hasLocalScanConfig(builtinConfigs = BUILTIN_SCANNER_CONFIGS) {
-	return !!getScanConfig(builtinConfigs);
-}
-
 export function saveScanConfig(config) {
 	const normalized = normalizeConfig(config);
 	if (!normalized) {
@@ -210,175 +152,3 @@ 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,16 +1,19 @@
 // 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', 'nlscan', 'sunmi', 'urovo', 'zebra', 'honeywell',
+	'idata', 'seuic', 'autoid', '东集', '东大',
+];
+
 export default {
   data() {
     return {
@@ -19,14 +22,52 @@ export default {
       registeredBrands: [],
       remoteScannerConfigs: [],
       usePhoneScanFallback: false,
-      phoneScanPanelOpen: false,
       _scanCallback: null,
     }
   },
   
   methods: {
     getScannerConfigs() {
-      return BUILTIN_SCANNER_CONFIGS.map((item) => ({ ...item }));
+      return [
+        {
+          // 东大集成 SEUIC / AUTOID 系列（如 AUTOID9），勿与新大陆 nlscan 混淆
+          brand: 'seuic',
+          name: '东大集成(AUTOID)',
+          action: 'com.android.server.scannerservice.broadcast',
+          dataKey: 'scannerdata',
+          needSetup: true,
+          setupAction: 'com.android.scanner.service_settings',
+          setupParams: {
+            barcode_send_mode: 'BROADCAST',
+            action_barcode_broadcast: 'com.android.server.scannerservice.broadcast',
+            key_barcode_broadcast: 'scannerdata',
+            endchar: 'NONE'
+          }
+        },
+        {
+          brand: 'sunmi',
+          name: '商米',
+          action: 'com.sunmi.scanner.ACTION_DATA_CODE_RECEIVED',
+          dataKey: 'data',
+          needSetup: false
+        },
+        {
+          brand: 'urovo',
+          name: '优博讯',
+          action: 'android.intent.ACTION_DECODE_DATA',
+          dataKey: 'barcode_string',
+          needSetup: false
+        },
+        {
+          // 新大陆 Newland，广播为 nlscan.action.SCANNER_RESULT
+          brand: 'nlscan',
+          name: '新大陆',
+          action: 'nlscan.action.SCANNER_RESULT',
+          dataKey: 'SCAN_BARCODE1',
+          needSetup: false
+        },
+        { ...PHONE_SCAN_CONFIG },
+      ];
     },
 
     getPhoneScanConfig() {
@@ -34,7 +75,20 @@ export default {
     },
 
     isPdaDevice() {
-      return detectPdaDevice();
+      // #ifdef APP-PLUS
+      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() {
@@ -73,15 +127,6 @@ 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
@@ -327,12 +372,10 @@ export default {
   
   onHide() {
     this.isPageActive = false;
-    this.closePhoneScanPanel();
   },
   
   onUnload() {
     this.isPageActive = false;
-    this.closePhoneScanPanel();
     this.unregisterScanBroadcast();
   }
 }

src/common/status-tag.scss

@@ -1,15 +0,0 @@
-@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,13 +18,6 @@ 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: '已审核',
@@ -53,13 +46,12 @@ export const FABRIC_INFO_FIELDS = [
 
 /** 细码表格列（不含操作列） */
 export const FINE_CODE_TABLE_COLUMNS = [
-	{ label: '序号', key: 'seq', width: 80 },
+	{ label: '序号', key: 'seq', width: 70 },
-	{ label: '卷号', key: 'roll_no', width: 110 },
+	{ label: '卷号', key: 'roll_no', width: 90 },
-	{ label: '外部卷号', key: 'extern_volume_number', width: 140 },
+	{ label: '匹数', key: 'roll', width: 90 },
-	{ label: '匹数', key: 'roll', width: 100 },
+	{ label: '数量(重量)', key: 'weight', width: 120 },
-	{ label: '数量(重量)', key: 'weight', width: 140 },
+	{ label: '条码', key: 'bar_code', width: 260 },
-	{ label: '条码', key: 'bar_code', width: 280 },
+	{ label: '仓位', key: 'position', width: 110 },
-	{ label: '仓位', key: 'position', width: 130 },
 ];
 
 /** 审核状态变更操作配置（apiKey 对应 gfmOtherDeliveryOrder 下的方法名） */
@@ -69,6 +61,12 @@ export const STATUS_ACTION_CONFIG = {
 	unapprove: { status: AUDIT_STATUS.PENDING, msg: '确认消审该单据？', apiKey: 'statusWait' },
 };
 
+/** 审核 / 作废成功后播放的语音文案 */
+export const STATUS_ACTION_VOICE = {
+	approve: '审核成功',
+	void: '作废成功',
+};
+
 // 出仓类型：当前后端仅提供「坯布其他出货单」一种类型的接口
 export const BILL_TYPES = [
 	{ value: 'other', label: '坯布其他出货单' },
@@ -77,8 +75,8 @@ export const BILL_TYPES = [
 /** 列表分页拉取每页条数 */
 export const LIST_PAGE_SIZE = 100;
 
-/** 往来单位类型：染厂（染厂下拉筛选） */
+/** 往来单位类型：染厂（接收单位下拉筛选） */
-export const BUSINESS_UNIT_TYPE_DYE_FACTORY = 12;
+export const BUSINESS_UNIT_TYPE_DYEING_FACTORY = 12;
 
 export function getStatusOptions() {
 	return Object.keys(AUDIT_STATUS_MAP).map((value) => ({
@@ -87,7 +85,14 @@ export function getStatusOptions() {
 	}));
 }
 
-export { mapToSelectOptions } from '@/common/remoteSelect';
+/** 将下拉/列表接口响应转为 u-select 所需的 { value, label } */
+export function mapToSelectOptions(data) {
+	const list = Array.isArray(data) ? data : (data && (data.list || data.items || data.records)) || [];
+	return list.map((item) => ({
+		value: item.id,
+		label: item.name || item.label || item.code || String(item.id),
+	}));
+}
 
 // 匹数：后端以 0.01 匹存储（乘以100的整数），展示需除以100
 export function formatRoll(value) {
@@ -124,8 +129,8 @@ export function normalizeOrder(order) {
 	return {
 		id: order.id,
 		order_no: order.order_no || '',
-		audit_status: toAuditStatus(order.audit_status),
+		audit_status: order.audit_status,
-		audit_status_name: order.audit_status_name || AUDIT_STATUS_MAP[toAuditStatus(order.audit_status)] || '',
+		audit_status_name: order.audit_status_name || AUDIT_STATUS_MAP[order.audit_status] || '',
 		// 表头
 		sale_system_id: order.sale_system_id || '',
 		sale_system_name: order.sale_system_name || '',
@@ -148,22 +153,13 @@ export function normalizeOrder(order) {
 	};
 }
 
-/** 扫码详情区表格列 */
+/** 扫码详情区汇总维度（勾选后随扫码请求把对应 lock 字段传给后端） */
-export const SCAN_DETAIL_TABLE_COLUMNS = [
-	{ label: '坯布编号', key: 'grey_fabric_code', width: 160 },
-	{ label: '坯布名称', key: 'grey_fabric_name', width: 160 },
-	{ label: '纱批', key: 'yarn_batch', width: 130 },
-	{ label: '机号', key: 'machine_number', width: 110 },
-	{ label: '条数', key: 'roll', width: 90 },
-	{ label: '重量', key: 'weight', width: 110 },
-];
-
-/** 扫码详情区可勾选锁定维度（对应 PDAScanGfmOtherDeliveryOrderParam 的 *_lock；勾选后参与表格分组并随扫码请求传给后端） */
 export const SCAN_GROUP_OPTIONS = [
 	{ key: 'produce_order_no', label: '合同' },
 	{ key: 'grey_fabric_code', label: '布编' },
 	{ key: 'yarn_batch', label: '纱批' },
 	{ key: 'machine_number', label: '机号' },
+	{ key: 'volume_number', label: '布号' },
 	{ key: 'grey_fabric_level_name', label: '等级' },
 ];
 
@@ -176,32 +172,6 @@ export const SCAN_MERGE_FIELD_MAP = {
 	grey_fabric_level_name: 'grey_fabric_level_id_lock',
 };
 
-/** 扫码锁定维度不匹配时的语音文案（按匹配优先级排列） */
-const SCAN_MISMATCH_VOICE_RULES = [
-	{ patterns: ['机台', '机号', 'machine_number'], voice: '机台不同' },
-	{ patterns: ['纱批', 'yarn_batch'], voice: '纱批不同' },
-	{ patterns: ['合同号', '合同', '生产通知单', 'produce_order'], voice: '合同号不同' },
-	{ patterns: ['布编', 'grey_fabric_code'], voice: '布编不同' },
-	{ patterns: ['等级', 'grey_fabric_level', 'level'], voice: '等级不同' },
-];
-
-/**
- * 根据后端错误信息解析锁定维度不匹配的播报文案
- * @param {string} message
- * @returns {string} 如「机台不同」；无法识别则返回空串
- */
-export function resolveScanMismatchVoice(message) {
-	const msg = String(message || '');
-	if (!msg) return '';
-	for (let i = 0; i < SCAN_MISMATCH_VOICE_RULES.length; i++) {
-		const rule = SCAN_MISMATCH_VOICE_RULES[i];
-		if (rule.patterns.some((p) => msg.indexOf(p) !== -1)) {
-			return rule.voice;
-		}
-	}
-	return '';
-}
-
 /** 构建扫码新增/删除请求参数（勾选锁定维度时附带当前详情区字段值） */
 export function buildScanUpdateParams({ id, scanCode, scanType, groupKeys = [], detail = {} }) {
 	const params = {
@@ -233,7 +203,6 @@ export function getEmptyScanDetail() {
 		yarn_batch: '',
 		machine_number: '',
 		volume_number: '',
-		extern_volume_number: '',
 		grey_fabric_level_id: [],
 		grey_fabric_level_name: '',
 		weight: 0,
@@ -267,9 +236,6 @@ export function buildScanDetailFromOrderResponse(order) {
 		yarn_batch: raw.yarn_batch || '',
 		machine_number: raw.machine_number || '',
 		volume_number: raw.volume_number || '',
-		extern_volume_number: raw.extern_volume_number != null && raw.extern_volume_number !== ''
-			? String(raw.extern_volume_number)
-			: '',
 		grey_fabric_level_id: raw.grey_fabric_level_id || [],
 		grey_fabric_level_name: raw.grey_fabric_level_name || '',
 		weight: 0,
@@ -321,7 +287,6 @@ export function buildScanDetailFromContext(context, order) {
 		yarn_batch: item.yarn_batch || '',
 		machine_number: item.machine_number || '',
 		volume_number: fineCode.fabric_piece_code || fineCode.roll_no || fineCode.bar_code || '',
-		extern_volume_number: fineCode.extern_volume_number || '',
 		grey_fabric_level_name: item.grey_fabric_level_name || '',
 		weight: getFineCodeDisplayWeight(fineCode),
 		scanned_roll: Number(scannedRoll.toFixed(2)),
@@ -331,56 +296,6 @@ export function buildScanDetailFromContext(context, order) {
 	};
 }
 
-function aggregateScanTableRows(rows, keys) {
-	const map = new Map();
-	rows.forEach((row) => {
-		const groupId = keys.map((k) => row[k] || '').join('|');
-		const existing = map.get(groupId);
-		if (!existing) {
-			map.set(groupId, { ...row, roll: 0, raw_weight: 0 });
-		}
-		const agg = map.get(groupId);
-		agg.roll = Number((agg.roll + Number(row.roll || 0)).toFixed(2));
-		agg.raw_weight = Number(agg.raw_weight || 0) + Number(row.raw_weight || 0);
-	});
-	return Array.from(map.values()).map((row) => ({
-		...row,
-		weight: formatWeightKg(row.raw_weight),
-	}));
-}
-
-/** 构建扫码详情区汇总表格数据 */
-export function buildScanDetailTableRows(itemData, groupKeys = []) {
-	const rows = [];
-	(itemData || []).forEach((item) => {
-		(item.fine_codes || []).forEach((fc) => {
-			rows.push({
-				customer_name: item.customer_name || '',
-				produce_order_no: item.produce_order_no || item.contract_no || '',
-				grey_fabric_code: item.grey_fabric_code || '',
-				grey_fabric_name: item.grey_fabric_name || '',
-				yarn_batch: item.yarn_batch || '',
-				machine_number: item.machine_number || '',
-				volume_number: fc.roll_no || fc.fabric_piece_code || '',
-				grey_fabric_level_name: item.grey_fabric_level_name || '',
-				roll: fc.roll || 0,
-				raw_weight: fc.raw_weight != null ? fc.raw_weight : 0,
-			});
-		});
-	});
-	if (!rows.length) return [];
-	const keys = (groupKeys || []).filter(Boolean);
-	if (!keys.length) {
-		return aggregateScanTableRows(rows, ['grey_fabric_code', 'grey_fabric_name', 'yarn_batch', 'machine_number']);
-	}
-	return aggregateScanTableRows(rows, keys);
-}
-
-export function getScanDetailTableWidth(columns) {
-	const total = (columns || []).reduce((sum, col) => sum + (col.width || 120), 0);
-	return `${total}rpx`;
-}
-
 export function normalizeItem(item) {
 	const machineStockRaw = item.machine_stock_roll ?? item.machine_stock ?? item.machine_inventory_roll;
 	return {
@@ -408,9 +323,6 @@ export function normalizeItem(item) {
 		fine_codes: (item.item_fc_data || []).map((fc) => ({
 			id: fc.id,
 			roll_no: fc.volume_number || '',
-			extern_volume_number: fc.extern_volume_number != null && fc.extern_volume_number !== ''
-				? String(fc.extern_volume_number)
-				: '',
 			fabric_piece_code: fc.fabric_piece_code || '',
 			bar_code: fc.fabric_piece_code || fc.bar_code || '',
 			position: fc.position || '',
@@ -477,13 +389,11 @@ export function formatDisplayTime(value, format = 'YYYY-MM-DD') {
 }
 
 export function canScanAtStatus(status) {
-	const s = toAuditStatus(status);
+	return [AUDIT_STATUS.PENDING, AUDIT_STATUS.REJECTED].includes(status);
-	return s === AUDIT_STATUS.PENDING || s === AUDIT_STATUS.REJECTED;
 }
 
 export function isLockedOrderStatus(status) {
-	const s = toAuditStatus(status);
+	return [AUDIT_STATUS.APPROVED, AUDIT_STATUS.VOIDED].includes(status);
-	return s === AUDIT_STATUS.APPROVED || s === AUDIT_STATUS.VOIDED;
 }
 
 /** 分页拉取全部列表（直至末页） */
@@ -500,12 +410,7 @@ export function fetchAllOrderList(listFn, params = {}, pageSize = LIST_PAGE_SIZE
 
 /** 新增/编辑页底部：审核、作废 */
 export function getFormStatusActionButtons(headerSaved, orderId, status) {
-	if (!headerSaved || !orderId) return [];
+	if (!headerSaved || !orderId || !canScanAtStatus(status)) 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' },
@@ -514,15 +419,14 @@ export function getFormStatusActionButtons(headerSaved, orderId, status) {
 
 /** 查看页底部：编辑、审核、作废 / 消审 */
 export function getViewStatusActionButtons(status) {
-	const s = toAuditStatus(status);
+	if (status === AUDIT_STATUS.PENDING || status === AUDIT_STATUS.REJECTED) {
-	if (s === AUDIT_STATUS.PENDING || s === AUDIT_STATUS.REJECTED) {
 		return [
 			{ label: '编辑', action: 'edit' },
 			{ label: '审核', action: 'approve' },
 			{ label: '作废', action: 'void' },
 		];
 	}
-	if (s === AUDIT_STATUS.APPROVED) {
+	if (status === AUDIT_STATUS.APPROVED) {
 		return [{ label: '消审', action: 'unapprove' }];
 	}
 	return [];
@@ -542,7 +446,7 @@ export function orderToFormFields(order) {
 
 export function getFineCodeTableColumns(readonly) {
 	const cols = [...FINE_CODE_TABLE_COLUMNS];
-	if (!readonly) cols.push({ label: '操作', key: 'action', width: 100 });
+	if (!readonly) cols.push({ label: '操作', key: 'action', width: 90 });
 	return cols;
 }
 
@@ -550,7 +454,6 @@ export function mapFineCodeTableRows(list, readonly) {
 	return (list || []).map((item, index) => ({
 		seq: index + 1,
 		roll_no: item.roll_no || '-',
-		extern_volume_number: item.extern_volume_number || '-',
 		roll: item.roll != null && item.roll !== '' ? item.roll : '-',
 		weight: item.weight != null && item.weight !== '' ? `${item.weight}` : '-',
 		bar_code: item.bar_code || '-',

src/common/storeFabricWarehouse.js

@@ -53,17 +53,16 @@ export const STOCK_TABLE_COLUMNS = [
 
 /** 细码明细表格列 */
 export const WAREHOUSE_DETAIL_COLUMNS = [
-	{ label: '序号', key: 'seq', width: 80 },
+	{ label: '序号', key: 'seq', width: 70 },
-	{ label: '卷号', key: 'volume_number', width: 110 },
+	{ label: '卷号', key: 'volume_number', width: 90 },
-	{ label: '外部卷号', key: 'extern_volume_number', width: 140 },
+	{ label: '匹数', key: 'roll', width: 90 },
-	{ label: '匹数', key: 'roll', width: 100 },
+	{ label: '数量(KG)', key: 'weight', width: 110 },
-	{ label: '数量(KG)', key: 'weight', width: 130 },
+	{ label: '条码', key: 'bar_code', width: 240 },
-	{ label: '条码', key: 'bar_code', width: 280 },
+	{ label: '仓位', key: 'position', width: 100 },
-	{ label: '仓位', key: 'position', width: 120 },
+	{ label: '颜色', key: 'gray_fabric_color_name', width: 100 },
-	{ label: '颜色', key: 'gray_fabric_color_name', width: 120 },
+	{ label: '织厂', key: 'supplier_name', width: 120 },
-	{ label: '织厂', key: 'supplier_name', width: 140 },
+	{ label: '机台', key: 'machine_number', width: 90 },
-	{ label: '机台', key: 'machine_number', width: 100 },
+	{ label: '库龄(天)', key: 'days_of_age', width: 90 },
-	{ label: '库龄(天)', key: 'days_of_age', width: 110 },
 ];
 
 export function formatStockWeightWithUnit(weight, unitName) {
@@ -245,7 +244,6 @@ export function mapWarehouseDetailRows(list = []) {
 	return (list || []).map((item, index) => ({
 		seq: index + 1,
 		volume_number: item.volume_number || '-',
-		extern_volume_number: item.extern_volume_number || '-',
 		roll: item.num != null && item.num !== '' ? formatRoll(item.num) : '-',
 		weight: item.weight != null && item.weight !== '' ? formatWeightKg(item.weight) : '-',
 		bar_code: item.bar_code || item.fabric_piece_code || '-',

src/common/storeGoodsProcessIn.js

@@ -1,472 +0,0 @@
-/**
- * 加工进仓单常量与数据工具
- *
- * 真实接口请求统一注册在 src/common/http.api.js 的 vm.$u.api.fpmProcessInOrder 下。
- */
-import dayjs from 'dayjs';
-
-export const AUDIT_STATUS = {
-	PENDING: 1,
-	APPROVED: 2,
-	REJECTED: 3,
-	VOIDED: 4,
-};
-
-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: '已审核',
-	3: '已驳回',
-	4: '已作废',
-};
-
-/** 操作类型：1录入 3删除 */
-export const ARRANGE_TYPE = {
-	IN: 1,
-	DEL: 3,
-};
-
-/** 入仓类型：加工进仓单 */
-export const IN_ORDER_TYPE_PROCESS = 5;
-
-/** 入仓类型：返修进仓 */
-export const IN_ORDER_TYPE_REPAIR = 6;
-
-export const IN_ORDER_TYPE_MAP = {
-	[IN_ORDER_TYPE_PROCESS]: '加工进仓单',
-	[IN_ORDER_TYPE_REPAIR]: '返修进仓',
-};
-
-export const IN_ORDER_TYPE_OPTIONS = [
-	{ value: IN_ORDER_TYPE_PROCESS, label: IN_ORDER_TYPE_MAP[IN_ORDER_TYPE_PROCESS] },
-	{ value: IN_ORDER_TYPE_REPAIR, label: IN_ORDER_TYPE_MAP[IN_ORDER_TYPE_REPAIR] },
-];
-
-/** 默认纸筒重量（公斤，表单展示值） */
-export const DEFAULT_PAPER_TUBE_WEIGHT = 0.3;
-
-/** 默认包装重量（公斤，表单展示值） */
-export const DEFAULT_PACKAGE_WEIGHT = 0.15;
-
-/** 往来单位类型：加工单位 */
-export const BUSINESS_UNIT_TYPE_PROCESS = 12;
-
-/** 成品物理仓类型 */
-export const WAREHOUSE_TYPE_FINISHED = 103;
-
-/** 默认仓库名称 */
-export const DEFAULT_WAREHOUSE_NAME = '成品仓';
-
-export const LIST_PAGE_SIZE = 100;
-
-export const STATUS_ACTION_CONFIG = {
-	approve: { status: AUDIT_STATUS.APPROVED, msg: '确认审核该单据？', apiKey: 'statusPass' },
-	void: { status: AUDIT_STATUS.VOIDED, msg: '确认作废该单据？', apiKey: 'statusCancel' },
-	unapprove: { status: AUDIT_STATUS.PENDING, msg: '确认消审该单据？', apiKey: 'statusWait' },
-};
-
-export function getStatusOptions() {
-	return Object.keys(AUDIT_STATUS_MAP).map((value) => ({
-		value,
-		label: AUDIT_STATUS_MAP[value],
-	}));
-}
-
-export { mapToSelectOptions } from '@/common/remoteSelect';
-
-/** 匹数：后端 ×100 存储 */
-export function formatRoll(value) {
-	const n = Number(value || 0) / 100;
-	return Number.isInteger(n) ? n : Number(n.toFixed(2));
-}
-
-/** 数量（公斤）：后端 ×10000 存储 */
-export function formatWeightKg(value) {
-	const n = Number(value || 0) / 10000;
-	return Number(n.toFixed(2));
-}
-
-/** 公斤展示值转后端存储（×10000） */
-export function toWeightStorage(value) {
-	return Math.round(Number(value || 0) * 10000);
-}
-
-export function normalizeOrder(order) {
-	if (!order) return null;
-	return {
-		id: order.id,
-		order_no: order.order_no || '',
-		audit_status: toAuditStatus(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 || '',
-		warehouse_name: order.warehouse_name || '',
-		sale_system_id: order.sale_system_id || '',
-		sale_system_name: order.sale_system_name || '',
-		in_order_type: order.in_order_type || IN_ORDER_TYPE_PROCESS,
-		in_order_type_name: order.in_order_type_name
-			|| IN_ORDER_TYPE_MAP[order.in_order_type]
-			|| IN_ORDER_TYPE_MAP[IN_ORDER_TYPE_PROCESS],
-		paper_tube_weight: formatWeightKg(order.paper_tube_weight),
-		package_weight: formatWeightKg(order.package_weight),
-		remark: order.remark || '',
-		warehouse_in_time: (order.warehouse_in_time || '').slice(0, 10),
-		creator_name: order.creator_name || '',
-		create_time: order.create_time || '',
-		auditor_name: order.auditor_name || '',
-		audit_time: order.audit_time || '',
-		total_roll: formatRoll(order.total_roll),
-		total_weight: formatWeightKg(order.total_weight),
-		total_length: formatRoll(order.total_length),
-		item_data: (order.item_data || []).map(normalizeItem),
-		_raw: order,
-	};
-}
-
-export function normalizeFineCode(fc) {
-	if (!fc) return null;
-	const weightRaw = fc.base_unit_weight != null
-		? fc.base_unit_weight
-		: (fc.settle_weight != null ? fc.settle_weight : fc.weight);
-	const qrCode = fc.qr_code || fc.long_code || '';
-	const barCode = fc.bar_code || fc.digital_code || fc.short_code || '';
-	return {
-		id: fc.id,
-		volume_number: fc.volume_number != null && fc.volume_number !== '' ? String(fc.volume_number) : '',
-		extern_volume_number: fc.extern_volume_number != null && fc.extern_volume_number !== ''
-			? String(fc.extern_volume_number)
-			: '',
-		roll: formatRoll(fc.roll),
-		weight: formatWeightKg(weightRaw),
-		bar_code: barCode,
-		qr_code: qrCode,
-		digital_code: fc.digital_code || '',
-		long_code: fc.long_code || '',
-		short_code: fc.short_code || '',
-		dye_factory_dyelot_number: fc.dye_factory_dyelot_number || fc.dyelot_number || '',
-		warehouse_bin_name: fc.warehouse_bin_name || '',
-		shelf_no: fc.shelf_no || '',
-		scan_code: qrCode || barCode || '',
-		paper_tube_weight: fc.paper_tube_weight != null && fc.paper_tube_weight !== ''
-			? formatWeightKg(fc.paper_tube_weight)
-			: null,
-		package_weight: fc.package_weight != null && fc.package_weight !== ''
-			? formatWeightKg(fc.package_weight)
-			: null,
-	};
-}
-
-export function normalizeItem(item) {
-	return {
-		id: item.id,
-		quote_order_no: item.quote_order_no || '',
-		product_code: item.product_code || '',
-		product_name: item.product_name || '',
-		product_color_code: item.product_color_code || '',
-		product_color_name: item.product_color_name || '',
-		dye_factory_dyelot_number: item.dye_factory_dyelot_number || '',
-		dye_factory_color_code: item.dye_factory_color_code || '',
-		in_roll: formatRoll(item.in_roll),
-		in_weight: formatWeightKg(item.in_weight),
-		item_fc_data: (item.item_fc_data || []).map(normalizeFineCode).filter(Boolean),
-	};
-}
-
-/**
- * 明细分组：成品编号 → 成品色号 → 细码
- */
-export function buildItemGroups(items) {
-	const productMap = new Map();
-	(items || []).forEach((item) => {
-		const productKey = item.product_code || '-';
-		if (!productMap.has(productKey)) {
-			productMap.set(productKey, {
-				group_key: `p:${productKey}`,
-				product_code: item.product_code || '',
-				product_name: item.product_name || '',
-				in_roll: 0,
-				in_weight: 0,
-				colors: new Map(),
-			});
-		}
-		const productGroup = productMap.get(productKey);
-		if (!productGroup.product_name && item.product_name) {
-			productGroup.product_name = item.product_name;
-		}
-
-		const colorKey = item.product_color_code || item.product_color_name || '-';
-		if (!productGroup.colors.has(colorKey)) {
-			productGroup.colors.set(colorKey, {
-				group_key: `p:${productKey}|c:${colorKey}`,
-				product_color_code: item.product_color_code || '',
-				product_color_name: item.product_color_name || '',
-				quote_order_no: item.quote_order_no || '',
-				dye_factory_dyelot_number: item.dye_factory_dyelot_number || '',
-				in_roll: 0,
-				in_weight: 0,
-				fine_codes: [],
-			});
-		}
-		const colorGroup = productGroup.colors.get(colorKey);
-		productGroup.in_roll = Number((productGroup.in_roll + Number(item.in_roll || 0)).toFixed(2));
-		productGroup.in_weight = Number((productGroup.in_weight + Number(item.in_weight || 0)).toFixed(2));
-		colorGroup.in_roll = Number((colorGroup.in_roll + Number(item.in_roll || 0)).toFixed(2));
-		colorGroup.in_weight = Number((colorGroup.in_weight + Number(item.in_weight || 0)).toFixed(2));
-		if (item.quote_order_no) colorGroup.quote_order_no = item.quote_order_no;
-		if (item.dye_factory_dyelot_number) {
-			colorGroup.dye_factory_dyelot_number = item.dye_factory_dyelot_number;
-		}
-		if (!colorGroup.product_color_name && item.product_color_name) {
-			colorGroup.product_color_name = item.product_color_name;
-		}
-		colorGroup.fine_codes.push(...(item.item_fc_data || []));
-	});
-
-	return Array.from(productMap.values()).map((product) => ({
-		group_key: product.group_key,
-		product_code: product.product_code,
-		product_name: product.product_name,
-		in_roll: product.in_roll,
-		in_weight: product.in_weight,
-		colors: Array.from(product.colors.values()),
-	}));
-}
-
-export function getEmptyScanDetail() {
-	return {
-		quote_order_no: '',
-		dyelot_number: '',
-		volume_number: '',
-		extern_volume_number: '',
-		product_code: '',
-		product_color_code: '',
-		order_roll: 0,
-		item_roll: 0,
-		order_weight: 0,
-		item_weight: 0,
-	};
-}
-
-/** 刚扫细码的数量（公斤存储值）：优先细码 weight */
-function pickScannedFineWeight(res) {
-	if (!res) return 0;
-	if (res.weight != null && res.weight !== '') return res.weight;
-	if (res.base_unit_weight != null && res.base_unit_weight !== '') return res.base_unit_weight;
-	if (res.settle_weight != null && res.settle_weight !== '') return res.settle_weight;
-	if (res.actually_weight != null && res.actually_weight !== '') return res.actually_weight;
-	return res.item_weight;
-}
-
-/** 从扫码接口返回构建详情区（匹数÷100，数量÷10000） */
-export function buildScanDetailFromScanResponse(res) {
-	if (!res) return getEmptyScanDetail();
-	return {
-		quote_order_no: res.quote_order_no || '',
-		dyelot_number: res.dyelot_number || '',
-		volume_number: res.volume_number != null && res.volume_number !== '' ? String(res.volume_number) : '',
-		extern_volume_number: res.extern_volume_number != null && res.extern_volume_number !== ''
-			? String(res.extern_volume_number)
-			: '',
-		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),
-		// 本行数量：刚扫这条细码的重量（weight），不是明细行合计
-		item_weight: formatWeightKg(pickScannedFineWeight(res)),
-	};
-}
-
-/** 校验纸筒/包装重量（扫码时提交） */
-export function validateScanWeights(paperTubeWeight, packageWeight) {
-	if (paperTubeWeight === '' || paperTubeWeight == null) {
-		return '请输入纸筒重量';
-	}
-	if (Number.isNaN(Number(paperTubeWeight))) return '纸筒重量格式不正确';
-	if (packageWeight === '' || packageWeight == null) {
-		return '请输入包装重量';
-	}
-	if (Number.isNaN(Number(packageWeight))) return '包装重量格式不正确';
-	return '';
-}
-
-/** 构建扫码请求参数（纸筒/包装重量在扫码时提交，公斤值需 ×10000） */
-export function buildScanUpdateParams({
-	id,
-	scanCode,
-	arrangeType,
-	warehouseBinId,
-	paperTubeWeight,
-	packageWeight,
-}) {
-	const code = (scanCode || '').trim();
-	const params = {
-		id: Number(id),
-		arrange_type: arrangeType,
-		paper_tube_weight: toWeightStorage(paperTubeWeight),
-		package_weight: toWeightStorage(packageWeight),
-	};
-	if (warehouseBinId) {
-		params.warehouse_bin_id = Number(warehouseBinId);
-	}
-	// 长度大于25走二维码，否则走条码
-	if (code.length > 25) {
-		params.qr_code = code;
-	} else {
-		params.bar_code = code;
-	}
-	return params;
-}
-
-export function buildStatusParam(id) {
-	return { id: String(id) };
-}
-
-export function formatDisplayTime(value, format = 'YYYY-MM-DD') {
-	if (!value) return '';
-	const parsed = dayjs(value);
-	return parsed.isValid() ? parsed.format(format) : String(value).slice(0, 10);
-}
-
-export function canScanAtStatus(status) {
-	const s = toAuditStatus(status);
-	return s === AUDIT_STATUS.PENDING || s === AUDIT_STATUS.REJECTED;
-}
-
-export function isLockedOrderStatus(status) {
-	const s = toAuditStatus(status);
-	return s === AUDIT_STATUS.APPROVED || s === AUDIT_STATUS.VOIDED;
-}
-
-export function fetchAllOrderList(listFn, params = {}, pageSize = LIST_PAGE_SIZE) {
-	const pickBatch = (res) => {
-		if (Array.isArray(res)) return res;
-		if (!res || typeof res !== 'object') return [];
-		return res.list || res.records || res.items || [];
-	};
-	const loadPage = (page, acc) => listFn({ ...params, page, size: pageSize })
-		.then((res) => {
-			const batch = pickBatch(res);
-			if (!batch.length) return acc;
-			// 一次返回超过 pageSize：后端忽略分页，视为全量，避免死循环翻页
-			if (batch.length > pageSize) return acc.concat(batch);
-			// 翻页后与首页首条相同：后端忽略 page，避免死循环
-			if (
-				page > 1
-				&& acc.length
-				&& batch[0]
-				&& acc[0]
-				&& String(batch[0].id) === String(acc[0].id)
-			) {
-				return acc;
-			}
-			const merged = acc.concat(batch);
-			const total = !Array.isArray(res) && res != null ? Number(res.total) : NaN;
-			if (!Number.isNaN(total) && merged.length >= total) return merged;
-			if (batch.length < pageSize) return merged;
-			return loadPage(page + 1, merged);
-		});
-	return loadPage(1, []);
-}
-
-export function getFormStatusActionButtons(headerSaved, orderId, status) {
-	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' },
-	];
-}
-
-export function getViewStatusActionButtons(status) {
-	const s = toAuditStatus(status);
-	if (s === AUDIT_STATUS.PENDING || s === AUDIT_STATUS.REJECTED) {
-		return [
-			{ label: '编辑', action: 'edit' },
-			{ label: '审核', action: 'approve' },
-			{ label: '作废', action: 'void' },
-		];
-	}
-	if (s === AUDIT_STATUS.APPROVED) {
-		return [{ label: '消审', action: 'unapprove' }];
-	}
-	return [];
-}
-
-export function orderToFormFields(order) {
-	return {
-		order_no: order.order_no,
-		process_unit_id: order.process_unit_id,
-		process_name: order.process_name,
-		warehouse_id: order.warehouse_id,
-		warehouse_name: order.warehouse_name,
-		sale_system_id: order.sale_system_id,
-		sale_system_name: order.sale_system_name,
-		in_order_type: order.in_order_type || IN_ORDER_TYPE_PROCESS,
-		in_order_type_name: order.in_order_type_name
-			|| IN_ORDER_TYPE_MAP[order.in_order_type]
-			|| IN_ORDER_TYPE_MAP[IN_ORDER_TYPE_PROCESS],
-		paper_tube_weight: String(DEFAULT_PAPER_TUBE_WEIGHT),
-		package_weight: String(DEFAULT_PACKAGE_WEIGHT),
-		remark: order.remark,
-		item_data: order.item_data,
-	};
-}
-
-/** 从仓库下拉中选出默认成品仓 */
-export function pickDefaultWarehouse(options, loginWarehouseId, loginWarehouseName) {
-	const list = options || [];
-	const byName = list.find((item) => item.label === DEFAULT_WAREHOUSE_NAME);
-	if (byName) return byName;
-	if (loginWarehouseId) {
-		const byId = list.find((item) => String(item.value) === String(loginWarehouseId));
-		if (byId) return byId;
-		if (loginWarehouseName) {
-			return { value: loginWarehouseId, label: loginWarehouseName };
-		}
-	}
-	return list[0] || null;
-}
-
-/**
- * 确认并执行审核状态变更
- */
-export function confirmOrderStatusAction(vm, { orderId, action, onSuccess }) {
-	const cfg = STATUS_ACTION_CONFIG[action];
-	if (!cfg || !orderId) return;
-	const api = vm.$u.api.fpmProcessInOrder;
-	const requestFn = api[cfg.apiKey];
-	if (typeof requestFn !== 'function') return;
-	uni.showModal({
-		title: '提示',
-		content: cfg.msg,
-		success: (res) => {
-			if (!res.confirm) return;
-			uni.showLoading({ title: '处理中...' });
-			requestFn(buildStatusParam(orderId))
-				.then(() => {
-					if (typeof onSuccess === 'function') return onSuccess();
-					uni.hideLoading();
-				})
-				.catch((e) => {
-					uni.hideLoading();
-					if (vm.showError) vm.showError(e.message || '操作失败');
-				});
-		},
-	});
-}

src/common/storeGoodsProcessOut.js

@@ -1,408 +0,0 @@
-/**
- * 加工出仓单常量与数据工具
- *
- * 真实接口请求统一注册在 src/common/http.api.js 的 vm.$u.api.fpmProcessOutOrder 下。
- */
-import dayjs from 'dayjs';
-
-export const AUDIT_STATUS = {
-	PENDING: 1,
-	APPROVED: 2,
-	REJECTED: 3,
-	VOIDED: 4,
-};
-
-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: '已审核',
-	3: '已驳回',
-	4: '已作废',
-};
-
-/** 操作类型：1录入 3删除 */
-export const ARRANGE_TYPE = {
-	IN: 1,
-	DEL: 3,
-};
-
-/** 出仓类型：正常加工出仓 WarehouseGoodOutTypeProcess = 5 */
-export const OUT_ORDER_TYPE_PROCESS = 5;
-export const OUT_ORDER_TYPE_PROCESS_NAME = '正常加工出仓';
-/** 出仓类型：回修加工出仓 WarehouseGoodOutTypeProcessRepair = 8 */
-export const OUT_ORDER_TYPE_REPAIR = 8;
-export const OUT_ORDER_TYPE_REPAIR_NAME = '回修加工出仓';
-
-/** 往来单位类型：加工单位 */
-export const BUSINESS_UNIT_TYPE_PROCESS = 12;
-
-/** 成品物理仓类型 */
-export const WAREHOUSE_TYPE_FINISHED = 103;
-
-/** 默认仓库名称 */
-export const DEFAULT_WAREHOUSE_NAME = '成品仓';
-
-export const LIST_PAGE_SIZE = 100;
-
-export const STATUS_ACTION_CONFIG = {
-	approve: { status: AUDIT_STATUS.APPROVED, msg: '确认审核该单据？', apiKey: 'statusPass' },
-	void: { status: AUDIT_STATUS.VOIDED, msg: '确认作废该单据？', apiKey: 'statusCancel' },
-	unapprove: { status: AUDIT_STATUS.PENDING, msg: '确认消审该单据？', apiKey: 'statusWait' },
-};
-
-export function getStatusOptions() {
-	return Object.keys(AUDIT_STATUS_MAP).map((value) => ({
-		value,
-		label: AUDIT_STATUS_MAP[value],
-	}));
-}
-
-export { mapToSelectOptions } from '@/common/remoteSelect';
-
-/** 匹数：后端 ×100 存储 */
-export function formatRoll(value) {
-	const n = Number(value || 0) / 100;
-	return Number.isInteger(n) ? n : Number(n.toFixed(2));
-}
-
-/** 数量（公斤）：后端 ×10000 存储 */
-export function formatWeightKg(value) {
-	const n = Number(value || 0) / 10000;
-	return Number(n.toFixed(2));
-}
-
-export function normalizeOrder(order) {
-	if (!order) return null;
-	return {
-		id: order.id,
-		order_no: order.order_no || '',
-		audit_status: toAuditStatus(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 || '',
-		warehouse_name: order.warehouse_name || '',
-		sale_system_id: order.sale_system_id || '',
-		sale_system_name: order.sale_system_name || '',
-		out_order_type: order.out_order_type || OUT_ORDER_TYPE_PROCESS,
-		out_order_type_name: order.out_order_type_name || OUT_ORDER_TYPE_PROCESS_NAME,
-		remark: order.remark || '',
-		warehouse_out_time: (order.warehouse_out_time || '').slice(0, 10),
-		creator_name: order.creator_name || '',
-		create_time: order.create_time || '',
-		auditor_name: order.auditor_name || '',
-		audit_time: order.audit_time || '',
-		total_roll: formatRoll(order.total_roll),
-		total_weight: formatWeightKg(order.total_weight),
-		total_length: formatRoll(order.total_length),
-		item_data: (order.item_data || []).map(normalizeItem),
-		_raw: order,
-	};
-}
-
-export function normalizeFineCode(fc) {
-	if (!fc) return null;
-	// 出仓细码数量：优先基本单位公斤，其次结算数量
-	const weightRaw = fc.base_unit_weight != null
-		? fc.base_unit_weight
-		: (fc.settle_weight != null ? fc.settle_weight : fc.weight);
-	const qrCode = fc.qr_code || '';
-	const digitalCode = fc.digital_code || '';
-	const barCode = fc.bar_code || digitalCode || '';
-	return {
-		id: fc.id,
-		volume_number: fc.volume_number != null && fc.volume_number !== '' ? String(fc.volume_number) : '',
-		extern_volume_number: fc.extern_volume_number != null && fc.extern_volume_number !== ''
-			? String(fc.extern_volume_number)
-			: '',
-		roll: formatRoll(fc.roll),
-		weight: formatWeightKg(weightRaw),
-		bar_code: barCode,
-		qr_code: qrCode,
-		digital_code: digitalCode,
-		dye_factory_dyelot_number: fc.dye_factory_dyelot_number || fc.dyelot_number || '',
-		warehouse_bin_name: fc.warehouse_bin_name || '',
-		shelf_no: fc.shelf_no || '',
-		// 删除扫码优先二维码
-		scan_code: qrCode || barCode || digitalCode || '',
-	};
-}
-
-export function normalizeItem(item) {
-	// 明细数量字段：OpenAPI 为 total_weight / settle_weight（×10000），匹数为 out_roll（×100）
-	const weightRaw = item.total_weight != null
-		? item.total_weight
-		: (item.settle_weight != null ? item.settle_weight : item.out_weight);
-	return {
-		id: item.id,
-		quote_order_no: item.quote_order_no || '',
-		product_code: item.product_code || '',
-		product_name: item.product_name || '',
-		product_color_code: item.product_color_code || '',
-		product_color_name: item.product_color_name || '',
-		dye_factory_dyelot_number: item.dye_factory_dyelot_number || '',
-		dye_factory_color_code: item.dye_factory_color_code || '',
-		out_roll: formatRoll(item.out_roll),
-		out_weight: formatWeightKg(weightRaw),
-		item_fc_data: (item.item_fc_data || []).map(normalizeFineCode).filter(Boolean),
-	};
-}
-
-/**
- * 明细分组：成品编号 → 成品色号 → 细码
- */
-export function buildItemGroups(items) {
-	const productMap = new Map();
-	(items || []).forEach((item) => {
-		const productKey = item.product_code || '-';
-		if (!productMap.has(productKey)) {
-			productMap.set(productKey, {
-				group_key: `p:${productKey}`,
-				product_code: item.product_code || '',
-				product_name: item.product_name || '',
-				out_roll: 0,
-				out_weight: 0,
-				colors: new Map(),
-			});
-		}
-		const productGroup = productMap.get(productKey);
-		if (!productGroup.product_name && item.product_name) {
-			productGroup.product_name = item.product_name;
-		}
-
-		const colorKey = item.product_color_code || item.product_color_name || '-';
-		if (!productGroup.colors.has(colorKey)) {
-			productGroup.colors.set(colorKey, {
-				group_key: `p:${productKey}|c:${colorKey}`,
-				product_color_code: item.product_color_code || '',
-				product_color_name: item.product_color_name || '',
-				quote_order_no: item.quote_order_no || '',
-				dye_factory_dyelot_number: item.dye_factory_dyelot_number || '',
-				out_roll: 0,
-				out_weight: 0,
-				fine_codes: [],
-			});
-		}
-		const colorGroup = productGroup.colors.get(colorKey);
-		productGroup.out_roll = Number((productGroup.out_roll + Number(item.out_roll || 0)).toFixed(2));
-		productGroup.out_weight = Number((productGroup.out_weight + Number(item.out_weight || 0)).toFixed(2));
-		colorGroup.out_roll = Number((colorGroup.out_roll + Number(item.out_roll || 0)).toFixed(2));
-		colorGroup.out_weight = Number((colorGroup.out_weight + Number(item.out_weight || 0)).toFixed(2));
-		if (item.quote_order_no) colorGroup.quote_order_no = item.quote_order_no;
-		if (item.dye_factory_dyelot_number) {
-			colorGroup.dye_factory_dyelot_number = item.dye_factory_dyelot_number;
-		}
-		if (!colorGroup.product_color_name && item.product_color_name) {
-			colorGroup.product_color_name = item.product_color_name;
-		}
-		colorGroup.fine_codes.push(...(item.item_fc_data || []));
-	});
-
-	return Array.from(productMap.values()).map((product) => ({
-		group_key: product.group_key,
-		product_code: product.product_code,
-		product_name: product.product_name,
-		out_roll: product.out_roll,
-		out_weight: product.out_weight,
-		colors: Array.from(product.colors.values()),
-	}));
-}
-
-export function getEmptyScanDetail() {
-	return {
-		quote_order_no: '',
-		dyelot_number: '',
-		volume_number: '',
-		extern_volume_number: '',
-		product_code: '',
-		product_color_code: '',
-		order_roll: 0,
-		item_roll: 0,
-		order_weight: 0,
-		item_weight: 0,
-	};
-}
-
-/** 从扫码接口返回构建详情区（匹数÷100，数量÷10000） */
-export function buildScanDetailFromScanResponse(res) {
-	if (!res) return getEmptyScanDetail();
-	return {
-		quote_order_no: res.quote_order_no || '',
-		dyelot_number: res.dyelot_number || '',
-		volume_number: res.volume_number != null && res.volume_number !== '' ? String(res.volume_number) : '',
-		extern_volume_number: res.extern_volume_number != null && res.extern_volume_number !== ''
-			? String(res.extern_volume_number)
-			: '',
-		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),
-		item_weight: formatWeightKg(res.item_weight != null ? res.item_weight : res.weight),
-	};
-}
-
-/** 构建扫码请求参数 */
-export function buildScanUpdateParams({ id, scanCode, arrangeType, warehouseBinId }) {
-	const code = (scanCode || '').trim();
-	const params = {
-		id: Number(id),
-		arrange_type: arrangeType,
-	};
-	if (warehouseBinId) {
-		params.warehouse_bin_id = Number(warehouseBinId);
-	}
-	// 长度大于25走二维码，否则走条码
-	if (code.length > 25) {
-		params.qr_code = code;
-	} else {
-		params.bar_code = code;
-	}
-	return params;
-}
-
-export function buildStatusParam(id) {
-	return { id: String(id) };
-}
-
-export function formatDisplayTime(value, format = 'YYYY-MM-DD') {
-	if (!value) return '';
-	const parsed = dayjs(value);
-	return parsed.isValid() ? parsed.format(format) : String(value).slice(0, 10);
-}
-
-export function canScanAtStatus(status) {
-	const s = toAuditStatus(status);
-	return s === AUDIT_STATUS.PENDING || s === AUDIT_STATUS.REJECTED;
-}
-
-export function isLockedOrderStatus(status) {
-	const s = toAuditStatus(status);
-	return s === AUDIT_STATUS.APPROVED || s === AUDIT_STATUS.VOIDED;
-}
-
-export function fetchAllOrderList(listFn, params = {}, pageSize = LIST_PAGE_SIZE) {
-	const pickBatch = (res) => {
-		if (Array.isArray(res)) return res;
-		if (!res || typeof res !== 'object') return [];
-		return res.list || res.records || res.items || [];
-	};
-	const loadPage = (page, acc) => listFn({ ...params, page, size: pageSize })
-		.then((res) => {
-			const batch = pickBatch(res);
-			if (!batch.length) return acc;
-			// 一次返回超过 pageSize：后端忽略分页，视为全量，避免死循环翻页
-			if (batch.length > pageSize) return acc.concat(batch);
-			// 翻页后与首页首条相同：后端忽略 page，避免死循环
-			if (
-				page > 1
-				&& acc.length
-				&& batch[0]
-				&& acc[0]
-				&& String(batch[0].id) === String(acc[0].id)
-			) {
-				return acc;
-			}
-			const merged = acc.concat(batch);
-			const total = !Array.isArray(res) && res != null ? Number(res.total) : NaN;
-			if (!Number.isNaN(total) && merged.length >= total) return merged;
-			if (batch.length < pageSize) return merged;
-			return loadPage(page + 1, merged);
-		});
-	return loadPage(1, []);
-}
-
-export function getFormStatusActionButtons(headerSaved, orderId, status) {
-	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' },
-	];
-}
-
-export function getViewStatusActionButtons(status) {
-	const s = toAuditStatus(status);
-	if (s === AUDIT_STATUS.PENDING || s === AUDIT_STATUS.REJECTED) {
-		return [
-			{ label: '编辑', action: 'edit' },
-			{ label: '审核', action: 'approve' },
-			{ label: '作废', action: 'void' },
-		];
-	}
-	if (s === AUDIT_STATUS.APPROVED) {
-		return [{ label: '消审', action: 'unapprove' }];
-	}
-	return [];
-}
-
-export function orderToFormFields(order) {
-	return {
-		order_no: order.order_no,
-		out_order_type: order.out_order_type || OUT_ORDER_TYPE_PROCESS,
-		out_order_type_name: order.out_order_type_name || OUT_ORDER_TYPE_PROCESS_NAME,
-		process_unit_id: order.process_unit_id,
-		process_name: order.process_name,
-		warehouse_id: order.warehouse_id,
-		warehouse_name: order.warehouse_name,
-		remark: order.remark,
-		item_data: order.item_data,
-	};
-}
-
-/** 从仓库下拉中选出默认成品仓 */
-export function pickDefaultWarehouse(options, loginWarehouseId, loginWarehouseName) {
-	const list = options || [];
-	const byName = list.find((item) => item.label === DEFAULT_WAREHOUSE_NAME);
-	if (byName) return byName;
-	if (loginWarehouseId) {
-		const byId = list.find((item) => String(item.value) === String(loginWarehouseId));
-		if (byId) return byId;
-		if (loginWarehouseName) {
-			return { value: loginWarehouseId, label: loginWarehouseName };
-		}
-	}
-	return list[0] || null;
-}
-
-/**
- * 确认并执行审核状态变更
- */
-export function confirmOrderStatusAction(vm, { orderId, action, onSuccess }) {
-	const cfg = STATUS_ACTION_CONFIG[action];
-	if (!cfg || !orderId) return;
-	const api = vm.$u.api.fpmProcessOutOrder;
-	const requestFn = api[cfg.apiKey];
-	if (typeof requestFn !== 'function') return;
-	uni.showModal({
-		title: '提示',
-		content: cfg.msg,
-		success: (res) => {
-			if (!res.confirm) return;
-			uni.showLoading({ title: '处理中...' });
-			requestFn(buildStatusParam(orderId))
-				.then(() => {
-					if (typeof onSuccess === 'function') return onSuccess();
-					uni.hideLoading();
-				})
-				.catch((e) => {
-					uni.hideLoading();
-					if (vm.showError) vm.showError(e.message || '操作失败');
-				});
-		},
-	});
-}

src/common/storeGoodsProcessReturnIn.js

@@ -1,402 +0,0 @@
-/**
- * 加工退货进仓单常量与数据工具
- *
- * 真实接口请求统一注册在 src/common/http.api.js 的 vm.$u.api.fpmProcessReturnInOrder 下。
- */
-import dayjs from 'dayjs';
-
-export const AUDIT_STATUS = {
-	PENDING: 1,
-	APPROVED: 2,
-	REJECTED: 3,
-	VOIDED: 4,
-};
-
-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: '已审核',
-	3: '已驳回',
-	4: '已作废',
-};
-
-/** 操作类型：1录入 3删除 */
-export const ARRANGE_TYPE = {
-	IN: 1,
-	DEL: 3,
-};
-
-/** 入仓类型：加工退货进仓单 */
-export const IN_ORDER_TYPE_PROCESS_RETURN = 9;
-
-/** 往来单位类型：加工单位 */
-export const BUSINESS_UNIT_TYPE_PROCESS = 12;
-
-/** 成品物理仓类型 */
-export const WAREHOUSE_TYPE_FINISHED = 103;
-
-/** 默认仓库名称 */
-export const DEFAULT_WAREHOUSE_NAME = '成品仓';
-
-export const LIST_PAGE_SIZE = 100;
-
-export const STATUS_ACTION_CONFIG = {
-	approve: { status: AUDIT_STATUS.APPROVED, msg: '确认审核该单据？', apiKey: 'statusPass' },
-	void: { status: AUDIT_STATUS.VOIDED, msg: '确认作废该单据？', apiKey: 'statusCancel' },
-	unapprove: { status: AUDIT_STATUS.PENDING, msg: '确认消审该单据？', apiKey: 'statusWait' },
-};
-
-export function getStatusOptions() {
-	return Object.keys(AUDIT_STATUS_MAP).map((value) => ({
-		value,
-		label: AUDIT_STATUS_MAP[value],
-	}));
-}
-
-export { mapToSelectOptions } from '@/common/remoteSelect';
-
-/** 匹数：后端 ×100 存储 */
-export function formatRoll(value) {
-	const n = Number(value || 0) / 100;
-	return Number.isInteger(n) ? n : Number(n.toFixed(2));
-}
-
-/** 数量（公斤）：后端 ×10000 存储 */
-export function formatWeightKg(value) {
-	const n = Number(value || 0) / 10000;
-	return Number(n.toFixed(2));
-}
-
-export function normalizeOrder(order) {
-	if (!order) return null;
-	return {
-		id: order.id,
-		order_no: order.order_no || '',
-		audit_status: toAuditStatus(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 || '',
-		warehouse_name: order.warehouse_name || '',
-		sale_system_id: order.sale_system_id || '',
-		sale_system_name: order.sale_system_name || '',
-		in_order_type: order.in_order_type || IN_ORDER_TYPE_PROCESS_RETURN,
-		in_order_type_name: order.in_order_type_name || '加工退货进仓单',
-		remark: order.remark || '',
-		warehouse_in_time: (order.warehouse_in_time || '').slice(0, 10),
-		creator_name: order.creator_name || '',
-		create_time: order.create_time || '',
-		auditor_name: order.auditor_name || '',
-		audit_time: order.audit_time || '',
-		total_roll: formatRoll(order.total_roll),
-		total_weight: formatWeightKg(order.total_weight),
-		total_length: formatRoll(order.total_length),
-		item_data: (order.item_data || []).map(normalizeItem),
-		_raw: order,
-	};
-}
-
-export function normalizeFineCode(fc) {
-	if (!fc) return null;
-	const weightRaw = fc.base_unit_weight != null
-		? fc.base_unit_weight
-		: (fc.settle_weight != null ? fc.settle_weight : fc.weight);
-	return {
-		id: fc.id,
-		volume_number: fc.volume_number != null && fc.volume_number !== '' ? String(fc.volume_number) : '',
-		extern_volume_number: fc.extern_volume_number != null && fc.extern_volume_number !== ''
-			? String(fc.extern_volume_number)
-			: '',
-		roll: formatRoll(fc.roll),
-		weight: formatWeightKg(weightRaw),
-		bar_code: fc.bar_code || '',
-		qr_code: fc.qr_code || '',
-		dye_factory_dyelot_number: fc.dye_factory_dyelot_number || fc.dyelot_number || '',
-		warehouse_bin_name: fc.warehouse_bin_name || '',
-		shelf_no: fc.shelf_no || '',
-		scan_code: fc.qr_code || fc.bar_code || '',
-	};
-}
-
-export function normalizeItem(item) {
-	return {
-		id: item.id,
-		quote_order_no: item.quote_order_no || '',
-		product_code: item.product_code || '',
-		product_name: item.product_name || '',
-		product_color_code: item.product_color_code || '',
-		product_color_name: item.product_color_name || '',
-		dye_factory_dyelot_number: item.dye_factory_dyelot_number || '',
-		dye_factory_color_code: item.dye_factory_color_code || '',
-		in_roll: formatRoll(item.in_roll),
-		in_weight: formatWeightKg(item.in_weight),
-		item_fc_data: (item.item_fc_data || []).map(normalizeFineCode).filter(Boolean),
-	};
-}
-
-/**
- * 明细分组：成品编号 → 成品色号 → 细码
- */
-export function buildItemGroups(items) {
-	const productMap = new Map();
-	(items || []).forEach((item) => {
-		const productKey = item.product_code || '-';
-		if (!productMap.has(productKey)) {
-			productMap.set(productKey, {
-				group_key: `p:${productKey}`,
-				product_code: item.product_code || '',
-				product_name: item.product_name || '',
-				in_roll: 0,
-				in_weight: 0,
-				colors: new Map(),
-			});
-		}
-		const productGroup = productMap.get(productKey);
-		if (!productGroup.product_name && item.product_name) {
-			productGroup.product_name = item.product_name;
-		}
-
-		const colorKey = item.product_color_code || item.product_color_name || '-';
-		if (!productGroup.colors.has(colorKey)) {
-			productGroup.colors.set(colorKey, {
-				group_key: `p:${productKey}|c:${colorKey}`,
-				product_color_code: item.product_color_code || '',
-				product_color_name: item.product_color_name || '',
-				quote_order_no: item.quote_order_no || '',
-				dye_factory_dyelot_number: item.dye_factory_dyelot_number || '',
-				in_roll: 0,
-				in_weight: 0,
-				fine_codes: [],
-			});
-		}
-		const colorGroup = productGroup.colors.get(colorKey);
-		productGroup.in_roll = Number((productGroup.in_roll + Number(item.in_roll || 0)).toFixed(2));
-		productGroup.in_weight = Number((productGroup.in_weight + Number(item.in_weight || 0)).toFixed(2));
-		colorGroup.in_roll = Number((colorGroup.in_roll + Number(item.in_roll || 0)).toFixed(2));
-		colorGroup.in_weight = Number((colorGroup.in_weight + Number(item.in_weight || 0)).toFixed(2));
-		if (item.quote_order_no) colorGroup.quote_order_no = item.quote_order_no;
-		if (item.dye_factory_dyelot_number) {
-			colorGroup.dye_factory_dyelot_number = item.dye_factory_dyelot_number;
-		}
-		if (!colorGroup.product_color_name && item.product_color_name) {
-			colorGroup.product_color_name = item.product_color_name;
-		}
-		colorGroup.fine_codes.push(...(item.item_fc_data || []));
-	});
-
-	return Array.from(productMap.values()).map((product) => ({
-		group_key: product.group_key,
-		product_code: product.product_code,
-		product_name: product.product_name,
-		in_roll: product.in_roll,
-		in_weight: product.in_weight,
-		colors: Array.from(product.colors.values()),
-	}));
-}
-
-export function getEmptyScanDetail() {
-	return {
-		quote_order_no: '',
-		dyelot_number: '',
-		volume_number: '',
-		extern_volume_number: '',
-		product_code: '',
-		product_color_code: '',
-		order_roll: 0,
-		item_roll: 0,
-		order_weight: 0,
-		item_weight: 0,
-	};
-}
-
-/** 刚扫细码的数量（公斤存储值）：优先细码 weight */
-function pickScannedFineWeight(res) {
-	if (!res) return 0;
-	if (res.weight != null && res.weight !== '') return res.weight;
-	if (res.base_unit_weight != null && res.base_unit_weight !== '') return res.base_unit_weight;
-	if (res.settle_weight != null && res.settle_weight !== '') return res.settle_weight;
-	if (res.actually_weight != null && res.actually_weight !== '') return res.actually_weight;
-	return res.item_weight;
-}
-
-/** 从扫码接口返回构建详情区（匹数÷100，数量÷10000） */
-export function buildScanDetailFromScanResponse(res) {
-	if (!res) return getEmptyScanDetail();
-	return {
-		quote_order_no: res.quote_order_no || '',
-		dyelot_number: res.dyelot_number || '',
-		volume_number: res.volume_number != null && res.volume_number !== '' ? String(res.volume_number) : '',
-		extern_volume_number: res.extern_volume_number != null && res.extern_volume_number !== ''
-			? String(res.extern_volume_number)
-			: '',
-		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),
-		item_weight: formatWeightKg(pickScannedFineWeight(res)),
-	};
-}
-
-/** 构建扫码请求参数 */
-export function buildScanUpdateParams({ id, scanCode, arrangeType, warehouseBinId }) {
-	const code = (scanCode || '').trim();
-	const params = {
-		id: Number(id),
-		arrange_type: arrangeType,
-	};
-	if (warehouseBinId) {
-		params.warehouse_bin_id = Number(warehouseBinId);
-	}
-	// 长度大于25走二维码，否则走条码
-	if (code.length > 25) {
-		params.qr_code = code;
-	} else {
-		params.bar_code = code;
-	}
-	return params;
-}
-
-export function buildStatusParam(id) {
-	return { id: String(id) };
-}
-
-export function formatDisplayTime(value, format = 'YYYY-MM-DD') {
-	if (!value) return '';
-	const parsed = dayjs(value);
-	return parsed.isValid() ? parsed.format(format) : String(value).slice(0, 10);
-}
-
-export function canScanAtStatus(status) {
-	const s = toAuditStatus(status);
-	return s === AUDIT_STATUS.PENDING || s === AUDIT_STATUS.REJECTED;
-}
-
-export function isLockedOrderStatus(status) {
-	const s = toAuditStatus(status);
-	return s === AUDIT_STATUS.APPROVED || s === AUDIT_STATUS.VOIDED;
-}
-
-export function fetchAllOrderList(listFn, params = {}, pageSize = LIST_PAGE_SIZE) {
-	const pickBatch = (res) => {
-		if (Array.isArray(res)) return res;
-		if (!res || typeof res !== 'object') return [];
-		return res.list || res.records || res.items || [];
-	};
-	const loadPage = (page, acc) => listFn({ ...params, page, size: pageSize })
-		.then((res) => {
-			const batch = pickBatch(res);
-			if (!batch.length) return acc;
-			// 一次返回超过 pageSize：后端忽略分页，视为全量，避免死循环翻页
-			if (batch.length > pageSize) return acc.concat(batch);
-			// 翻页后与首页首条相同：后端忽略 page，避免死循环
-			if (
-				page > 1
-				&& acc.length
-				&& batch[0]
-				&& acc[0]
-				&& String(batch[0].id) === String(acc[0].id)
-			) {
-				return acc;
-			}
-			const merged = acc.concat(batch);
-			const total = !Array.isArray(res) && res != null ? Number(res.total) : NaN;
-			if (!Number.isNaN(total) && merged.length >= total) return merged;
-			if (batch.length < pageSize) return merged;
-			return loadPage(page + 1, merged);
-		});
-	return loadPage(1, []);
-}
-
-export function getFormStatusActionButtons(headerSaved, orderId, status) {
-	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' },
-	];
-}
-
-export function getViewStatusActionButtons(status) {
-	const s = toAuditStatus(status);
-	if (s === AUDIT_STATUS.PENDING || s === AUDIT_STATUS.REJECTED) {
-		return [
-			{ label: '编辑', action: 'edit' },
-			{ label: '审核', action: 'approve' },
-			{ label: '作废', action: 'void' },
-		];
-	}
-	if (s === AUDIT_STATUS.APPROVED) {
-		return [{ label: '消审', action: 'unapprove' }];
-	}
-	return [];
-}
-
-export function orderToFormFields(order) {
-	return {
-		order_no: order.order_no,
-		process_unit_id: order.process_unit_id,
-		process_name: order.process_name,
-		warehouse_id: order.warehouse_id,
-		warehouse_name: order.warehouse_name,
-		remark: order.remark,
-		item_data: order.item_data,
-	};
-}
-
-/** 从仓库下拉中选出默认成品仓 */
-export function pickDefaultWarehouse(options, loginWarehouseId, loginWarehouseName) {
-	const list = options || [];
-	const byName = list.find((item) => item.label === DEFAULT_WAREHOUSE_NAME);
-	if (byName) return byName;
-	if (loginWarehouseId) {
-		const byId = list.find((item) => String(item.value) === String(loginWarehouseId));
-		if (byId) return byId;
-		if (loginWarehouseName) {
-			return { value: loginWarehouseId, label: loginWarehouseName };
-		}
-	}
-	return list[0] || null;
-}
-
-/**
- * 确认并执行审核状态变更
- */
-export function confirmOrderStatusAction(vm, { orderId, action, onSuccess }) {
-	const cfg = STATUS_ACTION_CONFIG[action];
-	if (!cfg || !orderId) return;
-	const api = vm.$u.api.fpmProcessReturnInOrder;
-	const requestFn = api[cfg.apiKey];
-	if (typeof requestFn !== 'function') return;
-	uni.showModal({
-		title: '提示',
-		content: cfg.msg,
-		success: (res) => {
-			if (!res.confirm) return;
-			uni.showLoading({ title: '处理中...' });
-			requestFn(buildStatusParam(orderId))
-				.then(() => {
-					if (typeof onSuccess === 'function') return onSuccess();
-					uni.hideLoading();
-				})
-				.catch((e) => {
-					uni.hideLoading();
-					if (vm.showError) vm.showError(e.message || '操作失败');
-				});
-		},
-	});
-}

src/common/storeGoodsPurchaseIn.js

@@ -1,490 +0,0 @@
-/**
- * 成品采购进仓单常量与数据工具
- *
- * 真实接口请求统一注册在 src/common/http.api.js 的 vm.$u.api.fpmPrcInOrder 下。
- */
-import dayjs from 'dayjs';
-
-export const AUDIT_STATUS = {
-	PENDING: 1,
-	APPROVED: 2,
-	REJECTED: 3,
-	VOIDED: 4,
-};
-
-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: '已审核',
-	3: '已驳回',
-	4: '已作废',
-};
-
-/** 操作类型：1录入 3删除 */
-export const ARRANGE_TYPE = {
-	IN: 1,
-	DEL: 3,
-};
-
-/** 入仓类型：采购进仓单 */
-export const IN_ORDER_TYPE_PURCHASE = 4;
-
-export const IN_ORDER_TYPE_MAP = {
-	[IN_ORDER_TYPE_PURCHASE]: '采购进仓单',
-};
-
-/** 订单类型：1大货 2剪板 3客订大货 4客订剪板 */
-export const SALE_MODE = {
-	BULK: 1,
-	SHEAR: 2,
-	CUSTOMER_BULK: 3,
-	CUSTOMER_SHEAR: 4,
-};
-
-export const SALE_MODE_MAP = {
-	[SALE_MODE.BULK]: '大货',
-	[SALE_MODE.SHEAR]: '剪板',
-	[SALE_MODE.CUSTOMER_BULK]: '客订大货',
-	[SALE_MODE.CUSTOMER_SHEAR]: '客订剪板',
-};
-
-export const SALE_MODE_OPTIONS = [
-	{ value: SALE_MODE.BULK, label: SALE_MODE_MAP[SALE_MODE.BULK] },
-	{ value: SALE_MODE.SHEAR, label: SALE_MODE_MAP[SALE_MODE.SHEAR] },
-	{ value: SALE_MODE.CUSTOMER_BULK, label: SALE_MODE_MAP[SALE_MODE.CUSTOMER_BULK] },
-	{ value: SALE_MODE.CUSTOMER_SHEAR, label: SALE_MODE_MAP[SALE_MODE.CUSTOMER_SHEAR] },
-];
-
-/** 往来单位类型：成品供应商 */
-export const BUSINESS_UNIT_TYPE_PRODUCT_SUPPLIER = 15;
-
-/** 成品物理仓类型 */
-export const WAREHOUSE_TYPE_FINISHED = 103;
-
-/** 默认仓库名称 */
-export const DEFAULT_WAREHOUSE_NAME = '成品仓';
-
-/** 默认纸筒重量（公斤，表单展示值） */
-export const DEFAULT_PAPER_TUBE_WEIGHT = 0.3;
-
-/** 默认包装重量（公斤，表单展示值） */
-export const DEFAULT_PACKAGE_WEIGHT = 0.15;
-
-export const LIST_PAGE_SIZE = 100;
-
-export const STATUS_ACTION_CONFIG = {
-	approve: { status: AUDIT_STATUS.APPROVED, msg: '确认审核该单据？', apiKey: 'statusPass' },
-	void: { status: AUDIT_STATUS.VOIDED, msg: '确认作废该单据？', apiKey: 'statusCancel' },
-	unapprove: { status: AUDIT_STATUS.PENDING, msg: '确认消审该单据？', apiKey: 'statusWait' },
-};
-
-export function getStatusOptions() {
-	return Object.keys(AUDIT_STATUS_MAP).map((value) => ({
-		value,
-		label: AUDIT_STATUS_MAP[value],
-	}));
-}
-
-export { mapToSelectOptions } from '@/common/remoteSelect';
-
-/** 匹数：后端 ×100 存储 */
-export function formatRoll(value) {
-	const n = Number(value || 0) / 100;
-	return Number.isInteger(n) ? n : Number(n.toFixed(2));
-}
-
-/** 数量（公斤）：后端 ×10000 存储 */
-export function formatWeightKg(value) {
-	const n = Number(value || 0) / 10000;
-	return Number(n.toFixed(2));
-}
-
-/** 公斤展示值转后端存储（×10000） */
-export function toWeightStorage(value) {
-	return Math.round(Number(value || 0) * 10000);
-}
-
-export function normalizeOrder(order) {
-	if (!order) return null;
-	return {
-		id: order.id,
-		order_no: order.order_no || '',
-		audit_status: toAuditStatus(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 || '',
-		warehouse_name: order.warehouse_name || '',
-		sale_system_id: order.sale_system_id || '',
-		sale_system_name: order.sale_system_name || '',
-		sale_mode: order.sale_mode || '',
-		sale_mode_name: order.sale_mode_name || SALE_MODE_MAP[order.sale_mode] || '',
-		in_order_type: order.in_order_type || IN_ORDER_TYPE_PURCHASE,
-		in_order_type_name: order.in_order_type_name
-			|| IN_ORDER_TYPE_MAP[order.in_order_type]
-			|| IN_ORDER_TYPE_MAP[IN_ORDER_TYPE_PURCHASE],
-		paper_tube_weight: formatWeightKg(order.paper_tube_weight),
-		package_weight: formatWeightKg(order.package_weight),
-		remark: order.remark || '',
-		warehouse_in_time: (order.warehouse_in_time || '').slice(0, 10),
-		creator_name: order.creator_name || '',
-		create_time: order.create_time || '',
-		auditor_name: order.auditor_name || '',
-		audit_time: order.audit_time || '',
-		total_roll: formatRoll(order.total_roll),
-		total_weight: formatWeightKg(order.total_weight),
-		total_length: formatRoll(order.total_length),
-		item_data: (order.item_data || []).map(normalizeItem),
-		_raw: order,
-	};
-}
-
-export function normalizeFineCode(fc) {
-	if (!fc) return null;
-	const weightRaw = fc.base_unit_weight != null
-		? fc.base_unit_weight
-		: (fc.settle_weight != null ? fc.settle_weight : fc.weight);
-	const qrCode = fc.qr_code || fc.long_code || '';
-	const barCode = fc.bar_code || fc.digital_code || fc.short_code || '';
-	return {
-		id: fc.id,
-		volume_number: fc.volume_number != null && fc.volume_number !== '' ? String(fc.volume_number) : '',
-		extern_volume_number: fc.extern_volume_number != null && fc.extern_volume_number !== ''
-			? String(fc.extern_volume_number)
-			: '',
-		roll: formatRoll(fc.roll),
-		weight: formatWeightKg(weightRaw),
-		bar_code: barCode,
-		qr_code: qrCode,
-		digital_code: fc.digital_code || '',
-		long_code: fc.long_code || '',
-		short_code: fc.short_code || '',
-		dye_factory_dyelot_number: fc.dye_factory_dyelot_number || fc.dyelot_number || '',
-		warehouse_bin_name: fc.warehouse_bin_name || '',
-		shelf_no: fc.shelf_no || '',
-		scan_code: qrCode || barCode || '',
-		paper_tube_weight: fc.paper_tube_weight != null && fc.paper_tube_weight !== ''
-			? formatWeightKg(fc.paper_tube_weight)
-			: null,
-		package_weight: fc.package_weight != null && fc.package_weight !== ''
-			? formatWeightKg(fc.package_weight)
-			: null,
-	};
-}
-
-export function normalizeItem(item) {
-	const weightRaw = item.in_weight != null ? item.in_weight : item.total_weight;
-	return {
-		id: item.id,
-		quote_order_no: item.quote_order_no || '',
-		product_code: item.product_code || '',
-		product_name: item.product_name || '',
-		product_color_code: item.product_color_code || '',
-		product_color_name: item.product_color_name || '',
-		dye_factory_dyelot_number: item.dye_factory_dyelot_number || '',
-		dye_factory_color_code: item.dye_factory_color_code || '',
-		in_roll: formatRoll(item.in_roll),
-		in_weight: formatWeightKg(weightRaw),
-		item_fc_data: (item.item_fc_data || []).map(normalizeFineCode).filter(Boolean),
-	};
-}
-
-/**
- * 明细分组：成品编号 → 成品色号 → 细码
- */
-export function buildItemGroups(items) {
-	const productMap = new Map();
-	(items || []).forEach((item) => {
-		const productKey = item.product_code || '-';
-		if (!productMap.has(productKey)) {
-			productMap.set(productKey, {
-				group_key: `p:${productKey}`,
-				product_code: item.product_code || '',
-				product_name: item.product_name || '',
-				in_roll: 0,
-				in_weight: 0,
-				colors: new Map(),
-			});
-		}
-		const productGroup = productMap.get(productKey);
-		if (!productGroup.product_name && item.product_name) {
-			productGroup.product_name = item.product_name;
-		}
-
-		const colorKey = item.product_color_code || item.product_color_name || '-';
-		if (!productGroup.colors.has(colorKey)) {
-			productGroup.colors.set(colorKey, {
-				group_key: `p:${productKey}|c:${colorKey}`,
-				product_color_code: item.product_color_code || '',
-				product_color_name: item.product_color_name || '',
-				quote_order_no: item.quote_order_no || '',
-				dye_factory_dyelot_number: item.dye_factory_dyelot_number || '',
-				in_roll: 0,
-				in_weight: 0,
-				fine_codes: [],
-			});
-		}
-		const colorGroup = productGroup.colors.get(colorKey);
-		productGroup.in_roll = Number((productGroup.in_roll + Number(item.in_roll || 0)).toFixed(2));
-		productGroup.in_weight = Number((productGroup.in_weight + Number(item.in_weight || 0)).toFixed(2));
-		colorGroup.in_roll = Number((colorGroup.in_roll + Number(item.in_roll || 0)).toFixed(2));
-		colorGroup.in_weight = Number((colorGroup.in_weight + Number(item.in_weight || 0)).toFixed(2));
-		if (item.quote_order_no) colorGroup.quote_order_no = item.quote_order_no;
-		if (item.dye_factory_dyelot_number) {
-			colorGroup.dye_factory_dyelot_number = item.dye_factory_dyelot_number;
-		}
-		if (!colorGroup.product_color_name && item.product_color_name) {
-			colorGroup.product_color_name = item.product_color_name;
-		}
-		colorGroup.fine_codes.push(...(item.item_fc_data || []));
-	});
-
-	return Array.from(productMap.values()).map((product) => ({
-		group_key: product.group_key,
-		product_code: product.product_code,
-		product_name: product.product_name,
-		in_roll: product.in_roll,
-		in_weight: product.in_weight,
-		colors: Array.from(product.colors.values()),
-	}));
-}
-
-export function getEmptyScanDetail() {
-	return {
-		quote_order_no: '',
-		dyelot_number: '',
-		volume_number: '',
-		extern_volume_number: '',
-		product_code: '',
-		product_color_code: '',
-		order_roll: 0,
-		item_roll: 0,
-		order_weight: 0,
-		item_weight: 0,
-	};
-}
-
-/** 刚扫细码的数量（公斤存储值）：优先细码 weight */
-function pickScannedFineWeight(res) {
-	if (!res) return 0;
-	if (res.weight != null && res.weight !== '') return res.weight;
-	if (res.base_unit_weight != null && res.base_unit_weight !== '') return res.base_unit_weight;
-	if (res.settle_weight != null && res.settle_weight !== '') return res.settle_weight;
-	if (res.actually_weight != null && res.actually_weight !== '') return res.actually_weight;
-	return res.item_weight;
-}
-
-/** 从扫码接口返回构建详情区（匹数÷100，数量÷10000） */
-export function buildScanDetailFromScanResponse(res) {
-	if (!res) return getEmptyScanDetail();
-	return {
-		quote_order_no: res.quote_order_no || '',
-		dyelot_number: res.dyelot_number || '',
-		volume_number: res.volume_number != null && res.volume_number !== '' ? String(res.volume_number) : '',
-		extern_volume_number: res.extern_volume_number != null && res.extern_volume_number !== ''
-			? String(res.extern_volume_number)
-			: '',
-		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),
-		// 本行数量：刚扫这条细码的重量（weight），不是明细行合计
-		item_weight: formatWeightKg(pickScannedFineWeight(res)),
-	};
-}
-
-/** 校验纸筒/包装重量（扫码时提交） */
-export function validateScanWeights(paperTubeWeight, packageWeight) {
-	if (paperTubeWeight === '' || paperTubeWeight == null) {
-		return '请输入纸筒重量';
-	}
-	if (Number.isNaN(Number(paperTubeWeight))) return '纸筒重量格式不正确';
-	if (packageWeight === '' || packageWeight == null) {
-		return '请输入包装重量';
-	}
-	if (Number.isNaN(Number(packageWeight))) return '包装重量格式不正确';
-	return '';
-}
-
-/** 构建扫码请求参数（纸筒/包装重量在扫码时提交，公斤值需 ×10000） */
-export function buildScanUpdateParams({
-	id,
-	scanCode,
-	arrangeType,
-	warehouseBinId,
-	paperTubeWeight,
-	packageWeight,
-}) {
-	const code = (scanCode || '').trim();
-	const params = {
-		id: Number(id),
-		arrange_type: arrangeType,
-		paper_tube_weight: toWeightStorage(paperTubeWeight),
-		package_weight: toWeightStorage(packageWeight),
-	};
-	if (warehouseBinId) {
-		params.warehouse_bin_id = Number(warehouseBinId);
-	}
-	// 长度大于25走二维码，否则走条码
-	if (code.length > 25) {
-		params.qr_code = code;
-	} else {
-		params.bar_code = code;
-	}
-	return params;
-}
-
-export function buildStatusParam(id) {
-	return { id: String(id) };
-}
-
-export function formatDisplayTime(value, format = 'YYYY-MM-DD') {
-	if (!value) return '';
-	const parsed = dayjs(value);
-	return parsed.isValid() ? parsed.format(format) : String(value).slice(0, 10);
-}
-
-export function canScanAtStatus(status) {
-	const s = toAuditStatus(status);
-	return s === AUDIT_STATUS.PENDING || s === AUDIT_STATUS.REJECTED;
-}
-
-export function isLockedOrderStatus(status) {
-	const s = toAuditStatus(status);
-	return s === AUDIT_STATUS.APPROVED || s === AUDIT_STATUS.VOIDED;
-}
-
-export function fetchAllOrderList(listFn, params = {}, pageSize = LIST_PAGE_SIZE) {
-	const pickBatch = (res) => {
-		if (Array.isArray(res)) return res;
-		if (!res || typeof res !== 'object') return [];
-		return res.list || res.records || res.items || [];
-	};
-	const loadPage = (page, acc) => listFn({ ...params, page, size: pageSize })
-		.then((res) => {
-			const batch = pickBatch(res);
-			if (!batch.length) return acc;
-			// 一次返回超过 pageSize：后端忽略分页，视为全量，避免死循环翻页
-			if (batch.length > pageSize) return acc.concat(batch);
-			// 翻页后与首页首条相同：后端忽略 page，避免死循环
-			if (
-				page > 1
-				&& acc.length
-				&& batch[0]
-				&& acc[0]
-				&& String(batch[0].id) === String(acc[0].id)
-			) {
-				return acc;
-			}
-			const merged = acc.concat(batch);
-			const total = !Array.isArray(res) && res != null ? Number(res.total) : NaN;
-			if (!Number.isNaN(total) && merged.length >= total) return merged;
-			if (batch.length < pageSize) return merged;
-			return loadPage(page + 1, merged);
-		});
-	return loadPage(1, []);
-}
-
-export function getFormStatusActionButtons(headerSaved, orderId, status) {
-	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' },
-	];
-}
-
-export function getViewStatusActionButtons(status) {
-	const s = toAuditStatus(status);
-	if (s === AUDIT_STATUS.PENDING || s === AUDIT_STATUS.REJECTED) {
-		return [
-			{ label: '编辑', action: 'edit' },
-			{ label: '审核', action: 'approve' },
-			{ label: '作废', action: 'void' },
-		];
-	}
-	if (s === AUDIT_STATUS.APPROVED) {
-		return [{ label: '消审', action: 'unapprove' }];
-	}
-	return [];
-}
-
-export function orderToFormFields(order) {
-	return {
-		order_no: order.order_no,
-		biz_unit_id: order.biz_unit_id,
-		biz_unit_name: order.biz_unit_name,
-		warehouse_id: order.warehouse_id,
-		warehouse_name: order.warehouse_name,
-		sale_system_id: order.sale_system_id,
-		sale_system_name: order.sale_system_name,
-		sale_mode: order.sale_mode || '',
-		sale_mode_name: order.sale_mode_name || SALE_MODE_MAP[order.sale_mode] || '',
-		in_order_type: order.in_order_type || IN_ORDER_TYPE_PURCHASE,
-		in_order_type_name: order.in_order_type_name
-			|| IN_ORDER_TYPE_MAP[order.in_order_type]
-			|| IN_ORDER_TYPE_MAP[IN_ORDER_TYPE_PURCHASE],
-		paper_tube_weight: String(DEFAULT_PAPER_TUBE_WEIGHT),
-		package_weight: String(DEFAULT_PACKAGE_WEIGHT),
-		remark: order.remark,
-		item_data: order.item_data,
-	};
-}
-
-/** 从仓库下拉中选出默认成品仓 */
-export function pickDefaultWarehouse(options, loginWarehouseId, loginWarehouseName) {
-	const list = options || [];
-	const byName = list.find((item) => item.label === DEFAULT_WAREHOUSE_NAME);
-	if (byName) return byName;
-	if (loginWarehouseId) {
-		const byId = list.find((item) => String(item.value) === String(loginWarehouseId));
-		if (byId) return byId;
-		if (loginWarehouseName) {
-			return { value: loginWarehouseId, label: loginWarehouseName };
-		}
-	}
-	return list[0] || null;
-}
-
-/**
- * 确认并执行审核状态变更
- */
-export function confirmOrderStatusAction(vm, { orderId, action, onSuccess }) {
-	const cfg = STATUS_ACTION_CONFIG[action];
-	if (!cfg || !orderId) return;
-	const api = vm.$u.api.fpmPrcInOrder;
-	const requestFn = api[cfg.apiKey];
-	if (typeof requestFn !== 'function') return;
-	uni.showModal({
-		title: '提示',
-		content: cfg.msg,
-		success: (res) => {
-			if (!res.confirm) return;
-			uni.showLoading({ title: '处理中...' });
-			requestFn(buildStatusParam(orderId))
-				.then(() => {
-					if (typeof onSuccess === 'function') return onSuccess();
-					uni.hideLoading();
-				})
-				.catch((e) => {
-					uni.hideLoading();
-					if (vm.showError) vm.showError(e.message || '操作失败');
-				});
-		},
-	});
-}

src/common/tts.js

@@ -1,94 +0,0 @@
-/**
- * Android PDA 语音播报（系统 TextToSpeech）
- * App 端可用；非 App 环境静默跳过。
- */
-let ttsInstance = null;
-let ttsReady = false;
-let ttsInitStarted = false;
-const pendingQueue = [];
-
-function flushPending() {
-	if (!ttsReady || !ttsInstance) return;
-	while (pendingQueue.length) {
-		const text = pendingQueue.shift();
-		doSpeak(text);
-	}
-}
-
-function doSpeak(text) {
-	if (!ttsInstance || !text) return;
-	try {
-		const TextToSpeech = plus.android.importClass('android.speech.tts.TextToSpeech');
-		// QUEUE_FLUSH：打断当前播报，立即播新内容
-		ttsInstance.speak(String(text), TextToSpeech.QUEUE_FLUSH, null);
-	} catch (e) {
-		console.warn('[tts] speak failed', e);
-	}
-}
-
-export function initTts() {
-	// #ifdef APP-PLUS
-	if (ttsInitStarted || typeof plus === 'undefined') return;
-	if (plus.os.name !== 'Android') return;
-	ttsInitStarted = true;
-	try {
-		const main = plus.android.runtimeMainActivity();
-		const TextToSpeech = plus.android.importClass('android.speech.tts.TextToSpeech');
-		const Locale = plus.android.importClass('java.util.Locale');
-		ttsInstance = new TextToSpeech(
-			main,
-			plus.android.implements('android.speech.tts.TextToSpeech$OnInitListener', {
-				onInit(status) {
-					if (status === TextToSpeech.SUCCESS) {
-						try {
-							ttsInstance.setLanguage(Locale.CHINA);
-							ttsInstance.setSpeechRate(1.0);
-						} catch (e) {
-							console.warn('[tts] setLanguage failed', e);
-						}
-						ttsReady = true;
-						flushPending();
-					} else {
-						console.warn('[tts] init status not SUCCESS', status);
-						ttsReady = false;
-					}
-				},
-			})
-		);
-	} catch (e) {
-		console.warn('[tts] init failed', e);
-		ttsInitStarted = false;
-	}
-	// #endif
-}
-
-/**
- * 播报中文文本；TTS 未就绪时先入队，初始化成功后补播。
- * @param {string} text
- */
-export function speak(text) {
-	const content = (text || '').trim();
-	if (!content) return;
-	// #ifdef APP-PLUS
-	if (typeof plus === 'undefined' || plus.os.name !== 'Android') return;
-	if (!ttsInitStarted) initTts();
-	if (ttsReady && ttsInstance) {
-		doSpeak(content);
-		return;
-	}
-	pendingQueue.push(content);
-	// 避免异常堆积
-	if (pendingQueue.length > 5) pendingQueue.splice(0, pendingQueue.length - 5);
-	// #endif
-}
-
-export function stopSpeak() {
-	// #ifdef APP-PLUS
-	if (!ttsInstance) return;
-	try {
-		ttsInstance.stop();
-	} catch (e) {
-		/* ignore */
-	}
-	// #endif
-}

src/common/userSession.js

@@ -1,155 +0,0 @@
-/**
- * 登录会话：token、用户信息、菜单/按钮权限
- */
-import store from '@/store/index.js';
-
-const TOKEN_KEY = 'RemoteTokenData';
-const USER_TOKEN_KEY = 'userToken';
-const INFORMATION_KEY = 'PdaUserInformation';
-
-function commitVuex(name, value) {
-	store.commit('$uStore', { name, value });
-}
-
-function applyGlobalData(patch) {
-	try {
-		const app = getApp();
-		if (!app || !app.globalData) {
-			return;
-		}
-		Object.keys(patch).forEach((key) => {
-			app.globalData[key] = patch[key];
-		});
-	} catch (e) {
-		console.log('applyGlobalData error', e);
-	}
-}
-
-export function getLoginData() {
-	return uni.getStorageSync(TOKEN_KEY) || null;
-}
-
-export function getUserInformation() {
-	return uni.getStorageSync(INFORMATION_KEY) || null;
-}
-
-export function applyLoginData(loginData) {
-	if (!loginData) {
-		return;
-	}
-	uni.setStorageSync(TOKEN_KEY, loginData);
-	uni.setStorageSync(USER_TOKEN_KEY, { Token: loginData.token });
-	if (loginData.token) {
-		commitVuex('vuex_token', loginData.token);
-	}
-	applyGlobalData({
-		Token: loginData.token || '',
-		EmployeeID: loginData.employee_id != null ? loginData.employee_id : (loginData.user_id || 0),
-		LoginID: loginData.user_id || 0,
-		LoginName: loginData.user_name || '',
-		UserName: loginData.user_name || '',
-		PlanDepartmentID: loginData.default_sale_system_id || 0,
-		PlanDepartmentName: loginData.default_sale_system_name || '',
-		StoreNameID: loginData.default_physical_warehouse_id || 0,
-		StoreName: loginData.default_physical_warehouse_name || '',
-		IsSaleUserStatus: 0,
-		UserGroup: '',
-		StoreTypeNo: ''
-	});
-}
-
-export function applyUserInformation(info) {
-	if (!info) {
-		return;
-	}
-	uni.setStorageSync(INFORMATION_KEY, info);
-	const profile = {
-		userName: info.user_name || '',
-		user_id: info.user_id,
-		user_name: info.user_name || '',
-		avatar: info.avatar_url || '',
-		avatar_url: info.avatar_url || '',
-		employee_id: info.employee_id,
-		department_id: info.department_id,
-		department_name: info.department_name || '',
-		phone: info.phone || '',
-		default_sale_system_id: info.default_sale_system_id,
-		default_sale_system_name: info.default_sale_system_name || '',
-		default_customer_id: info.default_customer_id,
-		default_customer_name: info.default_customer_name || '',
-		role_id: info.role_id || []
-	};
-	commitVuex('vuex_user', profile);
-	applyGlobalData({
-		EmployeeID: info.employee_id != null ? info.employee_id : (info.user_id || 0),
-		LoginID: info.user_id || 0,
-		LoginName: info.user_name || '',
-		UserName: info.user_name || '',
-		PlanDepartmentID: info.default_sale_system_id || 0,
-		PlanDepartmentName: info.default_sale_system_name || ''
-	});
-}
-
-export function restoreUserSession() {
-	const loginData = getLoginData();
-	if (loginData && loginData.token) {
-		applyLoginData(loginData);
-	}
-	const info = getUserInformation();
-	if (info) {
-		applyUserInformation(info);
-	}
-}
-
-export function clearUserSession() {
-	uni.removeStorageSync(TOKEN_KEY);
-	uni.removeStorageSync(USER_TOKEN_KEY);
-	uni.removeStorageSync(INFORMATION_KEY);
-	uni.removeStorageSync('token');
-	commitVuex('vuex_token', '');
-	commitVuex('vuex_user', {});
-	applyGlobalData({
-		Token: '',
-		EmployeeID: 0,
-		LoginID: 0,
-		LoginName: '',
-		UserName: '',
-		PlanDepartmentID: 0,
-		PlanDepartmentName: '',
-		StoreNameID: 0,
-		StoreName: '',
-		IsSaleUserStatus: 0,
-		UserGroup: '',
-		StoreTypeNo: ''
-	});
-}
-
-export function hasResourceRouter(name) {
-	if (!name) {
-		return true;
-	}
-	const info = getUserInformation();
-	if (!info) {
-		return true;
-	}
-	const names = info.resource_router_names;
-	if (!Array.isArray(names)) {
-		return true;
-	}
-	return names.indexOf(name) !== -1;
-}
-
-export function hasButtonCode(code) {
-	if (!code) {
-		return true;
-	}
-	const info = getUserInformation();
-	if (!info) {
-		return true;
-	}
-	const codes = info.button_codes;
-	if (!Array.isArray(codes)) {
-		return true;
-	}
-	return codes.indexOf(code) !== -1;
-}

src/common/util.js

@@ -2,7 +2,6 @@
  * 通用公共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/';  //开发环境 添
@@ -333,56 +332,7 @@ 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');
@@ -399,8 +349,7 @@ function playSuccessAudio(text, options) {
 	successAudio.play();
 }
 
-function playErrorAudio(text) {
+function playErrorAudio() {
-	speakFeedback(text, '失败');
 	if (!errorAudio) {
 		//console.log("create error");
 		errorAudio = createAudio('/static/audio/apperror.wav');
@@ -417,6 +366,58 @@ function playErrorAudio(text) {
 	errorAudio.play();
 }
 
+// 固定中文提示语音
+const SPEAK_AUDIO = {
+	'扫码出仓成功': '/static/audio/scan_out_ok.mp3',
+	'删除成功': '/static/audio/delete_ok.mp3',
+	'提交成功': '/static/audio/submit_ok.mp3',
+	'审核成功': '/static/audio/audit_ok.mp3',
+	'作废成功': '/static/audio/void_ok.mp3',
+	'扫码成功': '/static/audio/scan_ok.wav',
+	'进仓成功': '/static/audio/in_ok.wav',
+};
+
+const speakAudioMap = {};
+
+function stopOtherSpeak(exceptText) {
+	Object.keys(speakAudioMap).forEach((key) => {
+		if (key === exceptText || !speakAudioMap[key]) return;
+		try {
+			speakAudioMap[key].stop();
+		} catch (e) {}
+	});
+	if (successAudio) {
+		try {
+			successAudio.stop();
+		} catch (e) {}
+	}
+}
+
+function playSpeak(text) {
+	const src = SPEAK_AUDIO[text];
+	if (!src) return;
+	stopOtherSpeak(text);
+	const prev = speakAudioMap[text];
+	if (prev) {
+		try {
+			prev.stop();
+			prev.destroy();
+		} catch (e) {}
+		speakAudioMap[text] = undefined;
+	}
+	const audio = uni.createInnerAudioContext();
+	audio.autoplay = true;
+	audio.src = src;
+	audio.onError((res) => {
+		console.log('语音播放失败', text, res && res.errMsg);
+		try {
+			audio.destroy();
+		} catch (e) {}
+		if (speakAudioMap[text] === audio) speakAudioMap[text] = undefined;
+	});
+	speakAudioMap[text] = audio;
+}
+
 
 export default {
 	get apiurl() {
@@ -429,5 +430,5 @@ export default {
 	parGetData,
 	playSuccessAudio,
 	playErrorAudio,
-	statusSuccessVoice,
+	playSpeak,
 };

src/components/card/storeFabricBusinessOutItem.vue

@@ -13,7 +13,7 @@
 			<view>{{ item.bill_type_name }}</view>
 		</view>
 		<view class="cardRow">
-			<view>染厂：</view>
+			<view>接收单位：</view>
 			<view>{{ item.business_unit_name || '-' }}</view>
 		</view>
 		<view class="cardRow">
@@ -46,15 +46,21 @@ export default {
 };
 </script>
 
-<style scoped lang="scss">
+<style scoped>
-@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

@@ -1,61 +0,0 @@
-<template>
-	<view class="myCard">
-		<view class="cardTopName">
-			<text>{{ item.order_no }}</text>
-			<text class="statusTag" :class="'status-' + item.audit_status">{{ item.audit_status_name }}</text>
-		</view>
-		<view class="cardRow">
-			<view>加工单位：</view>
-			<view>{{ item.process_name || '-' }}</view>
-		</view>
-		<view class="cardRow">
-			<view>仓库名称：</view>
-			<view>{{ item.warehouse_name || '-' }}</view>
-		</view>
-		<view class="cardRow">
-			<view>匹数总计：</view>
-			<view>{{ item.total_roll != null ? item.total_roll : '-' }}</view>
-		</view>
-		<view class="cardRow">
-			<view>创 建 人：</view>
-			<view>{{ item.create_user_name }} {{ formatTime(item.create_time, 'YYYY-MM-DD') }}</view>
-		</view>
-		<view v-if="item.auditor_name" class="cardRow">
-			<view>审 核 人：</view>
-			<view>{{ item.auditor_name }} {{ formatTime(item.audit_date, 'YYYY-MM-DD') }}</view>
-		</view>
-		<view v-if="!isDetail && !isSelect" class="lookDetail">
-			<text>查看详情</text>
-			<u-icon name="arrow-right" size="36" />
-		</view>
-	</view>
-</template>
-
-<script>
-import { formatDisplayTime } from '@/common/storeGoodsProcessIn';
-
-export default {
-	props: {
-		item: { type: Object, default: () => ({}) },
-		index: { type: Number, default: 0 },
-		isSelect: { type: Boolean, default: false },
-		isDetail: { type: Boolean, default: false },
-	},
-	methods: {
-		formatTime: formatDisplayTime,
-	},
-};
-</script>
-
-<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;
-}
-</style>

src/components/card/storeGoodsProcessOutItem.vue

@@ -1,65 +0,0 @@
-<template>
-	<view class="myCard">
-		<view class="cardTopName">
-			<text>{{ item.order_no }}</text>
-			<text class="statusTag" :class="'status-' + item.audit_status">{{ item.audit_status_name }}</text>
-		</view>
-		<view class="cardRow">
-			<view>出仓类型：</view>
-			<view>{{ item.out_order_type_name || '-' }}</view>
-		</view>
-		<view class="cardRow">
-			<view>加工单位：</view>
-			<view>{{ item.process_name || '-' }}</view>
-		</view>
-		<view class="cardRow">
-			<view>仓库名称：</view>
-			<view>{{ item.warehouse_name || '-' }}</view>
-		</view>
-		<view class="cardRow">
-			<view>匹数总计：</view>
-			<view>{{ item.total_roll != null ? item.total_roll : '-' }}</view>
-		</view>
-		<view class="cardRow">
-			<view>创 建 人：</view>
-			<view>{{ item.create_user_name }} {{ formatTime(item.create_time, 'YYYY-MM-DD') }}</view>
-		</view>
-		<view v-if="item.auditor_name" class="cardRow">
-			<view>审 核 人：</view>
-			<view>{{ item.auditor_name }} {{ formatTime(item.audit_date, 'YYYY-MM-DD') }}</view>
-		</view>
-		<view v-if="!isDetail && !isSelect" class="lookDetail">
-			<text>查看详情</text>
-			<u-icon name="arrow-right" size="36" />
-		</view>
-	</view>
-</template>
-
-<script>
-import { formatDisplayTime } from '@/common/storeGoodsProcessOut';
-
-export default {
-	props: {
-		item: { type: Object, default: () => ({}) },
-		index: { type: Number, default: 0 },
-		isSelect: { type: Boolean, default: false },
-		isDetail: { type: Boolean, default: false },
-	},
-	methods: {
-		formatTime: formatDisplayTime,
-	},
-};
-</script>
-
-<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;
-}
-</style>

src/components/card/storeGoodsProcessReturnInItem.vue

@@ -1,61 +0,0 @@
-<template>
-	<view class="myCard">
-		<view class="cardTopName">
-			<text>{{ item.order_no }}</text>
-			<text class="statusTag" :class="'status-' + item.audit_status">{{ item.audit_status_name }}</text>
-		</view>
-		<view class="cardRow">
-			<view>加工单位：</view>
-			<view>{{ item.process_name || '-' }}</view>
-		</view>
-		<view class="cardRow">
-			<view>仓库名称：</view>
-			<view>{{ item.warehouse_name || '-' }}</view>
-		</view>
-		<view class="cardRow">
-			<view>匹数总计：</view>
-			<view>{{ item.total_roll != null ? item.total_roll : '-' }}</view>
-		</view>
-		<view class="cardRow">
-			<view>创 建 人：</view>
-			<view>{{ item.create_user_name }} {{ formatTime(item.create_time, 'YYYY-MM-DD') }}</view>
-		</view>
-		<view v-if="item.auditor_name" class="cardRow">
-			<view>审 核 人：</view>
-			<view>{{ item.auditor_name }} {{ formatTime(item.audit_date, 'YYYY-MM-DD') }}</view>
-		</view>
-		<view v-if="!isDetail && !isSelect" class="lookDetail">
-			<text>查看详情</text>
-			<u-icon name="arrow-right" size="36" />
-		</view>
-	</view>
-</template>
-
-<script>
-import { formatDisplayTime } from '@/common/storeGoodsProcessReturnIn';
-
-export default {
-	props: {
-		item: { type: Object, default: () => ({}) },
-		index: { type: Number, default: 0 },
-		isSelect: { type: Boolean, default: false },
-		isDetail: { type: Boolean, default: false },
-	},
-	methods: {
-		formatTime: formatDisplayTime,
-	},
-};
-</script>
-
-<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;
-}
-</style>

src/components/card/storeGoodsPurchaseInItem.vue

@@ -1,61 +0,0 @@
-<template>
-	<view class="myCard">
-		<view class="cardTopName">
-			<text>{{ item.order_no }}</text>
-			<text class="statusTag" :class="'status-' + item.audit_status">{{ item.audit_status_name }}</text>
-		</view>
-		<view class="cardRow">
-			<view>供 应 商：</view>
-			<view>{{ item.biz_unit_name || '-' }}</view>
-		</view>
-		<view class="cardRow">
-			<view>仓库名称：</view>
-			<view>{{ item.warehouse_name || '-' }}</view>
-		</view>
-		<view class="cardRow">
-			<view>匹数总计：</view>
-			<view>{{ item.total_roll != null ? item.total_roll : '-' }}</view>
-		</view>
-		<view class="cardRow">
-			<view>创 建 人：</view>
-			<view>{{ item.create_user_name }} {{ formatTime(item.create_time, 'YYYY-MM-DD') }}</view>
-		</view>
-		<view v-if="item.auditor_name" class="cardRow">
-			<view>审 核 人：</view>
-			<view>{{ item.auditor_name }} {{ formatTime(item.audit_date, 'YYYY-MM-DD') }}</view>
-		</view>
-		<view v-if="!isDetail && !isSelect" class="lookDetail">
-			<text>查看详情</text>
-			<u-icon name="arrow-right" size="36" />
-		</view>
-	</view>
-</template>
-
-<script>
-import { formatDisplayTime } from '@/common/storeGoodsPurchaseIn';
-
-export default {
-	props: {
-		item: { type: Object, default: () => ({}) },
-		index: { type: Number, default: 0 },
-		isSelect: { type: Boolean, default: false },
-		isDetail: { type: Boolean, default: false },
-	},
-	methods: {
-		formatTime: formatDisplayTime,
-	},
-};
-</script>
-
-<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;
-}
-</style>

src/components/common/PlusBarcodePanel.vue

@@ -1,286 +0,0 @@
-<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/FabricInfoPopup.vue

@@ -42,7 +42,7 @@ export default {
 	overflow: hidden;
 }
 .popupTitle {
-	font-size: 34rpx;
+	font-size: 32rpx;
 	font-weight: bold;
 	text-align: center;
 	margin-bottom: 20rpx;
@@ -58,7 +58,7 @@ export default {
 	display: flex;
 	padding: 16rpx 0;
 	border-bottom: 1rpx solid #f0f0f0;
-	font-size: 30rpx;
+	font-size: 28rpx;
 }
 .label {
 	width: 180rpx;

src/components/storefabric/FabricOutDetailList.vue

@@ -1,135 +1,36 @@
 <template>
 	<view>
-		<view class="summary-title">{{ title }}</view>
+		<view v-if="title" class="fabric-out-sectionTitle">{{ title }}</view>
 		<slot name="before-list" />
-		<view class="summary-wrap">
+		<view class="fabric-out-detailList">
-			<scroll-view scroll-x class="summary-scroll">
+			<view
-				<t-table v-if="list.length" border="1" border-color="#e5e5e5" :style="{ width: tableWidth }">
+				v-for="row in list"
-					<t-tr class="summary-head" font-size="18" color="#666666" align="left">
+				:key="row.group_key || row.id"
-						<t-th v-for="col in columns" :key="col.key" :style="cellStyle(col)">{{ col.label }}</t-th>
+				class="fabric-out-detailCard"
-					</t-tr>
+			>
-					<t-tr
+				<view class="fabric-out-detailRow" @click="$emit('fabric-info', row)">
-						v-for="row in list"
+					<text>{{ row.grey_fabric_code }}#{{ row.grey_fabric_name }}</text>
-						:key="row.group_key || row.id"
+					<u-icon name="arrow-right" size="32" color="#888" />
-						font-size="18"
+				</view>
-						color="#333333"
+				<view class="fabric-out-detailMeta">
-						align="left"
+					<text>匹数：{{ row.roll }}</text>
-						@click="$emit('fabric-info', row)"
+					<text>重量：{{ row.weight }}KG</text>
-					>
+					<u-button type="primary" size="mini" @click="$emit('fine-code', row)">细码</u-button>
-						<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>
+			</view>
-						<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: '出仓细码' },
+		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 '@/common/pda-typography.scss';
+@import '@/pages/storefabric/storeFabricBusinessOutPage.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,16 +10,11 @@
 				@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-else-if="showPhoneScan"
+				v-if="showPhoneScan"
 				class="fabric-out-phoneScanIcon"
 				name="scan"
-				size="44"
+				size="80"
 				color="#2979ff"
 				@click="$emit('phone-scan')"
 			/>
@@ -43,32 +38,16 @@ 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;
+	padding: 10rpx 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/FabricOutScanDetail.vue

@@ -12,12 +12,14 @@
 			<text class="fabric-out-scanDetailLabel">客户：</text>
 			<text class="fabric-out-scanDetailValue">{{ detail.customer_name || '' }}</text>
 		</view>
-		<view class="fabric-out-scanDetailRow fabric-out-scanDetailRow--2col">
+		<view class="fabric-out-scanDetailRow">
 			<view class="fabric-out-scanDetailCheck" @click="toggleGroup('produce_order_no')">
 				<checkbox :checked="isGroupChecked('produce_order_no')" />
 				<text class="fabric-out-scanDetailLabel">生产通知单：</text>
 				<text class="fabric-out-scanDetailValue">{{ detail.produce_order_no || '' }}</text>
 			</view>
+		</view>
+		<view class="fabric-out-scanDetailRow">
 			<view class="fabric-out-scanDetailCheck" @click="toggleGroup('grey_fabric_code')">
 				<checkbox :checked="isGroupChecked('grey_fabric_code')" />
 				<text class="fabric-out-scanDetailLabel">布编：</text>
@@ -41,15 +43,12 @@
 				<text class="fabric-out-scanDetailLabel">机号：</text>
 				<text class="fabric-out-scanDetailValue">{{ detail.machine_number || '' }}</text>
 			</view>
-			<view class="fabric-out-scanDetailCell">
+			<view class="fabric-out-scanDetailCheck" @click="toggleGroup('volume_number')">
+				<checkbox :checked="isGroupChecked('volume_number')" />
 				<text class="fabric-out-scanDetailLabel">布号：</text>
 				<text class="fabric-out-scanDetailValue">{{ detail.volume_number || '' }}</text>
 			</view>
 		</view>
-		<view class="fabric-out-scanDetailRow">
-			<text class="fabric-out-scanDetailLabel">外部卷号：</text>
-			<text class="fabric-out-scanDetailValue">{{ detail.extern_volume_number || '-' }}</text>
-		</view>
 		<view class="fabric-out-scanDetailRow fabric-out-scanDetailRow--2col">
 			<view class="fabric-out-scanDetailCheck" @click="toggleGroup('grey_fabric_level_name')">
 				<checkbox :checked="isGroupChecked('grey_fabric_level_name')" />
@@ -61,75 +60,20 @@
 				<text class="fabric-out-scanDetailValue">{{ formatWeight(detail.weight) }}Kg</text>
 			</view>
 		</view>
-
-		<scroll-view scroll-x class="fabric-out-scanDetailTableScroll">
-			<view class="fabric-out-scanDetailTable" :style="{ width: tableWidth }">
-				<view class="fabric-out-scanDetailTableRow fabric-out-scanDetailTableHead">
-					<view
-						v-for="col in columns"
-						:key="col.key"
-						class="fabric-out-scanDetailTableCell"
-						:style="cellStyle(col)"
-					>{{ col.label }}</view>
-				</view>
-				<view v-if="!tableRows.length" class="fabric-out-scanDetailEmpty">暂无数据~~</view>
-				<view
-					v-for="(row, rowIndex) in tableRows"
-					:key="rowIndex"
-					class="fabric-out-scanDetailTableRow"
-				>
-					<view
-						v-for="col in columns"
-						:key="col.key"
-						class="fabric-out-scanDetailTableCell"
-						:style="cellStyle(col)"
-					>{{ formatCell(row, col.key) }}</view>
-				</view>
-			</view>
-		</scroll-view>
 	</view>
 </template>
 
 <script>
-import {
-	SCAN_DETAIL_TABLE_COLUMNS,
-	SCAN_GROUP_OPTIONS,
-	getScanDetailTableWidth,
-	buildScanDetailTableRows,
-} from '@/common/storeFabricBusinessOut';
-
-const LOCKABLE_GROUP_KEYS = SCAN_GROUP_OPTIONS.map((item) => item.key);
-
 export default {
 	props: {
 		detail: { type: Object, default: () => ({}) },
-		itemData: { type: Array, default: () => [] },
 		groupKeys: { type: Array, default: () => [] },
 	},
-	computed: {
-		columns() {
-			return SCAN_DETAIL_TABLE_COLUMNS;
-		},
-		tableWidth() {
-			return getScanDetailTableWidth(this.columns);
-		},
-		tableRows() {
-			return buildScanDetailTableRows(this.itemData, this.groupKeys);
-		},
-	},
 	methods: {
-		cellStyle(col) {
-			return {
-				width: `${col.width}rpx`,
-				minWidth: `${col.width}rpx`,
-				maxWidth: `${col.width}rpx`,
-			};
-		},
 		isGroupChecked(key) {
 			return (this.groupKeys || []).includes(key);
 		},
 		toggleGroup(key) {
-			if (!LOCKABLE_GROUP_KEYS.includes(key)) return;
 			const next = [...(this.groupKeys || [])];
 			const index = next.indexOf(key);
 			if (index >= 0) next.splice(index, 1);
@@ -147,11 +91,6 @@ export default {
 			const n = Number(value || 0);
 			return Number(n.toFixed(2));
 		},
-		formatCell(row, key) {
-			if (key === 'roll') return this.formatRoll(row.roll);
-			if (key === 'weight') return this.formatWeight(row.weight);
-			return row[key] || '';
-		},
 	},
 };
 </script>

src/components/storefabric/FineCodePopup.vue

@@ -58,10 +58,10 @@ export default {
 			return getFineCodeTableWidth(this.columns);
 		},
 		tableScrollHeight() {
-			const rowHeight = 68;
+			const rowHeight = 56;
-			const headerHeight = 68;
+			const headerHeight = 56;
 			const total = headerHeight + this.list.length * rowHeight;
-			return `${Math.min(Math.max(total, 136), 520)}rpx`;
+			return `${Math.min(Math.max(total, 112), 480)}rpx`;
 		},
 	},
 	methods: {
@@ -91,7 +91,7 @@ export default {
 	overflow: hidden;
 }
 .popupTitle {
-	font-size: 34rpx;
+	font-size: 32rpx;
 	font-weight: bold;
 	text-align: center;
 	margin-bottom: 20rpx;
@@ -102,7 +102,7 @@ export default {
 	text-align: center;
 	color: #999;
 	padding: 40rpx 0;
-	font-size: 30rpx;
+	font-size: 28rpx;
 }
 .tableScroll {
 	width: 100%;
@@ -131,8 +131,8 @@ export default {
 }
 .tableCell {
 	flex-shrink: 0;
-	padding: 16rpx 10rpx;
+	padding: 12rpx 8rpx;
-	font-size: 28rpx;
+	font-size: 22rpx;
 	color: #333;
 	text-align: center;
 	border-right: 1rpx solid #e1e1e1;
@@ -152,7 +152,7 @@ export default {
 }
 .tableTip {
 	margin-top: 16rpx;
-	font-size: 26rpx;
+	font-size: 22rpx;
 	color: #999;
 	text-align: center;
 	flex-shrink: 0;

src/components/storefabric/OrderHeaderFold.vue

@@ -1,60 +0,0 @@
-<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,9 +22,7 @@ export default {
 };
 </script>
 
-<style scoped lang="scss">
+<style scoped>
-@import '@/common/status-tag.scss';
-
 .statusRow {
 	display: flex;
 	align-items: center;
@@ -34,7 +32,18 @@ export default {
 	border-bottom: 1rpx solid #f5f5f5;
 }
 .statusLabel {
-	font-size: $pda-font-body;
+	font-size: 40rpx;
 	color: #333;
 }
+.statusTag {
+	font-size: 34rpx;
+	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/storefabric/SearchSelectPopup.vue

@@ -0,0 +1,134 @@
+<template>
+	<u-popup v-model="visible" mode="bottom" :safe-area-inset-bottom="true" border-radius="16">
+		<view class="search-select" :style="{ maxHeight: panelMaxHeight + 'px' }">
+			<view class="search-select__bar">
+				<text class="search-select__title">{{ title }}</text>
+				<text class="search-select__cancel" @click="visible = false">取消</text>
+			</view>
+			<view class="search-select__search">
+				<u-search v-model="keyword" :placeholder="placeholder" :show-action="false" />
+			</view>
+			<scroll-view
+				scroll-y
+				class="search-select__list"
+				:style="{ height: listHeight + 'px' }"
+				:enable-back-to-top="false"
+			>
+				<view v-if="!filteredList.length" class="search-select__empty">暂无匹配数据</view>
+				<view
+					v-for="item in filteredList"
+					:key="String(item.value)"
+					class="search-select__item"
+					@click="confirm(item)"
+				>{{ item.label }}</view>
+			</scroll-view>
+		</view>
+	</u-popup>
+</template>
+
+<script>
+export default {
+	props: {
+		show: { type: Boolean, default: false },
+		title: { type: String, default: '请选择' },
+		placeholder: { type: String, default: '请输入名称搜索' },
+		list: { type: Array, default: () => [] },
+	},
+	data() {
+		return {
+			keyword: '',
+			panelMaxHeight: 520,
+			listHeight: 360,
+		};
+	},
+	computed: {
+		visible: {
+			get() { return this.show; },
+			set(val) { this.$emit('update:show', val); },
+		},
+		filteredList() {
+			const keyword = (this.keyword || '').trim().toLowerCase();
+			if (!keyword) return this.list;
+			return this.list.filter((item) => String(item.label || '').toLowerCase().includes(keyword));
+		},
+	},
+	watch: {
+		show(val) {
+			if (val) {
+				this.keyword = '';
+				this.calcHeight();
+			}
+		},
+	},
+	mounted() {
+		this.calcHeight();
+	},
+	methods: {
+		calcHeight() {
+			try {
+				const sys = uni.getSystemInfoSync();
+				const winH = sys.windowHeight || 600;
+				// 弹层约占屏高 65%，列表为弹层去掉标题+搜索后的剩余高度
+				this.panelMaxHeight = Math.floor(winH * 0.65);
+				this.listHeight = Math.max(220, this.panelMaxHeight - 140);
+			} catch (e) {
+				this.panelMaxHeight = 520;
+				this.listHeight = 360;
+			}
+		},
+		confirm(item) {
+			this.visible = false;
+			this.$emit('confirm', item);
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+@import '@/common/pda-typography.scss';
+
+.search-select {
+	background: #fff;
+	padding-bottom: 20rpx;
+	box-sizing: border-box;
+	display: flex;
+	flex-direction: column;
+	overflow: hidden;
+}
+.search-select__bar {
+	flex-shrink: 0;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 24rpx 30rpx 12rpx;
+}
+.search-select__title {
+	font-size: $pda-font-popup-title;
+	font-weight: bold;
+	color: #202328;
+}
+.search-select__cancel {
+	font-size: $pda-font-popup-sub;
+	color: #888;
+}
+.search-select__search {
+	flex-shrink: 0;
+	padding: 0 24rpx 12rpx;
+}
+.search-select__list {
+	width: 100%;
+	box-sizing: border-box;
+}
+.search-select__empty {
+	padding: 80rpx 0;
+	text-align: center;
+	color: #999;
+	font-size: $pda-font-popup-sub;
+}
+.search-select__item {
+	padding: 32rpx 30rpx;
+	font-size: $pda-font-popup-item;
+	color: #202328;
+	border-bottom: 1px solid #f2f2f2;
+}
+</style>

src/components/storefabric/WarehouseDataTable.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="warehouse-table-wrap">
+	<view class="warehouse-table-wrap" :class="{ 'is-auto-height': isAutoHeight }">
 		<scroll-view scroll-x class="tableScrollX">
 			<wyb-table
 				ref="table"
@@ -22,10 +22,14 @@ export default {
 	props: {
 		headers: { type: Array, default: () => [] },
 		contents: { type: Array, default: () => [] },
+		// auto：高度随内容撑开，纵向滚动交给外层 scroll-view，避免与下拉刷新抢手势
 		height: { type: String, default: 'auto' },
 		firstLineFixed: { type: Boolean, default: true },
 	},
 	computed: {
+		isAutoHeight() {
+			return !this.height || this.height === 'auto';
+		},
 		tableWidth() {
 			const total = (this.headers || []).reduce((sum, col) => sum + (col.width || 160), 0);
 			return `${total}rpx`;
@@ -49,4 +53,10 @@ export default {
 .tableScrollX {
 	width: 100%;
 }
+/* 取消表格内部纵向滚动，只保留横向；纵向由页面 scroll-view 处理 */
+.is-auto-height ::v-deep .wyb-table-scroll-view {
+	height: auto !important;
+	overflow-x: auto;
+	overflow-y: visible;
+}
 </style>

src/components/storegoods/FineCodeSummaryTable.vue

@@ -1,294 +0,0 @@
-<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

@@ -1,93 +0,0 @@
-<template>
-	<view>
-		<view v-if="canScan" class="flex-white-plr26 ptb20 bdb_f5 fabric-out-scanRow process-in-binRow">
-			<text class="mr26 process-in-binLabel">仓位<text class="redXingh">*</text></text>
-			<input
-				type="text"
-				:value="code"
-				class="fabric-out-scanInput"
-				placeholder="请先扫描仓位"
-				@input="$emit('code-input', $event.detail.value)"
-				@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-else-if="showPhoneScan"
-				class="fabric-out-phoneScanIcon"
-				name="scan"
-				size="44"
-				color="#2979ff"
-				@click="$emit('phone-scan')"
-			/>
-			<text v-if="binId" class="process-in-binClear" @click="$emit('clear')">更换</text>
-		</view>
-		<view v-else-if="showDisabledTip" class="fabric-out-scanTip">{{ disabledTip }}</view>
-		<view v-if="canScan && !binId" class="fabric-out-scanTip">请先扫描仓位，再扫描布匹二维码</view>
-	</view>
-</template>
-
-<script>
-export default {
-	props: {
-		canScan: { type: Boolean, default: false },
-		binId: { type: [Number, String], default: 0 },
-		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: '请先提交保存后再扫仓位' },
-	},
-};
-</script>
-
-<style scoped lang="scss">
-@import '@/pages/storefabric/storeFabricBusinessOutPage.scss';
-@import '@/common/pda-typography.scss';
-
-.process-in-binRow {
-	background: #fff;
-}
-.process-in-binLabel {
-	flex-shrink: 0;
-}
-.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;
-}
-.process-in-binName {
-	margin-left: 12rpx;
-	font-size: 28rpx;
-	color: #333;
-	max-width: 200rpx;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}
-.process-in-binClear {
-	margin-left: 16rpx;
-	font-size: 28rpx;
-	color: #2979ff;
-	flex-shrink: 0;
-}
-</style>

src/components/storegoods/ProcessInDetailList.vue

@@ -1,35 +0,0 @@
-<template>
-	<FineCodeSummaryTable
-		:groups="groups"
-		:title="title"
-		:empty-text="emptyText"
-		roll-key="in_roll"
-		weight-key="in_weight"
-		:deletable="deletable"
-		:show-tare-columns="showTareColumns"
-		@delete="$emit('delete', $event)"
-	>
-		<slot name="before-list" slot="before-list" />
-	</FineCodeSummaryTable>
-</template>
-
-<script>
-import FineCodeSummaryTable from '@/components/storegoods/FineCodeSummaryTable.vue';
-import { buildItemGroups } from '@/common/storeGoodsProcessIn';
-
-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);
-		},
-	},
-};
-</script>

src/components/storegoods/ProcessInScanDetail.vue

@@ -1,36 +0,0 @@
-<template>
-	<view class="fabric-out-scanDetail">
-		<view class="fabric-out-scanDetailRow fabric-out-scanDetailRow--2col">
-			<text class="fabric-out-scanDetailCell">染整单号：{{ detail.quote_order_no || '-' }}</text>
-			<text class="fabric-out-scanDetailCell">缸号：{{ detail.dyelot_number || '-' }}</text>
-		</view>
-		<view class="fabric-out-scanDetailRow fabric-out-scanDetailRow--2col">
-			<text class="fabric-out-scanDetailCell">卷号：{{ detail.volume_number || '-' }}</text>
-			<text class="fabric-out-scanDetailCell">外部卷号：{{ detail.extern_volume_number || '-' }}</text>
-		</view>
-		<view class="fabric-out-scanDetailRow fabric-out-scanDetailRow--2col">
-			<text class="fabric-out-scanDetailCell">成品编号：{{ detail.product_code || '-' }}</text>
-			<text class="fabric-out-scanDetailCell">成品色号：{{ detail.product_color_code || '-' }}</text>
-		</view>
-		<view class="fabric-out-scanDetailRow fabric-out-scanDetailRow--2col">
-			<text class="fabric-out-scanDetailCell">本行数量：{{ detail.item_weight != null ? detail.item_weight : '-' }}</text>
-			<text class="fabric-out-scanDetailCell">本单匹数：{{ detail.order_roll != null ? detail.order_roll : '-' }}</text>
-		</view>
-		<view class="fabric-out-scanDetailRow">
-			<text class="fabric-out-scanDetailLabel">本单数量：</text>
-			<text class="fabric-out-scanDetailValue">{{ detail.order_weight != null ? detail.order_weight : '-' }}</text>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	props: {
-		detail: { type: Object, default: () => ({}) },
-	},
-};
-</script>
-
-<style scoped lang="scss">
-@import '@/pages/storefabric/storeFabricBusinessOutPage.scss';
-</style>

src/components/storegoods/ProcessOutDetailList.vue

@@ -1,33 +0,0 @@
-<template>
-	<FineCodeSummaryTable
-		:groups="groups"
-		:title="title"
-		empty-text="暂无出仓明细"
-		roll-key="out_roll"
-		weight-key="out_weight"
-		:deletable="deletable"
-		show-bar-code
-		@delete="$emit('delete', $event)"
-	>
-		<slot name="before-list" slot="before-list" />
-	</FineCodeSummaryTable>
-</template>
-
-<script>
-import FineCodeSummaryTable from '@/components/storegoods/FineCodeSummaryTable.vue';
-import { buildItemGroups } from '@/common/storeGoodsProcessOut';
-
-export default {
-	components: { FineCodeSummaryTable },
-	props: {
-		list: { type: Array, default: () => [] },
-		title: { type: String, default: '出仓明细' },
-		deletable: { type: Boolean, default: false },
-	},
-	computed: {
-		groups() {
-			return buildItemGroups(this.list);
-		},
-	},
-};
-</script>

src/components/storegoods/ProcessOutScanDetail.vue

@@ -1,36 +0,0 @@
-<template>
-	<view class="fabric-out-scanDetail">
-		<view class="fabric-out-scanDetailRow fabric-out-scanDetailRow--2col">
-			<text class="fabric-out-scanDetailCell">染整单号：{{ detail.quote_order_no || '-' }}</text>
-			<text class="fabric-out-scanDetailCell">缸号：{{ detail.dyelot_number || '-' }}</text>
-		</view>
-		<view class="fabric-out-scanDetailRow fabric-out-scanDetailRow--2col">
-			<text class="fabric-out-scanDetailCell">卷号：{{ detail.volume_number || '-' }}</text>
-			<text class="fabric-out-scanDetailCell">外部卷号：{{ detail.extern_volume_number || '-' }}</text>
-		</view>
-		<view class="fabric-out-scanDetailRow fabric-out-scanDetailRow--2col">
-			<text class="fabric-out-scanDetailCell">成品编号：{{ detail.product_code || '-' }}</text>
-			<text class="fabric-out-scanDetailCell">成品色号：{{ detail.product_color_code || '-' }}</text>
-		</view>
-		<view class="fabric-out-scanDetailRow fabric-out-scanDetailRow--2col">
-			<text class="fabric-out-scanDetailCell">本行匹数：{{ detail.item_roll != null ? detail.item_roll : '-' }}</text>
-			<text class="fabric-out-scanDetailCell">本行数量：{{ detail.item_weight != null ? detail.item_weight : '-' }}</text>
-		</view>
-		<view class="fabric-out-scanDetailRow fabric-out-scanDetailRow--2col">
-			<text class="fabric-out-scanDetailCell">本单匹数：{{ detail.order_roll != null ? detail.order_roll : '-' }}</text>
-			<text class="fabric-out-scanDetailCell">本单数量：{{ detail.order_weight != null ? detail.order_weight : '-' }}</text>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	props: {
-		detail: { type: Object, default: () => ({}) },
-	},
-};
-</script>
-
-<style scoped lang="scss">
-@import '@/pages/storefabric/storeFabricBusinessOutPage.scss';
-</style>

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

@@ -1,86 +0,0 @@
-<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

@@ -1,71 +0,0 @@
-<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

@@ -1,71 +0,0 @@
-<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

@@ -1,81 +0,0 @@
-<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-action-sheet/u-action-sheet.vue

@@ -1,247 +0,0 @@
-<template>
-	<u-popup mode="bottom" :border-radius="borderRadius" :popup="false" v-model="value" :maskCloseAble="maskCloseAble"
-	    length="auto" :safeAreaInsetBottom="safeAreaInsetBottom" @close="popupClose" :z-index="uZIndex">
-		<view class="u-tips u-border-bottom" v-if="tips.text" :style="[tipsStyle]">
-			{{tips.text}}
-		</view>
-		<view class="u-action-sheet-search" v-if="showSearch" @tap.stop>
-			<u-icon name="search" size="32" color="#909399"></u-icon>
-			<input
-				class="u-action-sheet-search__input"
-				:value="keyword"
-				:placeholder="searchPlaceholder"
-				confirm-type="search"
-				:adjust-position="true"
-				@input="onSearchInput"
-			/>
-			<u-icon
-				v-if="keyword"
-				name="close-circle-fill"
-				size="28"
-				color="#c0c4cc"
-				@tap.stop="clearSearch"
-			></u-icon>
-		</view>
-		<scroll-view scroll-y class="u-action-sheet-scroll">
-			<view
-				v-for="(item, index) in displayList"
-				:key="item._originIndex"
-				@touchmove.stop.prevent
-				@tap="itemClick(item._originIndex)"
-				:style="[itemStyle(item._originIndex)]"
-				class="u-action-sheet-item u-line-1"
-				:class="[index < displayList.length - 1 ? 'u-border-bottom' : '']"
-				:hover-stay-time="150"
-			>
-				<text>{{item.text}}</text>
-				<text class="u-action-sheet-item__subtext u-line-1" v-if="item.subText">{{item.subText}}</text>
-			</view>
-			<view v-if="!displayList.length" class="u-action-sheet-empty">无匹配选项</view>
-		</scroll-view>
-		<view class="u-gab" v-if="cancelBtn">
-		</view>
-		<view @touchmove.stop.prevent class="u-actionsheet-cancel u-action-sheet-item" hover-class="u-hover-class"
-		    :hover-stay-time="150" v-if="cancelBtn" @tap="close">{{cancelText}}</view>
-	</u-popup>
-</template>
-
-<script>
-	/**
-	 * actionSheet 操作菜单（本地覆盖：选项支持搜索）
-	 * @description 本组件用于从底部弹出一个操作菜单，供用户选择并返回结果。
-	 * @tutorial https://www.uviewui.com/components/actionSheet.html
-	 * @property {Array<Object>} list 按钮的文字数组，见官方文档示例
-	 * @property {Boolean} show-search 是否显示搜索框(默认true)
-	 * @property {String} search-placeholder 搜索框占位文字
-	 * @event {Function} click 点击ActionSheet列表项时触发，返回原始列表下标
-	 * @example <u-action-sheet :list="list" @click="click" v-model="show"></u-action-sheet>
-	 */
-	export default {
-		name: "u-action-sheet",
-		props: {
-			maskCloseAble: {
-				type: Boolean,
-				default: true
-			},
-			list: {
-				type: Array,
-				default () {
-					return [];
-				}
-			},
-			tips: {
-				type: Object,
-				default () {
-					return {
-						text: '',
-						color: '',
-						fontSize: '26'
-					}
-				}
-			},
-			cancelBtn: {
-				type: Boolean,
-				default: true
-			},
-			safeAreaInsetBottom: {
-				type: Boolean,
-				default: false
-			},
-			value: {
-				type: Boolean,
-				default: false
-			},
-			borderRadius: {
-				type: [String, Number],
-				default: 0
-			},
-			zIndex: {
-				type: [String, Number],
-				default: 0
-			},
-			cancelText: {
-				type: String,
-				default: '取消'
-			},
-			showSearch: {
-				type: Boolean,
-				default: true
-			},
-			searchPlaceholder: {
-				type: String,
-				default: '搜索'
-			}
-		},
-		data() {
-			return {
-				keyword: ''
-			};
-		},
-		watch: {
-			value(val) {
-				if (val) this.keyword = '';
-			}
-		},
-		computed: {
-			tipsStyle() {
-				let style = {};
-				if (this.tips.color) style.color = this.tips.color;
-				if (this.tips.fontSize) style.fontSize = this.tips.fontSize + 'rpx';
-				return style;
-			},
-			itemStyle() {
-				return (index) => {
-					let style = {};
-					const item = this.list[index];
-					if (!item) return style;
-					if (item.color) style.color = item.color;
-					if (item.fontSize) style.fontSize = item.fontSize + 'rpx';
-					if (item.disabled) style.color = '#c0c4cc';
-					return style;
-				}
-			},
-			uZIndex() {
-				return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
-			},
-			displayList() {
-				const keyword = (this.keyword || '').trim().toLowerCase();
-				return (this.list || []).reduce((arr, item, index) => {
-					const text = String((item && item.text) || '');
-					const subText = String((item && item.subText) || '');
-					if (!keyword || text.toLowerCase().indexOf(keyword) !== -1 || subText.toLowerCase().indexOf(keyword) !== -1) {
-						arr.push(Object.assign({}, item, { _originIndex: index }));
-					}
-					return arr;
-				}, []);
-			}
-		},
-		methods: {
-			onSearchInput(e) {
-				this.keyword = e && e.detail && e.detail.value != null ? e.detail.value : '';
-			},
-			clearSearch() {
-				this.keyword = '';
-			},
-			close() {
-				this.popupClose();
-				this.$emit('close');
-			},
-			popupClose() {
-				this.keyword = '';
-				this.$emit('input', false);
-			},
-			itemClick(index) {
-				if(this.list[index] && this.list[index].disabled) return;
-				this.$emit('click', index);
-				this.$emit('input', false);
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "~uview-ui/libs/css/style.components.scss";
-
-	.u-tips {
-		font-size: 26rpx;
-		text-align: center;
-		padding: 34rpx 0;
-		line-height: 1;
-		color: $u-tips-color;
-	}
-
-	.u-action-sheet-search {
-		@include vue-flex;
-		align-items: center;
-		margin: 16rpx 24rpx;
-		padding: 0 24rpx;
-		height: 80rpx;
-		background-color: #f5f5f5;
-		border-radius: 12rpx;
-		box-sizing: border-box;
-
-		&__input {
-			flex: 1;
-			height: 80rpx;
-			margin-left: 12rpx;
-			font-size: 30rpx;
-			color: #303133;
-		}
-	}
-
-	.u-action-sheet-scroll {
-		max-height: 600rpx;
-	}
-
-	.u-action-sheet-empty {
-		text-align: center;
-		padding: 60rpx 0;
-		font-size: 30rpx;
-		color: #909399;
-	}
-
-	.u-action-sheet-item {
-		@include vue-flex;
-		line-height: 1;
-		justify-content: center;
-		align-items: center;
-		font-size: 32rpx;
-		padding: 34rpx 0;
-		flex-direction: column;
-	}
-	
-	.u-action-sheet-item__subtext {
-		font-size: 24rpx;
-		color: $u-tips-color;
-		margin-top: 20rpx;
-	}
-
-	.u-gab {
-		height: 12rpx;
-		background-color: rgb(234, 234, 236);
-	}
-
-	.u-actionsheet-cancel {
-		color: $u-main-color;
-	}
-</style>

src/components/u-dropdown-item/u-dropdown-item.vue

@@ -1,186 +0,0 @@
-<template>
-	<view class="u-dropdown-item" v-if="active" @touchmove.stop.prevent="() => {}" @tap.stop.prevent="() => {}">
-		<block v-if="!$slots.default && !$slots.$default">
-			<view class="u-dropdown-item__search" v-if="showSearch" @tap.stop>
-				<u-icon name="search" size="28" color="#909399"></u-icon>
-				<input
-					class="u-dropdown-item__search__input"
-					:value="keyword"
-					:placeholder="searchPlaceholder"
-					confirm-type="search"
-					:adjust-position="true"
-					@input="onSearchInput"
-				/>
-				<u-icon
-					v-if="keyword"
-					name="close-circle-fill"
-					size="28"
-					color="#c0c4cc"
-					@tap.stop="clearSearch"
-				></u-icon>
-			</view>
-			<scroll-view scroll-y="true" :style="{
-				height: $u.addUnit(height)
-			}">
-				<view class="u-dropdown-item__options">
-					<u-cell-group>
-						<u-cell-item @click="cellClick(item.value)" :arrow="false" :title="item.label" v-for="(item, index) in filteredOptions"
-						 :key="index" :title-style="{
-							color: value == item.value ? activeColor : inactiveColor
-						}">
-							<u-icon v-if="value == item.value" name="checkbox-mark" :color="activeColor" size="32"></u-icon>
-						</u-cell-item>
-					</u-cell-group>
-					<view v-if="!filteredOptions.length" class="u-dropdown-item__empty">无匹配选项</view>
-				</view>
-			</scroll-view>
-		</block>
-		<slot v-else />
-	</view>
-</template>
-
-<script>
-	/**
-	 * dropdown-item 下拉菜单（本地覆盖：选项支持搜索）
-	 * @description 该组件一般用于向下展开菜单，同时可切换多个选项卡的场景
-	 * @tutorial http://uviewui.com/components/dropdown.html
-	 * @property {String | Number} v-model 双向绑定选项卡选择值
-	 * @property {String} title 菜单项标题
-	 * @property {Array[Object]} options 选项数据，如果传入了默认slot，此参数无效
-	 * @property {Boolean} show-search 是否显示搜索框(默认true)
-	 * @property {String} search-placeholder 搜索框占位文字
-	 * @example <u-dropdown-item title="标题"></u-dropdown-item>
-	 */
-	export default {
-		name: 'u-dropdown-item',
-		props: {
-			value: {
-				type: [Number, String, Array],
-				default: ''
-			},
-			title: {
-				type: [String, Number],
-				default: ''
-			},
-			options: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-			disabled: {
-				type: Boolean,
-				default: false
-			},
-			height: {
-				type: [Number, String],
-				default: 'auto'
-			},
-			showSearch: {
-				type: Boolean,
-				default: true
-			},
-			searchPlaceholder: {
-				type: String,
-				default: '搜索'
-			}
-		},
-		data() {
-			return {
-				active: false,
-				activeColor: '#2979ff',
-				inactiveColor: '#606266',
-				keyword: ''
-			}
-		},
-		computed: {
-			propsChange() {
-				return `${this.title}-${this.disabled}`;
-			},
-			filteredOptions() {
-				const keyword = (this.keyword || '').trim().toLowerCase();
-				const list = this.options || [];
-				if (!keyword) return list;
-				return list.filter(item => {
-					const label = String(item && item.label != null ? item.label : '');
-					const value = String(item && item.value != null ? item.value : '');
-					return label.toLowerCase().indexOf(keyword) !== -1 || value.toLowerCase().indexOf(keyword) !== -1;
-				});
-			}
-		},
-		watch: {
-			propsChange() {
-				if (this.parent) this.parent.init();
-			},
-			active(val) {
-				if (!val) this.keyword = '';
-			}
-		},
-		created() {
-			this.parent = false;
-		},
-		methods: {
-			onSearchInput(e) {
-				this.keyword = e && e.detail && e.detail.value != null ? e.detail.value : '';
-			},
-			clearSearch() {
-				this.keyword = '';
-			},
-			init() {
-				let parent = this.$u.$parent.call(this, 'u-dropdown');
-				if (parent) {
-					this.parent = parent;
-					this.activeColor = parent.activeColor;
-					this.inactiveColor = parent.inactiveColor;
-					let exist = parent.children.find(val => {
-						return this === val;
-					})
-					if (!exist) parent.children.push(this);
-					if (parent.children.length == 1) this.active = true;
-					parent.menuList.push({
-						title: this.title,
-						disabled: this.disabled
-					});
-				}
-			},
-			cellClick(value) {
-				this.$emit('input', value);
-				this.parent.close();
-				this.$emit('change', value);
-			}
-		},
-		mounted() {
-			this.init();
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	@import "~uview-ui/libs/css/style.components.scss";
-
-	.u-dropdown-item__search {
-		@include vue-flex;
-		align-items: center;
-		margin: 16rpx 24rpx 0;
-		padding: 0 24rpx;
-		height: 72rpx;
-		background-color: #f5f5f5;
-		border-radius: 12rpx;
-		box-sizing: border-box;
-
-		&__input {
-			flex: 1;
-			height: 72rpx;
-			margin-left: 12rpx;
-			font-size: 28rpx;
-			color: #303133;
-		}
-	}
-
-	.u-dropdown-item__empty {
-		text-align: center;
-		padding: 40rpx 0;
-		font-size: 28rpx;
-		color: #909399;
-	}
-</style>

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

@@ -1,589 +0,0 @@
-<template>
-	<view class="u-select">
-		<u-popup :maskCloseAble="maskCloseAble" mode="bottom" :popup="false" v-model="value" length="auto" :safeAreaInsetBottom="safeAreaInsetBottom" @close="close" :z-index="uZIndex">
-			<view class="u-select">
-				<view class="u-select__header" @touchmove.stop.prevent="">
-					<view
-						class="u-select__header__cancel u-select__header__btn"
-						:style="{ color: cancelColor }"
-						hover-class="u-hover-class"
-						:hover-stay-time="150"
-						@tap="getResult('cancel')"
-					>
-						{{cancelText}}
-					</view>
-					<view class="u-select__header__title">
-						{{title}}
-					</view>
-					<view
-						class="u-select__header__confirm u-select__header__btn"
-						:style="{ color: moving ? cancelColor : confirmColor }"
-						hover-class="u-hover-class"
-						:hover-stay-time="150"
-						@touchmove.stop=""
-						@tap.stop="getResult('confirm')"
-					>
-						{{confirmText}}
-					</view>
-				</view>
-				<view class="u-select__search" v-if="showSearch" @tap.stop>
-					<u-icon name="search" size="32" color="#909399"></u-icon>
-					<input
-						class="u-select__search__input"
-						:value="keyword"
-						:placeholder="searchPlaceholder"
-						confirm-type="search"
-						:adjust-position="true"
-						@input="onSearchInput"
-						@confirm="onSearchConfirm"
-					/>
-					<u-icon
-						v-if="keyword"
-						name="close-circle-fill"
-						size="28"
-						color="#c0c4cc"
-						@tap.stop="clearSearch"
-					></u-icon>
-				</view>
-				<view v-if="loading" class="u-select__loading">搜索中...</view>
-				<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"
-								: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>
-				</view>
-			</view>
-		</u-popup>
-	</view>
-</template>
-
-<script>
-	/**
-	 * select 列选择器（本地覆盖：选项支持搜索）
-	 * @description 此选择器用于单列，多列，多列联动的选择场景。
-	 * @tutorial http://uviewui.com/components/select.html
-	 * @property {String} mode 模式选择，"single-column"-单列模式，"mutil-column"-多列模式，"mutil-column-auto"-多列联动模式
-	 * @property {Array} list 列数据，数组形式，见官网说明
-	 * @property {Boolean} v-model 布尔值变量，用于控制选择器的弹出与收起
-	 * @property {Boolean} show-search 是否显示搜索框(默认true)
-	 * @property {String} search-placeholder 搜索框占位文字
-	 * @event {Function} confirm 点击确定按钮，返回当前选择的值
-	 * @example <u-select v-model="show" :list="list"></u-select>
-	 */
-
-export default {
-	props: {
-		list: {
-			type: Array,
-			default() {
-				return [];
-			}
-		},
-		border: {
-			type: Boolean,
-			default: true
-		},
-		value: {
-			type: Boolean,
-			default: false
-		},
-		cancelColor: {
-			type: String,
-			default: '#606266'
-		},
-		confirmColor: {
-			type: String,
-			default: '#2979ff'
-		},
-		zIndex: {
-			type: [String, Number],
-			default: 0
-		},
-		safeAreaInsetBottom: {
-			type: Boolean,
-			default: false
-		},
-		maskCloseAble: {
-			type: Boolean,
-			default: true
-		},
-		defaultValue: {
-			type: Array,
-			default() {
-				return [0];
-			}
-		},
-		mode: {
-			type: String,
-			default: 'single-column'
-		},
-		valueName: {
-			type: String,
-			default: 'value'
-		},
-		labelName: {
-			type: String,
-			default: 'label'
-		},
-		childName: {
-			type: String,
-			default: 'children'
-		},
-		title: {
-			type: String,
-			default: ''
-		},
-		cancelText: {
-			type: String,
-			default: '取消'
-		},
-		confirmText: {
-			type: String,
-			default: '确认'
-		},
-		showSearch: {
-			type: Boolean,
-			default: true
-		},
-		searchPlaceholder: {
-			type: String,
-			default: '搜索'
-		},
-		remote: {
-			type: Boolean,
-			default: false
-		},
-		loading: {
-			type: Boolean,
-			default: false
-		},
-		debounce: {
-			type: Number,
-			default: 400
-		},
-		/** 选项行高（rpx）。App 端需与 indicator 同步，避免选中框错位 */
-		itemHeight: {
-			type: [Number, String],
-			default: 0
-		},
-		/** 可见行数，用于计算滚轮高度；需为奇数，选中行才能居中 */
-		visibleItemCount: {
-			type: [Number, String],
-			default: 5
-		}
-	},
-	data() {
-		return {
-			defaultSelector: [0],
-			columnData: [],
-			selectValue: [],
-			lastSelectIndex: [],
-			columnNum: 0,
-			moving: false,
-			keyword: '',
-			pickerKey: 0,
-			// 勿用 _ 前缀：Vue2 不会把 data 代理到 this
-			searchTimer: null,
-			lastSearchEmit: '',
-			lastSearchAt: 0
-		};
-	},
-	watch: {
-		value: {
-			immediate: true,
-			handler(val) {
-				if (val) {
-					this.keyword = '';
-					this.applyPickerData();
-					if (this.remote) this.emitRemoteSearch('');
-				} else {
-					this.clearSearchTimer();
-					this.lastSearchEmit = '';
-					this.lastSearchAt = 0;
-				}
-			}
-		},
-		list: {
-			handler() {
-				if (!this.value) return;
-				this.applyPickerData();
-			},
-		},
-		loading(val) {
-			// loading 从 true→false 时再刷一次滚轮，避免原生 picker-view 漏更
-			if (!val && this.value && this.remote) this.applyPickerData();
-		},
-	},
-	beforeDestroy() {
-		this.clearSearchTimer();
-	},
-	computed: {
-		uZIndex() {
-			return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
-		},
-		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() {
-			// #ifdef MP-WEIXIN
-			this.moving = true;
-			// #endif
-		},
-		pickend() {
-			// #ifdef MP-WEIXIN
-			this.moving = false;
-			// #endif
-		},
-		readInputValue(e) {
-			if (typeof e === 'string' || typeof e === 'number') return String(e);
-			if (e && e.detail && e.detail.value != null) return String(e.detail.value);
-			if (e && e.target && e.target.value != null) return String(e.target.value);
-			return '';
-		},
-		clearSearchTimer() {
-			if (this.searchTimer) {
-				clearTimeout(this.searchTimer);
-				this.searchTimer = null;
-			}
-		},
-		emitRemoteSearch(keyword) {
-			this.clearSearchTimer();
-			const key = keyword == null ? '' : String(keyword).trim();
-			const now = Date.now();
-			if (key === this.lastSearchEmit && now - this.lastSearchAt < 80) return;
-			this.lastSearchEmit = key;
-			this.lastSearchAt = now;
-			this.$emit('search', key);
-		},
-		scheduleRemoteSearch() {
-			this.clearSearchTimer();
-			this.searchTimer = setTimeout(() => {
-				this.emitRemoteSearch(this.keyword);
-			}, this.debounce);
-		},
-		onSearchInput(e) {
-			this.keyword = this.readInputValue(e);
-			if (this.remote) this.scheduleRemoteSearch();
-			else this.applyFilter();
-		},
-		onSearchConfirm(e) {
-			this.keyword = this.readInputValue(e);
-			if (this.remote) this.emitRemoteSearch(this.keyword);
-			else this.applyFilter();
-		},
-		clearSearch() {
-			this.keyword = '';
-			if (this.remote) this.emitRemoteSearch('');
-			else this.applyFilter();
-		},
-		matchKeyword(text) {
-			const keyword = (this.keyword || '').trim().toLowerCase();
-			if (!keyword) return true;
-			return String(text == null ? '' : text).toLowerCase().indexOf(keyword) !== -1;
-		},
-		filterItems(list) {
-			if (!Array.isArray(list)) return [];
-			if (this.remote) return list.slice();
-			const keyword = (this.keyword || '').trim();
-			if (!keyword) return list.slice();
-			return list.filter(item => {
-				return this.matchKeyword(item && item[this.labelName]) || this.matchKeyword(item && item[this.valueName]);
-			});
-		},
-		applyPickerData() {
-			this.init();
-			this.pickerKey += 1;
-		},
-		applyFilter() {
-			this.applyPickerData();
-		},
-		init() {
-			this.setColumnNum();
-			this.setDefaultSelector();
-			this.setColumnData();
-			this.setSelectValue();
-		},
-		setDefaultSelector() {
-			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() {
-			if(this.mode == 'single-column') this.columnNum = 1;
-			else if(this.mode == 'mutil-column') this.columnNum = this.list.length;
-			else if(this.mode == 'mutil-column-auto') {
-				let num = 1;
-				let column = this.list;
-				while(column[0] && column[0][this.childName]) {
-					column = column[0] ? column[0][this.childName] : {};
-					num ++;
-				}
-				this.columnNum = num;
-			}
-		},
-		setColumnData() {
-			let data = [];
-			this.selectValue = [];
-			if(this.mode == 'mutil-column-auto') {
-				const sourceList = this.filterItems(this.list);
-				if (!sourceList.length) {
-					this.columnData = [[]];
-					return;
-				}
-				let selector = this.defaultSelector.length ? this.defaultSelector[0] : 0;
-				if (selector >= sourceList.length) selector = 0;
-				let column = sourceList[selector];
-				for (let i = 0; i < this.columnNum; i++) {
-					if (i == 0) {
-						data[i] = sourceList;
-						column = column ? column[this.childName] : [];
-					} else {
-						data[i] = column || [];
-						const nextIndex = this.defaultSelector[i] || 0;
-						column = (column && column[nextIndex]) ? column[nextIndex][this.childName] : [];
-					}
-				}
-			} else if(this.mode == 'single-column') {
-				data[0] = this.filterItems(this.list);
-			} else {
-				data = (this.list || []).map(col => this.filterItems(Array.isArray(col) ? col : []));
-			}
-			this.columnData = data.slice();
-		},
-		setSelectValue() {
-			let tmp = null;
-			for(let i = 0; i < this.columnNum; i++) {
-				const col = this.columnData[i] || [];
-				tmp = col[this.defaultSelector[i]];
-				let data = {
-					value: tmp ? tmp[this.valueName] : null,
-					label: tmp ? tmp[this.labelName] : null
-				};
-				if(tmp && tmp.extra !== undefined) data.extra = tmp.extra;
-				this.selectValue.push(data)
-			}
-		},
-		columnChange(e) {
-			let index = null;
-			let columnIndex = e.detail.value;
-			this.selectValue = [];
-			this.defaultSelector = columnIndex;
-			if(this.mode == 'mutil-column-auto') {
-				this.lastSelectIndex.map((val, idx) => {
-					if (val != columnIndex[idx]) index = idx;
-				});
-				
-				for (let i = index + 1; i < this.columnNum; i++) {
-					this.columnData[i] = this.columnData[i - 1][i - 1 == index ? columnIndex[index] : 0][this.childName];
-					this.defaultSelector[i] = 0;
-				}
-				columnIndex.map((item, idx) => {
-					let data = this.columnData[idx][columnIndex[idx]];
-					let tmp = {
-						value: data ? data[this.valueName] : null,
-						label: data ? data[this.labelName] : null,
-					};
-					if(data && data.extra !== undefined) tmp.extra = data.extra;
-					this.selectValue.push(tmp);
-
-				})
-				this.lastSelectIndex = columnIndex;
-			} else if(this.mode == 'single-column') {
-				let data = this.columnData[0][columnIndex[0]];
-				let tmp = {
-					value: data ? data[this.valueName] : null,
-					label: data ? data[this.labelName] : null,
-				};
-				if(data && data.extra !== undefined) tmp.extra = data.extra;
-				this.selectValue.push(tmp);
-			} else if(this.mode == 'mutil-column') {
-				columnIndex.map((item, idx) => {
-					let data = this.columnData[idx][columnIndex[idx]];
-					let tmp = {
-						value: data ? data[this.valueName] : null,
-						label: data ? data[this.labelName] : null,
-					};
-					if(data && data.extra !== undefined) tmp.extra = data.extra;
-					this.selectValue.push(tmp);
-				})
-			}
-		},
-		close() {
-			this.$emit('input', false);
-			this.$set(this, 'defaultSelector', [0]);
-			this.keyword = '';
-			this.lastSearchEmit = '';
-			this.lastSearchAt = 0;
-		},
-		getResult(event = null) {
-			// #ifdef MP-WEIXIN
-			if (this.moving) return;
-			// #endif
-			if (event === 'confirm' && this.isColumnEmpty) {
-				this.$u.toast && this.$u.toast('无匹配选项');
-				return;
-			}
-			if (event) this.$emit(event, this.selectValue);
-			this.close();
-		},
-		selectHandler() {
-			this.$emit('click');
-		}
-	}
-};
-</script>
-
-<style scoped lang="scss">
-@import "~uview-ui/libs/css/style.components.scss";
-
-.u-select {
-
-	&__action {
-		position: relative;
-		line-height: $u-form-item-height;
-		height: $u-form-item-height;
-
-		&__icon {
-			position: absolute;
-			right: 20rpx;
-			top: 50%;
-			transition: transform .4s;
-			transform: translateY(-50%);
-			z-index: 1;
-
-			&--reverse {
-				transform: rotate(-180deg) translateY(50%);
-			}
-		}
-	}
-
-	&__hader {
-		&__title {
-			color: $u-content-color;
-		}
-	}
-
-	&--border {
-		border-radius: 6rpx;
-		border-radius: 4px;
-		border: 1px solid $u-form-item-border-color;
-	}
-
-	&__header {
-		@include vue-flex;
-		align-items: center;
-		justify-content: space-between;
-		height: 80rpx;
-		padding: 0 40rpx;
-	}
-
-	&__search {
-		@include vue-flex;
-		align-items: center;
-		margin: 0 24rpx 16rpx;
-		padding: 0 24rpx;
-		height: 80rpx;
-		background-color: #f5f5f5;
-		border-radius: 12rpx;
-		box-sizing: border-box;
-
-		&__input {
-			flex: 1;
-			height: 80rpx;
-			margin-left: 12rpx;
-			font-size: 30rpx;
-			color: #303133;
-		}
-	}
-
-	&__loading {
-		padding: 0 24rpx 8rpx;
-		font-size: 26rpx;
-		color: #909399;
-	}
-
-	&__empty {
-		@include vue-flex;
-		align-items: center;
-		justify-content: center;
-		height: 100%;
-		font-size: 30rpx;
-		color: #909399;
-	}
-
-	&__body {
-		width: 100%;
-		height: 500rpx;
-		overflow: hidden;
-		background-color: #fff;
-
-		&__picker-view {
-			height: 100%;
-			box-sizing: border-box;
-
-			&__item {
-				@include vue-flex;
-				align-items: center;
-				justify-content: center;
-				font-size: 32rpx;
-				color: $u-main-color;
-				padding: 0 8rpx;
-			}
-		}
-	}
-}
-</style>

src/components/wyb-table/wyb-table.vue

@@ -534,7 +534,7 @@
 			fontSize: {
 				type: Array,
 				default() {
-					return [28]
+					return [20]
 				}
 			},
 			defaultColWidth: {
@@ -548,7 +548,7 @@
 			minHeight: {
 				type: Array,
 				default() {
-					return [84]
+					return [70]
 				}
 			},
 			headerBgColor: {

src/manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "浩拓ERP",
+    "name" : "浩拓织厂",
     "appid" : "__UNI__F79F300",
-    "description" : "浩拓ERP",
+    "description" : "周尚-浩拓织厂",
-    "versionName" : "1.1.21",
+    "versionName" : "1.1.12",
-    "versionCode" : 121,
+    "versionCode" : 112,
     "transformPx" : false,
     "app-plus" : {
         "optimization" : {

src/mixins/listFilterMixin.js

@@ -1,119 +0,0 @@
-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

@@ -1,8 +1,5 @@
 {
 	"easycom": {
-		"^u-select$": "@/components/u-select/u-select.vue",
-		"^u-action-sheet$": "@/components/u-action-sheet/u-action-sheet.vue",
-		"^u-dropdown-item$": "@/components/u-dropdown-item/u-dropdown-item.vue",
 		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 	},
 	"pages": [
@@ -424,126 +421,14 @@
                 "enablePullDownRefresh": false
             }
             
-        },{
-            "path" : "pages/storegoods/storeGoodsProcessInList",
-            "style" :
-            {
-                "navigationBarTitleText": "加工进仓列表",
-                "enablePullDownRefresh": false
-            }
-        },{
-            "path" : "pages/storegoods/storeGoodsProcessInAdd",
-            "style" :
-            {
-                "navigationBarTitleText": "新增加工进仓单",
-                "enablePullDownRefresh": false
-            }
-        },{
-            "path" : "pages/storegoods/storeGoodsProcessInEdit",
-            "style" :
-            {
-                "navigationBarTitleText": "编辑加工进仓单",
-                "enablePullDownRefresh": false
-            }
-        },{
-            "path" : "pages/storegoods/storeGoodsProcessInView",
-            "style" :
-            {
-                "navigationBarTitleText": "查看加工进仓单",
-                "enablePullDownRefresh": false
-            }
-        },{
-            "path" : "pages/storegoods/storeGoodsPurchaseInList",
-            "style" :
-            {
-                "navigationBarTitleText": "成品采购进仓",
-                "enablePullDownRefresh": false
-            }
-        },{
-            "path" : "pages/storegoods/storeGoodsPurchaseInAdd",
-            "style" :
-            {
-                "navigationBarTitleText": "新增采购进仓单",
-                "enablePullDownRefresh": false
-            }
-        },{
-            "path" : "pages/storegoods/storeGoodsPurchaseInEdit",
-            "style" :
-            {
-                "navigationBarTitleText": "编辑采购进仓单",
-                "enablePullDownRefresh": false
-            }
-        },{
-            "path" : "pages/storegoods/storeGoodsPurchaseInView",
-            "style" :
-            {
-                "navigationBarTitleText": "采购进仓单详情",
-                "enablePullDownRefresh": false
-            }
-        },{
-            "path" : "pages/storegoods/storeGoodsProcessReturnInList",
-            "style" :
-            {
-                "navigationBarTitleText": "加工退货进仓列表",
-                "enablePullDownRefresh": false
-            }
-        },{
-            "path" : "pages/storegoods/storeGoodsProcessReturnInAdd",
-            "style" :
-            {
-                "navigationBarTitleText": "新增加工退货进仓单",
-                "enablePullDownRefresh": false
-            }
-        },{
-            "path" : "pages/storegoods/storeGoodsProcessReturnInEdit",
-            "style" :
-            {
-                "navigationBarTitleText": "编辑加工退货进仓单",
-                "enablePullDownRefresh": false
-            }
-        },{
-            "path" : "pages/storegoods/storeGoodsProcessReturnInView",
-            "style" :
-            {
-                "navigationBarTitleText": "查看加工退货进仓单",
-                "enablePullDownRefresh": false
-            }
-        },{
-            "path" : "pages/storegoods/storeGoodsProcessOutList",
-            "style" :
-            {
-                "navigationBarTitleText": "加工出仓列表",
-                "enablePullDownRefresh": false
-            }
-        },{
-            "path" : "pages/storegoods/storeGoodsProcessOutAdd",
-            "style" :
-            {
-                "navigationBarTitleText": "新增加工出仓单",
-                "enablePullDownRefresh": false
-            }
-        },{
-            "path" : "pages/storegoods/storeGoodsProcessOutEdit",
-            "style" :
-            {
-                "navigationBarTitleText": "编辑加工出仓单",
-                "enablePullDownRefresh": false
-            }
-        },{
-            "path" : "pages/storegoods/storeGoodsProcessOutView",
-            "style" :
-            {
-                "navigationBarTitleText": "查看加工出仓单",
-                "enablePullDownRefresh": false
-            }
         },{
             "path" : "pages/storegoods/storeGoodsBusinessIn",
-            "style" :
+            "style" :                                                                                    
             {
                 "navigationBarTitleText": "成品进仓",
                 "enablePullDownRefresh": false
             }
-
+            
         },{
             "path" : "pages/storegoods/storeGoodsBusinessInAdd",
             "style" :                                                                                    
@@ -684,7 +569,7 @@
                 "navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
-        },{
+		},{
             "path" : "pages/storefabric/storeFabricBusinessOutList",
             "style" :                                                                                    
             {
@@ -692,6 +577,13 @@
                 "enablePullDownRefresh": false
             }
         },{
+			"path": "pages/storefabric/storeFabricManualIn",
+			"style": {
+				"navigationBarTitleText": "手动进仓",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false
+			}
+		},{
             "path" : "pages/storefabric/storeFabricBusinessOutAdd",
             "style" :                                                                                    
             {
@@ -915,12 +807,6 @@
 		"backgroundColor": "#ffffff",
 		"borderStyle": "white",
 		"list": [
-			// {
-			// 	"pagePath": "pages/sys/home/index",
-			// 	"iconPath": "static/aidex/tabbar/home_1.png",
-			// 	"selectedIconPath": "static/aidex/tabbar/home_2.png",
-			// 	"text": "首页"
-			// },
 			{
 				"pagePath": "pages/sys/workbench/index",
 				"iconPath": "static/aidex/tabbar/apply_1.png",

src/pages/common/aidex.scss

@@ -58,11 +58,10 @@
 			}
 			
 			.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,22 +15,10 @@
       <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-else-if="usePhoneScanFallback"
+          v-if="usePhoneScanFallback"
           name="scan"
           size="44"
           color="#2979ff"
@@ -56,9 +44,6 @@
         <text class="title" style="width: 200px">成品缸号：{{ CrockNo }}</text>
         <text class="title" style="width: 200px">成品卷号：{{ GoodsBillNo }}</text>
       </u-form-item>
-      <u-form-item>
-        <text class="title" style="width: 200px">外部卷号：{{ ExternVolumeNumber }}</text>
-      </u-form-item>
       <u-form-item>
         <text class="title">{{ BillDataMessage }}</text>
       </u-form-item>
@@ -95,10 +80,8 @@ 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 {
@@ -127,7 +110,6 @@ export default {
       GoodsCodeName: "",
       CrockNo: "",
       GoodsBillNo: "",
-      ExternVolumeNumber: "",
       BillSumRoll: 0,
       BillSumQty: 0,
       BillSumMQty: 0,
@@ -229,17 +211,14 @@ export default {
 
   methods: {
     handlePhoneScan() {
-      this.togglePhoneScanPanel();
+      this.openPhoneScan();
-    },
-    onPlusBarcodeSuccess(scanResult) {
-      this.handleScanResult(scanResult, this._scanCallback);
     },
 
-    playSuccess(text) {
+    playSuccess() {
-      util.playSuccessAudio(text);
+      util.playSuccessAudio();
     },
-    playError(text) {
+    playError() {
-      util.playErrorAudio(text);
+      util.playErrorAudio();
     },
 
     handleAllCrockNoChange() {
@@ -306,7 +285,7 @@ export default {
     },
     // 添加通用错误提示方法
     showError(message) {
-      this.playError(message);
+      this.playError();
       uni.showModal({
         title: '提示',
         content: message,
@@ -315,7 +294,7 @@ export default {
     },
     // 添加成功提示方法
     showSuccess(message) {
-      this.playSuccess(message);
+      this.playSuccess();
       uni.showToast({
         title: message,
         icon: 'success'
@@ -381,13 +360,13 @@ 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;
             this.GoodsCodeName = aResultData.product_color_name;
             this.CrockNo = aResultData.dyelot_number;
             this.GoodsBillNo = aResultData.volume_number;
-            this.ExternVolumeNumber = aResultData.extern_volume_number || '';
             this.QRBarCode = "";
 
             if (aBarCodeDelStatus == 1) {
@@ -417,7 +396,7 @@ export default {
     // 提交按钮方法
     submitBtnFun: function () {
       if (this.BillMasterID == 0) {
-        this.playError("单号为空，不能提交");
+        this.playError();
         this.BillDataMessage = "单号为空，不能提交";
         return;
       }
@@ -454,15 +433,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 = "连接服务器出错，请检查后台服务是否启动！";
       });
     },
@@ -471,18 +450,6 @@ 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,12 +2,18 @@
 
 	<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>
@@ -16,9 +22,9 @@
 
 		</view>
 
-		<view @click="pickerSelectFun('染厂')" class="flex-white-plr26 ptb20 bdb_f5">
+		<view @click="pickerSelectFun('接收单位')" class="flex-white-plr26 ptb20 bdb_f5">
 
-			<text class="mr26">染厂<text class="redXingh">*</text></text>
+			<text class="mr26">接收单位<text class="redXingh">*</text></text>
 
 			<view :class="form.business_unit_name ? '' : 'cBlack'">
 
@@ -54,8 +60,6 @@
 
 		</view>
 
-		</OrderHeaderFold>
-
 
 
 		<FabricOutDetailList
@@ -68,13 +72,6 @@
 
 		>
 
-			<PlusBarcodePanel
-				slot="before-list"
-				:visible.sync="phoneScanPanelOpen"
-				hint-text="连续扫码出仓，扫完可继续下一条"
-				:scan-time-space="1200"
-				@success="onPlusBarcodeSuccess"
-			/>
 			<FabricOutScanBar
 				slot="before-list"
 				:can-scan="canScan"
@@ -83,7 +80,6 @@
 				:message="BillDataMessage"
 				disabled-tip="请先提交保存后再扫码"
 				:show-phone-scan="usePhoneScanFallback"
-				:scanning="phoneScanPanelOpen"
 				@input="QRBarCode = $event"
 				@scan="handleScan"
 				@phone-scan="handlePhoneScan"
@@ -93,7 +89,6 @@
 			<FabricOutScanDetail
 				slot="before-list"
 				:detail="scanDetail"
-				:item-data="form.item_data"
 				:group-keys="scanGroupKeys"
 				@group-change="scanGroupKeys = $event"
 			/>
@@ -126,7 +121,13 @@
 
 
 
-		<u-select v-model="selectShow" :list="selectList" :remote="isRemoteSelect" :loading="selectSearching" @search="onSelectSearch" @confirm="selectConfirmFun"></u-select>
+		<search-select-popup
+			:show.sync="selectShow"
+			title="选择接收单位"
+			placeholder="请输入染厂名称"
+			:list="selectList"
+			@confirm="selectConfirmFun"
+		/>
 
 		<FabricInfoPopup :show.sync="fabricInfoShow" :data="currentFabricInfo" />
 
@@ -148,8 +149,6 @@ 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';
@@ -158,7 +157,7 @@ import FabricOutScanDetail from '@/components/storefabric/FabricOutScanDetail.vu
 
 import FabricOutFooter from '@/components/storefabric/FabricOutFooter.vue';
 
-import PlusBarcodePanel from '@/components/common/PlusBarcodePanel.vue';
+import SearchSelectPopup from '@/components/storefabric/SearchSelectPopup.vue';
 
 
 
@@ -166,16 +165,12 @@ export default {
 
 	components: {
 
-		PlusBarcodePanel,
-
 		FabricInfoPopup,
 
 		FineCodePopup,
 
 		OrderStatusBar,
 
-		OrderHeaderFold,
-
 		FabricOutDetailList,
 
 		FabricOutScanBar,
@@ -184,6 +179,8 @@ export default {
 
 		FabricOutFooter,
 
+		SearchSelectPopup,
+
 	},
 
 	mixins: [formMixin],

src/pages/storefabric/storeFabricBusinessOutEdit.vue

@@ -1,13 +1,17 @@
 <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>
 		</view>
 		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">染厂</text>
+			<text class="mr26">接收单位</text>
 			<text>{{ form.business_unit_name || '-' }}</text>
 		</view>
 		<view class="flex-white-plr26 ptb20 bdb_f5">
@@ -18,20 +22,12 @@
 			<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"
@@ -39,7 +35,6 @@
 				:delete-mode="BarCodeDelStatus"
 				:message="BillDataMessage"
 				:show-phone-scan="usePhoneScanFallback"
-				:scanning="phoneScanPanelOpen"
 				@input="QRBarCode = $event"
 				@scan="handleScan"
 				@phone-scan="handlePhoneScan"
@@ -48,7 +43,6 @@
 			<FabricOutScanDetail
 				slot="before-list"
 				:detail="scanDetail"
-				:item-data="form.item_data"
 				:group-keys="scanGroupKeys"
 				@group-change="scanGroupKeys = $event"
 			/>
@@ -56,7 +50,13 @@
 
 		<FabricOutFooter :buttons="statusActionButtons" @action="handleStatusAction" />
 
-		<u-select v-model="selectShow" :list="selectList" :remote="isRemoteSelect" :loading="selectSearching" @search="onSelectSearch" @confirm="selectConfirmFun"></u-select>
+		<search-select-popup
+			:show.sync="selectShow"
+			title="选择接收单位"
+			placeholder="请输入染厂名称"
+			:list="selectList"
+			@confirm="selectConfirmFun"
+		/>
 		<FabricInfoPopup :show.sync="fabricInfoShow" :data="currentFabricInfo" />
 		<FineCodePopup :show.sync="fineCodeShow" :list="currentFineCodes" :readonly="false" @delete="onDeleteFineCode" />
 	</view>
@@ -67,31 +67,24 @@ 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';
+import SearchSelectPopup from '@/components/storefabric/SearchSelectPopup.vue';
 
 export default {
 	components: {
-		PlusBarcodePanel,
 		FabricInfoPopup,
 		FineCodePopup,
 		OrderStatusBar,
-		OrderHeaderFold,
 		FabricOutDetailList,
 		FabricOutScanBar,
 		FabricOutScanDetail,
 		FabricOutFooter,
+		SearchSelectPopup,
 	},
 	mixins: [formMixin],
-	data() {
-		return {
-			headerCollapsed: true,
-		};
-	},
 	onLoad(e) {
 		uni.setNavigationBarTitle({ title: '编辑坯布出仓单' });
 		this.pageMode = 'edit';

src/pages/storefabric/storeFabricBusinessOutList.vue

@@ -9,18 +9,9 @@
 				@custom="applySearch"
 				@clear="applySearch"
 			/>
-			<view
+			<view class="filterBtn" :class="{ 'filterBtn--active': hasActiveFilter }" @click="filterShow = true">
-				class="filterBtn"
-				:class="{ 'filter-active': hasActiveFilter }"
-				@click="filterShow = true"
-			>
 				<view class="filterBtn__icon">
-					<u-icon
+					<u-icon name="list" size="44" :color="hasActiveFilter ? '#2979ff' : '#666'"></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>
@@ -70,12 +61,12 @@
 						</picker>
 					</view>
 				</view>
-<!--				<view class="filterItem" @click="openDeliveryUnitSelect">-->
+				<view class="filterItem" @click="openDeliveryUnitSelect">
-<!--					<text class="filterLabel">出仓单位</text>-->
+					<text class="filterLabel">出仓单位</text>
-<!--					<view class="filterValue">{{ deliveryUnitLabel || '全部' }} <u-icon name="arrow-right" size="28"></u-icon></view>-->
+					<view class="filterValue">{{ deliveryUnitLabel || '全部' }} <u-icon name="arrow-right" size="36"></u-icon></view>
-<!--				</view>-->
+				</view>
 				<view class="filterItem" @click="openBusinessUnitSelect">
-					<text class="filterLabel">染厂</text>
+					<text class="filterLabel">接收单位</text>
 					<view class="filterValue">{{ businessUnitLabel || '全部' }} <u-icon name="arrow-right" size="36"></u-icon></view>
 				</view>
 				<view class="filterItem" @click="openStatusSelect">
@@ -100,41 +91,37 @@
 		<u-select
 			class="pdaSelect"
 			v-model="unitSelectShow"
-			title="选择染厂"
+			title="选择出仓单位"
 			:list="unitSelectList"
 			:default-value="unitSelectDefault"
-			remote
-			:loading="selectSearching"
-			@search="onUnitSearch"
 			@confirm="onUnitConfirm"
 		></u-select>
+		<search-select-popup
+			:show.sync="businessUnitSelectShow"
+			title="选择接收单位"
+			placeholder="请输入染厂名称"
+			:list="businessUnitSelectList"
+			@confirm="onBusinessUnitConfirm"
+		/>
 	</view>
 </template>
 
 <script>
 import addBtn from '@/components/addBtn/addBtn.vue';
 import FabricOutItem from '@/components/card/storeFabricBusinessOutItem.vue';
+import SearchSelectPopup from '@/components/storefabric/SearchSelectPopup.vue';
 import {
 	getStatusOptions,
 	AUDIT_STATUS,
 	AUDIT_STATUS_MAP,
 	BILL_TYPES,
-	BUSINESS_UNIT_TYPE_DYE_FACTORY,
+	BUSINESS_UNIT_TYPE_DYEING_FACTORY,
 	formatRoll,
 	mapToSelectOptions,
 	fetchAllOrderList,
 } from '@/common/storeFabricBusinessOut';
-import { withNameParam } from '@/common/remoteSelect';
 
-const FILTER_STORAGE_KEY = 'storeFabricBusinessOutListFilters_v2';
+const FILTER_STORAGE_KEY = 'storeFabricBusinessOutListFilters';
-
-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: '',
@@ -152,21 +139,17 @@ const normalizeFilters = (value) => {
 	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 },
+	components: { addBtn, FabricOutItem, SearchSelectPopup },
 	data() {
 		return {
 			list: [],
@@ -175,13 +158,11 @@ export default {
 			filterShow: false,
 			statusSelectShow: false,
 			unitSelectShow: false,
+			businessUnitSelectShow: false,
 			unitSelectType: '',
 			deliveryUnitOptions: [],
 			businessUnitOptions: [],
 			unitOptionsLoading: false,
-			selectSearching: false,
-			unitSearchSeq: 0,
-			unitSelectList: [{ value: '', label: '全部' }],
 			billTypeName: (BILL_TYPES[0] || {}).label || '坯布其他出货单',
 			filters: createDefaultFilters(),
 			appliedFilters: createDefaultFilters(),
@@ -202,6 +183,12 @@ export default {
 		businessUnitLabel() {
 			return this.filters.business_unit_name || '';
 		},
+		unitSelectList() {
+			return [{ value: '', label: '全部' }, ...this.deliveryUnitOptions];
+		},
+		businessUnitSelectList() {
+			return [{ value: '', label: '全部' }, ...this.businessUnitOptions];
+		},
 		statusSelectDefault() {
 			const index = this.statusSelectList.findIndex(
 				(item) => String(item.value) === String(this.filters.audit_status)
@@ -209,23 +196,20 @@ export default {
 			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)
+				(item) => String(item.value) === String(this.filters.delivery_unit_id)
 			);
 			return [index >= 0 ? index : 0];
 		},
 		hasActiveFilter() {
-			const filters = this.appliedFilters || {};
+			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)
+				|| (filters.audit_status !== '' && filters.audit_status !== null)
 			);
 		},
 	},
@@ -244,21 +228,12 @@ export default {
 	methods: {
 		restoreFilterCache() {
 			try {
-				const cached = uni.getStorageSync(FILTER_STORAGE_KEY);
+				const filters = normalizeFilters(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 = createDefaultFilters();
-				this.filters = { ...filters };
+				this.appliedFilters = createDefaultFilters();
-				this.appliedFilters = { ...filters };
 			}
 		},
 		saveFilterCache() {
@@ -295,7 +270,7 @@ export default {
 		},
 		loadBusinessUnitOptions() {
 			if (this.businessUnitOptions.length) return Promise.resolve(this.businessUnitOptions);
-			return this.$u.api.businessUnit.list({ unit_type_id: BUSINESS_UNIT_TYPE_DYE_FACTORY })
+			return this.$u.api.businessUnit.list({ unit_type_id: BUSINESS_UNIT_TYPE_DYEING_FACTORY })
 				.then((res) => {
 					this.businessUnitOptions = mapToSelectOptions(res);
 					return this.businessUnitOptions;
@@ -305,62 +280,44 @@ export default {
 					return this.businessUnitOptions;
 				});
 		},
-		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) {
-			this.unitSelectType = type;
+			if (this.unitOptionsLoading) return;
-			const cache = type === 'delivery' ? this.deliveryUnitOptions : this.businessUnitOptions;
+			this.unitOptionsLoading = true;
-			this.applyUnitSelectList(cache);
+			const loadFn = type === 'delivery' ? this.loadDeliveryUnitOptions : this.loadBusinessUnitOptions;
-			this.unitSelectShow = true;
+			loadFn.call(this)
-		},
+				.then((list) => {
-		onUnitSearch(keyword) {
+					if (!list.length) {
-			const seq = ++this.unitSearchSeq;
+						uni.showToast({ title: '暂无可选单位', icon: 'none' });
-			const isDelivery = this.unitSelectType === 'delivery';
+						return;
-			const empty = !String(keyword || '').trim();
-			this.selectSearching = true;
-			const params = isDelivery ? {} : { unit_type_id: BUSINESS_UNIT_TYPE_DYE_FACTORY };
-			this.$u.api.businessUnit.list(withNameParam(params, keyword))
-				.then((res) => {
-					if (seq !== this.unitSearchSeq) return;
-					const list = mapToSelectOptions(res);
-					if (empty) {
-						if (isDelivery) this.deliveryUnitOptions = list;
-						else this.businessUnitOptions = list;
 					}
-					this.applyUnitSelectList(list, empty);
+					this.unitSelectType = type;
+					this.unitSelectShow = true;
 				})
-				.catch((e) => {
+				.finally(() => {
-					if (seq !== this.unitSearchSeq) return;
+					this.unitOptionsLoading = false;
-					uni.showToast({ title: (e && e.message) || '搜索失败', icon: 'none' });
-				})
-				.then(() => {
-					if (seq === this.unitSearchSeq) this.selectSearching = false;
-				}, () => {
-					if (seq === this.unitSearchSeq) this.selectSearching = false;
 				});
 		},
 		openDeliveryUnitSelect() {
 			this.openUnitSelect('delivery');
 		},
 		openBusinessUnitSelect() {
-			this.openUnitSelect('business');
+			if (this.unitOptionsLoading) return;
+			this.unitOptionsLoading = true;
+			this.loadBusinessUnitOptions()
+				.then((list) => {
+					if (!list.length) {
+						uni.showToast({ title: '暂无可选单位', icon: 'none' });
+						return;
+					}
+					this.businessUnitSelectShow = true;
+				})
+				.finally(() => {
+					this.unitOptionsLoading = false;
+				});
+		},
+		onBusinessUnitConfirm(item) {
+			this.filters.business_unit_id = item.value;
+			this.filters.business_unit_name = item.value ? item.label : '';
 		},
 		onUnitConfirm(e) {
 			const item = e[0] || {};
@@ -376,7 +333,7 @@ export default {
 			const filters = this.appliedFilters;
 			const params = {};
 			if (filters.order_no) params.order_no = filters.order_no;
-			if (hasFilterValue(filters.audit_status)) {
+			if (filters.audit_status !== '' && filters.audit_status !== null) {
 				params.audit_status = filters.audit_status;
 			}
 			fetchAllOrderList((p) => this.$u.api.gfmOtherDeliveryOrder.list(p), params)
@@ -427,12 +384,13 @@ export default {
 			this.loadList();
 		},
 		goView(item) {
-			uni.navigateTo({ url: `./storeFabricBusinessOutView?id=${item.id}` });
+			const page = Number(item.audit_status) === AUDIT_STATUS.PENDING
+				? 'storeFabricBusinessOutEdit'
+				: 'storeFabricBusinessOutView';
+			uni.navigateTo({ url: `./${page}?id=${item.id}` });
 		},
 		openStatusSelect() { this.statusSelectShow = true; },
-		onStatusConfirm(e) {
+		onStatusConfirm(e) { this.filters.audit_status = e[0].value; },
-			this.filters.audit_status = normalizeAuditStatus((e[0] || {}).value);
-		},
 		resetFilter() {
 			this.filters = createDefaultFilters();
 		},
@@ -445,5 +403,146 @@ export default {
 </script>
 
 <style lang="scss">
-@import '@/common/list-filter.scss';
+@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: 6rpx 8rpx;
+	border: 2rpx solid transparent;
+	border-radius: 10rpx;
+	box-sizing: border-box;
+	font-size: $pda-font-nav-sub;
+	line-height: 1.2;
+	color: #666;
+	transition: color 0.2s, background-color 0.2s, border-color 0.2s;
+}
+.filterBtn--active {
+	color: #2979ff;
+	background: #eef5ff;
+	border-color: #9fc5ff;
+}
+.filterBtn__icon {
+	position: relative;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+.filterBtn__badge {
+	position: absolute;
+	top: -3rpx;
+	right: -7rpx;
+	width: 13rpx;
+	height: 13rpx;
+	border: 3rpx 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;
+}
 </style>

src/pages/storefabric/storeFabricBusinessOutMixin.js

@@ -3,21 +3,17 @@
  *
  * 业务说明：
  * 1. 后端当前仅提供「坯布其他出货单」一种类型的接口，故出仓类型固定为 other，
- *    表头保留染厂(business_unit) / 出货日期 / 备注 等字段。
+ *    表头保留接收单位(business_unit) / 出货日期 / 备注 等字段。
  * 2. 用户先填写表头并「提交保存」(addGfmOtherDeliveryOrder)，拿到出仓单 id 后即可扫码；
  *    扫码新增/删除细码走 updateGfmOtherDeliveryOrder；勾选锁定维度时附带 *_lock 字段，操作后用返回的最新详情刷新。
  * 3. 后端没有「修改表头」接口，保存成功或编辑进入后表头变为只读，仅可扫码维护细码。
  */
 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';
 import {
 	AUDIT_STATUS_MAP,
 	BILL_TYPES,
-	BUSINESS_UNIT_TYPE_DYE_FACTORY,
+	BUSINESS_UNIT_TYPE_DYEING_FACTORY,
 	normalizeOrder,
 	mapToSelectOptions,
 	getFineCodeScanCode,
@@ -26,6 +22,7 @@ import {
 	getFormStatusActionButtons,
 	orderToFormFields,
 	confirmOrderStatusAction,
+	STATUS_ACTION_VOICE,
 	DRAFT_AUDIT_STATUS,
 	DRAFT_AUDIT_STATUS_NAME,
 	getEmptyScanDetail,
@@ -35,19 +32,16 @@ import {
 	buildScanUpdateParams,
 	getOrderDisplayWeight,
 	getFineCodeDisplayWeight,
-	resolveScanMismatchVoice,
 } from '@/common/storeFabricBusinessOut';
 
 export default {
-	components: { PlusBarcodePanel },
+	mixins: [scanMixin],
-	mixins: [scanMixin, remoteSelectMixin],
 	data() {
 		return {
 			pageMode: 'add',
 			orderId: 0,
 			form: this.getEmptyForm(),
 			headerSaved: false,
-			headerCollapsed: false,
 			selectShow: false,
 			selectList: [],
 			selectType: '',
@@ -99,7 +93,6 @@ export default {
 	},
 	onShow() {
 		this.isPageActive = true;
-		initTts();
 		if (this.canScan && this.isEditable) {
 			this.registerScanBroadcast((scanResult) => {
 				this.QRBarCode = scanResult.trim().replace(/[\r\n]/g, '');
@@ -117,15 +110,7 @@ export default {
 	},
 	methods: {
 		handlePhoneScan() {
-			if (!this.canScan) {
+			this.openPhoneScan();
-				this.showError('请先提交保存后再扫码');
-				return;
-			}
-			this.togglePhoneScanPanel();
-		},
-		onPlusBarcodeSuccess(scanResult) {
-			this.QRBarCode = String(scanResult || '').trim().replace(/[\r\n]/g, '');
-			return this.handleScan();
 		},
 		registerOrderScanBroadcast() {
 			this.registerScanBroadcast((scanResult) => {
@@ -137,7 +122,6 @@ export default {
 			const nextCanScan = this.isEditable && canScanAtStatus(status);
 			if (this.canScan && !nextCanScan) {
 				this.unregisterScanBroadcast();
-				this.closePhoneScanPanel();
 			}
 			this.canScan = nextCanScan;
 		},
@@ -153,21 +137,12 @@ export default {
 		},
 		ensureBusinessUnitOptions() {
 			if (this.businessUnitOptions.length) return Promise.resolve(this.businessUnitOptions);
-			return this.$u.api.businessUnit.list({ unit_type_id: BUSINESS_UNIT_TYPE_DYE_FACTORY })
+			return this.$u.api.businessUnit.list({ unit_type_id: BUSINESS_UNIT_TYPE_DYEING_FACTORY })
 				.then((res) => {
 					this.businessUnitOptions = mapToSelectOptions(res);
 					return this.businessUnitOptions;
 				});
 		},
-		fetchRemoteSelectOptions(type, keyword) {
-			if (type !== '染厂') return Promise.resolve([]);
-			return this.$u.api.businessUnit.list(withNameParam({ unit_type_id: BUSINESS_UNIT_TYPE_DYE_FACTORY }, keyword))
-				.then((res) => {
-					const list = mapToSelectOptions(res);
-					if (!String(keyword || '').trim()) this.businessUnitOptions = list;
-					return list;
-				});
-		},
 		getEmptyForm() {
 			return {
 				order_no: '',
@@ -195,7 +170,6 @@ 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);
@@ -209,23 +183,31 @@ export default {
 		},
 		pickerSelectFun(type) {
 			if (!this.headerEditable) return;
-			if (type === '染厂') {
+			this.selectType = type;
-				this.openSelectPicker(type, this.businessUnitOptions);
+			const openPicker = (list) => {
-				return;
+				if (!list.length) {
+					this.showError('暂无可选数据');
+					return;
+				}
+				this.selectList = list;
+				this.selectShow = true;
+			};
+			if (type === '接收单位') {
+				this.ensureBusinessUnitOptions()
+					.then(openPicker)
+					.catch((e) => this.showError(e.message || '加载单位列表失败'));
 			}
 		},
-		selectConfirmFun(e) {
+		selectConfirmFun(item) {
-			const item = e[0];
+			if (!item || this.selectType !== '接收单位') return;
-			if (this.selectType === '染厂') {
+			this.form.business_unit_id = item.value;
-				this.form.business_unit_id = item.value;
+			this.form.business_unit_name = item.label;
-				this.form.business_unit_name = item.label;
-			}
 		},
 		bindDateChange(e) {
 			this.form.delivery_time = e.detail.value;
 		},
 		validateForm() {
-			if (!this.form.business_unit_id) return '请选择染厂';
+			if (!this.form.business_unit_id) return '请选择接收单位';
 			if (!this.form.delivery_time) return '请选择出货日期';
 			return '';
 		},
@@ -260,9 +242,8 @@ export default {
 					const order = normalizeOrder(detail);
 					this.applyOrder(order);
 					this.headerSaved = true;
-					this.headerCollapsed = true;
 					this.syncCanScanFromStatus(order.audit_status);
-					this.showSuccess('保存成功，可以扫码', '保存成功', { voiceOnly: true });
+					this.showSuccess('保存成功，可以扫码', '提交成功');
 					this.registerOrderScanBroadcast();
 				})
 				.catch((e) => {
@@ -350,21 +331,14 @@ export default {
 						const row = order.item_data.find((i) => (i.group_key || String(i.id)) === this.currentGroupKey);
 						this.currentFineCodes = row ? [...row.fine_codes] : [];
 					}
-					this.BillDataMessage = scanType === 2 ? '删除成功' : '扫描成功';
+					this.BillDataMessage = scanType === 2 ? '删除成功' : '扫码出仓成功';
 					this.QRBarCode = '';
-					if (scanType === 2) {
+					if (scanType === 2) this.showSuccess('删除成功', '删除成功');
-						speak('已删除出仓');
+					else util.playSpeak('扫码出仓成功');
-						uni.showToast({ title: '删除成功', icon: 'success' });
-					} else {
-						speak('成功');
-					}
 				})
 				.catch((e) => {
 					uni.hideLoading();
-					const message = e.message || (scanType === 2 ? '删除失败' : '扫码失败');
+					this.showError(e.message || (scanType === 2 ? '删除失败' : '扫码失败'));
-					const mismatchVoice = resolveScanMismatchVoice(message);
-					speak(mismatchVoice || (scanType === 2 ? '删除失败' : '扫码失败'));
-					uni.showToast({ title: message, icon: 'none', duration: 2500 });
 					this.QRBarCode = '';
 				});
 		},
@@ -404,16 +378,18 @@ export default {
 						if (!order) return;
 						this.applyOrder(order);
 						this.syncCanScanFromStatus(order.audit_status);
-						this.showSuccess(util.statusSuccessVoice(action));
+						const voice = STATUS_ACTION_VOICE[action] || '';
+						this.showSuccess(voice || '操作成功', voice);
 					}),
 			});
 		},
-		showError(message, options = {}) {
+		showError(message) {
-			if (!options.skipErrorAudio) util.playErrorAudio(message);
+			util.playErrorAudio();
 			uni.showModal({ title: '提示', content: message, showCancel: false });
 		},
-		showSuccess(message, voiceText, options) {
+		showSuccess(message, speakText) {
-			util.playSuccessAudio(voiceText || message, options);
+			if (speakText) util.playSpeak(speakText);
+			else util.playSuccessAudio();
 			uni.showToast({ title: message, icon: 'success' });
 		},
 		getBillTypeName() {

src/pages/storefabric/storeFabricBusinessOutPage.scss

@@ -6,8 +6,25 @@
 .fabric-out-mt32 {
 	margin-top: 32rpx;
 }
+.fabric-out-page .flex-white-plr26,
+.fabric-out-page .flex-white-plr26-column,
+.fabric-out-page .flex-white-plr26 text,
+.fabric-out-page .flex-white-plr26 view,
+.fabric-out-page .u-input__input,
+.fabric-out-page .uni-input-input,
+.fabric-out-page .uni-textarea-textarea {
+	font-size: 40rpx;
+}
+.fabric-out-page .redXingh {
+	font-size: 40rpx;
+}
+.fabric-out-page .u-btn {
+	font-size: 36rpx !important;
+	height: 88rpx;
+	line-height: 88rpx;
+}
 .fabric-out-sectionTitle {
-	font-size: 32rpx;
+	font-size: 42rpx;
 	font-weight: bold;
 	padding: 24rpx 26rpx 12rpx;
 	border-left: 6rpx solid #007AFF;
@@ -16,7 +33,7 @@
 .fabric-out-scanTip {
 	padding: 20rpx 26rpx;
 	color: #fa8c16;
-	font-size: 28rpx;
+	font-size: 36rpx;
 	background: #fff7e6;
 	margin: 16rpx 26rpx;
 	border-radius: 8rpx;
@@ -24,7 +41,7 @@
 .fabric-out-msgTip {
 	padding: 12rpx 26rpx;
 	color: #52c41a;
-	font-size: 28rpx;
+	font-size: 36rpx;
 }
 .fabric-out-detailList {
 	padding: 0 26rpx;
@@ -39,7 +56,7 @@
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
-	font-size: 30rpx;
+	font-size: 38rpx;
 	font-weight: bold;
 	padding-bottom: 12rpx;
 	border-bottom: 1rpx solid #f0f0f0;
@@ -49,7 +66,7 @@
 	align-items: center;
 	gap: 20rpx;
 	padding-top: 12rpx;
-	font-size: 28rpx;
+	font-size: 36rpx;
 	color: #666;
 }
 .fabric-out-scanRow {
@@ -66,7 +83,7 @@
 .fabric-out-delCheck {
 	display: flex;
 	align-items: center;
-	font-size: 28rpx;
+	font-size: 36rpx;
 	color: #666;
 	white-space: nowrap;
 }
@@ -82,7 +99,7 @@
 	flex-wrap: wrap;
 	padding: 16rpx 20rpx;
 	border-bottom: 1rpx solid #f0f0f0;
-	font-size: 28rpx;
+	font-size: 36rpx;
 	color: #333;
 }
 .fabric-out-scanDetailRow--2col {
@@ -108,34 +125,6 @@
 	color: #333;
 	word-break: break-all;
 }
-.fabric-out-scanDetailTableScroll {
-	width: 100%;
-}
-.fabric-out-scanDetailTable {
-	min-width: 100%;
-}
-.fabric-out-scanDetailTableRow {
-	display: flex;
-	border-bottom: 1rpx solid #f0f0f0;
-}
-.fabric-out-scanDetailTableHead {
-	background: #f5f5f5;
-	font-weight: bold;
-}
-.fabric-out-scanDetailTableCell {
-	padding: 16rpx 10rpx;
-	font-size: 28rpx;
-	color: #333;
-	text-align: center;
-	box-sizing: border-box;
-	word-break: break-all;
-}
-.fabric-out-scanDetailEmpty {
-	padding: 24rpx;
-	text-align: center;
-	font-size: 28rpx;
-	color: #999;
-}
 .fabric-out-submitView {
 	width: 100%;
 	padding: 16rpx 26rpx 26rpx;

src/pages/storefabric/storeFabricBusinessOutView.vue

@@ -1,13 +1,17 @@
 <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>
 		</view>
 		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">染厂</text><text>{{ order.business_unit_name }}</text>
+			<text class="mr26">接收单位</text><text>{{ order.business_unit_name }}</text>
 		</view>
 		<view class="flex-white-plr26 ptb20 bdb_f5">
 			<text class="mr26">出货日期</text><text>{{ formatTime(order.delivery_time) }}</text>
@@ -21,7 +25,6 @@
 		<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"
@@ -42,7 +45,6 @@ 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 {
@@ -51,13 +53,13 @@ import {
 	getViewStatusActionButtons,
 	confirmOrderStatusAction,
 	formatDisplayTime,
+	STATUS_ACTION_VOICE,
 } from '@/common/storeFabricBusinessOut';
 
 export default {
-	components: { FabricInfoPopup, FineCodePopup, OrderStatusBar, OrderHeaderFold, FabricOutDetailList, FabricOutFooter },
+	components: { FabricInfoPopup, FineCodePopup, OrderStatusBar, FabricOutDetailList, FabricOutFooter },
 	data() {
 		return {
-			headerCollapsed: true,
 			orderId: 0,
 			order: {},
 			billTypeName: (BILL_TYPES[0] || {}).label || '坯布其他出货单',
@@ -117,25 +119,20 @@ export default {
 			confirmOrderStatusAction(this, {
 				orderId: this.orderId,
 				action,
-				onSuccess: () => {
+				onSuccess: () => this.$u.api.gfmOtherDeliveryOrder.detail({ id: this.orderId })
-					uni.hideLoading();
+					.then((res) => {
-					const voice = util.statusSuccessVoice(action);
+						uni.hideLoading();
-					util.playSuccessAudio(voice);
+						const order = normalizeOrder(res);
-					uni.showToast({ title: voice, icon: 'success' });
+						if (order) this.order = order;
-					if (action === 'unapprove') {
+						const voice = STATUS_ACTION_VOICE[action] || '';
-						uni.redirectTo({ url: `./storeFabricBusinessOutEdit?id=${this.orderId}` });
+						if (voice) util.playSpeak(voice);
-						return;
+						else util.playSuccessAudio();
-					}
+						uni.showToast({ title: voice || '操作成功', icon: 'success' });
-					return this.$u.api.gfmOtherDeliveryOrder.detail({ id: this.orderId })
+					}),
-						.then((res) => {
-							const order = normalizeOrder(res);
-							if (order) this.order = order;
-						});
-				},
 			});
 		},
 		showError(message) {
-			util.playErrorAudio(message);
+			util.playErrorAudio();
 			uni.showModal({ title: '提示', content: message, showCancel: false });
 		},
 	},

src/pages/storefabric/storeFabricManualIn.vue

@@ -0,0 +1,561 @@
+<template>
+	<view class="manual-in">
+		<common-navbar title="手动进仓">
+			<template #right>
+				<view class="manual-in__setting" @click="navToSetting">
+					<u-icon name="setting" color="#333333" size="34"></u-icon>
+					<text>设置</text>
+				</view>
+			</template>
+		</common-navbar>
+
+		<view class="manual-in__scan">
+			<input
+				class="manual-in__scan-input"
+				type="text"
+				confirm-type="done"
+				:focus="scanFocus"
+				v-model="scanCode"
+				placeholder="请点击扫描/输入布票编码"
+				placeholder-class="manual-in__placeholder"
+				@confirm="onScanConfirm"
+			/>
+		</view>
+
+		<view class="manual-in__panel">
+			<view class="manual-in__row">
+				<text class="manual-in__label">布票编码</text>
+				<text class="manual-in__value">{{ detail.fabric_piece_code || '-' }}</text>
+			</view>
+			<view class="manual-in__row">
+				<text class="manual-in__label">生产单号</text>
+				<text class="manual-in__value">{{ detail.production_order_no || '-' }}</text>
+			</view>
+			<view class="manual-in__row">
+				<text class="manual-in__label">机台</text>
+				<text class="manual-in__value">{{ detail.machine_number || '-' }}</text>
+			</view>
+			<view class="manual-in__row">
+				<text class="manual-in__label">布种名称</text>
+				<text class="manual-in__value">{{ detail.grey_fabric_name || '-' }}</text>
+			</view>
+			<view class="manual-in__row">
+				<text class="manual-in__label">坯布编号</text>
+				<text class="manual-in__value">{{ detail.grey_fabric_code || '-' }}</text>
+			</view>
+			<view class="manual-in__row manual-in__row--input">
+				<text class="manual-in__label">重量</text>
+				<view class="manual-in__right">
+					<input
+						class="manual-in__field"
+						type="digit"
+						v-model="weightKg"
+						placeholder="请输入"
+						placeholder-class="manual-in__placeholder"
+					/>
+					<text class="manual-in__unit">KG</text>
+					<text class="manual-in__action" @click="clearWeight">取消</text>
+				</view>
+			</view>
+			<view class="manual-in__row manual-in__row--input" @click="openLevelPicker">
+				<text class="manual-in__label">等级</text>
+				<view class="manual-in__right">
+					<text :class="levelDisplayName ? 'manual-in__field-text' : 'manual-in__placeholder'">
+						{{ levelDisplayName || '请选择等级' }}
+					</text>
+					<text class="manual-in__action" @click.stop="clearLevel">取消</text>
+				</view>
+			</view>
+			<view class="manual-in__row manual-in__row--input" @click="openInspectorPicker">
+				<text class="manual-in__label">查布工</text>
+				<view class="manual-in__right">
+					<text :class="detail.inspector_name ? 'manual-in__field-text' : 'manual-in__placeholder'">
+						{{ detail.inspector_name || '请选择查布工' }}
+					</text>
+					<text class="manual-in__action" @click.stop="clearInspector">取消</text>
+				</view>
+			</view>
+			<view class="manual-in__row manual-in__row--input">
+				<text class="manual-in__label">存放仓位</text>
+				<view class="manual-in__right">
+					<input
+						class="manual-in__field"
+						type="text"
+						v-model="warehouseBinName"
+						placeholder="/"
+						placeholder-class="manual-in__placeholder"
+					/>
+					<text class="manual-in__action" @click="editWarehouseBin">修改</text>
+				</view>
+			</view>
+			<view class="manual-in__row" v-if="detail.volume_number != null && detail.volume_number !== ''">
+				<text class="manual-in__label">卷号</text>
+				<text class="manual-in__value">{{ detail.volume_number }}</text>
+			</view>
+		</view>
+
+		<view class="manual-in__footer">
+			<u-button
+				type="primary"
+				shape="circle"
+				:loading="submitting"
+				:disabled="submitting || loadingDetail"
+				@click="submitInWarehouse"
+			>确定进仓</u-button>
+		</view>
+
+		<SearchSelectPopup
+			:show.sync="levelPickerShow"
+			title="选择等级"
+			placeholder="请输入等级名称"
+			:list="levelOptions"
+			@confirm="onLevelConfirm"
+		/>
+		<SearchSelectPopup
+			:show.sync="inspectorPickerShow"
+			title="选择查布工"
+			placeholder="请输入查布工姓名"
+			:list="inspectorOptions"
+			@confirm="onInspectorConfirm"
+		/>
+	</view>
+</template>
+
+<script>
+import CommonNavbar from '@/components/common-navbar/index';
+import SearchSelectPopup from '@/components/storefabric/SearchSelectPopup.vue';
+import scanMixin from '@/common/scanMixin.js';
+import util from '@/common/util.js';
+import { formatWeightKg } from '@/common/storeFabricBusinessOut.js';
+
+// 坯布等级字典 id（与后台字典配置一致）
+const DICTIONARY_TYPE_GREY_FABRIC_LEVEL = 10025;
+// 查布工岗位 duty（验布/查布相关）
+const INSPECTOR_DUTY = '20004,20011';
+const WEIGHT_SCALE = 10000;
+
+function emptyDetail() {
+	return {
+		fabric_piece_code: '',
+		production_order_no: '',
+		machine_number: '',
+		grey_fabric_name: '',
+		grey_fabric_code: '',
+		inspection_weight: null,
+		grey_fabric_level_id: [],
+		grey_fabric_level_name: '',
+		inspector_id: null,
+		inspector_name: '',
+		volume_number: '',
+		grey_fabric_id: '',
+		id: '',
+	};
+}
+
+function toWeightInt(kg) {
+	const raw = String(kg == null ? '' : kg).trim();
+	if (!raw) return null;
+	const n = Number(raw);
+	if (!Number.isFinite(n) || n <= 0) return null;
+	return Math.round(n * WEIGHT_SCALE);
+}
+
+function formatDisplayWeightKg(value) {
+	if (value == null || value === '') return '';
+	const n = Number(value);
+	if (!Number.isFinite(n) || n <= 0) return '';
+	return String(formatWeightKg(n));
+}
+
+function normalizeLevelIds(value) {
+	if (Array.isArray(value)) {
+		return value.map((item) => Number(item)).filter((item) => Number.isFinite(item));
+	}
+	if (value == null || value === '') return [];
+	const n = Number(value);
+	return Number.isFinite(n) ? [n] : [];
+}
+
+export default {
+	components: { CommonNavbar, SearchSelectPopup },
+	mixins: [scanMixin],
+	data() {
+		return {
+			scanCode: '',
+			scanFocus: true,
+			submitting: false,
+			loadingDetail: false,
+			warehouseBinId: null,
+			warehouseBinName: '',
+			weightKg: '',
+			detail: emptyDetail(),
+			levelPickerShow: false,
+			levelOptions: [],
+			levelOptionsLoaded: false,
+			inspectorPickerShow: false,
+			inspectorOptions: [],
+			inspectorOptionsLoaded: false,
+		};
+	},
+	computed: {
+		levelDisplayName() {
+			return this.detail.grey_fabric_level_name || '';
+		},
+	},
+	onLoad() {
+		this.registerScanBroadcast(this.handleScanCode);
+		this.loadLevelOptions();
+		this.loadInspectorOptions();
+	},
+	onShow() {
+		this.scanFocus = false;
+		this.$nextTick(() => {
+			this.scanFocus = true;
+		});
+	},
+	methods: {
+		navToSetting() {
+			uni.navigateTo({ url: '/pages/sys/user/scan-settings' });
+		},
+		clearWeight() {
+			this.weightKg = '';
+			this.detail.inspection_weight = null;
+		},
+		clearLevel() {
+			this.detail.grey_fabric_level_id = [];
+			this.detail.grey_fabric_level_name = '';
+		},
+		clearInspector() {
+			this.detail.inspector_id = null;
+			this.detail.inspector_name = '';
+		},
+		editWarehouseBin() {
+			uni.showModal({
+				title: '存放仓位',
+				editable: true,
+				placeholderText: '请输入仓位名称',
+				content: this.warehouseBinName || '',
+				success: (res) => {
+					if (!res.confirm) return;
+					this.warehouseBinName = (res.content || '').trim();
+					this.warehouseBinId = null;
+				},
+			});
+		},
+		async loadLevelOptions() {
+			try {
+				const res = await this.$u.api.dictionary.getDetailEnumList({
+					dictionary_id: DICTIONARY_TYPE_GREY_FABRIC_LEVEL,
+					status: 1,
+					size: 200,
+				});
+				const list = Array.isArray(res) ? res : (Array.isArray(res && res.list) ? res.list : []);
+				this.levelOptions = list
+					.map((item) => ({
+						value: item.id,
+						label: item.name || item.code || String(item.id),
+					}))
+					.filter((item) => item.value != null);
+				this.levelOptionsLoaded = true;
+			} catch (error) {
+				console.log('加载坯布等级枚举失败', error);
+				this.levelOptions = [];
+			}
+		},
+		async openLevelPicker() {
+			if (!this.levelOptionsLoaded || !this.levelOptions.length) {
+				await this.loadLevelOptions();
+			}
+			if (!this.levelOptions.length) {
+				this.$u.toast('暂无等级可选，请检查等级字典配置');
+				return;
+			}
+			this.levelPickerShow = true;
+		},
+		onLevelConfirm(item) {
+			if (!item) return;
+			this.detail.grey_fabric_level_id = [Number(item.value)];
+			this.detail.grey_fabric_level_name = item.label || '';
+		},
+		async loadInspectorOptions() {
+			try {
+				const res = await this.$u.api.employee.listEnum({
+					size: 50,
+					duty: INSPECTOR_DUTY,
+				});
+				const list = Array.isArray(res) ? res : (Array.isArray(res && res.list) ? res.list : []);
+				this.inspectorOptions = list
+					.map((item) => ({
+						value: item.id,
+						label: item.name || item.employee_name || item.real_name || item.code || String(item.id),
+					}))
+					.filter((item) => item.value != null);
+				this.inspectorOptionsLoaded = true;
+			} catch (error) {
+				console.log('加载查布工枚举失败', error);
+				this.inspectorOptions = [];
+			}
+		},
+		async openInspectorPicker() {
+			if (!this.inspectorOptionsLoaded || !this.inspectorOptions.length) {
+				await this.loadInspectorOptions();
+			}
+			if (!this.inspectorOptions.length) {
+				this.$u.toast('暂无查布工可选');
+				return;
+			}
+			this.inspectorPickerShow = true;
+		},
+		onInspectorConfirm(item) {
+			if (!item) return;
+			this.detail.inspector_id = Number(item.value);
+			this.detail.inspector_name = item.label || '';
+		},
+		handleScanCode(scanResult) {
+			const code = String(scanResult || '').trim().replace(/[\r\n]/g, '');
+			if (!code) return;
+			this.fetchScanDetail(code);
+		},
+		onScanConfirm() {
+			const code = String(this.scanCode || '').trim();
+			if (!code) {
+				this.$u.toast('请扫描或输入布票编码');
+				return;
+			}
+			this.fetchScanDetail(code);
+		},
+		async fetchScanDetail(code) {
+			if (this.loadingDetail) return;
+			this.loadingDetail = true;
+			this.scanCode = code;
+			try {
+				const res = await this.$u.api.productionScheduleOrder.getScanFineCodeDetail({
+					fabric_piece_code: code,
+				});
+				this.applyScanDetail(res, code);
+			} catch (error) {
+				console.log('扫码获取细码失败', error);
+				this.detail = {
+					...emptyDetail(),
+					fabric_piece_code: code,
+				};
+				this.weightKg = '';
+			} finally {
+				this.loadingDetail = false;
+			}
+		},
+		applyScanDetail(res, fallbackCode) {
+			const data = res || {};
+			const levelIds = normalizeLevelIds(data.grey_fabric_level_id);
+			this.detail = {
+				...emptyDetail(),
+				fabric_piece_code: data.fabric_piece_code || fallbackCode || '',
+				production_order_no: data.production_order_no || '',
+				machine_number: data.machine_number || '',
+				grey_fabric_name: data.grey_fabric_name || '',
+				grey_fabric_code: data.grey_fabric_code || '',
+				inspection_weight: formatDisplayWeightKg(data.inspection_weight) ? data.inspection_weight : null,
+				grey_fabric_level_id: levelIds,
+				grey_fabric_level_name: data.grey_fabric_level_name || '',
+				inspector_id: data.inspector_id != null ? data.inspector_id : null,
+				inspector_name: data.inspector_name || '',
+			};
+			this.weightKg = formatDisplayWeightKg(data.inspection_weight);
+			this.scanCode = this.detail.fabric_piece_code;
+			util.playSpeak('扫码成功');
+		},
+		async submitInWarehouse() {
+			const fabricPieceCode = String(this.detail.fabric_piece_code || this.scanCode || '').trim();
+			if (!fabricPieceCode) {
+				this.$u.toast('请先扫描或输入布票编码');
+				return;
+			}
+			const actualWeight = toWeightInt(this.weightKg);
+			if (actualWeight == null) {
+				this.$u.toast('请输入有效重量');
+				return;
+			}
+			const levelIds = normalizeLevelIds(this.detail.grey_fabric_level_id);
+			if (!levelIds.length) {
+				this.$u.toast('请选择等级');
+				return;
+			}
+			if (this.submitting) return;
+			this.submitting = true;
+			try {
+				const payload = {
+					fabric_piece_code: fabricPieceCode,
+					actual_weight: actualWeight,
+					electronic_scale_weight: actualWeight,
+					grey_fabric_level_id: levelIds,
+				};
+				const inspectorName = String(this.detail.inspector_name || '').trim();
+				if (inspectorName) {
+					payload.inspector_name = inspectorName;
+				}
+				if (this.detail.inspector_id != null && this.detail.inspector_id !== '') {
+					payload.inspector_id = Number(this.detail.inspector_id);
+				}
+				const binName = String(this.warehouseBinName || '').trim();
+				if (binName && binName !== '/') {
+					payload.warehouse_bin_name = binName;
+				}
+				if (this.warehouseBinId != null && this.warehouseBinId !== '') {
+					payload.warehouse_bin_id = Number(this.warehouseBinId);
+				}
+				const res = await this.$u.api.productionScheduleOrder.scanInWarehouseFineCode(payload);
+				if (res) {
+					this.detail.volume_number = res.volume_number != null ? res.volume_number : this.detail.volume_number;
+					this.detail.grey_fabric_id = res.grey_fabric_id != null ? res.grey_fabric_id : this.detail.grey_fabric_id;
+					this.detail.id = res.id != null ? res.id : this.detail.id;
+					if (res.fabric_piece_code) {
+						this.detail.fabric_piece_code = res.fabric_piece_code;
+					}
+				}
+				const volumeText = res && res.volume_number != null ? `，卷号 ${res.volume_number}` : '';
+				util.playSpeak('进仓成功');
+				this.$u.toast(`进仓成功${volumeText}`);
+				this.resetForNextScan();
+			} catch (error) {
+				console.log('手动进仓失败', error);
+			} finally {
+				this.submitting = false;
+			}
+		},
+		resetForNextScan() {
+			this.scanCode = '';
+			this.detail = emptyDetail();
+			this.weightKg = '';
+			this.warehouseBinId = null;
+			this.warehouseBinName = '';
+			this.$nextTick(() => {
+				this.scanFocus = false;
+				this.$nextTick(() => {
+					this.scanFocus = true;
+				});
+			});
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/common/pda-typography.scss';
+
+.manual-in {
+	min-height: 100vh;
+	background: #f5f6f8;
+	padding-bottom: 180rpx;
+	box-sizing: border-box;
+}
+
+.manual-in__setting {
+	display: flex;
+	align-items: center;
+	gap: 8rpx;
+	font-size: $pda-font-nav-sub;
+	color: #333;
+}
+
+.manual-in__scan {
+	margin: 16rpx 0;
+	padding: 0 28rpx;
+	background: #fff;
+}
+
+.manual-in__scan-input {
+	height: $pda-scan-input-height;
+	font-size: $pda-font-body;
+	color: #202328;
+}
+
+.manual-in__placeholder {
+	color: #b0b4bb;
+	font-size: $pda-font-placeholder;
+}
+
+.manual-in__panel {
+	background: #fff;
+}
+
+.manual-in__row {
+	display: flex;
+	align-items: center;
+	min-height: $pda-row-min-height;
+	padding: 12rpx 28rpx;
+	border-bottom: 1rpx solid #eceff3;
+	box-sizing: border-box;
+}
+
+.manual-in__row--input {
+	justify-content: space-between;
+}
+
+.manual-in__label {
+	width: $pda-label-width;
+	flex-shrink: 0;
+	font-size: $pda-font-body;
+	color: #666;
+}
+
+.manual-in__value {
+	flex: 1;
+	font-size: $pda-font-body;
+	color: #202328;
+	text-align: left;
+}
+
+.manual-in__right {
+	flex: 1;
+	display: flex;
+	align-items: center;
+	justify-content: flex-end;
+	gap: 18rpx;
+}
+
+.manual-in__field {
+	flex: 1;
+	min-width: 0;
+	text-align: right;
+	font-size: $pda-font-body;
+	color: #202328;
+}
+
+.manual-in__field-text {
+	flex: 1;
+	min-width: 0;
+	text-align: right;
+	font-size: $pda-font-body;
+	color: #202328;
+}
+
+.manual-in__unit {
+	font-size: $pda-font-unit;
+	color: #666;
+	padding: 6rpx 14rpx;
+	border: 1rpx solid #d7dbe3;
+	border-radius: 8rpx;
+}
+
+.manual-in__action {
+	font-size: $pda-font-action;
+	color: #2f78e6;
+	flex-shrink: 0;
+}
+
+.manual-in__footer {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	padding: 24rpx 40rpx calc(24rpx + env(safe-area-inset-bottom));
+	background: #fff;
+	box-shadow: 0 -4rpx 16rpx rgba(0, 0, 0, 0.04);
+}
+
+::v-deep .manual-in__footer .u-btn {
+	height: $pda-button-height !important;
+	line-height: $pda-button-height !important;
+	font-size: $pda-font-button !important;
+}
+</style>

src/pages/storefabric/storeFabricWarehouseDetail.vue

@@ -186,15 +186,15 @@ page { background-color: #F8F8F8; }
 	border-radius: 12rpx;
 }
 .infoTitle {
-	font-size: 32rpx;
+	font-size: 30rpx;
 	font-weight: bold;
 	margin-bottom: 16rpx;
 	color: #333;
 }
 .infoRow {
 	display: flex;
-	font-size: 28rpx;
+	font-size: 26rpx;
-	padding: 10rpx 0;
+	padding: 8rpx 0;
 }
 .infoLabel {
 	width: 160rpx;
@@ -208,8 +208,8 @@ page { background-color: #F8F8F8; }
 }
 .summaryBar {
 	margin: 16rpx 24rpx 0;
-	padding: 14rpx 16rpx;
+	padding: 12rpx 16rpx;
-	font-size: 28rpx;
+	font-size: 26rpx;
 	color: #666;
 	background: #fff;
 	border-radius: 8rpx;
@@ -241,8 +241,8 @@ page { background-color: #F8F8F8; }
 }
 .tableCell {
 	flex-shrink: 0;
-	padding: 16rpx 10rpx;
+	padding: 12rpx 8rpx;
-	font-size: 28rpx;
+	font-size: 22rpx;
 	color: #333;
 	text-align: center;
 	border-right: 1rpx solid #e1e1e1;

src/pages/storefabric/storeFabricWarehouseGroupList.vue

@@ -42,7 +42,7 @@
 				<WarehouseDataTable
 					:headers="tableHeaders"
 					:contents="tableContents"
-					:height="tableHeight"
+					height="auto"
 					@row-click="goStockList"
 				/>
 			</view>
@@ -56,7 +56,6 @@ import {
 	GROUP_TABLE_COLUMNS,
 	buildGroupListQuery,
 	buildStockListNavigateQuery,
-	calcTableHeight,
 	fetchAllWarehouseList,
 	mapGroupTableRow,
 	sumStockTotals,
@@ -85,9 +84,6 @@ export default {
 		totals() {
 			return sumStockTotals(this.list);
 		},
-		tableHeight() {
-			return calcTableHeight(this.tableContents.length);
-		},
 	},
 	onLoad() {
 		uni.setNavigationBarTitle({ title: '坯布库存' });

src/pages/storefabric/storeFabricWarehouseStockList.vue

@@ -36,7 +36,7 @@
 				<WarehouseDataTable
 					:headers="tableHeaders"
 					:contents="tableContents"
-					:height="tableHeight"
+					height="auto"
 					@row-click="goDetail"
 				/>
 			</view>
@@ -50,7 +50,6 @@ import {
 	STOCK_TABLE_COLUMNS,
 	buildDetailNavigateQuery,
 	buildStockListQuery,
-	calcTableHeight,
 	fetchAllWarehouseList,
 	mapStockTableRow,
 	parsePageQuery,
@@ -84,9 +83,6 @@ export default {
 		totals() {
 			return sumStockTotals(this.list);
 		},
-		tableHeight() {
-			return calcTableHeight(this.tableContents.length, { maxPx: 9999 });
-		},
 	},
 	onLoad(options) {
 		const parsed = parsePageQuery(options || {});

src/pages/storefabric/storefabricBusinessOutDetail.vue

@@ -40,7 +40,6 @@
 			<u-form-item>
 				<text class="title" style="width:200px;">成品缸号：{{CrockNo}}</text>
 				<text class="title" style="width:200px;">缸号卷号：{{GoodsBillNo}}</text>
-				<text class="title" style="width:200px;">外部卷号：{{ExternVolumeNumber}}</text>
 
 			</u-form-item>
 			<u-form-item>
@@ -114,7 +113,6 @@
 				GoodsCodeName: '',
 				CrockNo: '',
 				GoodsBillNo: '',
-				ExternVolumeNumber: '',
 				GoodsQty: 0,
 				testFocus0: false,
 				testFocus1: true,
@@ -283,7 +281,6 @@
 								this.GoodsCodeName = aResultData.GoodsCodeName;
 								this.CrockNo = aResultData.CrockNo;
 								this.GoodsBillNo = aResultData.GoodsBillNo;
-								this.ExternVolumeNumber = aResultData.extern_volume_number || aResultData.ExternVolumeNumber || '';
 								this.GoodsQty = aResultData.GoodsQty;
 								this.BillSumRoll = parseFloat(aResultData.BillSumRoll);
 								this.BillSumQty = parseFloat(aResultData.BillSumQty);

src/pages/storegoods/storeGoodsBusinessCheckAdd.vue

@@ -29,22 +29,10 @@
 				</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-else-if="usePhoneScanFallback"
+					v-if="usePhoneScanFallback"
 					name="scan"
 					size="44"
 					color="#2979ff"
@@ -69,7 +57,6 @@
 			<u-form-item>
 				<text class="title" style="width:200px;">成品缸号：{{CrockNo}}</text>
 				<text class="title" style="width:200px;">缸号卷号：{{GoodsBillNo}}</text>
-				<text class="title" style="width:200px;">外部卷号：{{ExternVolumeNumber}}</text>
 			</u-form-item>
 			<u-form-item>
 				<text class="title" style="width:200px;">本架盘前：{{BillSumOldRoll}}条</text>
@@ -118,10 +105,8 @@
 		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 {
@@ -161,7 +146,6 @@
 				GoodsCodeName: '',
 				CrockNo: '',
 				GoodsBillNo: '',
-				ExternVolumeNumber: '',
 				GoodsQty: 0,
 				BillSumOldRoll: 0,
 				BillSumNewRoll: 0,
@@ -259,31 +243,12 @@
 		},
 		methods: {
 			handlePhoneScan() {
-				this.togglePhoneScanPanel();
+				this.openPhoneScan();
-			},
-			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(message);
+				this.playError();
 				uni.showModal({
 					title: '提示',
 					content: message,
@@ -293,7 +258,7 @@
 
 			// 添加成功提示方法
 			showSuccess(message) {
-				this.playSuccess(message);
+				this.playSuccess();
 				uni.showToast({
 					title: message,
 					icon: 'success'
@@ -302,11 +267,11 @@
 
 			
 			
-			playSuccess(text) {
+			playSuccess() {
-				util.playSuccessAudio(text);
+				util.playSuccessAudio();
 			},
-			playError(text) {
+			playError() {
-				util.playErrorAudio(text);
+				util.playErrorAudio();
 			},
 
 			BarCodeDelChange: function() {
@@ -629,7 +594,6 @@
 							this.GoodsCodeName = aResultData.product_color_name;
 							this.CrockNo = aResultData.dyelot_number;
 							this.GoodsBillNo = aResultData.volume_number;
-						this.ExternVolumeNumber = aResultData.extern_volume_number || '';
 							this.GoodsQty = aResultData.weight / 10000;
 							this.BillSumOldRoll = aResultData.warehouse_bin_check_before_roll/100;
 							this.BillSumNewRoll = aResultData.warehouse_bin_check_roll/100;
@@ -725,18 +689,6 @@
 </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,23 +9,11 @@
 				<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-else-if="usePhoneScanFallback"
+					v-if="usePhoneScanFallback"
 					name="scan"
 					size="44"
 					color="#2979ff"
@@ -50,7 +38,6 @@
 			<u-form-item>
 				<text class="title" style="width:200px;">成品缸号：{{ CrockNo }}</text>
 				<text class="title" style="width:200px;">缸号卷号：{{ GoodsBillNo }}</text>
-				<text class="title" style="width:200px;">外部卷号：{{ ExternVolumeNumber }}</text>
 
 			</u-form-item>
 			<u-form-item>
@@ -90,11 +77,9 @@ 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 {
@@ -121,7 +106,6 @@ export default {
 			GoodsCodeName: '',
 			CrockNo: '',
 			GoodsBillNo: '',
-				ExternVolumeNumber: '',
 			GoodsQty: 0,
 			StoreStationNameFocus: false,
 			BillSumOldRoll: 0,
@@ -192,15 +176,12 @@ export default {
 	},
 	methods: {
 		handlePhoneScan() {
-			this.togglePhoneScanPanel();
+			this.openPhoneScan();
-		},
-		onPlusBarcodeSuccess(scanResult) {
-			this.handleScanResult(scanResult, this._scanCallback);
 		},
 
 		// 添加通用错误提示方法
 		showError(message) {
-			this.playError(message);
+			this.playError();
 			uni.showModal({
 				title: '提示',
 				content: message,
@@ -208,11 +189,11 @@ export default {
 			});
 		},
 
-		playSuccess(text) {
+		playSuccess() {
-			util.playSuccessAudio(text);
+			util.playSuccessAudio();
 		},
-		playError(text) {
+		playError() {
-			util.playErrorAudio(text);
+			util.playErrorAudio();
 		},
 
 		BarCodeDelChange: function () {
@@ -270,7 +251,6 @@ export default {
 						this.GoodsCodeName = aResultData.product_color_name;
 						this.CrockNo = aResultData.dyelot_number;
 						this.GoodsBillNo = aResultData.volume_number;
-						this.ExternVolumeNumber = aResultData.extern_volume_number || '';
 						this.GoodsQty = aResultData.weight / 10000;
 						this.BillSumOldRoll = aResultData.warehouse_bin_check_before_roll / 100;
 						this.BillSumNewRoll = aResultData.warehouse_bin_check_roll / 100;
@@ -392,18 +372,6 @@ 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/storeGoodsBusinessInAdd.vue

@@ -75,7 +75,6 @@
 			<u-form-item>
 				<text class="title" style="width:200px;">成品缸号：{{CrockNo}}</text>
 				<text class="title" style="width:200px;">缸号卷号：{{GoodsBillNo}}</text>
-				<text class="title" style="width:200px;">外部卷号：{{ExternVolumeNumber}}</text>
 			</u-form-item>
 			<u-form-item>
 				<text class="title" style="width:200px;">本单条数：{{BillSumRoll}}条</text>
@@ -162,7 +161,6 @@
 				GoodsCodeName: '',
 				CrockNo: '',
 				GoodsBillNo: '',
-				ExternVolumeNumber: '',
 				GoodsQty: 0,
 				testFocus0: false,
 				testFocus1: true,
@@ -905,7 +903,6 @@
 								this.GoodsCodeName = aResultData.GoodsCodeName;
 								this.CrockNo = aResultData.CrockNo;
 								this.GoodsBillNo = aResultData.GoodsBillNo;
-								this.ExternVolumeNumber = aResultData.extern_volume_number || aResultData.ExternVolumeNumber || '';
 								this.GoodsQty = aResultData.GoodsQty;
 								this.BillSumRoll = parseFloat(aResultData.BillSumRoll);
 								this.BillSumQty = parseFloat(aResultData.BillSumQty);

src/pages/storegoods/storeGoodsBusinessInDetail.vue

@@ -40,7 +40,6 @@
 			<u-form-item>
 				<text class="title" style="width:200px;">成品缸号：{{CrockNo}}</text>
 				<text class="title" style="width:200px;">缸号卷号：{{GoodsBillNo}}</text>
-				<text class="title" style="width:200px;">外部卷号：{{ExternVolumeNumber}}</text>
 
 			</u-form-item>
 			<u-form-item>
@@ -116,7 +115,6 @@
 				GoodsCodeName: '',
 				CrockNo: '',
 				GoodsBillNo: '',
-				ExternVolumeNumber: '',
 				GoodsQty: 0,
 				testFocus0: false,
 				testFocus1: true,
@@ -285,7 +283,6 @@
 								this.GoodsCodeName = aResultData.GoodsCodeName;
 								this.CrockNo = aResultData.CrockNo;
 								this.GoodsBillNo = aResultData.GoodsBillNo;
-								this.ExternVolumeNumber = aResultData.extern_volume_number || aResultData.ExternVolumeNumber || '';
 								this.GoodsQty = aResultData.GoodsQty;
 								this.BillSumRoll = parseFloat(aResultData.BillSumRoll);
 								this.BillSumQty = parseFloat(aResultData.BillSumQty);

src/pages/storegoods/storeGoodsBusinessOutAdd.vue

@@ -78,7 +78,6 @@
 			<u-form-item>
 				<text class="title" style="width:200px;">成品缸号：{{CrockNo}}</text>
 				<text class="title" style="width:200px;">缸号卷号：{{GoodsBillNo}}</text>
-				<text class="title" style="width:200px;">外部卷号：{{ExternVolumeNumber}}</text>
 			</u-form-item>
 			<u-form-item>
 				<text class="title" style="width:200px;">本单条数：{{BillSumRoll}}条</text>
@@ -165,7 +164,6 @@
 				GoodsCodeName: '',
 				CrockNo: '',
 				GoodsBillNo: '',
-				ExternVolumeNumber: '',
 				GoodsQty: 0,
 				testFocus0: false,
 				testFocus1: true,
@@ -818,7 +816,6 @@
 								this.GoodsCodeName = aResultData.GoodsCodeName;
 								this.CrockNo = aResultData.CrockNo;
 								this.GoodsBillNo = aResultData.GoodsBillNo;
-								this.ExternVolumeNumber = aResultData.extern_volume_number || aResultData.ExternVolumeNumber || '';
 								this.GoodsQty = aResultData.GoodsQty;
 								this.BillSumRoll = parseFloat(aResultData.BillSumRoll);
 								this.BillSumQty = parseFloat(aResultData.BillSumQty);

src/pages/storegoods/storeGoodsBusinessOutDetail.vue

@@ -40,7 +40,6 @@
 			<u-form-item>
 				<text class="title" style="width:200px;">成品缸号：{{CrockNo}}</text>
 				<text class="title" style="width:200px;">缸号卷号：{{GoodsBillNo}}</text>
-				<text class="title" style="width:200px;">外部卷号：{{ExternVolumeNumber}}</text>
 
 			</u-form-item>
 			<u-form-item>
@@ -114,7 +113,6 @@
 				GoodsCodeName: '',
 				CrockNo: '',
 				GoodsBillNo: '',
-				ExternVolumeNumber: '',
 				GoodsQty: 0,
 				testFocus0: false,
 				testFocus1: true,
@@ -283,7 +281,6 @@
 								this.GoodsCodeName = aResultData.GoodsCodeName;
 								this.CrockNo = aResultData.CrockNo;
 								this.GoodsBillNo = aResultData.GoodsBillNo;
-								this.ExternVolumeNumber = aResultData.extern_volume_number || aResultData.ExternVolumeNumber || '';
 								this.GoodsQty = aResultData.GoodsQty;
 								this.BillSumRoll = parseFloat(aResultData.BillSumRoll);
 								this.BillSumQty = parseFloat(aResultData.BillSumQty);

src/pages/storegoods/storeGoodsBusinessStationMoveAdd.vue

@@ -66,7 +66,6 @@
 			<u-form-item>
 				<text class="title" style="width:200px;">成品缸号：{{CrockNo}}</text>
 				<text class="title" style="width:200px;">缸号卷号：{{GoodsBillNo}}</text>
-				<text class="title" style="width:200px;">外部卷号：{{ExternVolumeNumber}}</text>
 			</u-form-item>
 			<u-form-item>
 				<text class="title" style="width:200px;">本单条数：{{BillSumRoll}}条</text>
@@ -156,7 +155,6 @@
 				GoodsCodeName: '',
 				CrockNo: '',
 				GoodsBillNo: '',
-				ExternVolumeNumber: '',
 				GoodsQty: 0,
 				FromStoreStationFocus: false,
 				ToStoreStationFocus: true,
@@ -713,7 +711,6 @@
 								this.GoodsCodeName = aResultData.GoodsCodeName;
 								this.CrockNo = aResultData.CrockNo;
 								this.GoodsBillNo = aResultData.GoodsBillNo;
-								this.ExternVolumeNumber = aResultData.extern_volume_number || aResultData.ExternVolumeNumber || '';
 								this.GoodsQty = aResultData.GoodsQty;
 								this.GoodsCodeSumRoll = parseFloat(aResultData.GoodsCodeSumRoll);
 								this.GoodsCodeSumQty = parseFloat(aResultData.GoodsCodeSumQty);

src/pages/storegoods/storeGoodsBusinessStationMoveDetail.vue

@@ -48,7 +48,6 @@
 			<u-form-item>
 				<text class="title" style="width:200px;">成品缸号：{{CrockNo}}</text>
 				<text class="title" style="width:200px;">缸号卷号：{{GoodsBillNo}}</text>
-				<text class="title" style="width:200px;">外部卷号：{{ExternVolumeNumber}}</text>
 			</u-form-item>
 			<u-form-item>
 				<text class="title" style="width:200px;">本单条数：{{BillSumRoll}}条</text>
@@ -120,7 +119,6 @@
 				GoodsCodeName: '',
 				CrockNo: '',
 				GoodsBillNo: '',
-				ExternVolumeNumber: '',
 				GoodsQty: 0,
 				FromStoreStationFocus: false,
 				ToStoreStationFocus: true,
@@ -362,7 +360,6 @@
 								this.GoodsCodeName = aResultData.GoodsCodeName;
 								this.CrockNo = aResultData.CrockNo;
 								this.GoodsBillNo = aResultData.GoodsBillNo;
-								this.ExternVolumeNumber = aResultData.extern_volume_number || aResultData.ExternVolumeNumber || '';
 								this.GoodsQty = aResultData.GoodsQty;
 								this.GoodsCodeSumRoll = parseFloat(aResultData.GoodsCodeSumRoll);
 								this.GoodsCodeSumQty = parseFloat(aResultData.GoodsCodeSumQty);

src/pages/storegoods/storeGoodsBusinessStationMoveOnly.vue

@@ -23,23 +23,11 @@
 					<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-else-if="usePhoneScanFallback"
+					v-if="usePhoneScanFallback"
 					name="scan"
 					size="44"
 					color="#2979ff"
@@ -61,7 +49,6 @@
 			<u-form-item>
 				<text class="title" style="width:200px;">成品缸号：{{ CrockNo }}</text>
 				<text class="title" style="width:200px;">缸号卷号：{{ GoodsBillNo }}</text>
-				<text class="title" style="width:200px;">外部卷号：{{ ExternVolumeNumber }}</text>
 
 			</u-form-item>
 			<u-form-item>
@@ -95,9 +82,7 @@ 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 {
@@ -125,7 +110,6 @@ export default {
 			GoodsCodeName: '',
 			CrockNo: '',
 			GoodsBillNo: '',
-				ExternVolumeNumber: '',
 			GoodsQty: 0,
 			FromStoreStationFocus: false,
 			QRBarCodeFocus: false,
@@ -197,17 +181,14 @@ export default {
 	},
 	methods: {
 		handlePhoneScan() {
-			this.togglePhoneScanPanel();
+			this.openPhoneScan();
-		},
-		onPlusBarcodeSuccess(scanResult) {
-			this.handleScanResult(scanResult, this._scanCallback);
 		},
 
 		playSuccess() {
 			util.playSuccessAudio();
 		},
-		playError(text) {
+		playError() {
-			util.playErrorAudio(text);
+			util.playErrorAudio();
 		},
 
 		// 自定义扫码处理回调 - 处理本页面特有的扫码逻辑
@@ -285,7 +266,7 @@ export default {
 
 		// 添加一个通用的错误提示方法
 		showError(message) {
-			this.playError(message);
+			this.playError();
 			uni.showModal({
 				title: '提示',
 				content: message,
@@ -465,7 +446,6 @@ export default {
 						this.GoodsCodeName = aResultData.product_color_name;
 						this.CrockNo = aResultData.dyelot_number;
 						this.GoodsBillNo = aResultData.volume_number;
-						this.ExternVolumeNumber = aResultData.extern_volume_number || '';
 						this.GoodsQty = aResultData.weight / 10000;
 						this.StoreStationSumRoll = aResultData.warehouse_bin_roll / 100;
 						this.StoreStationSumQty = aResultData.warehouse_bin_weight / 10000;
@@ -528,18 +508,6 @@ 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,176 +0,0 @@
-<template>
-	<view class="fabric-out-page">
-		<OrderHeaderFold v-model="headerCollapsed" :summary="form.order_no || '保存后自动生成'">
-		<OrderStatusBar class="fabric-out-mt32" :status="displayAuditStatus" :name="displayAuditStatusName" />
-		<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'">
-				{{ form.in_order_type_name || '请选择' }}
-				<u-icon v-if="headerEditable" class="ml26" name="arrow-right" size="40" color="#888888"></u-icon>
-			</view>
-		</view>
-		<view @click="pickerSelectFun('加工单位')" class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">加工单位<text class="redXingh">*</text></text>
-			<view :class="form.process_name ? '' : 'cBlack'">
-				{{ form.process_name || '请选择' }}
-				<u-icon v-if="headerEditable" class="ml26" name="arrow-right" size="40" color="#888888"></u-icon>
-			</view>
-		</view>
-		<view @click="pickerSelectFun('仓库名称')" class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">仓库名称<text class="redXingh">*</text></text>
-			<view :class="form.warehouse_name ? '' : 'cBlack'">
-				{{ form.warehouse_name || '请选择' }}
-				<u-icon v-if="headerEditable" class="ml26" name="arrow-right" size="40" color="#888888"></u-icon>
-			</view>
-		</view>
-		<view class="flex-white-plr26 ptb10 bdb_f5 process-in-weight-row">
-			<view class="process-in-weight-col">
-				<text class="mr16">纸筒重量</text>
-				<u-input
-					v-model="form.paper_tube_weight"
-					type="digit"
-					:disabled="!canEditWeights"
-					placeholder="1.5"
-					:custom-style="weightInputStyle"
-					placeholder-style="color: #c0c4cc; font-size: 36rpx;"
-				/>
-			</view>
-			<view class="process-in-weight-col">
-				<text class="mr16">包装重量</text>
-				<u-input
-					v-model="form.package_weight"
-					type="digit"
-					:disabled="!canEditWeights"
-					placeholder="0.3"
-					:custom-style="weightInputStyle"
-					placeholder-style="color: #c0c4cc; font-size: 36rpx;"
-				/>
-			</view>
-		</view>
-		<view @click="pickerSelectFun('营销体系')" class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">营销体系<text class="redXingh">*</text></text>
-			<view :class="form.sale_system_name ? '' : 'cBlack'">
-				{{ form.sale_system_name || '请选择' }}
-				<u-icon v-if="headerEditable" class="ml26" name="arrow-right" size="40" color="#888888"></u-icon>
-			</view>
-		</view>
-		<view class="flex-white-plr26-column ptb20 mt32">
-			<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"
-			@clear="clearWarehouseBin"
-		/>
-		<FabricOutScanBar
-			:can-scan="showQrScanBar"
-			:value="QRBarCode"
-			:delete-mode="BarCodeDelStatus"
-			:message="BillDataMessage"
-			:disabled-tip="qrDisabledTip"
-			:show-phone-scan="canScanQr"
-			:scanning="phoneScanPanelOpen && phoneScanTarget === 'qr'"
-			@input="QRBarCode = $event"
-			@scan="handleScan"
-			@phone-scan="handlePhoneScan"
-			@delete-mode-change="BarCodeDelChange"
-		/>
-		<ProcessInScanDetail :detail="scanDetail" />
-
-		<ProcessInDetailList
-			:list="form.item_data"
-			:deletable="canScan"
-			show-tare-columns
-			@delete="onDeleteFineCode"
-		/>
-
-		<FabricOutFooter
-			v-if="!headerSaved"
-			:buttons="[{ label: '提交保存', action: 'save' }]"
-			single
-			@action="submitSave"
-		/>
-		<FabricOutFooter
-			v-else
-			:buttons="statusActionButtons"
-			@action="handleStatusAction"
-		/>
-
-		<u-select v-model="selectShow" :list="selectList" :remote="isRemoteSelect" :loading="selectSearching" @search="onSelectSearch" @confirm="selectConfirmFun"></u-select>
-	</view>
-</template>
-
-<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,
-		ProcessInDetailList,
-		ProcessInBinBar,
-	},
-	mixins: [formMixin],
-	data() {
-		return {
-			weightInputStyle: {
-				fontSize: '36rpx',
-			},
-		};
-	},
-	onLoad() {
-		uni.setNavigationBarTitle({ title: '新增加工进仓单' });
-		this.pageMode = 'add';
-		this.loadBaseDropdowns();
-	},
-};
-</script>
-
-<style lang="scss">
-@import '@/pages/storefabric/storeFabricBusinessOutPage.scss';
-page {
-	background-color: #F8F8F8;
-	padding-bottom: 260rpx;
-}
-.process-in-weight-row {
-	gap: 20rpx;
-}
-.process-in-weight-col {
-	flex: 1;
-	display: flex;
-	align-items: center;
-	min-width: 0;
-
-	::v-deep .u-input__input {
-		font-size: 36rpx !important;
-	}
-}
-</style>

src/pages/storegoods/storeGoodsProcessInEdit.vue

@@ -1,157 +0,0 @@
-<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 ptb20 bdb_f5">
-			<text class="mr26">进仓类型</text>
-			<text>{{ form.in_order_type_name || '加工进仓单' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">加工单位</text>
-			<text>{{ form.process_name || '-' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">仓库名称</text>
-			<text>{{ form.warehouse_name || '-' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb10 bdb_f5 process-in-weight-row">
-			<view class="process-in-weight-col">
-				<text class="mr16">纸筒重量</text>
-				<u-input
-					v-model="form.paper_tube_weight"
-					type="digit"
-					:disabled="!canEditWeights"
-					placeholder="1.5"
-					:custom-style="weightInputStyle"
-					placeholder-style="color: #c0c4cc; font-size: 36rpx;"
-				/>
-			</view>
-			<view class="process-in-weight-col">
-				<text class="mr16">包装重量</text>
-				<u-input
-					v-model="form.package_weight"
-					type="digit"
-					:disabled="!canEditWeights"
-					placeholder="0.3"
-					:custom-style="weightInputStyle"
-					placeholder-style="color: #c0c4cc; font-size: 36rpx;"
-				/>
-			</view>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">营销体系</text>
-			<text>{{ form.sale_system_name || '-' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<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"
-			@clear="clearWarehouseBin"
-		/>
-		<FabricOutScanBar
-			:can-scan="showQrScanBar"
-			:value="QRBarCode"
-			:delete-mode="BarCodeDelStatus"
-			:message="BillDataMessage"
-			:disabled-tip="qrDisabledTip"
-			:show-phone-scan="canScanQr"
-			:scanning="phoneScanPanelOpen && phoneScanTarget === 'qr'"
-			@input="QRBarCode = $event"
-			@scan="handleScan"
-			@phone-scan="handlePhoneScan"
-			@delete-mode-change="BarCodeDelChange"
-		/>
-		<ProcessInScanDetail :detail="scanDetail" />
-
-		<ProcessInDetailList
-			:list="form.item_data"
-			:deletable="canScan"
-			show-tare-columns
-			@delete="onDeleteFineCode"
-		/>
-
-		<FabricOutFooter :buttons="statusActionButtons" @action="handleStatusAction" />
-
-		<u-select v-model="selectShow" :list="selectList" :remote="isRemoteSelect" :loading="selectSearching" @search="onSelectSearch" @confirm="selectConfirmFun"></u-select>
-	</view>
-</template>
-
-<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,
-		ProcessInDetailList,
-		ProcessInBinBar,
-	},
-	mixins: [formMixin],
-	data() {
-		return {
-			headerCollapsed: true,
-			weightInputStyle: {
-				fontSize: '36rpx',
-			},
-		};
-	},
-	onLoad(e) {
-		uni.setNavigationBarTitle({ title: '编辑加工进仓单' });
-		this.pageMode = 'edit';
-		if (e.id) {
-			this.loadOrder(Number(e.id), { rejectIfLocked: true });
-		}
-	},
-};
-</script>
-
-<style lang="scss">
-@import '@/pages/storefabric/storeFabricBusinessOutPage.scss';
-page {
-	background-color: #F8F8F8;
-	padding-bottom: 260rpx;
-}
-.process-in-weight-row {
-	gap: 20rpx;
-}
-.process-in-weight-col {
-	flex: 1;
-	display: flex;
-	align-items: center;
-	min-width: 0;
-
-	::v-deep .u-input__input {
-		font-size: 36rpx !important;
-	}
-}
-</style>

src/pages/storegoods/storeGoodsProcessInList.vue

@@ -1,275 +0,0 @@
-<template>
-	<view>
-		<view class="filterBar">
-			<u-search v-model="filters.order_no" 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="filterIconColor" name="list" size="44" :color="filterIconColor"></u-icon>
-					<view v-if="hasActiveFilter" class="filterBtn__badge"></view>
-				</view>
-				<text>筛选</text>
-			</view>
-		</view>
-
-		<scroll-view scroll-y :style="{ height: scrollHeight }" refresher-enabled
-			:refresher-triggered="triggered" @refresherrefresh="onRefresh">
-			<dataNull v-if="list.length === 0" src="/src/static/img/chahua/gjNull.png"
-				title="暂无加工进仓单" title1="请点击右下角按钮新增">
-			</dataNull>
-			<view v-for="(item, index) in list" :key="item.id" @click="goView(item)">
-				<ProcessInItem :item="item" :index="index" />
-			</view>
-		</scroll-view>
-
-		<addBtn url="./storeGoodsProcessInAdd"></addBtn>
-
-		<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>
-					<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="36"></u-icon></view>
-				</view>
-				<view class="filterItem" @click="openWarehouseSelect">
-					<text class="filterLabel">仓库</text>
-					<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="36"></u-icon></view>
-				</view>
-				<view class="filterActions">
-					<u-button type="warning" size="medium" @click="resetFilter">重置</u-button>
-					<u-button type="primary" size="medium" @click="applyFilter">确定</u-button>
-				</view>
-			</view>
-		</u-popup>
-
-		<u-select class="pdaSelect" v-model="statusSelectShow" title="选择订单状态" :list="statusSelectList" :default-value="statusSelectDefault" @confirm="onStatusConfirm"></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>
-
-<script>
-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,
-	formatRoll,
-	mapToSelectOptions,
-	fetchAllOrderList,
-} from '@/common/storeGoodsProcessIn';
-import { withNameParam } from '@/common/remoteSelect';
-import listFilterMixin from '@/mixins/listFilterMixin';
-
-export default {
-	components: { addBtn, ProcessInItem },
-	mixins: [listFilterMixin],
-	data() {
-		return {
-			list: [],
-			scrollHeight: '667px',
-			triggered: false,
-			listLoading: false,
-			filterShow: false,
-			statusSelectShow: false,
-			unitSelectShow: false,
-			unitSelectType: '',
-			processUnitOptions: [],
-			warehouseOptions: [],
-			unitOptionsLoading: false,
-			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.PENDING,
-			},
-			statusSelectList: [
-				{ value: '', label: '全部' },
-				...getStatusOptions(),
-			],
-		};
-	},
-	computed: {
-		statusLabel() {
-			if (this.filters.audit_status === '' || this.filters.audit_status === null) return '';
-			return AUDIT_STATUS_MAP[Number(this.filters.audit_status)] || '';
-		},
-		processUnitLabel() {
-			return this.filters.process_name || '';
-		},
-		warehouseLabel() {
-			return this.filters.warehouse_name || '';
-		},
-	},
-	onLoad() {
-		uni.setNavigationBarTitle({ title: '加工进仓列表' });
-		this.restoreFilterCache();
-		uni.getSystemInfo({
-			success: (res) => {
-				this.scrollHeight = `${res.windowHeight - 50}px`;
-			},
-		});
-	},
-	onShow() {
-		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 })
-				.then((res) => {
-					this.processUnitOptions = mapToSelectOptions(res);
-					return this.processUnitOptions;
-				})
-				.catch(() => {
-					this.processUnitOptions = [];
-					return this.processUnitOptions;
-				});
-		},
-		loadWarehouseOptions() {
-			if (this.warehouseOptions.length) return Promise.resolve(this.warehouseOptions);
-			return this.$u.api.physicalWarehouse.getDropdownList({ warehouse_type_id: WAREHOUSE_TYPE_FINISHED })
-				.then((res) => {
-					this.warehouseOptions = mapToSelectOptions(res);
-					return this.warehouseOptions;
-				})
-				.catch(() => {
-					this.warehouseOptions = [];
-					return this.warehouseOptions;
-				});
-		},
-		openUnitSelect(type) {
-			this.unitSelectType = type;
-			const cache = type === 'warehouse' ? this.warehouseOptions : this.processUnitOptions;
-			this.applyUnitSelectList(cache);
-			this.unitSelectShow = true;
-		},
-		onUnitSearch(keyword) {
-			const seq = ++this.unitSearchSeq;
-			const type = this.unitSelectType;
-			const empty = !String(keyword || '').trim();
-			this.selectSearching = true;
-			const req = type === 'warehouse'
-				? this.$u.api.physicalWarehouse.getDropdownList(withNameParam({ warehouse_type_id: WAREHOUSE_TYPE_FINISHED }, keyword))
-				: this.$u.api.businessUnit.list(withNameParam({ unit_type_id: BUSINESS_UNIT_TYPE_PROCESS }, keyword));
-			req.then((res) => {
-				if (seq !== this.unitSearchSeq) return;
-				const list = mapToSelectOptions(res);
-				if (empty) {
-					if (type === 'warehouse') this.warehouseOptions = list;
-					else this.processUnitOptions = list;
-				}
-				this.applyUnitSelectList(list, empty);
-			}).catch((e) => {
-				if (seq !== this.unitSearchSeq) return;
-				uni.showToast({ title: (e && e.message) || '搜索失败', icon: 'none' });
-			}).then(() => {
-				if (seq === this.unitSearchSeq) this.selectSearching = false;
-			}, () => {
-				if (seq === this.unitSearchSeq) this.selectSearching = false;
-			});
-		},
-		openProcessUnitSelect() {
-			this.openUnitSelect('process');
-		},
-		openWarehouseSelect() {
-			this.openUnitSelect('warehouse');
-		},
-		onUnitConfirm(e) {
-			const item = e[0] || {};
-			if (this.unitSelectType === 'warehouse') {
-				this.filters.warehouse_id = item.value;
-				this.filters.warehouse_name = item.value ? item.label : '';
-			} else {
-				this.filters.process_unit_id = item.value;
-				this.filters.process_name = item.value ? item.label : '';
-			}
-		},
-		loadList() {
-			if (this.listLoading) return;
-			this.listLoading = true;
-			const filters = this.appliedFilters || this.filters;
-			const params = {};
-			if (filters.order_no) params.order_no = filters.order_no;
-			if (filters.process_unit_id) params.process_unit_id = filters.process_unit_id;
-			if (filters.warehouse_id) params.warehouse_id = filters.warehouse_id;
-			if (this.hasFilterValue(filters.audit_status)) {
-				params.audit_status = filters.audit_status;
-			}
-			fetchAllOrderList((p) => this.$u.api.fpmProcessInOrder.list(p), params)
-				.then((rows) => {
-					this.list = rows.map(this.mapToCard);
-				})
-				.catch((err) => {
-					this.list = [];
-					uni.showToast({ title: err.message || '加载失败', icon: 'none' });
-				})
-				.finally(() => {
-					this.listLoading = false;
-					this.triggered = false;
-					// 避免并发请求下 uView 全局 loading 遮罩关不掉
-					uni.hideLoading();
-				});
-		},
-		mapToCard(order) {
-			return {
-				id: order.id,
-				order_no: order.order_no || '',
-				process_unit_id: order.process_unit_id || '',
-				process_name: order.process_name || '',
-				warehouse_id: order.warehouse_id || '',
-				warehouse_name: order.warehouse_name || '',
-				create_user_name: order.creator_name || '',
-				create_time: order.create_time || '',
-				auditor_name: order.auditor_name || '',
-				audit_date: order.audit_time || '',
-				audit_status: order.audit_status,
-				audit_status_name: order.audit_status_name || AUDIT_STATUS_MAP[order.audit_status] || '',
-				total_roll: formatRoll(order.total_roll),
-			};
-		},
-		onRefresh() {
-			this.triggered = true;
-			this.loadList();
-		},
-		goView(item) {
-			const page = Number(item.audit_status) === 1
-				? 'storeGoodsProcessInEdit'
-				: 'storeGoodsProcessInView';
-			uni.navigateTo({ url: `./${page}?id=${item.id}` });
-		},
-		openStatusSelect() { this.statusSelectShow = true; },
-	},
-};
-</script>
-
-<style lang="scss">
-@import '@/common/list-filter.scss';
-</style>

src/pages/storegoods/storeGoodsProcessInMixin.js

@@ -1,707 +0,0 @@
-/**
- * 加工进仓单表单 mixin（新增/编辑共用）
- *
- * 1. 先填表头（进仓类型 / 加工单位 / 仓库 / 营销体系 / 备注）提交 add，拿到 id 后可扫码
- * 2. 先扫仓位（getWarehouseBin：传 qr_code + warehouse_id），校验后扫布匹二维码
- * 3. 扫码走 updateFpmProcessInOrder（arrange_type: 1 录入 / 3 删除，带 warehouse_bin_id、纸筒/包装重量）
- * 4. 手机扫码成功展示详情后自动再次调起扫码，形成连续扫
- */
-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';
-import {
-	AUDIT_STATUS_MAP,
-	ARRANGE_TYPE,
-	BUSINESS_UNIT_TYPE_PROCESS,
-	WAREHOUSE_TYPE_FINISHED,
-	IN_ORDER_TYPE_PROCESS,
-	IN_ORDER_TYPE_MAP,
-	IN_ORDER_TYPE_OPTIONS,
-	DEFAULT_PAPER_TUBE_WEIGHT,
-	DEFAULT_PACKAGE_WEIGHT,
-	normalizeOrder,
-	mapToSelectOptions,
-	canScanAtStatus,
-	isLockedOrderStatus,
-	getFormStatusActionButtons,
-	orderToFormFields,
-	confirmOrderStatusAction,
-	DRAFT_AUDIT_STATUS,
-	DRAFT_AUDIT_STATUS_NAME,
-	getEmptyScanDetail,
-	buildScanDetailFromScanResponse,
-	buildScanUpdateParams,
-	pickDefaultWarehouse,
-	validateScanWeights,
-} from '@/common/storeGoodsProcessIn';
-
-export default {
-	components: { PlusBarcodePanel },
-	mixins: [scanMixin, remoteSelectMixin],
-	data() {
-		return {
-			pageMode: 'add',
-			orderId: 0,
-			form: this.getEmptyForm(),
-			headerSaved: false,
-			headerCollapsed: false,
-			selectShow: false,
-			selectList: [],
-			selectType: '',
-			canScan: false,
-			QRBarCode: '',
-			BarCodeDelStatus: false,
-			BillDataMessage: '',
-			scanDetail: getEmptyScanDetail(),
-			auditStatus: 0,
-			processUnitOptions: [],
-			warehouseOptions: [],
-			saleSystemOptions: [],
-			inOrderTypeOptions: IN_ORDER_TYPE_OPTIONS,
-			dropdownLoading: false,
-			/** 仓位 */
-			warehouseBinId: 0,
-			warehouseBinCode: '',
-			warehouseBinName: '',
-			/** 手机连续扫码开关：成功后自动再调起；取消/失败则关闭 */
-			phoneContinuousScan: false,
-			/** 手机扫当前目标：bin | qr */
-			phoneScanTarget: 'bin',
-		};
-	},
-	computed: {
-		isReadonly() {
-			return this.pageMode === 'view';
-		},
-		isEditable() {
-			return this.pageMode === 'add' || this.pageMode === 'edit';
-		},
-		headerEditable() {
-			return this.pageMode === 'add' && !this.headerSaved;
-		},
-		/** 纸筒/包装重量随扫码提交，保存前后及可扫编辑态均可改 */
-		canEditWeights() {
-			return this.isEditable && (this.headerEditable || this.canScan);
-		},
-		statusActionButtons() {
-			return getFormStatusActionButtons(this.headerSaved, this.orderId, this.auditStatus);
-		},
-		displayAuditStatus() {
-			if (this.pageMode === 'add' && !this.headerSaved) return DRAFT_AUDIT_STATUS;
-			return this.auditStatus;
-		},
-		displayAuditStatusName() {
-			if (this.pageMode === 'add' && !this.headerSaved) return DRAFT_AUDIT_STATUS_NAME;
-			return AUDIT_STATUS_MAP[this.auditStatus] || '';
-		},
-		/** 录入需先选仓位；删除模式仅需单据可扫 */
-		canScanQr() {
-			if (!this.canScan) return false;
-			if (this.BarCodeDelStatus) return true;
-			return !!this.warehouseBinId;
-		},
-		/** 扫码栏在可扫状态下始终展示（含删除勾选） */
-		showQrScanBar() {
-			return this.canScan;
-		},
-		qrDisabledTip() {
-			if (!this.canScan) return '请先提交保存后再扫码';
-			if (!this.warehouseBinId && !this.BarCodeDelStatus) return '请先扫描仓位后再扫布匹二维码';
-			return '当前状态不可扫码';
-		},
-		phoneScanHint() {
-			return this.phoneScanTarget === 'bin'
-				? '请扫描仓位，成功后自动扫布飞'
-				: '连续扫描布飞二维码，扫完可继续下一条';
-		},
-	},
-	onShow() {
-		this.isPageActive = true;
-		initTts();
-		if (this.canScan && this.isEditable) {
-			this.registerOrderScanBroadcast();
-		}
-	},
-	onHide() {
-		this.isPageActive = false;
-		this.phoneContinuousScan = false;
-		this.unregisterScanBroadcast();
-	},
-	onUnload() {
-		this.isPageActive = false;
-		this.phoneContinuousScan = false;
-		this.unregisterScanBroadcast();
-	},
-	methods: {
-		clearWarehouseBin() {
-			this.warehouseBinId = 0;
-			this.warehouseBinCode = '';
-			this.warehouseBinName = '';
-			this.phoneContinuousScan = false;
-			this._phoneBinLocked = false;
-			this._pendingFabricCode = '';
-			if (this.phoneScanTarget === 'bin') this.closePhoneScanPanel();
-		},
-		/** 重扫仓位：先清空输入框再填入，避免残留旧码拼接 */
-		applyWarehouseBinScan(scanResult) {
-			const code = String(scanResult || '').trim().replace(/[\r\n]/g, '');
-			if (!code) return;
-			this.warehouseBinCode = '';
-			this.$nextTick(() => {
-				this.warehouseBinCode = code;
-				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.openHalfScreenScan('bin');
-		},
-		handlePhoneScan() {
-			if (!this.canScan || !this.orderId) {
-				this.showError('请先提交保存后再扫码');
-				return;
-			}
-			// 删除模式可直接扫布匹码；录入模式无仓位时先扫仓位
-			if (!this.BarCodeDelStatus && !this.warehouseBinId) {
-				this.handleBinPhoneScan();
-				return;
-			}
-			this.openHalfScreenScan('qr');
-		},
-		openContinuousPhoneScan() {
-			if (this.phoneScanPanelOpen) return;
-			if (!this.phoneContinuousScan || !this.canScanQr || !this.isPageActive) {
-				this.phoneContinuousScan = false;
-				return;
-			}
-			this.openPhoneScan({
-				callback: (scanResult) => {
-					this.QRBarCode = String(scanResult || '').trim().replace(/[\r\n]/g, '');
-					this.$nextTick(() => this.handleScan({ fromPhone: true }));
-				},
-				fail: () => {
-					this.phoneContinuousScan = false;
-				},
-			});
-		},
-		scheduleNextPhoneScan() {
-			if (this.phoneScanPanelOpen) return;
-			if (!this.phoneContinuousScan || !this.canScanQr || !this.isPageActive) {
-				this.phoneContinuousScan = false;
-				return;
-			}
-			setTimeout(() => {
-				this.openContinuousPhoneScan();
-			}, 400);
-		},
-		registerOrderScanBroadcast() {
-			this.registerScanBroadcast((scanResult) => {
-				const code = String(scanResult || '').trim().replace(/[\r\n]/g, '');
-				if (!code) return;
-				// 删除模式：直接按布匹码删除；未扫仓位时枪扫优先解析为仓位
-				if (!this.BarCodeDelStatus && !this.warehouseBinId) {
-					this.applyWarehouseBinScan(code);
-					return;
-				}
-				this.QRBarCode = code;
-				this.$nextTick(() => this.handleScan());
-			});
-		},
-		resolveWarehouseBin() {
-			const code = (this.warehouseBinCode || '').trim();
-			if (!this.canScan || !this.orderId) {
-				this.showError('请先提交保存后再扫码');
-				return;
-			}
-			if (!code) return;
-			if (!this.form.warehouse_id) {
-				this.showError('单据缺少仓库信息');
-				return;
-			}
-			uni.showLoading({ title: '识别仓位...' });
-			return this.$u.api.warehouseBin.getByQrCode({
-				qr_code: code,
-				warehouse_id: Number(this.form.warehouse_id),
-			})
-				.then((data) => {
-					uni.hideLoading();
-					if (!data || !data.id) {
-						throw new Error('未识别到仓位');
-					}
-					// 返回 physical_warehouse_id，与单据仓库校验
-					if (
-						data.physical_warehouse_id
-						&& String(data.physical_warehouse_id) !== String(this.form.warehouse_id)
-					) {
-						this.warehouseBinId = 0;
-						this.warehouseBinName = '';
-						throw new Error('该仓位不属于当前仓库');
-					}
-					this.warehouseBinId = data.id;
-					this.warehouseBinCode = data.code || data.qr_code || code;
-					this.warehouseBinName = data.name || '';
-					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 = '';
-					this.showError(e.message || '仓位识别失败');
-				});
-		},
-		syncCanScanFromStatus(status) {
-			const nextCanScan = this.isEditable && canScanAtStatus(status);
-			if (this.canScan && !nextCanScan) {
-				this.phoneContinuousScan = false;
-				this.closePhoneScanPanel();
-				this.unregisterScanBroadcast();
-			}
-			this.canScan = nextCanScan;
-		},
-		loadBaseDropdowns() {
-			if (this.dropdownLoading) return Promise.resolve();
-			this.dropdownLoading = true;
-			if (this.headerEditable) this.applyDefaultSaleSystem();
-			return Promise.all([
-				this.ensureProcessUnitOptions().catch((e) => {
-					console.error('加载加工单位失败', e);
-					return [];
-				}),
-				this.ensureWarehouseOptions().catch((e) => {
-					console.error('加载仓库失败', e);
-					return [];
-				}),
-				this.ensureSaleSystemOptions().catch((e) => {
-					console.error('加载营销体系失败', e);
-					return [];
-				}),
-			]).finally(() => {
-				this.dropdownLoading = false;
-			});
-		},
-		ensureProcessUnitOptions() {
-			if (this.processUnitOptions.length) return Promise.resolve(this.processUnitOptions);
-			return this.$u.api.businessUnit.list({ unit_type_id: BUSINESS_UNIT_TYPE_PROCESS })
-				.then((res) => {
-					this.processUnitOptions = mapToSelectOptions(res);
-					return this.processUnitOptions;
-				});
-		},
-		ensureWarehouseOptions() {
-			if (this.warehouseOptions.length) return Promise.resolve(this.warehouseOptions);
-			return this.$u.api.physicalWarehouse.getDropdownList({ warehouse_type_id: WAREHOUSE_TYPE_FINISHED })
-				.then((res) => {
-					this.warehouseOptions = mapToSelectOptions(res);
-					if (this.headerEditable && !this.form.warehouse_id) {
-						this.applyDefaultWarehouse();
-					}
-					return this.warehouseOptions;
-				});
-		},
-		ensureSaleSystemOptions() {
-			if (this.saleSystemOptions.length) return Promise.resolve(this.saleSystemOptions);
-			return this.$u.api.saleSystem.getDropdownList()
-				.then((res) => {
-					this.saleSystemOptions = mapToSelectOptions(res);
-					if (this.headerEditable) this.applyDefaultSaleSystem();
-					return this.saleSystemOptions;
-				});
-		},
-		fetchRemoteSelectOptions(type, keyword) {
-			const empty = !String(keyword || '').trim();
-			if (type === '加工单位') {
-				return this.$u.api.businessUnit.list(withNameParam({ unit_type_id: BUSINESS_UNIT_TYPE_PROCESS }, keyword))
-					.then((res) => {
-						const list = mapToSelectOptions(res);
-						if (empty) this.processUnitOptions = list;
-						return list;
-					});
-			}
-			if (type === '仓库名称') {
-				return this.$u.api.physicalWarehouse.getDropdownList(withNameParam({ warehouse_type_id: WAREHOUSE_TYPE_FINISHED }, keyword))
-					.then((res) => {
-						const list = mapToSelectOptions(res);
-						if (empty) this.warehouseOptions = list;
-						return list;
-					});
-			}
-			if (type === '营销体系') {
-				return this.$u.api.saleSystem.getDropdownList(withNameParam({}, keyword))
-					.then((res) => {
-						const list = mapToSelectOptions(res);
-						if (empty) this.saleSystemOptions = list;
-						return list;
-					});
-			}
-			return Promise.resolve([]);
-		},
-		applyDefaultWarehouse() {
-			const app = getApp();
-			const picked = pickDefaultWarehouse(
-				this.warehouseOptions,
-				app && app.globalData ? app.globalData.StoreNameID : '',
-				app && app.globalData ? app.globalData.StoreName : '',
-			);
-			if (!picked) return;
-			this.form.warehouse_id = picked.value;
-			this.form.warehouse_name = picked.label;
-		},
-		applyDefaultSaleSystem() {
-			if (this.form.sale_system_id) {
-				if (!this.form.sale_system_name && this.saleSystemOptions.length) {
-					const found = this.saleSystemOptions.find(
-						(item) => String(item.value) === String(this.form.sale_system_id),
-					);
-					if (found) this.form.sale_system_name = found.label;
-				}
-				return;
-			}
-			const app = getApp();
-			const gd = app && app.globalData ? app.globalData : {};
-			const id = gd.PlanDepartmentID;
-			if (!id) return;
-			this.form.sale_system_id = id;
-			this.form.sale_system_name = gd.PlanDepartmentName || '';
-			if (!this.form.sale_system_name && this.saleSystemOptions.length) {
-				const found = this.saleSystemOptions.find((item) => String(item.value) === String(id));
-				if (found) this.form.sale_system_name = found.label;
-			}
-		},
-		getEmptyForm() {
-			const app = getApp();
-			const gd = app && app.globalData ? app.globalData : {};
-			return {
-				order_no: '',
-				process_unit_id: '',
-				process_name: '',
-				warehouse_id: '',
-				warehouse_name: '',
-				sale_system_id: gd.PlanDepartmentID || '',
-				sale_system_name: gd.PlanDepartmentName || '',
-				in_order_type: IN_ORDER_TYPE_PROCESS,
-				in_order_type_name: IN_ORDER_TYPE_MAP[IN_ORDER_TYPE_PROCESS],
-				paper_tube_weight: String(DEFAULT_PAPER_TUBE_WEIGHT),
-				package_weight: String(DEFAULT_PACKAGE_WEIGHT),
-				remark: '',
-				item_data: [],
-			};
-		},
-		loadOrder(id, options = {}) {
-			const { rejectIfLocked = false } = options;
-			return this.$u.api.fpmProcessInOrder.detail({ id })
-				.then((res) => {
-					const order = normalizeOrder(res);
-					if (!order) {
-						this.showError('单据不存在');
-						return null;
-					}
-					if (rejectIfLocked && isLockedOrderStatus(order.audit_status)) {
-						this.showError('当前状态不可编辑');
-						setTimeout(() => uni.navigateBack(), 1500);
-						return null;
-					}
-					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);
-					if (this.canScan) this.registerOrderScanBroadcast();
-					return order;
-				})
-				.catch((e) => {
-					this.showError(e.message || '加载单据失败');
-					return null;
-				});
-		},
-		pickerSelectFun(type) {
-			if (!this.headerEditable) return;
-			if (type === '进仓类型') {
-				this.selectType = type;
-				if (!this.inOrderTypeOptions.length) {
-					this.showError('暂无可选数据');
-					return;
-				}
-				this.selectList = this.inOrderTypeOptions;
-				this.selectShow = true;
-				return;
-			}
-			const cache = {
-				'加工单位': this.processUnitOptions,
-				'仓库名称': this.warehouseOptions,
-				'营销体系': this.saleSystemOptions,
-			};
-			if (cache[type]) this.openSelectPicker(type, cache[type]);
-		},
-		selectConfirmFun(e) {
-			const item = e[0];
-			if (this.selectType === '进仓类型') {
-				this.form.in_order_type = item.value;
-				this.form.in_order_type_name = item.label;
-			} else if (this.selectType === '加工单位') {
-				this.form.process_unit_id = item.value;
-				this.form.process_name = item.label;
-			} else if (this.selectType === '仓库名称') {
-				this.form.warehouse_id = item.value;
-				this.form.warehouse_name = item.label;
-			} else if (this.selectType === '营销体系') {
-				this.form.sale_system_id = item.value;
-				this.form.sale_system_name = item.label;
-			}
-		},
-		validateForm() {
-			if (!this.form.in_order_type) return '请选择进仓类型';
-			if (!this.form.process_unit_id) return '请选择加工单位';
-			if (!this.form.warehouse_id) return '请选择仓库名称';
-			if (!this.form.sale_system_id) return '请选择营销体系';
-			return '';
-		},
-		buildAddParam() {
-			return {
-				inOrderType: Number(this.form.in_order_type),
-				process_unit_id: Number(this.form.process_unit_id),
-				warehouse_id: Number(this.form.warehouse_id),
-				sale_system_id: Number(this.form.sale_system_id),
-				remark: this.form.remark || '',
-				item_data: [],
-			};
-		},
-		submitSave() {
-			if (this.headerSaved) {
-				this.showError('表头已保存，请直接扫码');
-				return;
-			}
-			const err = this.validateForm();
-			if (err) {
-				this.showError(err);
-				return;
-			}
-			uni.showLoading({ title: '保存中...' });
-			this.$u.api.fpmProcessInOrder.add(this.buildAddParam())
-				.then((res) => {
-					this.orderId = (res && res.id) || 0;
-					if (!this.orderId) {
-						throw new Error('保存失败，未返回单据ID');
-					}
-					return this.$u.api.fpmProcessInOrder.detail({ id: this.orderId });
-				})
-				.then((detail) => {
-					uni.hideLoading();
-					const order = normalizeOrder(detail);
-					this.applyOrder(order, { keepWeights: true });
-					this.headerSaved = true;
-					this.headerCollapsed = true;
-					this.clearWarehouseBin();
-					this.syncCanScanFromStatus(order.audit_status);
-					this.showSuccess('保存成功，请先扫描仓位', '保存成功', { voiceOnly: true });
-					this.registerOrderScanBroadcast();
-				})
-				.catch((e) => {
-					uni.hideLoading();
-					this.showError(e.message || '保存失败');
-				});
-		},
-		applyOrder(order, options = {}) {
-			if (!order) return;
-			this.auditStatus = order.audit_status;
-			const paperTubeWeight = this.form.paper_tube_weight;
-			const packageWeight = this.form.package_weight;
-			Object.assign(this.form, orderToFormFields(order));
-			if (options.keepWeights) {
-				this.form.paper_tube_weight = paperTubeWeight;
-				this.form.package_weight = packageWeight;
-			}
-		},
-		handleScan(options = {}) {
-			const fromPhone = !!options.fromPhone;
-			const code = (this.QRBarCode || '').trim();
-			if (!this.canScan || !this.orderId) {
-				this.showError('请先提交保存后再扫码');
-				this.QRBarCode = '';
-				this.phoneContinuousScan = false;
-				return;
-			}
-			const isDelete = this.BarCodeDelStatus;
-			if (!isDelete && !this.warehouseBinId) {
-				this.showError('请先扫描仓位');
-				this.QRBarCode = '';
-				this.phoneContinuousScan = false;
-				return;
-			}
-			if (!code) {
-				this.QRBarCode = '';
-				if (fromPhone) this.scheduleNextPhoneScan();
-				return;
-			}
-			const arrangeType = isDelete ? ARRANGE_TYPE.DEL : ARRANGE_TYPE.IN;
-			this.doScanUpdate(code, arrangeType, { fromPhone });
-		},
-		BarCodeDelChange(e) {
-			this.BarCodeDelStatus = (e.detail.value || []).length > 0;
-			this.BillDataMessage = this.BarCodeDelStatus ? '删除模式：扫描细码即可删除' : '';
-		},
-		getFineCodeScanCode(fineCode) {
-			if (!fineCode) return '';
-			return fineCode.qr_code
-				|| fineCode.long_code
-				|| fineCode.scan_code
-				|| fineCode.digital_code
-				|| fineCode.bar_code
-				|| fineCode.short_code
-				|| '';
-		},
-		onDeleteFineCode(fineCode) {
-			if (!this.canScan || !this.orderId) {
-				this.showError('当前状态不可删除');
-				return;
-			}
-			const scanCode = this.getFineCodeScanCode(fineCode);
-			if (!scanCode) {
-				this.showError('该细码缺少条码，无法删除');
-				return;
-			}
-			uni.showModal({
-				title: '提示',
-				content: `确认删除细码 ${scanCode}？`,
-				success: (res) => {
-					if (!res.confirm) return;
-					this.doScanUpdate(scanCode, ARRANGE_TYPE.DEL);
-				},
-			});
-		},
-		doScanUpdate(scanCode, arrangeType, options = {}) {
-			const { fromPhone = false } = options;
-			const isDelete = arrangeType === ARRANGE_TYPE.DEL;
-			if (!isDelete) {
-				const weightErr = validateScanWeights(this.form.paper_tube_weight, this.form.package_weight);
-				if (weightErr) {
-					this.showError(weightErr);
-					this.QRBarCode = '';
-					this.phoneContinuousScan = false;
-					return;
-				}
-			}
-			uni.showLoading({ title: isDelete ? '删除中...' : '处理中...' });
-			return this.$u.api.fpmProcessInOrder.scanUpdate(buildScanUpdateParams({
-				id: this.orderId,
-				scanCode,
-				arrangeType,
-				// 删除不强制仓位；录入带当前仓位
-				warehouseBinId: isDelete ? 0 : this.warehouseBinId,
-				paperTubeWeight: this.form.paper_tube_weight,
-				packageWeight: this.form.package_weight,
-			}))
-				.then((scanRes) => {
-					this.scanDetail = buildScanDetailFromScanResponse(scanRes);
-					this.BillDataMessage = isDelete ? '删除成功' : '扫描成功';
-					this.QRBarCode = '';
-					if (isDelete) {
-						speak('已删除');
-						uni.showToast({ title: '删除成功', icon: 'success' });
-					} else {
-						speak('成功');
-					}
-					return this.$u.api.fpmProcessInOrder.detail({ id: this.orderId })
-						.then((detail) => {
-							const order = normalizeOrder(detail);
-							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);
-				})
-				.then(() => {
-					uni.hideLoading();
-					if (fromPhone) this.scheduleNextPhoneScan();
-				})
-				.catch((e) => {
-					uni.hideLoading();
-					this.phoneContinuousScan = false;
-					const message = e.message || (isDelete ? '删除失败' : '扫码失败');
-					speak(isDelete ? '删除失败' : '扫码失败');
-					uni.showToast({ title: message, icon: 'none', duration: 2500 });
-					this.QRBarCode = '';
-				});
-		},
-		handleStatusAction(action) {
-			confirmOrderStatusAction(this, {
-				orderId: this.orderId,
-				action,
-				onSuccess: () => this.$u.api.fpmProcessInOrder.detail({ id: this.orderId })
-					.then((detail) => {
-						uni.hideLoading();
-						const order = normalizeOrder(detail);
-						if (!order) return;
-						this.applyOrder(order);
-						this.syncCanScanFromStatus(order.audit_status);
-						this.showSuccess(util.statusSuccessVoice(action));
-					}),
-			});
-		},
-		showError(message) {
-			util.playErrorAudio(message);
-			uni.showModal({ title: '提示', content: message, showCancel: false });
-		},
-		showSuccess(message, voiceText, options) {
-			util.playSuccessAudio(voiceText || message, options);
-			uni.showToast({ title: message, icon: 'success' });
-		},
-	},
-};

src/pages/storegoods/storeGoodsProcessInView.vue

@@ -1,159 +0,0 @@
-<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 ptb20 bdb_f5">
-			<text class="mr26">进仓类型</text>
-			<text>{{ order.in_order_type_name || '加工进仓单' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">加工单位</text>
-			<text>{{ order.process_name || '-' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">仓库名称</text>
-			<text>{{ order.warehouse_name || '-' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5 process-in-weight-row">
-			<view class="process-in-weight-col">
-				<text class="mr16">纸筒重量</text>
-				<text>{{ order.paper_tube_weight != null ? order.paper_tube_weight : '-' }}</text>
-			</view>
-			<view class="process-in-weight-col">
-				<text class="mr16">包装重量</text>
-				<text>{{ order.package_weight != null ? order.package_weight : '-' }}</text>
-			</view>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">营销体系</text>
-			<text>{{ order.sale_system_name || '-' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">单据备注</text>
-			<text>{{ order.remark || '-' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">创建人</text>
-			<text>{{ order.creator_name }} {{ formatTime(order.create_time, 'YYYY-MM-DD') }}</text>
-		</view>
-		<view v-if="order.auditor_name" class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">审核人</text>
-			<text>{{ order.auditor_name }} {{ formatTime(order.audit_time, 'YYYY-MM-DD') }}</text>
-		</view>
-		</OrderHeaderFold>
-
-		<ProcessInDetailList
-			:title="detailTitle"
-			:list="order.item_data"
-			show-tare-columns
-		/>
-
-		<FabricOutFooter :buttons="actionButtons" @action="handleAction" />
-	</view>
-</template>
-
-<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 {
-	normalizeOrder,
-	getViewStatusActionButtons,
-	confirmOrderStatusAction,
-	formatDisplayTime,
-} from '@/common/storeGoodsProcessIn';
-
-export default {
-	components: { OrderStatusBar, OrderHeaderFold, FabricOutFooter, ProcessInDetailList },
-	data() {
-		return {
-			orderId: 0,
-			headerCollapsed: true,
-			order: { item_data: [] },
-		};
-	},
-	computed: {
-		actionButtons() {
-			return getViewStatusActionButtons(this.order.audit_status);
-		},
-		detailTitle() {
-			return `进仓明细（共 ${this.order.total_roll || 0} 匹）`;
-		},
-	},
-	onLoad(e) {
-		uni.setNavigationBarTitle({ title: '查看加工进仓单' });
-		if (e.id) {
-			this.orderId = Number(e.id);
-			this.refreshOrder();
-		}
-	},
-	onShow() {
-		if (this.orderId) this.refreshOrder();
-	},
-	methods: {
-		formatTime: formatDisplayTime,
-		refreshOrder() {
-			this.$u.api.fpmProcessInOrder.detail({ id: this.orderId })
-				.then((res) => {
-					const order = normalizeOrder(res);
-					if (!order) {
-						this.showError('单据不存在');
-						return;
-					}
-					this.order = order;
-				})
-				.catch((err) => {
-					this.showError(err.message || '加载单据失败');
-				});
-		},
-		handleAction(action) {
-			if (action === 'edit') {
-				uni.navigateTo({ url: `./storeGoodsProcessInEdit?id=${this.orderId}` });
-				return;
-			}
-			confirmOrderStatusAction(this, {
-				orderId: this.orderId,
-				action,
-				onSuccess: () => {
-					uni.hideLoading();
-					const voice = util.statusSuccessVoice(action);
-					util.playSuccessAudio(voice);
-					uni.showToast({ title: voice, icon: 'success' });
-					if (action === 'unapprove') {
-						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(message);
-			uni.showModal({ title: '提示', content: message, showCancel: false });
-		},
-	},
-};
-</script>
-
-<style lang="scss">
-@import '@/pages/storefabric/storeFabricBusinessOutPage.scss';
-page {
-	background-color: #F8F8F8;
-	padding-bottom: 260rpx;
-}
-.process-in-weight-row {
-	gap: 20rpx;
-}
-.process-in-weight-col {
-	flex: 1;
-	display: flex;
-	align-items: center;
-	min-width: 0;
-}
-</style>

src/pages/storegoods/storeGoodsProcessOutAdd.vue

@@ -1,110 +0,0 @@
-<template>
-	<view class="fabric-out-page">
-		<OrderHeaderFold v-model="headerCollapsed" :summary="form.order_no || '保存后自动生成'">
-		<OrderStatusBar class="fabric-out-mt32" :status="displayAuditStatus" :name="displayAuditStatusName" />
-		<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'">
-				{{ form.out_order_type_name || '请选择' }}
-				<u-icon v-if="headerEditable" class="ml26" name="arrow-right" size="40" color="#888888"></u-icon>
-			</view>
-		</view>
-		<view @click="pickerSelectFun('加工单位')" class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">加工单位<text class="redXingh">*</text></text>
-			<view :class="form.process_name ? '' : 'cBlack'">
-				{{ form.process_name || '请选择' }}
-				<u-icon v-if="headerEditable" class="ml26" name="arrow-right" size="40" color="#888888"></u-icon>
-			</view>
-		</view>
-		<view @click="pickerSelectFun('仓库名称')" class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">仓库名称<text class="redXingh">*</text></text>
-			<view :class="form.warehouse_name ? '' : 'cBlack'">
-				{{ form.warehouse_name || '请选择' }}
-				<u-icon v-if="headerEditable" class="ml26" name="arrow-right" size="40" color="#888888"></u-icon>
-			</view>
-		</view>
-		<view class="flex-white-plr26-column ptb20 mt32">
-			<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"
-			:delete-mode="BarCodeDelStatus"
-			:message="BillDataMessage"
-			:disabled-tip="qrDisabledTip"
-			:show-phone-scan="canScanQr"
-			:scanning="phoneScanPanelOpen"
-			@input="QRBarCode = $event"
-			@scan="handleScan"
-			@phone-scan="handlePhoneScan"
-			@delete-mode-change="BarCodeDelChange"
-		/>
-		<ProcessOutScanDetail :detail="scanDetail" />
-
-		<ProcessOutDetailList
-			:list="form.item_data"
-			:deletable="canScan"
-			@delete="onDeleteFineCode"
-		/>
-
-		<FabricOutFooter
-			v-if="!headerSaved"
-			:buttons="[{ label: '提交保存', action: 'save' }]"
-			single
-			@action="submitSave"
-		/>
-		<FabricOutFooter
-			v-else
-			:buttons="statusActionButtons"
-			@action="handleStatusAction"
-		/>
-
-		<u-select v-model="selectShow" :list="selectList" :remote="isRemoteSelect" :loading="selectSearching" @search="onSelectSearch" @confirm="selectConfirmFun"></u-select>
-	</view>
-</template>
-
-<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],
-	onLoad() {
-		uni.setNavigationBarTitle({ title: '新增加工出仓单' });
-		this.pageMode = 'add';
-		this.loadBaseDropdowns();
-	},
-};
-</script>
-
-<style lang="scss">
-@import '@/pages/storefabric/storeFabricBusinessOutPage.scss';
-page {
-	background-color: #F8F8F8;
-	padding-bottom: 260rpx;
-}
-</style>

src/pages/storegoods/storeGoodsProcessOutEdit.vue

@@ -1,98 +0,0 @@
-<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 ptb20 bdb_f5">
-			<text class="mr26">出仓类型</text>
-			<text>{{ form.out_order_type_name || '正常加工出仓' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">加工单位</text>
-			<text>{{ form.process_name || '-' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">仓库名称</text>
-			<text>{{ form.warehouse_name || '-' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<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"
-			:delete-mode="BarCodeDelStatus"
-			:message="BillDataMessage"
-			:disabled-tip="qrDisabledTip"
-			:show-phone-scan="canScanQr"
-			:scanning="phoneScanPanelOpen"
-			@input="QRBarCode = $event"
-			@scan="handleScan"
-			@phone-scan="handlePhoneScan"
-			@delete-mode-change="BarCodeDelChange"
-		/>
-		<ProcessOutScanDetail :detail="scanDetail" />
-
-		<ProcessOutDetailList
-			:list="form.item_data"
-			:deletable="canScan"
-			@delete="onDeleteFineCode"
-		/>
-
-		<FabricOutFooter :buttons="statusActionButtons" @action="handleStatusAction" />
-
-		<u-select v-model="selectShow" :list="selectList" :remote="isRemoteSelect" :loading="selectSearching" @search="onSelectSearch" @confirm="selectConfirmFun"></u-select>
-	</view>
-</template>
-
-<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';
-		if (e.id) {
-			this.loadOrder(Number(e.id), { rejectIfLocked: true });
-		}
-	},
-};
-</script>
-
-<style lang="scss">
-@import '@/pages/storefabric/storeFabricBusinessOutPage.scss';
-page {
-	background-color: #F8F8F8;
-	padding-bottom: 260rpx;
-}
-</style>

src/pages/storegoods/storeGoodsProcessOutList.vue

@@ -1,277 +0,0 @@
-<template>
-	<view>
-		<view class="filterBar">
-			<u-search v-model="filters.order_no" 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="filterIconColor" name="list" size="44" :color="filterIconColor"></u-icon>
-					<view v-if="hasActiveFilter" class="filterBtn__badge"></view>
-				</view>
-				<text>筛选</text>
-			</view>
-		</view>
-
-		<scroll-view scroll-y :style="{ height: scrollHeight }" refresher-enabled
-			:refresher-triggered="triggered" @refresherrefresh="onRefresh">
-			<dataNull v-if="list.length === 0" src="/src/static/img/chahua/gjNull.png"
-				title="暂无加工出仓单" title1="请点击右下角按钮新增">
-			</dataNull>
-			<view v-for="(item, index) in list" :key="item.id" @click="goView(item)">
-				<ProcessOutItem :item="item" :index="index" />
-			</view>
-		</scroll-view>
-
-		<addBtn url="./storeGoodsProcessOutAdd"></addBtn>
-
-		<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>
-					<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="36"></u-icon></view>
-				</view>
-				<view class="filterItem" @click="openWarehouseSelect">
-					<text class="filterLabel">仓库</text>
-					<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="36"></u-icon></view>
-				</view>
-				<view class="filterActions">
-					<u-button type="warning" size="medium" @click="resetFilter">重置</u-button>
-					<u-button type="primary" size="medium" @click="applyFilter">确定</u-button>
-				</view>
-			</view>
-		</u-popup>
-
-		<u-select class="pdaSelect" v-model="statusSelectShow" title="选择订单状态" :list="statusSelectList" :default-value="statusSelectDefault" @confirm="onStatusConfirm"></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>
-
-<script>
-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,
-	formatRoll,
-	mapToSelectOptions,
-	fetchAllOrderList,
-} from '@/common/storeGoodsProcessOut';
-import { withNameParam } from '@/common/remoteSelect';
-import listFilterMixin from '@/mixins/listFilterMixin';
-
-export default {
-	components: { addBtn, ProcessOutItem },
-	mixins: [listFilterMixin],
-	data() {
-		return {
-			list: [],
-			scrollHeight: '667px',
-			triggered: false,
-			listLoading: false,
-			filterShow: false,
-			statusSelectShow: false,
-			unitSelectShow: false,
-			unitSelectType: '',
-			processUnitOptions: [],
-			warehouseOptions: [],
-			unitOptionsLoading: false,
-			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.PENDING,
-			},
-			statusSelectList: [
-				{ value: '', label: '全部' },
-				...getStatusOptions(),
-			],
-		};
-	},
-	computed: {
-		statusLabel() {
-			if (this.filters.audit_status === '' || this.filters.audit_status === null) return '';
-			return AUDIT_STATUS_MAP[Number(this.filters.audit_status)] || '';
-		},
-		processUnitLabel() {
-			return this.filters.process_name || '';
-		},
-		warehouseLabel() {
-			return this.filters.warehouse_name || '';
-		},
-	},
-	onLoad() {
-		uni.setNavigationBarTitle({ title: '加工出仓列表' });
-		this.restoreFilterCache();
-		uni.getSystemInfo({
-			success: (res) => {
-				this.scrollHeight = `${res.windowHeight - 50}px`;
-			},
-		});
-	},
-	onShow() {
-		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 })
-				.then((res) => {
-					this.processUnitOptions = mapToSelectOptions(res);
-					return this.processUnitOptions;
-				})
-				.catch(() => {
-					this.processUnitOptions = [];
-					return this.processUnitOptions;
-				});
-		},
-		loadWarehouseOptions() {
-			if (this.warehouseOptions.length) return Promise.resolve(this.warehouseOptions);
-			return this.$u.api.physicalWarehouse.getDropdownList({ warehouse_type_id: WAREHOUSE_TYPE_FINISHED })
-				.then((res) => {
-					this.warehouseOptions = mapToSelectOptions(res);
-					return this.warehouseOptions;
-				})
-				.catch(() => {
-					this.warehouseOptions = [];
-					return this.warehouseOptions;
-				});
-		},
-		openUnitSelect(type) {
-			this.unitSelectType = type;
-			const cache = type === 'warehouse' ? this.warehouseOptions : this.processUnitOptions;
-			this.applyUnitSelectList(cache);
-			this.unitSelectShow = true;
-		},
-		onUnitSearch(keyword) {
-			const seq = ++this.unitSearchSeq;
-			const type = this.unitSelectType;
-			const empty = !String(keyword || '').trim();
-			this.selectSearching = true;
-			const req = type === 'warehouse'
-				? this.$u.api.physicalWarehouse.getDropdownList(withNameParam({ warehouse_type_id: WAREHOUSE_TYPE_FINISHED }, keyword))
-				: this.$u.api.businessUnit.list(withNameParam({ unit_type_id: BUSINESS_UNIT_TYPE_PROCESS }, keyword));
-			req.then((res) => {
-				if (seq !== this.unitSearchSeq) return;
-				const list = mapToSelectOptions(res);
-				if (empty) {
-					if (type === 'warehouse') this.warehouseOptions = list;
-					else this.processUnitOptions = list;
-				}
-				this.applyUnitSelectList(list, empty);
-			}).catch((e) => {
-				if (seq !== this.unitSearchSeq) return;
-				uni.showToast({ title: (e && e.message) || '搜索失败', icon: 'none' });
-			}).then(() => {
-				if (seq === this.unitSearchSeq) this.selectSearching = false;
-			}, () => {
-				if (seq === this.unitSearchSeq) this.selectSearching = false;
-			});
-		},
-		openProcessUnitSelect() {
-			this.openUnitSelect('process');
-		},
-		openWarehouseSelect() {
-			this.openUnitSelect('warehouse');
-		},
-		onUnitConfirm(e) {
-			const item = e[0] || {};
-			if (this.unitSelectType === 'warehouse') {
-				this.filters.warehouse_id = item.value;
-				this.filters.warehouse_name = item.value ? item.label : '';
-			} else {
-				this.filters.process_unit_id = item.value;
-				this.filters.process_name = item.value ? item.label : '';
-			}
-		},
-		loadList() {
-			if (this.listLoading) return;
-			this.listLoading = true;
-			const filters = this.appliedFilters || this.filters;
-			const params = {};
-			if (filters.order_no) params.order_no = filters.order_no;
-			if (filters.process_unit_id) params.process_unit_id = filters.process_unit_id;
-			if (filters.warehouse_id) params.warehouse_id = filters.warehouse_id;
-			if (this.hasFilterValue(filters.audit_status)) {
-				params.audit_status = filters.audit_status;
-			}
-			fetchAllOrderList((p) => this.$u.api.fpmProcessOutOrder.list(p), params)
-				.then((rows) => {
-					this.list = rows.map(this.mapToCard);
-				})
-				.catch((err) => {
-					this.list = [];
-					uni.showToast({ title: err.message || '加载失败', icon: 'none' });
-				})
-				.finally(() => {
-					this.listLoading = false;
-					this.triggered = false;
-					// 避免并发请求下 uView 全局 loading 遮罩关不掉
-					uni.hideLoading();
-				});
-		},
-		mapToCard(order) {
-			return {
-				id: order.id,
-				order_no: order.order_no || '',
-				out_order_type: order.out_order_type || '',
-				out_order_type_name: order.out_order_type_name || '',
-				process_unit_id: order.process_unit_id || '',
-				process_name: order.process_name || '',
-				warehouse_id: order.warehouse_id || '',
-				warehouse_name: order.warehouse_name || '',
-				create_user_name: order.creator_name || '',
-				create_time: order.create_time || '',
-				auditor_name: order.auditor_name || '',
-				audit_date: order.audit_time || '',
-				audit_status: order.audit_status,
-				audit_status_name: order.audit_status_name || AUDIT_STATUS_MAP[order.audit_status] || '',
-				total_roll: formatRoll(order.total_roll),
-			};
-		},
-		onRefresh() {
-			this.triggered = true;
-			this.loadList();
-		},
-		goView(item) {
-			const page = Number(item.audit_status) === 1
-				? 'storeGoodsProcessOutEdit'
-				: 'storeGoodsProcessOutView';
-			uni.navigateTo({ url: `./${page}?id=${item.id}` });
-		},
-		openStatusSelect() { this.statusSelectShow = true; },
-	},
-};
-</script>
-
-<style lang="scss">
-@import '@/common/list-filter.scss';
-</style>

src/pages/storegoods/storeGoodsProcessOutMixin.js

@@ -1,515 +0,0 @@
-/**
- * 加工出仓单表单 mixin（新增/编辑共用）
- *
- * 1. 先填表头（加工单位 / 仓库 / 备注）提交 add，拿到 id 后可扫码
- * 2. 扫码走 updateFpmProcessOutOrder（arrange_type: 1 录入 / 3 删除），不扫仓位
- * 3. 手机扫码成功展示详情后自动再次调起扫码，形成连续扫
- */
-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';
-import {
-	AUDIT_STATUS_MAP,
-	ARRANGE_TYPE,
-	BUSINESS_UNIT_TYPE_PROCESS,
-	WAREHOUSE_TYPE_FINISHED,
-	OUT_ORDER_TYPE_PROCESS,
-	OUT_ORDER_TYPE_PROCESS_NAME,
-	normalizeOrder,
-	mapToSelectOptions,
-	canScanAtStatus,
-	isLockedOrderStatus,
-	getFormStatusActionButtons,
-	orderToFormFields,
-	confirmOrderStatusAction,
-	DRAFT_AUDIT_STATUS,
-	DRAFT_AUDIT_STATUS_NAME,
-	getEmptyScanDetail,
-	buildScanDetailFromScanResponse,
-	buildScanUpdateParams,
-	pickDefaultWarehouse,
-	formatDisplayTime,
-} from '@/common/storeGoodsProcessOut';
-
-export default {
-	components: { PlusBarcodePanel },
-	mixins: [scanMixin, remoteSelectMixin],
-	data() {
-		return {
-			pageMode: 'add',
-			orderId: 0,
-			form: this.getEmptyForm(),
-			headerSaved: false,
-			headerCollapsed: false,
-			selectShow: false,
-			selectList: [],
-			selectType: '',
-			canScan: false,
-			QRBarCode: '',
-			BarCodeDelStatus: false,
-			BillDataMessage: '',
-			scanDetail: getEmptyScanDetail(),
-			auditStatus: 0,
-			processUnitOptions: [],
-			warehouseOptions: [],
-			outOrderTypeOptions: [],
-			dropdownLoading: false,
-			/** 手机连续扫码开关：成功后自动再调起；取消/失败则关闭 */
-			phoneContinuousScan: false,
-		};
-	},
-	computed: {
-		isReadonly() {
-			return this.pageMode === 'view';
-		},
-		isEditable() {
-			return this.pageMode === 'add' || this.pageMode === 'edit';
-		},
-		headerEditable() {
-			return this.pageMode === 'add' && !this.headerSaved;
-		},
-		statusActionButtons() {
-			return getFormStatusActionButtons(this.headerSaved, this.orderId, this.auditStatus);
-		},
-		displayAuditStatus() {
-			if (this.pageMode === 'add' && !this.headerSaved) return DRAFT_AUDIT_STATUS;
-			return this.auditStatus;
-		},
-		displayAuditStatusName() {
-			if (this.pageMode === 'add' && !this.headerSaved) return DRAFT_AUDIT_STATUS_NAME;
-			return AUDIT_STATUS_MAP[this.auditStatus] || '';
-		},
-		canScanQr() {
-			return this.canScan;
-		},
-		showQrScanBar() {
-			return this.canScan;
-		},
-		qrDisabledTip() {
-			if (!this.canScan) return '请先提交保存后再扫码';
-			return '当前状态不可扫码';
-		},
-	},
-	onShow() {
-		this.isPageActive = true;
-		initTts();
-		if (this.canScan && this.isEditable) {
-			this.registerOrderScanBroadcast();
-		}
-	},
-	onHide() {
-		this.isPageActive = false;
-		this.phoneContinuousScan = false;
-		this.unregisterScanBroadcast();
-	},
-	onUnload() {
-		this.isPageActive = false;
-		this.phoneContinuousScan = false;
-		this.unregisterScanBroadcast();
-	},
-	methods: {
-		handlePhoneScan() {
-			if (!this.canScan || !this.orderId) {
-				this.showError('请先提交保存后再扫码');
-				return;
-			}
-			this.phoneContinuousScan = false;
-			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;
-			}
-			this.openPhoneScan({
-				callback: (scanResult) => {
-					this.QRBarCode = String(scanResult || '').trim().replace(/[\r\n]/g, '');
-					this.$nextTick(() => this.handleScan({ fromPhone: true }));
-				},
-				fail: () => {
-					this.phoneContinuousScan = false;
-				},
-			});
-		},
-		scheduleNextPhoneScan() {
-			if (this.phoneScanPanelOpen) return;
-			if (!this.phoneContinuousScan || !this.canScanQr || !this.isPageActive) {
-				this.phoneContinuousScan = false;
-				return;
-			}
-			setTimeout(() => {
-				this.openContinuousPhoneScan();
-			}, 400);
-		},
-		registerOrderScanBroadcast() {
-			this.registerScanBroadcast((scanResult) => {
-				const code = String(scanResult || '').trim().replace(/[\r\n]/g, '');
-				if (!code) return;
-				this.QRBarCode = code;
-				this.$nextTick(() => this.handleScan());
-			});
-		},
-		syncCanScanFromStatus(status) {
-			const nextCanScan = this.isEditable && canScanAtStatus(status);
-			if (this.canScan && !nextCanScan) {
-				this.phoneContinuousScan = false;
-				this.closePhoneScanPanel();
-				this.unregisterScanBroadcast();
-			}
-			this.canScan = nextCanScan;
-		},
-		loadBaseDropdowns() {
-			if (this.dropdownLoading) return Promise.resolve();
-			this.dropdownLoading = true;
-			return Promise.all([
-				this.ensureOutOrderTypeOptions().catch((e) => {
-					console.error('加载出仓类型失败', e);
-					return [];
-				}),
-				this.ensureProcessUnitOptions().catch((e) => {
-					console.error('加载加工单位失败', e);
-					return [];
-				}),
-				this.ensureWarehouseOptions().catch((e) => {
-					console.error('加载仓库失败', e);
-					return [];
-				}),
-			]).finally(() => {
-				this.dropdownLoading = false;
-			});
-		},
-		ensureOutOrderTypeOptions() {
-			if (this.outOrderTypeOptions.length) return Promise.resolve(this.outOrderTypeOptions);
-			return this.$u.api.fpmProcessOutOrder.getOutTypeEnum()
-				.then((res) => {
-					this.outOrderTypeOptions = mapToSelectOptions(res);
-					if (this.headerEditable && !this.form.out_order_type) {
-						this.applyDefaultOutOrderType();
-					}
-					return this.outOrderTypeOptions;
-				});
-		},
-		applyDefaultOutOrderType() {
-			const list = this.outOrderTypeOptions || [];
-			const preferred = list.find((item) => Number(item.value) === OUT_ORDER_TYPE_PROCESS) || list[0];
-			if (!preferred) return;
-			this.form.out_order_type = preferred.value;
-			this.form.out_order_type_name = preferred.label;
-		},
-		ensureProcessUnitOptions() {
-			if (this.processUnitOptions.length) return Promise.resolve(this.processUnitOptions);
-			return this.$u.api.businessUnit.list({ unit_type_id: BUSINESS_UNIT_TYPE_PROCESS })
-				.then((res) => {
-					this.processUnitOptions = mapToSelectOptions(res);
-					return this.processUnitOptions;
-				});
-		},
-		ensureWarehouseOptions() {
-			if (this.warehouseOptions.length) return Promise.resolve(this.warehouseOptions);
-			return this.$u.api.physicalWarehouse.getDropdownList({ warehouse_type_id: WAREHOUSE_TYPE_FINISHED })
-				.then((res) => {
-					this.warehouseOptions = mapToSelectOptions(res);
-					if (this.headerEditable && !this.form.warehouse_id) {
-						this.applyDefaultWarehouse();
-					}
-					return this.warehouseOptions;
-				});
-		},
-		fetchRemoteSelectOptions(type, keyword) {
-			const empty = !String(keyword || '').trim();
-			if (type === '加工单位') {
-				return this.$u.api.businessUnit.list(withNameParam({ unit_type_id: BUSINESS_UNIT_TYPE_PROCESS }, keyword))
-					.then((res) => {
-						const list = mapToSelectOptions(res);
-						if (empty) this.processUnitOptions = list;
-						return list;
-					});
-			}
-			if (type === '仓库名称') {
-				return this.$u.api.physicalWarehouse.getDropdownList(withNameParam({ warehouse_type_id: WAREHOUSE_TYPE_FINISHED }, keyword))
-					.then((res) => {
-						const list = mapToSelectOptions(res);
-						if (empty) this.warehouseOptions = list;
-						return list;
-					});
-			}
-			return Promise.resolve([]);
-		},
-		applyDefaultWarehouse() {
-			const app = getApp();
-			const picked = pickDefaultWarehouse(
-				this.warehouseOptions,
-				app && app.globalData ? app.globalData.StoreNameID : '',
-				app && app.globalData ? app.globalData.StoreName : '',
-			);
-			if (!picked) return;
-			this.form.warehouse_id = picked.value;
-			this.form.warehouse_name = picked.label;
-		},
-		getEmptyForm() {
-			return {
-				order_no: '',
-				out_order_type: OUT_ORDER_TYPE_PROCESS,
-				out_order_type_name: OUT_ORDER_TYPE_PROCESS_NAME,
-				process_unit_id: '',
-				process_name: '',
-				warehouse_id: '',
-				warehouse_name: '',
-				remark: '',
-				item_data: [],
-			};
-		},
-		loadOrder(id, options = {}) {
-			const { rejectIfLocked = false } = options;
-			return this.$u.api.fpmProcessOutOrder.detail({ id })
-				.then((res) => {
-					const order = normalizeOrder(res);
-					if (!order) {
-						this.showError('单据不存在');
-						return null;
-					}
-					if (rejectIfLocked && isLockedOrderStatus(order.audit_status)) {
-						this.showError('当前状态不可编辑');
-						setTimeout(() => uni.navigateBack(), 1500);
-						return null;
-					}
-					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();
-					return order;
-				})
-				.catch((e) => {
-					this.showError(e.message || '加载单据失败');
-					return null;
-				});
-		},
-		pickerSelectFun(type) {
-			if (!this.headerEditable) return;
-			if (type === '出仓类型') {
-				this.selectType = type;
-				const openPicker = (list) => {
-					if (!list.length) {
-						this.showError('暂无可选数据');
-						return;
-					}
-					this.selectList = list;
-					this.selectShow = true;
-				};
-				this.ensureOutOrderTypeOptions()
-					.then(openPicker)
-					.catch((e) => this.showError(e.message || '加载出仓类型失败'));
-				return;
-			}
-			const cache = {
-				'加工单位': this.processUnitOptions,
-				'仓库名称': this.warehouseOptions,
-			};
-			if (cache[type]) this.openSelectPicker(type, cache[type]);
-		},
-		selectConfirmFun(e) {
-			const item = e[0];
-			if (this.selectType === '出仓类型') {
-				this.form.out_order_type = item.value;
-				this.form.out_order_type_name = item.label;
-			} else if (this.selectType === '加工单位') {
-				this.form.process_unit_id = item.value;
-				this.form.process_name = item.label;
-			} else if (this.selectType === '仓库名称') {
-				this.form.warehouse_id = item.value;
-				this.form.warehouse_name = item.label;
-			}
-		},
-		validateForm() {
-			if (!this.form.out_order_type) return '请选择出仓类型';
-			if (!this.form.process_unit_id) return '请选择加工单位';
-			if (!this.form.warehouse_id) return '请选择仓库名称';
-			const app = getApp();
-			const saleSystemId = app && app.globalData ? app.globalData.PlanDepartmentID : '';
-			if (!saleSystemId) return '缺少营销体系，请重新登录';
-			return '';
-		},
-		buildAddParam() {
-			const app = getApp();
-			return {
-				// OpenAPI: product.AddFpmProcessOutOrderParam
-				out_order_type: Number(this.form.out_order_type),
-				process_unit_id: Number(this.form.process_unit_id),
-				warehouse_id: Number(this.form.warehouse_id),
-				sale_system_id: Number(app.globalData.PlanDepartmentID),
-				warehouse_out_time: formatDisplayTime(new Date(), 'YYYY-MM-DD'),
-				remark: this.form.remark || '',
-				item_data: [],
-			};
-		},
-		submitSave() {
-			if (this.headerSaved) {
-				this.showError('表头已保存，请直接扫码');
-				return;
-			}
-			const err = this.validateForm();
-			if (err) {
-				this.showError(err);
-				return;
-			}
-			uni.showLoading({ title: '保存中...' });
-			this.$u.api.fpmProcessOutOrder.add(this.buildAddParam())
-				.then((res) => {
-					this.orderId = (res && res.id) || 0;
-					if (!this.orderId) {
-						throw new Error('保存失败，未返回单据ID');
-					}
-					return this.$u.api.fpmProcessOutOrder.detail({ id: this.orderId });
-				})
-				.then((detail) => {
-					uni.hideLoading();
-					const order = normalizeOrder(detail);
-					this.applyOrder(order);
-					this.headerSaved = true;
-					this.headerCollapsed = true;
-					this.syncCanScanFromStatus(order.audit_status);
-					this.showSuccess('保存成功，请开始扫码', '保存成功', { voiceOnly: true });
-					this.registerOrderScanBroadcast();
-				})
-				.catch((e) => {
-					uni.hideLoading();
-					this.showError(e.message || '保存失败');
-				});
-		},
-		applyOrder(order) {
-			if (!order) return;
-			this.auditStatus = order.audit_status;
-			Object.assign(this.form, orderToFormFields(order));
-		},
-		handleScan(options = {}) {
-			const fromPhone = !!options.fromPhone;
-			const code = (this.QRBarCode || '').trim();
-			if (!this.canScan || !this.orderId) {
-				this.showError('请先提交保存后再扫码');
-				this.QRBarCode = '';
-				this.phoneContinuousScan = false;
-				return;
-			}
-			if (!code) {
-				this.QRBarCode = '';
-				if (fromPhone) this.scheduleNextPhoneScan();
-				return;
-			}
-			const arrangeType = this.BarCodeDelStatus ? ARRANGE_TYPE.DEL : ARRANGE_TYPE.IN;
-			this.doScanUpdate(code, arrangeType, { fromPhone });
-		},
-		BarCodeDelChange(e) {
-			this.BarCodeDelStatus = (e.detail.value || []).length > 0;
-			this.BillDataMessage = this.BarCodeDelStatus ? '删除模式：扫描细码即可删除' : '';
-		},
-		getFineCodeScanCode(fineCode) {
-			if (!fineCode) return '';
-			return fineCode.qr_code
-				|| fineCode.scan_code
-				|| fineCode.digital_code
-				|| fineCode.bar_code
-				|| '';
-		},
-		onDeleteFineCode(fineCode) {
-			if (!this.canScan || !this.orderId) {
-				this.showError('当前状态不可删除');
-				return;
-			}
-			const scanCode = this.getFineCodeScanCode(fineCode);
-			if (!scanCode) {
-				this.showError('该细码缺少条码，无法删除');
-				return;
-			}
-			uni.showModal({
-				title: '提示',
-				content: `确认删除细码 ${scanCode}？`,
-				success: (res) => {
-					if (!res.confirm) return;
-					this.doScanUpdate(scanCode, ARRANGE_TYPE.DEL);
-				},
-			});
-		},
-		doScanUpdate(scanCode, arrangeType, options = {}) {
-			const { fromPhone = false } = options;
-			const isDelete = arrangeType === ARRANGE_TYPE.DEL;
-			uni.showLoading({ title: isDelete ? '删除中...' : '处理中...' });
-			return this.$u.api.fpmProcessOutOrder.scanUpdate(buildScanUpdateParams({
-				id: this.orderId,
-				scanCode,
-				arrangeType,
-			}))
-				.then((scanRes) => {
-					this.scanDetail = buildScanDetailFromScanResponse(scanRes);
-					this.BillDataMessage = isDelete ? '删除成功' : '扫描成功';
-					this.QRBarCode = '';
-					if (isDelete) {
-						speak('已删除');
-						uni.showToast({ title: '删除成功', icon: 'success' });
-					} else {
-						speak('成功');
-					}
-					return this.$u.api.fpmProcessOutOrder.detail({ id: this.orderId })
-						.then((detail) => {
-							const order = normalizeOrder(detail);
-							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);
-				})
-				.then(() => {
-					uni.hideLoading();
-					if (fromPhone) this.scheduleNextPhoneScan();
-				})
-				.catch((e) => {
-					uni.hideLoading();
-					this.phoneContinuousScan = false;
-					const message = e.message || (isDelete ? '删除失败' : '扫码失败');
-					speak(isDelete ? '删除失败' : '扫码失败');
-					uni.showToast({ title: message, icon: 'none', duration: 2500 });
-					this.QRBarCode = '';
-				});
-		},
-		handleStatusAction(action) {
-			confirmOrderStatusAction(this, {
-				orderId: this.orderId,
-				action,
-				onSuccess: () => this.$u.api.fpmProcessOutOrder.detail({ id: this.orderId })
-					.then((detail) => {
-						uni.hideLoading();
-						const order = normalizeOrder(detail);
-						if (!order) return;
-						this.applyOrder(order);
-						this.syncCanScanFromStatus(order.audit_status);
-						this.showSuccess(util.statusSuccessVoice(action));
-					}),
-			});
-		},
-		showError(message) {
-			util.playErrorAudio(message);
-			uni.showModal({ title: '提示', content: message, showCancel: false });
-		},
-		showSuccess(message, voiceText, options) {
-			util.playSuccessAudio(voiceText || message, options);
-			uni.showToast({ title: message, icon: 'success' });
-		},
-	},
-};

src/pages/storegoods/storeGoodsProcessOutView.vue

@@ -1,135 +0,0 @@
-<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 ptb20 bdb_f5">
-			<text class="mr26">出仓类型</text>
-			<text>{{ order.out_order_type_name || '正常加工出仓' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">加工单位</text>
-			<text>{{ order.process_name || '-' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">仓库名称</text>
-			<text>{{ order.warehouse_name || '-' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">单据备注</text>
-			<text>{{ order.remark || '-' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">创建人</text>
-			<text>{{ order.creator_name }} {{ formatTime(order.create_time, 'YYYY-MM-DD') }}</text>
-		</view>
-		<view v-if="order.auditor_name" class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">审核人</text>
-			<text>{{ order.auditor_name }} {{ formatTime(order.audit_time, 'YYYY-MM-DD') }}</text>
-		</view>
-		</OrderHeaderFold>
-
-		<ProcessOutDetailList
-			:title="detailTitle"
-			:list="order.item_data"
-		/>
-
-		<FabricOutFooter :buttons="actionButtons" @action="handleAction" />
-	</view>
-</template>
-
-<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 {
-	normalizeOrder,
-	getViewStatusActionButtons,
-	confirmOrderStatusAction,
-	formatDisplayTime,
-} from '@/common/storeGoodsProcessOut';
-
-export default {
-	components: { OrderStatusBar, OrderHeaderFold, FabricOutFooter, ProcessOutDetailList },
-	data() {
-		return {
-			orderId: 0,
-			headerCollapsed: true,
-			order: { item_data: [] },
-		};
-	},
-	computed: {
-		actionButtons() {
-			return getViewStatusActionButtons(this.order.audit_status);
-		},
-		detailTitle() {
-			return `出仓明细（共 ${this.order.total_roll || 0} 匹）`;
-		},
-	},
-	onLoad(e) {
-		uni.setNavigationBarTitle({ title: '查看加工出仓单' });
-		if (e.id) {
-			this.orderId = Number(e.id);
-			this.refreshOrder();
-		}
-	},
-	onShow() {
-		if (this.orderId) this.refreshOrder();
-	},
-	methods: {
-		formatTime: formatDisplayTime,
-		refreshOrder() {
-			this.$u.api.fpmProcessOutOrder.detail({ id: this.orderId })
-				.then((res) => {
-					const order = normalizeOrder(res);
-					if (!order) {
-						this.showError('单据不存在');
-						return;
-					}
-					this.order = order;
-				})
-				.catch((err) => {
-					this.showError(err.message || '加载单据失败');
-				});
-		},
-		handleAction(action) {
-			if (action === 'edit') {
-				uni.navigateTo({ url: `./storeGoodsProcessOutEdit?id=${this.orderId}` });
-				return;
-			}
-			confirmOrderStatusAction(this, {
-				orderId: this.orderId,
-				action,
-				onSuccess: () => {
-					uni.hideLoading();
-					const voice = util.statusSuccessVoice(action);
-					util.playSuccessAudio(voice);
-					uni.showToast({ title: voice, icon: 'success' });
-					if (action === 'unapprove') {
-						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(message);
-			uni.showModal({ title: '提示', content: message, showCancel: false });
-		},
-	},
-};
-</script>
-
-<style lang="scss">
-@import '@/pages/storefabric/storeFabricBusinessOutPage.scss';
-page {
-	background-color: #F8F8F8;
-	padding-bottom: 260rpx;
-}
-</style>

src/pages/storegoods/storeGoodsProcessReturnInAdd.vue

@@ -1,121 +0,0 @@
-<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 ptb20 bdb_f5">
-			<text class="mr26">进仓类型</text>
-			<view>加工退货进仓单</view>
-		</view>
-		<view @click="pickerSelectFun('加工单位')" class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">加工单位<text class="redXingh">*</text></text>
-			<view :class="form.process_name ? '' : 'cBlack'">
-				{{ form.process_name || '请选择' }}
-				<u-icon v-if="headerEditable" class="ml26" name="arrow-right" size="40" color="#888888"></u-icon>
-			</view>
-		</view>
-		<view @click="pickerSelectFun('仓库名称')" class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">仓库名称<text class="redXingh">*</text></text>
-			<view :class="form.warehouse_name ? '' : 'cBlack'">
-				{{ form.warehouse_name || '请选择' }}
-				<u-icon v-if="headerEditable" class="ml26" name="arrow-right" size="40" color="#888888"></u-icon>
-			</view>
-		</view>
-		<view class="flex-white-plr26-column ptb20 mt32">
-			<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"
-			@clear="clearWarehouseBin"
-		/>
-		<FabricOutScanBar
-			:can-scan="showQrScanBar"
-			:value="QRBarCode"
-			:delete-mode="BarCodeDelStatus"
-			:message="BillDataMessage"
-			:disabled-tip="qrDisabledTip"
-			:show-phone-scan="canScanQr"
-			:scanning="phoneScanPanelOpen && phoneScanTarget === 'qr'"
-			@input="QRBarCode = $event"
-			@scan="handleScan"
-			@phone-scan="handlePhoneScan"
-			@delete-mode-change="BarCodeDelChange"
-		/>
-		<ProcessInScanDetail :detail="scanDetail" />
-
-		<ProcessInDetailList
-			:list="form.item_data"
-			:deletable="canScan"
-			@delete="onDeleteFineCode"
-		/>
-
-		<FabricOutFooter
-			v-if="!headerSaved"
-			:buttons="[{ label: '提交保存', action: 'save' }]"
-			single
-			@action="submitSave"
-		/>
-		<FabricOutFooter
-			v-else
-			:buttons="statusActionButtons"
-			@action="handleStatusAction"
-		/>
-
-		<u-select v-model="selectShow" :list="selectList" :remote="isRemoteSelect" :loading="selectSearching" @search="onSelectSearch" @confirm="selectConfirmFun"></u-select>
-	</view>
-</template>
-
-<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,
-		ProcessInDetailList,
-		ProcessInBinBar,
-	},
-	mixins: [formMixin],
-	onLoad() {
-		uni.setNavigationBarTitle({ title: '新增加工退货进仓单' });
-		this.pageMode = 'add';
-		this.loadBaseDropdowns();
-	},
-};
-</script>
-
-<style lang="scss">
-@import '@/pages/storefabric/storeFabricBusinessOutPage.scss';
-page {
-	background-color: #F8F8F8;
-	padding-bottom: 260rpx;
-}
-</style>

src/pages/storegoods/storeGoodsProcessReturnInEdit.vue

@@ -1,112 +0,0 @@
-<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 ptb20 bdb_f5">
-			<text class="mr26">进仓类型</text>
-			<text>加工退货进仓单</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">加工单位</text>
-			<text>{{ form.process_name || '-' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">仓库名称</text>
-			<text>{{ form.warehouse_name || '-' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<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"
-			@clear="clearWarehouseBin"
-		/>
-		<FabricOutScanBar
-			:can-scan="showQrScanBar"
-			:value="QRBarCode"
-			:delete-mode="BarCodeDelStatus"
-			:message="BillDataMessage"
-			:disabled-tip="qrDisabledTip"
-			:show-phone-scan="canScanQr"
-			:scanning="phoneScanPanelOpen && phoneScanTarget === 'qr'"
-			@input="QRBarCode = $event"
-			@scan="handleScan"
-			@phone-scan="handlePhoneScan"
-			@delete-mode-change="BarCodeDelChange"
-		/>
-		<ProcessInScanDetail :detail="scanDetail" />
-
-		<ProcessInDetailList
-			:list="form.item_data"
-			:deletable="canScan"
-			@delete="onDeleteFineCode"
-		/>
-
-		<FabricOutFooter :buttons="statusActionButtons" @action="handleStatusAction" />
-
-		<u-select v-model="selectShow" :list="selectList" :remote="isRemoteSelect" :loading="selectSearching" @search="onSelectSearch" @confirm="selectConfirmFun"></u-select>
-	</view>
-</template>
-
-<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,
-		ProcessInDetailList,
-		ProcessInBinBar,
-	},
-	mixins: [formMixin],
-	data() {
-		return {
-			headerCollapsed: true,
-		};
-	},
-	onLoad(e) {
-		uni.setNavigationBarTitle({ title: '编辑加工退货进仓单' });
-		this.pageMode = 'edit';
-		if (e.id) {
-			this.loadOrder(Number(e.id), { rejectIfLocked: true });
-		}
-	},
-};
-</script>
-
-<style lang="scss">
-@import '@/pages/storefabric/storeFabricBusinessOutPage.scss';
-page {
-	background-color: #F8F8F8;
-	padding-bottom: 260rpx;
-}
-</style>

src/pages/storegoods/storeGoodsProcessReturnInList.vue

@@ -1,275 +0,0 @@
-<template>
-	<view>
-		<view class="filterBar">
-			<u-search v-model="filters.order_no" 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="filterIconColor" name="list" size="44" :color="filterIconColor"></u-icon>
-					<view v-if="hasActiveFilter" class="filterBtn__badge"></view>
-				</view>
-				<text>筛选</text>
-			</view>
-		</view>
-
-		<scroll-view scroll-y :style="{ height: scrollHeight }" refresher-enabled
-			:refresher-triggered="triggered" @refresherrefresh="onRefresh">
-			<dataNull v-if="list.length === 0" src="/src/static/img/chahua/gjNull.png"
-				title="暂无加工退货进仓单" title1="请点击右下角按钮新增">
-			</dataNull>
-			<view v-for="(item, index) in list" :key="item.id" @click="goView(item)">
-				<ProcessReturnInItem :item="item" :index="index" />
-			</view>
-		</scroll-view>
-
-		<addBtn url="./storeGoodsProcessReturnInAdd"></addBtn>
-
-		<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>
-					<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="36"></u-icon></view>
-				</view>
-				<view class="filterItem" @click="openWarehouseSelect">
-					<text class="filterLabel">仓库</text>
-					<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="36"></u-icon></view>
-				</view>
-				<view class="filterActions">
-					<u-button type="warning" size="medium" @click="resetFilter">重置</u-button>
-					<u-button type="primary" size="medium" @click="applyFilter">确定</u-button>
-				</view>
-			</view>
-		</u-popup>
-
-		<u-select class="pdaSelect" v-model="statusSelectShow" title="选择订单状态" :list="statusSelectList" :default-value="statusSelectDefault" @confirm="onStatusConfirm"></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>
-
-<script>
-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,
-	formatRoll,
-	mapToSelectOptions,
-	fetchAllOrderList,
-} from '@/common/storeGoodsProcessReturnIn';
-import { withNameParam } from '@/common/remoteSelect';
-import listFilterMixin from '@/mixins/listFilterMixin';
-
-export default {
-	components: { addBtn, ProcessReturnInItem },
-	mixins: [listFilterMixin],
-	data() {
-		return {
-			list: [],
-			scrollHeight: '667px',
-			triggered: false,
-			listLoading: false,
-			filterShow: false,
-			statusSelectShow: false,
-			unitSelectShow: false,
-			unitSelectType: '',
-			processUnitOptions: [],
-			warehouseOptions: [],
-			unitOptionsLoading: false,
-			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.PENDING,
-			},
-			statusSelectList: [
-				{ value: '', label: '全部' },
-				...getStatusOptions(),
-			],
-		};
-	},
-	computed: {
-		statusLabel() {
-			if (this.filters.audit_status === '' || this.filters.audit_status === null) return '';
-			return AUDIT_STATUS_MAP[Number(this.filters.audit_status)] || '';
-		},
-		processUnitLabel() {
-			return this.filters.process_name || '';
-		},
-		warehouseLabel() {
-			return this.filters.warehouse_name || '';
-		},
-	},
-	onLoad() {
-		uni.setNavigationBarTitle({ title: '加工退货进仓列表' });
-		this.restoreFilterCache();
-		uni.getSystemInfo({
-			success: (res) => {
-				this.scrollHeight = `${res.windowHeight - 50}px`;
-			},
-		});
-	},
-	onShow() {
-		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 })
-				.then((res) => {
-					this.processUnitOptions = mapToSelectOptions(res);
-					return this.processUnitOptions;
-				})
-				.catch(() => {
-					this.processUnitOptions = [];
-					return this.processUnitOptions;
-				});
-		},
-		loadWarehouseOptions() {
-			if (this.warehouseOptions.length) return Promise.resolve(this.warehouseOptions);
-			return this.$u.api.physicalWarehouse.getDropdownList({ warehouse_type_id: WAREHOUSE_TYPE_FINISHED })
-				.then((res) => {
-					this.warehouseOptions = mapToSelectOptions(res);
-					return this.warehouseOptions;
-				})
-				.catch(() => {
-					this.warehouseOptions = [];
-					return this.warehouseOptions;
-				});
-		},
-		openUnitSelect(type) {
-			this.unitSelectType = type;
-			const cache = type === 'warehouse' ? this.warehouseOptions : this.processUnitOptions;
-			this.applyUnitSelectList(cache);
-			this.unitSelectShow = true;
-		},
-		onUnitSearch(keyword) {
-			const seq = ++this.unitSearchSeq;
-			const type = this.unitSelectType;
-			const empty = !String(keyword || '').trim();
-			this.selectSearching = true;
-			const req = type === 'warehouse'
-				? this.$u.api.physicalWarehouse.getDropdownList(withNameParam({ warehouse_type_id: WAREHOUSE_TYPE_FINISHED }, keyword))
-				: this.$u.api.businessUnit.list(withNameParam({ unit_type_id: BUSINESS_UNIT_TYPE_PROCESS }, keyword));
-			req.then((res) => {
-				if (seq !== this.unitSearchSeq) return;
-				const list = mapToSelectOptions(res);
-				if (empty) {
-					if (type === 'warehouse') this.warehouseOptions = list;
-					else this.processUnitOptions = list;
-				}
-				this.applyUnitSelectList(list, empty);
-			}).catch((e) => {
-				if (seq !== this.unitSearchSeq) return;
-				uni.showToast({ title: (e && e.message) || '搜索失败', icon: 'none' });
-			}).then(() => {
-				if (seq === this.unitSearchSeq) this.selectSearching = false;
-			}, () => {
-				if (seq === this.unitSearchSeq) this.selectSearching = false;
-			});
-		},
-		openProcessUnitSelect() {
-			this.openUnitSelect('process');
-		},
-		openWarehouseSelect() {
-			this.openUnitSelect('warehouse');
-		},
-		onUnitConfirm(e) {
-			const item = e[0] || {};
-			if (this.unitSelectType === 'warehouse') {
-				this.filters.warehouse_id = item.value;
-				this.filters.warehouse_name = item.value ? item.label : '';
-			} else {
-				this.filters.process_unit_id = item.value;
-				this.filters.process_name = item.value ? item.label : '';
-			}
-		},
-		loadList() {
-			if (this.listLoading) return;
-			this.listLoading = true;
-			const filters = this.appliedFilters || this.filters;
-			const params = {};
-			if (filters.order_no) params.order_no = filters.order_no;
-			if (filters.process_unit_id) params.supplier_id = filters.process_unit_id;
-			if (filters.warehouse_id) params.warehouse_id = filters.warehouse_id;
-			if (this.hasFilterValue(filters.audit_status)) {
-				params.audit_status = filters.audit_status;
-			}
-			fetchAllOrderList((p) => this.$u.api.fpmProcessReturnInOrder.list(p), params)
-				.then((rows) => {
-					this.list = rows.map(this.mapToCard);
-				})
-				.catch((err) => {
-					this.list = [];
-					uni.showToast({ title: err.message || '加载失败', icon: 'none' });
-				})
-				.finally(() => {
-					this.listLoading = false;
-					this.triggered = false;
-					// 避免并发请求下 uView 全局 loading 遮罩关不掉
-					uni.hideLoading();
-				});
-		},
-		mapToCard(order) {
-			return {
-				id: order.id,
-				order_no: order.order_no || '',
-				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 || '',
-				warehouse_name: order.warehouse_name || '',
-				create_user_name: order.creator_name || '',
-				create_time: order.create_time || '',
-				auditor_name: order.auditor_name || '',
-				audit_date: order.audit_time || '',
-				audit_status: order.audit_status,
-				audit_status_name: order.audit_status_name || AUDIT_STATUS_MAP[order.audit_status] || '',
-				total_roll: formatRoll(order.total_roll),
-			};
-		},
-		onRefresh() {
-			this.triggered = true;
-			this.loadList();
-		},
-		goView(item) {
-			const page = Number(item.audit_status) === 1
-				? 'storeGoodsProcessReturnInEdit'
-				: 'storeGoodsProcessReturnInView';
-			uni.navigateTo({ url: `./${page}?id=${item.id}` });
-		},
-		openStatusSelect() { this.statusSelectShow = true; },
-	},
-};
-</script>
-
-<style lang="scss">
-@import '@/common/list-filter.scss';
-</style>

src/pages/storegoods/storeGoodsProcessReturnInMixin.js

@@ -1,607 +0,0 @@
-/**
- * 加工退货进仓单表单 mixin（新增/编辑共用）
- *
- * 1. 先填表头（加工单位 / 仓库 / 备注）提交 add，拿到 id 后可扫码
- * 2. 先扫仓位（getWarehouseBin：传 qr_code + warehouse_id），校验后扫布匹二维码
- * 3. 扫码走 updateFpmProcessReturnInOrder（arrange_type: 1 录入 / 3 删除，带 warehouse_bin_id）
- * 4. 手机扫码成功展示详情后自动再次调起扫码，形成连续扫
- */
-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';
-import {
-	AUDIT_STATUS_MAP,
-	ARRANGE_TYPE,
-	BUSINESS_UNIT_TYPE_PROCESS,
-	WAREHOUSE_TYPE_FINISHED,
-	IN_ORDER_TYPE_PROCESS_RETURN,
-	normalizeOrder,
-	mapToSelectOptions,
-	canScanAtStatus,
-	isLockedOrderStatus,
-	getFormStatusActionButtons,
-	orderToFormFields,
-	confirmOrderStatusAction,
-	DRAFT_AUDIT_STATUS,
-	DRAFT_AUDIT_STATUS_NAME,
-	getEmptyScanDetail,
-	buildScanDetailFromScanResponse,
-	buildScanUpdateParams,
-	pickDefaultWarehouse,
-} from '@/common/storeGoodsProcessReturnIn';
-
-export default {
-	components: { PlusBarcodePanel },
-	mixins: [scanMixin, remoteSelectMixin],
-	data() {
-		return {
-			pageMode: 'add',
-			orderId: 0,
-			form: this.getEmptyForm(),
-			headerSaved: false,
-			headerCollapsed: false,
-			selectShow: false,
-			selectList: [],
-			selectType: '',
-			canScan: false,
-			QRBarCode: '',
-			BarCodeDelStatus: false,
-			BillDataMessage: '',
-			scanDetail: getEmptyScanDetail(),
-			auditStatus: 0,
-			processUnitOptions: [],
-			warehouseOptions: [],
-			dropdownLoading: false,
-			/** 仓位 */
-			warehouseBinId: 0,
-			warehouseBinCode: '',
-			warehouseBinName: '',
-			/** 手机连续扫码开关：成功后自动再调起；取消/失败则关闭 */
-			phoneContinuousScan: false,
-			/** 手机扫当前目标：bin | qr */
-			phoneScanTarget: 'bin',
-		};
-	},
-	computed: {
-		isReadonly() {
-			return this.pageMode === 'view';
-		},
-		isEditable() {
-			return this.pageMode === 'add' || this.pageMode === 'edit';
-		},
-		headerEditable() {
-			return this.pageMode === 'add' && !this.headerSaved;
-		},
-		statusActionButtons() {
-			return getFormStatusActionButtons(this.headerSaved, this.orderId, this.auditStatus);
-		},
-		displayAuditStatus() {
-			if (this.pageMode === 'add' && !this.headerSaved) return DRAFT_AUDIT_STATUS;
-			return this.auditStatus;
-		},
-		displayAuditStatusName() {
-			if (this.pageMode === 'add' && !this.headerSaved) return DRAFT_AUDIT_STATUS_NAME;
-			return AUDIT_STATUS_MAP[this.auditStatus] || '';
-		},
-		/** 录入需先选仓位；删除模式仅需单据可扫 */
-		canScanQr() {
-			if (!this.canScan) return false;
-			if (this.BarCodeDelStatus) return true;
-			return !!this.warehouseBinId;
-		},
-		/** 扫码栏在可扫状态下始终展示（含删除勾选） */
-		showQrScanBar() {
-			return this.canScan;
-		},
-		qrDisabledTip() {
-			if (!this.canScan) return '请先提交保存后再扫码';
-			if (!this.warehouseBinId && !this.BarCodeDelStatus) return '请先扫描仓位后再扫布匹二维码';
-			return '当前状态不可扫码';
-		},
-		phoneScanHint() {
-			return this.phoneScanTarget === 'bin'
-				? '请扫描仓位，成功后自动扫布飞'
-				: '连续扫描布飞二维码，扫完可继续下一条';
-		},
-	},
-	onShow() {
-		this.isPageActive = true;
-		initTts();
-		if (this.canScan && this.isEditable) {
-			this.registerOrderScanBroadcast();
-		}
-	},
-	onHide() {
-		this.isPageActive = false;
-		this.phoneContinuousScan = false;
-		this.unregisterScanBroadcast();
-	},
-	onUnload() {
-		this.isPageActive = false;
-		this.phoneContinuousScan = false;
-		this.unregisterScanBroadcast();
-	},
-	methods: {
-		clearWarehouseBin() {
-			this.warehouseBinId = 0;
-			this.warehouseBinCode = '';
-			this.warehouseBinName = '';
-			this.phoneContinuousScan = false;
-			this._phoneBinLocked = false;
-			this._pendingFabricCode = '';
-			if (this.phoneScanTarget === 'bin') this.closePhoneScanPanel();
-		},
-		/** 重扫仓位：先清空输入框再填入，避免残留旧码拼接 */
-		applyWarehouseBinScan(scanResult) {
-			const code = String(scanResult || '').trim().replace(/[\r\n]/g, '');
-			if (!code) return;
-			this.warehouseBinCode = '';
-			this.$nextTick(() => {
-				this.warehouseBinCode = code;
-				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.openHalfScreenScan('bin');
-		},
-		handlePhoneScan() {
-			if (!this.canScan || !this.orderId) {
-				this.showError('请先提交保存后再扫码');
-				return;
-			}
-			// 删除模式可直接扫布匹码；录入模式无仓位时先扫仓位
-			if (!this.BarCodeDelStatus && !this.warehouseBinId) {
-				this.handleBinPhoneScan();
-				return;
-			}
-			this.openHalfScreenScan('qr');
-		},
-		openContinuousPhoneScan() {
-			if (this.phoneScanPanelOpen) return;
-			if (!this.phoneContinuousScan || !this.canScanQr || !this.isPageActive) {
-				this.phoneContinuousScan = false;
-				return;
-			}
-			this.openPhoneScan({
-				callback: (scanResult) => {
-					this.QRBarCode = String(scanResult || '').trim().replace(/[\r\n]/g, '');
-					this.$nextTick(() => this.handleScan({ fromPhone: true }));
-				},
-				fail: () => {
-					this.phoneContinuousScan = false;
-				},
-			});
-		},
-		scheduleNextPhoneScan() {
-			if (this.phoneScanPanelOpen) return;
-			if (!this.phoneContinuousScan || !this.canScanQr || !this.isPageActive) {
-				this.phoneContinuousScan = false;
-				return;
-			}
-			setTimeout(() => {
-				this.openContinuousPhoneScan();
-			}, 400);
-		},
-		registerOrderScanBroadcast() {
-			this.registerScanBroadcast((scanResult) => {
-				const code = String(scanResult || '').trim().replace(/[\r\n]/g, '');
-				if (!code) return;
-				// 删除模式：直接按布匹码删除；未扫仓位时枪扫优先解析为仓位
-				if (!this.BarCodeDelStatus && !this.warehouseBinId) {
-					this.applyWarehouseBinScan(code);
-					return;
-				}
-				this.QRBarCode = code;
-				this.$nextTick(() => this.handleScan());
-			});
-		},
-		resolveWarehouseBin() {
-			const code = (this.warehouseBinCode || '').trim();
-			if (!this.canScan || !this.orderId) {
-				this.showError('请先提交保存后再扫码');
-				return;
-			}
-			if (!code) return;
-			if (!this.form.warehouse_id) {
-				this.showError('单据缺少仓库信息');
-				return;
-			}
-			uni.showLoading({ title: '识别仓位...' });
-			return this.$u.api.warehouseBin.getByQrCode({
-				qr_code: code,
-				warehouse_id: Number(this.form.warehouse_id),
-			})
-				.then((data) => {
-					uni.hideLoading();
-					if (!data || !data.id) {
-						throw new Error('未识别到仓位');
-					}
-					// 返回 physical_warehouse_id，与单据仓库校验
-					if (
-						data.physical_warehouse_id
-						&& String(data.physical_warehouse_id) !== String(this.form.warehouse_id)
-					) {
-						this.warehouseBinId = 0;
-						this.warehouseBinName = '';
-						throw new Error('该仓位不属于当前仓库');
-					}
-					this.warehouseBinId = data.id;
-					this.warehouseBinCode = data.code || data.qr_code || code;
-					this.warehouseBinName = data.name || '';
-					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 = '';
-					this.showError(e.message || '仓位识别失败');
-				});
-		},
-		syncCanScanFromStatus(status) {
-			const nextCanScan = this.isEditable && canScanAtStatus(status);
-			if (this.canScan && !nextCanScan) {
-				this.phoneContinuousScan = false;
-				this.closePhoneScanPanel();
-				this.unregisterScanBroadcast();
-			}
-			this.canScan = nextCanScan;
-		},
-		loadBaseDropdowns() {
-			if (this.dropdownLoading) return Promise.resolve();
-			this.dropdownLoading = true;
-			return Promise.all([
-				this.ensureProcessUnitOptions().catch((e) => {
-					console.error('加载加工单位失败', e);
-					return [];
-				}),
-				this.ensureWarehouseOptions().catch((e) => {
-					console.error('加载仓库失败', e);
-					return [];
-				}),
-			]).finally(() => {
-				this.dropdownLoading = false;
-			});
-		},
-		ensureProcessUnitOptions() {
-			if (this.processUnitOptions.length) return Promise.resolve(this.processUnitOptions);
-			return this.$u.api.businessUnit.list({ unit_type_id: BUSINESS_UNIT_TYPE_PROCESS })
-				.then((res) => {
-					this.processUnitOptions = mapToSelectOptions(res);
-					return this.processUnitOptions;
-				});
-		},
-		ensureWarehouseOptions() {
-			if (this.warehouseOptions.length) return Promise.resolve(this.warehouseOptions);
-			return this.$u.api.physicalWarehouse.getDropdownList({ warehouse_type_id: WAREHOUSE_TYPE_FINISHED })
-				.then((res) => {
-					this.warehouseOptions = mapToSelectOptions(res);
-					if (this.headerEditable && !this.form.warehouse_id) {
-						this.applyDefaultWarehouse();
-					}
-					return this.warehouseOptions;
-				});
-		},
-		fetchRemoteSelectOptions(type, keyword) {
-			const empty = !String(keyword || '').trim();
-			if (type === '加工单位') {
-				return this.$u.api.businessUnit.list(withNameParam({ unit_type_id: BUSINESS_UNIT_TYPE_PROCESS }, keyword))
-					.then((res) => {
-						const list = mapToSelectOptions(res);
-						if (empty) this.processUnitOptions = list;
-						return list;
-					});
-			}
-			if (type === '仓库名称') {
-				return this.$u.api.physicalWarehouse.getDropdownList(withNameParam({ warehouse_type_id: WAREHOUSE_TYPE_FINISHED }, keyword))
-					.then((res) => {
-						const list = mapToSelectOptions(res);
-						if (empty) this.warehouseOptions = list;
-						return list;
-					});
-			}
-			return Promise.resolve([]);
-		},
-		applyDefaultWarehouse() {
-			const app = getApp();
-			const picked = pickDefaultWarehouse(
-				this.warehouseOptions,
-				app && app.globalData ? app.globalData.StoreNameID : '',
-				app && app.globalData ? app.globalData.StoreName : '',
-			);
-			if (!picked) return;
-			this.form.warehouse_id = picked.value;
-			this.form.warehouse_name = picked.label;
-		},
-		getEmptyForm() {
-			return {
-				order_no: '',
-				process_unit_id: '',
-				process_name: '',
-				warehouse_id: '',
-				warehouse_name: '',
-				remark: '',
-				item_data: [],
-			};
-		},
-		loadOrder(id, options = {}) {
-			const { rejectIfLocked = false } = options;
-			return this.$u.api.fpmProcessReturnInOrder.detail({ id })
-				.then((res) => {
-					const order = normalizeOrder(res);
-					if (!order) {
-						this.showError('单据不存在');
-						return null;
-					}
-					if (rejectIfLocked && isLockedOrderStatus(order.audit_status)) {
-						this.showError('当前状态不可编辑');
-						setTimeout(() => uni.navigateBack(), 1500);
-						return null;
-					}
-					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);
-					if (this.canScan) this.registerOrderScanBroadcast();
-					return order;
-				})
-				.catch((e) => {
-					this.showError(e.message || '加载单据失败');
-					return null;
-				});
-		},
-		pickerSelectFun(type) {
-			if (!this.headerEditable) return;
-			const cache = {
-				'加工单位': this.processUnitOptions,
-				'仓库名称': this.warehouseOptions,
-			};
-			if (cache[type]) this.openSelectPicker(type, cache[type]);
-		},
-		selectConfirmFun(e) {
-			const item = e[0];
-			if (this.selectType === '加工单位') {
-				this.form.process_unit_id = item.value;
-				this.form.process_name = item.label;
-			} else if (this.selectType === '仓库名称') {
-				this.form.warehouse_id = item.value;
-				this.form.warehouse_name = item.label;
-			}
-		},
-		validateForm() {
-			if (!this.form.process_unit_id) return '请选择加工单位';
-			if (!this.form.warehouse_id) return '请选择仓库名称';
-			const app = getApp();
-			const saleSystemId = app && app.globalData ? app.globalData.PlanDepartmentID : '';
-			if (!saleSystemId) return '缺少营销体系，请重新登录';
-			return '';
-		},
-		buildAddParam() {
-			const app = getApp();
-			return {
-				inOrderType: IN_ORDER_TYPE_PROCESS_RETURN,
-				biz_unit_id: Number(this.form.process_unit_id),
-				warehouse_id: Number(this.form.warehouse_id),
-				sale_system_id: Number(app.globalData.PlanDepartmentID),
-				remark: this.form.remark || '',
-				item_data: [],
-			};
-		},
-		submitSave() {
-			if (this.headerSaved) {
-				this.showError('表头已保存，请直接扫码');
-				return;
-			}
-			const err = this.validateForm();
-			if (err) {
-				this.showError(err);
-				return;
-			}
-			uni.showLoading({ title: '保存中...' });
-			this.$u.api.fpmProcessReturnInOrder.add(this.buildAddParam())
-				.then((res) => {
-					this.orderId = (res && res.id) || 0;
-					if (!this.orderId) {
-						throw new Error('保存失败，未返回单据ID');
-					}
-					return this.$u.api.fpmProcessReturnInOrder.detail({ id: this.orderId });
-				})
-				.then((detail) => {
-					uni.hideLoading();
-					const order = normalizeOrder(detail);
-					this.applyOrder(order);
-					this.headerSaved = true;
-					this.headerCollapsed = true;
-					this.clearWarehouseBin();
-					this.syncCanScanFromStatus(order.audit_status);
-					this.showSuccess('保存成功，请先扫描仓位', '保存成功', { voiceOnly: true });
-					this.registerOrderScanBroadcast();
-				})
-				.catch((e) => {
-					uni.hideLoading();
-					this.showError(e.message || '保存失败');
-				});
-		},
-		applyOrder(order) {
-			if (!order) return;
-			this.auditStatus = order.audit_status;
-			Object.assign(this.form, orderToFormFields(order));
-		},
-		handleScan(options = {}) {
-			const fromPhone = !!options.fromPhone;
-			const code = (this.QRBarCode || '').trim();
-			if (!this.canScan || !this.orderId) {
-				this.showError('请先提交保存后再扫码');
-				this.QRBarCode = '';
-				this.phoneContinuousScan = false;
-				return;
-			}
-			const isDelete = this.BarCodeDelStatus;
-			if (!isDelete && !this.warehouseBinId) {
-				this.showError('请先扫描仓位');
-				this.QRBarCode = '';
-				this.phoneContinuousScan = false;
-				return;
-			}
-			if (!code) {
-				this.QRBarCode = '';
-				if (fromPhone) this.scheduleNextPhoneScan();
-				return;
-			}
-			const arrangeType = isDelete ? ARRANGE_TYPE.DEL : ARRANGE_TYPE.IN;
-			this.doScanUpdate(code, arrangeType, { fromPhone });
-		},
-		BarCodeDelChange(e) {
-			this.BarCodeDelStatus = (e.detail.value || []).length > 0;
-			this.BillDataMessage = this.BarCodeDelStatus ? '删除模式：扫描细码即可删除' : '';
-		},
-		getFineCodeScanCode(fineCode) {
-			if (!fineCode) return '';
-			return fineCode.qr_code || fineCode.scan_code || fineCode.bar_code || '';
-		},
-		onDeleteFineCode(fineCode) {
-			if (!this.canScan || !this.orderId) {
-				this.showError('当前状态不可删除');
-				return;
-			}
-			const scanCode = this.getFineCodeScanCode(fineCode);
-			if (!scanCode) {
-				this.showError('该细码缺少条码，无法删除');
-				return;
-			}
-			uni.showModal({
-				title: '提示',
-				content: `确认删除细码 ${scanCode}？`,
-				success: (res) => {
-					if (!res.confirm) return;
-					this.doScanUpdate(scanCode, ARRANGE_TYPE.DEL);
-				},
-			});
-		},
-		doScanUpdate(scanCode, arrangeType, options = {}) {
-			const { fromPhone = false } = options;
-			const isDelete = arrangeType === ARRANGE_TYPE.DEL;
-			uni.showLoading({ title: isDelete ? '删除中...' : '处理中...' });
-			return this.$u.api.fpmProcessReturnInOrder.scanUpdate(buildScanUpdateParams({
-				id: this.orderId,
-				scanCode,
-				arrangeType,
-				// 删除不强制仓位；录入带当前仓位
-				warehouseBinId: isDelete ? 0 : this.warehouseBinId,
-			}))
-				.then((scanRes) => {
-					this.scanDetail = buildScanDetailFromScanResponse(scanRes);
-					this.BillDataMessage = isDelete ? '删除成功' : '扫描成功';
-					this.QRBarCode = '';
-					if (isDelete) {
-						speak('已删除');
-						uni.showToast({ title: '删除成功', icon: 'success' });
-					} else {
-						speak('成功');
-					}
-					return this.$u.api.fpmProcessReturnInOrder.detail({ id: this.orderId })
-						.then((detail) => {
-							const order = normalizeOrder(detail);
-							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);
-				})
-				.then(() => {
-					uni.hideLoading();
-					if (fromPhone) this.scheduleNextPhoneScan();
-				})
-				.catch((e) => {
-					uni.hideLoading();
-					this.phoneContinuousScan = false;
-					const message = e.message || (isDelete ? '删除失败' : '扫码失败');
-					speak(isDelete ? '删除失败' : '扫码失败');
-					uni.showToast({ title: message, icon: 'none', duration: 2500 });
-					this.QRBarCode = '';
-				});
-		},
-		handleStatusAction(action) {
-			confirmOrderStatusAction(this, {
-				orderId: this.orderId,
-				action,
-				onSuccess: () => this.$u.api.fpmProcessReturnInOrder.detail({ id: this.orderId })
-					.then((detail) => {
-						uni.hideLoading();
-						const order = normalizeOrder(detail);
-						if (!order) return;
-						this.applyOrder(order);
-						this.syncCanScanFromStatus(order.audit_status);
-						this.showSuccess(util.statusSuccessVoice(action));
-					}),
-			});
-		},
-		showError(message) {
-			util.playErrorAudio(message);
-			uni.showModal({ title: '提示', content: message, showCancel: false });
-		},
-		showSuccess(message, voiceText, options) {
-			util.playSuccessAudio(voiceText || message, options);
-			uni.showToast({ title: message, icon: 'success' });
-		},
-	},
-};

src/pages/storegoods/storeGoodsProcessReturnInView.vue

@@ -1,135 +0,0 @@
-<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 ptb20 bdb_f5">
-			<text class="mr26">进仓类型</text>
-			<text>{{ order.in_order_type_name || '加工退货进仓单' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">加工单位</text>
-			<text>{{ order.process_name || '-' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">仓库名称</text>
-			<text>{{ order.warehouse_name || '-' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">单据备注</text>
-			<text>{{ order.remark || '-' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">创建人</text>
-			<text>{{ order.creator_name }} {{ formatTime(order.create_time, 'YYYY-MM-DD') }}</text>
-		</view>
-		<view v-if="order.auditor_name" class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">审核人</text>
-			<text>{{ order.auditor_name }} {{ formatTime(order.audit_time, 'YYYY-MM-DD') }}</text>
-		</view>
-		</OrderHeaderFold>
-
-		<ProcessInDetailList
-			:title="detailTitle"
-			:list="order.item_data"
-		/>
-
-		<FabricOutFooter :buttons="actionButtons" @action="handleAction" />
-	</view>
-</template>
-
-<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 {
-	normalizeOrder,
-	getViewStatusActionButtons,
-	confirmOrderStatusAction,
-	formatDisplayTime,
-} from '@/common/storeGoodsProcessReturnIn';
-
-export default {
-	components: { OrderStatusBar, OrderHeaderFold, FabricOutFooter, ProcessInDetailList },
-	data() {
-		return {
-			orderId: 0,
-			headerCollapsed: true,
-			order: { item_data: [] },
-		};
-	},
-	computed: {
-		actionButtons() {
-			return getViewStatusActionButtons(this.order.audit_status);
-		},
-		detailTitle() {
-			return `进仓明细（共 ${this.order.total_roll || 0} 匹）`;
-		},
-	},
-	onLoad(e) {
-		uni.setNavigationBarTitle({ title: '查看加工退货进仓单' });
-		if (e.id) {
-			this.orderId = Number(e.id);
-			this.refreshOrder();
-		}
-	},
-	onShow() {
-		if (this.orderId) this.refreshOrder();
-	},
-	methods: {
-		formatTime: formatDisplayTime,
-		refreshOrder() {
-			this.$u.api.fpmProcessReturnInOrder.detail({ id: this.orderId })
-				.then((res) => {
-					const order = normalizeOrder(res);
-					if (!order) {
-						this.showError('单据不存在');
-						return;
-					}
-					this.order = order;
-				})
-				.catch((err) => {
-					this.showError(err.message || '加载单据失败');
-				});
-		},
-		handleAction(action) {
-			if (action === 'edit') {
-				uni.navigateTo({ url: `./storeGoodsProcessReturnInEdit?id=${this.orderId}` });
-				return;
-			}
-			confirmOrderStatusAction(this, {
-				orderId: this.orderId,
-				action,
-				onSuccess: () => {
-					uni.hideLoading();
-					const voice = util.statusSuccessVoice(action);
-					util.playSuccessAudio(voice);
-					uni.showToast({ title: voice, icon: 'success' });
-					if (action === 'unapprove') {
-						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(message);
-			uni.showModal({ title: '提示', content: message, showCancel: false });
-		},
-	},
-};
-</script>
-
-<style lang="scss">
-@import '@/pages/storefabric/storeFabricBusinessOutPage.scss';
-page {
-	background-color: #F8F8F8;
-	padding-bottom: 260rpx;
-}
-</style>

src/pages/storegoods/storeGoodsPurchaseInAdd.vue

@@ -1,176 +0,0 @@
-<template>
-	<view class="fabric-out-page">
-		<OrderHeaderFold v-model="headerCollapsed" :summary="form.order_no || '保存后自动生成'">
-		<OrderStatusBar class="fabric-out-mt32" :status="displayAuditStatus" :name="displayAuditStatusName" />
-		<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'">
-				{{ form.biz_unit_name || '请选择' }}
-				<u-icon v-if="headerEditable" class="ml26" name="arrow-right" size="40" color="#888888"></u-icon>
-			</view>
-		</view>
-		<view @click="pickerSelectFun('仓库名称')" class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">仓库名称<text class="redXingh">*</text></text>
-			<view :class="form.warehouse_name ? '' : 'cBlack'">
-				{{ form.warehouse_name || '请选择' }}
-				<u-icon v-if="headerEditable" class="ml26" name="arrow-right" size="40" color="#888888"></u-icon>
-			</view>
-		</view>
-		<view class="flex-white-plr26 ptb10 bdb_f5 process-in-weight-row">
-			<view class="process-in-weight-col">
-				<text class="mr16">纸筒重量</text>
-				<u-input
-					v-model="form.paper_tube_weight"
-					type="digit"
-					:disabled="!canEditWeights"
-					placeholder="1.5"
-					:custom-style="weightInputStyle"
-					placeholder-style="color: #c0c4cc; font-size: 36rpx;"
-				/>
-			</view>
-			<view class="process-in-weight-col">
-				<text class="mr16">包装重量</text>
-				<u-input
-					v-model="form.package_weight"
-					type="digit"
-					:disabled="!canEditWeights"
-					placeholder="0.3"
-					:custom-style="weightInputStyle"
-					placeholder-style="color: #c0c4cc; font-size: 36rpx;"
-				/>
-			</view>
-		</view>
-		<view @click="pickerSelectFun('营销体系')" class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">营销体系<text class="redXingh">*</text></text>
-			<view :class="form.sale_system_name ? '' : 'cBlack'">
-				{{ form.sale_system_name || '请选择' }}
-				<u-icon v-if="headerEditable" class="ml26" name="arrow-right" size="40" color="#888888"></u-icon>
-			</view>
-		</view>
-		<view @click="pickerSelectFun('订单类型')" class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">订单类型<text class="redXingh">*</text></text>
-			<view :class="form.sale_mode_name ? '' : 'cBlack'">
-				{{ form.sale_mode_name || '请选择' }}
-				<u-icon v-if="headerEditable" class="ml26" name="arrow-right" size="40" color="#888888"></u-icon>
-			</view>
-		</view>
-		<view class="flex-white-plr26-column ptb20 mt32">
-			<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"
-			@clear="clearWarehouseBin"
-		/>
-		<FabricOutScanBar
-			:can-scan="showQrScanBar"
-			:value="QRBarCode"
-			:delete-mode="BarCodeDelStatus"
-			:message="BillDataMessage"
-			:disabled-tip="qrDisabledTip"
-			:show-phone-scan="canScanQr"
-			:scanning="phoneScanPanelOpen && phoneScanTarget === 'qr'"
-			@input="QRBarCode = $event"
-			@scan="handleScan"
-			@phone-scan="handlePhoneScan"
-			@delete-mode-change="BarCodeDelChange"
-		/>
-		<ProcessInScanDetail :detail="scanDetail" />
-
-		<ProcessInDetailList
-			:list="form.item_data"
-			:deletable="canScan"
-			show-tare-columns
-			@delete="onDeleteFineCode"
-		/>
-
-		<FabricOutFooter
-			v-if="!headerSaved"
-			:buttons="[{ label: '提交保存', action: 'save' }]"
-			single
-			@action="submitSave"
-		/>
-		<FabricOutFooter
-			v-else
-			:buttons="statusActionButtons"
-			@action="handleStatusAction"
-		/>
-
-		<u-select v-model="selectShow" :list="selectList" :remote="isRemoteSelect" :loading="selectSearching" @search="onSelectSearch" @confirm="selectConfirmFun"></u-select>
-	</view>
-</template>
-
-<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,
-		ProcessInDetailList,
-		ProcessInBinBar,
-	},
-	mixins: [formMixin],
-	data() {
-		return {
-			weightInputStyle: {
-				fontSize: '36rpx',
-			},
-		};
-	},
-	onLoad() {
-		uni.setNavigationBarTitle({ title: '新增采购进仓单' });
-		this.pageMode = 'add';
-		this.loadBaseDropdowns();
-	},
-};
-</script>
-
-<style lang="scss">
-@import '@/pages/storefabric/storeFabricBusinessOutPage.scss';
-page {
-	background-color: #F8F8F8;
-	padding-bottom: 260rpx;
-}
-.process-in-weight-row {
-	gap: 20rpx;
-}
-.process-in-weight-col {
-	flex: 1;
-	display: flex;
-	align-items: center;
-	min-width: 0;
-
-	::v-deep .u-input__input {
-		font-size: 36rpx !important;
-	}
-}
-</style>

src/pages/storegoods/storeGoodsPurchaseInEdit.vue

@@ -1,157 +0,0 @@
-<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 ptb20 bdb_f5">
-			<text class="mr26">供应商</text>
-			<text>{{ form.biz_unit_name || '-' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">仓库名称</text>
-			<text>{{ form.warehouse_name || '-' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb10 bdb_f5 process-in-weight-row">
-			<view class="process-in-weight-col">
-				<text class="mr16">纸筒重量</text>
-				<u-input
-					v-model="form.paper_tube_weight"
-					type="digit"
-					:disabled="!canEditWeights"
-					placeholder="1.5"
-					:custom-style="weightInputStyle"
-					placeholder-style="color: #c0c4cc; font-size: 36rpx;"
-				/>
-			</view>
-			<view class="process-in-weight-col">
-				<text class="mr16">包装重量</text>
-				<u-input
-					v-model="form.package_weight"
-					type="digit"
-					:disabled="!canEditWeights"
-					placeholder="0.3"
-					:custom-style="weightInputStyle"
-					placeholder-style="color: #c0c4cc; font-size: 36rpx;"
-				/>
-			</view>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">营销体系</text>
-			<text>{{ form.sale_system_name || '-' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<text class="mr26">订单类型</text>
-			<text>{{ form.sale_mode_name || '-' }}</text>
-		</view>
-		<view class="flex-white-plr26 ptb20 bdb_f5">
-			<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"
-			@clear="clearWarehouseBin"
-		/>
-		<FabricOutScanBar
-			:can-scan="showQrScanBar"
-			:value="QRBarCode"
-			:delete-mode="BarCodeDelStatus"
-			:message="BillDataMessage"
-			:disabled-tip="qrDisabledTip"
-			:show-phone-scan="canScanQr"
-			:scanning="phoneScanPanelOpen && phoneScanTarget === 'qr'"
-			@input="QRBarCode = $event"
-			@scan="handleScan"
-			@phone-scan="handlePhoneScan"
-			@delete-mode-change="BarCodeDelChange"
-		/>
-		<ProcessInScanDetail :detail="scanDetail" />
-
-		<ProcessInDetailList
-			:list="form.item_data"
-			:deletable="canScan"
-			show-tare-columns
-			@delete="onDeleteFineCode"
-		/>
-
-		<FabricOutFooter :buttons="statusActionButtons" @action="handleStatusAction" />
-
-		<u-select v-model="selectShow" :list="selectList" :remote="isRemoteSelect" :loading="selectSearching" @search="onSelectSearch" @confirm="selectConfirmFun"></u-select>
-	</view>
-</template>
-
-<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,
-		ProcessInDetailList,
-		ProcessInBinBar,
-	},
-	mixins: [formMixin],
-	data() {
-		return {
-			headerCollapsed: true,
-			weightInputStyle: {
-				fontSize: '36rpx',
-			},
-		};
-	},
-	onLoad(e) {
-		uni.setNavigationBarTitle({ title: '编辑采购进仓单' });
-		this.pageMode = 'edit';
-		if (e.id) {
-			this.loadOrder(Number(e.id), { rejectIfLocked: true });
-		}
-	},
-};
-</script>
-
-<style lang="scss">
-@import '@/pages/storefabric/storeFabricBusinessOutPage.scss';
-page {
-	background-color: #F8F8F8;
-	padding-bottom: 260rpx;
-}
-.process-in-weight-row {
-	gap: 20rpx;
-}
-.process-in-weight-col {
-	flex: 1;
-	display: flex;
-	align-items: center;
-	min-width: 0;
-
-	::v-deep .u-input__input {
-		font-size: 36rpx !important;
-	}
-}
-</style>