diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index af4ab5d56..1aa12e4be 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -344,10 +344,10 @@ -

技术委员会常务副主任/总院院长

+

业务主管副院长

- +
@@ -356,10 +356,10 @@ -

总院技术委员会主任

+

院长

- +
@@ -526,8 +526,8 @@ export default { startUserName: [{required: true, message: "请选择标准法规部人员", trigger: ['blur', 'change']}], leaderUser: [{required: true, message: "请选择标准法规部主管领导", trigger: ['blur', 'change']}], feeUser: [{required: true, message: "请选择费用管理部门人员", trigger: ['blur', 'change']}], - engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}], - directorUserName: [{required: true, message: "请选择总院技术委员会主任", trigger: ['blur', 'change']}], + engineerUser: [{required: true, message: "请选择业务主管副院长 ", trigger: ['blur', 'change']}], + directorUserName: [{required: true, message: "请选择院长", trigger: ['blur', 'change']}], }, roleShowflag: false, roleShowflagOne: false, diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 15dcc3a27..77a5e0115 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -18,21 +18,21 @@ - + - + - + - + - + @@ -263,7 +263,7 @@ -

管理推荐部

+

管理推进部

@@ -275,10 +275,10 @@ -

技术委员会常务副主任/总院院长

+

业务主管副院长

- +
@@ -287,10 +287,10 @@ -

技术委员会主任

+

院长

