Skip to content

S
smart_gov_platform
Commit ed321a24 authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 60d234c8 993fca22
Hide whitespace changes
Inline Side-by-side
Showing with 130 additions and 73 deletions
base-manager-ui/admin/src/pages/basicset/surface/centralizeskin/CentralizeSkin.vue
View file @ ed321a24
......@@ -161,7 +161,7 @@
<div
class="vertical-skin"
:id="conponentsId"
v-if="imageResolution === '2'"
v-else-if="imageResolution === '2'"
:style="{
background: filterItem('1', 0),
}"
......
base-manager-ui/admin/src/pages/basicset/workman/components/EditPersonel.vue
View file @ ed321a24
......@@ -39,8 +39,8 @@
<a-form-model-item label="所属部门" prop="deptId">
<a-select
showSearch
v-model="form.deptId"
optionFilterProp="label"
v-model="form.deptId"
placeholder="请选择部门"
@change="handleDeptSelect"
allowClear
......@@ -57,29 +57,36 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="经办人Id" prop="operatorId">
<a-input v-model="form.operatorId" placeholder="请输入经办人Id" />
</a-form-model-item>
</a-col>
<!-- <a-col :span="12">
<a-form-model-item label="所属窗口" prop="windowId">
<a-select
v-model="form.windowId"
placeholder="请选择窗口"
@change="handleWindowSelect"
showSearch
allowClear
optionFilterProp="label"
>
<a-select-option
v-for="v in windowData"
:key="v.id"
:value="v.id"
>{{ v.name }}</a-select-option
:label="v.name + v.fromnum"
:data-name="v.name"
>
<span>{{ v.name }}</span>
<span>--</span>
<span>{{ v.fromnum }}</span>
</a-select-option>
</a-select>
</a-form-model-item>
</a-col> -->
</a-col>
</a-row>
<a-row>
<a-col :span="12">
<a-form-model-item label="经办人Id" prop="operatorId">
<a-input v-model="form.operatorId" placeholder="请输入经办人Id" />
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="星级" prop="starlevel">
<a-select
......@@ -95,27 +102,27 @@
</a-select>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="12">
<a-form-model-item label="职务" prop="userpost">
<a-input v-model="form.userpost" placeholder="请输入职务" />
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="12">
<a-form-model-item label="职称" prop="posttitle">
<a-input v-model="form.posttitle" placeholder="请输入职称" />
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="政治面貌" prop="politicalstatus">
<a-form-model-item label="称号" prop="dangyuan">
<a-select
allowClear
v-model="form.politicalstatus"
placeholder="请选择政治面貌"
v-model="form.dangyuan"
placeholder="请选择称号"
>
<a-select-option
v-for="(value, key) in politicalDict"
v-for="(value, key) in designationDict"
:key="key"
:value="Number(key)"
>{{ value }}</a-select-option
......@@ -124,14 +131,14 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="称号" prop="dangyuan">
<a-form-model-item label="政治面貌" prop="politicalstatus">
<a-select
allowClear
v-model="form.dangyuan"
placeholder="请选择称号"
v-model="form.politicalstatus"
placeholder="请选择政治面貌"
>
<a-select-option
v-for="(value, key) in designationDict"
v-for="(value, key) in politicalDict"
:key="key"
:value="Number(key)"
>{{ value }}</a-select-option
......@@ -144,6 +151,11 @@
<a-input v-model="form.phone" placeholder="请输入电话" />
</a-form-model-item>
</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 v-if="form.dangyuan === 99">
<!-- <a-col :span="12"> </a-col> -->
......@@ -154,11 +166,6 @@
</a-col>
</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-form-model-item label="身份证" prop="idCard">
<a-input v-model="form.idCard" placeholder="请输入身份证号码" />
......@@ -392,7 +399,7 @@ export default {
loading: false,
imageUrl: "",
labelCol: { span: 5 },
wrapperCol: { span: 14 },
wrapperCol: { span: 19 },
indeterminate: true,
checkAll: false,
modelIds: [], // 模块
......@@ -401,12 +408,13 @@ export default {
siteId: "",
siteName: "",
},
curWindow: {}, // 当前选择窗口
form: {
// roleId: "", // 权限id
deptId: undefined, // 部门id
deptName: "", //部门名称
windowName: "", // 窗口名称
// windowId: undefined, // 窗口id
windowId: undefined, // 窗口id
siteName: "", // 站点名称
siteId: "", // 站点id
name: "", // 姓名
......@@ -469,6 +477,15 @@ export default {
this.siteInfo.siteId = info.id;
this.siteInfo.siteName = info.label;
},
// 获取窗口列表
async getWindowList(deptId) {
let windowData = [];
let res = await getWindowList({ deptId, page: 1, size: -1 });
if (res.data.code == 1) {
windowData = res.data.data.data;
}
return windowData;
},
// 获取模块
async getModelList() {
let res = await modelList({ page: 1, size: -1 });
......@@ -478,20 +495,29 @@ export default {
// 部门选择
async handleDeptSelect(val, node) {
this.form.windowId = undefined;
let { text } = node.componentOptions.children[0];
this.form.deptName = text;
let res = await getWindowList({ deptId: val, page: 1, size: -1 });
this.windowData = res.data.data.data;
this.form.windowName = "";
if (val) {
let { text } = node.componentOptions.children[0];
this.form.deptName = text;
this.windowData = await this.getWindowList(val);
} else {
this.form.deptName = "";
this.windowData = [];
}
},
//编辑获取窗口
async editWindow(val) {
let res = await getWindowList({ deptId: val, page: 1, size: -1 });
this.windowData = res.data.data.data;
this.windowData = await this.getWindowList(val);
},
// 窗口选择
handleWindowSelect(val, node) {
let { text } = node.componentOptions.children[0];
this.form.windowName = text;
if (val) {
let name = node.data.attrs["data-name"];
this.form.windowName = name;
} else {
this.form.windowName = "";
}
this.$forceUpdate();
},
// 保存
hideModal() {
......@@ -509,9 +535,11 @@ export default {
},
// 编辑
onEdit(data) {
this.editWindow(data.deptId);
this.form = { ...data };
this.form.loginName && this.$delete(this.form, "loginName");
this.form.loginPwd && this.$delete(this.form, "loginPwd");
this.form.windowId = this.form.windowId ? this.form.windowId : undefined;
if (this.form.photoPath) {
this.fileList = [
{
......@@ -523,16 +551,18 @@ export default {
},
];
}
// this.editWindow(data.deptId);
},
// 关闭对话框
handleClose() {
// this.$refs.formData.resetFields();
this.loading = false;
this.Visible = false;
this.form.windowName = "";
this.fileList = [];
this.$refs.formData.resetFields();
},
// 重置
handleReset() {
this.form.windowName = "";
this.$refs.formData.resetFields();
},
// 照片上传
......
base-manager-ui/admin/src/pages/basicset/workman/components/addpersonnel.vue
View file @ ed321a24
......@@ -39,8 +39,8 @@
<a-form-model-item label="所属部门" prop="deptId">
<a-select
showSearch
v-model="form.deptId"
optionFilterProp="label"
v-model="form.deptId"
placeholder="请选择部门"
@change="handleDeptSelect"
allowClear
......@@ -57,29 +57,36 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="经办人Id" prop="operatorId">
<a-input v-model="form.operatorId" placeholder="请输入经办人Id" />
</a-form-model-item>
</a-col>
<!-- <a-col :span="12">
<a-form-model-item label="所属窗口" prop="windowId">
<a-select
v-model="form.windowId"
placeholder="请选择窗口"
@change="handleWindowSelect"
showSearch
allowClear
optionFilterProp="label"
>
<a-select-option
v-for="v in windowData"
:key="v.id"
:value="v.id"
>{{ v.name }}</a-select-option
:label="v.name + v.fromnum"
:data-name="v.name"
>
<span>{{ v.name }}</span>
<span>--</span>
<span>{{ v.fromnum }}</span>
</a-select-option>
</a-select>
</a-form-model-item>
</a-col> -->
</a-col>
</a-row>
<a-row>
<a-col :span="12">
<a-form-model-item label="经办人Id" prop="operatorId">
<a-input v-model="form.operatorId" placeholder="请输入经办人Id" />
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="星级" prop="starlevel">
<a-select
......@@ -95,27 +102,27 @@
</a-select>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="12">
<a-form-model-item label="职务" prop="userpost">
<a-input v-model="form.userpost" placeholder="请输入职务" />
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="12">
<a-form-model-item label="职称" prop="posttitle">
<a-input v-model="form.posttitle" placeholder="请输入职称" />
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="政治面貌" prop="politicalstatus">
<a-form-model-item label="称号" prop="dangyuan">
<a-select
allowClear
v-model="form.politicalstatus"
placeholder="请选择政治面貌"
v-model="form.dangyuan"
placeholder="请选择称号"
>
<a-select-option
v-for="(value, key) in politicalDict"
v-for="(value, key) in designationDict"
:key="key"
:value="Number(key)"
>{{ value }}</a-select-option
......@@ -124,14 +131,14 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="称号" prop="dangyuan">
<a-form-model-item label="政治面貌" prop="politicalstatus">
<a-select
allowClear
v-model="form.dangyuan"
placeholder="请选择称号"
v-model="form.politicalstatus"
placeholder="请选择政治面貌"
>
<a-select-option
v-for="(value, key) in designationDict"
v-for="(value, key) in politicalDict"
:key="key"
:value="Number(key)"
>{{ value }}</a-select-option
......@@ -144,6 +151,11 @@
<a-input v-model="form.phone" placeholder="请输入电话" />
</a-form-model-item>
</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 v-if="form.dangyuan === 99">
<!-- <a-col :span="12"> </a-col> -->
......@@ -154,11 +166,6 @@
</a-col>
</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-form-model-item label="身份证" prop="idCard">
<a-input v-model="form.idCard" placeholder="请输入身份证号码" />
......@@ -426,7 +433,7 @@ export default {
loading: false,
imageUrl: "",
labelCol: { span: 5 },
wrapperCol: { span: 14 },
wrapperCol: { span: 19 },
indeterminate: true,
checkAll: false,
modelIds: [], // 模块
......@@ -442,7 +449,7 @@ export default {
deptId: undefined, // 部门id
deptName: "", //部门名称
windowName: "", // 窗口名称
// windowId: undefined, // 窗口id
windowId: undefined, // 窗口id
siteName: "", // 站点名称
siteId: "", // 站点id
name: "", // 姓名
......@@ -510,23 +517,40 @@ export default {
let res = await modelList({ page: 1, size: -1 });
this.modelIds = res.data.data.data;
},
// 获取窗口列表
async getWindowList(deptId) {
let windowData = [];
let res = await getWindowList({ deptId, page: 1, size: -1 });
if (res.data.code == 1) {
windowData = res.data.data.data;
}
return windowData;
},
// 部门选择
async handleDeptSelect(val, node) {
this.form.windowId = undefined;
let { text } = node.componentOptions.children[0];
this.form.deptName = text;
let res = await getWindowList({ deptId: val, page: 1, size: -1 });
this.windowData = res.data.data.data;
this.form.windowName = "";
if (val) {
let { text } = node.componentOptions.children[0];
this.form.deptName = text;
this.windowData = await this.getWindowList(val);
} else {
this.form.deptName = "";
this.windowData = [];
}
},
//编辑获取窗口
async editWindow(val) {
let res = await getWindowList({ deptId: val, page: 1, size: -1 });
this.windowData = res.data.data.data;
this.windowData = await this.getWindowList(val);
},
// 窗口选择
handleWindowSelect(val, node) {
let { text } = node.componentOptions.children[0];
this.form.windowName = text;
if (val) {
let name = node.data.attrs["data-name"];
this.form.windowName = name;
} else {
this.form.windowName = "";
}
},
// 保存
hideModal() {
......@@ -548,12 +572,12 @@ export default {
},
// 重置
handleReset() {
this.form.windowName = "";
this.$refs.formData.resetFields();
},
// 新增
onAdd() {
Object.assign(this.form, this.$options.data().form);
this.windowData = [];
this.form.id && this.$delete(this.form, "id");
},
// 编辑
......@@ -575,6 +599,9 @@ export default {
// 关闭对话框
handleClose() {
// this.$refs.formData.resetFields();
this.windowData = [];
this.fileList = [];
this.form.windowName = "";
this.loading = false;
this.Visible = false;
},
......
base-manager-ui/admin/src/pages/basicset/workman/personnel.vue
View file @ ed321a24
......@@ -233,7 +233,7 @@
</div>
<span v-else>--</span>
</template>
<!-- 创建时间 -->
<!-- 所属窗口 -->
<template slot="windowName" slot-scope="text">
{{ text.windowName ? text.windowName : "--" }}
</template>
......
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