guoyuepeng
/
qa-prevention-gwj-vue
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

【bug】 

1. 排班登记管理搜索报错
2. 企业应急人员新增、修改页面字段不一致
pet
shanao 2024-12-11 15:49:28 +08:00
parent 8a22dc94ea
commit cfdb68dafb
3 changed files with 90 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/emergen_cyrescue/emergency_information/emergency_knowledge/case_library/components/casebasic.vue
View File

@ -281,10 +281,11 @@ export default {
//* ***************************数据保存**********************************
handleEdit(v) {
this.dialogFormEdit = true
const newVar = v.LEVEL == null || v.LEVEL === '' ? null : v.LEVEL
this.form = {
TITLE: v.TITLE,
CONTENT: v.CONTENT,
LEVEL: v.LEVEL,
LEVEL: newVar,
ID: v.ID
}
this.dialogType = 'editUser'
@ -315,6 +316,8 @@ export default {
},
dataSave() {
this.listLoading = true
// 避免修改时mybatis-plus 自动过滤空值
this.form.LEVEL = this.form.LEVEL == null ? '' : this.form.LEVEL
requestFN(
'/caseLibrary/save', this.form
).then((data) => {

104
src/views/emergen_cyrescue/emergency_information/emergency_management_agency/emergency_personnel/components/list.vue
View File

@ -57,46 +57,106 @@
<!-- 查看弹窗 -->
<el-dialog :visible.sync="dialogFormShow" title="详情" width="1000px">
<!-- <el-form :model="form" label-width="100px" style="margin-right: 10px">-->
<!-- <el-form-item label="姓名" prop="USER_NAME">-->
<!-- <el-input v-model="form.USER_NAME" placeholder="请输入姓名..." disabled/>-->
<!-- </el-form-item>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="性别" prop="GENDER">-->
<!-- <el-select v-model="form.GENDER" disabled placeholder="请选择性别" style="width: 100%;">-->
<!-- <el-option label="男" value="0"/>-->
<!-- <el-option label="女" value="1"/>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="行政职务" prop="ADMINISTRATIVE_POSITION">-->
<!-- <el-input v-model="form.ADMINISTRATIVE_POSITION" placeholder="请选择行政职务" disabled/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="行政级别" prop="ADMINISTRATIVE_LEVEL">-->
<!-- <el-input v-model="form.ADMINISTRATIVE_LEVEL" placeholder="请选择行政级别" disabled/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="身份证号" prop="IDENTITY_NUMBER">-->
<!-- <el-input v-model="form.IDENTITY_NUMBER" placeholder="请输入身份证号..." disabled/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="联系电话" prop="CONTACT_PHONE">-->
<!-- <el-input v-model="form.CONTACT_PHONE" placeholder="请输入联系电话..." disabled/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="排序" prop="SORT_ORDER">-->
<!-- <el-input v-model="form.SORT_ORDER" placeholder="请输入排序..." disabled/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- </el-form>-->
<el-form :model="form" label-width="100px" style="margin-right: 10px">
<el-form-item label="姓名" prop="USER_NAME">
<el-input v-model="form.USER_NAME" placeholder="请输入姓名..." disabled/>
</el-form-item>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="性别" prop="GENDER">
<el-form-item label="所属机构" prop="ORG_ID">
<el-select v-model="form.ORG_ID" disabled placeholder="请选择所属机构" style="width: 100%;">
<el-option
v-for="item in varTeamList"
:key="item.ID"
:label="item.ORG_NAME"
:value="item.ID"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="用户" prop="USER_NAME">
<el-input v-model="form.USER_NAME" placeholder="请选择用户" disabled @click.native="openSelectUser()"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="排序" disabled prop="SORT_ORDER">
<el-input v-model="form.SORT_ORDER" disabled placeholder="请输入排序..."/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="性别" disabled prop="GENDER">
<el-select v-model="form.GENDER" disabled placeholder="请选择性别" style="width: 100%;">
<el-option label="男" value="0"/>
<el-option label="女" value="1"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="行政职务" prop="ADMINISTRATIVE_POSITION">
<el-input v-model="form.ADMINISTRATIVE_POSITION" placeholder="请选择行政职务" disabled/>
<el-form-item label="行政职务" disabled prop="ADMINISTRATIVE_POSITION">
<el-input v-model="form.ADMINISTRATIVE_POSITION" disabled placeholder="请输入行政职务..."/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="行政级别" disabled prop="ADMINISTRATIVE_LEVEL">
<el-input v-model="form.ADMINISTRATIVE_LEVEL" disabled placeholder="请输入行政级别..."/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="行政级别" prop="ADMINISTRATIVE_LEVEL">
<el-input v-model="form.ADMINISTRATIVE_LEVEL" placeholder="请选择行政级别" disabled/>
<el-form-item label="身份证号" disabled prop="IDENTITY_NUMBER">
<el-input v-model="form.IDENTITY_NUMBER" disabled placeholder="请输入身份证号..."/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="身份证号" prop="IDENTITY_NUMBER">
<el-input v-model="form.IDENTITY_NUMBER" placeholder="请输入身份证号..." disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="联系电话" prop="CONTACT_PHONE">
<el-input v-model="form.CONTACT_PHONE" placeholder="请输入联系电话..." disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="排序" prop="SORT_ORDER">
<el-input v-model="form.SORT_ORDER" placeholder="请输入排序..." disabled/>
<el-form-item label="联系电话" disabled prop="CONTACT_PHONE">
<el-input v-model="form.CONTACT_PHONE" disabled placeholder="请输入联系电话..."/>
</el-form-item>
</el-col>
</el-row>

4
src/views/emergen_cyrescue/emergency_report/duty_management/shift_registration/components/list.vue
View File

@ -5,6 +5,7 @@
<el-form-item label="月份：" prop="monthvalue">
<el-date-picker
v-model="monthvalue"
:clearable="false"
type="month"
value-format="yyyy-MM"
placeholder="选择月"/>
@ -418,6 +419,9 @@ export default {
label: node.name,
children: node.nodes
}
},
rules: {
monthvalue: [{ required: true, message: '请输入月份' }]
}
}
},