diff --git a/jnpf-app/components/jnpf/jnpf-upload-pound/index.vue b/jnpf-app/components/jnpf/jnpf-upload-pound/index.vue
new file mode 100644
index 00000000..cff2e9ba
--- /dev/null
+++ b/jnpf-app/components/jnpf/jnpf-upload-pound/index.vue
@@ -0,0 +1,248 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{tipText}}
+
+
+
+
+
\ No newline at end of file
diff --git a/jnpf-app/manifest.json b/jnpf-app/manifest.json
index 1f3e45fe..e3fe1072 100644
--- a/jnpf-app/manifest.json
+++ b/jnpf-app/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "管家平台",
+ "name" : "管家平台2期",
"appid" : "__UNI__FA01CC1",
"description" : "专注信息化平台、软件开发、app开发",
"versionName" : "3.4.76",
diff --git a/jnpf-app/pages/index/portal.vue b/jnpf-app/pages/index/portal.vue
index 854368cf..9bd5741c 100644
--- a/jnpf-app/pages/index/portal.vue
+++ b/jnpf-app/pages/index/portal.vue
@@ -1,207 +1,237 @@
-
-
-
-
- 济钢城市矿产再生资源智慧管家平台
-
-
-
-
-
-
-
-
- {{homeInfo.avgPurchasePrice}}
- 磅单采购数
-
-
+
+
+
+
+ 济钢城市矿产再生资源智慧管家平台
+
+
+
+
+
+
+
+
+ {{homeInfo.avgPurchasePrice}}
+ 磅单采购数
+
+
+
+
+
+
+
+
+
+
+ {{homeInfo.todayPurchasePrice}}
+ 今日采购量
+
+
+
+
+
+
+
+
+
+
+
+
+ {{homeInfo.salesVolumeToday}}
+ 今日销售量
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 今日付款:{{homeInfo.todayPay}}元
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 今日回款:{{homeInfo.todayPayment}}元
+
+
+
+
+
+
+
-
-
-
-
-
-
-
- {{homeInfo.todayPurchasePrice}}
- 今日采购量
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 待支付:{{homeInfo.unpaid}}元
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 待回款:{{homeInfo.moneyCollected}}元
+
+
+
+
+
+
-
-
- {{homeInfo.salesVolumeToday}}
- 今日销售量
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 今日付款:{{homeInfo.todayPay}}元
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 今日回款:{{homeInfo.todayPayment}}元
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- 待支付:{{homeInfo.unpaid}}元
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 待回款:{{homeInfo.moneyCollected}}元
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 采购收货凭证
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 采购收货凭证
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -309,6 +339,12 @@
// #endif
},
methods: {
+ openPage(path) {
+ if (!path) return;
+ uni.navigateTo({
+ url: path,
+ });
+ },
getHomeInfo() {
request({
url: '/api/scm/BusinessEnterpriseRelational/getHomePage',
diff --git a/jnpf-app/pages/scm/form/purchaseReceiptVoucher/index.vue b/jnpf-app/pages/scm/form/purchaseReceiptVoucher/index.vue
index 855345a7..a50ad44a 100644
--- a/jnpf-app/pages/scm/form/purchaseReceiptVoucher/index.vue
+++ b/jnpf-app/pages/scm/form/purchaseReceiptVoucher/index.vue
@@ -1,386 +1,356 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ({{i+1}})
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{dataForm.voucherproductList.length==0?"添加":"添加"}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ({{i+1}})
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{dataForm.vouchervehicleList.length==0?"添加":"添加"}}
-
-
-
-
-
- 更多
-
- 确定
- 取消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+ {{dataForm.vouchervehicleList.length==0?"添加":"添加"}}
+
+
+
+
+
+ 更多
+
+ 确定
+ 取消
+
+
+
+
-
+
+
\ No newline at end of file
diff --git a/jnpf-app/utils/define.js b/jnpf-app/utils/define.js
index e8645e81..47831078 100644
--- a/jnpf-app/utils/define.js
+++ b/jnpf-app/utils/define.js
@@ -2,26 +2,28 @@
/*JAVA app.java.jnpfsoft.com NET dotnet.jnpfsoft.com*/
// #ifndef MP
const baseURL = process.env.NODE_ENV === "production" ?
- "http://221.214.32.166:40000" : "http://221.214.32.166:40000" // 接口前缀
+ "http://127.0.0.1:50000" : "http://127.0.0.1:50000" // 接口前缀
const define = {
copyright: "Copyright @ 2024 上海长江云息数字科技有限公司版权所有",
sysVersion: "V3.5",
baseURL: baseURL,
- webSocketUrl: process.env.NODE_ENV === "production" ? "wss://221.214.32.166:40000/websocket" :
- "ws://221.214.32.166:40000/api/message/websocket",
+ webSocketUrl: process.env.NODE_ENV === "production" ? "wss://127.0.0.1:50000/websocket" :
+ "ws://127.0.0.1:50000/api/message/websocket",
comUploadUrl: baseURL + '/api/file/Uploader/',
+ comUploadUrlPound: baseURL + '/api/scm/Voucher/Uploader/',
timeout: process.env.NODE_ENV === 'production' ? 1000000 : 1000000,
report: process.env.NODE_ENV === 'development' ? 'http://221.214.32.166:8200' : baseURL + '/Report'
}
// #endif
// #ifdef MP
-const baseURL = "http://221.214.32.166:40000" // "https://app.java.jnpfsoft.com"
+const baseURL = "http://127.0.0.1:50000" // "https://app.java.jnpfsoft.com"
const define = {
copyright: "Copyright @ 2024 上海长江云息数字科技有限公司版权所有",
sysVersion: "V3.5",
baseURL: baseURL,
- webSocketUrl: "ws://221.214.32.166:40000/api/message/websocket", //"wss://app.java.jnpfsoft.com/api/message/websocket"
+ comUploadUrlPound: baseURL + '/api/scm/Voucher/Uploader/',
+ webSocketUrl: "ws://127.0.0.1:50000/api/message/websocket", //"wss://app.java.jnpfsoft.com/api/message/websocket"
comUploadUrl: baseURL + '/api/file/Uploader/',
timeout: process.env.NODE_ENV === 'production' ? 1000000 : 1000000,
report: baseURL + '/Report'