diff --git a/src/common/axios/index.js b/src/common/axios/index.js index c53e52bc9..da73cb853 100644 --- a/src/common/axios/index.js +++ b/src/common/axios/index.js @@ -7,10 +7,11 @@ import axios from 'axios' import router from '@/router' import store from '@/store' import {Message} from 'element-ui' +import { serverUrl } from '@/sysConfig' export const CancelToken = axios.CancelToken // import 'element-ui/lib/theme-chalk/index.css' const _axios = axios.create({ - baseURL: '/' + baseURL: process.env.NODE_ENV === 'production' ? serverUrl : '/' }) /** diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 7e0edac2e..da6e5b796 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1034,6 +1034,7 @@ export default { _formData.append("createUserName", this.$store.getters.userInfo.userName); _formData.append("prcType", "4"); _formData.append("json", JSON.stringify({ + taskInfo: '引入法规标准清单', form: this.listForm, roleForm: this.roleForm, commentText: this.commentText diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue index e3f518392..ade22d84d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue @@ -419,6 +419,7 @@ export default { pageSize: this.$store.getters.userInfo.configContent, pageNo: 1, totalNo: 0, + prcNum: '', pageSizeNo: this.$store.getters.userInfo.configContent, listForm: { listName: "", //清单名称 @@ -454,20 +455,19 @@ export default { queryTaskFirst({ bpnId: this.$route.query.bpnId }).then(res => { - console.log(res.mes); let mes = JSON.parse(res.mes); this.listForm = mes.form; - this.detailData = mes.form.detailData this.dataList = mes.form.dataList; this.commentText = mes.commentText; - // this.fileList = mes.form.fileName.split(",") - // console.log(this.fileList); + this.prcNum = mes.prcNum + this.fileIds = mes.form.fileId; this.getFileInfo(); + this.processTable(); }); }, processTable () { this.$http.get('lawss/activiti/get_list_by_instance', { - prcNum: this.$route.query.prcNum, + prcNum: this.prcNum, sortWord: this.shunxu ? this.paixu : '', shunxu: this.shunxu }, { @@ -650,38 +650,6 @@ export default { beforeUpload () { }, - // getData() { - // return new Promise((resolve, reject) => { - // inboundLiaisonDetail({ - // taskIds: this.taskIds, - // pId: this.pId - // }).then(res => { - // if (res) { - // const processForm = JSON.parse(res.mesg) - // this.getFormFieldList(processForm) - // } - // }).catch(e => { - // }) - // }) - // }, - // /** - // * @description: 动态表单读取 - // */ - // getFormFieldList (item) { - // this.$nextTick(() => { - // this.listForm = JSON.parse(JSON.stringify(item)) - // this.listForm.prcNum = this.prcNum - // this.listForm.prcName = this.prcName - // this.listForm['id'] = item.id - // this.listForm.dataList = item.dataList - // this.dataList = item.dataList - // this.listForm.applyUpdUserId = item.applyUpdUserId - // this.listForm.jlUserId = item.jlUserId - // this.listForm.zrUserId = item.zrUserId - // this.fileIds = item.fileId; - // this.getFileInfo(); - // }) - // }, //保存事件 handleSave() { this.saveLoading = true; @@ -691,8 +659,12 @@ export default { _formData.append("createUserName", this.$store.getters.userInfo.userName); _formData.append("prcType", "4"); _formData.append("json", JSON.stringify({ + taskInfo: '根据会签意见修订', form: this.listForm, roleForm: this.roleForm, + prcNum: this.$route.query.prcNum, + taskIds: this.$route.query.taskIds, + pId: this.$route.query.prcId, commentText: this.commentText })); saveTaskFirst(_formData).then(res => { @@ -765,7 +737,7 @@ export default { this.setMap(this.standStateOptions); }); this.getData(); - this.processTable(); + // this.processTable(); this.getStandData(); }, }; diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 03351cc87..1fad32ba3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -193,20 +193,20 @@ - - - -

会签人

