From b9029de355f3bc74dbfd040c5703f8be1b09e374 Mon Sep 17 00:00:00 2001 From: nsgkyjk <759200926@qq.com> Date: Mon, 9 May 2022 18:49:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/homesteadSurvey/add.vue | 1 + static/dictyType.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue index 3557f2ca..7a3923ad 100644 --- a/src/views/homesteadSurvey/add.vue +++ b/src/views/homesteadSurvey/add.vue @@ -4596,6 +4596,7 @@ export default { this.form.qlsdfs = "1" this.form.qlsdfsName = "地上" } + console.log(this.form.sjly) if(this.form.sjly==null||this.form.sjly==""){ this.form.sjly = "04" this.form.sjlyName = "农村宅基地使用权确权登记发证" diff --git a/static/dictyType.json b/static/dictyType.json index bc3744f4..cd636ed3 100644 --- a/static/dictyType.json +++ b/static/dictyType.json @@ -101,7 +101,7 @@ "dict_code":1238, "dict_sort":11, "dictLabel":"自住", - "dictValue":"22", + "dictValue":"11", "dict_type":"nmfwlyzk", "css_class":null, "list_class":"default", From c39ec3e703726e08fad72dc6e5afa76c794ee037 Mon Sep 17 00:00:00 2001 From: yujk <990961482@qq.com> Date: Mon, 9 May 2022 18:50:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=93=B6=E5=86=9Capp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/yinnong/workbench.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/yinnong/workbench.vue b/src/views/yinnong/workbench.vue index 2d86d7a2..76d825fe 100644 --- a/src/views/yinnong/workbench.vue +++ b/src/views/yinnong/workbench.vue @@ -179,7 +179,7 @@ if (response.code === 200) { this.$store.dispatch("GetInfo").then(() => { // this.$router.go(0); - window.location.href = "/onlineHome/workbench"; + window.location.href = "/yinnong/workbench"; }); } }); @@ -212,7 +212,7 @@ if (response.code === 200) { this.$store.dispatch("GetInfo").then(() => { // this.$router.go(0); - window.location.href = "/onlineHome/workbench"; + window.location.href = "/yinnong/workbench"; }); } }); From bfa975631bb4549a4afbeb481f3322839f9b80ba Mon Sep 17 00:00:00 2001 From: nsgkyjk <759200926@qq.com> Date: Mon, 9 May 2022 19:53:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=93=B6=E5=86=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../paymentApproval/approvalAdd.vue | 19 +++--- .../paymentApproval/approvalAdd10.vue | 19 +++--- .../paymentApproval/approvalAdd11.vue | 19 +++--- .../paymentApproval/approvalAdd12.vue | 19 +++--- .../paymentApproval/approvalAdd2.vue | 19 +++--- .../paymentApproval/approvalAdd4.vue | 19 +++--- .../paymentApproval/approvalApproval10.vue | 67 +++++++++++++++---- .../paymentApproval/approvalApproval12.vue | 67 +++++++++++++++---- .../paymentApproval/approvalDetail.vue | 21 +++--- .../paymentApproval/approvalDetail10.vue | 25 +++---- .../paymentApproval/approvalDetail11.vue | 25 +++---- .../paymentApproval/approvalDetail12.vue | 25 +++---- .../paymentApproval/approvalDetail2.vue | 25 +++---- .../paymentApproval/approvalDetail4.vue | 25 +++---- .../paymentApproval/approvalModify.vue | 19 +++--- .../paymentApproval/approvalModify10.vue | 19 +++--- .../paymentApproval/approvalModify11.vue | 19 +++--- .../paymentApproval/approvalModify12.vue | 19 +++--- .../paymentApproval/approvalModify2.vue | 19 +++--- .../paymentApproval/approvalModify4.vue | 19 +++--- 20 files changed, 272 insertions(+), 236 deletions(-) diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue index d19f1f0f..f7db93ee 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue @@ -259,17 +259,14 @@ --> -

上传附件(收据)

-
- -
-

上传附件(发票)

-
- -
-

上传附件(其他)

-
- +

上传附件

+
+ + + + + +
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd10.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd10.vue index a139e0a3..692c47da 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd10.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd10.vue @@ -203,17 +203,14 @@
-

上传附件(收据)

-
- -
-

上传附件(发票)

-
- -
-

上传附件(其他)

-
- +

上传附件

+
+ + + + + +
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue index 4a39085f..b1a1d996 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue @@ -204,17 +204,14 @@
-

上传附件(收据)

-
- -
-

上传附件(发票)

-
- -
-

上传附件(其他)

-
- +

上传附件

+
+ + + + + +
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd12.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd12.vue index 166bc4c4..a2be4a10 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd12.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd12.vue @@ -248,17 +248,14 @@
-

上传附件(收据)

-
- -
-

上传附件(发票)

-
- -
-

上传附件(其他)

-
- +

上传附件

+
+ + + + + +
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue index 4745955c..f67f3261 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue @@ -251,17 +251,14 @@ />
-

上传附件(收据)

-
- -
-

上传附件(发票)

-
- -
-

上传附件(其他)

-
- +

上传附件

+
+ + + + + +
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd4.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd4.vue index f9327ba2..384e4f04 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd4.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd4.vue @@ -251,17 +251,14 @@ />
-

上传附件(收据)

-
- -
-

上传附件(发票)

-
- -
-

上传附件(其他)

-
- +

上传附件

+
+ + + + + +
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval10.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval10.vue index 084f9a60..f754aecf 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval10.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval10.vue @@ -59,13 +59,31 @@
-

上传附件

+

上传附件(收据)

- - + +
-

附件下载{{fileList&&fileList.length==0?':暂无可下载文件':''}}

- +

附件下载(收据){{fileList1&&fileList1.length==0?':暂无可下载文件':''}}

+ + {{index+1}}.{{item.fileName}} + +

上传附件(发票)

+
+ + +
+

附件下载(发票){{fileList2&&fileList2.length==0?':暂无可下载文件':''}}

+ + {{index+1}}.{{item.fileName}} + +

上传附件(其他)

+
+ + +
+

附件下载(其他){{fileList3&&fileList3.length==0?':暂无可下载文件':''}}

+ {{index+1}}.{{item.fileName}}
@@ -111,7 +129,9 @@ maxDate: new Date(2050, 10, 1), currentDate: new Date(), form:{}, - fileList:[], + fileList1:[], + fileList2:[], + fileList3:[], capitalExpenditureType:'', payee:'', bankType:'', @@ -392,19 +412,40 @@ }) }, getFileList(){ - let oData= { + let oData1= { tableId: this.$route.query.id, tableName: "t_yinnong_cash", bizPath: "yinnong", - fileType: "", + fileType: "1", } - attachmentList(oData).then(res => { - console.log(res) - console.log(location.protocol+"//"+location.host+request.defaults.baseURL) + attachmentList(oData1).then(res => { + res.rows.map(r => { + let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL + this.fileList1.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName}) + }) + }) + let oData2= { + tableId: this.$route.query.id, + tableName: "t_yinnong_cash", + bizPath: "yinnong", + fileType: "2", + } + attachmentList(oData2).then(res => { + res.rows.map(r => { + let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL + this.fileList2.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName}) + }) + }) + let oData3= { + tableId: this.$route.query.id, + tableName: "t_yinnong_cash", + bizPath: "yinnong", + fileType: "3", + } + attachmentList(oData1).then(res => { res.rows.map(r => { let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL - this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName}) - console.log(r) + this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName}) }) }) }, diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval12.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval12.vue index d518f437..be330874 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval12.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval12.vue @@ -111,13 +111,31 @@
-

