修改bug

ruoyi-ui/src/views/system/fcry/index.vue

@@ -13,7 +13,7 @@
       </el-form-item>
       <el-form-item label="房间号/床号" prop="room">
         <el-input
-          v-model="queryParams.room"
+          v-model.trim="queryParams.room"
           placeholder="请输入房间号/床号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -21,7 +21,7 @@
       </el-form-item>
       <el-form-item label="居住人姓名" prop="jzName">
         <el-input
-          v-model="queryParams.jzName"
+          v-model.trim="queryParams.jzName"
           placeholder="请输入居住人姓名"
           clearable
           @keyup.enter.native="handleQuery"
@@ -29,7 +29,7 @@
       </el-form-item>
       <el-form-item label="身份证号码" prop="cardNo">
         <el-input
-          v-model="queryParams.cardNo"
+          v-model.trim="queryParams.cardNo"
           placeholder="请输入身份证号码"
           clearable
           @keyup.enter.native="handleQuery"
@@ -37,7 +37,7 @@
       </el-form-item>
       <el-form-item label="联系方式" prop="phone">
         <el-input
-          v-model="queryParams.phone"
+          v-model.trim="queryParams.phone"
           placeholder="请输入联系方式"
           clearable
           @keyup.enter.native="handleQuery"
@@ -75,7 +75,7 @@
       </el-form-item>
       <el-form-item label="楼号" prop="floor">
         <el-input
-          v-model="queryParams.floor"
+          v-model.trim="queryParams.floor"
           placeholder="请输入楼号单元号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -83,7 +83,7 @@
       </el-form-item>
       <el-form-item label="单元号" prop="unit">
         <el-input
-          v-model="queryParams.unit"
+          v-model.trim="queryParams.unit"
           placeholder="请输入单元号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -91,7 +91,7 @@
       </el-form-item>
       <el-form-item label="门牌号" prop="doorplate">
         <el-input
-          v-model="queryParams.doorplate"
+          v-model.trim="queryParams.doorplate"
           placeholder="请输入门牌号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -203,7 +203,7 @@
       <el-table-column label="房间号/床号" align="center" prop="room" width="100" :show-overflow-tooltip="true"/>
       <el-table-column label="居住人姓名" align="center" prop="jzName" width="150" :show-overflow-tooltip="true"/>
       <el-table-column label="身份证号码" align="center" prop="cardNo" width="180" :show-overflow-tooltip="true"/>
-      <el-table-column label="人员类别" align="center" prop="peopleType"/>
+      <el-table-column label="人员类别" align="center" prop="peopleType" :show-overflow-tooltip="true"/>
       <el-table-column label="是否疾控判定阳性" align="center" prop="isPositive" width="180" :show-overflow-tooltip="true"/>
       <el-table-column label="仅抗原阳性" align="center" prop="positiveOnly" width="150" :show-overflow-tooltip="true"/>
       <el-table-column label="联系方式" align="center" prop="phone" width="150" :show-overflow-tooltip="true"/>
@@ -227,17 +227,29 @@
           <dict-tag :options="dict.type.community" :value="scope.row.community"/>
         </template>
       </el-table-column>
-      <el-table-column label="楼号" align="center" prop="floor"  :show-overflow-tooltip="true"/>
-      <el-table-column label="单元号" align="center" prop="unit" :show-overflow-tooltip="true"/>
-      <el-table-column label="门牌号" align="center" prop="doorplate" :show-overflow-tooltip="true"/>
+      <el-table-column label="楼号" align="center" prop="floor"  :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.floor ? scope.row.floor : '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="单元号" align="center" prop="unit" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.unit ? scope.row.unit : '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="门牌号" align="center" prop="doorplate" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ (scope.row.doorplate) ? (scope.row.doorplate) : '-' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="转入时间" align="center" prop="zrTime" width="180" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.zrTime) ? parseTime(scope.row.zrTime).substring(0,10) : ''}}</span>
+          <span>{{ parseTime(scope.row.zrTime) ? parseTime(scope.row.zrTime).substring(0,10) : '-'}}</span>
         </template>
       </el-table-column>
       <el-table-column label="转出时间" align="center" prop="zcTime" width="180" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.zcTime) ? parseTime(scope.row.zcTime).substring(0,10) : '' }}</span>
+          <span>{{ parseTime(scope.row.zcTime) ? parseTime(scope.row.zcTime).substring(0,10) : '-' }}</span>
         </template>
       </el-table-column>
 <!--      <el-table-column label="隔离位置" align="center" prop="glPlace" width="120" :show-overflow-tooltip="true"/>-->
@@ -283,7 +295,7 @@
     />
 
     <!-- 添加或修改方舱人员对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form :disabled="title ==='查看方舱人员'" v-loading="formLoading" ref="form" :model="form" :rules="rules" label-width="auto">
         <el-row>
           <el-col :span="12">
