diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index bfc365ba3..e0e75c8b5 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3722,41 +3722,18 @@ export default { }, { _this: this }, 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, - // value: res.data[key].join(','), - // isShowImp: '0', - // id: key - // }) - // } - // } - // }) + displayLocation.map(item => { + if (item.value === '2URVBGR2Y4UG77KZ5YPL') { + for (let key in res.data) { + item.one.push({ + attrName: key, + value: res.data[key].join(','), + isShowImp: '0', + id: key + }) + } + } + }) this.dynamicFormField = displayLocation }) sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation)) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index 97fad8e2b..730458af1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -164,10 +164,10 @@ -

技术管理中心主任

+

技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任

- +
@@ -175,10 +175,10 @@ -

工程研究总院院长

+

工程研究总院院长或标准法规主管副院长

- +
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index 2ae9cd88d..cdb198016 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -35,6 +35,7 @@ @@ -164,11 +165,11 @@ -

技术管理中心主任

+

技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任

- +
@@ -176,10 +177,10 @@ -

工程研究总院院长

+

工程研究总院院长或标准法规主管副院长

- +
@@ -263,6 +264,11 @@ export default { name: "bzdyStep1", data() { return { + pickerOptions: { + disabledDate(time) { + return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的 + } + }, drawerTitle2: '', type2: '', bpnId: '', @@ -397,14 +403,14 @@ export default { this.nodeList2 = this.roleForm.dockUserList.split(',') } } else { - this.drawerTitle2 = '选择技术管理中心主任' + this.drawerTitle2 = '选择技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任' if ( this.roleForm.directorUser.length > 0) { this.nodeList2 = this.roleForm.directorUser.split(',') } } this.modalshowflag2 = true }, - choiceZRR (type, title, id) { + choiceZRR (type, title, id) { this.nodeList = [] this.nodeList.push(id) this.type = type diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index cf40474f6..a4a438917 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -47,7 +47,7 @@ {{ item.name }} @@ -63,7 +63,7 @@ {{ item.name }} @@ -127,19 +127,19 @@ - - -
- - -
-
-
+ + + + + + + + + + + + +
{ this.saveLoading = false @@ -425,7 +428,7 @@ this.json.dyhz = this.form.dyhz this.isSubmit = true var json = this.json - json.commentText = this.commentText + // json.commentText = this.commentText json.fileId = this.form.fileId json.fileName = this.form.fileName this.$http.post('lawss/activiti/completeTask', { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index 1e1404123..9dde7dcb7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -47,7 +47,7 @@ {{ item.name }} @@ -63,7 +63,7 @@ {{ item.name }} @@ -322,6 +322,10 @@ updateFile (fileId) { window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId }, + updateFile2 (item) { + let id = item.id + window.location.href = '/api/att/attFile/downloadFile?fileId=' + id + }, handleTabs(name) { this.active = name }, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index 98493163f..381d36b17 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -3,7 +3,7 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 85927dd47..7af7467dc 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -137,7 +137,7 @@ + @click.native="choiceZRRS('1')">
@@ -161,13 +161,13 @@ -

技术管理中心主任

+

技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任

@@ -176,13 +176,13 @@ -

工程研究总院院长

+

工程研究总院院长或标准法规主管副院长

@@ -287,7 +287,7 @@
0) { - this.nodeList2 = this.roleForm.dockUserList.split(',') + if (type === '1') { + this.drawerTitle2 = '选择责任部门对接人' + if ( this.roleForm.dockUserList.length > 0) { + this.nodeList2 = this.roleForm.dockUserList.split(',') + } + } else { + this.drawerTitle2 = '选择技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任' + if (this.roleForm.directorUser.length > 0) { + this.nodeList2 = this.roleForm.directorUser.split(',') + } } this.modalshowflag2 = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index ebc145333..398ec19b8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -138,7 +138,7 @@ + @click.native="choiceZRRS('1')">
@@ -162,13 +162,13 @@ -

技术管理中心主任

+

技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任

@@ -177,13 +177,13 @@ -

工程研究总院院长

+

工程研究总院院长或标准法规主管副院长

@@ -289,7 +289,7 @@ 0) { - this.nodeList2 = this.roleForm.dockUserList.split(',') + if (type === '1') { + this.drawerTitle2 = '选择责任部门对接人' + if ( this.roleForm.dockUserList.length > 0) { + this.nodeList2 = this.roleForm.dockUserList.split(',') + } + } else { + this.drawerTitle2 = '选择技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任' + if (this.roleForm.directorUser.length > 0) { + this.nodeList2 = this.roleForm.directorUser.split(',') + } } this.modalshowflag2 = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 90b9e7da4..a5a771887 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -464,7 +464,7 @@ export default { if (this.commentText) { this.isSubmit = true var json = this.json - json.directorFlag = '0' + json.directorFlag = '1' json.commentText = this.commentText this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 6a39b188b..fdd493c52 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -3,7 +3,7 @@ - +
基础信息
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 4de7326ed..c8d3c6477 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -4566,7 +4566,6 @@ export default { this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 this.standSystemOptions = res.data.TXLBBUSS // 标准体系 - console.log(this.standSystemOptions); this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型 this.categoryOptions.options = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证 diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 2d6ec22f6..702f7c6aa 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -263,40 +263,42 @@ v-model="addForm.unit"> - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + +
+ + + + +
+
+ +
+ + + +
@@ -361,6 +363,128 @@ :nodeList="nodeListZRBM" @checkedRole="drawerCheckZRBM" /> + +
+
+ +
+ + + + + + + + + 查询 + + 清空 + + + +
+
+
+ + + + + + + + + + + + + + + + +
+ + 数据加载中…… +
+
+ +
+
+ +
+
+ + +
+ +
+
@@ -371,9 +495,28 @@ components: {}, data() { return { + TXJGList: [], + TXJGmodal: false, + standSystemOptions: [], + defaultProps: { + children: 'children', + label: 'menuName' + }, + QYBZShow: false, + QYBZList: [], modalshowflagZRBM: false, nodeListZRBM: [], - + QYBZformSelect: [], + QYBZmodal: false, + QYBZform: { + page: 1, + pageSzie: this.$store.getters.userInfo.configContent, + validFlag: '0', + userId: this.$store.getters.userInfo.userId, + standCode: '', + standName: '', + total: 0, + }, QCDWmodal: false, QCDWValue: [], QCDWList: [], @@ -390,6 +533,10 @@ DrawerType: '', ids: [], addForm: { + tsJson: '', + tsJsonName: '', + rqbJson: '', + rqbName: '', unit: '', // 单位 unitName: '', esName: '', // 企标名称 @@ -450,6 +597,83 @@ props: {}, watch: {}, methods: { + TXJGcloseDrawer () { + this.TXJGmodal = false + }, + TXJGenterDrawer () { + let list = this.$refs.TXJGTree.getCheckedNodes() + let id = '' + let name = '' + list.map(item => { + if (id.length > 0) { + id += ',' + id += item.id + name += ',' + name += item.menuName + } else { + id = item.id + name = item.menuName + } + }) + this.addForm.tsJson = id + this.addForm.tsJsonName = name + this.TXJGmodal = false + }, + choiceTXJG (id) { + if (id) { + this.TXJGList = id.split(',') + } else { + this.TXJGList = [] + } + this.TXJGmodal = true + }, + QYBZcloseDrawer () { + this.clearQYBZ() + }, + QYBZenterDrawer () { + if (this.QYBZformSelect.length > 1) { + this.$message.warning('请选择一条标准') + } else if (this.QYBZformSelect.length < 1){ + this.$message.warning('请选择要带入的标准') + } else { + this.addForm.rqbJson = this.QYBZformSelect[0].id + this.addForm.rqbName = this.QYBZformSelect[0].standName + this.clearQYBZ() + this.QYBZmodal = false + } + }, + handleSelectionQYBZ (val) { + this.QYBZformSelect = val + }, + QYBZpageChange (page) { + this.QYBZform.page = page + this.QYBZget() + }, + QYBZpageSizeChange (pageSize) { + this.QYBZform.pageSize = pageSize + this.QYBZget() + }, + QYBZget () { + this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, { + _this: this, loading: 'QYBZShow' + }, res => { + this.QYBZList = res.data.list + this.QYBZform.total = res.data.count + }, e => { + }) + }, + clearQYBZ () { + this.QYBZform = { + page: 1, + standCode: '', + standName: '', + } + }, + choiceQYBZ (id) { + this.QYBZformSelect = [] + this.QYBZget() + this.QYBZmodal = true + }, drawerCheckZRBM (data) { let list = '' let listName = '' @@ -718,6 +942,7 @@ _this: this }, res => { this.QCDWList = res.data.QCDW // 起草单位 + this.standSystemOptions = res.data.TXLBBUSS // 体系结构 }, e => { }) }, @@ -730,6 +955,36 @@ #enterpriseStandardPlan { height: 100%; background: #fff; + .standardForComments { + height: calc(~'100% - 56px'); + background: #fff; + flex-direction: column; + .action-bar { + margin-bottom: 5px; + padding: 0; + } + + .content { + flex: auto; + overflow: hidden; + display: flex; + flex-direction: column; + + .table-wrap { + flex: auto; + overflow: hidden; + position: relative; + } + } + + & > .pagination { + position: static; + + /deep/ .pagination-slot { + padding: 0; + } + } + } /deep/.table-wrap { .el-table__fixed { height: calc(~'100% - 20px') !important;