diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index 322ac2238..611f46333 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -255,7 +255,7 @@ export default { uploadSuccess(res, file, fileList) { if (res.ok) { // this.value += res.data.id + ',' - this.$emit('input', this.value ? this.value + ',' : this.value+ res.data.id + ',') + this.$emit('input', this.value ? this.value + ','+ res.data.id + ',' : this.value+ res.data.id + ',') this.$emit('success') this.$message({ message: '文件上传成功', diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index e1c72c47a..fdee3c148 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1269,10 +1269,10 @@ export default { { id: bringData[0].id, page: this.page, Size: this.pageSize }, { _this: this }, res => { - if (res.data == null) { - res.data = []; + if (res.data.records == null) { + res.data.records = []; } - this.dataList = res.data; + this.dataList = res.data.records; this.dataList.forEach(item => { if (item.xcxssrqgj === null){ this.$set(item, "XCXSSRQ", ''); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 09c935c54..5b66cb677 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -1243,10 +1243,10 @@ export default { { id: bringData[0].id, page: this.page, Size: this.pageSize }, { _this: this }, res => { - if (res.data == null) { - res.data = []; + if (res.data.records == null) { + res.data.records = []; } - this.dataList = res.data; + this.dataList = res.data.records; this.dataList.forEach(item => { if (item.xcxssrqgj === null){ this.$set(item, "XCXSSRQ", ''); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue new file mode 100644 index 000000000..48849b845 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -0,0 +1,949 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 41331f01f..52482ca58 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -94,22 +94,9 @@ prop="distributePerson" label="分发责任人"> - - - - - - - - @@ -250,10 +237,10 @@ > + @@ -500,7 +490,8 @@ export default { }] }, choiceForm: {}, //选择标准清单列表 - showColumn: true + showColumn: true, + textStatusMap: {}// 文本状态id与name对应 }; }, methods: { @@ -642,16 +633,14 @@ export default { _formData.append("createUserName", this.$store.getters.userInfo.uName); _formData.append("prcType", "5"); _formData.append("json", JSON.stringify({ - prcForm: this.prcForm, - sarAccessInfoList: this.sarAccessInfoList, - sarAccessInfoListADMIN: this.sarAccessInfoListADMIN, - bzqdForm: this.bzqdForm, - listInfo: this.listInfo, - id: this.id + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText })); saveTaskFirst(_formData).then(res => { this.saveLoading = false; this.$message.success("保存成功"); + this.$router.push("/processCenter"); }).catch(e => { this.saveLoading = false; }); @@ -666,7 +655,6 @@ export default { this.$message.warning("请选择分发责任人"); } else { var json = Object.assign(this.listForm, this.roleForm); - console.log(json); this.$refs["listForm"].validate((valid) => { if (valid) { this.$refs["roleForm"].validate((valid) => { @@ -821,18 +809,32 @@ export default { standType: "" }; this.getStandData(); - } + }, + // 将文本状态的id与name对应 + setMap(data) { + data.forEach(item => { + this.$set(this.textStatusMap, item.value, item.label); + }); + }, }, computed: {}, watch: { - dataList: { - deep: true, - handler (val) { - console.log('dataList update', val) - } - } + // dataList: { + // deep: true, + // handler (val) { + // console.log('dataList update', val) + // } + // } }, mounted() { + //从数据库中查询下拉框数据 + this.$http.get("sys/dictype/getDicTypeListCode", {}, { + _this: this + }, res => { + this.countryOptions = res.data.COUNTRY; + this.standStateOptions = res.data.WBZTCLASS; // 文本状态 + this.setMap(this.standStateOptions); + }); this.getTree(); this.getProductData(); this.getStandData(); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 3acb8e4a7..688712f47 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -314,6 +314,7 @@ export default { */ getFormFieldList (item) { this.$nextTick(() => { + console.log(item); this.listForm = JSON.parse(JSON.stringify(item)) this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName @@ -352,10 +353,8 @@ export default { this.$router.push('/processCenter') } }, e => { - }); } - }, //标准表格选择框改变 selectStandChange(data) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 439803ab4..283e74541 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -346,6 +346,7 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { + console.log(res); if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue new file mode 100644 index 000000000..74b4b3417 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -0,0 +1,657 @@ + + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index f42b51d7a..fd95d9787 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -271,6 +271,26 @@ export default { } }) break + case '5': + this.$router.push({ + name: 'xmpgStep1-1', + query: { + type: '5', + processName: '项目合规评估流程-标准', + bpnId: id + } + }) + break + case '6': + this.$router.push({ + name: 'xmpg2Step1-1', + query: { + type: '6', + processName: '项目合规评估流程-项目', + bpnId: id + } + }) + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index b47761910..e2efd0482 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -4,7 +4,7 @@
@@ -580,7 +580,7 @@ export default { this.active = -1 } } - // 考虑如果没有当前时间， 颜色怎么设置 + // 考虑如果没有当前时间，颜色怎么设置 }) this.selectTableDataList() }, @@ -611,8 +611,8 @@ export default { } const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' + 'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id - console.log(exportURL) - window.open(exportURL) + console.log(exportURL,'_self') + window.open(exportURL,'_self') this.$message.success('导出信息成功') } } else if (this.saveExportType === 'all') { @@ -629,8 +629,8 @@ export default { } const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' + 'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id - console.log(exportURL) - window.open(exportURL) + console.log(exportURL,'_self') + window.open(exportURL,'_self') this.$message.success('导出信息成功') } } diff --git a/src/router/index.js b/src/router/index.js index d46cfc24f..b437ec15b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -294,6 +294,15 @@ const routes = [ title: '项目合规评估流程' } }, + { + path: '/xmpgStep1-1', + name: 'xmpgStep1-1', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程' + } + }, { path: '/xmpgStep2', name: 'xmpgStep2', @@ -357,6 +366,15 @@ const routes = [ title: '项目合规评估流程-项目' } }, + { + path: '/xmpg2Step1-1', + name: 'xmpg2Step1-1', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, { path: '/xmpg2Step2', name: 'xmpg2Step2',