@@ -300,26 +312,26 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="房间号/床号" prop="room">
-              <el-input v-model="form.room" placeholder="请输入房间号/床号" />
+              <el-input v-model.trim="form.room" maxlength="6" show-word-limit placeholder="请输入房间号/床号" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="居住人姓名" prop="jzName">
-              <el-input v-model="form.jzName" placeholder="请输入居住人姓名" />
+              <el-input v-model.trim="form.jzName" maxlength="48" show-word-limit placeholder="请输入居住人姓名" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="身份证号码" prop="cardNo">
-              <el-input v-model="form.cardNo" placeholder="请输入身份证号码" />
+              <el-input v-model.trim="form.cardNo" placeholder="请输入身份证号码" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="人员类别" prop="doorplate">
-              <el-input v-model="form.peopleType" placeholder="请输入人员类别" />
+              <el-input v-model.trim="form.peopleType" maxlength="20" show-word-limit placeholder="请输入人员类别" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -342,7 +354,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="联系方式" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入联系方式" />
+              <el-input v-model.trim="form.phone" placeholder="请输入联系方式" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -420,19 +432,19 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="楼号" prop="floor">
-              <el-input v-model="form.floor" placeholder="请输入楼号" />
+              <el-input v-model.trim="form.floor" maxlength="30" show-word-limit placeholder="请输入楼号" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="单元号" prop="unit">
-              <el-input v-model="form.unit" placeholder="请输入单元号" />
+              <el-input v-model.trim="form.unit" maxlength="4" show-word-limit  placeholder="请输入单元号" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="门牌号" prop="doorplate">
-              <el-input v-model="form.doorplate" placeholder="请输入门牌号" />
+              <el-input v-model.trim="form.doorplate" maxlength="4" show-word-limit  placeholder="请输入门牌号" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -493,7 +505,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" placeholder="请输入备注" />
+              <el-input v-model.trim="form.remark" maxlength="200" show-word-limit  placeholder="请输入备注" />
             </el-form-item>
           </el-col>
         </el-row>

ruoyi-ui/src/views/system/fkqk/index.vue

@@ -23,7 +23,7 @@
       </el-form-item>
       <el-form-item label="楼号" prop="floor">
         <el-input
-          v-model="queryParams.floor"
+          v-model.trim="queryParams.floor"
           placeholder="楼号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -31,7 +31,7 @@
       </el-form-item>
       <el-form-item label="单元号" prop="unit">
         <el-input
-          v-model="queryParams.unit"
+          v-model.trim="queryParams.unit"
           placeholder="单元号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -147,9 +147,21 @@
           <dict-tag :options="dict.type.residential_area" :value="scope.row.area"/>
         </template>
       </el-table-column>
-      <el-table-column label="楼号" align="center" prop="floor"  :show-overflow-tooltip="true"/>
-      <el-table-column label="单元号" align="center" prop="unit"  :show-overflow-tooltip="true"/>
-      <el-table-column label="封控明细" align="center" prop="fkDetailed" width="120" :show-overflow-tooltip="true"/>
+      <el-table-column label="楼号" align="center" prop="floor"  :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.floor ? scope.row.floor : '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="单元号" align="center" prop="unit"  :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.unit ? scope.row.unit : '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="封控明细" align="center" prop="fkDetailed" width="120" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.fkDetailed ? scope.row.fkDetailed : '-' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="涉及封控户数" align="center" prop="fkHs" width="120" :show-overflow-tooltip="true"/>
       <el-table-column label="涉及封控人数" align="center" prop="fkRs" width="120" :show-overflow-tooltip="true"/>
       <el-table-column label="封控时间" align="center" prop="fkTime" width="180"  :show-overflow-tooltip="true">
@@ -215,7 +227,7 @@
     />
 
     <!-- 添加或修改小区封控情况对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="1000px" append-to-body>
       <el-form :disabled="title ==='查看小区封控情况'" v-loading="formLoading" ref="form" :model="form" :rules="rules" label-width="auto">
         <el-row>
           <el-col :span="12">
@@ -290,31 +302,31 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="楼号" prop="floor">
-              <el-input v-model="form.floor" placeholder="请输入楼号" />
+              <el-input v-model.trim="form.floor" maxlength="30" show-word-limit placeholder="请输入楼号" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="单元号" prop="unit">
-              <el-input v-model="form.unit" placeholder="请输入单元号" />
+              <el-input v-model.trim="form.unit" maxlength="4" show-word-limit placeholder="请输入单元号" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="封控明细" prop="fkDetailed">
-              <el-input v-model="form.fkDetailed" placeholder="请输入封控明细" />
+              <el-input v-model.trim="form.fkDetailed" maxlength="80" show-word-limit  placeholder="请输入封控明细" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="涉及封控户数" prop="fkHs">
-              <el-input v-model="form.fkHs" placeholder="请输入涉及封控户数" />
+              <el-input-number style="width: 100%" v-model.trim="form.fkHs" placeholder="请输入涉及封控户数" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="涉及封控人数" prop="fkRs">
-              <el-input v-model="form.fkRs" placeholder="请输入涉及封控人数" />
+              <el-input-number style="width: 100%" v-model.trim="form.fkRs" placeholder="请输入涉及封控人数" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -385,7 +397,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" placeholder="请输入备注" />
+              <el-input v-model.trim="form.remark" maxlength="200" show-word-limit  placeholder="请输入备注" />
             </el-form-item>
           </el-col>
           <el-col :span="12">

