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 
# Conflicts:
#	src/pages/home1/components/solicitopinions/index.vue
This commit is contained in:
zhutianqi
2021-09-16 10:53:33 +08:00
parent 1b2fbca6fe bbfb1357b5
commit c6b9f532ce
12 changed files with 82 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+2
View File
@@ -93,6 +93,7 @@
</el-table-column>
<el-table-column
prop="chapterNumber"
align="center"
label="章条编号"
width="170px">
<template slot-scope="scope">
@@ -101,6 +102,7 @@
</el-table-column>
<el-table-column
prop="chapterName"
align="center"
label="章节名称"
width="170px">
<template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+4
View File
@@ -75,11 +75,13 @@
</el-table-column>
<el-table-column
prop="chapterNumber"
align="center"
label="章条编号"
width="170px">
</el-table-column>
<el-table-column
prop="chapterName"
align="center"
label="章节名称">
</el-table-column>
<el-table-column
@@ -104,10 +106,12 @@
</el-table-column>
<el-table-column
prop="department"
align="center"
label="提出部门">
</el-table-column>
<el-table-column
prop="responUserName"
align="center"
label="提出人">
</el-table-column>
</el-table>
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+5
View File
@@ -75,11 +75,13 @@
</el-table-column>
<el-table-column
prop="chapterNumber"
align="center"
label="章条编号"
width="170px">
</el-table-column>
<el-table-column
prop="chapterName"
align="center"
label="章节名称">
</el-table-column>
<el-table-column
@@ -128,14 +130,17 @@
</el-table-column>
<el-table-column
prop="department"
align="center"
label="提出部门">
</el-table-column>
<el-table-column
prop="responUserName"
align="center"
label="提出人">
</el-table-column>
<el-table-column
prop="state"
align="center"
label="处理意见">
<template slot-scope="scope">
<div style="margin: 5px 0;">
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+5
View File
@@ -87,11 +87,13 @@
</el-table-column>
<el-table-column
prop="chapterNumber"
align="center"
label="章条编号"
width="170px">
</el-table-column>
<el-table-column
prop="chapterName"
align="center"
label="章节名称">
</el-table-column>
<el-table-column
@@ -116,14 +118,17 @@
</el-table-column>
<el-table-column
prop="department"
align="center"
label="提出部门">
</el-table-column>
<el-table-column
prop="responUserName"
align="center"
label="提出人">
</el-table-column>
<el-table-column
prop="state"
align="center"
label="处理意见">
<template slot-scope="scope">
<div>{{ stateText(scope.row.state) }}</div>
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+5
View File
@@ -87,11 +87,13 @@
</el-table-column>
<el-table-column
prop="chapterNumber"
align="center"
label="章条编号"
width="170px">
</el-table-column>
<el-table-column
prop="chapterName"
align="center"
label="章节名称">
</el-table-column>
<el-table-column
@@ -116,14 +118,17 @@
</el-table-column>
<el-table-column
prop="department"
align="center"
label="提出部门">
</el-table-column>
<el-table-column
prop="responUserName"
align="center"
label="提出人">
</el-table-column>
<el-table-column
prop="state"
align="center"
label="处理意见">
<template slot-scope="scope">
<div>{{ stateText(scope.row.state) }}</div>
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+5
View File
@@ -87,11 +87,13 @@
</el-table-column>
<el-table-column
prop="chapterNumber"
align="center"
label="章条编号"
width="170px">
</el-table-column>
<el-table-column
prop="chapterName"
align="center"
label="章节名称">
</el-table-column>
<el-table-column
@@ -116,14 +118,17 @@
</el-table-column>
<el-table-column
prop="department"
align="center"
label="提出部门">
</el-table-column>
<el-table-column
prop="responUserName"
align="center"
label="提出人">
</el-table-column>
<el-table-column
prop="state"
align="center"
label="处理意见">
<template slot-scope="scope">
<div>{{ stateText(scope.row.state) }}</div>
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+5
View File
@@ -87,11 +87,13 @@
</el-table-column>
<el-table-column
prop="chapterNumber"
align="center"
label="章条编号"
width="170px">
</el-table-column>
<el-table-column
prop="chapterName"
align="center"
label="章节名称">
</el-table-column>
<el-table-column
@@ -116,14 +118,17 @@
</el-table-column>
<el-table-column
prop="department"
align="center"
label="提出部门">
</el-table-column>
<el-table-column
prop="responUserName"
align="center"
label="提出人">
</el-table-column>
<el-table-column
prop="state"
align="center"
label="处理意见">
<template slot-scope="scope">
<div>{{ stateText(scope.row.state) }}</div>