首页样式,工作组

This commit is contained in:
shenyanpei
2021-12-14 19:09:34 +08:00
parent 768a795084
commit 86b18d006e
18 changed files with 219 additions and 63 deletions
@@ -25,6 +25,7 @@
</el-table-column>
<el-table-column
prop="cid"
show-overflow-tooltip
label="标准名称/政策名称">
<template slot-scope="scope">
<span @click="standForComments(scope.row)">{{ scope.row.cid }}</span>
@@ -91,6 +92,10 @@ export default {
<style lang="less" scoped>
.solicitopinions {
/deep/.el-table__body-wrapper {
max-height: calc(65vh - 101px);
overflow-y: auto;
}
/deep/.el-table th > .cell {
font-size: 15px;
}
+3
View File
@@ -22,6 +22,9 @@
</el-tabs>
</div>
</div>
<div style="height: 20px;background-color: #fff;text-align: right;color: #4788c0">
<span style="margin-right: 10px;cursor: pointer;font-size: 12px" @click="$router.push('standardForComments')">更多 </span>
</div>
</div>
<div class="right_wrapper">
<nav-menu></nav-menu>
@@ -20,26 +20,28 @@
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:" prop="comityName">
<el-select
@change="comityChange"
v-model="rh_pageData.comityName"
placeholder="请选择标委会">
<el-option
v-for="item in comityNameOptions"
:key="item.value"
:label="item.label"
:value="item.label"/>
v-for="item in rh_pageData.comityOptionsOne"
:key="item.id"
:label="item.name"
:value="item.id"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="add-form-item" v-if="rh_pageData.comityName !== ''" prop="comityNameOne">
<el-select
@change="comityChangeOne"
v-model="rh_pageData.comityNameOne"
placeholder="请选择分标委">
<el-option
v-for="item in comityNameOptions"
:key="item.value"
:label="item.label"
:value="item.label"/>
v-for="item in rh_pageData.comityOptionsTwo"
:key="item.id"
:label="item.name"
:value="item.id"/>
</el-select>
</el-form-item>
</el-col>
@@ -49,10 +51,10 @@
v-model="rh_pageData.comityNameTwo"
placeholder="请选择工作组">
<el-option
v-for="item in comityNameOptions"
:key="item.value"
:label="item.label"
:value="item.label"/>
v-for="item in rh_pageData.comityOptionsTree"
:key="item.id"
:label="item.name"
:value="item.id"/>
</el-select>
</el-form-item>
</el-col>
@@ -390,7 +392,11 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {startProcess, saveTaskFirst, completeTask, queryTaskFirst, taskDel} from '@/api/process.js'
import {
startProcess, saveTaskFirst,
completeTask, queryTaskFirst,
taskDel, workGroup
} from '@/api/process.js'
export default {
components: {
@@ -429,11 +435,10 @@ export default {
fillLeader: '',
fillLeaderId: '',
fillFile: [],
comityOptionsOne: [],
comityOptionsTwo: [],
comityOptionsTree: [],
},
comityNameOptions: [
{value: '0', label: '国内法规入库流程'},
{value: '1', label: '标准法规技术评估流程'},
],
comityRoleOptions: [
{value: '0', label: '委员'},
{value: '1', label: '观察委员'},
@@ -474,11 +479,7 @@ export default {
engineerUserId: '',
},
rh_rules: {
comityName: [{required: true, message: "请选择协会名称", trigger: ['blur', 'change']}],
comityNameOne: [{required: true, message: "请选择分标委", trigger: ['blur', 'change']}],
comityNameTwo: [{required: true, message: "请选择工作组", trigger: ['blur', 'change']}]
},
rh_rules: {},
roleFormRules: {
dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}],
startUserName: [{required: true, message: "请选择标准法规部人员", trigger: ['blur', 'change']}],
@@ -503,13 +504,37 @@ export default {
if (this.bpnId !== undefined) {
this.getData()
}
let type = {
type: 0
}
workGroup(type).then(res => {
this.rh_pageData.comityOptionsOne = res.data.children
})
},
methods: {
// 右上标签页面切换
handleTabs(name) {
this.active = name
},
/** 获取分标委数据字典数据 */
comityChange() {
this.rh_pageData.comityNameOne = ''
this.rh_pageData.comityNameTwo = ''
this.rh_pageData.comityOptionsOne.forEach(item => {
if (item.children !== null && item.id === this.rh_pageData.comityName) {
this.rh_pageData.comityOptionsTwo = item.children
}
})
},
/** 获取工作组字典数据 */
comityChangeOne() {
this.rh_pageData.comityNameTwo = ''
this.rh_pageData.comityOptionsTwo.forEach(item => {
if (item.children !== null && item.id === this.rh_pageData.comityNameOne) {
this.rh_pageData.comityOptionsTree = item.children
}
})
},
getData() {
queryTaskFirst({
bpnId: this.$route.query.bpnId
@@ -733,7 +758,7 @@ export default {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
taskDel(taskId).then(res => {
return res
})
}
@@ -18,7 +18,12 @@
<el-row>
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ rh_pageData.comityName || '-' }}
<span
v-for="item in rh_pageData.comityOptionsOne"
:key="item.id"
v-if="item.id === rh_pageData.comityName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -18,7 +18,12 @@
<el-row>
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ rh_pageData.comityName || '-' }}
<span
v-for="item in rh_pageData.comityOptionsOne"
:key="item.id"
v-if="item.id === rh_pageData.comityName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -18,7 +18,12 @@
<el-row>
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ rh_pageData.comityName || '-' }}
<span
v-for="item in rh_pageData.comityOptionsOne"
:key="item.id"
v-if="item.id === rh_pageData.comityName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -18,7 +18,12 @@
<el-row>
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ rh_pageData.comityName || '-' }}
<span
v-for="item in rh_pageData.comityOptionsOne"
:key="item.id"
v-if="item.id === rh_pageData.comityName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -18,7 +18,12 @@
<el-row>
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ rh_pageData.comityName || '-' }}
<span
v-for="item in rh_pageData.comityOptionsOne"
:key="item.id"
v-if="item.id === rh_pageData.comityName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -21,7 +21,12 @@
<el-row>
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ rh_pageData.comityName || '-' }}
<span
v-for="item in rh_pageData.comityOptionsOne"
:key="item.id"
v-if="item.id === rh_pageData.comityName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -18,17 +18,32 @@
<el-row>
<el-col :span="8">
<el-form-item class="add-form-item" label="标委会:">
{{ hh_pageData.associaName || '-' }}
<span
v-for="item in hh_pageData.associaOptionsOne"
:key="item.id"
v-if="item.id === hh_pageData.associaName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="add-form-item" label="分标委:">
{{ hh_pageData.associaNameOne || '-' }}
<span
v-for="item in hh_pageData.associaOptionsTwo"
:key="item.id"
v-if="item.id === hh_pageData.associaNameOne">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="add-form-item" label="工作组:">
{{ hh_pageData.associaNameTwo || '-' }}
<span
v-for="item in hh_pageData.associaOptionsTree"
:key="item.id"
v-if="item.id === hh_pageData.associaNameTwo">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
</el-row>
@@ -310,6 +325,9 @@ export default {
this.hh_pageData.associaName = formList.associaName
this.hh_pageData.associaNameOne = formList.associaNameOne
this.hh_pageData.associaNameTwo = formList.associaNameTwo
this.hh_pageData.associaOptionsOne = formList.associaOptionsOne
this.hh_pageData.associaOptionsTwo = formList.associaOptionsTwo
this.hh_pageData.associaOptionsTree = formList.associaOptionsTree
this.hh_pageData.meetingStartTime = formList.meetingStartTime
this.hh_pageData.meetingName = formList.meetingName
this.hh_pageData.themeTable = formList.meetingTable
@@ -18,17 +18,32 @@
<el-row>
<el-col :span="8">
<el-form-item class="add-form-item" label="标委会:">
{{ hh_pageData.associaName || '-' }}
<span
v-for="item in hh_pageData.associaOptionsOne"
:key="item.id"
v-if="item.id === hh_pageData.associaName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="add-form-item" label="分标委:">
{{ hh_pageData.associaNameOne || '-' }}
<span
v-for="item in hh_pageData.associaOptionsTwo"
:key="item.id"
v-if="item.id === hh_pageData.associaNameOne">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="add-form-item" label="工作组:">
{{ hh_pageData.associaNameTwo || '-' }}
<span
v-for="item in hh_pageData.associaOptionsTree"
:key="item.id"
v-if="item.id === hh_pageData.associaNameTwo">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
</el-row>
@@ -34,26 +34,28 @@
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
<el-select
@change="comityChange"
v-model="ch_pageData.associaName"
placeholder="请选择标委会">
<el-option
v-for="item in associaNameOptions"
:key="item.value"
:label="item.label"
:value="item.label"/>
v-for="item in ch_pageData.associaOptionsOne"
:key="item.id"
:label="item.name"
:value="item.id"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ch_pageData.associaName !== ''">
<el-form-item class="add-form-item">
<el-select
@change="comityChangeOne"
v-model="ch_pageData.associaNameOne"
placeholder="请选择分标委">
<el-option
v-for="item in associaNameOptions"
:key="item.value"
:label="item.label"
:value="item.label"/>
v-for="item in ch_pageData.associaOptionsTwo"
:key="item.id"
:label="item.name"
:value="item.id"/>
</el-select>
</el-form-item>
</el-col>
@@ -63,10 +65,10 @@
v-model="ch_pageData.associaNameTwo"
placeholder="请选择工作组">
<el-option
v-for="item in associaNameOptions"
:key="item.value"
:label="item.label"
:value="item.label"/>
v-for="item in ch_pageData.associaOptionsTree"
:key="item.id"
:label="item.name"
:value="item.id"/>
</el-select>
</el-form-item>
</el-col>
@@ -76,7 +78,7 @@
<el-form-item class="add-form-item" label="会议时间:">
<el-date-picker
v-model="ch_pageData.meetingStartTime"
type="datetime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间"
align="right">
@@ -144,7 +146,7 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-form-item label-width="0" prop="meetingTable">
<div class="table_btn">
<el-button type="primary" size="small" @click="meeting_add">添加</el-button>
<el-button type="danger" size="small" @click="meeting_delete">批量删除</el-button>
@@ -333,7 +335,10 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {startProcess, queryTaskFirst, saveTaskFirst, completeTask,taskDel} from '@/api/process.js'
import {
startProcess, queryTaskFirst,
saveTaskFirst, completeTask,
taskDel, workGroup} from '@/api/process.js'
export default {
components: {
@@ -369,12 +374,11 @@ export default {
fillMail: '',
fillLeader: '',
fillFile: '',
associaOptionsOne: [],
associaOptionsTwo: [],
associaOptionsTree: []
},
associaNameOptions: [
{value: '0', label: '国内法规入库流程'},
{value: '1', label: '标准法规技术评估流程'},
],
feeKindOptions: [
{value: '0', label: '列支1'},
{value: '1', label: '列支2'},
@@ -426,12 +430,37 @@ export default {
if (this.bpnId !== undefined) {
this.getData()
}
let type = {
type: 0
}
workGroup(type).then(res => {
this.ch_pageData.associaOptionsOne = res.data.children
})
},
methods: {
// 右上标签页面切换
handleTabs(name) {
this.active = name
},
/** 获取分标委数据字典数据 */
comityChange() {
this.ch_pageData.associaNameOne = ''
this.ch_pageData.associaNameTwo = ''
this.ch_pageData.associaOptionsOne.forEach(item => {
if (item.children !== null && item.id === this.ch_pageData.associaName) {
this.ch_pageData.associaOptionsTwo = item.children
}
})
},
/** 获取工作组字典数据 */
comityChangeOne() {
this.ch_pageData.associaNameTwo = ''
this.ch_pageData.associaOptionsTwo.forEach(item => {
if (item.children !== null && item.id === this.ch_pageData.associaNameOne) {
this.ch_pageData.associaOptionsTree = item.children
}
})
},
getData() {
queryTaskFirst({
bpnId: this.$route.query.bpnId
@@ -656,6 +685,7 @@ export default {
})
} else {
this.$message.warning('请完成流程信息的人员选择')
this.isSubmit = false
}
})
}
@@ -30,7 +30,12 @@
<el-row :gutter="24">
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ ch_pageData.associaName || '-' }}
<span
v-for="item in ch_pageData.associaOptionsOne"
:key="item.id"
v-if="item.id === ch_pageData.associaName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -79,7 +84,7 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item class="add-form-item">
<el-form-item class="add-form-item" label-width="0">
<el-table
class="meeting_table"
:data="ch_pageData.meetingTable"
@@ -30,7 +30,12 @@
<el-row :gutter="24">
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ ch_pageData.associaName || '-' }}
<span
v-for="item in ch_pageData.associaOptionsOne"
:key="item.id"
v-if="item.id === ch_pageData.associaName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -79,7 +84,7 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item class="add-form-item">
<el-form-item class="add-form-item" label-width="0">
<el-table
class="meeting_table"
:data="ch_pageData.meetingTable"
@@ -30,7 +30,12 @@
<el-row :gutter="24">
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ ch_pageData.associaName || '-' }}
<span
v-for="item in ch_pageData.associaOptionsOne"
:key="item.id"
v-if="item.id === ch_pageData.associaName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -30,7 +30,12 @@
<el-row :gutter="24">
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ ch_pageData.associaName || '-' }}
<span
v-for="item in ch_pageData.associaOptionsOne"
:key="item.id"
v-if="item.id === ch_pageData.associaName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -30,7 +30,12 @@
<el-row :gutter="24">
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ ch_pageData.associaName || '-' }}
<span
v-for="item in ch_pageData.associaOptionsOne"
:key="item.id"
v-if="item.id === ch_pageData.associaName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -33,7 +33,12 @@
<el-row :gutter="24">
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ ch_pageData.associaName || '-' }}
<span
v-for="item in ch_pageData.associaOptionsOne"
:key="item.id"
v-if="item.id === ch_pageData.associaName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">