Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yanyizhou
2021-11-10 17:00:56 +08:00
@@ -26,7 +26,7 @@
size="mini"
class="common-button-primary"
v-if="editButton"
@click="">
@click="editItem">
编辑
</el-button>
<el-button
@@ -34,7 +34,7 @@
size="mini"
class="common-button-primary"
v-if="seeButton"
@click="">
@click="seeItem">
查看
</el-button>
<el-button
@@ -50,7 +50,7 @@
size="mini"
class="common-button-default"
v-if="delectButton"
@click="">
@click="delItem">
删除
</el-button>
</div>
@@ -62,7 +62,7 @@
:title="addDrawerTitle"
:visible.sync="addDrawer"
:before-close="addDrawerClose">
<div class="demo-drawer-content">
<div class="demo-drawer-content" v-if="addDrawer">
<div class="content">
<div class="standard-table-search">
<el-row :gutter="24">
@@ -80,40 +80,46 @@
disabled
:maxlength="100"/>
</el-form-item>
<el-form-item label="编号" style="width: 100%; margin-right:10px" prop="number" class="add-form-item">
<el-form-item label="编号" style="width: 100%; margin-right:10px" prop="number" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
v-model="addForm.number"
placeholder="请输入编号"
:disabled="DrawerType === 'see'"
:maxlength="100"/>
</el-form-item>
<el-form-item label="名称" style="width: 100%; margin-right:10px" prop="name" class="add-form-item">
<el-form-item label="名称" style="width: 100%; margin-right:10px" prop="name" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
v-model="addForm.name"
:disabled="DrawerType === 'see'"
placeholder="请输入名称"
:maxlength="100"/>
</el-form-item>
<el-form-item label="换届时间" style="width: 100%; margin-right:10px" prop="hjTime" class="add-form-item">
<el-form-item label="换届时间" style="width: 100%; margin-right:10px" prop="changeTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-date-picker
v-model="addForm.hjTime"
v-model="addForm.changeTime"
:disabled="DrawerType === 'see'"
value-format="yyyy-MM-dd HH:mm:ss"
type="date"
placeholder="请选择换届时间">
</el-date-picker>
</el-form-item>
<el-form-item label="标准化工作领域" style="width: 100%; margin-right:10px" prop="field" class="add-form-item">
<el-form-item label="标准化工作领域" style="width: 100%; margin-right:10px" prop="standerArea" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
v-model="addForm.field"
v-model="addForm.standerArea"
:disabled="DrawerType === 'see'"
placeholder="请输入标准化工作领域"
:maxlength="100"/>
</el-form-item>
<el-form-item label="备注" style="width: 100%; margin-right:10px" prop="mark" class="add-form-item">
<el-form-item label="备注" style="width: 100%; margin-right:10px" prop="mark" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
v-model="addForm.mark"
:disabled="DrawerType === 'see'"
placeholder="请输入备注"
:maxlength="100"/>
</el-form-item>
<div class="formTitle">
<div class="left">秘书处联系方式</div>
<div class="right">
<div class="right" v-if="DrawerType !== 'see'">
<el-button
type="primary"
size="mini"
@@ -141,7 +147,7 @@
type="selection"
align="center"
width="55"
v-if="addForm.wgNetInfos.length">
v-if="addForm.wgNetInfos.length && DrawerType !== 'see'">
</el-table-column>
<el-table-column
label="联络人"
@@ -150,7 +156,7 @@
width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.netId" style="display: none;"></el-input>
<el-input style="margin: 10px 0;" @click.native="checkRole('选择联络人', scope.$index, scope.row.netId)" v-model="scope.row.name"></el-input>
<el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" @click.native="checkRole('选择联络人', scope.$index, scope.row.netId)" v-model="scope.row.name"></el-input>
</template>
</el-table-column>
<el-table-column
@@ -182,7 +188,7 @@
</el-table>
<div class="formTitle">
<div class="left">集团参与情况</div>
<div class="right">
<div class="right" v-if="DrawerType !== 'see'">
<el-button
type="primary"
size="mini"
@@ -194,7 +200,7 @@
type="danger"
size="mini"
class="common-button-primary"
v-if="addForm.wgNetInfos.length"
v-if="addForm.wgDepts.length"
@click="delCyItem">
删除
</el-button>
@@ -210,7 +216,7 @@
type="selection"
align="center"
width="55"
v-if="addForm.wgDepts.length">
v-if="addForm.wgDepts.length && DrawerType !== 'see'">
</el-table-column>
<el-table-column
label="我司在工作组排名顺序"
@@ -218,7 +224,7 @@
align="center"
width="150">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.deptOrder"></el-input>
<el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.deptOrder"></el-input>
</template>
</el-table-column>
<el-table-column
@@ -228,7 +234,8 @@
width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.deptPeopleId" style="display: none;"></el-input>
<el-input style="margin: 10px 0;" @click.native="checkRole('选择我司人员', scope.$index, scope.row.deptPeopleId)" v-model="scope.row.name"></el-input>
<el-input v-if="DrawerType === 'see'" :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.name"></el-input>
<el-input v-else style="margin: 10px 0;" @click.native="checkRole('选择我司人员', scope.$index, scope.row.deptPeopleId)" v-model="scope.row.name"></el-input>
</template>
</el-table-column>
<el-table-column
@@ -273,7 +280,7 @@
align="center"
width="200">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.identity"></el-input>
<el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.identity"></el-input>
</template>
</el-table-column>
<el-table-column
@@ -282,7 +289,15 @@
width="250"
align="center">
<template slot-scope="scope">
<div v-if="scope.row.joinfile.length > 0" class="fileClass">
<div v-if="DrawerType === 'see'" class="fileClass">
<div v-if="scope.row.joinfile.length > 0" v-for="(item, index) in scope.row.joinfile" :key="index" @click="updateFile(scope.row)" style="margin-right: 5px;">
{{ item.name }}
</div>
<div v-else>
- -
</div>
</div>
<div v-else-if="scope.row.joinfile.length > 0" class="fileClass">
<div v-for="(item, index) in scope.row.joinfile" :key="index" @click="fileUpload('集团参与情况', scope.$index)" style="margin-right: 5px;">
{{ item.name }}
</div>
@@ -301,7 +316,7 @@
</el-table>
<div class="formTitle">
<div class="left">支付信息</div>
<div class="right">
<div class="right" v-if="DrawerType !== 'see'">
<el-button
type="primary"
size="mini"
@@ -329,7 +344,7 @@
type="selection"
align="center"
width="55"
v-if="addForm.wgPayInfos.length">
v-if="addForm.wgPayInfos.length && DrawerType !== 'see'">
</el-table-column>
<el-table-column
label="费用"
@@ -337,7 +352,7 @@
align="center"
width="150">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.price"></el-input>
<el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.price"></el-input>
</template>
</el-table-column>
<el-table-column
@@ -347,6 +362,7 @@
width="250">
<template slot-scope="scope">
<el-date-picker
:disabled="DrawerType === 'see'"
v-model="scope.row.year"
value-format="yyyy"
type="year"
@@ -360,7 +376,7 @@
width="150"
align="center">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.status"></el-input>
<el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.status"></el-input>
</template>
</el-table-column>
<el-table-column
@@ -369,7 +385,7 @@
prop="inplan"
align="center">
<template slot-scope="scope">
<el-select v-model="scope.row.inplan" placeholder="请选择">
<el-select :disabled="DrawerType === 'see'" v-model="scope.row.inplan" placeholder="请选择">
<el-option label="计划内" value="0"></el-option>
<el-option label="计划外" value="1"></el-option>
</el-select>
@@ -381,7 +397,7 @@
align="center"
width="150">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.payWay"></el-input>
<el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.payWay"></el-input>
</template>
</el-table-column>
<el-table-column
@@ -390,7 +406,7 @@
align="center"
width="200">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.payInfo"></el-input>
<el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.payInfo"></el-input>
</template>
</el-table-column>
<el-table-column
@@ -399,7 +415,15 @@
width="250"
align="center">
<template slot-scope="scope">
<div v-if="scope.row.joinfile.length > 0" class="fileClass">
<div v-if="DrawerType === 'see'" class="fileClass">
<div v-if="scope.row.joinfile.length > 0" v-for="(item, index) in scope.row.joinfile" :key="index" @click="updateFile(scope.row)" style="margin-right: 5px;">
{{ item.name }}
</div>
<div v-else>
- -
</div>
</div>
<div v-else-if="scope.row.joinfile.length > 0" class="fileClass">
<div v-for="(item, index) in scope.row.joinfile" :key="index" @click="fileUpload('支付信息', scope.$index)" style="margin-right: 5px;">
{{ item.name }}
</div>
@@ -418,7 +442,7 @@
</el-table>
<div class="formTitle">
<div class="left">参会记录</div>
<div class="right">
<div class="right" v-if="DrawerType !== 'see'">
<el-button
type="primary"
size="mini"
@@ -446,7 +470,7 @@
type="selection"
align="center"
width="55"
v-if="addForm.wgMeetingInfos.length">
v-if="addForm.wgMeetingInfos.length && DrawerType !== 'see'">
</el-table-column>
<el-table-column
label="参会日期"
@@ -458,6 +482,7 @@
v-model="scope.row.meetingTime"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetime"
:disabled="DrawerType === 'see'"
placeholder="请选择参会日期">
</el-date-picker>
</template>
@@ -468,7 +493,7 @@
align="center"
width="200">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.meetingName"></el-input>
<el-input style="margin: 10px 0;" :disabled="DrawerType === 'see'" v-model="scope.row.meetingName"></el-input>
</template>
</el-table-column>
<el-table-column
@@ -478,7 +503,8 @@
width="200">
<template slot-scope="scope">
<!-- <el-input v-model="scope.row.meetingPeople" style="display: none;"></el-input>-->
<el-input style="margin: 10px 0;" @click.native="checkRoles(scope.$index, scope.row.meetingPeople)" v-model="scope.row.meetingPeopleName"></el-input>
<el-input v-if="DrawerType === 'see'" :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.meetingPeopleName"></el-input>
<el-input v-else style="margin: 10px 0;" @click.native="checkRoles(scope.$index, scope.row.meetingPeople)" v-model="scope.row.meetingPeopleName"></el-input>
</template>
</el-table-column>
<el-table-column
@@ -487,7 +513,7 @@
align="center"
width="200">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.meetingReport"></el-input>
<el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.meetingReport"></el-input>
</template>
</el-table-column>
<el-table-column
@@ -496,7 +522,15 @@
width="250"
align="center">
<template slot-scope="scope">
<div v-if="scope.row.joinfile.length > 0" class="fileClass">
<div v-if="DrawerType === 'see'" class="fileClass">
<div v-if="scope.row.joinfile.length > 0" v-for="(item, index) in scope.row.joinfile" :key="index" @click="updateFile(scope.row)" style="margin-right: 5px;">
{{ item.name }}
</div>
<div v-else>
- -
</div>
</div>
<div v-else-if="scope.row.joinfile.length > 0" class="fileClass">
<div v-for="(item, index) in scope.row.joinfile" :key="index" @click="fileUpload('参会记录', scope.$index)" style="margin-right: 5px;">
{{ item.name }}
</div>
@@ -519,7 +553,7 @@
</div>
</div>
</div>
<div class="demo-drawer-footer">
<div class="demo-drawer-footer" v-if="DrawerType !== 'see'">
<el-button
size="mini"
class="common-button-primary"
@@ -594,8 +628,8 @@
name: '', // 名字
state: '', // 状态
properties: '', // 性质
hjTime: '', // 换届时间
field: '', // 标准化工作领域
changeTime: '', // 换届时间
standerArea: '', // 标准化工作领域
mark: '', // 备注
wgNetInfos: [], // 秘书联系方式
wgMeetingInfos: [], // 参会记录
@@ -625,11 +659,18 @@
fileType: '',
pIndex: '',
pType: '',
DrawerType: '',
row: {},
row2: {}
}
},
methods: {
updateFile (item) {
window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
},
checkRole(type, index, row) {
if (row) {
this.nodeList = []
this.nodeList.push(row)
} else {
this.nodeList = []
@@ -670,6 +711,8 @@
})
this.addForm.wgMeetingInfos[this.pIndex].meetingPeople = ids
this.addForm.wgMeetingInfos[this.pIndex].meetingPeopleName = nameList
this.$set(this.addForm.wgMeetingInfos, this.addForm.wgMeetingInfos[this.pIndex].meetingPeople, ids)
this.$set(this.addForm.wgMeetingInfos, this.addForm.wgMeetingInfos[this.pIndex].meetingPeopleName, nameList)
},
fileUpload(type, index) {
this.fileIndex = index
@@ -909,26 +952,235 @@
}
}, // 删除参会记录
addItem () {
this.DrawerType = 'add'
let row = this.row
if (row.level === '0') {
this.addDrawerTitle = '新增标委会'
} else if (row.level === '1') {
this.addDrawerTitle = '新增分标委'
} else if (row.level === '2') {
this.addDrawerTitle = '新增工作组'
} else if (row.level === '3') {
this.addDrawerTitle = '新增标准'
} else if (row.level === '4') {}
this.addForm = {
pid: row.id,
wgNetInfos: [],
nature: (parseInt(row.nature) + 1).toString(),
status: '0',
wgDepts: [],
wgPayInfos: [],
wgMeetingInfos: [],
level: (parseInt(row.level) + 1).toString(),
types: row.types,
pName: row.name,
itemType: row.level === '0' ? '标委会' : (row.level === '1' ? '分标委' : (row.level === '2' ? '工作组' : '标准'))
}
this.addDrawer = true
}, // 新增
editItem () {
this.DrawerType = 'edit'
let row = this.row
if (row.level === '0') {
this.addDrawerTitle = '编辑标委会'
} else if (row.level === '1') {
this.addDrawerTitle = '编辑分标委'
} else if (row.level === '2') {
this.addDrawerTitle = '编辑工作组'
} else if (row.level === '3') {
this.addDrawerTitle = '编辑标准'
} else if (row.level === '4') {}
this.getArr(row.wgDepts)
this.getArr(row.wgPayInfos)
this.getArr(row.wgMeetingInfos)
if (row.wgMeetingInfos) {
for (let a = 0; a < row.wgMeetingInfos.length; a++) {
row.wgMeetingInfos[a].meetingPeopleName = []
row.wgMeetingInfos[a].meetingPeople = []
if (row.wgMeetingInfos[a].joinMeetingPeopleInfo) {
row.wgMeetingInfos[a].joinMeetingPeopleInfo.forEach(item => {
row.wgMeetingInfos[a].meetingPeopleName.push(item.name)
row.wgMeetingInfos[a].meetingPeople.push(item.userId)
})
} else {
row.wgMeetingInfos[a].meetingPeopleName = []
row.wgMeetingInfos[a].meetingPeople = []
}
}
} else {
row.wgMeetingInfos = []
}
this.addForm = {
id: row.id,
pid: row.pid,
wgNetInfos: row.wgNetInfos || [],
nature: row.nature,
status: '0',
wgDepts: row.wgDepts || [],
wgPayInfos: row.wgPayInfos || [],
wgMeetingInfos: row.wgMeetingInfos || [],
level: row.level,
types: row.types,
pName: row.name,
name: row.name,
number: row.number,
changeTime: row.changeTime,
mark: row.mark,
standerArea: row.standerArea,
itemType: row.level === '0' ? '标委会' : (row.level === '1' ? '分标委' : (row.level === '2' ? '工作组' : '标准'))
}
this.addDrawer = true
}, // 编辑
seeItem () {
this.DrawerType = 'see'
let row = this.row2
if (row.level === '0') {
this.addDrawerTitle = '查看标委会'
} else if (row.level === '1') {
this.addDrawerTitle = '查看分标委'
} else if (row.level === '2') {
this.addDrawerTitle = '查看工作组'
} else if (row.level === '3') {
this.addDrawerTitle = '查看标准'
} else if (row.level === '4') {}
this.getArr(row.wgDepts)
this.getArr(row.wgPayInfos)
this.getArr(row.wgMeetingInfos)
if (row.wgMeetingInfos) {
for (let a = 0; a < row.wgMeetingInfos.length; a++) {
row.wgMeetingInfos[a].meetingPeopleName = []
row.wgMeetingInfos[a].meetingPeople = []
if (row.wgMeetingInfos[a].joinMeetingPeopleInfo) {
row.wgMeetingInfos[a].joinMeetingPeopleInfo.forEach(item => {
row.wgMeetingInfos[a].meetingPeopleName.push(item.name)
row.wgMeetingInfos[a].meetingPeople.push(item.userId)
})
} else {
row.wgMeetingInfos[a].meetingPeopleName = []
row.wgMeetingInfos[a].meetingPeople = []
}
}
} else {
row.wgMeetingInfos = []
}
this.addForm = {
id: row.id,
pid: row.pid,
wgNetInfos: row.wgNetInfos || [],
nature: row.nature,
status: '0',
wgDepts: row.wgDepts || [],
wgPayInfos: row.wgPayInfos || [],
wgMeetingInfos: row.wgMeetingInfos || [],
level: row.level,
types: row.types,
pName: row.name,
name: row.name,
number: row.number,
changeTime: row.changeTime,
mark: row.mark,
standerArea: row.standerArea,
itemType: row.level === '0' ? '标委会' : (row.level === '1' ? '分标委' : (row.level === '2' ? '工作组' : '标准'))
}
this.addDrawer = true
}, // 查看
delItem () {
if (this.row.children.length > 0) {
this.$message.warning('不可删除!')
} else {
this.$confirm('您是否确认删除选中数据?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
confirmButtonClass: 'common-button-primary',
roundButton: true
}).then(() => {
let ids = []
if (this.row.wgMeetingInfos.length > 0) {
this.row.wgMeetingInfos.forEach(item => {
ids.push(item.id)
})
}
this.$http.post('wg_work_group/deleteData', {
id: this.row.id,
meetingId: ids
}, {
_this: this
}, res => {
if (res.ok) {
this.headerNo = false
this.$message.success('删除成功')
this.destoryGraph()
this.getData()
}
})
}).catch(() => {
})
}
}, // 删除
getArr (row) {
if (row) {
row.forEach( item => {
if (typeof (item.joinfile) === 'string') {
item.joinfile = JSON.parse(item.joinfile) || []
}
})
return row
} else {
return []
}
},
addDrawerSubmit () {
this.submitLoading = true
this.addForm.wgDepts.forEach(item => {
item.joinfile = JSON.stringify(item.joinfile)
})
this.addForm.wgPayInfos.forEach(item => {
item.joinfile = JSON.stringify(item.joinfile)
})
this.addForm.wgMeetingInfos.forEach(item => {
item.joinfile = JSON.stringify(item.joinfile)
})
this.$http.postData('wg_work_group/add', this.addForm, {
_this: this
}, res => {
this.submitLoading = false
this.addDrawer = false
if (res.ok) {}
})
if (this.DrawerType === 'add') {
this.addForm.wgDepts.forEach(item => {
item.joinfile = JSON.stringify(item.joinfile)
})
this.addForm.wgPayInfos.forEach(item => {
item.joinfile = JSON.stringify(item.joinfile)
})
this.addForm.wgMeetingInfos.forEach(item => {
item.joinfile = JSON.stringify(item.joinfile)
})
this.$http.postData('wg_work_group/add', this.addForm, {
_this: this
}, res => {
this.submitLoading = false
this.addDrawer = false
if (res.ok) {
this.headerNo = false
this.$message.success('添加成功')
this.destoryGraph()
this.getData()
} else {
this.$message.warning('添加失败')
}
})
} else if (this.DrawerType === 'edit') {
this.addForm.wgDepts.forEach(item => {
item.joinfile = JSON.stringify(item.joinfile)
})
this.addForm.wgPayInfos.forEach(item => {
item.joinfile = JSON.stringify(item.joinfile)
})
this.addForm.wgMeetingInfos.forEach(item => {
item.joinfile = JSON.stringify(item.joinfile)
})
this.$http.postData('wg_work_group/updateData', this.addForm, {
_this: this
}, res => {
this.submitLoading = false
this.addDrawer = false
if (res.ok) {
this.headerNo = false
this.$message.success('修改成功')
this.destoryGraph()
this.getData()
} else {
this.$message.warning('修改失败')
}
})
}
}, // 新增提交
addDrawerClose () {
this.addDrawer = false
@@ -947,22 +1199,10 @@
handleNodeClick (node) {
this.headerNo = true
let row = node._cfg.model
console.log(row);
this.addForm = {
pid: row.id,
wgNetInfos: [],
nature: (parseInt(row.nature) + 1).toString(),
status: '0',
wgDepts: [],
wgPayInfos: [],
wgMeetingInfos: [],
level: (parseInt(row.level) + 1).toString(),
types: row.types,
pName: row.name,
itemType: row.level === '0' ? '标委会' : (row.level === '1' ? '分标委' : (row.level === '2' ? '工作组' : '标准'))
}
this.addForm.pName = row.name
this.row = JSON.parse(JSON.stringify(row))
this.row2 = JSON.parse(JSON.stringify(row))
if (row.level === '0') {
this.addDrawerTitle = '新增标委会'
this.addButton = true
this.addItemButton = false
this.editButton = false
@@ -970,7 +1210,6 @@
this.seeButton = false
this.seeItemButton = false
} else if (row.level === '1') {
this.addDrawerTitle = '新增分标委'
this.addButton = true
this.addItemButton = false
this.editButton = true
@@ -978,7 +1217,6 @@
this.seeButton = true
this.seeItemButton = false
} else if (row.level === '2') {
this.addDrawerTitle = '新增工作组'
this.addButton = true
this.addItemButton = false
this.editButton = true
@@ -986,7 +1224,6 @@
this.seeButton = true
this.seeItemButton = false
} else if (row.level === '3') {
this.addDrawerTitle = '新增标准'
this.addButton = false
this.addItemButton = true
this.editButton = true
@@ -1239,9 +1476,6 @@
this.getData();
this.getList()
},
created() {
// this.getData();
},
beforeDestroy() {
this.destoryGraph()
}
@@ -1266,6 +1500,7 @@
}
}
.formTitle {
height: 48px;
display: flex;
justify-content: space-between;
align-items: center;