diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index ba0dfdad9..c26c24ebd 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -88,16 +88,16 @@ export default { path: '/domesticStandardsAndRegulations', menuId: '3e3657498664beaa0dc1de1ecb3ae0da' }, - { - title: '零部件编号申请', - path: '/partCodeApply', - menuId: '' - }, - { - title: '标准法规工作组数据统计', - path: '/dataStatisComments', - menuId: '' - }, + // { + // title: '零部件编号申请', + // path: '/partCodeApply', + // menuId: '' + // }, + // { + // title: '标准法规工作组数据统计', + // path: '/dataStatisComments', + // menuId: '' + // }, { title: '海外标准法规', path: '/foreignStandardsAndRegulations', @@ -135,11 +135,11 @@ export default { // // // title: '本地产品/项目库', // // // path: '/localProductsOrProjectLibrary' // // // }, - { + /*{ title: '企业标准库', path: '/enterpriseStandardDatabase', menuId: '01ed8f752748227777b3572d56ee9ab5' - }, + },*/ // { // title: '企标制修订计划', // path: '/enterBSysRevPlanManaLib', diff --git a/src/components/personalCenter/index.vue b/src/components/personalCenter/index.vue index 7dbe3eecf..92b82bc75 100644 --- a/src/components/personalCenter/index.vue +++ b/src/components/personalCenter/index.vue @@ -37,7 +37,7 @@ export default { }, methods: { toHome () { - this.$router.push('/home') + this.$router.push('/home1') }, // 获取当前时间 getTime () { diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index afc9a4ef2..3514f3266 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -418,28 +418,52 @@ trigger="click" :value="false" > - + + + + + + + +
- - + + + + + + + +
+ + + + - + + + + +
+ + +
+ + + +
+ + +
@@ -507,7 +531,7 @@ @@ -533,30 +557,30 @@ @@ -1247,15 +1271,13 @@ export default { modalStandItemflag: false, tableLoading: false, standItemSearch: { + XCXSSRQ:'', + ZCCSSRQ:'', standId: '', fileType: '', - responsibleUnit: '', - orgName: '', - validFlag: '0', + itemsName:'', pageSize: this.$store.getters.userInfo.configContent, page: 1, - nameOrRequest: '', - parts: '' }, standitemTotal: 0, searching: false, @@ -2231,11 +2253,14 @@ export default { selectSarStandItems (id, flag) { this.standItemSearch.standId = this.sarStandardsInfoEO.id this.standItemSearch.fileType = this.fileType - this.$http.get('lawss/sarStandItems/getSarStandItemsList', this.standItemSearch, { - _this: this, loading: 'tableLoading' - }, res => { + this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', this.standItemSearch, {}, res => { this.selectedItemList = [] - this.standItemList = res.data.list + if (res.ok) { + this.standItemList = res.data; + console.log("hello"+this.standItemList+res.data); + this.standitemTotal = res.data.count // 分页需要 + } + // if (this.standItemList != null && this.standItemList.length > 0) { // for (let ind = 0; ind < this.standItemList.length; ind++) { // // 去掉html标签 @@ -2244,7 +2269,7 @@ export default { // this.standItemList[ind].termsConditions = itemContent // } // } - this.standitemTotal = res.data.count // 分页需要 + }, e => { }) }, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue index 1c406b205..842b3a8d0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -135,6 +135,7 @@ { + this.saveLoading = false + this.$message.success('保存成功') + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { @@ -261,11 +276,13 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.form.model = data.model - this.form.modelName = data.modelName + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.form.model = data.model || data.form.model + this.form.modelName = data.modelName || data.form.modelName + this.form.responUserList = data.form.responUserList + this.form.responUserListName = data.form.responUserListName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index 2166ae91f..e3f635c75 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -147,6 +147,7 @@
@@ -179,7 +181,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {inboundLiaisonDetail,processCreateStand} from 'api/process' + import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process' export default { name: "bzdyStep3", @@ -272,7 +274,21 @@ handleTabs(name) { this.active = name }, - handleSave() {}, + handleSave() { + this.saveLoading = true + let _formData = new FormData() + _formData.append('taskIds', this.taskIds) + _formData.append('json', JSON.stringify({ + form: this.form, + commentText: this.commentText, + })) + saveTaskForPub(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { @@ -304,11 +320,15 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.form.model = data.model - this.form.modelName = data.modelName + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.form.model = data.model || data.form.model + this.form.modelName = data.modelName || data.form.modelName + this.form.responUserList = data.form.responUserList + this.form.responUserListName = data.form.responUserListName + this.form.fileName = data.form.fileName || data.fileName || '' + this.form.fileId = data.form.fileId || data.fileId || '' }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index 8cc57135e..d991f2dac 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -252,13 +252,14 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.form.file = data.fileId - this.form.fileName = data.fileName - this.form.model = data.model - this.form.modelName = data.modelName + console.log(data); + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.form.file = data.fileId || data.form.fileId + this.form.fileName = data.fileName || data.form.fileName + this.form.model = data.model || data.form.model + this.form.modelName = data.modelName || data.form.modelName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index 1c962674b..011d29d6d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -92,7 +92,7 @@ label="文件" align="center"> @@ -174,6 +174,7 @@
@@ -296,7 +298,21 @@ handleTabs(name) { this.active = name }, - handleSave() {}, + handleSave() { + this.saveLoading = true + let _formData = new FormData() + _formData.append('taskIds', this.taskIds) + _formData.append('json', JSON.stringify({ + form: this.form, + commentText: this.commentText, + })) + saveTaskForPub(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { @@ -326,12 +342,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.tableData = data.responUserList - this.form.hzfileId = data.hzfileId - this.form.hzfileName = data.hzfileName + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.tableData = data.responUserList || data.form.responUserList + this.form.hzfileId = data.hzfileId || data.form.hzfileId + this.form.hzfileName = data.hzfileName || data.form.hzfileName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index 529ac6782..3e33eac63 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -87,7 +87,7 @@ label="文件" align="center"> @@ -341,12 +341,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.tableData = data.responUserList - this.form.hzfileName = data.hzfileName - this.form.hzfileId = data.hzfileId + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.tableData = data.responUserList || data.form.responUserList + this.form.hzfileId = data.hzfileId || data.form.hzfileId + this.form.hzfileName = data.hzfileName || data.form.hzfileName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue index 6bbd01b4f..2d7c2e343 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -3,7 +3,7 @@ - +
基础信息
@@ -87,7 +87,7 @@ label="文件" align="center"> @@ -341,12 +341,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.tableData = data.responUserList - this.form.hzfileName = data.hzfileName - this.form.hzfileId = data.hzfileId + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.tableData = data.responUserList || data.form.responUserList + this.form.hzfileId = data.hzfileId || data.form.hzfileId + this.form.hzfileName = data.hzfileName || data.form.hzfileName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index af250d1cb..2942c2ccb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -87,7 +87,7 @@ label="文件" align="center"> @@ -341,12 +341,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.tableData = data.responUserList - this.form.hzfileName = data.hzfileName - this.form.hzfileId = data.hzfileId + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.tableData = data.responUserList || data.form.responUserList + this.form.hzfileId = data.hzfileId || data.form.hzfileId + this.form.hzfileName = data.hzfileName || data.form.hzfileName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index 889c9514d..41e534615 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -3,7 +3,7 @@ - +
基础信息
@@ -87,7 +87,7 @@ label="文件" align="center"> @@ -341,12 +341,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.tableData = data.responUserList - this.form.hzfileName = data.hzfileName - this.form.hzfileId = data.hzfileId + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.tableData = data.responUserList || data.form.responUserList + this.form.hzfileId = data.hzfileId || data.form.hzfileId + this.form.hzfileName = data.hzfileName || data.form.hzfileName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index edcdc36b2..a59cea2ed 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -103,14 +103,18 @@ + + +
+
+ 关闭 +
+
@@ -367,6 +380,8 @@ name: "bzjdStep1-1", data() { return { + itermsConditionsFlag: false, + itermsConditionsTitle: '', textStatusMap: {}, listModel2: false, standInfoList2: [], @@ -457,6 +472,13 @@ ProcessTitle }, methods: { + itermsConditionsClose () { + this.itermsConditionsFlag = false + }, + itermsConditionsOpen (row) { + this.itermsConditionsFlag = true + this.itermsConditionsTitle = row + }, getData () { queryTaskFirst({ bpnId: this.$route.query.bpnId diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index a4a4a67cf..f5f4d3930 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -104,14 +104,18 @@ +
+ +
+
+ 关闭 +
+ + 加载中... + +
+
+ 关闭 +
+
@@ -227,6 +240,8 @@ name: "bzjdStep2", data() { return { + itermsConditionsFlag: false, + itermsConditionsTitle: '', type: '', drawerTitle: '', histortData: [], @@ -262,6 +277,13 @@ ProcessTitle }, methods: { + itermsConditionsClose () { + this.itermsConditionsFlag = false + }, + itermsConditionsOpen (row) { + this.itermsConditionsFlag = true + this.itermsConditionsTitle = row + }, getHistoryData () { this.$http.get('lawss/activiti/get_list_by_instance', { prcNum: this.$route.query.prcNum, @@ -308,7 +330,6 @@ this.active = name }, handleSave() { - this.saveLoading = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 214893b7a..e953869f4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -99,14 +99,18 @@ + 取消 + +
+
+ 关闭 +
+ 加载中... @@ -370,6 +383,8 @@ name: "bzjdStep3", data() { return { + itermsConditionsFlag: false, + itermsConditionsTitle: '', fhList: [ { value: '1', @@ -418,6 +433,13 @@ ProcessTitle }, methods: { + itermsConditionsClose () { + this.itermsConditionsFlag = false + }, + itermsConditionsOpen (row) { + this.itermsConditionsFlag = true + this.itermsConditionsTitle = row + }, getHistoryData () { this.$http.get('lawss/activiti/get_list_by_instance', { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 7ee51700c..6b90b2415 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -94,14 +94,18 @@ + + +
+
+ 关闭 +
+ @@ -274,6 +287,8 @@ name: "bzjdStep4", data() { return { + itermsConditionsFlag: false, + itermsConditionsTitle: '', histortData: [], sarType: '', itemList: [], @@ -300,6 +315,13 @@ ProcessTitle }, methods: { + itermsConditionsClose () { + this.itermsConditionsFlag = false + }, + itermsConditionsOpen (row) { + this.itermsConditionsFlag = true + this.itermsConditionsTitle = row + }, getHistoryData () { this.$http.get('lawss/activiti/get_list_by_instance', { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index f28d59a08..834bc18af 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -94,14 +94,18 @@ + + +
+
+ 关闭 +
+ 加载中... @@ -274,6 +287,8 @@ name: "bzjdStep5", data() { return { + itermsConditionsFlag: false, + itermsConditionsTitle: '', histortData: [], sarType: '', itemList: [], @@ -300,6 +315,13 @@ ProcessTitle }, methods: { + itermsConditionsClose () { + this.itermsConditionsFlag = false + }, + itermsConditionsOpen (row) { + this.itermsConditionsFlag = true + this.itermsConditionsTitle = row + }, getHistoryData () { this.$http.get('lawss/activiti/get_list_by_instance', { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index f0b635020..67a6dabe4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -95,14 +95,18 @@ + + +
+
+ 关闭 +
+ 加载中... @@ -273,6 +286,8 @@ name: "bzjdStep6", data() { return { + itermsConditionsFlag: false, + itermsConditionsTitle: '', histortData: [], sarType: '', itemList: [], @@ -299,6 +314,13 @@ ProcessTitle }, methods: { + itermsConditionsClose () { + this.itermsConditionsFlag = false + }, + itermsConditionsOpen (row) { + this.itermsConditionsFlag = true + this.itermsConditionsTitle = row + }, getHistoryData () { this.$http.get('lawss/activiti/get_list_by_instance', { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 187975a72..3fc280f48 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -678,7 +678,6 @@ 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) @@ -718,22 +717,19 @@ export default { this.saveLoading = true; let _formData = new FormData(); _formData.append("id", this.bpnId || ""); - _formData.append("createUser", this.$store.getters.userInfo.userId); - _formData.append("createUserName", this.$store.getters.userInfo.userName); _formData.append("prcType", "4"); _formData.append('taskIds', this.taskIds) _formData.append("json", JSON.stringify({ form: this.listForm, commentText: this.commentText })); - - // saveTaskForPub(_formData).then(res => { - // this.saveLoading = false; - // this.$message.success("保存成功"); - // this.bpnId = res.result; - // }).catch(e => { - // this.saveLoading = false; - // }); + saveTaskForPub(_formData).then(res => { + this.saveLoading = false; + this.$message.success("保存成功"); + this.bpnId = res.result; + }).catch(e => { + this.saveLoading = false; + }); }, //提交事件 handleSubmit() { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 74b330f0a..c38825090 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -282,6 +282,7 @@ export default { endTime: '', // 结束日期 cname: '', // 名称 standType: '', + standId: '', }, formRules: { cid: [ @@ -299,6 +300,7 @@ export default { standSort: '', standNumber: '', standType: '', + standId: '', page: 1, pageSize: this.$store.getters.userInfo.configContent }, @@ -456,6 +458,7 @@ export default { this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber } this.form.standType = bringData[0].standType + this.form.standId = bringData[0].id this.form.cname = bringData[0].standName; this.listModel = false; } else if (this.selectedList.length > 1) { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 5716eb580..039a1e43d 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -406,7 +406,6 @@ export default { }, // 保存按钮 handleSave() { - this.isSubmit = true let zqa = new Map(); for (let lastDataListElement of this.dataList) { let a = zqa.get(lastDataListElement.dutyPeopleInfoId) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index 71d89ca6a..6ef3f73c2 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -232,6 +232,7 @@ import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import {uploadFile} from '@/api/unqualProcess.js'; import {inboundLiaisonDetail, completeTask, saveTaskForPub} from "@/api/process" +import listOfCountries from "@/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries"; export default { name: "wfhxzgStep4", @@ -307,11 +308,11 @@ export default { }, getFormFieldList (item) { this.$nextTick(() => { - let listJSON = JSON.parse(JSON.stringify(item.responUserInfo.info)) + let listJSON = JSON.parse(JSON.stringify(item.responUserList)) if (listJSON.length !== undefined) { - this.dataList = listJSON + this.dataList = listJSON[0].standardInfoList } else { - this.dataList = [listJSON] + this.dataList = [listJSON][0].standardInfoList } this.dataList.forEach(item => { if (item.fileText.length !== 0) { @@ -427,8 +428,8 @@ export default { _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ // roleForm: this.roleForm, - responUserInfo: { - info: this.dataList.splice(-1, 1) + responUserList: { + standardInfoList: this.dataList }, commentText: this.commentText })) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index aafe0469e..ca623d269 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -117,7 +117,7 @@ @@ -3509,6 +3511,10 @@ export default { if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.ZCCSSRQ) { res.data.list[i].ZCCSSRQ = res.data.list[i].attrInfoMap.ZCCSSRQ } + if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.SSRQ) { + res.data.list[i].SSRQ = res.data.list[i].attrInfoMap.SSRQ + console.log(res.data.list[i].SSRQ); + } } this.stahndinfoList = res.data.list this.total = res.data.count diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index cbbff74d1..d44b0a32d 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -641,7 +641,7 @@ - + diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 377f873c3..2c68a966a 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -10,7 +10,7 @@
- 产品平台: {{ localProEO.projectPlatfor }} + 产品平台1: {{ localProEO.projectPlatfor }} 项目编号: {{ localProEO.projectNumber }} @@ -30,7 +30,7 @@ 项目级别: {{ localProEO.projectLevel }} - 项目经理: {{ localProEO.projectManager }} + 项目经理: {{ localProEO.uname }} 项目计划开始时间: {{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }} 项目计划完成时间: { this.myLoading.loadData = false - this.nonList = res.data.records this.total = res.data.total + this.nonList = res.data.records + this.nonList.forEach(item => { + // 责任部门转换 + if (item.responsibleUnit !== null || item.responsibleUnit !== "") { + let k = (item.responsibleUnit || "").split(","); + for (let i in this.zrbmOptions) { + for (let m = 0; m < k.length; m++) { + if (this.zrbmOptions[i].value === k[m]) { + k[m] = this.zrbmOptions[i].label; + } + item.responsibleUnit = k.join(","); + } + } + } + }); }, e => { this.myLoading.loadData = false }) @@ -665,18 +679,15 @@ export default { }, }, mounted () { + // 从数据库中查询各下拉框数据 this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { - this.allSelectOptions = res.data || {} this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 - this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 - this.getGzzOption() - this.setMap(this.standStateOptions) + this.getTableByPage() }, e => { }) - this.getTableByPage() // 加载所有的部门 this.getOrgTreeSource() } diff --git a/src/pages/regulatoryRepository/partCodeApply/index.vue b/src/pages/regulatoryRepository/partCodeApply/index.vue index 4fb363ee1..191afc273 100644 --- a/src/pages/regulatoryRepository/partCodeApply/index.vue +++ b/src/pages/regulatoryRepository/partCodeApply/index.vue @@ -1,10 +1,86 @@ diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 23cc1cb95..864bd9717 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -11,19 +11,27 @@

- {{ $route.query.item.cid }} + + {{ this.$route.query.item.cid }} +

- {{ $route.query.item.cname || '-' }} + + {{ this.$route.query.item.cname || '-' }} +

- {{ $route.query.item.endTime || '-' }} + {{ this.$route.query.item.startTime || '-' }}

- {{ $route.query.item.startTime + ' ~ ' + $route.query.item.endTime}} + {{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}} -

@@ -120,6 +128,7 @@ name: 'consultationDetails', data () { return { + itemData: this.$route.query.item, id: '', // 选中id type: '', // 选中状态 spinShow: false, @@ -152,6 +161,17 @@ } }, methods: { + // 点击查看 + handlePreview (item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: 'INLAND_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, exportAll () { window.open('/api/slrs/sar-public-idea-all/tuallStand?cid=' + this.$route.query.item.cid) }, @@ -166,21 +186,6 @@ } }) }, - - //点击查看 - handlePreview(data) { - console.log(data); - return - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: data.id, - pageType: data.standType - } - }); - window.open(routeUrl.href, "_blank"); - }, - // 获取详情信息列表 getList() { this.spinShow = true @@ -188,7 +193,6 @@ _this: this }, res => { this.standinfoList = res.data.records - console.log(this.standinfoList); this.total = res.data.total this.spinShow = false }, e => { @@ -272,10 +276,10 @@ cid: this.$route.query.item.cid, content: this.opinionContent.content, partCode: this.opinionContent.partCode, - userId: this.$store.getters.userInfo.userId, - userName: this.$store.getters.userInfo.account, - deptName: this.$store.getters.userInfo.orgName, - deptId: this.$store.getters.userInfo.orgId + userId: this.$store.getters.userInfo.userId || '', + userName: this.$store.getters.userInfo.userName || '', + deptName: this.$store.getters.userInfo.orgName || '', + deptId: this.$store.getters.userInfo.orgId || '' } if (this.type === 'edit') { form.id = this.id diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 8571d2d34..efe1b4c11 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,7 +6,7 @@ // 服务器地址 // const devIp = '10.96.10.171' // const devInterfacePORT = '9999' -const devIp = 'localhost' +const devIp = '10.96.170.156' const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'