From 8fc5b9fac04792d2f284bb111bc26e26779ca70c Mon Sep 17 00:00:00 2001 From: xuyuanqing <392009588@qq.com> Date: Fri, 10 May 2024 09:05:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E5=86=9C-=E9=93=B6=E8=A1=8C=E8=BD=AC?= =?UTF-8?q?=E8=B4=A6=E7=94=B3=E8=AF=B7=E3=80=81=E5=A4=87=E4=BB=98=E9=87=91?= =?UTF-8?q?=E6=94=AF=E5=87=BA=E7=94=B3=E8=AF=B7=E6=B5=8B=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/sunVillage_info/PDF.png | Bin 0 -> 6234 bytes src/assets/images/sunVillage_info/PPT.png | Bin 0 -> 5094 bytes src/assets/images/sunVillage_info/RAR.png | Bin 0 -> 3833 bytes .../collectionAccount/collectionAdd.vue | 10 +- .../paymentApproval/approvalAdd.vue | 176 +- .../paymentApproval/approvalAdd11.vue | 1852 +++++++++-------- .../paymentApproval/approvalApproval11.vue | 2 +- .../paymentApproval/approvalDetail.vue | 120 +- .../paymentApproval/approvalDetail11.vue | 120 +- .../paymentApproval/approvalList.vue | 19 +- .../paymentApproval/approvalList11.vue | 18 +- .../paymentApproval/approvalModify.vue | 176 +- .../paymentApproval/approvalModify11.vue | 189 +- .../sunVillage_info/list_contract_detail.vue | 31 +- .../sunVillage_info/list_finance_detail.vue | 31 +- .../sunVillage_info/list_photo_detail.vue | 32 +- .../sunVillage_info/list_tourists_detail.vue | 32 +- .../list_tourists_registration.vue | 23 +- .../list_tourists_registration_add.vue | 63 +- .../collectionAccount/collectionAdd.vue | 9 +- .../paymentApproval/approvalAdd.vue | 166 +- .../paymentApproval/approvalAdd11.vue | 171 +- .../paymentApproval/approvalAdd2.vue | 79 + .../paymentApproval/approvalApproval.vue | 2 +- .../paymentApproval/approvalApproval11.vue | 2 +- .../paymentApproval/approvalDetail.vue | 368 +++- .../paymentApproval/approvalDetail11.vue | 120 +- .../paymentApproval/approvalList.vue | 20 +- .../paymentApproval/approvalList11.vue | 14 +- .../paymentApproval/approvalModify.vue | 818 +++++--- .../paymentApproval/approvalModify11.vue | 120 +- .../paymentApproval/approvalModify3.vue | 12 + .../paymentApproval/approvalProcess.vue | 8 +- .../paymentApproval/approvalProcess2.vue | 8 +- .../recordDetail/recordDetailList.vue | 9 +- src/views/yinnong/doneCompleted/completed.vue | 176 -- .../yinnong/doneCompleted/completedNew.vue | 8 +- src/views/yinnong/doneCompleted/done.vue | 170 -- src/views/yinnong/doneCompleted/doneNew.vue | 11 +- src/views/yinnongIndex.vue | 4 +- 40 files changed, 3481 insertions(+), 1708 deletions(-) create mode 100644 src/assets/images/sunVillage_info/PDF.png create mode 100644 src/assets/images/sunVillage_info/PPT.png create mode 100644 src/assets/images/sunVillage_info/RAR.png delete mode 100644 src/views/yinnong/doneCompleted/completed.vue delete mode 100644 src/views/yinnong/doneCompleted/done.vue diff --git a/src/assets/images/sunVillage_info/PDF.png b/src/assets/images/sunVillage_info/PDF.png new file mode 100644 index 0000000000000000000000000000000000000000..4c04d10c3685c0c5c0be96e564c1ef053cf974d2 GIT binary patch literal 6234 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 NYRcM56$;j&{{tBOloS8} literal 0 HcmV?d00001 diff --git a/src/assets/images/sunVillage_info/PPT.png b/src/assets/images/sunVillage_info/PPT.png new file mode 100644 index 0000000000000000000000000000000000000000..a80d0b67fb56e29fd1a853287c28b6094f693f71 GIT binary patch literal 5094 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 literal 0 HcmV?d00001 diff --git a/src/assets/images/sunVillage_info/RAR.png b/src/assets/images/sunVillage_info/RAR.png new file mode 100644 index 0000000000000000000000000000000000000000..925da976d1aacedfa2de4f5b8cbe2188a98526cd GIT binary patch literal 3833 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 literal 0 HcmV?d00001 diff --git a/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionAdd.vue b/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionAdd.vue index 52f4d120..558a4b73 100644 --- a/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionAdd.vue +++ b/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionAdd.vue @@ -181,16 +181,16 @@ }, changeInform(val){ - console.log(val) var that = this; var str = val; var numArr = str.match(/\d+/g) - var nameArr = str.match(/[\u4e00-\u9fa5]/g).join("") - console.log(numArr) - console.log(nameArr) + var nameArr = str.match(/[\u4e00-\u9fa5]/g); + if(nameArr != null){ + nameArr = nameArr.join("") + } if (numArr) { numArr.map(rr=>{ - if (rr.length>16) { + if (rr.length>=16) { const carId = isBankCard(rr); if (carId) { that.form.payee = nameArr; diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue index 1ae2e27c..c8254e42 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue @@ -328,11 +328,41 @@

上传附件（若申请单未变动可不必点击底部的修改按钮）

- + + + - + + + - + + +
@@ -680,6 +710,120 @@ }) }); }, + previewPreview(file, index, len) { + const baseImgUrl = this.$store.getters.baseRoutingUrl; + if (file.url) { + //已上传文件 + let fileName = file.file.name || file.url; + let subIndex = fileName.lastIndexOf("."); + let ext = fileName.substring(subIndex + 1, fileName.length); + let imgi = file.listIndex + //console.log(ext) + let allUrl = file.url; + if(ext !== 'jpg' && ext !== 'png' && ext !== 'gif' && ext !== 'svg' && ext !== 'ico' && ext !== 'bmp'){ + const link = document.createElement("a"); + link.style.display = "none"; + link.target = "_blank" + link.href = allUrl; + document.body.appendChild(link); + link.click(); + document.body.removeChild(link); + } + + } else { + //新上传文件 + let fileName = file.file.name; + // console.info(file.file.name) + let subIndex = fileName.lastIndexOf("."); + let ext = fileName.substring(subIndex + 1, fileName.length); + if(ext !== 'jpg' && ext !== 'png' && ext !== 'gif' && ext !== 'svg' && ext !== 'ico' && ext !== 'bmp'){ + let type = this.getfileType(ext); + // 将文件转换为base64编码 + this.fileToBase64(file.file, ext).then(res => { + this.downloadFile(res, fileName, ext, type); + }) + } + } + }, + downloadFile(base64, fileName, fileType, mimetype) { + const typeHeader = 'data:application/' + fileType + ';base64,'; + const blob = this.base64ToBlob(base64, mimetype); + this.downloadFileDownload(blob, fileName, fileType); + }, + fileToBase64(file,fileType){ + return new Promise((resolve,reject)=>{ + //创建一个新的FileReader 对象 + const reader = new FileReader(); + //读取file对象 + reader.readAsDataURL(file); + reader.onload=function () { + const base64String = reader.result.split(",")[1]; + resolve('data:application/' + fileType + ';base64,'+base64String); + } + reader.onerror=function () { + reject(new Error("Failed to load file") ) + } + }) + }, + base64ToBlob(base64, mime) { + //解码base64得到二进制字符串 + + let raw = window.atob(base64.substring(base64.indexOf(',') + 1)); + let rawLength = raw.length + //创建8位无符号整数值的类型化数组 + let uInt8Array = new Uint8Array(rawLength) + for (let i = 0; i < rawLength; ++i) { + uInt8Array[i] = raw.charCodeAt(i); + } + return new Blob([uInt8Array], {type: mime}) + }, + getfileType(type) { + switch (type) { + case 'txt': + return 'text/plain'; + case 'doc': + return 'application/msword'; + case 'docx': + return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'; + case 'xls': + return 'application/vnd.ms-excel'; + case 'xlsx': + return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; + case 'pdf': + return 'application/pdf'; + case 'pptx': + return 'application/vnd.openxmlformats-officedocument.presentationml.presentation'; + case 'png': + return 'image/png'; + case 'jpg': + return 'image/jpeg'; + case 'gif': + return 'image/gif'; + case 'svg': + return 'image/svg+xml'; + case 'ico': + return 'image/x-icon'; + case 'bmp': + return 'image/bmp,'; + } + }, + downloadFileDownload(blob, fileName, fileType) { + const downloadElement = document.createElement('a'); + let href = blob; + if (typeof blob === 'string') { + downloadElement.target = '_blank' + } else { + href = window.URL.createObjectURL(blob) + } + downloadElement.href = href; + downloadElement.download = fileName + '.' + fileType;//下载后文件名 + document.body.appendChild(downloadElement); + downloadElement.click(); + document.body.removeChild(downloadElement) + if (typeof blob !== 'string') { + window.URL.revokeObjectURL(href) + } + }, payeeDictLabel(datas, value) { var actions = []; Object.keys(datas).some((key) => { @@ -1187,6 +1331,20 @@ commonAttach(params1).then((r1) => { file.id=r1.id; file.fileUrl = r1.fileUrl; + let subIndex = r1.fileUrl.lastIndexOf("."); + let ext = r1.fileUrl.substring(subIndex + 1, r1.fileUrl.length); + let baseUrl = location.protocol + "//" + location.host + request.defaults.baseURL; + let fileData = {"url": baseUrl + r1.fileUrl, "file": new File([], "name", {}), "id": r1.id,"type":ext}; + if(obj === '1'){ + this.fileList1.splice(-1, 1); + this.fileList1.push(fileData); + }else if(obj === '2'){ + this.fileList2.splice(-1, 1); + this.fileList2.push(fileData); + }else{ + this.fileList3.splice(-1, 1); + this.fileList3.push(fileData); + } }) } }, @@ -1203,7 +1361,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= { @@ -1215,7 +1375,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= { @@ -1227,7 +1389,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/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd11.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd11.vue index df527990..35087748 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd11.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd11.vue @@ -1,18 +1,18 @@ diff --git a/src/views/sunVillage_info/list_tourists_registration.vue b/src/views/sunVillage_info/list_tourists_registration.vue index e19014e8..b412e1b3 100644 --- a/src/views/sunVillage_info/list_tourists_registration.vue +++ b/src/views/sunVillage_info/list_tourists_registration.vue @@ -29,8 +29,8 @@ 姓名 - - 张三 + + {{item.workerName}}
@@ -43,10 +43,10 @@ 出工事由 出工数 - - 2023-03-05 - 上班打卡 - 8 + + {{item.jobTime}} + {{item.workReason}} + {{item.workNum}}
@@ -77,6 +77,7 @@ fileList:[], listLength:'0', searchInput:'', + pageNum:0, queryParams:{ pageNum:1, pageSize:10, @@ -92,6 +93,7 @@ showBtn:true, yearMonth:[], yearList:[], + oddjobList:[], deptName:'', nowYear:new Date().getFullYear(), }; @@ -109,7 +111,14 @@ methods: { getList(){ var _this = this; - + let params = { + bookId:this.queryParams.bookId, + yearMonth:this.queryParams.yearMonth, + } + listOddjob(params).then(response => { + this.listLength = response.total; + this.oddjobList = response.rows; + }); }, tabClickMonth(month){ this.month = month ; diff --git a/src/views/sunVillage_info/list_tourists_registration_add.vue b/src/views/sunVillage_info/list_tourists_registration_add.vue index 0c0f4d36..75368e19 100644 --- a/src/views/sunVillage_info/list_tourists_registration_add.vue +++ b/src/views/sunVillage_info/list_tourists_registration_add.vue @@ -4,7 +4,7 @@ 零工登记
- +
@@ -16,7 +16,7 @@ clickable label="出工日期" placeholder="请选择" - v-model="value" + v-model="form.jobTime" @click="showBuildTime = true" input-align="right" right-icon="arrow-down" @@ -30,24 +30,25 @@ type="date" title="选择年月日" :min-date="minDate" - v-model="buildTime" + :max-date="maxDate" + :value="new Date" @confirm="onConfirmBuildTime" @cancel="showBuildTime = false" /> - - - - - - - + + + + + + +
- + 保存
@@ -55,15 +56,16 @@
diff --git a/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue b/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue index c8915e0a..27aeed02 100644 --- a/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue +++ b/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue @@ -180,12 +180,13 @@ var that = this; var str = val; var numArr = str.match(/\d+/g) - var nameArr = str.match(/[\u4e00-\u9fa5]/g).join("") - console.log(numArr) - console.log(nameArr) + var nameArr = str.match(/[\u4e00-\u9fa5]/g) + if(nameArr != null){ + nameArr = nameArr.join("") + } if (numArr) { numArr.map(rr=>{ - if (rr.length>16) { + if (rr.length>=16) { const carId = isBankCard(rr); if (carId) { that.form.payee = nameArr; diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue index a24ce9ac..0e8b1eb1 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue @@ -275,7 +275,7 @@
- +
上传附件（若申请单未变动可不必点击底部的修改按钮）

- + + + - + + + - + + +
@@ -538,6 +568,120 @@ let dd = new Date().getDate(); _this.nowDate = moment(new Date()).format("YYYY-MM-DD"); }, + previewPreview(file, index, len) { + const baseImgUrl = this.$store.getters.baseRoutingUrl; + if (file.url) { + //已上传文件 + let fileName = file.file.name || file.url; + let subIndex = fileName.lastIndexOf("."); + let ext = fileName.substring(subIndex + 1, fileName.length); + let imgi = file.listIndex + //console.log(ext) + let allUrl = file.url; + if(ext !== 'jpg' && ext !== 'png' && ext !== 'gif' && ext !== 'svg' && ext !== 'ico' && ext !== 'bmp'){ + const link = document.createElement("a"); + link.style.display = "none"; + link.target = "_blank" + link.href = allUrl; + document.body.appendChild(link); + link.click(); + document.body.removeChild(link); + } + + } else { + //新上传文件 + let fileName = file.file.name; + // console.info(file.file.name) + let subIndex = fileName.lastIndexOf("."); + let ext = fileName.substring(subIndex + 1, fileName.length); + if(ext !== 'jpg' && ext !== 'png' && ext !== 'gif' && ext !== 'svg' && ext !== 'ico' && ext !== 'bmp'){ + let type = this.getfileType(ext); + // 将文件转换为base64编码 + this.fileToBase64(file.file, ext).then(res => { + this.downloadFile(res, fileName, ext, type); + }) + } + } + }, + getfileType(type) { + switch (type) { + case 'txt': + return 'text/plain'; + case 'doc': + return 'application/msword'; + case 'docx': + return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'; + case 'xls': + return 'application/vnd.ms-excel'; + case 'xlsx': + return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; + case 'pdf': + return 'application/pdf'; + case 'pptx': + return 'application/vnd.openxmlformats-officedocument.presentationml.presentation'; + case 'png': + return 'image/png'; + case 'jpg': + return 'image/jpeg'; + case 'gif': + return 'image/gif'; + case 'svg': + return 'image/svg+xml'; + case 'ico': + return 'image/x-icon'; + case 'bmp': + return 'image/bmp,'; + } + }, + downloadFile(base64, fileName, fileType, mimetype) { + const typeHeader = 'data:application/' + fileType + ';base64,'; + const blob = this.base64ToBlob(base64, mimetype); + this.downloadFileDownload(blob, fileName, fileType); + }, + base64ToBlob(base64, mime) { + //解码base64得到二进制字符串 + + let raw = window.atob(base64.substring(base64.indexOf(',') + 1)); + let rawLength = raw.length + //创建8位无符号整数值的类型化数组 + let uInt8Array = new Uint8Array(rawLength) + for (let i = 0; i < rawLength; ++i) { + uInt8Array[i] = raw.charCodeAt(i); + } + return new Blob([uInt8Array], {type: mime}) + }, + downloadFileDownload(blob, fileName, fileType) { + const downloadElement = document.createElement('a'); + let href = blob; + if (typeof blob === 'string') { + downloadElement.target = '_blank' + } else { + href = window.URL.createObjectURL(blob) + } + downloadElement.href = href; + downloadElement.download = fileName + '.' + fileType;//下载后文件名 + document.body.appendChild(downloadElement); + downloadElement.click(); + document.body.removeChild(downloadElement) + if (typeof blob !== 'string') { + window.URL.revokeObjectURL(href) + } + }, + fileToBase64(file,fileType){ + return new Promise((resolve,reject)=>{ + //创建一个新的FileReader 对象 + const reader = new FileReader(); + //读取file对象 + reader.readAsDataURL(file); + reader.onload=function () { + const base64String = reader.result.split(",")[1]; + resolve('data:application/' + fileType + ';base64,'+base64String); + } + reader.onerror=function () { + reject(new Error("Failed to load file") ) + } + }) + }, initProjectInfo(){ let _this = this let queryParams={ @@ -1168,6 +1312,20 @@ commonAttach(params1).then((r1) => { file.id=r1.id; file.fileUrl = r1.fileUrl; + let subIndex = r1.fileUrl.lastIndexOf("."); + let ext = r1.fileUrl.substring(subIndex + 1, r1.fileUrl.length); + let baseUrl = location.protocol + "//" + location.host + request.defaults.baseURL; + let fileData = {"url": baseUrl + r1.fileUrl, "file": new File([], "name", {}), "id": r1.id,"type":ext}; + if(obj === '1'){ + this.fileList1.splice(-1, 1); + this.fileList1.push(fileData); + }else if(obj === '2'){ + this.fileList2.splice(-1, 1); + this.fileList2.push(fileData); + }else{ + this.fileList3.splice(-1, 1); + this.fileList3.push(fileData); + } }) } }, diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue index 88c65863..63ca13a3 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue @@ -232,11 +232,11 @@

上传附件

- + - + - +
@@ -445,6 +445,120 @@ } }); }, + previewPreview(file, index, len) { + const baseImgUrl = this.$store.getters.baseRoutingUrl; + if (file.url) { + //已上传文件 + let fileName = file.file.name || file.url; + let subIndex = fileName.lastIndexOf("."); + let ext = fileName.substring(subIndex + 1, fileName.length); + let imgi = file.listIndex + //console.log(ext) + let allUrl = file.url; + if(ext !== 'jpg' && ext !== 'png' && ext !== 'gif' && ext !== 'svg' && ext !== 'ico' && ext !== 'bmp'){ + const link = document.createElement("a"); + link.style.display = "none"; + link.target = "_blank" + link.href = allUrl; + document.body.appendChild(link); + link.click(); + document.body.removeChild(link); + } + + } else { + //新上传文件 + let fileName = file.file.name; + // console.info(file.file.name) + let subIndex = fileName.lastIndexOf("."); + let ext = fileName.substring(subIndex + 1, fileName.length); + if(ext !== 'jpg' && ext !== 'png' && ext !== 'gif' && ext !== 'svg' && ext !== 'ico' && ext !== 'bmp'){ + let type = this.getfileType(ext); + // 将文件转换为base64编码 + this.fileToBase64(file.file, ext).then(res => { + this.downloadFile(res, fileName, ext, type); + }) + } + } + }, + getfileType(type) { + switch (type) { + case 'txt': + return 'text/plain'; + case 'doc': + return 'application/msword'; + case 'docx': + return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'; + case 'xls': + return 'application/vnd.ms-excel'; + case 'xlsx': + return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; + case 'pdf': + return 'application/pdf'; + case 'pptx': + return 'application/vnd.openxmlformats-officedocument.presentationml.presentation'; + case 'png': + return 'image/png'; + case 'jpg': + return 'image/jpeg'; + case 'gif': + return 'image/gif'; + case 'svg': + return 'image/svg+xml'; + case 'ico': + return 'image/x-icon'; + case 'bmp': + return 'image/bmp,'; + } + }, + downloadFile(base64, fileName, fileType, mimetype) { + const typeHeader = 'data:application/' + fileType + ';base64,'; + const blob = this.base64ToBlob(base64, mimetype); + this.downloadFileDownload(blob, fileName, fileType); + }, + base64ToBlob(base64, mime) { + //解码base64得到二进制字符串 + + let raw = window.atob(base64.substring(base64.indexOf(',') + 1)); + let rawLength = raw.length + //创建8位无符号整数值的类型化数组 + let uInt8Array = new Uint8Array(rawLength) + for (let i = 0; i < rawLength; ++i) { + uInt8Array[i] = raw.charCodeAt(i); + } + return new Blob([uInt8Array], {type: mime}) + }, + downloadFileDownload(blob, fileName, fileType) { + const downloadElement = document.createElement('a'); + let href = blob; + if (typeof blob === 'string') { + downloadElement.target = '_blank' + } else { + href = window.URL.createObjectURL(blob) + } + downloadElement.href = href; + downloadElement.download = fileName + '.' + fileType;//下载后文件名 + document.body.appendChild(downloadElement); + downloadElement.click(); + document.body.removeChild(downloadElement) + if (typeof blob !== 'string') { + window.URL.revokeObjectURL(href) + } + }, + fileToBase64(file,fileType){ + return new Promise((resolve,reject)=>{ + //创建一个新的FileReader 对象 + const reader = new FileReader(); + //读取file对象 + reader.readAsDataURL(file); + reader.onload=function () { + const base64String = reader.result.split(",")[1]; + resolve('data:application/' + fileType + ';base64,'+base64String); + } + reader.onerror=function () { + reject(new Error("Failed to load file") ) + } + }) + }, // 表单重置 reset() { this.form = { @@ -700,6 +814,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }) @@ -710,6 +825,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }) @@ -718,6 +834,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -776,6 +893,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -792,6 +910,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -807,6 +926,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -828,6 +948,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -844,6 +965,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -859,6 +981,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -889,6 +1012,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -905,6 +1029,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -920,6 +1045,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -940,6 +1066,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -956,6 +1083,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -971,6 +1099,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1011,6 +1140,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1027,6 +1157,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1043,6 +1174,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1063,6 +1195,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1079,6 +1212,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1094,6 +1228,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1124,6 +1259,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1140,6 +1276,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1155,6 +1292,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1175,6 +1313,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1191,6 +1330,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1206,6 +1346,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1308,6 +1449,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1322,6 +1464,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1335,6 +1478,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1353,6 +1497,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1367,6 +1512,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1380,6 +1526,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1408,6 +1555,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1422,6 +1570,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1435,6 +1584,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1453,6 +1603,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1467,6 +1618,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1480,6 +1632,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1518,6 +1671,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1532,6 +1686,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1545,6 +1700,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1563,6 +1719,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1577,6 +1734,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1590,6 +1748,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1618,6 +1777,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1632,6 +1792,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1645,6 +1806,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1663,6 +1825,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1677,6 +1840,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) @@ -1690,6 +1854,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } }) diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue index a91de357..b294a63c 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue @@ -782,6 +782,8 @@ this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); + },2000) }) }else{ @@ -789,6 +791,7 @@ this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -801,6 +804,7 @@ this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -808,6 +812,7 @@ this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -818,6 +823,7 @@ this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -825,6 +831,7 @@ this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -880,6 +887,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -887,6 +895,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -898,6 +907,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -905,6 +915,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -915,6 +926,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -922,6 +934,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -937,6 +950,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -944,6 +958,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -955,6 +970,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -962,6 +978,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -972,6 +989,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -979,6 +997,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -1004,6 +1023,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -1011,6 +1031,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -1022,6 +1043,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -1029,6 +1051,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -1039,6 +1062,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -1046,6 +1070,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -1061,6 +1086,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -1068,6 +1094,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -1079,6 +1106,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -1086,6 +1114,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -1096,6 +1125,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -1103,6 +1133,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -1138,6 +1169,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -1145,6 +1177,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -1156,6 +1189,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -1163,6 +1197,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -1173,6 +1208,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -1180,6 +1216,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -1195,6 +1232,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -1202,6 +1240,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -1213,6 +1252,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -1220,6 +1260,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -1230,6 +1271,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -1237,6 +1279,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -1262,6 +1305,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -1269,6 +1313,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -1280,6 +1325,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -1287,6 +1333,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -1297,6 +1344,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -1304,6 +1352,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -1319,6 +1368,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -1326,6 +1376,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -1337,6 +1388,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -1344,6 +1396,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -1354,6 +1407,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ @@ -1361,6 +1415,7 @@ _this.$toast.success('提交成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } @@ -1446,6 +1501,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } else if(_this.form.capitalExpenditureType==4){ @@ -1453,12 +1509,14 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } } @@ -1470,6 +1528,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } else if(_this.form.capitalExpenditureType==4){ @@ -1477,12 +1536,14 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } } @@ -1504,6 +1565,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } else if(_this.form.capitalExpenditureType==4){ @@ -1511,12 +1573,14 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } } @@ -1528,6 +1592,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } else if(_this.form.capitalExpenditureType==4){ @@ -1535,12 +1600,14 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } } @@ -1572,6 +1639,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } else if(_this.form.capitalExpenditureType==4){ @@ -1579,12 +1647,14 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } } @@ -1596,6 +1666,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } else if(_this.form.capitalExpenditureType==4){ @@ -1603,12 +1674,14 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } } @@ -1630,6 +1703,7 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } else if(_this.form.capitalExpenditureType==4){ @@ -1637,12 +1711,14 @@ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ _this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } } @@ -1654,6 +1730,7 @@ this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) } else if(this.form.capitalExpenditureType==4){ @@ -1661,12 +1738,14 @@ this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) }) }else{ this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) + window.location.reload(); },2000) } } diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue index 9f859446..1cebe8a8 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue @@ -366,7 +366,7 @@ const data = { taskId: this.$route.query.taskId, auditbatchNo: this.$route.query.auditbatchNo, - comment: this.comment, + remark: this.comment, pass: this.pass, }; approval(data).then((response) => { diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval11.vue index 08e9061b..9b85da08 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval11.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval11.vue @@ -355,7 +355,7 @@ const data = { taskId: this.$route.query.taskId, auditbatchNo: this.$route.query.auditbatchNo, - comment: this.comment, + remark: this.comment, pass: this.pass, }; console.log(data); diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue index 30254e95..eb63153d 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue @@ -15,8 +15,8 @@

基础信息

- - + + - +
- +
- +

付款方信息

@@ -44,14 +47,14 @@
- + - +
- +
@@ -59,116 +62,140 @@

收款方信息

- - + +
-
-
- +
+
+ - - - + + +
-

查看更多

+

+ 查看更多

收起列表

上传附件

- - - - - - - - - + + + + + + + + +
- - diff --git a/src/views/yinnong/doneCompleted/completedNew.vue b/src/views/yinnong/doneCompleted/completedNew.vue index 45dad854..779646e6 100644 --- a/src/views/yinnong/doneCompleted/completedNew.vue +++ b/src/views/yinnong/doneCompleted/completedNew.vue @@ -14,8 +14,8 @@ finished-text="没有更多了" @load="getList" > - - + + @@ -34,7 +34,7 @@