Merge branch '陈航-修改退住信息问题等' of sckj/mz-cloud into master

ruoyi-modules/mz-organization-khgl/src/main/resources/mapper/organization/YljgKhRztzxxMapper.xml

@@ -153,7 +153,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         `mz-cloud`.`yljg_kh_htxx`
         <where>
-            sjrzsj is not null and sjrzsj != ''
+            status = '0'
+            and sjrzsj is not null and sjrzsj != ''
             <if test="xm != null  and xm != ''"> and xm like concat('%', #{xm}, '%')</if>
             <if test="jgId != null  and jgId != ''"> and jg_id = #{jgId}</if>
             <if test="zjhm != null  and zjhm != ''"> and zjhm like concat('%', #{zjhm}, '%')</if>

ruoyi-ui/src/views/organization/kugl/hfdj/index.vue

@@ -85,12 +85,20 @@
           <el-input v-model="form.rzcw" placeholder="请输入床位" v-bind:disabled="beforeSubmit" />
         </el-form-item>
 
+        <el-form-item label="新楼宇" prop="xlyId">
+          <BizDict :value="form.xlyId" :parmar="parmarLy" @changeData="changeDataLy" :para1="form.jgId"
+                   style="width: 100%"></BizDict>
+        </el-form-item>
+        <el-form-item label="新楼层" prop="xlcId">
+          <BizDict :value="form.xlcId" :parmar="parmarLc" @changeData="changeDataLc" :para1="form.xlyId"
+                   style="width: 100%"></BizDict>
+        </el-form-item>
         <el-form-item label="新房间" prop="xfjId">
-          <BizDict :value="form.xfjId" :parmar="parmarFjh" @changeData="changeDataFjh" :para1="para2"
+          <BizDict :value="form.xfjId" :parmar="parmarFjh" @changeData="changeDataFjh" :para1="form.xlcId"
             style="width: 100%"></BizDict>
         </el-form-item>
         <el-form-item label="新床位" prop="xcwId">
-          <BizDict :value="form.xcwId" :parmar="parmarCwh" @changeData="changeDataCwh" :para1="para3"
+          <BizDict :value="form.xcwId" :parmar="parmarCwh" @changeData="changeDataCwh" :para1="form.xfjId"
             style="width: 100%"></BizDict>
         </el-form-item>
       </el-form>
@@ -112,6 +120,14 @@ export default {
   data() {
     return {
 
+      // 楼宇
+      parmarLy:{
+        dictType:'ly',
+      },
+      // 楼层
+      parmarLc:{
+        dictType:'lc',
+      },
       // 房间
       parmarFjh: {
         dictType: 'fj'
@@ -121,8 +137,9 @@ export default {
         dictType: 'cw'
       },
 
-      para2: '',
-      para3: '',
+      xlyId: '',
+      xlcId: '',
+      xcwId: '',
       // 遮罩层
       loading: true,
       submitFormLoading: false,
@@ -160,6 +177,12 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        xlyId: [
+          { required: true, message: '新房间不能为空', trigger: 'blur' }
+        ],
+        xlcId: [
+          { required: true, message: '新房间不能为空', trigger: 'blur' }
+        ],
         xfjId: [
           { required: true, message: '新房间不能为空', trigger: 'blur' }
         ],
@@ -206,14 +229,17 @@ export default {
         rzcw: null,
         xfj: null,
         xcw: null,
+        xlyId: null,
+        xlcId: null,
         xfjId: null,
         xcwId: null,
         blr: null,
         jgId: null,
         khId: null
       }
-      this.para2 = ''
-      this.para3 = ''
+      this.xlyId = ''
+      this.xlcId = ''
+      this.xcwId = ''
       this.resetForm('form')
     },
     /** 搜索按钮操作 */
@@ -240,7 +266,6 @@ export default {
       this.form.htId = row.htId
       this.form.khId = row.khId
       this.form.zjhm = row.zjhm
-      this.para2 = row.lcId
       this.open = true
       this.title = '换房申请'
       this.$modal.msgWarning('温馨提示:换房登记会修改合同信息中的床位信息!')
@@ -321,20 +346,32 @@ export default {
       }).catch(() => {
       })
     },
-    // 房间
+
+    changeDataLy(lyData, list) {
+      this.form.xlyId = lyData
+      this.form.xlcId = ''
+      this.form.xfjId = ''
+      this.form.xcwId = ''
+      if (list) {
+        this.form.xlymc = list.label;
+      }
+    },
+    changeDataLc(lcData, list) {
+      this.form.xlcId = lcData
+      this.form.xfjId = ''
+      this.form.xcwId = ''
+      if (list) {
+        this.form.xlcmc = list.label;
+      }
+    },
     changeDataFjh(fjData, list) {
-      console.log(fjData, '这是房间')
-      this.para3 = fjData
       this.form.xfjId = fjData
       this.form.xcwId = ''
       if (list) {
         this.form.xfjmc = list.label;
       }
     },
-
-    // 床位
     changeDataCwh(cwData, list) {
-      console.log(cwData, '这是床位')
       this.form.xcwId = cwData
       if (list) {
         this.form.xcwmc = list.label;