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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-03-25 14:28:15 +08:00
parent 53efc701d4 36f4d7fa0c
commit 46e40ac7a5
4 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+1
View File
@@ -795,6 +795,7 @@ export default {
} }
} }
} }
this.$refs.filterTable.clearSelection()
this.PLmodalshowflag = false this.PLmodalshowflag = false
}, },
cancleUserInfo2 () { cancleUserInfo2 () {
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+8 -7
View File
@@ -88,20 +88,17 @@
prop="itemsNum" prop="itemsNum"
label="条款号" label="条款号"
width="70" width="70"
fixed
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
label="条款名称" label="条款名称"
show-overflow-tooltip show-overflow-tooltip
fixed
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itermsConditions" prop="itermsConditions"
label="条款内容" label="条款内容"
fixed
width="200" width="200"
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
@@ -172,14 +169,11 @@
<!-- align="center">--> <!-- align="center">-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column <el-table-column
prop="complianceRequir" prop="complianceRequirShow"
width="150" width="150"
label="符合项状态" label="符合项状态"
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
<template slot-scope="scope">
{{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="complianceState" prop="complianceState"
@@ -505,6 +499,13 @@
this.sarType = data.standInData || data.sarType this.sarType = data.standInData || data.sarType
this.json = data this.json = data
this.itemList = data.itemList this.itemList = data.itemList
this.itemList.forEach(item => {
if(item.complianceRequir === '1'){
item.complianceRequirShow = '符合'
}else{
item.complianceRequirShow = '不符合'
}
})
this.loading = false this.loading = false
}).catch(e => { }).catch(e => {
}) })
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+8 -7
View File
@@ -88,20 +88,17 @@
prop="itemsNum" prop="itemsNum"
label="条款号" label="条款号"
width="70" width="70"
fixed
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
label="条款名称" label="条款名称"
show-overflow-tooltip show-overflow-tooltip
fixed
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itermsConditions" prop="itermsConditions"
label="条款内容" label="条款内容"
fixed
width="200" width="200"
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
@@ -172,14 +169,11 @@
<!-- align="center">--> <!-- align="center">-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column <el-table-column
prop="complianceRequir" prop="complianceRequirShow"
width="150" width="150"
label="符合项状态" label="符合项状态"
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
<template slot-scope="scope">
{{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="complianceState" prop="complianceState"
@@ -502,6 +496,13 @@
this.sarType = data.standInData || data.sarType this.sarType = data.standInData || data.sarType
this.json = data this.json = data
this.itemList = data.itemList this.itemList = data.itemList
this.itemList.forEach(item => {
if(item.complianceRequir === '1'){
item.complianceRequirShow = '符合'
}else{
item.complianceRequirShow = '不符合'
}
})
this.loading = false this.loading = false
}).catch(e => { }).catch(e => {
}) })
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+8 -4
View File
@@ -88,20 +88,17 @@
prop="itemsNum" prop="itemsNum"
label="条款号" label="条款号"
width="70" width="70"
fixed
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
label="条款名称" label="条款名称"
show-overflow-tooltip show-overflow-tooltip
fixed
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itermsConditions" prop="itermsConditions"
label="条款内容" label="条款内容"
fixed
width="200" width="200"
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
@@ -172,7 +169,7 @@
<!-- align="center">--> <!-- align="center">-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column <el-table-column
prop="complianceRequir" prop="complianceRequirShow"
width="150" width="150"
label="符合项状态" label="符合项状态"
show-overflow-tooltip show-overflow-tooltip
@@ -500,6 +497,13 @@
this.sarType = data.standInData || data.sarType this.sarType = data.standInData || data.sarType
this.json = data this.json = data
this.itemList = data.itemList this.itemList = data.itemList
this.itemList.forEach(item => {
if(item.complianceRequir === '1'){
item.complianceRequirShow = '符合'
}else{
item.complianceRequirShow = '不符合'
}
})
this.loading = false this.loading = false
}).catch(e => { }).catch(e => {
}) })