kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'build' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into build

Browse Source
This commit is contained in:
yanran200730
2022-10-18 17:10:01 +08:00
parent 2dee5e3b37 5d95afe99d
commit d93ae197e3
1 changed files with 125 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

247
project/pingchang/apps/AppOrganizationChange/components/addChange.vue
View File

@@ -1,92 +1,81 @@
<template> <template>
<ai-list class="addChange"> <section class="addChange">
<template #title> <ai-detail>
<ai-title title="基本信息" isShowBottomBorder isShowBack @onBackClick="cancel(false)" /> <ai-title slot="title" title="新增换届" isShowBottomBorder isShowBack @onBackClick="cancel(false)" />
</template> <template #content>
<template #content> <ai-card title="基本信息">
<div class="Form" style="padding: 0 200px;"> <template #content>
<el-form ref="form" :model="form" label-width="100px" label-position="right"> <div class="Form">
<ai-bar title="基本信息"></ai-bar> <el-form ref="form" :model="form" :rules="rules" label-width="100px" label-position="right">
<el-row type="flex"> <el-row type="flex">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="换届时间" prop="data" :rules="[{ required: true, message: '请选择换届时间', trigger: 'blur' }]"> <el-form-item label="换届时间" prop="changeTime">
<el-input size="small" :maxlength="30" placeholder="请输入大屏项目名称" v-model="form.name"></el-input> <el-date-picker v-model="form.changeTime" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width:338px">
</el-form-item> </el-date-picker>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item label="届次" prop="noun" :rules="[{ required: true, message: '请输入届次', trigger: 'blur' }]"> <el-col :span="12">
<el-input size="small" :maxlength="30" placeholder="请输入届次" v-model="form.name"></el-input> <el-form-item label="届次" prop="sessionTime">
</el-form-item> <el-input size="small" :maxlength="30" placeholder="请输入届次" v-model="form.sessionTime"></el-input>
</el-col> </el-form-item>
</el-row> </el-col>
<ai-bar title="本届任职(必填)"> </el-row>
<template slot="right"> <ai-bar title="本届任职(必填)">
<el-button size="small" type="text" icon="iconfont iconAdd" @click="toEdit('')" >添加任职人员</el-button> <template slot="right">
</template> <el-button size="small" type="text" icon="iconfont iconAdd" @click="form.serveList.push({name:null,position:null,type:0})" >添加任职人员</el-button>
</ai-bar> </template>
<el-table :data="form.ladderRule" size="mini" border stripe> </ai-bar>
<el-table-column label="查看人数(人)" align="center"> <el-table :data="form.serveList" size="mini" border stripe>
<template slot-scope="{row}"> <el-table-column label="职位" align="center">
<el-input class="tableInput" v-model.number="row.viewCount" clearable placeholder="请输入"/> <template slot-scope="{row}">
</template> <el-input class="tableInput" v-model="row.position" clearable placeholder="请输入职位"/>
</el-table-column> </template>
<el-table-column label="获得积分(分)" align="center"> </el-table-column>
<template slot-scope="{row}"> <el-table-column label="姓名" align="center">
<el-input class="tableInput" v-model="row.integral" clearable placeholder="请输入" type="number" <template slot-scope="{row}">
@keyup.native="row.integral=checkIntegral(row.integral)"/> <el-input class="tableInput" v-model="row.name" clearable placeholder="请输入姓名" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template slot-scope="{$index}"> <template slot-scope="{$index}">
<el-button type="text" @click="handleDelete($index)">删除</el-button> <el-button type="text" @click="handleDelete($index, 'serveList')">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-form> </el-form>
<!-- <ai-bar title="本届任职(必填)"> <ai-bar title="本届候选人">
<template slot="right"> <template slot="right">
<el-button size="small" type="text" icon="iconfont iconAdd" @click="toEdit('')" >添加任职人员</el-button> <el-button size="small" type="text" icon="iconfont iconAdd" @click="form.candidateList.push({name:null,position:null,type: 1})" >添加候选人</el-button>
</template>
</ai-bar>
<el-table :data="form.candidateList" size="mini" border stripe>
<el-table-column label="职位" align="center">
<template slot-scope="{row}">
<el-input class="tableInput" v-model="row.position" clearable placeholder="请输入职位"/>
</template>
</el-table-column>
<el-table-column label="候选人" align="center">
<template slot-scope="{row}">
<el-input class="tableInput" v-model="row.name" clearable placeholder="请输入姓名" />
</template>
</el-table-column>
<el-table-column label="操作" align="center">
<template slot-scope="{$index}">
<el-button type="text" @click="handleDelete($index, 'candidateList')">删除</el-button>
</template>
</el-table-column>
</el-table>
</div>
</template> </template>
</ai-bar> </ai-card>
<ai-table </template>
class="detail-table__table" <template slot="footer" class="footer">
:tableData="tableDataJob" <el-button class="delete-btn footer-btn" @click="cancel(false)">取消</el-button>
:col-configs="colConfigsJob" <el-button class="footer-btn" type="primary" @click="confirm()">保存</el-button>
:total="job.total" </template>
:current.sync="job.current" </ai-detail>
:size.sync="job.size" </section>
>
<el-table-column slot="options" label="操作" align="center">
<template slot-scope="{ row }">
<el-button type="text" @click="jobEdit(row.id)">编辑</el-button>
<el-button type="text" @click="jobDelete(row.id)">删除</el-button>
</template>
</el-table-column>
</ai-table>
<ai-bar title="本届候选人">
<template slot="right">
<el-button size="small" type="text" icon="iconfont iconAdd" @click="toEdit('')" >添加候选人</el-button>
</template>
</ai-bar>
<ai-table
class="detail-table__table"
:tableData="tableDataPerson"
:col-configs="colConfigsPerson"
:total="person.total"
:current.sync="person.current"
:size.sync="person.size"
>
<el-table-column slot="options" label="操作" align="center">
<template slot-scope="{ row }">
<el-button type="text" @click="jobEdit(row.id)">编辑</el-button>
<el-button type="text" @click="jobDelete(row.id)">删除</el-button>
</template>
</el-table-column>
</ai-table> -->
</div>
</template>
</ai-list>
</template> </template>
<script> <script>
@@ -98,44 +87,34 @@ export default {
dict: Object, dict: Object,
}, },
data() { data() {
let validServe = (rule, value, callback) => {
if (!value.length) {
return callback(new Error('请填写本届任职人员信息'));
} else {
callback();
}
};
let validCandidate = (rule, value, callback) => {
if (!value.length) {
return callback(new Error('请填写本届候选人员信息'));
} else {
callback();
}
};
return { return {
form: { form: {
addOrMakeup: true,
changeTime: '',
sessionTime: '',
serveList: [], // 任职人员列表
candidateList: [], // 候选人员列表
}, },
tableDataJob: [], rules: {
tableDataPerson: [], changeTime: [{ required: true, message: '请选择换届时间', trigger: 'blur' }],
totalJob: '', sessionTime: [{ required: true, message: '请输入届次', trigger: 'blur' }],
job: { serveList: [{required: true,validator: validServe, trigger: "blur"}],
total: 0, candidateList: [{required: true,validator: validCandidate, trigger: "blur"}],
current: 1,
size: 10,
}, },
person: {
total: 0,
current: 1,
size: 10,
}
}
},
computed: {
colConfigsJob() {
return [
{prop: 'content', label: '职位'},
{prop: 'content', label: '姓名'},
{slot: 'options'},
]
},
colConfigsPerson() {
return [
{prop: 'content', label: '职位'},
{prop: 'content', label: '候选人'},
{slot: 'options'},
]
},
formRules() {
return {
// corpId: [{required: true, message: "请输入CorpId"}],
}
} }
}, },
methods: { methods: {
@@ -144,11 +123,35 @@ export default {
type: 'List', type: 'List',
isRefresh: !!isRefresh isRefresh: !!isRefresh
}) })
} },
handleDelete(i, type) {
this.$confirm("确定要删除该数据?").then(() => {
if(type == 'candidateList') {
this.form.candidateList.splice(i, 1)
} else if(type == 'serveList') {
this.form.serveList.splice(i, 1)
}
}).catch(() => 0)
},
confirm() {
this.$refs.form.validate((valid) => {
if(valid) {
this.instance.post(`/app/apporganizationgeneralelection/add`, {
...this.form
}).then(res=>{
if(res.code == 0) {
console.log(res);
}
})
}
})
},
} }
} }
</script> </script>
<style lang="scss" scope> <style lang="scss" scope>
.addChange {} .addChange {
height: 100%;
}
</style> </style>