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:
liuhuaizhi
2021-07-30 17:04:02 +08:00
parent 40c43b55a8 e040599ad5
commit 3f873b0285
1 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+36 -32
View File
@@ -233,20 +233,20 @@
label="标准号/政策号" label="标准号/政策号"
width="170" width="170"
align="center"> align="center">
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<div v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNumSplit }}</div> <!-- <div v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNumSplit }}</div>-->
<div v-else>{{ scope.row.showNumber }}</div> <!-- <div v-else>{{ scope.row.showNumber }}</div>-->
</template> <!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
label="标准名称/政策名称" label="标准名称/政策名称"
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNameSplit }}</span> <!-- <span v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNameSplit }}</span>-->
<span v-else>{{ scope.row.standName }}</span> <!-- <span v-else>{{ scope.row.standName }}</span>-->
</template> <!-- </template>-->
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
@@ -287,20 +287,20 @@
label="标准号/政策号" label="标准号/政策号"
width="170" width="170"
align="center"> align="center">
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<div v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNumSplit }}</div> <!-- <div v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNumSplit }}</div>-->
<div v-else>{{ scope.row.showNumber }}</div> <!-- <div v-else>{{ scope.row.showNumber }}</div>-->
</template> <!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
label="标准名称/政策名称" label="标准名称/政策名称"
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNameSplit }}</span> <!-- <span v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNameSplit }}</span>-->
<span v-else>{{ scope.row.standName }}</span> <!-- <span v-else>{{ scope.row.standName }}</span>-->
</template> <!-- </template>-->
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
@@ -374,7 +374,7 @@
page: 1, page: 1,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
result: '1', result: '1',
sarType: 'INLAND' standType: 'INLAND'
}, },
spinShow: false, spinShow: false,
standInfoList: [], standInfoList: [],
@@ -513,15 +513,17 @@
for (let i = 0; i < this.selectedList.length; i++) { for (let i = 0; i < this.selectedList.length; i++) {
bringData.push(deposit.get(this.selectedList[i])); bringData.push(deposit.get(this.selectedList[i]));
} }
if (bringData[0].splitStatus === '0') { this.form.itemsNum = bringData[0].showNumber
this.form.itemsNum = bringData[0].standNumSplit this.form.itemsName = bringData[0].standName
this.form.itemsName = bringData[0].standNameSplit // if (bringData[0].splitStatus === '0') {
} else { // this.form.itemsNum = bringData[0].standNumSplit
this.form.itemsNum = bringData[0].showNumber // this.form.itemsName = bringData[0].standNameSplit
this.form.itemsName = bringData[0].standName // } else {
} // this.form.itemsNum = bringData[0].showNumber
// this.form.itemsName = bringData[0].standName
// }
this.form.standId = bringData[0].id this.form.standId = bringData[0].id
this.sarType = bringData[0].sarType this.sarType = bringData[0].standType
this.standId = bringData[0].standId this.standId = bringData[0].standId
this.listModel = false; this.listModel = false;
this.listModel2 = true this.listModel2 = true
@@ -560,13 +562,15 @@
for (let i = 0; i < this.selectedList2.length; i++) { for (let i = 0; i < this.selectedList2.length; i++) {
bringData.push(deposit.get(this.selectedList2[i])); bringData.push(deposit.get(this.selectedList2[i]));
} }
if (bringData[0].splitStatus === '0') { // if (bringData[0].splitStatus === '0') {
this.form.itemsNum1 = bringData[0].standNumSplit // this.form.itemsNum1 = bringData[0].standNumSplit
this.form.itemsName1 = bringData[0].standNameSplit // this.form.itemsName1 = bringData[0].standNameSplit
} else { // } else {
this.form.itemsNum1 = bringData[0].showNumber // this.form.itemsNum1 = bringData[0].showNumber
this.form.itemsName1 = bringData[0].standName // this.form.itemsName1 = bringData[0].standName
} // }
this.form.itemsNum1 = bringData[0].showNumber
this.form.itemsName1 = bringData[0].standName
this.form.oldNumber = bringData[0].id this.form.oldNumber = bringData[0].id
this.listModel2 = false this.listModel2 = false
} else if (this.selectedList2.length > 1) { } else if (this.selectedList2.length > 1) {