From 0ce4aec75d87508cece9437be816e057ea433765 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 03 八月 2026 11:50:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁
---
multiple/assets/logo/DDGWLogo.png | 0
public/DDGWfavicon.ico | 0
multiple/assets/logo/XLZNLogo.png | 0
multiple/config.json | 47 +++++++++++++++++++++++++++++++++++++++++------
src/views/salesManagement/salesLedger/index.vue | 3 ++-
src/assets/logo/logo.png | 0
multiple/assets/favicon/DDGWfavicon.ico | 0
multiple/assets/logo/XHZGLogo.png | 0
multiple/assets/favicon/XLZNfavicon.ico | 0
src/views/inventoryManagement/stockManagement/Record.vue | 4 ++--
multiple/assets/favicon/DTZGfavicon.ico | 0
multiple/assets/logo/DTZGLogo.png | 0
multiple/assets/favicon/XHZGfavicon.ico | 0
13 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/multiple/assets/favicon/DDGWfavicon.ico b/multiple/assets/favicon/DDGWfavicon.ico
new file mode 100644
index 0000000..e1905a1
--- /dev/null
+++ b/multiple/assets/favicon/DDGWfavicon.ico
Binary files differ
diff --git a/multiple/assets/favicon/DTZGfavicon.ico b/multiple/assets/favicon/DTZGfavicon.ico
new file mode 100644
index 0000000..7bb591f
--- /dev/null
+++ b/multiple/assets/favicon/DTZGfavicon.ico
Binary files differ
diff --git a/multiple/assets/favicon/XHZGfavicon.ico b/multiple/assets/favicon/XHZGfavicon.ico
new file mode 100644
index 0000000..d506107
--- /dev/null
+++ b/multiple/assets/favicon/XHZGfavicon.ico
Binary files differ
diff --git a/multiple/assets/favicon/XLZNfavicon.ico b/multiple/assets/favicon/XLZNfavicon.ico
new file mode 100644
index 0000000..b313e41
--- /dev/null
+++ b/multiple/assets/favicon/XLZNfavicon.ico
Binary files differ
diff --git a/multiple/assets/logo/DDGWLogo.png b/multiple/assets/logo/DDGWLogo.png
new file mode 100644
index 0000000..dd0ec17
--- /dev/null
+++ b/multiple/assets/logo/DDGWLogo.png
Binary files differ
diff --git a/multiple/assets/logo/DTZGLogo.png b/multiple/assets/logo/DTZGLogo.png
new file mode 100644
index 0000000..f384a5d
--- /dev/null
+++ b/multiple/assets/logo/DTZGLogo.png
Binary files differ
diff --git a/multiple/assets/logo/XHZGLogo.png b/multiple/assets/logo/XHZGLogo.png
new file mode 100644
index 0000000..725a58e
--- /dev/null
+++ b/multiple/assets/logo/XHZGLogo.png
Binary files differ
diff --git a/multiple/assets/logo/XLZNLogo.png b/multiple/assets/logo/XLZNLogo.png
new file mode 100644
index 0000000..56ae75e
--- /dev/null
+++ b/multiple/assets/logo/XLZNLogo.png
Binary files differ
diff --git a/multiple/config.json b/multiple/config.json
index 129c998..cfa6f07 100644
--- a/multiple/config.json
+++ b/multiple/config.json
@@ -150,15 +150,50 @@
"logo": "logo/JHJMLogo.png",
"favicon": "favicon/JHJMfavicon.ico"
},
- "SKJS": {
+ "DDGW": {
"env": {
- "VITE_APP_TITLE": "寰愬窞浠�鍏嬮噾灞炲埗鍝佹湁闄愬叕鍙�",
- "VITE_BASE_API": "http://36.213.180.217:9514",
- "VITE_JAVA_API": "http://36.213.180.217:9515"
+ "VITE_APP_TITLE": "娌冲崡涓滃ぇ楂樻俯鑺傝兘鏉愭枡鏈夐檺鍏徃",
+ "VITE_BASE_API": "http://103.189.141.42:9001",
+ "VITE_JAVA_API": "http://103.189.141.42:9002"
},
- "logo": "logo/SKJSLogo.png",
- "favicon": "favicon/SKJSFavicon.ico"
+ "logo": "logo/DDGWLogo.png",
+ "favicon": "favicon/DDGWfavicon.ico"
},
+ "XHZG": {
+ "env": {
+ "VITE_APP_TITLE": "楣ゅ娆ｅ紭閲嶅伐鏈夐檺鍏徃",
+ "VITE_BASE_API": "http://103.189.141.42:9001",
+ "VITE_JAVA_API": "http://103.189.141.42:9002"
+ },
+ "logo": "logo/XHZGLogo.png",
+ "favicon": "favicon/XHZGfavicon.ico"
+ },
+ "DTZG": {
+ "env": {
+ "VITE_APP_TITLE": "寰愬窞涓滅壒閲嶅伐绉戞妧鏈夐檺鍏徃",
+ "VITE_BASE_API": "http://36.213.180.217:9510",
+ "VITE_JAVA_API": "http://36.213.180.217:9511"
+ },
+ "logo": "logo/DTZGLogo.png",
+ "favicon": "favicon/DTZGfavicon.ico"
+ },
+ "XLZN": {
+ "env": {
+ "VITE_APP_TITLE": "姹熻嫃鏃緳鏅鸿兘绉戞妧鏈夐檺鍏徃",
+ "VITE_BASE_API": "http://36.213.180.217:9512",
+ "VITE_JAVA_API": "http://36.213.180.217:9513"
+ },
+ "logo": "logo/XLZNLogo.png",
+ "favicon": "favicon/XLZNfavicon.ico"
+ },"SKJS": {
+ "env": {
+ "VITE_APP_TITLE": "寰愬窞浠�鍏嬮噾灞炲埗鍝佹湁闄愬叕鍙�",
+ "VITE_BASE_API": "http://36.213.180.217:9514",
+ "VITE_JAVA_API": "http://36.213.180.217:9515"
+ },
+ "logo": "logo/SKJSLogo.png",
+ "favicon": "favicon/SKJSFavicon.ico"
+},
"YJYY": {
"env": {
"VITE_APP_TITLE": "寰愬窞姘镐匠娑插帇璁惧鏈夐檺鍏徃",
diff --git a/public/DDGWfavicon.ico b/public/DDGWfavicon.ico
new file mode 100644
index 0000000..e1905a1
--- /dev/null
+++ b/public/DDGWfavicon.ico
Binary files differ
diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png
index a5831b8..dd0ec17 100644
--- a/src/assets/logo/logo.png
+++ b/src/assets/logo/logo.png
Binary files differ
diff --git a/src/views/inventoryManagement/stockManagement/Record.vue b/src/views/inventoryManagement/stockManagement/Record.vue
index 0f3c79c..f036a9a 100644
--- a/src/views/inventoryManagement/stockManagement/Record.vue
+++ b/src/views/inventoryManagement/stockManagement/Record.vue
@@ -104,11 +104,11 @@
prop="unQualifiedLockedQuantity"
show-overflow-tooltip
/> -->
-<!-- <el-table-column
+ <el-table-column
label="搴撳瓨棰勮鏁伴噺"
prop="warnNum"
show-overflow-tooltip
- />-->
+ />
<el-table-column label="澶囨敞" prop="remark" show-overflow-tooltip />
<el-table-column
label="鏈�杩戞洿鏂版椂闂�"
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 0077850..9362a18 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -1501,6 +1501,7 @@
productForm.value.productModelId = p.id;
productForm.value.specificationModel = p.model || '';
productForm.value.unit = p.unit || '';
+ fetchCurrentStock(productForm.value.productModelId);
showProductSelectDialog.value = false;
};
// 鑾峰彇tree瀛愭暟鎹�
@@ -2806,4 +2807,4 @@
page-break-after: avoid;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3