Skip to content

S
smart_gov_platform
Commit c972ec4b authored by “yiyousong”'s avatar “yiyousong”
Browse files
Options

pref:修改工作人员展示，取消新增的时候绑定窗口

parent 412027b6
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 59 deletions
base-manager-ui/admin/src/pages/basicset/workman/components/EditPersonel.vue
View file @ c972ec4b
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <!-- <a-col :span="12">
<a-form-model-item label="所属窗口" prop="windowId"> <a-form-model-item label="所属窗口" prop="windowId">
<a-select <a-select
v-model="form.windowId" v-model="form.windowId"
...@@ -79,14 +79,14 @@ ...@@ -79,14 +79,14 @@
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col> -->
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="经办人Id" prop="operatorId"> <a-form-model-item label="经办人Id" prop="operatorId">
<a-input v-model="form.operatorId" placeholder="请输入经办人Id" /> <a-input v-model="form.operatorId" placeholder="请输入经办人Id" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="星级" prop="starlevel"> <a-form-model-item label="星级" prop="starlevel">
<a-select <a-select
...@@ -102,27 +102,27 @@ ...@@ -102,27 +102,27 @@
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="职务" prop="userpost"> <a-form-model-item label="职务" prop="userpost">
<a-input v-model="form.userpost" placeholder="请输入职务" /> <a-input v-model="form.userpost" placeholder="请输入职务" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="职称" prop="posttitle"> <a-form-model-item label="职称" prop="posttitle">
<a-input v-model="form.posttitle" placeholder="请输入职称" /> <a-input v-model="form.posttitle" placeholder="请输入职称" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="称号" prop="dangyuan"> <a-form-model-item label="政治面貌" prop="politicalstatus">
<a-select <a-select
allowClear allowClear
v-model="form.dangyuan" v-model="form.politicalstatus"
placeholder="请选择称号" placeholder="请选择政治面貌"
> >
<a-select-option <a-select-option
v-for="(value, key) in designationDict" v-for="(value, key) in politicalDict"
:key="key" :key="key"
:value="Number(key)" :value="Number(key)"
>{{ value }}</a-select-option >{{ value }}</a-select-option
...@@ -130,15 +130,17 @@ ...@@ -130,15 +130,17 @@
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="政治面貌" prop="politicalstatus"> <a-form-model-item label="称号" prop="dangyuan">
<a-select <a-select
allowClear allowClear
v-model="form.politicalstatus" v-model="form.dangyuan"
placeholder="请选择政治面貌" placeholder="请选择称号"
> >
<a-select-option <a-select-option
v-for="(value, key) in politicalDict" v-for="(value, key) in designationDict"
:key="key" :key="key"
:value="Number(key)" :value="Number(key)"
>{{ value }}</a-select-option >{{ value }}</a-select-option
...@@ -151,11 +153,6 @@ ...@@ -151,11 +153,6 @@
<a-input v-model="form.phone" placeholder="请输入电话" /> <a-input v-model="form.phone" placeholder="请输入电话" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12">
<a-form-model-item label="手机" prop="mobile">
<a-input v-model="form.mobile" placeholder="请输入手机" />
</a-form-model-item>
</a-col>
</a-row> </a-row>
<a-row v-if="form.dangyuan === 99"> <a-row v-if="form.dangyuan === 99">
<!-- <a-col :span="12"> </a-col> --> <!-- <a-col :span="12"> </a-col> -->
...@@ -166,6 +163,11 @@ ...@@ -166,6 +163,11 @@
</a-col> </a-col>
</a-row> </a-row>
<a-row> <a-row>
<a-col :span="12">
<a-form-model-item label="手机" prop="mobile">
<a-input v-model="form.mobile" placeholder="请输入手机" />
</a-form-model-item>
</a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="身份证" prop="idCard"> <a-form-model-item label="身份证" prop="idCard">
<a-input v-model="form.idCard" placeholder="请输入身份证号码" /> <a-input v-model="form.idCard" placeholder="请输入身份证号码" />
...@@ -494,15 +496,15 @@ export default { ...@@ -494,15 +496,15 @@ export default {
// 部门选择 // 部门选择
async handleDeptSelect(val, node) { async handleDeptSelect(val, node) {
this.form.windowId = undefined; // this.form.windowId = undefined;
this.form.windowName = ""; // this.form.windowName = "";
if (val) { if (val) {
let { text } = node.componentOptions.children[0]; let { text } = node.componentOptions.children[0];
this.form.deptName = text; this.form.deptName = text;
this.windowData = await this.getWindowList(val); // this.windowData = await this.getWindowList(val);
} else { } else {
this.form.deptName = ""; this.form.deptName = "";
this.windowData = []; // this.windowData = [];
} }
}, },
//编辑获取窗口 //编辑获取窗口
...@@ -535,7 +537,7 @@ export default { ...@@ -535,7 +537,7 @@ export default {
}, },
// 编辑 // 编辑
onEdit(data) { onEdit(data) {
this.editWindow(data.deptId); // this.editWindow(data.deptId);
this.form = { ...data }; this.form = { ...data };
this.form.loginName && this.$delete(this.form, "loginName"); this.form.loginName && this.$delete(this.form, "loginName");
this.form.loginPwd && this.$delete(this.form, "loginPwd"); this.form.loginPwd && this.$delete(this.form, "loginPwd");
...@@ -554,15 +556,16 @@ export default { ...@@ -554,15 +556,16 @@ export default {
}, },
// 关闭对话框 // 关闭对话框
handleClose() { handleClose() {
this.$refs.formData.resetFields();
this.fileList = [];
this.loading = false; this.loading = false;
this.Visible = false; this.Visible = false;
this.form.windowName = ""; // this.windowData = [];
this.fileList = []; // this.form.windowName = "";
this.$refs.formData.resetFields();
}, },
// 重置 // 重置
handleReset() { handleReset() {
this.form.windowName = ""; // this.form.windowName = "";
this.$refs.formData.resetFields(); this.$refs.formData.resetFields();
}, },
// 照片上传 // 照片上传
......
base-manager-ui/admin/src/pages/basicset/workman/components/addpersonnel.vue
View file @ c972ec4b
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <!-- <a-col :span="12">
<a-form-model-item label="所属窗口" prop="windowId"> <a-form-model-item label="所属窗口" prop="windowId">
<a-select <a-select
v-model="form.windowId" v-model="form.windowId"
...@@ -79,14 +79,14 @@ ...@@ -79,14 +79,14 @@
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col> -->
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="经办人Id" prop="operatorId"> <a-form-model-item label="经办人Id" prop="operatorId">
<a-input v-model="form.operatorId" placeholder="请输入经办人Id" /> <a-input v-model="form.operatorId" placeholder="请输入经办人Id" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="星级" prop="starlevel"> <a-form-model-item label="星级" prop="starlevel">
<a-select <a-select
...@@ -102,27 +102,27 @@ ...@@ -102,27 +102,27 @@
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="职务" prop="userpost"> <a-form-model-item label="职务" prop="userpost">
<a-input v-model="form.userpost" placeholder="请输入职务" /> <a-input v-model="form.userpost" placeholder="请输入职务" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="职称" prop="posttitle"> <a-form-model-item label="职称" prop="posttitle">
<a-input v-model="form.posttitle" placeholder="请输入职称" /> <a-input v-model="form.posttitle" placeholder="请输入职称" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="称号" prop="dangyuan"> <a-form-model-item label="政治面貌" prop="politicalstatus">
<a-select <a-select
allowClear allowClear
v-model="form.dangyuan" v-model="form.politicalstatus"
placeholder="请选择称号" placeholder="请选择政治面貌"
> >
<a-select-option <a-select-option
v-for="(value, key) in designationDict" v-for="(value, key) in politicalDict"
:key="key" :key="key"
:value="Number(key)" :value="Number(key)"
>{{ value }}</a-select-option >{{ value }}</a-select-option
...@@ -130,15 +130,17 @@ ...@@ -130,15 +130,17 @@
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="政治面貌" prop="politicalstatus"> <a-form-model-item label="称号" prop="dangyuan">
<a-select <a-select
allowClear allowClear
v-model="form.politicalstatus" v-model="form.dangyuan"
placeholder="请选择政治面貌" placeholder="请选择称号"
> >
<a-select-option <a-select-option
v-for="(value, key) in politicalDict" v-for="(value, key) in designationDict"
:key="key" :key="key"
:value="Number(key)" :value="Number(key)"
>{{ value }}</a-select-option >{{ value }}</a-select-option
...@@ -151,11 +153,6 @@ ...@@ -151,11 +153,6 @@
<a-input v-model="form.phone" placeholder="请输入电话" /> <a-input v-model="form.phone" placeholder="请输入电话" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12">
<a-form-model-item label="手机" prop="mobile">
<a-input v-model="form.mobile" placeholder="请输入手机" />
</a-form-model-item>
</a-col>
</a-row> </a-row>
<a-row v-if="form.dangyuan === 99"> <a-row v-if="form.dangyuan === 99">
<!-- <a-col :span="12"> </a-col> --> <!-- <a-col :span="12"> </a-col> -->
...@@ -166,6 +163,11 @@ ...@@ -166,6 +163,11 @@
</a-col> </a-col>
</a-row> </a-row>
<a-row> <a-row>
<a-col :span="12">
<a-form-model-item label="手机" prop="mobile">
<a-input v-model="form.mobile" placeholder="请输入手机" />
</a-form-model-item>
</a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="身份证" prop="idCard"> <a-form-model-item label="身份证" prop="idCard">
<a-input v-model="form.idCard" placeholder="请输入身份证号码" /> <a-input v-model="form.idCard" placeholder="请输入身份证号码" />
...@@ -528,15 +530,15 @@ export default { ...@@ -528,15 +530,15 @@ export default {
}, },
// 部门选择 // 部门选择
async handleDeptSelect(val, node) { async handleDeptSelect(val, node) {
this.form.windowId = undefined; // this.form.windowId = undefined;
this.form.windowName = ""; // this.form.windowName = "";
if (val) { if (val) {
let { text } = node.componentOptions.children[0]; let { text } = node.componentOptions.children[0];
this.form.deptName = text; this.form.deptName = text;
this.windowData = await this.getWindowList(val); // this.windowData = await this.getWindowList(val);
} else { } else {
this.form.deptName = ""; this.form.deptName = "";
this.windowData = []; // this.windowData = [];
} }
}, },
//编辑获取窗口 //编辑获取窗口
...@@ -572,7 +574,7 @@ export default { ...@@ -572,7 +574,7 @@ export default {
}, },
// 重置 // 重置
handleReset() { handleReset() {
this.form.windowName = ""; // this.form.windowName = "";
this.$refs.formData.resetFields(); this.$refs.formData.resetFields();
}, },
// 新增 // 新增
...@@ -583,7 +585,7 @@ export default { ...@@ -583,7 +585,7 @@ export default {
// 编辑 // 编辑
onEdit(data) { onEdit(data) {
this.form = { ...data }; this.form = { ...data };
this.editWindow(data.deptId); // this.editWindow(data.deptId);
if (this.form.photoPath) { if (this.form.photoPath) {
this.fileList = [ this.fileList = [
{ {
...@@ -599,9 +601,9 @@ export default { ...@@ -599,9 +601,9 @@ export default {
// 关闭对话框 // 关闭对话框
handleClose() { handleClose() {
// this.$refs.formData.resetFields(); // this.$refs.formData.resetFields();
this.windowData = []; // this.windowData = [];
this.fileList = []; this.fileList = [];
this.form.windowName = ""; // this.form.windowName = "";
this.loading = false; this.loading = false;
this.Visible = false; this.Visible = false;
}, },
......
base-manager-ui/admin/src/pages/basicset/workman/personnel.vue
View file @ c972ec4b
...@@ -246,9 +246,9 @@ ...@@ -246,9 +246,9 @@
{{ text.createTime | dateFormat }} {{ text.createTime | dateFormat }}
</template> </template>
<!-- 最后登录时间 --> <!-- 最后登录时间 -->
<template slot="logintime" slot-scope="text"> <template slot="lastLoginTime" slot-scope="text">
<span v-if="text.logintime">{{ <span v-if="text.lastLoginTime">{{
text.logintime | dateFormat text.lastLoginTime | dateFormat
}}</span> }}</span>
<span v-else>--</span> <span v-else>--</span>
</template> </template>
...@@ -369,7 +369,7 @@ const columns = [ ...@@ -369,7 +369,7 @@ const columns = [
{ {
title: "最后登录时间", title: "最后登录时间",
scopedSlots: { scopedSlots: {
customRender: "logintime", customRender: "lastLoginTime",
}, },
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment