|
|
@@ -114,16 +114,16 @@
|
|
|
</el-row>
|
|
|
|
|
|
<el-row :gutter="20">
|
|
|
- <el-col :span="6">
|
|
|
+ <el-col :span="11">
|
|
|
<el-form-item label="负责人（站长）" prop="charger">
|
|
|
<el-input v-model="form.charger" placeholder="请输入负责人（站长）" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="5">
|
|
|
+ <!-- <el-col :span="5"> -->
|
|
|
<!-- <el-button type="primary" size="small" @click="addNewPeople">新增人员</el-button> -->
|
|
|
<!-- <el-button type="primary" size="small" @click="submitFormBut">提交新人员</el-button> -->
|
|
|
- </el-col>
|
|
|
- <el-col :span="9">
|
|
|
+ <!-- </el-col> -->
|
|
|
+ <el-col :span="11">
|
|
|
<el-form-item label="报警电话" prop="alarmTel">
|
|
|
<el-input v-model="form.alarmTel" placeholder="请输入报警电话" />
|
|
|
</el-form-item></el-col>
|
|
|
@@ -216,21 +216,24 @@
|
|
|
<el-dialog title="编辑人员" :visible.sync="insideModal" width="50%">
|
|
|
<el-form ref="form" :model="insideForm" label-width="80px">
|
|
|
<el-form-item label="姓名">
|
|
|
- <el-input v-model="insideForm.name"></el-input>
|
|
|
+ <el-input v-model="insideForm.name" @blur="nameBlur"></el-input>
|
|
|
+ <span v-if="nameRule" style="color: red;font-size: 12px;">名字不能为空</span>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="人员类型">
|
|
|
<!-- <el-input v-model="insideForm.type"></el-input> -->
|
|
|
<el-select v-model="insideForm.type" placeholder="请选择">
|
|
|
- <el-option key="0" label="普通人员" value="0"/>
|
|
|
- <el-option key="1" label="值班人员" value="1"/>
|
|
|
- <el-option key="2" label="站长" value="2"/>
|
|
|
+ <el-option key="0" label="普通人员" value="0" />
|
|
|
+ <el-option key="1" label="值班人员" value="1" />
|
|
|
+ <el-option key="2" label="站长" value="2" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="身份证">
|
|
|
- <el-input v-model="insideForm.idcard"></el-input>
|
|
|
+ <el-input v-model="insideForm.idcard" @blur="idcardBlur"></el-input>
|
|
|
+ <span v-if="idcardRule" style="color: red;font-size: 12px;">身份证号有误</span>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="电话号">
|
|
|
- <el-input v-model="insideForm.phone"></el-input>
|
|
|
+ <el-input v-model="insideForm.phone" @blur="phoneBlur"></el-input>
|
|
|
+ <span v-if="phoneRule" style="color: red;font-size: 12px;">电话号有误</span>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
@@ -300,7 +303,11 @@ export default {
|
|
|
idcard: "",
|
|
|
phone: ""
|
|
|
},
|
|
|
- insideUpdateId:'',
|
|
|
+ insideUpdateId: '',
|
|
|
+ nameRule: false,
|
|
|
+ idcardRule: false,
|
|
|
+ phoneRule: false,
|
|
|
+ firestationid: "",
|
|
|
}
|
|
|
},
|
|
|
props: ["orgId"],
|
|
|
@@ -508,13 +515,14 @@ export default {
|
|
|
// 执行其他操作，如提交表单
|
|
|
},
|
|
|
searchAllPeople(row) {
|
|
|
+ this.firestationid = row.id
|
|
|
getAllPeople({ pageNo: 1, pageSize: 10, microstationid: row.id }).then(res => {
|
|
|
this.firePeople = res.data.list
|
|
|
})
|
|
|
this.lookFirePeople = true
|
|
|
},
|
|
|
makeSureFire() {
|
|
|
-
|
|
|
+ this.lookFirePeople = false
|
|
|
},
|
|
|
delPeople(row) {
|
|
|
delFirePeople(row.id).then(res => {
|
|
|
@@ -523,12 +531,16 @@ export default {
|
|
|
message: '删除成功',
|
|
|
type: 'success'
|
|
|
});
|
|
|
+ getAllPeople({ pageNo: 1, pageSize: 10, microstationid: this.firestationid }).then(res => {
|
|
|
+ this.firePeople = res.data.list
|
|
|
+ })
|
|
|
}
|
|
|
})
|
|
|
- this.lookFirePeople = false
|
|
|
+ // this.lookFirePeople = false
|
|
|
+
|
|
|
},
|
|
|
editPeople(row) {
|
|
|
- console.log(row, 'inside');
|
|
|
+ // console.log(row, 'inside');
|
|
|
this.insideForm.name = row.empName
|
|
|
this.insideForm.idcard = row.idcardno
|
|
|
this.insideForm.phone = row.mobile
|
|
|
@@ -537,7 +549,52 @@ export default {
|
|
|
this.insideModal = true
|
|
|
},
|
|
|
insideSure() {
|
|
|
- // editFirePeople({id:this.insideUpdateId,empName:this.insideForm.name})
|
|
|
+ if (!(this.nameRule || this.phoneRule || this.idcardRule)) {
|
|
|
+ // 当 nameRule、phoneRule 和 idcardRule 都为 false 时，执行这里的代码
|
|
|
+ editFirePeople({ id: this.insideUpdateId, empName: this.insideForm.name, empType: this.insideForm.type, idcardno: this.insideForm.idcard, mobile: this.insideForm.phone }).then(res => {
|
|
|
+ // console.log(res,'update');
|
|
|
+ if (res.data) {
|
|
|
+ this.$message({
|
|
|
+ message: '修改成功',
|
|
|
+ type: 'success'
|
|
|
+ });
|
|
|
+ this.insideModal = false
|
|
|
+ this.lookFirePeople = false
|
|
|
+ }
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ this.$message({
|
|
|
+ message: '请检查表单项',
|
|
|
+ type: 'error'
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ },
|
|
|
+ nameBlur() {
|
|
|
+ if (this.insideForm.name === '') {
|
|
|
+ this.nameRule = true
|
|
|
+ } else {
|
|
|
+ this.nameRule = false
|
|
|
+ }
|
|
|
+ },
|
|
|
+ idcardBlur() {
|
|
|
+ const idCardRegex = /^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2]\d|3[0-1])\d{3}[\dXx]$/;
|
|
|
+ if (idCardRegex.test(this.insideForm.idcard)) {
|
|
|
+ this.idcardRule = false
|
|
|
+ } else {
|
|
|
+ this.idcardRule = true
|
|
|
+ }
|
|
|
+ },
|
|
|
+ phoneBlur() {
|
|
|
+ console.log(211);
|
|
|
+ const phoneRegex = /^1[3456789]\d{9}$/;
|
|
|
+ if (phoneRegex.test(this.insideForm.phone)) {
|
|
|
+ this.phoneRule = false
|
|
|
+ } else {
|
|
|
+ this.phoneRule = true
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
liyangzheng