diff --git a/src/components/workTree/index.vue b/src/components/workTree/index.vue new file mode 100644 index 000000000..0d805290e --- /dev/null +++ b/src/components/workTree/index.vue @@ -0,0 +1,352 @@ + + + + + diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index bd5756b9d..e062b815e 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -1,662 +1,76 @@ - + - - - - diff --git a/src/pages/config/pages/mechanismManage/pages/mechanism.vue b/src/pages/config/pages/mechanismManage/pages/mechanism.vue new file mode 100644 index 000000000..e9036a7f7 --- /dev/null +++ b/src/pages/config/pages/mechanismManage/pages/mechanism.vue @@ -0,0 +1,662 @@ + + + + + + + diff --git a/src/pages/config/pages/mechanismManage/pages/workgroup.vue b/src/pages/config/pages/mechanismManage/pages/workgroup.vue new file mode 100644 index 000000000..0af0db617 --- /dev/null +++ b/src/pages/config/pages/mechanismManage/pages/workgroup.vue @@ -0,0 +1,556 @@ + + + + + + diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 4ef277c07..22d7edfb3 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -395,7 +395,7 @@

{{ sarStandardsInfoEO.textStatusBuss || '-' }} + >文本状态{{ sarStandardsInfoEO.textStatusBussShow || '-' }}

{{ sarStandardsInfoEO.issueTime || '-' }}

{{ sarStandardsInfoEO.putTime || '-' }}

@@ -2156,11 +2156,11 @@ export default { _this: this }, res => { this.sarStandardsInfoEO = res.data || {} - this.textOptions.forEach(item => { - if(this.sarStandardsInfoEO.textStatusBuss === item.value){ - this.sarStandardsInfoEO.textStatusBuss = item.label - } - }) + // this.textOptions.forEach(item => { + // if(this.sarStandardsInfoEO.textStatusBuss === item.value){ + // this.sarStandardsInfoEO.textStatusBuss = item.label + // } + // }) if (this.sarStandardsInfoEO.issueTime) { this.sarStandardsInfoEO.issueTime = this.sarStandardsInfoEO.issueTime.split(' ')[0] } diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 858741158..8ae956e29 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3649,12 +3649,12 @@ export default { return item.id } }, - created() { + /*created() { dicTypeData().then(res => { // 能源类型数据字典 this.CycxOptions = res.data.CLLX }) - }, + },*/ async mounted() { this.sarStandardsInfoEO.id = this.$route.params.id // await this.selectStandMessage() @@ -3663,6 +3663,7 @@ export default { this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { + this.CycxOptions = res.data.CLLX this.applyArcticOptions.options = res.data.ENERGYTYPES // 根据需求文档,产品类别对应标准属性中的“适用车辆类型” this.emergyKindOptions = res.data.ENERGYTYPES this.requestOptions = res.data.REQUESTTYPE diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 5f9c0d958..dfc5bf555 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -116,13 +116,6 @@ - - + + @@ -392,14 +392,14 @@ choiceZRRS (row, type, index) { this.type = type if (type === 1) { - this.drawerTitle = '选择执行人' + this.drawerTitle = '选择责任人' this.nodeList2 = [] this.zxIndex = index this.nodeList2.push(row) this.modalshowflag2 = true } else { // 批量 - this.drawerTitle = '批量选择执行人' + this.drawerTitle = '批量选择责任人' if (this.zxIdList.length > 0) { this.nodeList2 = [] this.modalshowflag2 = true @@ -513,7 +513,7 @@ } this.sarType = data.standInData || data.sarType this.json = data - let arr + let arr = [] if (typeof(data.itemList) === 'string') { arr = JSON.parse(data.itemList) } else { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index ba8f527b2..a59334f4f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -114,14 +114,6 @@ 查看条款内容 - - @@ -177,6 +169,14 @@ show-overflow-tooltip align="center"> + + 查看条款内容 - - + + 查看条款内容 - - + + 查看条款内容 - - + +