- +
@@ -414,7 +414,13 @@ export default { // 上传所储存文件数组 newDataList: [], - ch_rules: {}, + ch_rules: { + meetingName: [{required: true, message: '请输入会议名称', trigger: 'change'}], + primaryUnit: [{required: true, message: '请输入主办单位', trigger: 'change'}], + associaName: [{required: true, message: '请选择协会名称', trigger: 'change'}], + meetingStartTime: [{required: true, message: '请选择会议时间', trigger: 'change'}], + meetingPlace: [{required: true, message: '请输入会议地点', trigger: 'change'}] + }, roleForm: { startUserName: this.$store.getters.userInfo.userName, startUser: this.$store.getters.userInfo.userId, @@ -433,9 +439,9 @@ export default { dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}], startUserName: [{required: true, message: "请选择标准法规部人员", trigger: ['blur', 'change']}], leaderUser: [{required: true, message: "请选择标准法规部主管中心主任", trigger: ['blur', 'change']}], - feeUser: [{required: true, message: "请选择管理推荐部", trigger: ['blur', 'change']}], - engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}], - directorUserName: [{required: true, message: "请选择技术委员会主任", trigger: ['blur', 'change']}], + feeUser: [{required: true, message: "请选择管理推进部", trigger: ['blur', 'change']}], + engineerUser: [{required: true, message: "请选择业务主管副院长 ", trigger: ['blur', 'change']}], + directorUserName: [{required: true, message: "请选择院长", trigger: ['blur', 'change']}], }, deleteDataList: [], diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 7f1f24140..60bd786bf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1296,7 +1296,7 @@ import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import CustomSelectArray from '@/components/CustomFormComponents/SelectArray' - import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId} from "api/process"; + import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,processBack} from "api/process"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; @@ -1634,6 +1634,8 @@ txlbOptions: [], // 体系类别 data: [], // 标准列表数据 ListForm: {}, // 新增数据 + + bpnId: '' } }, watch:{ @@ -2758,6 +2760,7 @@ }, popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData && checkedData.length != 0) { + console.log(checkedData) if(checkedData.length > 0){ this.form.dybxh = checkedData.map(item => item.model).join(",") this.form.dymc = checkedData.map(item => item.name).join(",") @@ -2819,7 +2822,7 @@ saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // this.bpnId = res.result + this.bpnId = res.result }).catch(e => { this.saveLoading = false }) @@ -2878,7 +2881,17 @@ json.applyUpdUserId = this.form.applyUpdUserId json.prcCreateUser = this.form.prcCreateUser json.prcCreateUserName = this.form.prcCreateUserName - this.$http.get('lawss/activiti/startProcess', {type: '1'}, { + this.$http.post('lawss/activiti/startProcessRollBack', { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.uName, + json: JSON.stringify({ + taskInfo: '申请人发起', + form: this.form, + roleForm: this.roleForm, + commentText: this.commentText + }), + type: '1', + }, { _this: this }, res => { if (res.ok) { @@ -2892,6 +2905,14 @@ if (res.success) { this.$message.success(res.message) this.isSubmit = false + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res => { + return res + }) + } // 流程提交之后,应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } @@ -2933,12 +2954,12 @@ }, }, mounted () { + this.bpnId = this.$route.query.bpnId this.getTaskId() this.getTree() this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { - console.log(res.data.ENERGYTYPES) this.countryOptions=res.data.COUNTRY//国家地区 this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 this.standNatureOptions = res.data.SARPROPERTY // 标准性质 diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index d3fefbe8a..470c43081 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -701,11 +701,6 @@ :no-data-text="listNoDataText" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" > - - - - - - - - - - - @@ -374,6 +375,11 @@ export default { name: "bzzqyjStep1", data() { return { + pickerOptions: { + disabledDate(time) { + return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的 + } + }, activeNames: '1', bpnId: '', fileUrl: 'api/att/attFile/upload', 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/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index d0dc8ab97..b809e03e2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -23,6 +23,8 @@ + 立项 + 合并 延期 @@ -31,8 +33,6 @@ 更名 - 立项 - @@ -270,11 +270,11 @@ export default { }, data() { return { - toggleType: '1', + toggleType: '5', comFlag: 1, active: "1", commentText: "", - comName: "merge", + comName: "establish", qbfsForm: {}, formLoading: false, approvalFlag: false, diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index c87d4a2c4..d06c3cdc8 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -282,7 +282,6 @@ export default { this.passInfo = JSON.parse(JSON.stringify(item)).passInfo } this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList - this.commentText = JSON.parse(JSON.stringify(item)).commentText }) }, // 批量选择分发责任人 diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 36328073a..20206b405 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -411,6 +411,7 @@ export default { let json = { passInfo: this.passInfo, responUserList: list, + commentText: this.commentText, actionFlag: 0 } if(flag)return; diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index dbaff522c..3cd838f65 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -473,7 +473,8 @@ export default { let fileDataList = this.dataList let json = { info: { fileDataList }, - username: this.$store.getters.userInfo.userName + username: this.$store.getters.userInfo.userName, + commentText: this.commentText, } const params = new FormData(); params.set('json', JSON.stringify(json)) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index ce4e10499..84878b786 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -50,7 +50,7 @@
- +
{ @@ -811,33 +810,45 @@ export default { }, //提交事件 handleSubmit() { - this.handlePrice() - if(this.comFlag > 0) { - this.$message.warning('请填写完整的不符合项信息') - this.comFlag = 0 + let submitFlag = 0; + this.dataList.forEach(item => { + if(item.complianceReasons || item.noCompliance){ + submitFlag = 1 + } + return + }) + if(submitFlag === 0 ){ + this.$message.warning('请至少对一条信息进行评估') }else{ - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.commentText = this.commentText; - this.listForm.approvalOpinion = ""; - this.listForm.signFlag = ""; - this.listForm.dataList = this.dataList; - const json = JSON.stringify(this.listForm); - this.isSubmit = true; - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }, e => { + this.handlePrice() + if(this.comFlag > 0) { + this.$message.warning('请填写完整的不符合项信息') + this.comFlag = 0 + }else{ + this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; + this.listForm.commentText = this.commentText; + this.listForm.approvalOpinion = ""; + this.listForm.signFlag = ""; + this.listForm.dataList = this.dataList; + const json = JSON.stringify(this.listForm); + this.isSubmit = true + return + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }, e => { - }); + }); + } } }, //批量编辑 diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 5b8749ebf..b13ecf8a2 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -794,33 +794,44 @@ export default { }, //提交事件 handleSubmit() { - this.handlePrice() - if(this.comFlag > 0) { - this.$message.warning('请填写完整的不符合项信息') - this.comFlag = 0 + let submitFlag = 0; + this.dataList.forEach(item => { + if(item.complianceReasons || item.noCompliance){ + submitFlag = 1 + } + return + }) + if(submitFlag === 0 ){ + this.$message.warning('请至少对一条信息进行评估') }else{ - this.listForm.dataList.forEach(item => { - if(item.workPeople === '请选择责任人'){ - item.workPeople = '' - } - }) - this.isSubmit = true; - this.listForm.commentText = this.commentText; - const json = JSON.stringify(this.listForm); - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }, e => { - }); + this.handlePrice() + if(this.comFlag > 0) { + this.$message.warning('请填写完整的不符合项信息') + this.comFlag = 0 + }else{ + this.listForm.dataList.forEach(item => { + if(item.workPeople === '请选择责任人'){ + item.workPeople = '' + } + }) + this.isSubmit = true; + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }, e => { + }); + } } }, //标准表格选择框改变 diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue new file mode 100644 index 000000000..8a80d95ab --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue @@ -0,0 +1,1111 @@ + + + + + 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..257249ee6 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -163,10 +163,12 @@ v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'">移除标准 OCR 拆分 @@ -426,9 +428,9 @@ @@ -460,9 +462,9 @@ placeholder="请选择标准性质" clearable> @@ -477,9 +479,9 @@ placeholder="请选择文本状态" clearable> {{ opt.label }} @@ -519,7 +521,6 @@