FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'FOTON'

Browse Source 
Develop

See merge request LAWS/laws-system-front-FOTON!307
This commit is contained in:
王夏晖
2022-01-27 13:39:51 +08:00
parent d0f7ed992c 448d0e0e72
commit 6aa505a1af
5 changed files with 79 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+7 -7
View File
@@ -125,13 +125,6 @@
<el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
</template>
</el-table-column>
<el-table-column
v-if="!form.itemsNum1"
prop="technicalRequir"
label="核心技术要求"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="newData"
width="180"
@@ -162,6 +155,13 @@
prop="zrUserName"
align="center">
</el-table-column>
<el-table-column
v-if="!form.itemsNum1"
prop="technicalRequir"
label="核心技术要求"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="changePoint"
v-if="form.itemsNum1"
src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
+8 -8
View File
@@ -173,14 +173,6 @@
<el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
</template>
</el-table-column>
<el-table-column
v-show="sarType === 'FOREIGN' && form.itemsNum1"
prop="changePoint"
width="150"
label="相对于国行标差异点"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="newData"
width="180"
@@ -228,6 +220,14 @@
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
v-show="sarType === 'FOREIGN' && form.itemsNum1"
prop="changePoint"
width="150"
label="相对于国行标差异点"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
label="责任人"
width="170"
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+7 -7
View File
@@ -132,13 +132,6 @@
</el-button>
</template>
</el-table-column>
<el-table-column
v-if="!form.itemsNum1"
prop="technicalRequir"
label="核心技术要求"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="newData"
width="180"
@@ -163,6 +156,13 @@
{{ scope.row.applyArctic.toString() }}
</template>
</el-table-column>
<el-table-column
v-if="!form.itemsNum1"
prop="technicalRequir"
label="核心技术要求"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="changePoint"
v-if="form.itemsNum1"
src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
+28 -1
View File
@@ -135,6 +135,15 @@
<process-title>
<template slot="title">填写信息</template>
</process-title>
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane
v-for="(item, index) in projectTabName"
:key="index"
:label="item"
:value="item"
:name="item">
</el-tab-pane>
</el-tabs>
<el-table
ref="multipleTable"
:data="dataList"
@@ -387,7 +396,9 @@ export default {
data() {
return {
//折叠的标志，true为折叠，false为不折叠
activeName: 'first',
foldFormFlag: false,
projectTabName: [],
comFlag: 0,
nodeList:[],
drawerTitle:'',
@@ -449,6 +460,7 @@ export default {
}]
},
choiceForm: {}, //选择标准清单列表
newDataList: [],
countryOptions: [], //适用区域下拉框数据
user1: "",
user2: "",
@@ -459,6 +471,15 @@ export default {
};
},
methods: {
handleClick(tab) {
let projectData = this.dataList
this.dataList = []
projectData.forEach(item => {
if(item.projectName === tab.name){
this.dataList.push(item)
}
})
},
//折叠/展开基础信息方法
foldForm() {
this.foldFormFlag = !this.foldFormFlag
@@ -583,7 +604,13 @@ export default {
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
this.listForm['id'] = item.id
this.newDataList = item.dataList
this.dataList = item.dataList
item.dataList.forEach(item => {
if(!this.projectTabName.includes(item.projectName)){
this.projectTabName.push(item.projectName)
}
})
} else {
this.listForm = item.form;
this.dataList = item.form.dataList;
@@ -594,7 +621,7 @@ export default {
//提交事件
handleSubmit() {
this.listForm.dataList = this.dataList
this.listForm.dataList = this.newDataList
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.isSubmit = true
src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
+29 -2
View File
@@ -1,4 +1,4 @@
<!--标准合规评估 标准法规部部长审批-->
<!--标准合规评估 标准法规部部长审批-->
<template>
<div class="bzpg-step8">
<ProcessHeader toggle>
@@ -135,6 +135,15 @@
<process-title>
<template slot="title">填写信息</template>
</process-title>
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane
v-for="(item, index) in projectTabName"
:key="index"
:label="item"
:value="item"
:name="item">
</el-tab-pane>
</el-tabs>
<el-table
ref="multipleTable"
:data="dataList"
@@ -387,7 +396,9 @@ export default {
data() {
return {
//折叠的标志，true为折叠，false为不折叠
activeName: 'first',
foldFormFlag: false,
projectTabName: [],
comFlag: 0,
nodeList:[],
drawerTitle:'',
@@ -449,6 +460,7 @@ export default {
}]
},
choiceForm: {}, //选择标准清单列表
newDataList: [],
countryOptions: [], //适用区域下拉框数据
user1: "",
user2: "",
@@ -459,6 +471,15 @@ export default {
};
},
methods: {
handleClick(tab) {
let projectData = this.dataList
this.dataList = []
projectData.forEach(item => {
if(item.projectName === tab.name){
this.dataList.push(item)
}
})
},
//折叠/展开基础信息方法
foldForm() {
this.foldFormFlag = !this.foldFormFlag
@@ -583,7 +604,13 @@ export default {
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
this.listForm['id'] = item.id
this.newDataList = item.dataList
this.dataList = item.dataList
item.dataList.forEach(item => {
if(!this.projectTabName.includes(item.projectName)){
this.projectTabName.push(item.projectName)
}
})
} else {
this.listForm = item.form;
this.dataList = item.form.dataList;
@@ -594,7 +621,7 @@ export default {
//提交事件
handleSubmit() {
this.listForm.dataList = this.dataList
this.listForm.dataList = this.newDataList
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.isSubmit = true