-
- - - -
- - - + + + + + + + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 35a47aa0a..d82a474de 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -446,8 +446,8 @@ export default { cnName: "", //中文名称 enName: "", //英文名称 isSubTime: "", //发布日期 - newCarTime: "", //新车型实施日期 - oldCarTime: "", //在产车实施日期 + XCXSSRQ: "", //新车型实施日期 + ZCCSSRQ: "", //在产车实施日期 applyCar: "", //适用车型 textState: "", //文本状态 id: "" @@ -656,6 +656,7 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { + console.log(res.mesg) if (res) { const processForm = JSON.parse(res.mesg) this.getFormFieldList(processForm) @@ -694,6 +695,9 @@ export default { taskInfo: '根据会签意见修订', form: this.listForm, roleForm: this.roleForm, + prcNum: this.$route.query.prcNum, + taskIds: this.$route.query.taskIds, + pId: this.$route.query.prcId, commentText: this.commentText })); saveTaskFirst(_formData).then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index ebb110b56..49068ff27 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -29,7 +29,16 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> - + + + + + + @@ -87,6 +96,42 @@ + + + +

确认+选择责任人

+
+ + + +
+ + + + + + +

负责人

+
+ + + +
+ + + + + + +

分发负责人

+
+ + + +
+ + + @@ -103,7 +148,7 @@ @@ -154,25 +199,44 @@ + @selection-change="selectedChange" + > - - - - - - - + + + + + + + + + + + + + + +
取消 带入 @@ -217,13 +281,17 @@ export default { // 责任部门 zrbmOptions: [], standModel: false, + // 总数 + total: 0, + // 当前页数 + pageNo: 1, // 查询未符合项整改数据库数据 queryUnqualidiedData: { pageNo: 1, pageSize: 10, total: 0, closeState: '1', - standId: '', // 标准号/名称 + standSerialNumber: '', // 标准号/名称 productName: '', // 项目名称 responsibleUnit: '' // 责任部门 }, @@ -269,9 +337,9 @@ export default { this.$set(item,'dutyPeople','') this.$set(item,'dutyPeopleInfoId','') this.$set(item,'dutyPeopleId','') - this.$set(item,'fileText','') - this.$set(item,'fileTextId','') - this.$set(item,'fileTextPath','') + this.$set(item,'fileText',[]) + this.$set(item,'fileTextId',[]) + this.$set(item,'fileTextPath',[]) }) this.total = res.data.total }) @@ -308,6 +376,18 @@ export default { }); } }, + // 点击查看 + handlePreview (item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: 'FOREIGN_STAND' + // pageType: item.standType + '_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, //选择标准取消事件 closeDrawer() { this.standModel = false @@ -432,7 +512,7 @@ export default { // 清空 查询条件 clearAllSearch (search = true) { this.queryUnqualidiedData = { - standId: '', + standSerialNumber: '', productName: '', responsibleUnit: '' } diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index d0c774c8a..4a203c4e7 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -13,7 +13,7 @@ - +
- + + + + + + @@ -119,7 +128,6 @@ -
@@ -316,9 +324,9 @@ export default { const params = { taskIds: this.taskIds, pId: this.pId, - standId: '', // 标准号/名称 - productName: '', // 项目名称 - responsibleUnit: '' // 责任部门 + // standId: '', // 标准号/名称 + // productName: '', // 项目名称 + // responsibleUnit: '' // 责任部门 } inboundLiaisonDetail(params).then(res => { const processForm = JSON.parse(res.mesg) @@ -328,6 +336,7 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList + this.textarea = JSON.parse(JSON.stringify(item)).commentText }) }, // 批量选择分发责任人 @@ -455,6 +464,18 @@ export default { }) this.dataList = this.realList }, + // 点击查看 + handlePreview (item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: 'FOREIGN_STAND' + // pageType: item.standType + '_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, // 清空 查询条件 clearAllSearch () { this.nonSearch = { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index e7b4bc4e9..ba1775e1f 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -13,7 +13,7 @@ - +
- + + + + + + @@ -125,7 +134,6 @@ -
@@ -316,6 +324,7 @@ export default { for (let i = 0; i { + if (res.success) { + this.$message.success('驳回成功') + this.$router.push('/processCenter') + } + this.isSubmit = false + }) + } else { + this.$message.warning('请输入反馈意见') + } +/* this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, userId: this.$store.getters.userInfo.userId @@ -365,7 +390,19 @@ export default { }) } else { this.$message.warning('请输入反馈意见') - } + }*/ + }, + // 点击查看 + handlePreview (item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: 'FOREIGN_STAND' + // pageType: item.standType + '_STAND' + } + }) + window.open(routeUrl.href, '_blank') }, // 保存按钮 handleSave() {}, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-3.vue new file mode 100644 index 000000000..4caae637d --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-3.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue new file mode 100644 index 000000000..8366e5eb4 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 07ed68194..ad7e4df9d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -633,6 +633,7 @@ export default { _formData.append("createUserName", this.$store.getters.userInfo.uName); _formData.append("prcType", "5"); _formData.append("json", JSON.stringify({ + taskInfo: '选择已拆分标准', form: this.listForm, roleForm: this.roleForm, commentText: this.commentText diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 97fe79a24..1a4d60404 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -246,21 +246,21 @@
-
- - -
- - -
- - -
+ + + + + + + + + + + + + + +
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 8e59d2f47..4e92accc3 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -447,45 +447,53 @@ export default { }, //驳回事件 beforeBack () { - this.listForm.applyUpdUserId = this.dataList[0].distributePersonId - this.listForm.commentText = this.commentText; - this.listForm.dataList = this.dataList - this.listForm.fenFlag = '1' - 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') - } - }, e => { - }); + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写审批意见') + } else { + this.listForm.applyUpdUserId = this.dataList[0].distributePersonId + this.listForm.commentText = this.commentText; + this.listForm.dataList = this.dataList + this.listForm.fenFlag = '1' + 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') + } + }, e => { + }); + } }, //提交事件 handleSubmit() { - this.listForm.applyUpdUserId = this.dataList[0].distributePersonId - this.listForm.commentText = this.commentText; - this.listForm.dataList = this.dataList - this.listForm.fenFlag = '2' - 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') - } - }, e => { - }); + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写审批意见') + }else { + this.listForm.applyUpdUserId = this.dataList[0].distributePersonId + this.listForm.commentText = this.commentText; + this.listForm.dataList = this.dataList + this.listForm.fenFlag = '2' + 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') + } + }, e => { + }); + } }, //标准表格选择框改变 selectStandChange(data) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index ea95b1152..eeec0a723 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -443,35 +443,42 @@ export default { }) }, //驳回事件 - beforeBack () { + beforeBack () { if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写审批意见') + } else { this.listForm.fenFlag = '2' this.handleSubmit() + } }, //提交事件 handleSubmit() { - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; - this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; - this.listForm.zrUserId = this.$store.getters.userInfo.userId ; - this.listForm.commentText = this.commentText; - this.listForm.standId = this.listForm.standId; - this.listForm.fenFlag = "1"; - this.listForm.dataList = this.dataList - 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') - } - }, e => { + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写审批意见') + } else { + this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; + this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; + this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; + this.listForm.zrUserId = this.$store.getters.userInfo.userId ; + this.listForm.commentText = this.commentText; + this.listForm.standId = this.listForm.standId; + this.listForm.fenFlag = "1"; + this.listForm.dataList = this.dataList + 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') + } + }, e => { - }); + }); + } }, //标准表格选择框改变 selectStandChange(data) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 7540a8b3a..a1ef9dd2f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -442,34 +442,42 @@ export default { //驳回事件 beforeBack () { - this.listForm.fenFlag = '2' - this.handleSubmit() + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写审批意见') + } else { + this.listForm.fenFlag = '2' + this.handleSubmit() + } }, //提交事件 handleSubmit() { - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; - this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; - this.listForm.zrUserId = this.$store.getters.userInfo.userId ; - this.listForm.commentText = this.commentText; - this.listForm.standId = this.listForm.standId; - this.listForm.fenFlag = "1"; - this.listForm.dataList = this.dataList - 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') - } - }, e => { + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写审批意见') + } else { + this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; + this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; + this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; + this.listForm.zrUserId = this.$store.getters.userInfo.userId ; + this.listForm.commentText = this.commentText; + this.listForm.standId = this.listForm.standId; + this.listForm.fenFlag = "1"; + this.listForm.dataList = this.dataList + 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') + } + }, e => { - }); + }); + } }, //标准表格选择框改变 selectStandChange(data) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 5dabd8629..7864191ff 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -85,22 +85,22 @@ { this.ProjectDatas = res.data.Maintenance.records; + this.total = res.data.Maintenance.total; }); }, diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index fb39c7d87..bd68b0c25 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -284,14 +284,36 @@ export default { } break case '5': - this.$router.push({ - name: 'xmpgStep1-1', - query: { - type: '5', - processName: '项目合规评估流程-标准', - bpnId: id - } - }) + if (mes.taskInfo === '选择已拆分标准') { + this.$router.push({ + name: 'xmpgStep1-1', + query: { + type: '5', + processName: '项目合规评估流程-标准', + bpnId: id, + verifySarStandard: true, + } + }) + } + // else if (mes.taskInfo === '分发责任人分发任务') { + // this.$router.push({ + // name: 'bzqdfbStep1-3', + // query: { + // type: '5', + // processName: '项目合规评估流程-标准', + // bpnId: id + // } + // }) + // }else if (mes.taskInfo === '责任人填写评估反馈') { + // this.$router.push({ + // name: 'bzqdfbStep1-3', + // query: { + // type: '5', + // processName: '项目合规评估流程-标准', + // bpnId: id + // } + // }) + // } break case '6': this.$router.push({ diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue index e1715915f..a520ab673 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue @@ -99,9 +99,9 @@ prop="standId" width="180px" align="center" - label="标准编号"> + label="标准号"> -
{{historySeeForm.standId}}
+
{{historySeeForm.standSerialNumber}}
{{historySeeForm.standName}}
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 9bab53613..cc52cb45e 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -197,7 +197,7 @@ label="计划关闭时间"> - +