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

This commit is contained in:
yanyizhou
2021-09-16 09:57:55 +08:00
7 changed files with 31 additions and 0 deletions
@@ -93,6 +93,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterNumber" prop="chapterNumber"
align="center"
label="章条编号" label="章条编号"
width="170px"> width="170px">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -101,6 +102,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center"
label="章节名称" label="章节名称"
width="170px"> width="170px">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -75,11 +75,13 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterNumber" prop="chapterNumber"
align="center"
label="章条编号" label="章条编号"
width="170px"> width="170px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center"
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -104,10 +106,12 @@
</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> </el-table>
@@ -75,11 +75,13 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterNumber" prop="chapterNumber"
align="center"
label="章条编号" label="章条编号"
width="170px"> width="170px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center"
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -128,14 +130,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 style="margin: 5px 0;"> <div style="margin: 5px 0;">
@@ -87,11 +87,13 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterNumber" prop="chapterNumber"
align="center"
label="章条编号" label="章条编号"
width="170px"> width="170px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center"
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -116,14 +118,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>
@@ -87,11 +87,13 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterNumber" prop="chapterNumber"
align="center"
label="章条编号" label="章条编号"
width="170px"> width="170px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center"
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -116,14 +118,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>
@@ -87,11 +87,13 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterNumber" prop="chapterNumber"
align="center"
label="章条编号" label="章条编号"
width="170px"> width="170px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center"
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -116,14 +118,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>
@@ -87,11 +87,13 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterNumber" prop="chapterNumber"
align="center"
label="章条编号" label="章条编号"
width="170px"> width="170px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center"
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -116,14 +118,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>