上传附件

+

上传附件(收据)

- - + +
-

附件下载{{fileList&&fileList.length==0?':暂无可下载文件':''}}

- +

附件下载(收据){{fileList1&&fileList1.length==0?':暂无可下载文件':''}}

+ + {{index+1}}.{{item.fileName}} + +

上传附件(发票)

+
+ + +
+

附件下载(发票){{fileList2&&fileList2.length==0?':暂无可下载文件':''}}

+ + {{index+1}}.{{item.fileName}} + +

上传附件(其他)

+
+ + +
+

附件下载(其他){{fileList3&&fileList3.length==0?':暂无可下载文件':''}}

+ {{index+1}}.{{item.fileName}}
@@ -169,7 +187,9 @@ maxDate: new Date(2025, 10, 1), currentDate: new Date(), form:{}, - fileList:[], + fileList1:[], + fileList2:[], + fileList3:[], capitalExpenditureType:'', payee:'', bankType:'', @@ -460,19 +480,40 @@ }) }, getFileList(){ - let oData= { + let oData1= { tableId: this.$route.query.id, tableName: "t_yinnong_cash", bizPath: "yinnong", - fileType: "", + fileType: "1", } - attachmentList(oData).then(res => { - console.log(res) - console.log(location.protocol+"//"+location.host+request.defaults.baseURL) + attachmentList(oData1).then(res => { + res.rows.map(r => { + let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL + this.fileList1.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName}) + }) + }) + let oData2= { + tableId: this.$route.query.id, + tableName: "t_yinnong_cash", + bizPath: "yinnong", + fileType: "2", + } + attachmentList(oData2).then(res => { + res.rows.map(r => { + let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL + this.fileList2.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName}) + }) + }) + let oData3= { + tableId: this.$route.query.id, + tableName: "t_yinnong_cash", + bizPath: "yinnong", + fileType: "3", + } + attachmentList(oData1).then(res => { res.rows.map(r => { let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL - this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName}) - console.log(r) + this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName}) }) }) }, diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue index 22deb782..37a8cfa3 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue @@ -72,20 +72,25 @@
-

