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
2021-12-25 16:08:20 +08:00
parent 32cac7e9c1 f6ed37a692
commit 66abb2e778
9 changed files with 1157 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+6 -6
View File
@@ -344,10 +344,10 @@
<el-timeline-item timestamp="审定" placement="top" :color="roleForm.engineerUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="engineerUser" style="margin-bottom: 0">
<h4>技术委员会常务副主任/总院院长</h4>
<h4>业务主管副院长 </h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.engineerUserId" style="display: none;"></el-input>
<el-input v-model="roleForm.engineerUser" placeholder="选择技术委员会常务副主任/总院院长" @click.native="choiceZRROne('engineerUser', '选择人员', roleForm.engineerUser)">
<el-input v-model="roleForm.engineerUser" placeholder="选择业务主管副院长 " @click.native="choiceZRROne('engineerUser', '选择业务主管副院长 ', roleForm.engineerUser)">
</el-input>
</div>
</el-form-item>
@@ -356,10 +356,10 @@
<el-timeline-item timestamp="批准" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="directorUserName" style="margin-bottom: 0">
<h4>总院技术委员会主任</h4>
<h4>院长</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.directorUserId" style="display: none;"></el-input>
<el-input v-model="roleForm.directorUserName" placeholder="选择总院技术委员会主任" @click.native="choiceZRROne('directorUserId', '选择人员', roleForm.directorUserName)">
<el-input v-model="roleForm.directorUserName" placeholder="选择院长" @click.native="choiceZRROne('directorUserId', '选择院长', roleForm.directorUserName)">
</el-input>
</div>
</el-form-item>
@@ -526,8 +526,8 @@ export default {
startUserName: [{required: true, message: "请选择标准法规部人员", trigger: ['blur', 'change']}],
leaderUser: [{required: true, message: "请选择标准法规部主管领导", trigger: ['blur', 'change']}],
feeUser: [{required: true, message: "请选择费用管理部门人员", trigger: ['blur', 'change']}],
engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}],
directorUserName: [{required: true, message: "请选择总院技术委员会主任", trigger: ['blur', 'change']}],
engineerUser: [{required: true, message: "请选择业务主管副院长 ", trigger: ['blur', 'change']}],
directorUserName: [{required: true, message: "请选择院长", trigger: ['blur', 'change']}],
},
roleShowflag: false,
roleShowflagOne: false,
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+20 -14
View File
@@ -18,21 +18,21 @@
<el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="150px">
<el-row :gutter="24">
<el-col :span="8">
<el-form-item class="add-form-item" label="会议名称:">
<el-form-item class="add-form-item" label="会议名称:" prop="meetingName">
<el-input
v-model="ch_pageData.meetingName"
placeholder="请填写"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="add-form-item" label="主办单位:">
<el-form-item class="add-form-item" label="主办单位:" prop="primaryUnit">
<el-input v-model="ch_pageData.primaryUnit" placeholder="请填写"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
<el-form-item class="add-form-item" label="协会名称:" prop="associaName">
<el-select
clearable
@change="comityChange"
@@ -78,7 +78,7 @@
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item class="add-form-item" label="会议时间:">
<el-form-item class="add-form-item" label="会议时间:" prop="meetingStartTime">
<el-date-picker
v-model="ch_pageData.meetingStartTime"
type="datetime"
@@ -89,7 +89,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="add-form-item" label="会议地点:">
<el-form-item class="add-form-item" label="会议地点:" prop="meetingPlace">
<el-input v-model="ch_pageData.meetingPlace" placeholder="请填写"/>
</el-form-item>
</el-col>
@@ -263,7 +263,7 @@
<el-timeline-item timestamp="会签" placement="top" :color="roleForm.feeUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="feeUser" style="margin-bottom: 0">
<h4>管理推荐部</h4>
<h4>管理推进部</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.feeUserId" style="display: none;"></el-input>
<el-input v-model="roleForm.feeUser" placeholder="选择费用管理部门" @click.native="choiceZRR('feeUser', '选择费用管理部门', roleForm.feeUser)">
@@ -275,10 +275,10 @@
<el-timeline-item timestamp="审定" placement="top" :color="roleForm.engineerUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="engineerUser" style="margin-bottom: 0">
<h4>技术委员会常务副主任/总院院长</h4>
<h4>业务主管副院长</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.engineerUserId" style="display: none;"></el-input>
<el-input v-model="roleForm.engineerUser" placeholder="选择人员" @click.native="choiceZRROne('engineerUser', '选择人员', roleForm.engineerUser)">
<el-input v-model="roleForm.engineerUser" placeholder="选择业务主管副院长" @click.native="choiceZRROne('engineerUser', '选择业务主管副院长', roleForm.engineerUser)">
</el-input>
</div>
</el-form-item>
@@ -287,10 +287,10 @@
<el-timeline-item timestamp="批准" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="directorUserName" style="margin-bottom: 0">
<h4>技术委员会主任</h4>
<h4>院长</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.directorUserId" style="display: none;"></el-input>
<el-input v-model="roleForm.directorUserName" placeholder="选择技术委员会主任" @click.native="choiceZRROne('directorUser', '选择人员技术委员会主任', roleForm.directorUserName)">
<el-input v-model="roleForm.directorUserName" placeholder="选择院长" @click.native="choiceZRROne('directorUser', '选择院长', roleForm.directorUserName)">
</el-input>
</div>
</el-form-item>
@@ -414,7 +414,13 @@ export default {
// 上传所储存文件数组
newDataList: [],
ch_rules: {},
ch_rules: {
meetingName: [{required: true, message: '请输入会议名称', trigger: 'change'}],
primaryUnit: [{required: true, message: '请输入主办单位', trigger: 'change'}],
associaName: [{required: true, message: '请选择协会名称', trigger: 'change'}],
meetingStartTime: [{required: true, message: '请选择会议时间', trigger: 'change'}],
meetingPlace: [{required: true, message: '请输入会议地点', trigger: 'change'}]
},
roleForm: {
startUserName: this.$store.getters.userInfo.userName,
startUser: this.$store.getters.userInfo.userId,
@@ -433,9 +439,9 @@ export default {
dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}],
startUserName: [{required: true, message: "请选择标准法规部人员", trigger: ['blur', 'change']}],
leaderUser: [{required: true, message: "请选择标准法规部主管中心主任", trigger: ['blur', 'change']}],
feeUser: [{required: true, message: "请选择管理推荐部", trigger: ['blur', 'change']}],
engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}],
directorUserName: [{required: true, message: "请选择技术委员会主任", trigger: ['blur', 'change']}],
feeUser: [{required: true, message: "请选择管理推进部", trigger: ['blur', 'change']}],
engineerUser: [{required: true, message: "请选择业务主管副院长 ", trigger: ['blur', 'change']}],
directorUserName: [{required: true, message: "请选择院长", trigger: ['blur', 'change']}],
},
deleteDataList: [],
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
-1
View File
@@ -282,7 +282,6 @@ export default {
this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
}
this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList
this.commentText = JSON.parse(JSON.stringify(item)).commentText
})
},
// 批量选择分发责任人
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+1
View File
@@ -411,6 +411,7 @@ export default {
let json = {
passInfo: this.passInfo,
responUserList: list,
commentText: this.commentText,
actionFlag: 0
}
if(flag)return;
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+2 -1
View File
@@ -473,7 +473,8 @@ export default {
let fileDataList = this.dataList
let json = {
info: { fileDataList },
username: this.$store.getters.userInfo.userName
username: this.$store.getters.userInfo.userName,
commentText: this.commentText,
}
const params = new FormData();
params.set('json', JSON.stringify(json))
src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+1 -1
View File
@@ -50,7 +50,7 @@
</el-table>
</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/phone/bzrk/step2.vue
+1111
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup.vue
+6 -1
View File
@@ -122,7 +122,12 @@ export default {
},
watch: {
value (val) {
this.tagList = val !== '' && val !== null ? val.split(',') : []
if(val !== '' && val !== null) {
this.tagList = []
} else {
this.tagList = val.split(',')
}
// this.tagList = val !== '' && val !== null ? val.split(',') : []
},
tagList: {
handler (val) {
src/router/index.js
+10
View File
@@ -2559,6 +2559,16 @@ const routes = [
title: '政策征求意见流程'
}
},
{
path: '/phoneBzrkStep2',
name: 'phoneBzrkStep2',
component: () => import('@/pages/processCenter/pages/phone/bzrk/step2.vue'),
meta: {
isBoolean: true,
requireAuth: true,
title: '标准入库流程'
}
},
]
},