commit
This commit is contained in:
zhutianqi
@@ -62,7 +62,8 @@
|
||||
:title="addDrawerTitle"
|
||||
:visible.sync="addDrawer"
|
||||
:before-close="addDrawerClose">
|
||||
<div class="content">
|
||||
<div class="demo-drawer-content">
|
||||
<div class="content">
|
||||
<div class="standard-table-search">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="24">
|
||||
@@ -144,37 +145,38 @@
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="联络人"
|
||||
prop="joinPerson"
|
||||
prop="name"
|
||||
align="center"
|
||||
width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.joinPerson"></el-input>
|
||||
<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>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="单位"
|
||||
prop="joinPersonCompany"
|
||||
prop="unit"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.joinPersonCompany"></el-input>
|
||||
<el-input style="margin: 10px 0;" disabled v-model="scope.row.unit"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="电话"
|
||||
prop="joinPersonPhone"
|
||||
prop="phone"
|
||||
align="center"
|
||||
width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.joinPersonPhone"></el-input>
|
||||
<el-input style="margin: 10px 0;" disabled v-model="scope.row.phone"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="邮箱"
|
||||
prop="joinPersonEmail"
|
||||
prop="email"
|
||||
align="center"
|
||||
width="200">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.joinPersonEmail"></el-input>
|
||||
<el-input style="margin: 10px 0;" disabled v-model="scope.row.email"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -212,63 +214,66 @@
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="我司在工作组排名顺序"
|
||||
prop="joinPm"
|
||||
prop="deptOrder"
|
||||
align="center"
|
||||
width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.joinPm"></el-input>
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.deptOrder"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="我司人员"
|
||||
prop="joinPerson"
|
||||
prop="name"
|
||||
align="center"
|
||||
width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.joinPerson"></el-input>
|
||||
<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>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="单位"
|
||||
prop="joinPersonCompany"
|
||||
prop="unitName"
|
||||
width="150"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.joinPersonCompany"></el-input>
|
||||
<el-input style="margin: 10px 0;" disabled v-model="scope.row.unit"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="部门"
|
||||
prop="joinDept"
|
||||
width="150"
|
||||
prop="deptName"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.joinDept"></el-input>
|
||||
<el-input style="margin: 10px 0;" disabled v-model="scope.row.deptName"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="电话"
|
||||
prop="joinPersonPhone"
|
||||
prop="phone"
|
||||
align="center"
|
||||
width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.joinPersonPhone"></el-input>
|
||||
<el-input style="margin: 10px 0;" disabled v-model="scope.row.phone"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="邮箱"
|
||||
prop="joinPersonEmail"
|
||||
prop="email"
|
||||
align="center"
|
||||
width="200">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.joinPersonEmail"></el-input>
|
||||
<el-input style="margin: 10px 0;" disabled v-model="scope.row.email"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="身份"
|
||||
prop="joinSf"
|
||||
prop="identity"
|
||||
align="center"
|
||||
width="200">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.joinSf"></el-input>
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.identity"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -328,54 +333,64 @@
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="费用"
|
||||
prop="joinPrice"
|
||||
prop="price"
|
||||
align="center"
|
||||
width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.joinPrice"></el-input>
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.price"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="年份"
|
||||
prop="joinYear"
|
||||
prop="year"
|
||||
align="center"
|
||||
width="150">
|
||||
width="250">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.joinYear"></el-input>
|
||||
<el-date-picker
|
||||
v-model="scope.row.year"
|
||||
value-format="yyyy"
|
||||
type="year"
|
||||
placeholder="选择年">
|
||||
</el-date-picker>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="状态"
|
||||
prop="joinStatus"
|
||||
prop="status"
|
||||
width="150"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.joinStatus"></el-input>
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.status"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="计划内"
|
||||
prop="joinJhn"
|
||||
width="150"
|
||||
prop="inplan"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.joinJhn"></el-input>
|
||||
<el-select v-model="scope.row.inplan" placeholder="请选择">
|
||||
<el-option label="计划内" value="0"></el-option>
|
||||
<el-option label="计划外" value="1"></el-option>
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="缴费方式"
|
||||
prop="joinJffs"
|
||||
prop="payWay"
|
||||
align="center"
|
||||
width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.joinJffs"></el-input>
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.payWay"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="费用列支"
|
||||
prop="joinFylz"
|
||||
prop="payInfo"
|
||||
align="center"
|
||||
width="200">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.joinFylz"></el-input>
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.payInfo"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -433,9 +448,51 @@
|
||||
width="55"
|
||||
v-if="addForm.wgMeetingInfos.length">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="参会日期"
|
||||
prop="meetingTime"
|
||||
align="center"
|
||||
width="250">
|
||||
<template slot-scope="scope">
|
||||
<el-date-picker
|
||||
v-model="scope.row.meetingTime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
type="datetime"
|
||||
placeholder="请选择参会日期">
|
||||
</el-date-picker>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="会议名称"
|
||||
prop="meetingName"
|
||||
align="center"
|
||||
width="200">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.meetingName"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="参会人员"
|
||||
prop="meetingPeople"
|
||||
align="center"
|
||||
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>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="参会报告"
|
||||
prop="meetingReport"
|
||||
align="center"
|
||||
width="200">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.meetingReport"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="joinfile"
|
||||
label="资料"
|
||||
label="会议资料"
|
||||
width="250"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
@@ -461,6 +518,22 @@
|
||||
</el-row>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="demo-drawer-footer">
|
||||
<el-button
|
||||
size="mini"
|
||||
class="common-button-primary"
|
||||
icon="el-icon-check"
|
||||
type="primary"
|
||||
:loading="submitLoading"
|
||||
@click="addDrawerSubmit">提交
|
||||
</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
class="common-button-default"
|
||||
icon="el-icon-close"
|
||||
@click="addDrawerClose">取消</el-button>
|
||||
</div>
|
||||
</el-drawer>
|
||||
<el-dialog width='400px' :visible.sync="fileMadel" title="上传资料">
|
||||
<el-upload
|
||||
@@ -484,6 +557,19 @@
|
||||
</div>
|
||||
</el-upload>
|
||||
</el-dialog>
|
||||
<Role-tree
|
||||
check-box
|
||||
is-title="选择人员"
|
||||
:is-visible.sync="modalshowflag"
|
||||
@checkedRole="checkedRole"
|
||||
:nodeList="nodeList"
|
||||
></Role-tree>
|
||||
<Role-tree
|
||||
is-title="选择人员"
|
||||
:is-visible.sync="modalshowflag2"
|
||||
@checkedRole="checkedRole2"
|
||||
:nodeList="nodeList2"
|
||||
></Role-tree>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
@@ -494,6 +580,11 @@
|
||||
name: "workingGroup1",
|
||||
data() {
|
||||
return {
|
||||
modalshowflag2: false,
|
||||
nodeList2: [],
|
||||
submitLoading: false,
|
||||
nodeList: [],
|
||||
modalshowflag: false,
|
||||
headerNo: false,
|
||||
addForm: {
|
||||
pName: '',
|
||||
@@ -532,9 +623,54 @@
|
||||
fileMadel: false,
|
||||
fileUrl: 'api/att/attFile/upload',
|
||||
fileType: '',
|
||||
pIndex: '',
|
||||
pType: '',
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
checkRole(type, index, row) {
|
||||
if (row) {
|
||||
this.nodeList.push(row)
|
||||
} else {
|
||||
this.nodeList = []
|
||||
}
|
||||
this.pType = type
|
||||
this.pIndex = index
|
||||
this.modalshowflag = true
|
||||
},
|
||||
checkRoles(index, row) {
|
||||
this.nodeList2 = row || []
|
||||
this.pIndex = index
|
||||
this.modalshowflag2 = true
|
||||
},
|
||||
checkedRole (data) {
|
||||
if (this.pType === '选择联络人') {
|
||||
this.addForm.wgNetInfos[this.pIndex].name = data[0].name
|
||||
this.addForm.wgNetInfos[this.pIndex].netId = data[0].id
|
||||
this.addForm.wgNetInfos[this.pIndex].unit = data[0].positionName
|
||||
this.addForm.wgNetInfos[this.pIndex].phone = data[0].phone
|
||||
this.addForm.wgNetInfos[this.pIndex].email = data[0].email
|
||||
} else if (this.pType === '选择我司人员') {
|
||||
this.addForm.wgDepts[this.pIndex].name = data[0].name
|
||||
this.addForm.wgDepts[this.pIndex].deptPeopleId = data[0].id
|
||||
this.addForm.wgDepts[this.pIndex].phone = data[0].phone
|
||||
this.addForm.wgDepts[this.pIndex].email = data[0].email
|
||||
this.addForm.wgDepts[this.pIndex].deptId = data[0].institutionId
|
||||
this.addForm.wgDepts[this.pIndex].deptName = data[0].institutionName
|
||||
this.addForm.wgDepts[this.pIndex].unit = data[0].positionId
|
||||
this.addForm.wgDepts[this.pIndex].unitName = data[0].positionName
|
||||
}
|
||||
},
|
||||
checkedRole2 (data) {
|
||||
let ids = []
|
||||
let nameList = []
|
||||
data.forEach(item => {
|
||||
ids.push(item.id)
|
||||
nameList.push(item.name)
|
||||
})
|
||||
this.addForm.wgMeetingInfos[this.pIndex].meetingPeople = ids
|
||||
this.addForm.wgMeetingInfos[this.pIndex].meetingPeopleName = nameList
|
||||
},
|
||||
fileUpload(type, index) {
|
||||
this.fileIndex = index
|
||||
this.fileType = type
|
||||
@@ -637,39 +773,42 @@
|
||||
var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
|
||||
this.addForm.wgNetInfos.push({
|
||||
joinId: id,
|
||||
joinPersonCompany: '',
|
||||
joinPerson: '',
|
||||
joinPersonPhone: '',
|
||||
joinPersonEmail: ''
|
||||
name: '',
|
||||
netId: '',
|
||||
email: '',
|
||||
phone: '',
|
||||
unit: ''
|
||||
})
|
||||
}, // 新增秘书处联系方式
|
||||
addCyItem () {
|
||||
var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
|
||||
this.addForm.wgDepts.push({
|
||||
joinId: id,
|
||||
joinPersonCompany: '',
|
||||
joinPerson: '',
|
||||
joinPersonPhone: '',
|
||||
joinPersonEmail: '',
|
||||
joinDept: '',
|
||||
joinSf: '',
|
||||
deptOrder: '',
|
||||
deptPeopleId: '',
|
||||
identity: '',
|
||||
joinfile: [],
|
||||
joinfileName: '',
|
||||
joinPm: ''
|
||||
name: '',
|
||||
unitName: '',
|
||||
phone: '',
|
||||
email: '',
|
||||
deptName: '',
|
||||
deptId: '',
|
||||
})
|
||||
}, // 新增集团参与情况
|
||||
addZfItem () {
|
||||
var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
|
||||
this.addForm.wgPayInfos.push({
|
||||
joinId: id,
|
||||
joinPrice: '',
|
||||
joinYear: '',
|
||||
joinStatus: '',
|
||||
joinJhn: '',
|
||||
joinJffs: '',
|
||||
price: '',
|
||||
year: '',
|
||||
status: '',
|
||||
inplan: '0',
|
||||
payWay: '',
|
||||
joinfile: [],
|
||||
joinfileName: '',
|
||||
joinFylz: ''
|
||||
payInfo: ''
|
||||
})
|
||||
}, // 新增支付信息
|
||||
addChItem () {
|
||||
@@ -678,6 +817,11 @@
|
||||
joinId: id,
|
||||
joinfile: [],
|
||||
joinfileName: '',
|
||||
meetingTime: '',
|
||||
meetingName: '',
|
||||
meetingPeople: '',
|
||||
meetingPeopleName: '',
|
||||
meetingReport: '',
|
||||
})
|
||||
}, // 新增参会记录
|
||||
delTelItem () {
|
||||
@@ -767,6 +911,25 @@
|
||||
addItem () {
|
||||
this.addDrawer = true
|
||||
}, // 新增
|
||||
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) {}
|
||||
})
|
||||
}, // 新增提交
|
||||
addDrawerClose () {
|
||||
this.addDrawer = false
|
||||
}, // drawer关闭事件
|
||||
@@ -786,11 +949,15 @@
|
||||
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: row.level,
|
||||
level: (parseInt(row.level) + 1).toString(),
|
||||
types: row.types,
|
||||
pName: row.name,
|
||||
itemType: row.level === '0' ? '标委会' : (row.level === '1' ? '分标委' : (row.level === '2' ? '工作组' : '标准'))
|
||||
}
|
||||
@@ -1064,7 +1231,6 @@
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.ok) {
|
||||
console.log(res);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user