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-24 10:43:53 +08:00
parent d514de5b34 64f0385896
commit 5847428974
9 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standCalendar/index.vue
-1
View File
@@ -520,7 +520,6 @@ export default {
localStorage.setItem('objs', JSON.stringify(item)) localStorage.setItem('objs', JSON.stringify(item))
this.fileListData = item this.fileListData = item
this.reData = item.files this.reData = item.files
console.log(item)
this.editMeetForm = item this.editMeetForm = item
this.editMeetForm.contents = [] this.editMeetForm.contents = []
if (this.editMeetForm.content !== '') { if (this.editMeetForm.content !== '') {
src/pages/processCenter/pages/components/ProcessHeaderPhone.vue
+11 -5
View File
@@ -2,9 +2,9 @@
<template> <template>
<div class="prc-header-wrap"> <div class="prc-header-wrap">
<div class="process-header"> <div class="process-header">
<span class="process-title"> <span class="process-title van-ellipsis" :title="proName + '(' + proNode + ')'">
<slot name="proName"></slot> <span>{{ proName }}</span>
<a>(<slot name="proNode"></slot>)</a> <span class="smallText">( {{ proNode }})</span>
</span> </span>
</div> </div>
<el-divider></el-divider> <el-divider></el-divider>
@@ -27,7 +27,9 @@
return { return {
activeName: '', activeName: '',
opacityStyle: {}, opacityStyle: {},
headerFixed: false headerFixed: false,
proName: '',
proNode: '',
} }
}, },
methods: { methods: {
@@ -53,6 +55,8 @@
}, },
watch: {}, watch: {},
mounted () { mounted () {
this.proName = this.$slots.proName[0].text
this.proNode = this.$slots.proNode[0].text
} }
} }
</script> </script>
@@ -65,15 +69,17 @@
.process-header { .process-header {
position: relative; position: relative;
padding-top: 10px; padding-top: 10px;
width: 100%;
} }
.process-title { .process-title {
width: 100%;
margin-left: 10px; margin-left: 10px;
font-size: 18px; font-size: 18px;
font-weight: bold; font-weight: bold;
display: inline-block; display: inline-block;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
a { .smallText {
font-size: 14px; font-size: 14px;
margin-left: 5px; margin-left: 5px;
cursor: default; cursor: default;
src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
+2 -4
View File
@@ -361,10 +361,8 @@
this.form.title = data.title || data.form.title this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date this.form.date = data.date || data.form.date
this.json = data || data.form this.json = data || data.form
// this.form.model = data.model || data.form.model this.form.responUserList = data.form? data.form.responUserList : ''
// this.form.modelName = data.modelName || data.form.modelName this.form.responUserListName = data.form? data.form.responUserListName : ''
this.form.responUserList = data.form.responUserList
this.form.responUserListName = data.form.responUserListName
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+6
View File
@@ -20,6 +20,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:" prop="comityName"> <el-form-item class="add-form-item" label="协会名称:" prop="comityName">
<el-select <el-select
clearable
@change="comityChange" @change="comityChange"
v-model="rh_pageData.comityName" v-model="rh_pageData.comityName"
placeholder="请选择标委会"> placeholder="请选择标委会">
@@ -34,6 +35,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item class="add-form-item" v-if="rh_pageData.comityName !== ''" prop="comityNameOne"> <el-form-item class="add-form-item" v-if="rh_pageData.comityName !== ''" prop="comityNameOne">
<el-select <el-select
clearable
@change="comityChangeOne" @change="comityChangeOne"
v-model="rh_pageData.comityNameOne" v-model="rh_pageData.comityNameOne"
placeholder="请选择分标委"> placeholder="请选择分标委">
@@ -48,6 +50,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item class="add-form-item" prop="comityNameTwo" v-if="rh_pageData.comityName !== '' && rh_pageData.comityNameOne !== ''"> <el-form-item class="add-form-item" prop="comityNameTwo" v-if="rh_pageData.comityName !== '' && rh_pageData.comityNameOne !== ''">
<el-select <el-select
clearable
v-model="rh_pageData.comityNameTwo" v-model="rh_pageData.comityNameTwo"
placeholder="请选择工作组"> placeholder="请选择工作组">
<el-option <el-option
@@ -63,6 +66,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item class="add-form-item" label="会员角色:" prop="comityRole"> <el-form-item class="add-form-item" label="会员角色:" prop="comityRole">
<el-select <el-select
clearable
v-model="rh_pageData.comityRole" v-model="rh_pageData.comityRole"
placeholder="请选择会员角色"> placeholder="请选择会员角色">
<el-option <el-option
@@ -76,6 +80,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item class="add-form-item" label="协会状态:" prop="comityState"> <el-form-item class="add-form-item" label="协会状态:" prop="comityState">
<el-select <el-select
clearable
v-model="rh_pageData.comityState" v-model="rh_pageData.comityState"
placeholder="选择协会状态"> placeholder="选择协会状态">
<el-option <el-option
@@ -89,6 +94,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item class="add-form-item" label="入会性质:" prop="comityKind"> <el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
<el-select <el-select
clearable
v-model="rh_pageData.comityKind" v-model="rh_pageData.comityKind"
placeholder="请选择入会性质"> placeholder="请选择入会性质">
<el-option <el-option
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+3
View File
@@ -34,6 +34,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:"> <el-form-item class="add-form-item" label="协会名称:">
<el-select <el-select
clearable
@change="comityChange" @change="comityChange"
v-model="ch_pageData.associaName" v-model="ch_pageData.associaName"
placeholder="请选择标委会"> placeholder="请选择标委会">
@@ -48,6 +49,7 @@
<el-col :span="8" v-if="ch_pageData.associaName !== ''"> <el-col :span="8" v-if="ch_pageData.associaName !== ''">
<el-form-item class="add-form-item"> <el-form-item class="add-form-item">
<el-select <el-select
clearable
@change="comityChangeOne" @change="comityChangeOne"
v-model="ch_pageData.associaNameOne" v-model="ch_pageData.associaNameOne"
placeholder="请选择分标委"> placeholder="请选择分标委">
@@ -62,6 +64,7 @@
<el-col :span="8" v-if="ch_pageData.associaName !== '' && ch_pageData.associaNameOne !== ''"> <el-col :span="8" v-if="ch_pageData.associaName !== '' && ch_pageData.associaNameOne !== ''">
<el-form-item class="add-form-item"> <el-form-item class="add-form-item">
<el-select <el-select
clearable
v-model="ch_pageData.associaNameTwo" v-model="ch_pageData.associaNameTwo"
placeholder="请选择工作组"> placeholder="请选择工作组">
<el-option <el-option
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+3 -3
View File
@@ -404,9 +404,9 @@ export default {
cname: [ cname: [
{required: true, message: '请输入标准名称', trigger: 'change'}, {required: true, message: '请输入标准名称', trigger: 'change'},
], ],
// fjListId: [ fjListId: [
// {required: true, message: '请选择附件', trigger: 'change'}, {required: true, message: '请选择附件', trigger: 'change'},
// ] ]
}, },
// 标准征求意见数据可库 // 标准征求意见数据可库
standCommonlySearch: { standCommonlySearch: {
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+3 -3
View File
@@ -412,9 +412,9 @@ export default {
endTime: [ endTime: [
{required: true, message: '请输入标准结束日期', trigger: 'change'}, {required: true, message: '请输入标准结束日期', trigger: 'change'},
], ],
// fjListId: [ fjListId: [
// {required: true, message: '请选择附件', trigger: 'change'}, {required: true, message: '请选择附件', trigger: 'change'},
// ] ]
}, },
// 标准征求意见数据可库 // 标准征求意见数据可库
standCommonlySearch: { standCommonlySearch: {
src/pages/processCenter/pages/phone/bzdy/step2.vue
+2 -4
View File
@@ -307,10 +307,8 @@
this.form.title = data.title || data.form.title this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date this.form.date = data.date || data.form.date
this.json = data || data.form this.json = data || data.form
// this.form.model = data.model || data.form.model this.form.responUserList = data.form? data.form.responUserList : ''
// this.form.modelName = data.modelName || data.form.modelName this.form.responUserListName = data.form? data.form.responUserListName : ''
this.form.responUserList = data.form.responUserList
this.form.responUserListName = data.form.responUserListName
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+1 -1
View File
@@ -492,7 +492,7 @@ export default {
case '2': case '2':
if (row.taskInfo === '责任对接人选择责任人') { if (row.taskInfo === '责任对接人选择责任人') {
this.$router.push({ this.$router.push({
name: 'phoneBzdyStep2', name: 'bzdyStep2',
query: { query: {
taskIds: row.taskIds, taskIds: row.taskIds,
prcId: row.prcId, prcId: row.prcId,