|
|
@@ -492,7 +492,6 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="层次 :" prop="batchValue">
|
|
|
-
|
|
|
<el-select
|
|
|
clearable
|
|
|
v-model="ruleForm.batchValue"
|
|
|
@@ -2121,6 +2120,13 @@ const updateS = async (row) => {
|
|
|
ruleForm.id = row.id;
|
|
|
ruleForm.fillStatus = row.fillStatus;
|
|
|
|
|
|
+ ruleForm.oprovince = null;
|
|
|
+ ruleForm.ocity = null;
|
|
|
+ ruleForm.odistrict = null;
|
|
|
+ ruleForm.province = null;
|
|
|
+ ruleForm.city = null;
|
|
|
+ ruleForm.district = null;
|
|
|
+
|
|
|
let data = {
|
|
|
id: row.id, // 当前页
|
|
|
};
|
|
|
@@ -2158,21 +2164,34 @@ const updateS = async (row) => {
|
|
|
// 填报明细
|
|
|
ruleForm.phone = resData.phone;
|
|
|
|
|
|
- ruleForm.oprovince = `${resData.oprovince},${resData.oprovinceId}`;
|
|
|
- cityList("籍贯").then(() => {
|
|
|
- ruleForm.ocity = `${resData.ocity},${resData.ocityId}`;
|
|
|
- districtList("籍贯").then(() => {
|
|
|
- ruleForm.odistrict = `${resData.odistrict},${resData.odistrictId}`;
|
|
|
+ if (ruleForm.oprovince) {
|
|
|
+ ruleForm.oprovince = `${resData.oprovince},${resData.oprovinceId}`;
|
|
|
+ cityList("籍贯").then(() => {
|
|
|
+ if (ruleForm.ocity) {
|
|
|
+ ruleForm.ocity = `${resData.ocity},${resData.ocityId}`;
|
|
|
+ districtList("籍贯").then(() => {
|
|
|
+ if (ruleForm.odistrict) {
|
|
|
+ ruleForm.odistrict = `${resData.odistrict},${resData.odistrictId}`;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
});
|
|
|
- });
|
|
|
+ }
|
|
|
|
|
|
- ruleForm.province = `${resData.province},${resData.provinceId}`;
|
|
|
- cityList().then(() => {
|
|
|
- ruleForm.city = `${resData.city},${resData.cityId}`;
|
|
|
- districtList().then(() => {
|
|
|
- ruleForm.district = `${resData.district},${resData.districtId}`;
|
|
|
+ if (ruleForm.province) {
|
|
|
+ ruleForm.province = `${resData.province},${resData.provinceId}`;
|
|
|
+ cityList().then(() => {
|
|
|
+ if (ruleForm.city) {
|
|
|
+ ruleForm.city = `${resData.city},${resData.cityId}`;
|
|
|
+ districtList().then(() => {
|
|
|
+ if (ruleForm.district) {
|
|
|
+ ruleForm.district = `${resData.district},${resData.districtId}`;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
});
|
|
|
- });
|
|
|
+ }
|
|
|
+
|
|
|
ruleForm.address = resData.address;
|
|
|
|
|
|
ruleForm.registerOntime = resData.registerOntime ? 1 : 0; // 按时报到
|
|
|
@@ -2183,8 +2202,7 @@ const updateS = async (row) => {
|
|
|
? resData.arrvieDate.split(" ")[0]
|
|
|
: "";
|
|
|
|
|
|
- ruleForm.arriveTime = `${resData.arriveTime},${resData.arriveTimeId}`;
|
|
|
- console.log(`${resData.arriveTime},${resData.arriveTimeId}`);
|
|
|
+ ruleForm.arriveTime =resData.arriveTime? `${resData.arriveTime},${resData.arriveTimeId}`:'';
|
|
|
|
|
|
// 家庭成员
|
|
|
ruleForm.familys = resData.fvs;
|
|
|
@@ -2463,26 +2481,32 @@ const submitAdd = lodash.debounce(async (formEl) => {
|
|
|
politicalStatu: ruleForm.politicalStatu,
|
|
|
nationality: ruleForm.nationality,
|
|
|
phone: ruleForm.phone,
|
|
|
- oprovince: ruleForm.oprovince.split(",")[0],
|
|
|
- oprovinceId: ruleForm.oprovince.split(",")[1],
|
|
|
- ocity: ruleForm.ocity.split(",")[0],
|
|
|
- ocityId: ruleForm.ocity.split(",")[1],
|
|
|
- odistrict: ruleForm.odistrict.split(",")[0],
|
|
|
- odistrictId: ruleForm.odistrict.split(",")[1],
|
|
|
- province: ruleForm.province.split(",")[0],
|
|
|
- provinceId: ruleForm.province.split(",")[1],
|
|
|
- city: ruleForm.city.split(",")[0],
|
|
|
- cityId: ruleForm.city.split(",")[1],
|
|
|
- district: ruleForm.district.split(",")[0],
|
|
|
- districtId: ruleForm.district.split(",")[1],
|
|
|
+ oprovince: ruleForm.oprovince ? ruleForm.oprovince.split(",")[0] : "",
|
|
|
+ oprovinceId: ruleForm.oprovince ? ruleForm.oprovince.split(",")[1] : "",
|
|
|
+ ocity: ruleForm.ocity ? ruleForm.ocity.split(",")[0] : "",
|
|
|
+ ocityId: ruleForm.ocity ? ruleForm.ocity.split(",")[1] : "",
|
|
|
+ odistrict: ruleForm.odistrict ? ruleForm.odistrict.split(",")[0] : "",
|
|
|
+ odistrictId: ruleForm.odistrict ? ruleForm.odistrict.split(",")[1] : "",
|
|
|
+ province: ruleForm.province ? ruleForm.province.split(",")[0] : "",
|
|
|
+ provinceId: ruleForm.province ? ruleForm.province.split(",")[1] : "",
|
|
|
+ city: ruleForm.city ? ruleForm.city.split(",")[0] : "",
|
|
|
+ cityId: ruleForm.city ? ruleForm.city.split(",")[1] : "",
|
|
|
+ district: ruleForm.district ? ruleForm.district.split(",")[0] : "",
|
|
|
+ districtId: ruleForm.district ? ruleForm.district.split(",")[1] : "",
|
|
|
address: ruleForm.address,
|
|
|
registerOntime: ruleForm.registerOntime,
|
|
|
zipCode: ruleForm.zipCode,
|
|
|
trafficMethod: ruleForm.trafficMethod,
|
|
|
arrive: ruleForm.arrive,
|
|
|
- arrvieDate: ruleForm.arrvieDate?`${ruleForm.arrvieDate} 00:00:00`:'',
|
|
|
- arriveTime: ruleForm.arriveTime.split(",")[0],
|
|
|
- arriveTimeId: ruleForm.arriveTime.split(",")[1],
|
|
|
+ arrvieDate: ruleForm.arrvieDate
|
|
|
+ ? `${ruleForm.arrvieDate} 00:00:00`
|
|
|
+ : "",
|
|
|
+ arriveTime: ruleForm.arriveTime
|
|
|
+ ? ruleForm.arriveTime.split(",")[0]
|
|
|
+ : "",
|
|
|
+ arriveTimeId: ruleForm.arriveTime
|
|
|
+ ? ruleForm.arriveTime.split(",")[1]
|
|
|
+ : "",
|
|
|
build: "",
|
|
|
buildId: "",
|
|
|
dormitory: "",
|