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:
zhutianqi
2022-02-25 10:13:27 +08:00
parent 7532139693 ecf9512f58
commit 61d442a0ca
5 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/mechanismManage/pages/workgroup.vue
+2 -2
View File
@@ -483,11 +483,11 @@ export default {
this.roleModal2 = false this.roleModal2 = false
}, },
pageChange(page) { pageChange(page) {
this.page = page; this.workSearch.page = page
this.getWorkData() this.getWorkData()
}, },
pageSizeChange(pageSize) { pageSizeChange(pageSize) {
this.pageSize = pageSize; this.workSearch.pageSize = pageSize
this.getWorkData() this.getWorkData()
} }
} }
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+2 -2
View File
@@ -781,10 +781,10 @@ export default {
}, },
roleFormRules: { roleFormRules: {
dockUserName: [ dockUserName: [
{ required: true, message: "请选择会签责任人", trigger: "change" } {required: true, message: "请选择相关业务单位", trigger: "change"}
], ],
directorUserName: [ directorUserName: [
{ required: true, message: "请选择审批责任人", trigger: "change" } {required: true, message: "请选择标准法规部法规分析业务经理", trigger: "change"}
] ]
}, },
dataList: [],//清单里的标准数据 dataList: [],//清单里的标准数据
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+2 -2
View File
@@ -750,10 +750,10 @@ export default {
}, },
roleFormRules: { roleFormRules: {
dockUserName: [ dockUserName: [
{required: true, message: "请选择会签责任人", trigger: "change"} {required: true, message: "请选择相关业务单位", trigger: "change"}
], ],
directorUserName: [ directorUserName: [
{required: true, message: "请选择审批责任人", trigger: "change"} {required: true, message: "请选择标准法规部法规分析业务经理", trigger: "change"}
] ]
}, },
dataList: [],//清单里的标准数据 dataList: [],//清单里的标准数据
src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
-1
View File
@@ -135,7 +135,6 @@
prop="actualCloseTime" prop="actualCloseTime"
width="130" width="130"
align="center" align="center"
sortable
label="实际关闭时间"> label="实际关闭时间">
<template slot-scope="scope">{{(scope.row.actualCloseTime ? scope.row.actualCloseTime.substring(0, 11): '')}}</template> <template slot-scope="scope">{{(scope.row.actualCloseTime ? scope.row.actualCloseTime.substring(0, 11): '')}}</template>
</el-table-column> </el-table-column>
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
-1
View File
@@ -185,7 +185,6 @@
<el-table-column <el-table-column
prop="planCloseTime" prop="planCloseTime"
width="150" width="150"
sortable="custom"
label="计划关闭时间"> label="计划关闭时间">
<template slot-scope="scope"> <template slot-scope="scope">
{{ (scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11) : "") }} {{ (scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11) : "") }}