diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 9a65c8d99..b58c86f1c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -592,7 +592,23 @@ }, handleSubmit() { if (this.data.length < 1) { - this.$message.warning('请输入征求意见') + this.isSubmit = true + var json = this.json + json.commentText = this.commentText + json.info = [] + json.form = this.form + json.department = this.$store.getters.userInfo.orgName + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: this.taskIds, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success('提交成功') + this.$router.push('/processCenter') + } + this.isSubmit = false + }) } else { var a = 0 var b = 0 diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 27a131e44..54daa4d59 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -537,9 +537,6 @@ }); }, handleSubmit() { - if (this.data.length < 1) { - this.$message.warning("请输入征求意见搞"); - } else { this.isSubmit = true; var json = this.json; json.oldinfo = this.oldData; @@ -556,7 +553,6 @@ } this.isSubmit = false; }); - } }, getData() { return new Promise((resolve, reject) => { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index 62758aff5..15563e9e9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -408,34 +408,38 @@ export default { } }, upload(row, title) { - var params = { - columnName: { - chapterNumber: "章条编号", - chapterName: "章节名称", - commentText: "修改意见内容(包括理由或依据)", - oldText: "修改前", - newText: "修改后", - reason: "修改理由", - department: "提出部门", - responUserName: "提出人", - }, - dataList: [] - }; - if (title === '上报意见.xls') { - params.columnName.stateText = "处理意见" - } - params.dataList = JSON.parse(JSON.stringify(row)); - params.dataList.forEach(item => { - if (item.state === "1") { - item.stateText = "上报"; - } else if (item.state === "2") { - item.stateText = "处理后上报"; - } else { - item.stateText = "不上报"; + if (row.length > 0) { + var params = { + columnName: { + chapterNumber: "章条编号", + chapterName: "章节名称", + commentText: "修改意见内容(包括理由或依据)", + oldText: "修改前", + newText: "修改后", + reason: "修改理由", + department: "提出部门", + responUserName: "提出人", + }, + dataList: [] + }; + if (title === '上报意见.xls') { + params.columnName.stateText = "处理意见" } - }); - this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => { - }); + params.dataList = JSON.parse(JSON.stringify(row)); + params.dataList.forEach(item => { + if (item.state === "1") { + item.stateText = "上报"; + } else if (item.state === "2") { + item.stateText = "处理后上报"; + } else { + item.stateText = "不上报"; + } + }); + this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => { + }); + } else { + this.$message.warning('无上报数据') + } }, handleTabs(name) { this.active = name; @@ -443,9 +447,6 @@ export default { handleSave() { }, handleSubmit() { - if (this.data.length < 1) { - this.$message.warning("请输入征求意见搞"); - } else { this.isSubmit = true; var json = this.json; json.hqFlag = '0'; @@ -461,7 +462,6 @@ export default { } this.isSubmit = false; }); - } }, handleSubmitNo() { if (this.commentText) { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 61c6afdde..125af3db2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -398,34 +398,38 @@ export default { }) }, upload(row, title) { - var params = { - columnName: { - chapterNumber: "章条编号", - chapterName: "章节名称", - commentText: "修改意见内容(包括理由或依据)", - oldText: "修改前", - newText: "修改后", - reason: "修改理由", - department: "提出部门", - responUserName: "提出人", - }, - dataList: [] - } - if (title === '上报意见.xls') { - params.columnName.stateText = "处理意见" - } - params.dataList = JSON.parse(JSON.stringify(row)) - params.dataList.forEach(item => { - if (item.state === '1') { - item.stateText = '上报' - } else if (item.state === '2') { - item.stateText = '处理后上报' - } else { - item.stateText = '不上报' + if (row.length > 0) { + var params = { + columnName: { + chapterNumber: "章条编号", + chapterName: "章节名称", + commentText: "修改意见内容(包括理由或依据)", + oldText: "修改前", + newText: "修改后", + reason: "修改理由", + department: "提出部门", + responUserName: "提出人", + }, + dataList: [] + }; + if (title === '上报意见.xls') { + params.columnName.stateText = "处理意见" } - }) - this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => { - }) + params.dataList = JSON.parse(JSON.stringify(row)); + params.dataList.forEach(item => { + if (item.state === "1") { + item.stateText = "上报"; + } else if (item.state === "2") { + item.stateText = "处理后上报"; + } else { + item.stateText = "不上报"; + } + }); + this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => { + }); + } else { + this.$message.warning('无上报数据') + } }, stateText(row) { if (row === '1') { @@ -440,9 +444,6 @@ export default { handleSave() { }, handleSubmit() { - if (this.data.length < 1) { - this.$message.warning('请输入征求意见搞') - } else { this.isSubmit = true var json = this.json json.bdFlag = '0' @@ -458,7 +459,6 @@ export default { } this.isSubmit = false }) - } }, handleSubmitNo() { if (this.commentText) { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 8c558717a..90b9e7da4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -398,34 +398,38 @@ export default { }) }, upload(row, title) { - var params = { - columnName: { - chapterNumber: "章条编号", - chapterName: "章节名称", - commentText: "修改意见内容(包括理由或依据)", - oldText: "修改前", - newText: "修改后", - reason: "修改理由", - department: "提出部门", - responUserName: "提出人", - }, - dataList: [] - } - if (title === '上报意见.xls') { - params.columnName.stateText = "处理意见" - } - params.dataList = JSON.parse(JSON.stringify(row)) - params.dataList.forEach(item => { - if (item.state === '1') { - item.stateText = '上报' - } else if (item.state === '2') { - item.stateText = '处理后上报' - } else { - item.stateText = '不上报' + if (row.length > 0) { + var params = { + columnName: { + chapterNumber: "章条编号", + chapterName: "章节名称", + commentText: "修改意见内容(包括理由或依据)", + oldText: "修改前", + newText: "修改后", + reason: "修改理由", + department: "提出部门", + responUserName: "提出人", + }, + dataList: [] + }; + if (title === '上报意见.xls') { + params.columnName.stateText = "处理意见" } - }) - this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => { - }) + params.dataList = JSON.parse(JSON.stringify(row)); + params.dataList.forEach(item => { + if (item.state === "1") { + item.stateText = "上报"; + } else if (item.state === "2") { + item.stateText = "处理后上报"; + } else { + item.stateText = "不上报"; + } + }); + this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => { + }); + } else { + this.$message.warning('无上报数据') + } }, stateText(row) { if (row === '1') { @@ -440,9 +444,6 @@ export default { handleSave() { }, handleSubmit() { - if (this.data.length < 1) { - this.$message.warning('请输入征求意见搞') - } else { this.isSubmit = true var json = this.json json.directorFlag = '0' @@ -458,7 +459,6 @@ export default { } this.isSubmit = false }) - } }, handleSubmitNo() { if (this.commentText) { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 664e3642e..6a39b188b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -398,34 +398,38 @@ export default { }); }, upload(row, title) { - var params = { - columnName: { - chapterNumber: "章条编号", - chapterName: "章节名称", - commentText: "修改意见内容(包括理由或依据)", - oldText: "修改前", - newText: "修改后", - reason: "修改理由", - department: "提出部门", - responUserName: "提出人", - }, - dataList: [] - }; - if (title === '上报意见.xls') { - params.columnName.stateText = "处理意见" - } - params.dataList = JSON.parse(JSON.stringify(row)); - params.dataList.forEach(item => { - if (item.state === "1") { - item.stateText = "上报"; - } else if (item.state === "2") { - item.stateText = "处理后上报"; - } else { - item.stateText = "不上报"; + if (row.length > 0) { + var params = { + columnName: { + chapterNumber: "章条编号", + chapterName: "章节名称", + commentText: "修改意见内容(包括理由或依据)", + oldText: "修改前", + newText: "修改后", + reason: "修改理由", + department: "提出部门", + responUserName: "提出人", + }, + dataList: [] + }; + if (title === '上报意见.xls') { + params.columnName.stateText = "处理意见" } - }); - this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => { - }); + params.dataList = JSON.parse(JSON.stringify(row)); + params.dataList.forEach(item => { + if (item.state === "1") { + item.stateText = "上报"; + } else if (item.state === "2") { + item.stateText = "处理后上报"; + } else { + item.stateText = "不上报"; + } + }); + this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => { + }); + } else { + this.$message.warning('无上报数据') + } }, stateText(row) { if (row === "1") { @@ -440,9 +444,6 @@ export default { handleSave() { }, handleSubmit() { - if (this.data.length < 1) { - this.$message.warning("请输入征求意见搞"); - } else { this.isSubmit = true; var json = this.json; json.presidentFlag = '0'; @@ -458,7 +459,6 @@ export default { } this.isSubmit = false; }); - } }, handleSubmitNo() { if (this.commentText) { diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue index 1ee72cb7d..2d2ccf72b 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue @@ -350,34 +350,38 @@ } }, upload(row, title) { - var params = { - columnName: { - chapterNumber: "章条编号", - chapterName: "章节名称", - commentText: "修改意见内容(包括理由或依据)", - oldText: "修改前", - newText: "修改后", - reason: "修改理由", - department: "提出部门", - responUserName: "提出人", - }, - dataList: [] - }; - if (title === '上报意见.xls') { - params.columnName.stateText = "处理意见" - } - params.dataList = JSON.parse(JSON.stringify(row)); - params.dataList.forEach(item => { - if (item.state === "1") { - item.stateText = "上报"; - } else if (item.state === "2") { - item.stateText = "处理后上报"; - } else { - item.stateText = "不上报"; + if (row.length > 0) { + var params = { + columnName: { + chapterNumber: "章条编号", + chapterName: "章节名称", + commentText: "修改意见内容(包括理由或依据)", + oldText: "修改前", + newText: "修改后", + reason: "修改理由", + department: "提出部门", + responUserName: "提出人", + }, + dataList: [] + }; + if (title === '上报意见.xls') { + params.columnName.stateText = "处理意见" } - }); - this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => { - }); + params.dataList = JSON.parse(JSON.stringify(row)); + params.dataList.forEach(item => { + if (item.state === "1") { + item.stateText = "上报"; + } else if (item.state === "2") { + item.stateText = "处理后上报"; + } else { + item.stateText = "不上报"; + } + }); + this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => { + }); + } else { + this.$message.warning('无上报数据') + } }, handleTabs(name) { this.active = name; @@ -385,9 +389,6 @@ handleSave() { }, handleSubmit() { - if (this.data.length < 1) { - this.$message.warning("请输入征求意见搞"); - } else { this.isSubmit = true; var json = this.json; json.hqFlag = '0'; @@ -403,7 +404,6 @@ } this.isSubmit = false; }); - } }, handleSubmitNo() { if (this.commentText) { diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step7.vue b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue index 2ad2b99fe..5bbd4d91a 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue @@ -350,34 +350,38 @@ } }, upload(row, title) { - var params = { - columnName: { - chapterNumber: "章条编号", - chapterName: "章节名称", - commentText: "修改意见内容(包括理由或依据)", - oldText: "修改前", - newText: "修改后", - reason: "修改理由", - department: "提出部门", - responUserName: "提出人", - }, - dataList: [] - }; - if (title === '上报意见.xls') { - params.columnName.stateText = "处理意见" - } - params.dataList = JSON.parse(JSON.stringify(row)); - params.dataList.forEach(item => { - if (item.state === "1") { - item.stateText = "上报"; - } else if (item.state === "2") { - item.stateText = "处理后上报"; - } else { - item.stateText = "不上报"; + if (row.length > 0) { + var params = { + columnName: { + chapterNumber: "章条编号", + chapterName: "章节名称", + commentText: "修改意见内容(包括理由或依据)", + oldText: "修改前", + newText: "修改后", + reason: "修改理由", + department: "提出部门", + responUserName: "提出人", + }, + dataList: [] + }; + if (title === '上报意见.xls') { + params.columnName.stateText = "处理意见" } - }); - this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => { - }); + params.dataList = JSON.parse(JSON.stringify(row)); + params.dataList.forEach(item => { + if (item.state === "1") { + item.stateText = "上报"; + } else if (item.state === "2") { + item.stateText = "处理后上报"; + } else { + item.stateText = "不上报"; + } + }); + this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => { + }); + } else { + this.$message.warning('无上报数据') + } }, handleTabs(name) { this.active = name; @@ -385,9 +389,6 @@ handleSave() { }, handleSubmit() { - if (this.data.length < 1) { - this.$message.warning("请输入征求意见搞"); - } else { this.isSubmit = true; var json = this.json; json.hqFlag = '0'; @@ -403,7 +404,6 @@ } this.isSubmit = false; }); - } }, handleSubmitNo() { if (this.commentText) { diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step8.vue b/src/pages/processCenter/pages/phone/bzzqyj/step8.vue index d0321645a..fa154ef1e 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step8.vue @@ -350,34 +350,38 @@ } }, upload(row, title) { - var params = { - columnName: { - chapterNumber: "章条编号", - chapterName: "章节名称", - commentText: "修改意见内容(包括理由或依据)", - oldText: "修改前", - newText: "修改后", - reason: "修改理由", - department: "提出部门", - responUserName: "提出人", - }, - dataList: [] - }; - if (title === '上报意见.xls') { - params.columnName.stateText = "处理意见" - } - params.dataList = JSON.parse(JSON.stringify(row)); - params.dataList.forEach(item => { - if (item.state === "1") { - item.stateText = "上报"; - } else if (item.state === "2") { - item.stateText = "处理后上报"; - } else { - item.stateText = "不上报"; + if (row.length > 0) { + var params = { + columnName: { + chapterNumber: "章条编号", + chapterName: "章节名称", + commentText: "修改意见内容(包括理由或依据)", + oldText: "修改前", + newText: "修改后", + reason: "修改理由", + department: "提出部门", + responUserName: "提出人", + }, + dataList: [] + }; + if (title === '上报意见.xls') { + params.columnName.stateText = "处理意见" } - }); - this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => { - }); + params.dataList = JSON.parse(JSON.stringify(row)); + params.dataList.forEach(item => { + if (item.state === "1") { + item.stateText = "上报"; + } else if (item.state === "2") { + item.stateText = "处理后上报"; + } else { + item.stateText = "不上报"; + } + }); + this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => { + }); + } else { + this.$message.warning('无上报数据') + } }, handleTabs(name) { this.active = name; @@ -385,9 +389,6 @@ handleSave() { }, handleSubmit() { - if (this.data.length < 1) { - this.$message.warning("请输入征求意见搞"); - } else { this.isSubmit = true; var json = this.json; json.hqFlag = '0'; @@ -403,7 +404,6 @@ } this.isSubmit = false; }); - } }, handleSubmitNo() { if (this.commentText) { diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step9.vue b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue index 792b1584f..7873858e3 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue @@ -365,34 +365,38 @@ } }, upload(row, title) { - var params = { - columnName: { - chapterNumber: "章条编号", - chapterName: "章节名称", - commentText: "修改意见内容(包括理由或依据)", - oldText: "修改前", - newText: "修改后", - reason: "修改理由", - department: "提出部门", - responUserName: "提出人", - }, - dataList: [] - }; - if (title === '上报意见.xls') { - params.columnName.stateText = "处理意见" - } - params.dataList = JSON.parse(JSON.stringify(row)); - params.dataList.forEach(item => { - if (item.state === "1") { - item.stateText = "上报"; - } else if (item.state === "2") { - item.stateText = "处理后上报"; - } else { - item.stateText = "不上报"; + if (row.length > 0) { + var params = { + columnName: { + chapterNumber: "章条编号", + chapterName: "章节名称", + commentText: "修改意见内容(包括理由或依据)", + oldText: "修改前", + newText: "修改后", + reason: "修改理由", + department: "提出部门", + responUserName: "提出人", + }, + dataList: [] + }; + if (title === '上报意见.xls') { + params.columnName.stateText = "处理意见" } - }); - this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => { - }); + params.dataList = JSON.parse(JSON.stringify(row)); + params.dataList.forEach(item => { + if (item.state === "1") { + item.stateText = "上报"; + } else if (item.state === "2") { + item.stateText = "处理后上报"; + } else { + item.stateText = "不上报"; + } + }); + this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => { + }); + } else { + this.$message.warning('无上报数据') + } }, handleTabs(name) { this.active = name; @@ -400,9 +404,6 @@ handleSave() { }, handleSubmit() { - if (this.data.length < 1) { - this.$message.warning("请输入征求意见搞"); - } else { this.isSubmit = true; var json = this.json; json.hqFlag = '0'; @@ -418,7 +419,6 @@ } this.isSubmit = false; }); - } }, handleSubmitNo() { if (this.commentText) { diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 92c207ee2..d639842ef 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -426,9 +426,9 @@ @@ -460,9 +460,9 @@ placeholder="请选择标准性质" clearable> @@ -477,9 +477,9 @@ placeholder="请选择文本状态" clearable> {{ opt.label }} @@ -519,7 +519,6 @@