diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index f0beb6e21..84fe82c79 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3177,7 +3177,6 @@ export default { displayLocation.forEach(location => { // 动态属性字段-FBGBJBD 单独添加至基础信息 const list = displayLocation.filter(item => item.label === '过程稿件'); - console.log() if (location.label === '基础信息' && list && list.length > 0) { if (!list[0].child) { location['child1'] = [] @@ -3207,7 +3206,6 @@ export default { } } } - const child = location.child || [] const one = [] const half = [] @@ -3232,7 +3230,6 @@ export default { location.showAll = false }) console.log(displayLocation) - this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', { id: this.$route.params.id }, { @@ -3240,6 +3237,29 @@ export default { }, res => { displayLocation.map(item => { if (item.value === '2URVBGR2Y4UG77KZ5YPL') { + item.child.forEach(items =>{ + let accessCountry = JSON.parse(sessionStorage.getItem("accessCountry")); + if (accessCountry.country === undefined) { + accessCountry.country = '文本' + } + if(items.attrField === 'SSRQ') { + items.attrName = '实施日期' + '(' + accessCountry.country + ')' + ':' + if (accessCountry.ssrq !== undefined) { + item.value = accessCountry.ssrq + } + } else if (items.attrField === 'ZCCSSRQ') { + items.attrName = '在产车实施日期' + '(' + accessCountry.country + ')' + ':' + if (accessCountry.zccssrqgj !== undefined) { + item.value = accessCountry.zccssrqgj + } + } else if(items.attrField === 'XCXSSRQ') { + items.attrName = '新车型实施日期' + '(' + accessCountry.country + ')' + ':' + if (accessCountry.xcxssrqgj !== undefined) { + item.value = accessCountry.xcxssrqgj + } + + } + }) for (let key in res.data) { item.one.push({ attrName: key, diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index e9fd7f355..c3cd904fa 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -390,7 +390,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {startProcess, saveTaskFirst, completeTask, queryTaskFirst} from '@/api/process.js' +import {startProcess, saveTaskFirst, completeTask, queryTaskFirst, taskDel} from '@/api/process.js' export default { components: { @@ -494,6 +494,7 @@ export default { saveLoading: false, commentText: '', + bpnId: '' } }, @@ -728,6 +729,14 @@ export default { completeTask(params).then(res => { if (res.success === true) { this.$message.success('提交成功') + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 11f73fd78..b8aafd06c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -333,7 +333,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {startProcess, queryTaskFirst, saveTaskFirst, completeTask} from '@/api/process.js' +import {startProcess, queryTaskFirst, saveTaskFirst, completeTask,taskDel} from '@/api/process.js' export default { components: { @@ -417,7 +417,8 @@ export default { roleShowflagOne: false, isSubmit: false, saveLoading: false, - commentText: '' + commentText: '', + bpnId: '' } }, mounted() { @@ -640,6 +641,14 @@ export default { completeTask(params).then(res => { if (res.success === true) { this.$message.success('提交成功') + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index b431e0e06..5dc8a02c7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -626,7 +626,6 @@ }, {}, res => { if (res.ok) { this.options = res.data.list - console.log(this.options); } }, e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue new file mode 100644 index 000000000..8a5edbd2d --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -0,0 +1,535 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue new file mode 100644 index 000000000..5caae05e7 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue @@ -0,0 +1,521 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 4689b0ce1..171ee0437 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -77,6 +77,20 @@ +
+ 新增 + + 删除 + +
+ fontWeight: 'bold', height: '48px'}" + @selection-change="handleSelectionChange"> + + + + + @@ -245,6 +273,54 @@ @checkedRole="checkedRole2" :nodeList="nodeList" > + +
+ + + + + + + + + + +
+ + + + + + + + +
+ + @@ -259,6 +335,18 @@ export default { name: "bzzqyjStep4", data() { return { + acceptShow: false, + idList: [], + options: [], + itemId: '', + modalshowflag2: false, + editForm: { + chapterNumber: '', + chapterName: '', + oldText: '', + newText: '', + reason: '', + }, itermsConditionsFlag: false, itermsConditionsTitle: '', drawerModal: false, @@ -295,8 +383,8 @@ export default { spName: '', }, formRules: { - responUserList: [ - {required: true, message: '请选择责任人', trigger: 'change'}, + spId: [ + {required: true, message: '请选择审批人', trigger: 'change'}, ] }, json: {} @@ -308,6 +396,107 @@ export default { ProcessTitle }, methods: { + handleSelectionChange(val) { + this.idList = [] + val.forEach(item => { + this.idList.push(item.id) + }) + }, + addDelete() { + if (this.idList.length > 0) { + this.$confirm('删除选中数据, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + for (let a = 0; a < this.data.length; a++) { + this.idList.forEach(item => { + if (this.data[a].id === item) { + this.data.splice(a, 1) + } + }) + } + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }); + }); + } else { + this.$message.warning('请选择要删除的数据') + } + }, + addModal() { + var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); + var json = { + chapterNumber: '', + chapterName: '', + commentText: '', + oldText: '', + newText: '', + reason: '', + id: id, + department: this.$store.getters.userInfo.upDeptName, + responUserName: this.$store.getters.userInfo.userName, + } + this.data.push(json) + this.itemId = id + this.editForm = { + chapterNumber: '', + chapterName: '', + oldText: '', + newText: '', + reason: '', + } + this.modalshowflag2 = true + }, + getItemList (standId, fileType) { // 查询分解单条款数据 + this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', { + standId: standId, + fileType: fileType, + pageSize: 9999, + page: 1 + }, {}, res => { + if (res.ok) { + this.options = res.data.list + } + }, e => { + }) + }, + optionsChange (data) { + for (let a = 0; a < this.options.length; a++) { + if (data === this.options[a].itemsNum) { + this.editForm.chapterName = this.options[a].itemsName + this.editForm.oldText = this.options[a].termsConditions + } + } + }, + saveUserInfo2 () { + for( let a = 0; a < this.data.length; a++) { + if (this.data[a].id === this.itemId) { + this.data[a].chapterNumber = this.editForm.chapterNumber + this.data[a].chapterName = this.editForm.chapterName + this.data[a].oldText = this.editForm.oldText + this.data[a].newText = this.editForm.newText + this.data[a].reason = this.editForm.reason + } + } + this.modalshowflag2 = false + }, + cancleUserInfo2 () { + this.modalshowflag2 = false + }, + itemEdit (row) { + this.itemId = row.id + this.modalshowflag2 = true + this.editForm = { + chapterNumber: row.chapterNumber, + chapterName: row.chapterName, + oldText: row.oldText, + newText: row.newText, + reason: row.reason, + } + }, checkedRole2(data) { this.form.spId = data[0].id this.form.spName = data[0].name @@ -429,6 +618,14 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + let commitStatus = res.commitStatus + if(commitStatus && commitStatus > 0){ + this.acceptShow = true + this.submitShow = false + }else { + this.acceptShow = false + this.submitShow = true + } this.form.fjList = data.fjList || data.form.fjList if (data.fjListId === '') { this.form.fjListId = '' @@ -444,6 +641,7 @@ export default { this.form.spId = data.spId || '' this.form.spName = data.spName || '' this.json = data + this.getItemList(data.standId,this.form.textValue) this.data = data.info || data.data }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index d6a4098b4..995ed952d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -12,11 +12,11 @@
@@ -26,32 +26,42 @@ + disabled + v-model="form.endTime" + type="date" + placeholder="请选择结束日期">
-
+
{{ item.fileName }} 下载
+ +
+
+ {{ item.name }} +
+
+
+ - - +
+
@@ -60,100 +70,79 @@ + type="index" + label="序号" + width="55" + align="center"> + prop="chapterNumber" + align="center" + sortable + label="章条编号" + width="101px"> + prop="chapterName" + align="center" + width="200px" + label="章节名称"> + prop="commentText" + align="center" + label="修改意见内容（包括理由或依据）"> + prop="oldText" + align="center" + label="修改前"> - + prop="newText" + align="center" + label="修改后"> - + prop="reason" + align="center" + label="修改理由"> + prop="department" + align="center" + label="提出部门"> + prop="responUserName" + align="center" + label="提出人"> + prop="state" + align="center" + label="处理意见"> + + +
+ type="textarea" + :rows="3" + resize="none" + placeholder="请输入意见" + v-model="commentText">
@@ -179,57 +180,57 @@
+ height="100%" + ref="selection" + :data="histortData" + tooltip-effect="dark" + style="width: 100%" + border + row-key="id" + :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"> + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> + prop="comment" + label="流程信息" + align="center"> + prop="completeFlag" + label="状态" + align="center"> @@ -237,13 +238,13 @@
+ +
+
+ 关闭 +
+ + +
+ + + + + + + + + + +
+ + + + + + + + +
+ + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index e1c15431d..a38e79e0b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -52,6 +52,16 @@ + +
+
+ {{ item.name }} +
+
+
+ - - +
+ @@ -108,6 +118,9 @@ prop="oldText" align="center" label="修改前"> + + +
+
+ 关闭 +
+ @@ -247,6 +269,8 @@ export default { name: "bzzqyjStep6", data() { return { + itermsConditionsFlag: false, + itermsConditionsTitle: '', drawerModal: false, histortData: [], oldData: [], @@ -278,6 +302,9 @@ export default { cname: "", // 名称 fjList: [], fjListId: '', + textType: '', + modelList: [], + modelNameList: '', }, formRules: { responUserList: [ @@ -293,6 +320,13 @@ export default { ProcessTitle }, methods: { + itermsConditionsClose () { + this.itermsConditionsFlag = false + }, + itermsConditionsOpen (row) { + this.itermsConditionsFlag = true + this.itermsConditionsTitle = row + }, downloadFile (attId) { window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId }, @@ -453,6 +487,9 @@ export default { } }) this.json = data + this.form.textType = data.textType + this.form.modelList = data.modelList + this.form.modelNameList = data.modelNameList this.data = arr this.oldData = data.oldinfo }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index bcf5d217c..f98820fdc 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -265,7 +265,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import { startProcess, completeTask, saveTaskFirst, queryTaskFirst } from '@/api/process.js' +import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel } from '@/api/process.js' import { standUnqualified, dicTypeData } from '@/api/unqualProcess.js' export default { name: "wfhxzgStep1", @@ -314,6 +314,7 @@ export default { label: 'name' }, taskID: '', + bpnId: '', } }, components: { @@ -516,6 +517,14 @@ export default { completeTask(params).then(res => { if(res.success === true) { this.$message.success('提交成功') + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 82d854de8..00fe29240 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -616,7 +616,7 @@ export default { }) } else if (row.taskInfo === '审批人审批') { this.$router.push({ - name: 'bzzqyjStep5', + name: 'bzzqyjStep4-1', query: { taskIds: row.taskIds, prcId: row.prcId, @@ -625,7 +625,29 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '责任人会签') { + } else if (row.taskInfo === '标准法规工程师分线审核') { + this.$router.push({ + name: 'bzzqyjStep4-2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '标准法规工程师汇总') { + this.$router.push({ + name: 'bzzqyjStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '责任人会签') { this.$router.push({ name: 'bzzqyjStep6', query: { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 57b044f8d..afb29ac50 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -418,7 +418,8 @@ export default { dialogColor: false, dialogType: "", color: "", - isShow: false + isShow: false, + countryAreaShow: '' }; }, methods: { @@ -654,11 +655,18 @@ export default { }, // 点击查看 handlePreview(data) { + let item = { + country: this.countryAreaShow, + ssrq: data.ssrq, + xcxssrqgj: data.xcxssrqgj, + zccssrqgj: data.zccssrqgj + } + sessionStorage.setItem("accessCountry", JSON.stringify(item)); let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { id: data.id, - pageType: data.standType + pageType: data.standType, } }); window.open(routeUrl.href, "_blank"); @@ -773,6 +781,7 @@ export default { let accessRow = JSON.parse(sessionStorage.getItem("accessRow")); this.pageId = accessRow.id; this.sarAccessEO = accessRow; + this.countryAreaShow = accessRow.countryAreaShow this.selectInfobyAccid(); this.getOrgTreeSource(); this.getFileInfo(); diff --git a/src/router/index.js b/src/router/index.js index 3d1818917..535f26f7c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1129,6 +1129,24 @@ const routes = [ title: '标准征求意见流程' } }, + { + path: '/bzzqyjStep4-1', + name: 'bzzqyjStep4-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue'), + meta: { + requireAuth: true, + title: '标准征求意见流程' + } + }, + { + path: '/bzzqyjStep4-2', + name: 'bzzqyjStep4-2', + component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue'), + meta: { + requireAuth: true, + title: '标准征求意见流程' + } + }, { path: '/bzzqyjStep5', name: 'bzzqyjStep5',