diff --git a/src/assets/images/sunVillage_info/RAR.png b/src/assets/images/sunVillage_info/RAR.png index 925da976..97425b8d 100644 Binary files a/src/assets/images/sunVillage_info/RAR.png and b/src/assets/images/sunVillage_info/RAR.png differ diff --git a/src/router/index.js b/src/router/index.js index 3ca9d5f5..be091e2c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2005,15 +2005,6 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/yinnong/personalPicture'], resolve) }, - { - path: '/yinnong/done', - name: 'yinnongDone', - meta: { - title: '我的已办', - hidden: true, - }, - component: (resolve) => require(['@/views/yinnong/done'], resolve) - }, { path: '/yinnong/doneCompleted/doneNew', name: 'yinnongDoneCompletedDoneNew', @@ -2023,15 +2014,6 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/yinnong/doneCompleted/doneNew'], resolve) }, - { - path: '/yinnong/doneCompleted/completed', - name: 'yinnongDoneCompletedCompleted', - meta: { - title: '我的待办', - hidden: true, - }, - component: (resolve) => require(['@/views/yinnong/doneCompleted/completed'], resolve) - }, { path: '/yinnong/doneCompleted/completedNew', name: 'yinnongDoneCompletedCompletedNew', diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue index 880c5b40..6402979b 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue @@ -82,13 +82,43 @@
- + + + - + + + - + + +
@@ -388,7 +418,9 @@ 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}) + let subIndex = r.fileName.lastIndexOf("."); + let ext = r.fileName.substring(subIndex + 1, r.fileName.length); + this.fileList1.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext}) }) }) let oData2= { @@ -400,7 +432,9 @@ 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}) + let subIndex = r.fileName.lastIndexOf("."); + let ext = r.fileName.substring(subIndex + 1, r.fileName.length); + this.fileList2.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext}) }) }) let oData3= { @@ -412,7 +446,9 @@ attachmentList(oData3).then(res => { res.rows.map(r => { let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL - this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id}) + let subIndex = r.fileName.lastIndexOf("."); + let ext = r.fileName.substring(subIndex + 1, r.fileName.length); + this.fileList3.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext}) }) }) }, diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail11.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail11.vue index 1fec4c19..ba5badf5 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail11.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail11.vue @@ -72,13 +72,43 @@
- + + + - + + + - + + +
@@ -377,7 +407,9 @@ 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}) + let subIndex = r.fileName.lastIndexOf("."); + let ext = r.fileName.substring(subIndex + 1, r.fileName.length); + this.fileList1.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext}) }) }) let oData2= { @@ -389,7 +421,9 @@ 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}) + let subIndex = r.fileName.lastIndexOf("."); + let ext = r.fileName.substring(subIndex + 1, r.fileName.length); + this.fileList2.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext}) }) }) let oData3= { @@ -401,7 +435,9 @@ attachmentList(oData3).then(res => { res.rows.map(r => { let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL - this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id}) + let subIndex = r.fileName.lastIndexOf("."); + let ext = r.fileName.substring(subIndex + 1, r.fileName.length); + this.fileList3.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext}) }) }) }, diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue index 0e8b1eb1..2fb1a7d3 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue @@ -1342,7 +1342,9 @@ 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,{})}) + let subIndex = r.fileName.lastIndexOf("."); + let ext = r.fileName.substring(subIndex + 1, r.fileName.length); + this.fileList1.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext}) }) }) let oData2= { @@ -1354,7 +1356,9 @@ 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,{})}) + let subIndex = r.fileName.lastIndexOf("."); + let ext = r.fileName.substring(subIndex + 1, r.fileName.length); + this.fileList2.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext}) }) }) let oData3= { @@ -1366,7 +1370,9 @@ attachmentList(oData3).then(res => { res.rows.map(r => { let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL - this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})}) + let subIndex = r.fileName.lastIndexOf("."); + let ext = r.fileName.substring(subIndex + 1, r.fileName.length); + this.fileList3.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext}) }) }) }, diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue index 63ca13a3..994183aa 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue @@ -2022,7 +2022,9 @@ 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,{})}) + let subIndex = r.fileName.lastIndexOf("."); + let ext = r.fileName.substring(subIndex + 1, r.fileName.length); + this.fileList1.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext}) }) }) let oData2= { @@ -2034,7 +2036,9 @@ 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,{})}) + let subIndex = r.fileName.lastIndexOf("."); + let ext = r.fileName.substring(subIndex + 1, r.fileName.length); + this.fileList2.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext}) }) }) let oData3= { @@ -2046,7 +2050,9 @@ attachmentList(oData3).then(res => { res.rows.map(r => { let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL - this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})}) + let subIndex = r.fileName.lastIndexOf("."); + let ext = r.fileName.substring(subIndex + 1, r.fileName.length); + this.fileList3.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext}) }) }) }, diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue index eb63153d..a64781fd 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue @@ -93,17 +93,47 @@ + :deletable="false" :max-count="fileList1.length" style="margin-left:8px;"> + + + :deletable="false" :max-count="fileList2.length" style="margin-left:8px;"> + + + :deletable="false" :max-count="fileList3.length" style="margin-left:8px;"> + + @@ -413,7 +443,9 @@ 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}) + let subIndex = r.fileName.lastIndexOf("."); + let ext = r.fileName.substring(subIndex + 1, r.fileName.length); + this.fileList1.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext}) }) }) let oData2 = { @@ -425,7 +457,9 @@ 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}) + let subIndex = r.fileName.lastIndexOf("."); + let ext = r.fileName.substring(subIndex + 1, r.fileName.length); + this.fileList2.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext}) }) }) let oData3 = { @@ -437,7 +471,9 @@ attachmentList(oData3).then(res => { res.rows.map(r => { let baseUrl = location.protocol + "//" + location.host + request.defaults.baseURL - this.fileList3.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id}) + let subIndex = r.fileName.lastIndexOf("."); + let ext = r.fileName.substring(subIndex + 1, r.fileName.length); + this.fileList3.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext}) }) }) }, diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue index 7b0e51ba..c933974a 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue @@ -72,13 +72,43 @@
- + + + - + + + - + + +
@@ -377,7 +407,9 @@ 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}) + let subIndex = r.fileName.lastIndexOf("."); + let ext = r.fileName.substring(subIndex + 1, r.fileName.length); + this.fileList1.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext}) }) }) let oData2= { @@ -389,7 +421,9 @@ 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}) + let subIndex = r.fileName.lastIndexOf("."); + let ext = r.fileName.substring(subIndex + 1, r.fileName.length); + this.fileList2.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext}) }) }) let oData3= { @@ -401,7 +435,9 @@ attachmentList(oData3).then(res => { res.rows.map(r => { let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL - this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id}) + let subIndex = r.fileName.lastIndexOf("."); + let ext = r.fileName.substring(subIndex + 1, r.fileName.length); + this.fileList3.push({"url": baseUrl + r.fileUrl, "file": new File([], r.fileName, {}), "id": r.id,"type":ext}) }) }) }, diff --git a/src/views/yinnong/doneCompleted/completedNew.vue b/src/views/yinnong/doneCompleted/completedNew.vue index 779646e6..dda2fa97 100644 --- a/src/views/yinnong/doneCompleted/completedNew.vue +++ b/src/views/yinnong/doneCompleted/completedNew.vue @@ -20,12 +20,12 @@ -

+

{{item.auditName}}

+ src="../../../../static/images/onlineHome/done.png">{{item.auditName}}