|
@@ -33,7 +33,7 @@
|
|
|
> -->
|
|
|
</div>
|
|
|
<el-form :inline="true">
|
|
|
- <el-form-item class="mr10" prop="keyword" label="">
|
|
|
+ <el-form-item prop="keyword" label="">
|
|
|
<el-input
|
|
|
placeholder="请输入学生姓名"
|
|
|
v-model="keyword"
|
|
@@ -41,7 +41,7 @@
|
|
|
@clear="getListData"
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="mr10" prop="xdx_xsxh" label="">
|
|
|
+ <el-form-item prop="xdx_xsxh" label="">
|
|
|
<el-input
|
|
|
v-model="xdx_xsxh"
|
|
|
placeholder="请输入学籍号"
|
|
@@ -49,7 +49,7 @@
|
|
|
@clear="getListData"
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="mr10" prop="xdx_lxfs" label="">
|
|
|
+ <el-form-item prop="xdx_lxfs" label="">
|
|
|
<el-input
|
|
|
v-model="xdx_lxfs"
|
|
|
clearable
|
|
@@ -57,7 +57,7 @@
|
|
|
placeholder="请输入手机号码"
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="mr10" prop="class_name" label="">
|
|
|
+ <el-form-item prop="class_name" label="">
|
|
|
<el-input
|
|
|
v-model="class_name"
|
|
|
clearable
|
|
@@ -133,25 +133,25 @@
|
|
|
</footer>
|
|
|
|
|
|
<el-dialog :title="title" :visible.sync="dialogFormVisible" width="700px">
|
|
|
- <el-form :inline="true" :model="dialogForm" label-width="100px">
|
|
|
+ <el-form
|
|
|
+ :inline="true"
|
|
|
+ :model="dialogForm"
|
|
|
+ label-width="100px"
|
|
|
+ label-position="right"
|
|
|
+ >
|
|
|
<h4 class="mb20 ml20 font-size-15 color-2">基本信息</h4>
|
|
|
- <el-form-item class="mr75" label="学生姓名" prop="xsxm">
|
|
|
+ <el-form-item label="学生姓名" prop="xsxm">
|
|
|
<el-input v-model="dialogForm.xsxm"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="mr10" label="学籍号" prop="xsxh">
|
|
|
+ <el-form-item label="学籍号" prop="xsxh">
|
|
|
<el-input v-model="dialogForm.xsxh"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="mr75" label="年龄" prop="nl">
|
|
|
+ <el-form-item label="年龄" prop="nl">
|
|
|
<el-input v-model="dialogForm.nl"></el-input>
|
|
|
</el-form-item>
|
|
|
|
|
|
- <el-form-item class="mr10" label="班级" prop="bj">
|
|
|
- <el-select
|
|
|
- class="mr10"
|
|
|
- clearable
|
|
|
- v-model="dialogForm.bj"
|
|
|
- placeholder="选择班级"
|
|
|
- >
|
|
|
+ <el-form-item label="班级" prop="bj">
|
|
|
+ <el-select clearable v-model="dialogForm.bj" placeholder="选择班级">
|
|
|
<el-option
|
|
|
v-for="(item, index) in classData"
|
|
|
:key="index"
|
|
@@ -161,9 +161,8 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="mr75" label="证件类型" prop="zjlx">
|
|
|
+ <el-form-item label="证件类型" prop="zjlx">
|
|
|
<el-select
|
|
|
- class="mr10"
|
|
|
clearable
|
|
|
v-model="dialogForm.zjlx"
|
|
|
placeholder="选择证件类型"
|
|
@@ -177,15 +176,14 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="mr10" label="身份号码" prop="sfhm">
|
|
|
+ <el-form-item label="身份号码" prop="sfhm">
|
|
|
<el-input v-model="dialogForm.sfhm"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="mr75" label="籍贯" prop="jg">
|
|
|
+ <el-form-item label="籍贯" prop="jg">
|
|
|
<el-input v-model="dialogForm.jg"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="mr10" label="出生年月" prop="csny">
|
|
|
+ <el-form-item label="出生年月" prop="csny">
|
|
|
<el-date-picker
|
|
|
- style="width: 191px"
|
|
|
v-model="dialogForm.csny"
|
|
|
type="date"
|
|
|
value-format="yyyy-MM-dd"
|
|
@@ -193,28 +191,28 @@
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
|
|
|
- <el-form-item class="mr75" label="曾用名" prop="cym">
|
|
|
+ <el-form-item label="曾用名" prop="cym">
|
|
|
<el-input v-model="dialogForm.cym"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="mr75" label="性别" prop="xb">
|
|
|
+ <el-form-item label="性别" prop="xb">
|
|
|
<el-radio-group v-model="dialogForm.xb">
|
|
|
<el-radio label="1">男</el-radio>
|
|
|
<el-radio label="2">女</el-radio>
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="mr75" label="血型" prop="xx">
|
|
|
+ <el-form-item label="血型" prop="xx">
|
|
|
<el-input v-model="dialogForm.xx"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="mr75" label="民族" prop="mz">
|
|
|
+ <el-form-item label="民族" prop="mz">
|
|
|
<el-input v-model="dialogForm.mz"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="mr10" label="政治面貌" prop="zzmm">
|
|
|
+ <el-form-item label="政治面貌" prop="zzmm">
|
|
|
<el-input v-model="dialogForm.zzmm"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="mr75" label="文化程度" prop="whcd">
|
|
|
+ <el-form-item label="文化程度" prop="whcd">
|
|
|
<el-input v-model="dialogForm.whcd"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="mr10" label="入党时间" prop="rdsj">
|
|
|
+ <el-form-item label="入党时间" prop="rdsj">
|
|
|
<el-date-picker
|
|
|
style="width: 191px"
|
|
|
v-model="dialogForm.rdsj"
|
|
@@ -223,16 +221,16 @@
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="mr75" label="所在支部" prop="szzb">
|
|
|
+ <el-form-item label="所在支部" prop="szzb">
|
|
|
<el-input v-model="dialogForm.szzb"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="mr10" label="所在党小组" prop="szdxz">
|
|
|
+ <el-form-item label="所在党小组" prop="szdxz">
|
|
|
<el-input v-model="dialogForm.szdxz"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="mr75" label="家庭住址" prop="jtzz">
|
|
|
+ <el-form-item label="家庭住址" prop="jtzz">
|
|
|
<el-input v-model="dialogForm.jtzz"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="mr75" label="详细地址" prop="xxdz">
|
|
|
+ <el-form-item label="详细地址" prop="xxdz">
|
|
|
<el-input v-model="dialogForm.xxdz"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="联系方式" prop="lxfs">
|
|
@@ -272,26 +270,43 @@
|
|
|
<div class="w-80px">
|
|
|
<h4 class="mb20 ml20 font-size-15 color-2">家庭主要</h4>
|
|
|
</div>
|
|
|
- <div>
|
|
|
- <el-form-item class="mr75" label="称谓" prop="xdx_jtcy">
|
|
|
- <el-input v-model="memberData.xdx_jtcy"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item class="mr10" label="姓名" prop="xdxj_xm">
|
|
|
- <el-input v-model="memberData.xdxj_xm"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item class="mr75" label="政治面貌" prop="xdxj_zzmm">
|
|
|
- <el-input v-model="memberData.xdxj_zzmm"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item class="mr10" label="工作单位" prop="xdxj_gzdw">
|
|
|
- <el-input v-model="memberData.xdxj_gzdw"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item class="mr75" label="职务" prop="xdxj_zw">
|
|
|
- <el-input v-model="memberData.xdxj_zw"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item class="mr10" label="手机号码" prop="xdxj_sjhm">
|
|
|
- <el-input v-model="memberData.xdxj_sjhm"></el-input>
|
|
|
- </el-form-item>
|
|
|
+ <div v-for="(children, ci) in childrenData" :key="ci">
|
|
|
+ <div class="d-flex flex-between mh25">
|
|
|
+ <div class="title">
|
|
|
+ <span>家庭成员</span>
|
|
|
+ <span v-if="childrenData.length > 1">{{ ci + 1 }}</span>
|
|
|
+ </div>
|
|
|
+ <el-button
|
|
|
+ v-if="childrenData.length > 1"
|
|
|
+ type="primary"
|
|
|
+ size="small"
|
|
|
+ plain
|
|
|
+ @click="handleRemoveCy(childrenData, ci)"
|
|
|
+ >
|
|
|
+ 删除
|
|
|
+ </el-button>
|
|
|
+ </div>
|
|
|
+ <div class="mb20">
|
|
|
+ <el-form-item
|
|
|
+ class="mv15"
|
|
|
+ v-for="(item, index) in children.data"
|
|
|
+ :key="index"
|
|
|
+ :label="item.name"
|
|
|
+ :prop="item.key"
|
|
|
+ >
|
|
|
+ <el-input v-model="item.value" />
|
|
|
+ </el-form-item>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
+ <el-button
|
|
|
+ style="margin: 20px 30px"
|
|
|
+ type="primary"
|
|
|
+ size="small"
|
|
|
+ plain
|
|
|
+ @click="handleAddCy(children)"
|
|
|
+ >
|
|
|
+ 添加成员
|
|
|
+ </el-button>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
@@ -304,19 +319,19 @@
|
|
|
<el-radio label="2">否</el-radio>
|
|
|
</el-radio-group>
|
|
|
<div>
|
|
|
- <div class="flex items-center space-x-4">
|
|
|
- <el-input v-model="dialogForm.xdx_hjry"></el-input>
|
|
|
+ <div class="d-flex flex-v-mid">
|
|
|
+ <el-input v-model="dialogForm.xdx_hjry" class="mr10"></el-input>
|
|
|
<el-button type="primary" size="small" @click="handleAddRymc">
|
|
|
添加荣誉
|
|
|
</el-button>
|
|
|
</div>
|
|
|
<div>
|
|
|
<div
|
|
|
- class="flex items-center space-x-4"
|
|
|
+ class="d-flex flex-v-mid"
|
|
|
v-for="(val, i) in rymcData"
|
|
|
:key="i"
|
|
|
>
|
|
|
- <span class="rymcName">{{ val.xdxr_shrymc }}</span>
|
|
|
+ <span class="mr10">{{ val.xdxr_shrymc }}</span>
|
|
|
<i
|
|
|
class="el-icon-close"
|
|
|
style="color: #3f8cff"
|
|
@@ -328,7 +343,7 @@
|
|
|
</el-form-item>
|
|
|
|
|
|
<h4 class="mb20 ml20 font-size-15 color-2">异动管理</h4>
|
|
|
- <el-form-item class="mr75" label="当前状态" prop="yddqzt">
|
|
|
+ <el-form-item label="当前状态" prop="yddqzt">
|
|
|
<el-radio-group v-model="dialogForm.yddqzt">
|
|
|
<el-radio label="1">退学</el-radio>
|
|
|
<el-radio label="2">转班</el-radio>
|
|
@@ -361,13 +376,10 @@ import {
|
|
|
hmc_edit,
|
|
|
hmc_del,
|
|
|
bjgl_list,
|
|
|
- hmc_export,
|
|
|
- jtcy_list,
|
|
|
- jtcy_add,
|
|
|
- jtcy_edit,
|
|
|
- jtcy_detail,
|
|
|
- jtcy_del,
|
|
|
- jtcy_export,
|
|
|
+ family_list,
|
|
|
+ family_edit,
|
|
|
+ family_add,
|
|
|
+ family_del,
|
|
|
ry_list,
|
|
|
ry_add,
|
|
|
ry_del,
|
|
@@ -419,24 +431,11 @@ export default {
|
|
|
szzb: "",
|
|
|
szdxz: "",
|
|
|
xdx_hjry: "",
|
|
|
- xdx_jtcy: "",
|
|
|
},
|
|
|
- memberData: [
|
|
|
- {
|
|
|
- xdxj_cw: "",
|
|
|
- xdxj_xm: "",
|
|
|
- xdxj_zzmm: "",
|
|
|
- xdxj_gzdw: "",
|
|
|
- xdxj_zw: "",
|
|
|
- xdxj_sjhm: "",
|
|
|
- },
|
|
|
- ],
|
|
|
+
|
|
|
tableData: [],
|
|
|
termList: [],
|
|
|
gradeList: [],
|
|
|
- dynamicTags: ["全国先进工作者", "优秀党务工作者"],
|
|
|
- inputVisible: false,
|
|
|
- inputValue: "",
|
|
|
title: "",
|
|
|
xdbs_jclx: [],
|
|
|
id: "",
|
|
@@ -459,36 +458,70 @@ export default {
|
|
|
zjlx_list: [],
|
|
|
rymcData: [],
|
|
|
xdxr_shrymc: "",
|
|
|
+ childrenData: [],
|
|
|
+ children: [
|
|
|
+ {
|
|
|
+ name: "称谓",
|
|
|
+ key: "xdxj_cw",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "姓名",
|
|
|
+ key: "xdxj_xm",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "政治面貌",
|
|
|
+ key: "xdxj_zzmm",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "工作单位",
|
|
|
+ key: "xdxj_gzdw",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "职位",
|
|
|
+ key: "xdxj_zw",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "手机号码",
|
|
|
+ key: "xdxj_sjhm",
|
|
|
+ },
|
|
|
+ ],
|
|
|
};
|
|
|
},
|
|
|
methods: {
|
|
|
+ handleAddCy(value) {
|
|
|
+ const data = JSON.parse(JSON.stringify(value));
|
|
|
+ data.map((val) => {
|
|
|
+ val.value = "";
|
|
|
+ });
|
|
|
+ console.log(data, "data");
|
|
|
+ this.childrenData.push({
|
|
|
+ xdxj_id: "",
|
|
|
+ data,
|
|
|
+ });
|
|
|
+ console.log(this.childrenData, "childrenData");
|
|
|
+ },
|
|
|
+ handleRemoveCy(data, i) {
|
|
|
+ if (data[i].xdxj_id) {
|
|
|
+ family_del({ xdxj_id: data[i].xdxj_id });
|
|
|
+ }
|
|
|
+ data.splice(i, 1);
|
|
|
+ },
|
|
|
+
|
|
|
handleAddRymc() {
|
|
|
const obj = {
|
|
|
xdxr_shrymc: this.dialogForm.xdx_hjry,
|
|
|
xdxr_xsxh: this.dialogForm.xsxh,
|
|
|
};
|
|
|
- console.log(obj, 11111111);
|
|
|
ry_add(obj).then((res) => {
|
|
|
this.rymcData.unshift({ xdxr_shrymc: this.dialogForm.xdx_hjry });
|
|
|
this.xdxr_shrymc = "";
|
|
|
});
|
|
|
},
|
|
|
handleRemoveRymc(i) {
|
|
|
- console.log(i, 1111);
|
|
|
ry_del({ xdxr_id: i.xdxr_id }).then((res) => {
|
|
|
this.rymcData.splice(i, 1);
|
|
|
});
|
|
|
},
|
|
|
- addMember() {
|
|
|
- this.memberData.push({
|
|
|
- xdxj_cw: "",
|
|
|
- xdxj_xm: "",
|
|
|
- xdxj_zzmm: "",
|
|
|
- xdxj_gzdw: "",
|
|
|
- xdxj_zw: "",
|
|
|
- xdxj_sjhm: "",
|
|
|
- });
|
|
|
- },
|
|
|
|
|
|
//班级
|
|
|
getClassData() {
|
|
@@ -519,6 +552,29 @@ export default {
|
|
|
this.total = Number(res.data.total_rows);
|
|
|
});
|
|
|
},
|
|
|
+ jtcyData(id) {
|
|
|
+ let data = {
|
|
|
+ xdx_id: id,
|
|
|
+ };
|
|
|
+ family_list(data).then((res) => {
|
|
|
+ this.loading = false;
|
|
|
+ const data = res.data.page_data;
|
|
|
+ this.childrenData = [];
|
|
|
+ if (data.length != 0) {
|
|
|
+ data.map((value) => {
|
|
|
+ const children = JSON.parse(JSON.stringify(this.children));
|
|
|
+ children.map((val) => {
|
|
|
+ val.value = value[val.key];
|
|
|
+ });
|
|
|
+ this.childrenData.unshift({
|
|
|
+ xdxj_id: value.xdxj_id,
|
|
|
+ data: children,
|
|
|
+ });
|
|
|
+ console.log(id, this.childrenData, 99);
|
|
|
+ });
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
addData() {
|
|
|
this.title = "添加/申请";
|
|
|
this.dialogForm = {
|
|
@@ -549,7 +605,6 @@ export default {
|
|
|
szzb: "",
|
|
|
szdxz: "",
|
|
|
xdx_hjry: "",
|
|
|
- xdx_jtcy: "",
|
|
|
};
|
|
|
this.isEdit = false;
|
|
|
this.dialogFormVisible = true;
|
|
@@ -642,15 +697,10 @@ export default {
|
|
|
this.dialogForm.szzb = item.xdx_szzb;
|
|
|
this.dialogForm.szdxz = item.xdx_szdxz;
|
|
|
this.dialogForm.xdx_hjry = item.xdx_hjry;
|
|
|
- console.log(item, 111);
|
|
|
- this.dialogForm.xdx_jtcy = item.xdx_jtcy;
|
|
|
- // if (m != "") {
|
|
|
- // this.memberData = JSON.parse(m);
|
|
|
- // }
|
|
|
+ this.jtcyData(item.xdx_id);
|
|
|
ry_list({ xdxr_xsxh: item.xsxh }).then((res) => {
|
|
|
if (res.code == 1) {
|
|
|
this.rymcData = res.data.page_data;
|
|
|
- console.log(this.rymcData, 333333);
|
|
|
this.dialogForm.sfhj = this.rymcData.length != 0 ? "1" : "2";
|
|
|
}
|
|
|
});
|
|
@@ -684,8 +734,6 @@ export default {
|
|
|
xdx_szzb: this.dialogForm.szzb,
|
|
|
xdx_szdxz: this.dialogForm.szdxz,
|
|
|
xdx_hjry: this.dialogForm.xdx_hjry,
|
|
|
- xdx_jtcy: this.dialogForm.xdx_jtcy,
|
|
|
- // xdx_jtcy: JSON.stringify(this.memberData),
|
|
|
};
|
|
|
if (!this.isEdit) {
|
|
|
hmc_add(data).then((res) => {
|
|
@@ -721,6 +769,28 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
});
|
|
|
+ if (this.childrenData) {
|
|
|
+ console.log(this.childrenData, 444);
|
|
|
+ this.childrenData.map((item) => {
|
|
|
+ const obj = { xdx_id: this.id };
|
|
|
+ item.data.map((val) => {
|
|
|
+ obj[val.key] = val.value;
|
|
|
+ });
|
|
|
+ let data1 = {
|
|
|
+ xddy_dygl_xsxjk_jtcy: obj,
|
|
|
+ };
|
|
|
+ console.log(data1, "data1");
|
|
|
+
|
|
|
+ if (item.xdxj_id == "") {
|
|
|
+ family_add(data1);
|
|
|
+ this.jtcyData(this.id);
|
|
|
+ } else {
|
|
|
+ data1 = Object.assign({ xdxj_id: item.xdxj_id }, data1);
|
|
|
+ family_edit(data1);
|
|
|
+ this.jtcyData(this.id);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
|
|
@@ -728,10 +798,6 @@ export default {
|
|
|
this.dialogFormVisible = false;
|
|
|
},
|
|
|
|
|
|
- handleClose(tag) {
|
|
|
- this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1);
|
|
|
- },
|
|
|
-
|
|
|
exportModle() {
|
|
|
let link =
|
|
|
window.globalVariables.api +
|
|
@@ -784,6 +850,12 @@ export default {
|
|
|
|
|
|
<style scoped lang="scss" scoped>
|
|
|
::v-deep .el-input {
|
|
|
- width: 160px;
|
|
|
+ width: 180px;
|
|
|
+}
|
|
|
+.title {
|
|
|
+ color: #3f8cff;
|
|
|
+ font-size: 16px;
|
|
|
+ font-weight: 600;
|
|
|
+ line-height: 22px;
|
|
|
}
|
|
|
</style>
|