ruoyi-ui/src/views/system/gldry/index.vue

@@ -19,7 +19,7 @@
       </el-form-item>
       <el-form-item label="房间号" prop="room">
         <el-input
-          v-model="queryParams.room"
+          v-model.trim="queryParams.room"
           placeholder="请输入房间号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -27,7 +27,7 @@
       </el-form-item>
       <el-form-item label="居住人姓名" prop="jzName">
         <el-input
-          v-model="queryParams.jzName"
+          v-model.trim="queryParams.jzName"
           placeholder="请输入居住人姓名"
           clearable
           @keyup.enter.native="handleQuery"
@@ -35,7 +35,7 @@
       </el-form-item>
       <el-form-item label="身份证号码" prop="cardNo">
         <el-input
-          v-model="queryParams.cardNo"
+          v-model.trim="queryParams.cardNo"
           placeholder="请输入身份证号码"
           clearable
           @keyup.enter.native="handleQuery"
@@ -43,7 +43,7 @@
       </el-form-item>
       <el-form-item label="联系方式" prop="phone">
         <el-input
-          v-model="queryParams.phone"
+          v-model.trim="queryParams.phone"
           placeholder="请输入联系方式"
           clearable
           @keyup.enter.native="handleQuery"
@@ -81,7 +81,7 @@
       </el-form-item>
       <el-form-item label="楼号" prop="buildingNo">
         <el-input
-          v-model="queryParams.buildingNo"
+          v-model.trim="queryParams.buildingNo"
           placeholder="请输入楼号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -89,7 +89,7 @@
       </el-form-item>
       <el-form-item label="单元号" prop="unitNo">
         <el-input
-          v-model="queryParams.unitNo"
+          v-model.trim="queryParams.unitNo"
           placeholder="请输入单元号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -97,7 +97,7 @@
       </el-form-item>
       <el-form-item label="门牌号" prop="houseNo">
         <el-input
-          v-model="queryParams.houseNo"
+          v-model.trim="queryParams.houseNo"
           placeholder="请输入门牌号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -281,7 +281,7 @@
     />
 
     <!-- 添加或修改隔离点人员对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form :disabled="title ==='查看隔离点人员'" v-loading="formLoading" ref="form" :model="form" :rules="rules" label-width="auto">
         <el-row>
           <el-col :span="12">
@@ -298,26 +298,26 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="房间号" prop="room">
-              <el-input v-model="form.room" placeholder="请输入房间号" show-word-limit maxlength="6"/>
+              <el-input v-model.trim="form.room" placeholder="请输入房间号" show-word-limit maxlength="6"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="居住人姓名" prop="jzName">
-              <el-input v-model="form.jzName" placeholder="请输入居住人姓名" />
+              <el-input v-model.trim="form.jzName" maxlength="48" show-word-limit placeholder="请输入居住人姓名" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="身份证号码" prop="cardNo">
-              <el-input v-model="form.cardNo" placeholder="请输入身份证号码" />
+              <el-input v-model.trim="form.cardNo" placeholder="请输入身份证号码" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="联系方式" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入联系方式" />
+              <el-input v-model.trim="form.phone" placeholder="请输入联系方式" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -402,19 +402,19 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="楼号" prop="buildingNo">
-              <el-input v-model="form.buildingNo" placeholder="请输入楼号单元号门牌号" />
+              <el-input v-model.trim="form.buildingNo" maxlength="30" show-word-limit placeholder="请输入楼号单元号门牌号" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="单元号" prop="unitNo">
-              <el-input v-model="form.unitNo" placeholder="请输入楼号单元号门牌号" />
+              <el-input v-model.trim="form.unitNo" maxlength="4" show-word-limit placeholder="请输入楼号单元号门牌号" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="门牌号" prop="houseNo">
-              <el-input v-model="form.houseNo" placeholder="请输入楼号单元号门牌号" />
+              <el-input v-model.trim="form.houseNo" maxlength="4" show-word-limit placeholder="请输入楼号单元号门牌号" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -459,7 +459,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" placeholder="请输入备注" />
+              <el-input v-model.trim="form.remark" maxlength="200" show-word-limit placeholder="请输入备注" />
             </el-form-item>
           </el-col>
         </el-row>

ruoyi-ui/src/views/system/jcglry/index.vue

@@ -255,7 +255,7 @@
     />
 
     <!-- 添加或修改解除隔离人员对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form :disabled="title ==='查看解除隔离人员'" v-loading="formLoading" ref="form" :model="form" :rules="rules" label-width="auto">
         <el-row>
           <el-col :span="12">