From 54077911c447da53f10d2ae43c2e2e05dae48b74 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 16 Jul 2024 09:50:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=B0=E8=B4=AD?=
=?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sgzb-ui/src/views/claimAndreturn/picking/protocol/index.vue | 3 ++-
sgzb-ui/src/views/warehouseManage/machinery/type/index.vue | 3 ++-
.../newPurchase/toolsAcceptance/component/queryTools.vue | 3 ++-
sgzb-ui/vue.config.js | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/protocol/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/protocol/index.vue
index 787aafc8..035362e8 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/protocol/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/protocol/index.vue
@@ -694,7 +694,8 @@ export default {
},
//图片查看
openImg(url) {
- this.dialogImageUrl = this.uploadUrl + url
+ // this.dialogImageUrl = this.uploadUrl + url
+ this.dialogImageUrl = url
this.dialogVisible = true
},
// 多选框选中数据
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue b/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
index 0939a569..d0aeec82 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
@@ -998,7 +998,8 @@ export default {
},
//图片查看
openImg(url) {
- this.dialogImageUrl = this.uploadUrl + url
+ // this.dialogImageUrl = this.uploadUrl + url
+ this.dialogImageUrl = url
this.dialogVisible = true
},
//文件上传
diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
index 2bca085a..1f0062e3 100644
--- a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
+++ b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
@@ -994,7 +994,8 @@ export default {
},
//图片查看
openImg(url) {
- this.dialogImageUrl = this.uploadUrl + url
+ // this.dialogImageUrl = this.uploadUrl + url
+ this.dialogImageUrl = url
this.dialogVisible = true
},
//验收后禁止勾选
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index 831d53b8..7ad73a50 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -42,7 +42,7 @@ module.exports = {
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网
// target: `https://z.csgmall.com.cn`,
- target: `http://10.40.92.60:28080`, //超
+ target: `http://192.168.2.76:28080`, //超
// target: `http://10.40.92.81:8080`, //韩/
// target: `http://10.40.92.74:8080`,//旭/
//target: `http://192.168.2.248:28080`, //帅
From d35f8799ae5102bacc4a7bb2ddbdccd2d2f725f5 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 16 Jul 2024 10:46:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sgzb-ui/src/views/store/tools/safeTools.vue | 699 +++++++++++-------
.../machinery/coding/index.vue | 7 +-
2 files changed, 418 insertions(+), 288 deletions(-)
diff --git a/sgzb-ui/src/views/store/tools/safeTools.vue b/sgzb-ui/src/views/store/tools/safeTools.vue
index 522678ce..39782feb 100644
--- a/sgzb-ui/src/views/store/tools/safeTools.vue
+++ b/sgzb-ui/src/views/store/tools/safeTools.vue
@@ -1,311 +1,436 @@
-
\ No newline at end of file
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue b/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
index 3cf3229e..3be6b012 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
@@ -220,10 +220,15 @@
>
- -->
+