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-12-05 14:55:30 +08:00
parent 3df2baa501 6b1bde788b
commit c53d1128ef
8 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standAutoSplit/index.vue
+14 -3
View File
@@ -50,6 +50,7 @@
<el-table-column
prop="showNumber"
label="标准号/政策号"
width="150"
align="center">
<template slot-scope="scope">
<a class="table-jump"
@@ -59,6 +60,7 @@
<el-table-column
prop="standName"
label="标准名称/政策名称"
width="300"
show-overflow-tooltip
align="center">
<template slot-scope="scope">
@@ -69,6 +71,7 @@
<el-table-column
prop="fileTypeShow"
label="文本状态"
width="110"
align="center">
</el-table-column>
<el-table-column
@@ -80,6 +83,7 @@
<el-table-column
prop="splitStatus"
label="拆分状态"
width="120"
align="center">
<template slot-scope="scope">
<span v-if="scope.row.splitStatus == '0'">编辑中</span>
@@ -92,6 +96,7 @@
<el-table-column
prop="creationTime"
label="拆分时间"
width="120"
sortable
align="center">
<template slot-scope="scope">
@@ -108,15 +113,21 @@
<el-tag type="danger" size="small" v-else>失败</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="50">
<el-table-column label="操作" align="center" width="80">
<template slot-scope="scope">
<el-dropdown trigger="click" @command="handleCommand">
<el-button
v-btn-permission="'17ba4598eb411d6feed468a2e446a301'"
type="primary"
size="mini"
@click="showUser(scope.row)"
>查看</el-button>
<!-- <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'17ba4598eb411d6feed468a2e446a301'">查看</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'10ba28487876990927f653a66e1eeb98'">删除</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-dropdown>-->
</template>
</el-table-column>
</el-table>
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
+1 -1
View File
@@ -127,7 +127,7 @@
</div>
</div>
<el-collapse accordion>
<el-collapse-item title="审批意见">
<el-collapse-item title="回执说明">
<div style="margin: 10px 0;">
<el-input
type="textarea"
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+3
View File
@@ -431,6 +431,9 @@ export default {
},
//流程提交
handleSubmit() {
if(this.$refs["childForm"].qbfsForm.type === undefined){
this.$refs["childForm"].qbfsForm.type = '1'
}
this.repeatName()
if(this.comFlag === '0'){
this.$message.warning('请更改企标名称')
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+5 -2
View File
@@ -185,7 +185,7 @@
show-overflow-tooltip
fixed="left"
align="center"
width="180px"
width="150px"
label="标准号">
<template slot-scope="scope">
<span @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode }}</span>
@@ -204,6 +204,7 @@
prop="issueTime"
sortable
align="center"
width="110"
label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
@@ -213,6 +214,7 @@
prop="xcxssrqgj"
sortable
align="center"
width="150"
label="新车型实施日期">
<template slot-scope="scope">
<span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
@@ -224,6 +226,7 @@
prop="zccssrqgj"
sortable
align="center"
width="150"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
@@ -232,7 +235,7 @@
<el-table-column
show-overflow-tooltip
prop="textStatus"
width="120px"
width="100px"
align="center"
label="文本状态">
<template slot-scope="scope">
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+4 -5
View File
@@ -1060,7 +1060,6 @@
@selection-change="selectConfigStandChange">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
@@ -1075,14 +1074,14 @@
<el-table-column
prop="standName"
label="标准名称"
width="200"
width="500"
align="center">
</el-table-column>
<el-table-column
prop="issueTime"
label="发布日期"
sortable="custom"
width="200"
width="120"
align="center">
<template slot-scope="scope">
{{ formatIssueDate(scope.row.issueTime) }}
@@ -1092,7 +1091,7 @@
prop="XCXSSRQ"
label="实施日期"
sortable="custom"
width="200"
width="120"
align="center">
<template slot-scope="scope">
<span>{{ formatText(scope.row.XCXSSRQ) }}</span>
@@ -1101,7 +1100,7 @@
<el-table-column
prop="textStatus"
label="文本状态"
width="200"
width="100"
align="center">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+4 -5
View File
@@ -777,32 +777,31 @@
show-overflow-tooltip
prop="lawsNumber"
label="政策编号"
width="150"
align="center"
>
</el-table-column>
<el-table-column
prop="lawsName"
label="中文名称"
width="200"
align="center">
</el-table-column>
<el-table-column
prop="lawsEnName"
label="英文名称"
width="200"
align="center">
</el-table-column>
<el-table-column
prop="issueTime"
label="发文日期"
width="180"
width="120"
sortable
align="center">
</el-table-column>
<el-table-column
prop="XCXSSRQLAWS"
label="实施日期"
width="180"
width="120"
sortable
align="center">
<template slot-scope="scope">
@@ -814,7 +813,7 @@
<el-table-column
prop="standStatusShow"
label="标准状态"
width="200"
width="100"
align="center">
</el-table-column>
</el-table>
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+4 -4
View File
@@ -1374,14 +1374,14 @@
<el-table-column
prop="standName"
label="标准名称"
width="200"
width="500"
align="center">
</el-table-column>
<el-table-column
prop="issueTime"
label="发布日期"
sortable
width="200"
width="120"
align="center">
<template slot-scope="scope">
{{ scope.row.issueTime || '' }}
@@ -1391,7 +1391,7 @@
prop="XCXSSRQ"
label="实施日期"
sortable
width="200"
width="120"
align="center">
<template slot-scope="scope">
<span>{{ formatText(scope.row.XCXSSRQ) }}</span>
@@ -1400,7 +1400,7 @@
<el-table-column
prop="textStatus"
label="文本状态"
width="200"
width="100"
align="center">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
src/pages/regulatoryRepository/standardForComments/index.vue
+3 -1
View File
@@ -69,7 +69,7 @@
<el-table-column
prop="category"
label="标准/政策"
width="180"
width="150"
align="center">
<template slot-scope="scope">
<a class="table-jump" @click.stop="handlePreview(scope.row)">{{ scope.row.category }}</a>
@@ -86,6 +86,7 @@
<el-table-column
prop="endTime"
label="征求意见周期"
width="200"
align="center">
<template slot-scope="scope">
{{ scope.row.startTime + ' ~ ' + scope.row.endTime }}
@@ -94,6 +95,7 @@
<el-table-column
prop="startTime"
label="上传时间"
width="200"
align="center">
</el-table-column>
</el-table>