Skip to content

Z
zj-manage
Commit f6b809c5 by songwenlu
Options

gx

parent cb09a948
Showing with 99 additions and 50 deletions
src/utils/request.js
......@@ -3,9 +3,9 @@ import { Message } from "element-ui";
import { getToken } from "@/utils/auth";
const config = {
// proxy: "https://exam.smart-zj.cn:9100/exam/", // 新线上地址
proxy: "http://81.69.231.72:8881/", // 测试地址
// proxy: "http://81.69.231.72:8881/", // 测试地址
proxy: "http://192.168.3.87:8881/", //本地
};
//axios基本配置
......@@ -73,11 +73,10 @@ api1.interceptors.response.use(
const res = response.data;
if (parseInt(res.code) === 200) {
return Promise.resolve(response).then(checkCode);
}
}
if (parseInt(res.code) === 1002) {
return Promise.resolve(response).then(checkCode);
}
else {
} else {
Message.error(res.message || "网络错误");
return Promise.resolve(response).then(checkCode);
}
......
src/views/FamilyManage/index.vue
......@@ -28,6 +28,7 @@
clearable
placeholder="请输入居住地址"
>
<el-option label="全部" value=""></el-option>
<el-option
v-for="item in options"
:key="item.value"
......@@ -44,6 +45,7 @@
clearable
placeholder="请输入状态码"
>
<el-option label="全部" value=""></el-option>
<el-option
v-for="item in reviewStateOptions"
:key="item.value"
......@@ -167,7 +169,7 @@
<!-- 通过0 拒绝1 -->
<div v-if="flag == 1">
<span>确定拒绝该家庭码的申请吗？确定的话请输入拒绝原因</span>
<div style="margin-top: 15px">
<!-- <div style="margin-top: 15px">
<el-input
type="textarea"
:autosize="{ minRows: 4, maxRows: 4 }"
......@@ -175,17 +177,28 @@
v-model="auditData.record"
>
</el-input>
</div>
</div> -->
</div>
<div v-else>
<span
>确定通过该家庭码的申请吗？确定的话请<span style="color: red"
>选择通过状态</span
>和输入说明</span
>
<el-form :model="auditData" label-width="80px" ref="form">
<el-form-item label="状态码">
</div>
<div>
<el-form
:model="auditData"
label-width="80px"
ref="auditForm"
:rules="auditRules"
>
<el-form-item
label="状态码"
prop="stateCode"
require
v-if="flag == 0"
>
<el-select
v-model="auditData.stateCode"
placeholder="请选择通过状态"
......@@ -199,7 +212,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="说明" prop="record">
<el-form-item label="说明" prop="record" require>
<el-input
type="textarea"
placeholder="请输入说明"
......@@ -263,10 +276,7 @@
<p class="label">婚姻状况</p>
<p class="value">{{ viewDetail.marriageState }}</p>
</div>
<div class="cell">
<p class="label">婚姻状况编码</p>
<p class="value">{{ viewDetail.marriageCode }}</p>
</div>
<div class="cell" v-if="viewDetail.weddingDate">
<p class="label">结婚日期</p>
<p class="value">{{ viewDetail.weddingDate }}</p>
......@@ -378,7 +388,10 @@
</el-image>
</p>
</div>
<div class="cell" v-if="viewDetail.partnerVO.birthCertificate?.length>0">
<div
class="cell"
v-if="viewDetail.partnerVO.birthCertificate?.length > 0"
>
<p class="label">生育登记证明</p>
<p class="value">
<el-image
......@@ -393,7 +406,7 @@
</p>
</div>
</div>
<div class="children" v-if="viewDetail.childrenVOList?.length>0">
<div class="children" v-if="viewDetail.childrenVOList?.length > 0">
<div
class="card"
v-for="(item, index) in viewDetail.childrenVOList"
......@@ -516,10 +529,17 @@
>
<div class="content">
<template v-if="record && record.length > 0">
<div class="cell" :key="index" v-for="(item, index) in record">
<p class="label" style="margin-right: 20px">
<div
class="cell"
:key="index"
v-for="(item, index) in record"
style="font-size: 16px"
>
<p class="label" style="margin-right: 30px">
{{ item?.state }}
<!-- <span v-if="item?.record">({{ item?.record }})</span> -->
<span v-if="item?.record" style="color: red; font-size: 16px"
>({{ item?.record }})</span
>
</p>
<div class="info">
<p class="item">操作人：{{ item?.departName }}</p>
......@@ -551,8 +571,7 @@ export default {
data() {
return {
auditDialog: false,
refuseValue: "",
refuseTextarea: null,
refuseCode: "",
// 居住地址
......@@ -577,6 +596,7 @@ export default {
record: "", //评语
departName: "卫健委",
familyCode: "",
user: "",
},
// 人才类型
tableData: [],
......@@ -650,6 +670,18 @@ export default {
viewRow: {},
flag: 0,
passOptions: [], //审核通过的状态
auditRules: {
stateCode: {
required: true,
message: "请选择审批状态",
trigger: "blur",
},
record: {
required: true,
message: "请输入说明",
trigger: "blur",
},
},
};
},
watch: {
......@@ -813,41 +845,59 @@ export default {
this.refuseCode = talentCode;
},
cancelBtn() {
this.refuseTextarea = null;
this.refuseValue = "";
this.auditData = {
state: "",
stateCode: "",
record: "", //评语
departName: "卫健委",
familyCode: "",
user: "",
};
this.auditDialog = false;
},
confirmBtn() {
if (this.flag == 0) {
// 通过
if (this.auditData.stateCode) {
console.log(this.auditData, "审核");
familyAudit(this.auditData).then((res) => {
if (res.code == 200) {
this.$message.success(res.msg || "审核成功");
this.auditDialog = false;
this.init();
this.$refs.auditForm.validate((valid) => {
if (valid) {
if (this.flag == 0) {
// 通过
this.passOptions.forEach((el) => {
if (el.value == this.auditData.stateCode) {
this.auditData.state = el.label;
}
});
this.auditData.user = localStorage.getItem("userName");
if (this.auditData.stateCode) {
familyAudit(this.auditData).then((res) => {
if (res.code == 200) {
this.$message.success(res.msg || "审核成功");
this.auditDialog = false;
this.init();
} else {
this.$message.success(res.msg || "审核失败");
}
});
} else {
this.$message.success(res.msg || "审核失败");
this.$message.warning("请先选择审批状态");
}
});
} else {
this.$message.warning("请先选择审批状态");
}
} else {
this.auditData.state = "不符合";
this.auditData.stateCode = "002";
familyAudit(this.auditData).then((res) => {
if (res.code == 200) {
console.log(res, 111);
this.$message.success(res.msg || "审核成功");
this.auditDialog = false;
this.init();
} else {
this.$message.success(res.msg || "审核失败");
this.auditData.state = "不符合";
this.auditData.stateCode = "002";
familyAudit(this.auditData).then((res) => {
if (res.code == 200) {
console.log(res, 111);
this.$message.success(res.msg || "审核成功");
this.auditDialog = false;
this.init();
} else {
this.$message.success(res.msg || "审核失败");
}
});
}
});
}
} else {
return false;
}
});
},
},
mounted() {},
......
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