diff --git a/README.md b/README.md
index 78381f9..bbb54aa 100644
--- a/README.md
+++ b/README.md
@@ -125,14 +125,14 @@ node scripts/upload-apk.js --file D:\path\你的.apk --target test
| 参数 | 说明 |
|---|---|
-| `--target test` | 测试 CDN:`https://testhcscm.cdn.zzfzyc.com` |
-| `--target prod` | 正式 CDN:`https://hcscm.cdn.zzfzyc.com` |
+| `--target test` | 测试 CDN:`https://zsfzcdn.yushangfangzhi.com` |
+| `--target prod` | 正式 CDN:`https://zsfzcdn.yushangfangzhi.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://testhcscm.cdn.zzfzyc.com/version/erp_pda_zhoushang/1.1.9.apk
-https://testhcscm.cdn.zzfzyc.com/version/erp_pda_zhoushang/latest.apk
+https://zsfzcdn.yushangfangzhi.com/version/erp_pda_zhoushang/1.1.9.apk
+https://zsfzcdn.yushangfangzhi.com/version/erp_pda_zhoushang/latest.apk
```
diff --git a/scripts/upload-apk.js b/scripts/upload-apk.js
index c10a4bf..a736145 100644
--- a/scripts/upload-apk.js
+++ b/scripts/upload-apk.js
@@ -24,8 +24,8 @@ const ROOT = path.resolve(__dirname, '..');
const API_BASE = 'https://hcscmtest.zzfzyc.com/hcscm';
const UPYUN_API = 'https://v0.api.upyun.com';
const CDN_HOST = {
- test: 'https://testhcscm.cdn.zzfzyc.com',
- prod: 'https://hcscm.cdn.zzfzyc.com',
+ test: 'https://zsfzcdn.yushangfangzhi.com',
+ prod: 'https://zsfzcdn.yushangfangzhi.com',
};
const MODE_ENV = {
diff --git a/src/components/storefabric/FabricOutDetailList.vue b/src/components/storefabric/FabricOutDetailList.vue
index a4f5529..7f236c5 100644
--- a/src/components/storefabric/FabricOutDetailList.vue
+++ b/src/components/storefabric/FabricOutDetailList.vue
@@ -1,36 +1,157 @@
- {{ title }}
+ {{ title }}
-
-
-
- {{ row.grey_fabric_code }}#{{ row.grey_fabric_name }}
-
+
+
+
+
+ {{ col.label }}
+
+ 暂无出仓明细
+
+ {{ row.grey_fabric_code || '-' }}
+ {{ row.grey_fabric_name || '-' }}
+ {{ displayNum(row.roll) }}
+ {{ displayNum(row.weight) }}
+ 细码
+
+
+ 合计
+
+ {{ totalRoll }}
+ {{ totalWeight }}
+
+
-
- 匹数:{{ row.roll }}
- 重量:{{ row.weight }}KG
- 细码
-
-
+
diff --git a/src/components/storefabric/OrderHeaderFold.vue b/src/components/storefabric/OrderHeaderFold.vue
new file mode 100644
index 0000000..1882621
--- /dev/null
+++ b/src/components/storefabric/OrderHeaderFold.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
diff --git a/src/components/storegoods/FineCodeSummaryTable.vue b/src/components/storegoods/FineCodeSummaryTable.vue
new file mode 100644
index 0000000..2425b3d
--- /dev/null
+++ b/src/components/storegoods/FineCodeSummaryTable.vue
@@ -0,0 +1,326 @@
+
+
+ {{ title }}
+
+
+
+
+
+ {{ col.label }}
+
+ {{ emptyText }}
+
+ {{ formatCell(row, col.key) }}
+
+
+ {{ totalCell(col.key) }}
+
+
+
+
+
+
+ 细码({{ expandedRow.fine_codes.length }})
+ {{ expandedKey ? '点击行收起' : '' }}
+
+ 暂无细码
+
+
+
+ {{ col.label }}
+
+
+ {{ formatFineCell(fc, col.key) }}
+
+
+
+
+ 点击「删除」移除对应细码
+
+
+
+
+
+
+
+
+
diff --git a/src/components/storegoods/ProcessInDetailList.vue b/src/components/storegoods/ProcessInDetailList.vue
index 2318c06..93ed096 100644
--- a/src/components/storegoods/ProcessInDetailList.vue
+++ b/src/components/storegoods/ProcessInDetailList.vue
@@ -1,261 +1,35 @@
-
- {{ title }}
-
-
-
-
-
-
- {{ product.product_code || '-' }}{{ ' ' + product.product_name }}
-
-
- 匹数 {{ product.in_roll }} / 数量 {{ product.in_weight }}
-
-
-
-
-
-
- 色号 {{ color.product_color_code || '-' }}{{ ' ' + color.product_color_name }}
-
-
- 匹数 {{ color.in_roll }} / 数量 {{ color.in_weight }}
-
-
-
- 染整单:{{ color.quote_order_no || '-' }}
- 缸号:{{ color.dye_factory_dyelot_number || '-' }}
-
-
- 细码({{ color.fine_codes.length }})
- 暂无细码
-
-
-
- {{ col.label }}
-
-
- {{ formatFineCell(fc, col.key) }}
-
-
-
-
- 勾选上方「删除」后扫码,或点击「删除」列移除细码
-
-
-
-
-
+
+
+
-
-
diff --git a/src/components/storegoods/ProcessOutDetailList.vue b/src/components/storegoods/ProcessOutDetailList.vue
index ea972d3..c968ad0 100644
--- a/src/components/storegoods/ProcessOutDetailList.vue
+++ b/src/components/storegoods/ProcessOutDetailList.vue
@@ -1,97 +1,24 @@
-
- {{ title }}
-
-
-
-
-
-
- {{ product.product_code || '-' }}{{ ' ' + product.product_name }}
-
-
- 匹数 {{ product.out_roll }} / 数量 {{ product.out_weight }}
-
-
-
-
-
-
- 色号 {{ color.product_color_code || '-' }}{{ ' ' + color.product_color_name }}
-
-
- 匹数 {{ color.out_roll }} / 数量 {{ color.out_weight }}
-
-
-
- 染整单:{{ color.quote_order_no || '-' }}
- 缸号:{{ color.dye_factory_dyelot_number || '-' }}
-
-
- 细码({{ color.fine_codes.length }})
- 暂无细码
-
-
-
- {{ col.label }}
-
-
- {{ formatFineCell(fc, col.key) }}
-
-
-
-
- 勾选上方「删除」后扫码,或点击「删除」列移除细码
-
-
-
-
-
+
+
+
-
-
diff --git a/src/manifest.json b/src/manifest.json
index f44d8a4..9923e8d 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,8 +2,8 @@
"name" : "浩拓ERP",
"appid" : "__UNI__F79F300",
"description" : "浩拓ERP",
- "versionName" : "1.1.17",
- "versionCode" : 117,
+ "versionName" : "1.1.18",
+ "versionCode" : 118,
"transformPx" : false,
"app-plus" : {
"optimization" : {
diff --git a/src/pages/storefabric/storeFabricBusinessOutAdd.vue b/src/pages/storefabric/storeFabricBusinessOutAdd.vue
index bdad569..462c842 100644
--- a/src/pages/storefabric/storeFabricBusinessOutAdd.vue
+++ b/src/pages/storefabric/storeFabricBusinessOutAdd.vue
@@ -2,6 +2,8 @@
+
+
@@ -60,6 +62,8 @@
+
+
+
@@ -22,6 +23,7 @@
单据备注
{{ form.remark || '-' }}
+
+
@@ -25,6 +26,7 @@
审核人{{ order.auditer_name }} {{ formatTime(order.audit_time, 'YYYY-MM-DD') }}
+
+
@@ -62,6 +63,7 @@
单据备注
+
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';
@@ -123,6 +126,7 @@ import ProcessInBinBar from '@/components/storegoods/ProcessInBinBar.vue';
export default {
components: {
OrderStatusBar,
+ OrderHeaderFold,
FabricOutScanBar,
FabricOutFooter,
ProcessInScanDetail,
diff --git a/src/pages/storegoods/storeGoodsProcessInEdit.vue b/src/pages/storegoods/storeGoodsProcessInEdit.vue
index 6c11a4b..631bcc0 100644
--- a/src/pages/storegoods/storeGoodsProcessInEdit.vue
+++ b/src/pages/storegoods/storeGoodsProcessInEdit.vue
@@ -1,5 +1,6 @@
+
@@ -50,6 +51,7 @@
单据备注
{{ form.remark || '-' }}
+
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';
@@ -101,6 +104,7 @@ import ProcessInBinBar from '@/components/storegoods/ProcessInBinBar.vue';
export default {
components: {
OrderStatusBar,
+ OrderHeaderFold,
FabricOutScanBar,
FabricOutFooter,
ProcessInScanDetail,
@@ -110,6 +114,7 @@ export default {
mixins: [formMixin],
data() {
return {
+ headerCollapsed: true,
weightInputStyle: {
fontSize: '36rpx',
},
diff --git a/src/pages/storegoods/storeGoodsProcessInMixin.js b/src/pages/storegoods/storeGoodsProcessInMixin.js
index 7fe919a..9e9bdf6 100644
--- a/src/pages/storegoods/storeGoodsProcessInMixin.js
+++ b/src/pages/storegoods/storeGoodsProcessInMixin.js
@@ -45,6 +45,7 @@ export default {
orderId: 0,
form: this.getEmptyForm(),
headerSaved: false,
+ headerCollapsed: false,
selectShow: false,
selectList: [],
selectType: '',
@@ -407,6 +408,7 @@ export default {
this.orderId = order.id;
this.auditStatus = order.audit_status;
this.headerSaved = true;
+ this.headerCollapsed = true;
this.form = orderToFormFields(order);
this.clearWarehouseBin();
this.syncCanScanFromStatus(order.audit_status);
@@ -494,6 +496,7 @@ export default {
const order = normalizeOrder(detail);
this.applyOrder(order, { keepWeights: true });
this.headerSaved = true;
+ this.headerCollapsed = true;
this.clearWarehouseBin();
this.syncCanScanFromStatus(order.audit_status);
this.showSuccess('保存成功,请先扫描仓位', '保存成功', { voiceOnly: true });
diff --git a/src/pages/storegoods/storeGoodsProcessInView.vue b/src/pages/storegoods/storeGoodsProcessInView.vue
index b48c657..ea0e558 100644
--- a/src/pages/storegoods/storeGoodsProcessInView.vue
+++ b/src/pages/storegoods/storeGoodsProcessInView.vue
@@ -1,5 +1,6 @@
+
@@ -44,6 +45,7 @@
审核人
{{ order.auditor_name }} {{ formatTime(order.audit_time, 'YYYY-MM-DD') }}
+
import util from '@/common/util';
import OrderStatusBar from '@/components/storefabric/OrderStatusBar.vue';
+import OrderHeaderFold from '@/components/storefabric/OrderHeaderFold.vue';
import FabricOutFooter from '@/components/storefabric/FabricOutFooter.vue';
import ProcessInDetailList from '@/components/storegoods/ProcessInDetailList.vue';
import {
@@ -68,10 +71,11 @@ import {
} from '@/common/storeGoodsProcessIn';
export default {
- components: { OrderStatusBar, FabricOutFooter, ProcessInDetailList },
+ components: { OrderStatusBar, OrderHeaderFold, FabricOutFooter, ProcessInDetailList },
data() {
return {
orderId: 0,
+ headerCollapsed: true,
order: { item_data: [] },
};
},
diff --git a/src/pages/storegoods/storeGoodsProcessOutAdd.vue b/src/pages/storegoods/storeGoodsProcessOutAdd.vue
index 683fcaa..e7b0547 100644
--- a/src/pages/storegoods/storeGoodsProcessOutAdd.vue
+++ b/src/pages/storegoods/storeGoodsProcessOutAdd.vue
@@ -1,5 +1,6 @@
+
@@ -31,6 +32,7 @@
单据备注
+
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';
@@ -79,6 +82,7 @@ import ProcessOutDetailList from '@/components/storegoods/ProcessOutDetailList.v
export default {
components: {
OrderStatusBar,
+ OrderHeaderFold,
FabricOutScanBar,
FabricOutFooter,
ProcessOutScanDetail,
diff --git a/src/pages/storegoods/storeGoodsProcessOutEdit.vue b/src/pages/storegoods/storeGoodsProcessOutEdit.vue
index f2bc1ee..a18aadf 100644
--- a/src/pages/storegoods/storeGoodsProcessOutEdit.vue
+++ b/src/pages/storegoods/storeGoodsProcessOutEdit.vue
@@ -1,5 +1,6 @@
+
@@ -22,6 +23,7 @@
单据备注
{{ form.remark || '-' }}
+
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';
@@ -60,12 +63,18 @@ import ProcessOutDetailList from '@/components/storegoods/ProcessOutDetailList.v
export default {
components: {
OrderStatusBar,
+ OrderHeaderFold,
FabricOutScanBar,
FabricOutFooter,
ProcessOutScanDetail,
ProcessOutDetailList,
},
mixins: [formMixin],
+ data() {
+ return {
+ headerCollapsed: true,
+ };
+ },
onLoad(e) {
uni.setNavigationBarTitle({ title: '编辑加工出仓单' });
this.pageMode = 'edit';
diff --git a/src/pages/storegoods/storeGoodsProcessOutMixin.js b/src/pages/storegoods/storeGoodsProcessOutMixin.js
index 79c7634..39a0615 100644
--- a/src/pages/storegoods/storeGoodsProcessOutMixin.js
+++ b/src/pages/storegoods/storeGoodsProcessOutMixin.js
@@ -41,6 +41,7 @@ export default {
orderId: 0,
form: this.getEmptyForm(),
headerSaved: false,
+ headerCollapsed: false,
selectShow: false,
selectList: [],
selectType: '',
@@ -274,6 +275,7 @@ export default {
this.orderId = order.id;
this.auditStatus = order.audit_status;
this.headerSaved = true;
+ this.headerCollapsed = true;
this.form = orderToFormFields(order);
this.syncCanScanFromStatus(order.audit_status);
if (this.canScan) this.registerOrderScanBroadcast();
@@ -366,6 +368,7 @@ 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.registerOrderScanBroadcast();
diff --git a/src/pages/storegoods/storeGoodsProcessOutView.vue b/src/pages/storegoods/storeGoodsProcessOutView.vue
index ffb00d7..eea4369 100644
--- a/src/pages/storegoods/storeGoodsProcessOutView.vue
+++ b/src/pages/storegoods/storeGoodsProcessOutView.vue
@@ -1,5 +1,6 @@
+
@@ -30,6 +31,7 @@
审核人
{{ order.auditor_name }} {{ formatTime(order.audit_time, 'YYYY-MM-DD') }}
+
import util from '@/common/util';
import OrderStatusBar from '@/components/storefabric/OrderStatusBar.vue';
+import OrderHeaderFold from '@/components/storefabric/OrderHeaderFold.vue';
import FabricOutFooter from '@/components/storefabric/FabricOutFooter.vue';
import ProcessOutDetailList from '@/components/storegoods/ProcessOutDetailList.vue';
import {
@@ -53,10 +56,11 @@ import {
} from '@/common/storeGoodsProcessOut';
export default {
- components: { OrderStatusBar, FabricOutFooter, ProcessOutDetailList },
+ components: { OrderStatusBar, OrderHeaderFold, FabricOutFooter, ProcessOutDetailList },
data() {
return {
orderId: 0,
+ headerCollapsed: true,
order: { item_data: [] },
};
},
diff --git a/src/pages/storegoods/storeGoodsProcessReturnInAdd.vue b/src/pages/storegoods/storeGoodsProcessReturnInAdd.vue
index 6b21872..7881f17 100644
--- a/src/pages/storegoods/storeGoodsProcessReturnInAdd.vue
+++ b/src/pages/storegoods/storeGoodsProcessReturnInAdd.vue
@@ -1,5 +1,6 @@
+
@@ -28,6 +29,7 @@
单据备注
+
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';
@@ -88,6 +91,7 @@ import ProcessInBinBar from '@/components/storegoods/ProcessInBinBar.vue';
export default {
components: {
OrderStatusBar,
+ OrderHeaderFold,
FabricOutScanBar,
FabricOutFooter,
ProcessInScanDetail,
diff --git a/src/pages/storegoods/storeGoodsProcessReturnInEdit.vue b/src/pages/storegoods/storeGoodsProcessReturnInEdit.vue
index 604d59e..cd734d2 100644
--- a/src/pages/storegoods/storeGoodsProcessReturnInEdit.vue
+++ b/src/pages/storegoods/storeGoodsProcessReturnInEdit.vue
@@ -1,5 +1,6 @@
+
@@ -22,6 +23,7 @@
单据备注
{{ form.remark || '-' }}
+
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';
@@ -72,6 +75,7 @@ import ProcessInBinBar from '@/components/storegoods/ProcessInBinBar.vue';
export default {
components: {
OrderStatusBar,
+ OrderHeaderFold,
FabricOutScanBar,
FabricOutFooter,
ProcessInScanDetail,
@@ -79,6 +83,11 @@ export default {
ProcessInBinBar,
},
mixins: [formMixin],
+ data() {
+ return {
+ headerCollapsed: true,
+ };
+ },
onLoad(e) {
uni.setNavigationBarTitle({ title: '编辑加工退货进仓单' });
this.pageMode = 'edit';
diff --git a/src/pages/storegoods/storeGoodsProcessReturnInMixin.js b/src/pages/storegoods/storeGoodsProcessReturnInMixin.js
index 036025b..fe56234 100644
--- a/src/pages/storegoods/storeGoodsProcessReturnInMixin.js
+++ b/src/pages/storegoods/storeGoodsProcessReturnInMixin.js
@@ -40,6 +40,7 @@ export default {
orderId: 0,
form: this.getEmptyForm(),
headerSaved: false,
+ headerCollapsed: false,
selectShow: false,
selectList: [],
selectType: '',
@@ -345,6 +346,7 @@ export default {
this.orderId = order.id;
this.auditStatus = order.audit_status;
this.headerSaved = true;
+ this.headerCollapsed = true;
this.form = orderToFormFields(order);
this.clearWarehouseBin();
this.syncCanScanFromStatus(order.audit_status);
@@ -417,6 +419,7 @@ export default {
const order = normalizeOrder(detail);
this.applyOrder(order);
this.headerSaved = true;
+ this.headerCollapsed = true;
this.clearWarehouseBin();
this.syncCanScanFromStatus(order.audit_status);
this.showSuccess('保存成功,请先扫描仓位', '保存成功', { voiceOnly: true });
diff --git a/src/pages/storegoods/storeGoodsProcessReturnInView.vue b/src/pages/storegoods/storeGoodsProcessReturnInView.vue
index 0b0bb1a..2397b76 100644
--- a/src/pages/storegoods/storeGoodsProcessReturnInView.vue
+++ b/src/pages/storegoods/storeGoodsProcessReturnInView.vue
@@ -1,5 +1,6 @@
+
@@ -30,6 +31,7 @@
审核人
{{ order.auditor_name }} {{ formatTime(order.audit_time, 'YYYY-MM-DD') }}
+
import util from '@/common/util';
import OrderStatusBar from '@/components/storefabric/OrderStatusBar.vue';
+import OrderHeaderFold from '@/components/storefabric/OrderHeaderFold.vue';
import FabricOutFooter from '@/components/storefabric/FabricOutFooter.vue';
import ProcessInDetailList from '@/components/storegoods/ProcessInDetailList.vue';
import {
@@ -53,10 +56,11 @@ import {
} from '@/common/storeGoodsProcessReturnIn';
export default {
- components: { OrderStatusBar, FabricOutFooter, ProcessInDetailList },
+ components: { OrderStatusBar, OrderHeaderFold, FabricOutFooter, ProcessInDetailList },
data() {
return {
orderId: 0,
+ headerCollapsed: true,
order: { item_data: [] },
};
},
diff --git a/src/pages/storegoods/storeGoodsPurchaseInAdd.vue b/src/pages/storegoods/storeGoodsPurchaseInAdd.vue
index 141d5b9..d2ffb30 100644
--- a/src/pages/storegoods/storeGoodsPurchaseInAdd.vue
+++ b/src/pages/storegoods/storeGoodsPurchaseInAdd.vue
@@ -1,5 +1,6 @@
+
@@ -62,6 +63,7 @@
单据备注
+
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';
@@ -123,6 +126,7 @@ import ProcessInBinBar from '@/components/storegoods/ProcessInBinBar.vue';
export default {
components: {
OrderStatusBar,
+ OrderHeaderFold,
FabricOutScanBar,
FabricOutFooter,
ProcessInScanDetail,
diff --git a/src/pages/storegoods/storeGoodsPurchaseInEdit.vue b/src/pages/storegoods/storeGoodsPurchaseInEdit.vue
index 71899c4..a49ccaa 100644
--- a/src/pages/storegoods/storeGoodsPurchaseInEdit.vue
+++ b/src/pages/storegoods/storeGoodsPurchaseInEdit.vue
@@ -1,5 +1,6 @@
+
@@ -50,6 +51,7 @@
单据备注
{{ form.remark || '-' }}
+
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';
@@ -101,6 +104,7 @@ import ProcessInBinBar from '@/components/storegoods/ProcessInBinBar.vue';
export default {
components: {
OrderStatusBar,
+ OrderHeaderFold,
FabricOutScanBar,
FabricOutFooter,
ProcessInScanDetail,
@@ -110,6 +114,7 @@ export default {
mixins: [formMixin],
data() {
return {
+ headerCollapsed: true,
weightInputStyle: {
fontSize: '36rpx',
},
diff --git a/src/pages/storegoods/storeGoodsPurchaseInMixin.js b/src/pages/storegoods/storeGoodsPurchaseInMixin.js
index bb471fd..a4301ef 100644
--- a/src/pages/storegoods/storeGoodsPurchaseInMixin.js
+++ b/src/pages/storegoods/storeGoodsPurchaseInMixin.js
@@ -47,6 +47,7 @@ export default {
orderId: 0,
form: this.getEmptyForm(),
headerSaved: false,
+ headerCollapsed: false,
selectShow: false,
selectList: [],
selectType: '',
@@ -411,6 +412,7 @@ export default {
this.orderId = order.id;
this.auditStatus = order.audit_status;
this.headerSaved = true;
+ this.headerCollapsed = true;
this.form = orderToFormFields(order);
this.clearWarehouseBin();
this.syncCanScanFromStatus(order.audit_status);
@@ -499,6 +501,7 @@ export default {
const order = normalizeOrder(detail);
this.applyOrder(order, { keepWeights: true });
this.headerSaved = true;
+ this.headerCollapsed = true;
this.clearWarehouseBin();
this.syncCanScanFromStatus(order.audit_status);
this.showSuccess('保存成功,请先扫描仓位', '保存成功', { voiceOnly: true });
diff --git a/src/pages/storegoods/storeGoodsPurchaseInView.vue b/src/pages/storegoods/storeGoodsPurchaseInView.vue
index 2e5e5ad..0635d1b 100644
--- a/src/pages/storegoods/storeGoodsPurchaseInView.vue
+++ b/src/pages/storegoods/storeGoodsPurchaseInView.vue
@@ -1,5 +1,6 @@
+
@@ -44,6 +45,7 @@
审核人
{{ order.auditor_name }} {{ formatTime(order.audit_time, 'YYYY-MM-DD') }}
+
import util from '@/common/util';
import OrderStatusBar from '@/components/storefabric/OrderStatusBar.vue';
+import OrderHeaderFold from '@/components/storefabric/OrderHeaderFold.vue';
import FabricOutFooter from '@/components/storefabric/FabricOutFooter.vue';
import ProcessInDetailList from '@/components/storegoods/ProcessInDetailList.vue';
import {
@@ -68,10 +71,11 @@ import {
} from '@/common/storeGoodsPurchaseIn';
export default {
- components: { OrderStatusBar, FabricOutFooter, ProcessInDetailList },
+ components: { OrderStatusBar, OrderHeaderFold, FabricOutFooter, ProcessInDetailList },
data() {
return {
orderId: 0,
+ headerCollapsed: true,
order: { item_data: [] },
};
},
diff --git a/src/pages/sys/login/index.vue b/src/pages/sys/login/index.vue
index f00ad4d..f055732 100644
--- a/src/pages/sys/login/index.vue
+++ b/src/pages/sys/login/index.vue
@@ -111,7 +111,6 @@
版本: {{ appVersion }}
({{ envName }})
- {{ checkingUpgrade ? '检查中...' : '检查更新' }}
@@ -139,7 +138,6 @@ export default {
password: ""
},
showApiUrlPicker: false,
- checkingUpgrade: false,
// 登录默认正式环境,本地已选过的地址仍会在 onShow 里恢复
selectedApiUrl: (config.devApiUrlOptions.find(item => item.label === '正式环境') || {}).value || config.productionApiUrl,
customApiUrl: 'http://192.168.1.66:50002/hcscm/pda/v1',
@@ -433,19 +431,8 @@ export default {
autoCheckUpgrade() {
this.runUpgradeCheck({ silentWhenLatest: true });
},
- // 手动检查版本更新
- checkUpgrade() {
- if (this.checkingUpgrade) return;
- // #ifndef APP-PLUS
- this.$u.toast('小程序端或H5端已是最新版,无需检查更新!');
- // #endif
- // #ifdef APP-PLUS
- this.runUpgradeCheck({ silentWhenLatest: false });
- // #endif
- },
runUpgradeCheck({ silentWhenLatest }) {
const self = this;
- this.checkingUpgrade = true;
app_upgrade(async () => {
try {
const appInfo = await new Promise((resolve) => {
@@ -474,8 +461,6 @@ export default {
self.$u.toast('检查更新失败,请稍后重试');
}
return { status: 0 };
- } finally {
- self.checkingUpgrade = false;
}
}, 1);
},
@@ -639,15 +624,6 @@ export default {
color: #5473e8;
margin-left: 10rpx;
}
-
-.check-upgrade-btn {
- font-size: 34rpx;
- color: #5473e8;
- margin-left: 24rpx;
- padding: 16rpx 8rpx;
- min-height: 64rpx;
- line-height: 64rpx;
-}