diff --git a/sgzb-ui/src/utils/globalUrl.js b/sgzb-ui/src/utils/globalUrl.js
index d84343c3..c5a6e866 100644
--- a/sgzb-ui/src/utils/globalUrl.js
+++ b/sgzb-ui/src/utils/globalUrl.js
@@ -1,6 +1,6 @@
-// const qrUrl = 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='; //测试
-const qrUrl = 'http://112.29.103.165:21626/qrCode/qrCodePage?qrCode='; //重庆
+const qrUrl = 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='; //测试
+// const qrUrl = 'http://112.29.103.165:21626/qrCode/qrCodePage?qrCode='; //重庆
// const qrUrl = 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='; //宁夏
// const qrUrl = 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode='; //南网
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
index 25b63cb1..0abd83be 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
@@ -287,7 +287,7 @@
-
+
@@ -600,21 +600,25 @@ export default {
typeof response.data.fileName === "string"
) {
try {
- let [urlArr, nameArr] = [
- response.data.fileUrl,
- response.data.fileName
- ].map(str => str.split(","));
+ if(response.data.fileUrl!=''){
+ let [urlArr, nameArr] = [
+ response.data.fileUrl,
+ response.data.fileName
+ ].map(str => str.split(","));
- if (urlArr.length !== nameArr.length) {
- return;
+ if (urlArr.length !== nameArr.length) {
+ return;
+ }
+ console.log(urlArr)
+ let fileList = urlArr.map((url, i) => ({
+ name: nameArr[i],
+ url: `${this.uploadUrl}${url}`
+ }));
+ console.log(fileList)
+ this.fileList = fileList;
+ this.checkUrlList = urlArr;
+ this.checkUrlNameList = nameArr;
}
- let fileList = urlArr.map((url, i) => ({
- name: nameArr[i],
- url: `${this.uploadUrl}${url}`
- }));
- this.fileList = fileList;
- this.checkUrlList = urlArr;
- this.checkUrlNameList = nameArr;
} catch (error) {
console.error("处理合同照片时发生错误:", error);
}
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
index 668b429a..faa467ad 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
@@ -415,9 +415,9 @@
/** 重置按钮操作 */
resetQuery() {
this.queryParams.time = []
- this.queryParams.unitId = null
- this.queryParams.proId = null
this.resetForm('queryForm')
+ this.GetUnitData()
+ this.GetProData()
this.handleQuery()
},
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
index d4052392..aae30d96 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
@@ -614,6 +614,8 @@
resetQuery() {
this.queryParams.time = []
this.resetForm('queryForm')
+ this.GetUnitData()
+ this.GetProData()
this.handleQuery()
},
handleNotice() {
diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
index 92b8915d..547b7de1 100644
--- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
@@ -431,9 +431,9 @@
/** 重置按钮操作 */
resetQuery() {
this.queryParams.time = []
- this.queryParams.unitId = null
- this.queryParams.proId = null
this.resetForm('queryForm')
+ this.GetUnitData()
+ this.GetProData()
this.handleQuery()
},
diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue
index dfd1af0b..6ca054db 100644
--- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue
@@ -22,7 +22,7 @@
-
+
@@ -252,7 +252,7 @@
diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
index 2873702d..3178c2a8 100644
--- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
@@ -488,6 +488,8 @@ export default {
resetQuery() {
this.queryParams.time = []
this.resetForm('queryForm')
+ this.GetUnitData()
+ this.GetProData()
this.handleQuery()
},
handleNotice() {
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
index 4522cd20..c14464b7 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
@@ -682,7 +682,7 @@ export default {
}
const res = await submitRefuseBackApply(params)
if (res.code == 200) {
- this.$message({ type: 'success', message: '申请成功'})
+ this.$message({ type: 'success', message: res.msg})
setTimeout(() => {
this.$tab.closeOpenPage({ path: "/claimAndRefund/return/returnApply"});
}, 1000)
@@ -697,7 +697,7 @@ export default {
}
const res = await submitBackApplyApi(params)
if (res.code == 200) {
- this.$message({ type: 'success', message: '申请成功'})
+ this.$message({ type: 'success', message: res.msg})
setTimeout(() => {
this.$tab.closeOpenPage({ path: "/claimAndRefund/return/returnApply"});
}, 1000)
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue
index 8e7a2d42..5e3e6fc0 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue
@@ -671,7 +671,7 @@ export default {
}
const res = await submitRefuseBackApply(params)
if (res.code == 200) {
- this.$message({ type: 'success', message: '申请成功'})
+ this.$message({ type: 'success', message: res.msg})
setTimeout(() => {
this.$tab.closeOpenPage({ path: "/claimAndRefund/return/returnApplyByCq"});
}, 1000)
@@ -686,7 +686,7 @@ export default {
}
const res = await submitBackApplyApi(params)
if (res.code == 200) {
- this.$message({ type: 'success', message: '申请成功'})
+ this.$message({ type: 'success', message: res.msg})
setTimeout(() => {
this.$tab.closeOpenPage({ path: "/claimAndRefund/return/returnApplyByCq"});
}, 1000)
diff --git a/sgzb-ui/src/views/cost/csotSettlement/costExame.vue b/sgzb-ui/src/views/cost/csotSettlement/costExame.vue
index f6e5b620..54359634 100644
--- a/sgzb-ui/src/views/cost/csotSettlement/costExame.vue
+++ b/sgzb-ui/src/views/cost/csotSettlement/costExame.vue
@@ -122,7 +122,7 @@
diff --git a/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue b/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
index f990a69d..55718938 100644
--- a/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
+++ b/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
@@ -103,7 +103,7 @@
>
diff --git a/sgzb-ui/src/views/store/warehousing/putInStore.vue b/sgzb-ui/src/views/store/warehousing/putInStore.vue
index 7652e09d..283b1569 100644
--- a/sgzb-ui/src/views/store/warehousing/putInStore.vue
+++ b/sgzb-ui/src/views/store/warehousing/putInStore.vue
@@ -114,7 +114,7 @@
v-model="codeForm.remarks"
type="textarea"
placeholder="请输入备注"
- maxlength="200"
+ maxlength="100"
rows="3"
show-word-limit
style="width: 13vw;"
@@ -261,7 +261,7 @@
v-model="codeForm.remarks"
type="textarea"
placeholder="请输入备注"
- maxlength="200"
+ maxlength="100"
rows="4"
show-word-limit
style="width: 400px;"
diff --git a/sgzb-ui/src/views/stquery/leaseRecord.vue b/sgzb-ui/src/views/stquery/leaseRecord.vue
index a13a7b1f..968042dc 100644
--- a/sgzb-ui/src/views/stquery/leaseRecord.vue
+++ b/sgzb-ui/src/views/stquery/leaseRecord.vue
@@ -223,9 +223,8 @@ export default {
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
- this.queryParams.time = null;
- this.queryParams.unitId = null;
- this.queryParams.proId = null;
+ this.getUnitList();
+ this.getProList();
this.handleQuery();
},
diff --git a/sgzb-ui/src/views/system/user/index.vue b/sgzb-ui/src/views/system/user/index.vue
index 6bce28f9..896d2e87 100644
--- a/sgzb-ui/src/views/system/user/index.vue
+++ b/sgzb-ui/src/views/system/user/index.vue
@@ -466,7 +466,7 @@
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
- maxlength="200"
+ maxlength="100"
>