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 @@ 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 @@ + + + + + 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 @@ - - 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 @@ - - 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 @@