上传附件(收据)

-
- - +

上传附件

+
+ + + + + + + + +

上传附件(发票)

- - +

上传附件(其他)

- - +
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail10.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail10.vue index d883c925..bc3e6a39 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail10.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail10.vue @@ -63,20 +63,17 @@ -

上传附件(收据)

-
- - -
-

上传附件(发票)

-
- - -
-

上传附件(其他)

-
- - +

上传附件

+
+ + + + + + + + +
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue index d1be5a46..b9403be6 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue @@ -64,20 +64,17 @@ -

上传附件(收据)

-
- - -
-

上传附件(发票)

-
- - -
-

上传附件(其他)

-
- - +

上传附件

+
+ + + + + + + + +
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue index 4b1c5617..3cb5bf3e 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue @@ -116,20 +116,17 @@ -

上传附件(收据)

-
- - -
-

上传附件(发票)

-
- - -
-

上传附件(其他)

-
- - +

上传附件

+
+ + + + + + + + +
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2.vue index 5dd5b41c..226e639c 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2.vue @@ -69,20 +69,17 @@ -

上传附件(收据)

-
- - -
-

上传附件(发票)

-
- - -
-

上传附件(其他)

-
- - +

上传附件

+
+ + + + + + + + +
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail4.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail4.vue index 5c665cdd..f9a5e53c 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail4.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail4.vue @@ -71,20 +71,17 @@ -

上传附件(收据)

-
- - -
-

上传附件(发票)

-
- - -
-

上传附件(其他)

-
- - +

上传附件

+
+ + + + + + + + +
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue index fdccd1cd..24d015f3 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue @@ -259,17 +259,14 @@ -

上传附件(收据)

-
- -
-

上传附件(发票)

-
- -
-

上传附件(其他)

-
- +

上传附件

+
+ + + + + +
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify10.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify10.vue index 7c01e627..515e1313 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify10.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify10.vue @@ -204,17 +204,14 @@
-

上传附件(收据)

-
- -
-

上传附件(发票)

-
- -
-

上传附件(其他)

-
- +

上传附件

+
+ + + + + +
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue index 8fecdeec..f7e5a1e6 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue @@ -206,17 +206,14 @@
-

上传附件(收据)

-
- -
-

上传附件(发票)

-
- -
-

上传附件(其他)

-
- +

上传附件

+
+ + + + + +
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify12.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify12.vue index fea029ca..daca3a8a 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify12.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify12.vue @@ -256,17 +256,14 @@
-

上传附件(收据)

-
- -
-

上传附件(发票)

-
- -
-

上传附件(其他)

-
- +

上传附件

+
+ + + + + +
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify2.vue index be982183..967b1bbc 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify2.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify2.vue @@ -261,17 +261,14 @@
-

上传附件(收据)

-
- -
-

上传附件(发票)

-
- -
-

上传附件(其他)

-
- +

上传附件

+
+ + + + + +
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify4.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify4.vue index 4b525e87..dd371f72 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify4.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify4.vue @@ -259,17 +259,14 @@
-

上传附件(收据)

-
- -
-

上传附件(发票)

-
- -
-

上传附件(其他)

-
- +

上传附件

+
+ + + + + +