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:
yanyizhou
2021-09-26 10:32:56 +08:00
parent 951b4c84aa 18b21893c0
commit 174c2d04ba
9 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
+8 -2
View File
@@ -91,12 +91,15 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterNumber" prop="chapterNumber"
align="center"
label="章条编号" label="章条编号"
width="170px"> width="101px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
label="章节名称"> align="center"
label="章节名称"
width="200px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
@@ -120,14 +123,17 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="department" prop="department"
align="center"
label="提出部门"> label="提出部门">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="responUserName" prop="responUserName"
align="center"
label="提出人"> label="提出人">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="state" prop="state"
align="center"
label="处理意见"> label="处理意见">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ stateText(scope.row.state) }}</div> <div>{{ stateText(scope.row.state) }}</div>
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+2 -2
View File
@@ -97,7 +97,7 @@
align="center" align="center"
sortable sortable
label="章条编号" label="章条编号"
width="170px"> width="101px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.chapterNumber"></el-input> <el-input style="margin: 10px 0;" v-model="scope.row.chapterNumber"></el-input>
</template> </template>
@@ -106,7 +106,7 @@
prop="chapterName" prop="chapterName"
align="center" align="center"
label="章节名称" label="章节名称"
width="170px"> width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input> <el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
</template> </template>
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+3 -2
View File
@@ -79,12 +79,13 @@
align="center" align="center"
sortable sortable
label="章条编号" label="章条编号"
width="170px"> width="101px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center" align="center"
label="章节名称"> label="章节名称"
width="200px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+2 -1
View File
@@ -79,11 +79,12 @@
align="center" align="center"
sortable sortable
label="章条编号" label="章条编号"
width="170px"> width="101px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center" align="center"
width="200px"
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+2 -1
View File
@@ -91,11 +91,12 @@
align="center" align="center"
sortable sortable
label="章条编号" label="章条编号"
width="170px"> width="101px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center" align="center"
width="200px"
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+2 -1
View File
@@ -91,11 +91,12 @@
align="center" align="center"
label="章条编号" label="章条编号"
sortable sortable
width="170px"> width="101px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center" align="center"
width="200px"
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+2 -1
View File
@@ -91,11 +91,12 @@
sortable sortable
align="center" align="center"
label="章条编号" label="章条编号"
width="170px"> width="101px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center" align="center"
width="200px"
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+2 -1
View File
@@ -91,11 +91,12 @@
align="center" align="center"
sortable sortable
label="章条编号" label="章条编号"
width="170px"> width="101px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center" align="center"
width="200px"
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+4 -1
View File
@@ -3192,7 +3192,10 @@ export default {
} }
} }
this.getDomesticStandardTable(this.tableFlag) // this.getDomesticStandardTable(this.tableFlag)
//搜索后排序,应该以被搜索后的数据排序
this.getDomesticStandardTable(this.standCommonlySearch)
}, },
// 修改成表格样式后，选择项勾选改变 // 修改成表格样式后，选择项勾选改变
standSelectChange(data) { standSelectChange(data) {