From cfdb68dafbca5d169e3d6c5bff57f7b7f860338d Mon Sep 17 00:00:00 2001
From: shanao <wangpeng@zcloudchina.com>
Date: Wed, 11 Dec 2024 15:49:28 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=201.=20=E6=8E=92=E7=8F=AD?=
 =?UTF-8?q?=E7=99=BB=E8=AE=B0=E7=AE=A1=E7=90=86=E6=90=9C=E7=B4=A2=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=202.=20=E4=BC=81=E4=B8=9A=E5=BA=94=E6=80=A5=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E6=96=B0=E5=A2=9E=E3=80=81=E4=BF=AE=E6=94=B9=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=AD=97=E6=AE=B5=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../case_library/components/casebasic.vue     |   5 +-
 .../emergency_personnel/components/list.vue   | 104 ++++++++++++++----
 .../shift_registration/components/list.vue    |   4 +
 3 files changed, 90 insertions(+), 23 deletions(-)

diff --git a/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/case_library/components/casebasic.vue b/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/case_library/components/casebasic.vue
index 4f91032..73d0ac5 100644
--- a/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/case_library/components/casebasic.vue
+++ b/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/case_library/components/casebasic.vue
@@ -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) => {
diff --git a/src/views/emergen_cyrescue/emergency_information/emergency_management_agency/emergency_personnel/components/list.vue b/src/views/emergen_cyrescue/emergency_information/emergency_management_agency/emergency_personnel/components/list.vue
index 3396779..30a7784 100644
--- a/src/views/emergen_cyrescue/emergency_information/emergency_management_agency/emergency_personnel/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_information/emergency_management_agency/emergency_personnel/components/list.vue
@@ -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>
diff --git a/src/views/emergen_cyrescue/emergency_report/duty_management/shift_registration/components/list.vue b/src/views/emergen_cyrescue/emergency_report/duty_management/shift_registration/components/list.vue
index 8bb18d4..a0ad6b0 100644
--- a/src/views/emergen_cyrescue/emergency_report/duty_management/shift_registration/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_report/duty_management/shift_registration/components/list.vue
@@ -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: '请输入月份' }]
       }
     }
   },