diff --git a/src/assets/images/sunVillage_info/PDF.png b/src/assets/images/sunVillage_info/PDF.png new file mode 100644 index 00000000..4c04d10c Binary files /dev/null and b/src/assets/images/sunVillage_info/PDF.png differ diff --git a/src/assets/images/sunVillage_info/PPT.png b/src/assets/images/sunVillage_info/PPT.png new file mode 100644 index 00000000..a80d0b67 Binary files /dev/null and b/src/assets/images/sunVillage_info/PPT.png differ diff --git a/src/assets/images/sunVillage_info/RAR.png b/src/assets/images/sunVillage_info/RAR.png new file mode 100644 index 00000000..925da976 Binary files /dev/null and b/src/assets/images/sunVillage_info/RAR.png differ 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 @@