Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-31 15:43:30
+ * @LastEditTime: 2023-08-07 14:43:46
 -->
 <template>
   <div class="rlPopup">
@@ -25,7 +25,7 @@
         <el-button type="primary" @click="clickImage" v-if="previewImg.imgList.length>0">（放大） 显示（缩小）</el-button>
         <el-upload class="fileUpdate" ref="upload" :key="key" action="" :show-file-list="false" :multiple="true" :auto-upload="false"
           :on-change="handleChange"
-          accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg" :before-upload="beforeUpload">
+          accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg">
           <el-button icon="el-icon-upload" type="primary" v-if="ableOperation">上传</el-button>
         </el-upload>
         <el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete"
@@ -225,28 +225,12 @@
         this.showViewer = true
       },
       /**
-       * @description: 上传
-       * @param {*} file
-       * @author: renchao
-       */
-      beforeUpload (file) {
-        const isLt5M = file.size / 1024 / 1024 < 5;
-        if (!isLt5M) {
-          this.$message.error('上传图片大小不能超过 5MB!');
-          return false;
-        }
-
-        // 所有条件满足时返回 true
-        return true;
-      },
-      /**
        * @description: handleChange
        * @param {*} file
        * @param {*} files
        * @author: renchao
        */
       async handleChange (file, fileList) {
-        if (!this.beforeUpload(file)) return
         let length = fileList.length;
         this.maxFileLength = Math.max(length, this.maxFileLength)
         var formData = new FormData();
@@ -254,8 +238,12 @@
           if (this.maxFileLength !== length) {
             return
           }
-          let num = 0
+          let num = 0, max = 0;
+          const isLt5M = file.size / 1024 / 1024 < 5;
           fileList.forEach(item => {
+            if (!isLt5M) {
+              max++
+            }
             if (!['image/jpeg', 'image/png', 'image/jpg', 'image/gif'].includes(item.raw.type)) {
               num++
             } else {
@@ -268,6 +256,11 @@
             this.key++
             return;
           }
+          if (max >= 1) {
+            this.$message.error('上传图片大小不能超过 5MB!');
+            this.key++
+            return;
+          }
           formData.append("bsmSj", this.previewImg.bsmSj);
           formData.append("bsmSlsq", this.previewImg.bsmSlsq);
           uploadBatch(formData).then((res) => {

@@ -2,7 +2,7 @@
  * @Description:
  * @Autor: renchao
  :show-message="false"
- * @LastEditTime: 2023-08-03 14:56:50
+ * @LastEditTime: 2023-08-07 17:31:09
 -->
 <template>
   <!-- 受理信息 -->
@@ -107,7 +107,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="坐落：">
-              <el-input disabled v-model="ruleForm.sldy.zl"></el-input>
+              <el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -189,14 +189,7 @@
             <el-form-item label="是否被续封："
               prop="cfdj.sfbxf"
               :rules="rules.sfbxfrules">
-              <el-select v-model="ruleForm.cfdj.sfbxf" @change="djlxchange">
-                <el-option
-                  v-for="item in sfbxflist"
-                  :key="item.dcode"
-                  :label="item.dname"
-                  :value="item.dcode"></el-option>
-              </el-select>
-              <el-radio-group v-model="ruleForm.cfdj.sfbxf">
+              <el-radio-group v-model="ruleForm.cfdj.sfbxf" @change="djlxchange">
                 <el-radio label="1">是</el-radio>
                 <el-radio label="2">否</el-radio>
               </el-radio-group>
@@ -513,7 +506,6 @@
       },
       // 弹框事件
       ssQlxxchangediolog (val) {
-        console.log("确定了", this.ruleForm);
         this.$confirm("是否将上手权利信息同步到表单", "提示", {
           iconClass: "el-icon-question", //自定义图标样式
           confirmButtonText: "确认", //确认按钮文字更换
@@ -524,8 +516,6 @@
           getQlxxByQlxxBsm({ qlxxBsm: val.bsmQlxx }).then((res) => {
             if (res.code == 200) {
               this.nowlist = res.result;
-              console.log("his.nowlist", this.nowlist);
-              console.log("this.ruleForm", this.ruleForm);
               for (var key in this.ruleForm.cfdj) {
                 if (
                   this.ruleForm.cfdj[key] == "" ||
@@ -539,13 +529,11 @@
                   (this.ruleForm.qlxx[key] == null && key != "ywh") ||
                   this.ruleForm.qlxx[key] == null
                 ) {
-                  console.log("this.ruleForm.qlxx[key]", key);
                   if (key != "ywh") {
                     this.ruleForm.qlxx[key] = this.nowlist.qlxx[key];
                   }
                 }
               }
-              console.log("this.ruleForm", this.ruleForm);
               this.$message({
                 type: "success",
                 message: "同步成功!",

@@ -101,7 +101,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="坐落：">
-              <el-input disabled v-model="ruleForm.sldy.zl"></el-input>
+              <el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -473,7 +473,7 @@
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!ableOperation"
-                v-model="ruleForm.sldy.gyfs">
+                v-model="ruleForm.qlxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -481,10 +481,10 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
+          <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
             <el-form-item label="是否分别持证：">
               <el-radio-group
-                v-model="ruleForm.sldy.sqfbcz"
+                v-model="ruleForm.qlxx.sqfbcz"
                 :disabled="!ableOperation">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
@@ -493,7 +493,7 @@
           </el-col>
           <el-col
             :span="6"
-            v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
+            v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'">
             <el-form-item label="持证人：">
               <el-select
                 v-model="ruleForm.czr"
@@ -507,7 +507,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <qlrCommonTable
           :tableData="ruleForm.qlrData"
@@ -831,7 +831,7 @@
               });
               return false;
             }
-            if (this.ruleForm.sldy.gyfs == "0") {
+            if (this.ruleForm.qlxx.gyfs == "0") {
               if (this.ruleForm.qlrData.length > 1) {
                 this.$message({
                   showClose: true,
@@ -842,7 +842,7 @@
               }
               this.ruleForm.qlrData[0].sfczr = "1";
             } else {
-              if (this.ruleForm.qlrList.length <= 1) {
+              if (this.ruleForm.qlrData.length <= 1) {
                 this.$message({
                   showClose: true,
                   message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
@@ -850,29 +850,29 @@
                 });
                 return false;
               }
-              //是否分别持证
-              if (this.ruleForm.sldy.sqfbcz == "1") {
-                //是
-                this.ruleForm.qlrList.forEach((item, index) => {
-                  item.sfczr = "1";
-                });
-              } else {
-                if (!that.ruleForm.czr) {
-                  that.$message({
-                    showClose: true,
-                    message: "请选择持证人",
-                    type: "error",
-                  });
-                  return false;
-                }
-                this.ruleForm.qlrList.forEach((item, index) => {
-                  if (item.zjh == this.ruleForm.czr) {
-                    item.sfczr = "1";
-                  } else {
-                    item.sfczr = "0";
-                  }
-                })
-              }
+              // //是否分别持证
+              // if (this.ruleForm.qlxx.sqfbcz == "1") {
+              //   //是
+              //   this.ruleForm.qlrData.forEach((item, index) => {
+              //     item.sfczr = "1";
+              //   });
+              // } else {
+              //   if (!that.ruleForm.czr) {
+              //     that.$message({
+              //       showClose: true,
+              //       message: "请选择持证人",
+              //       type: "error",
+              //     });
+              //     return false;
+              //   }
+              //   this.ruleForm.qlrData.forEach((item, index) => {
+              //     if (item.zjh == this.ruleForm.czr) {
+              //       item.sfczr = "1";
+              //     } else {
+              //       item.sfczr = "0";
+              //     }
+              //   })
+              // }
             }
             save(this.ruleForm).then((res) => {
               if (res.code === 200) {

@@ -100,7 +100,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="坐落：">
-              <el-input disabled v-model="ruleForm.sldy.zl"></el-input>
+              <el-input disabled v-model="ruleForm.ztQlxx.zl"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -717,7 +717,7 @@
               });
               return false;
             }
-            if (this.ruleForm.sldy.gyfs == "0") {
+            if (this.ruleForm.qlxx.gyfs == "0") {
               if (this.ruleForm.qlrData.length > 1) {
                 this.$message({
                   showClose: true,
@@ -726,7 +726,6 @@
                 });
                 return false;
               }
-              this.ruleForm.qlrData[0].sfczr = "1";
             } else {
               if (this.ruleForm.qlrList.length <= 1) {
                 this.$message({
@@ -736,29 +735,7 @@
                 });
                 return false;
               }
-              //是否分别持证
-              if (this.ruleForm.sldy.sqfbcz == "1") {
-                //是
-                this.ruleForm.qlrList.forEach((item, index) => {
-                  item.sfczr = "1";
-                });
-              } else {
-                if (!that.ruleForm.czr) {
-                  that.$message({
-                    showClose: true,
-                    message: "请选择持证人",
-                    type: "error",
-                  });
-                  return false;
-                }
-                this.ruleForm.qlrList.forEach((item, index) => {
-                  if (item.zjh == this.ruleForm.czr) {
-                    item.sfczr = "1";
-                  } else {
-                    item.sfczr = "0";
-                  }
-                });
-              }
+
             }
             save(this.ruleForm).then((res) => {
               if (res.code === 200) {

@@ -399,7 +399,7 @@
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!ableOperation"
-                v-model="ruleForm.sldy.gyfs">
+                v-model="ruleForm.qlxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -407,33 +407,6 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
-            <el-form-item label="是否分别持证：">
-              <el-radio-group
-                v-model="ruleForm.sldy.sqfbcz"
-                :disabled="!ableOperation">
-                <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col
-            :span="6"
-            v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
-            <el-form-item label="持证人：">
-              <el-select
-                v-model="ruleForm.czr"
-                placeholder="持证人"
-                :disabled="!ableOperation">
-                <el-option
-                  v-for="item in czrOptions"
-                  :key="item.zjh"
-                  :label="item.sqrmc"
-                  :value="item.zjh">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
         </el-row>
         <qlrCommonTable
           :tableData="ruleForm.qlrData"
@@ -775,9 +748,8 @@
                 });
                 return false;
               }
-              this.ruleForm.qlrData[0].sfczr = "1";
             } else {
-              if (this.ruleForm.qlrList.length <= 1) {
+              if (this.ruleForm.qlrData.length <= 1) {
                 this.$message({
                   showClose: true,
                   message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
@@ -785,29 +757,6 @@
                 });
                 return false;
               }
-              //是否分别持证
-              if (this.ruleForm.sldy.sqfbcz == "1") {
-                //是
-                this.ruleForm.qlrList.forEach((item, index) => {
-                  item.sfczr = "1";
-                });
-              } else {
-                if (!that.ruleForm.czr) {
-                  that.$message({
-                    showClose: true,
-                    message: "请选择持证人",
-                    type: "error",
-                  });
-                  return false;
-                }
-                this.ruleForm.qlrList.forEach((item, index) => {
-                  if (item.zjh == this.ruleForm.czr) {
-                    item.sfczr = "1";
-                  } else {
-                    item.sfczr = "0";
-                  }
-                });
-              }
             }
             save(this.ruleForm).then((res) => {
               if (res.code === 200) {

@@ -267,33 +267,6 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
-            <el-form-item label="是否分别持证：">
-              <el-radio-group
-                v-model="ruleForm.qlxx.sqfbcz"
-                :disabled="!ableOperation">
-                <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col
-            :span="6"
-            v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'">
-            <el-form-item label="持证人：">
-              <el-select
-                v-model="ruleForm.czr"
-                placeholder="持证人"
-                :disabled="!ableOperation">
-                <el-option
-                  v-for="item in czrOptions"
-                  :key="item.zjh"
-                  :label="item.sqrmc"
-                  :value="item.zjh">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
         </el-row>
         <qlrCommonTable
           :tableData="ruleForm.qlrData"
@@ -613,9 +586,8 @@
                 });
                 return false;
               }
-              this.ruleForm.qlrData[0].sfczr = "1";
             } else {
-              if (this.ruleForm.qlrList.length <= 1) {
+              if (this.ruleForm.qlrData.length <= 1) {
                 this.$message({
                   showClose: true,
                   message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
@@ -623,29 +595,6 @@
                 });
                 return false;
               }
-              //是否分别持证
-              if (this.ruleForm.qlxx.sqfbcz == "1") {
-                //是
-                this.ruleForm.qlrList.forEach((item, index) => {
-                  item.sfczr = "1";
-                });
-              } else {
-                if (!that.ruleForm.czr) {
-                  that.$message({
-                    showClose: true,
-                    message: "请选择持证人",
-                    type: "error",
-                  });
-                  return false;
-                }
-                this.ruleForm.qlrList.forEach((item, index) => {
-                  if (item.zjh == this.ruleForm.czr) {
-                    item.sfczr = "1";
-                  } else {
-                    item.sfczr = "0";
-                  }
-                });
-              }
             }
             save(this.ruleForm).then((res) => {
               if (res.code === 200) {

@@ -362,7 +362,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
+          <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
             <el-form-item label="是否分别持证：">
               <el-radio-group
                 v-model="ruleForm.qlxx.sqfbcz"
@@ -371,8 +371,8 @@
                 <el-radio :label="0">否</el-radio>
               </el-radio-group>
             </el-form-item>
-          </el-col>
-          <el-col
+          </el-col> -->
+          <!-- <el-col
             :span="6"
             v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'">
             <el-form-item label="持证人：">
@@ -388,7 +388,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <qlrCommonTable
           :tableData="ruleForm.qlrData"
@@ -694,9 +694,8 @@
                 });
                 return false;
               }
-              this.ruleForm.qlrData[0].sfczr = "1";
             } else {
-              if (this.ruleForm.qlrList.length <= 1) {
+              if (this.ruleForm.qlrData.length <= 1) {
                 this.$message({
                   showClose: true,
                   message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
@@ -704,29 +703,6 @@
                 });
                  return false;
               }
-              //是否分别持证
-              if (this.ruleForm.qlxx.sqfbcz == "1") {
-                //是
-                this.ruleForm.qlrList.forEach((item, index) => {
-                  item.sfczr = "1";
-                });
-              } else {
-                if (!that.ruleForm.czr) {
-                  that.$message({
-                    showClose: true,
-                    message: "请选择持证人",
-                    type: "error",
-                  });
-                  return false;
-                }
-                this.ruleForm.qlrList.forEach((item, index) => {
-                  if (item.zjh == this.ruleForm.czr) {
-                    item.sfczr = "1";
-                  } else {
-                    item.sfczr = "0";
-                  }
-                });
-              }
             }
             save(this.ruleForm).then((res) => {
               if (res.code === 200) {

@@ -102,7 +102,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="坐落：">
-              <el-input disabled v-model="ruleForm.sldy.zl"></el-input>
+              <el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -445,7 +445,7 @@
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!ableOperation"
-                v-model="ruleForm.sldy.gyfs">
+                v-model="ruleForm.qlxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -453,33 +453,6 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
-            <el-form-item label="是否分别持证：">
-              <el-radio-group
-                v-model="ruleForm.sldy.sqfbcz"
-                :disabled="!ableOperation">
-                <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col
-            :span="6"
-            v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
-            <el-form-item label="持证人：">
-              <el-select
-                v-model="ruleForm.czr"
-                placeholder="持证人"
-                :disabled="!ableOperation">
-                <el-option
-                  v-for="item in czrOptions"
-                  :key="item.zjh"
-                  :label="item.sqrmc"
-                  :value="item.zjh">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
         </el-row>
         <qlrCommonTable
           :tableData="ruleForm.qlrData"
@@ -814,9 +787,8 @@
                 });
                 return false;
               }
-              this.ruleForm.qlrData[0].sfczr = "1";
             } else {
-              if (this.ruleForm.qlrList.length <= 1) {
+              if (this.ruleForm.qlrData.length <= 1) {
                 this.$message({
                   showClose: true,
                   message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
@@ -824,29 +796,6 @@
                 });
                 return false;
               }
-              //是否分别持证
-              if (this.ruleForm.sldy.sqfbcz == "1") {
-                //是
-                this.ruleForm.qlrList.forEach((item, index) => {
-                  item.sfczr = "1";
-                });
-              } else {
-                if (!that.ruleForm.czr) {
-                  that.$message({
-                    showClose: true,
-                    message: "请选择持证人",
-                    type: "error",
-                  });
-                  return false;
-                }
-                this.ruleForm.qlrList.forEach((item, index) => {
-                  if (item.zjh == this.ruleForm.czr) {
-                    item.sfczr = "1";
-                  } else {
-                    item.sfczr = "0";
-                  }
-                });
-              }
             }
             save(this.ruleForm).then((res) => {
               if (res.code === 200) {

@@ -368,7 +368,7 @@
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!ableOperation"
-                v-model="ruleForm.sldy.gyfs">
+                v-model="ruleForm.qlxx.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -376,10 +376,10 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
+          <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
             <el-form-item label="是否分别持证：">
               <el-radio-group
-                v-model="ruleForm.sldy.sqfbcz"
+                v-model="ruleForm.qlxx.sqfbcz"
                 :disabled="!ableOperation">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
@@ -388,7 +388,7 @@
           </el-col>
           <el-col
             :span="6"
-            v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
+            v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'">
             <el-form-item label="持证人：">
               <el-select
                 v-model="ruleForm.czr"
@@ -402,7 +402,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <qlrCommonTable
           :tableData="ruleForm.qlrData"
@@ -717,7 +717,7 @@
               });
               return false;
             }
-            if (this.ruleForm.sldy.gyfs == "0") {
+            if (this.ruleForm.qlxx.gyfs == "0") {
               if (this.ruleForm.qlrData.length > 1) {
                 this.$message({
                   showClose: true,
@@ -726,7 +726,6 @@
                 });
                 return false;
               }
-              this.ruleForm.qlrData[0].sfczr = "1";
             } else {
               if (this.ruleForm.qlrList.length <= 1) {
                 this.$message({
@@ -736,29 +735,6 @@
                 });
                 return false;
               }
-              //是否分别持证
-              if (this.ruleForm.sldy.sqfbcz == "1") {
-                //是
-                this.ruleForm.qlrList.forEach((item, index) => {
-                  item.sfczr = "1";
-                });
-              } else {
-                if (!that.ruleForm.czr) {
-                  that.$message({
-                    showClose: true,
-                    message: "请选择持证人",
-                    type: "error",
-                  });
-                  return false;
-                }
-                this.ruleForm.qlrList.forEach((item, index) => {
-                  if (item.zjh == this.ruleForm.czr) {
-                    item.sfczr = "1";
-                  } else {
-                    item.sfczr = "0";
-                  }
-                });
-              }
             }
             save(this.ruleForm).then((res) => {
               if (res.code === 200) {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-04 16:45:57
+ * @LastEditTime: 2023-08-07 17:31:32
 -->
 <template>
   <!-- 受理信息 -->
@@ -14,9 +14,10 @@
       ref="ruleForm"
       :label-position="flag ? 'top' : ''"
       :inline="flag"
-      :show-message="false"
       inline-message
-      label-width="145px">
+      :show-message="false"
+      label-width="145px"
+    >
       <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
           补录信息
@@ -40,26 +41,30 @@
           </el-col>
         </el-row>
         <div class="slxx_title title-block bdcqk">
-          房地产权信息
-          <div class="count" v-if="ssqlxxshow">
+          异议登记不动产情况
+          <div class="count">
             <el-form-item
-              label="上手权利信息："
-              prop="ssQlxx.bdcqzh"
-              :rules="rules.ssQlxxrules">
+              label="抵押不动产信息："
+              prop="ztQlxx.bdcqzh"
+              :rules="rules.ztQlxxrules"
+            >
               <select-table
-                v-model="ruleForm.ssQlxx"
-                :table-width="730"
-                :tableData="ssQlxxList"
+                v-model="ruleForm.ztQlxx"
+                :table-width="550"
+                :tableData="ztQlxxList"
                 :props="props"
-                @change="ssQlxxchange">
+                @change="ztQlxxchange"
+              >
                 <el-table-column
                   prop="qllxmc"
                   width="130"
-                  label="权利类型"></el-table-column>
+                  label="权利类型"
+                ></el-table-column>
                 <el-table-column
                   prop="bdcqzh"
                   width="160"
-                  label="不动产权证书"></el-table-column>
+                  label="不动产权证书"
+                ></el-table-column>
                 <el-table-column prop="qlrmc" label="权利人"></el-table-column>
                 <el-table-column prop="mjmc" label="面积"></el-table-column>
                 <el-table-column prop="ytmc" label="用途"></el-table-column>
@@ -69,270 +74,156 @@
           </div>
           <div class="triangle"></div>
         </div>
-        <el-row :gutter="10">
+        <el-row :gutter="10" v-if="ruleForm.ztQlxx != null">
           <el-col :span="8">
-            <el-form-item label="不动产单元号：">
-              <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
+            <el-form-item label="权利人：">
+              <el-input disabled v-model="ruleForm.ztQlxx.qlrmc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item
-              label="业务号："
-              prop="qlxx.ywh"
-              :rules="rules.ywhrules">
-              <el-input v-model="ruleForm.qlxx.ywh"></el-input>
+            <el-form-item label="证件种类：">
+              <el-input disabled v-model="ruleForm.ztQlxx.qlrzjzl"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="上手业务号：">
-              <el-input disabled v-model="ruleForm.qlxx.ssywh"></el-input>
+            <el-form-item label="证件号：">
+              <el-input disabled v-model="ruleForm.ztQlxx.qlrzjhm"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="10">
+        <el-row :gutter="10" v-if="ruleForm.ztQlxx != null">
           <el-col :span="8">
             <el-form-item label="权利类型：">
-              <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
+              <el-input disabled v-model="ruleForm.ztQlxx.qllxmc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item
-              label="登记类型："
-              prop="qlxx.djlx"
-              :rules="rules.djlxrules">
-              <el-select v-model="ruleForm.qlxx.djlx" @change="djlxchange">
-                <el-option
-                  v-for="item in djlxlist"
-                  :key="item.dcode"
-                  :label="item.dname"
-                  :value="item.dcode">
-                </el-option>
-              </el-select>
+            <el-form-item label="不动产权证号：">
+              <el-input disabled v-model="ruleForm.ztQlxx.bdcqzh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="坐落：">
-              <el-input disabled v-model="ruleForm.sldy.zl"></el-input>
+              <el-input disabled v-model="ruleForm.ztQlxx.zl"></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="10" v-if="ruleForm.ztQlxx != null">
           <el-col :span="8">
-            <el-form-item label="土地使用权人：">
-              <el-input v-model="ruleForm.fdcq2.tdsyqr"></el-input>
+            <el-form-item label="不动产单元号：">
+              <el-input disabled v-model="ruleForm.ztQlxx.bdcdyh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="独用土地面积：">
-              <div class="flex">
-                <el-input
-                  v-model="ruleForm.fdcq2.dytdmj"
-                  oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
-                <el-select disabled v-model="mjdw" style="width: 20%">
-                  <el-option
-                    v-for="item in dictData['A7']"
-                    :key="item.dcode"
-                    :label="item.dname"
-                    :value="item.dcode">
-                  </el-option>
-                </el-select>
-              </div>
+            <el-form-item label="面积：">
+              <el-input disabled v-model="ruleForm.ztQlxx.mjmc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="分摊土地面积：">
-              <div class="flex">
-                <el-input
-                  v-model="ruleForm.fdcq2.fttdmj"
-                  oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
-                <el-select disabled v-model="mjdw" style="width: 20%">
-                  <el-option
-                    v-for="item in dictData['A7']"
-                    :key="item.dcode"
-                    :label="item.dname"
-                    :value="item.dcode">
-                  </el-option>
-                </el-select>
-              </div>
+            <el-form-item label="用途：">
+              <el-input disabled v-model="ruleForm.ztQlxx.ytmc"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <!-- 下拉框 -->
-            <el-form-item label="土地性质：" style="margin-bottom: 3px">
-              <treeselect
-                v-model="ruleForm.fdcq2.tdxz"
-                noOptionsText="暂无数据"
-                placeholder=""
-                :normalizer="normalizer"
-                :show-count="true"
-                :options="dictData['A9']" />
+        </el-row>
+        <div class="slxx_title title-block bdcqk">
+          异议登记信息
+          <div class="count" v-if="ssqlxxshow">
+            <el-form-item
+              label="上手权利信息："
+              prop="ssQlxx.bdcqzh"
+              :rules="rules.ssQlxxrules"
+            >
+              <select-table
+                v-model="ruleForm.ssQlxx"
+                :table-width="550"
+                :tableData="ssQlxxList"
+                :props="props"
+                @change="ssQlxxchange"
+              >
+                <el-table-column
+                  prop="qllxmc"
+                  width="130"
+                  label="权利类型"
+                ></el-table-column>
+                <el-table-column
+                  prop="bdcqzh"
+                  width="160"
+                  label="不动产权证书"
+                ></el-table-column>
+                <el-table-column prop="qlrmc" label="权利人"></el-table-column>
+                <el-table-column prop="mjmc" label="面积"></el-table-column>
+                <el-table-column prop="ytmc" label="用途"></el-table-column>
+                <el-table-column prop="zl" label="坐落"></el-table-column>
+              </select-table>
             </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="房地产交易价格：">
-              <div class="flex">
-                <el-input
-                  v-model="ruleForm.fdcq2.qjjg"
-                  style="width: 500%"
-                  oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
-                <el-select v-model="ruleForm.fdcq2.jedw">
-                  <el-option
-                    v-for="item in dictData['A57']"
-                    :key="item.dcode"
-                    :label="item.dname"
-                    :value="item.dcode">
-                  </el-option>
-                </el-select>
           </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="权属状态：">
-              <el-select v-model="ruleForm.qlxx.qszt">
-                <el-option
-                  v-for="item in qsztlist"
-                  :key="item.dcode"
-                  :label="item.dname"
-                  :value="item.dcode">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="规划用途：">
-              <el-select v-model="ruleForm.fdcq2.ghyt">
-                <el-option
-                  v-for="item in dictData['A17']"
-                  :key="item.dcode"
-                  :label="item.dname"
-                  :value="item.dcode">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="批准用途：">
-              <el-input v-model="ruleForm.fdcq2.pzyt"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="实际用途：">
-              <el-input v-model="ruleForm.fdcq2.sjyt"></el-input>
-            </el-form-item>
-          </el-col>
+          <div class="triangle"></div>
+        </div>
+        <el-row :gutter="10">
           <el-col :span="8">
-            <el-form-item label="房屋性质：">
-              <el-select v-model="ruleForm.fdcq2.fwxz">
-                <el-option
-                  v-for="item in dictData['A19']"
-                  :key="item.dcode"
-                  :label="item.dname"
-                  :value="item.dcode">
-                </el-option>
-              </el-select>
+            <el-form-item label="不动产单元号：">
+              <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item
-              label="房屋结构："
-              prop="fdcq2.fwjg"
-              :rules="rules.fwjgrules">
-              <el-select v-model="ruleForm.fdcq2.fwjg">
-                <el-option
-                  v-for="item in dictData['A46']"
-                  :key="item.dcode"
-                  :label="item.dname"
-                  :value="item.dcode">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="所在层：">
-              <el-input v-model="ruleForm.fdcq2.szc"></el-input>
+              label="业务号："
+              prop="qlxx.ywh"
+              :rules="rules.ywhrules"
+            >
+              <el-input v-model="ruleForm.qlxx.ywh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="总层数：">
-              <el-input v-model="ruleForm.fdcq2.zcs"></el-input>
+            <el-form-item label="上手业务号：">
+              <el-input disabled v-model="ruleForm.qlxx.ssywh"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="建筑面积：">
-              <div class="flex">
-                <el-input
-                  v-model="ruleForm.fdcq2.jzmj"
-                  oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
-                <el-select disabled v-model="mjdw" style="width: 20%">
-                  <el-option
-                    v-for="item in dictData['A7']"
-                    :key="item.dcode"
-                    :label="item.dname"
-                    :value="item.dcode">
-                  </el-option>
-                </el-select>
-              </div>
+        </el-row>
+        <el-row :gutter="10">
+          <!-- <el-col :span="8">
+            <el-form-item label="权利类型：">
+              <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
             </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="专有建筑面积：">
-              <div class="flex">
-                <el-input
-                  v-model="ruleForm.fdcq2.zyjzmj"
-                  oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
-                <el-select disabled v-model="mjdw" style="width: 20%">
-                  <el-option
-                    v-for="item in dictData['A7']"
-                    :key="item.dcode"
-                    :label="item.dname"
-                    :value="item.dcode">
-                  </el-option>
-                </el-select>
-              </div>
+          </el-col> -->
+          <!-- <el-col :span="8">
+            <el-form-item label="登记原因：">
+              <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="8">
-            <el-form-item label="分摊建筑面积：">
-              <div class="flex">
-                <el-input
-                  v-model="ruleForm.fdcq2.ftjzmj"
-                  oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
-                <el-select disabled v-model="mjdw" style="width: 20%">
+            <el-form-item
+              label="登记类型："
+              prop="qlxx.djlx"
+              :rules="rules.djlxrules"
+            >
+              <el-select v-model="ruleForm.qlxx.djlx" @change="djlxchange">
                 <el-option
-                    v-for="item in dictData['A7']"
+                  v-for="item in djlxlist"
                   :key="item.dcode"
                   :label="item.dname"
-                    :value="item.dcode">
+                  :value="item.dcode"
+                >
                 </el-option>
               </el-select>
-              </div>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="竣工时间：">
-              <el-date-picker
-                v-model="ruleForm.fdcq2.jgsj"
-                class="width100"
-                type="date"
-                placeholder="选择日期"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                format="yyyy-MM-dd">
-              </el-date-picker>
+          <!-- <el-col :span="8">
+            <el-form-item label="不动产坐落：">
+              <el-input v-model="ruleForm.qlxx.zl"></el-input>
             </el-form-item>
-          </el-col>
-
+          </el-col> -->
           <el-col :span="8">
             <el-form-item
               label="不动产权证号："
               prop="qlxx.bdcqzh"
-              :rules="rules.bdcqzhrules">
+              :rules="rules.bdcqzhrules"
+            >
               <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
             </el-form-item>
           </el-col>
           <!-- <el-col :span="8">
-            <el-form-item
-              label="区县代码："
-              prop="qlxx.qxdm"
-              :rules="rules.qxdmrules"
-            >
+            <el-form-item label="区县代码："  prop="qlxx.qxdm" :rules="rules.qxdmrules">
               <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
             </el-form-item>
           </el-col> -->
@@ -340,7 +231,8 @@
             <el-form-item
               label="登记机构："
               prop="qlxx.djjg"
-              :rules="rules.djjgrules">
+              :rules="rules.djjgrules"
+            >
               <el-input v-model="ruleForm.qlxx.djjg"></el-input>
             </el-form-item>
           </el-col>
@@ -348,7 +240,8 @@
             <el-form-item
               label="登簿人："
               prop="qlxx.dbr"
-              :rules="rules.dbrrules">
+              :rules="rules.dbrrules"
+            >
               <el-input v-model="ruleForm.qlxx.dbr"></el-input>
             </el-form-item>
           </el-col>
@@ -356,41 +249,85 @@
             <el-form-item
               label="登记时间："
               prop="qlxx.djsj"
-              :rules="rules.djsjrules">
+              :rules="rules.djsjrules"
+            >
               <el-date-picker
                 v-model="ruleForm.qlxx.djsj"
-                type="date"
                 class="width100"
+                type="date"
                 placeholder="选择日期"
                 value-format="yyyy-MM-dd HH:mm:ss"
-                format="yyyy-MM-dd">
+                format="yyyy-MM-dd"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="登记原因：">
-              <el-input v-model="ruleForm.fdcq2.djyy"></el-input>
+          <el-col :span="8">
+            <el-form-item label="权属状态：">
+              <el-select v-model="ruleForm.qlxx.qszt">
+                <el-option
+                  v-for="item in qsztlist"
+                  :key="item.dcode"
+                  :label="item.dname"
+                  :value="item.dcode"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="异议事项："
+              prop="yydj.yysx"
+              :rules="rules.yysxrules">
+              <el-input v-model="ruleForm.yydj.yysx"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="不动产登记证明号：">
+              <el-input
+                v-model="ruleForm.yydj.bdcdjzmh"
+                prop="yydj.bdcdjzmh"
+                :rules="rules.bdcdjzmhrules"
+                >></el-input
+              >
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="24">
             <el-form-item label="附记：">
-              <el-input v-model="ruleForm.fdcq2.fj"></el-input>
+              <el-input v-model="ruleForm.yydj.fj"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
+            <el-form-item label="注销异议业务号：">
+              <el-input v-model="ruleForm.yydj.zxyyywh"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
+            <el-form-item label="注销异议原因：">
+              <el-input v-model="ruleForm.yydj.zxyyyy"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
+            <el-form-item label="注销异议登簿人：">
+              <el-input v-model="ruleForm.yydj.zxyydbr"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
+            <el-form-item label="注销异议登记时间：">
+              <el-date-picker
+                v-model="ruleForm.yydj.zxyydjsj"
+                class="width100"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
         <div class="slxx_title title-block">
-          土地用途
-          <div class="triangle"></div>
-        </div>
-        <tdytTable
-          :tableData="ruleForm.tdytqxList"
-          @upDateTdytxxList="upDateTdytxxList"
-          :ableOperation="ableOperation" />
-        <div class="slxx_title title-block">
           权利人信息
           <div class="triangle"></div>
         </div>
@@ -399,7 +336,8 @@
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!ableOperation"
-                v-model="ruleForm.qlxx.gyfs">
+                v-model="ruleForm.qlxx.gyfs"
+              >
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
                 <el-radio label="2">按份所有</el-radio>
@@ -411,7 +349,8 @@
             <el-form-item label="是否分别持证：">
               <el-radio-group
                 v-model="ruleForm.qlxx.sqfbcz"
-                :disabled="!ableOperation">
+                :disabled="!ableOperation"
+              >
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
               </el-radio-group>
@@ -419,17 +358,20 @@
           </el-col>
           <el-col
             :span="6"
-            v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
+            v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'"
+          >
             <el-form-item label="持证人：">
               <el-select
                 v-model="ruleForm.czr"
                 placeholder="持证人"
-                :disabled="!ableOperation">
+                :disabled="!ableOperation"
+              >
                 <el-option
                   v-for="item in czrOptions"
                   :key="item.zjh"
                   :label="item.sqrmc"
-                  :value="item.zjh">
+                  :value="item.zjh"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
@@ -438,9 +380,23 @@
         <qlrCommonTable
           :tableData="ruleForm.qlrData"
           @upDateQlrxxList="upDateQlrxxList"
+          :key="key"
           :ableOperation="ableOperation"
+          :gyfs="ruleForm.qlxx.gyfs"
+        />
+        <div v-if="ruleForm.ywrData">
+          <div class="slxx_title title-block">
+            义务人信息
+            <div class="triangle"></div>
+          </div>
+          <ywrCommonTable
+            v-if="ruleForm.ywrData"
+            :tableData="ruleForm.ywrData"
             :key="key"
-          :gyfs="ruleForm.qlxx.gyfs" />
+            :ableOperation="ableOperation"
+            @upDateQlrxxList="upDateYwrxxList"
+          />
+        </div>
       </div>
       <el-row class="btn" v-if="ableOperation">
         <el-form-item>
@@ -451,19 +407,26 @@
   </div>
 </template>
 <script>
-  import { mapGetters } from "vuex";
-  import ywmix from "@/views/ywbl/mixin/index";
-  import { init, getSsQlxx, getQlxxByQlxxBsm, save } from "@/api/djbRepair.js";
-  import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
-  import selectTable from "@/components/selectTable/index.vue";
-  import tdytTable from "@/views/workflow/components/tdytTable";
-  export default {
+import { mapGetters } from "vuex";
+import ywmix from "@/views/ywbl/mixin/index";
+import {
+  init,
+  getSsQlxx,
+  getZtQlxx,
+  getQlxxByQlxxBsm,
+  save,
+} from "@/api/djbRepair.js";
+import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
+import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
+import tdytTable from "@/views/workflow/components/tdytTable";
+import selectTable from "@/components/selectTable/index.vue";
+export default {
   mixins: [ywmix],
-    components: { qlrCommonTable, tdytTable, selectTable },
+  components: { qlrCommonTable, ywrCommonTable, tdytTable, selectTable },
   computed: {
     ...mapGetters(["dictData", "flag"]),
     // 根据流程判断表单是否为只读
-      editDisabled () {
+    editDisabled() {
       if (!this.ableOperation) {
         //只读状态
         return true;
@@ -471,28 +434,22 @@
       return false;
     },
   },
-    data () {
+  data() {
     return {
-        mjdw: "1",
       ssqlxxshow: true,
       props: {
         label: "bdcqzh",
         value: "bdcdyid",
       },
-        // 键名转换，方法默认是label和children进行树状渲染
-        normalizer (node) {
-          //方法
-          if (node.children == null || node.children == "null") {
-            delete node.children;
-          }
-          return {
-            id: node.dcode,
-            label: node.dname,
-          };
-        },
-
       //表单是否可操作
       propsParam: this.$attrs,
+      key: 0,
+      isShow: false,
+      disabled: true,
+      czrOptions: [],
+      ssQlxxList: [],
+      ztQlxxList: [],
+      ruleForm: {},
       // 登记类型
       djlxlist: [
         {
@@ -532,86 +489,89 @@
           dname: "历史",
         },
       ],
-        key: 0,
-        tdxz: null,
-        isShow: false,
-        disabled: true,
-        czrOptions: [],
-        ssQlxxList: [],
-        ruleForm: {
-          fdcq2: {
-            ftjzmj: "",
-          },
-        },
-        ableOperation: false,
       //传递参数\
       rules: {
         ssQlxxrules: [
           { required: true, message: "上手权利信息", trigger: "blur" },
         ],
+        ztQlxxrules: [
+          { required: true, message: "抵押不动产信息", trigger: "blur" },
+        ],
         bdcqzhrules: [
-            { required: true, message: "不动产权证号：", trigger: "blur" },
+          { required: true, message: "不动产证号 ", trigger: "blur" },
         ],
         // qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
-          djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
+        djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
         dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
         djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
-          fwjgrules: [{ required: true, message: "房屋结构", trigger: "change" }],
         djlxrules: [{ required: true, message: "登记类型", trigger: "change" }],
         ywhrules: [{ required: true, message: "业务号", trigger: "blur" }],
+        bdcdjzmhrules: [
+          { required: true, message: "不动产登记证明号： ", trigger: "blur" },
+        ],
+        yysxrules: [{ required: true, message: "异议事项", trigger: "blur" }],
       },
+      ableOperation: false,
     };
   },
-    created () { },
-    mounted () {
+  created() {
     this.loadData();
+  },
+  mounted() {
     this.ableOperation = this.$parent.ableOperation;
   },
   methods: {
     /**
+     * @description: ztQlxxchange
+     * @param {*} val
+     * @author: renchao
+     */
+    ztQlxxchange(val) {
+      this.ruleForm.ztQlxx = val;
+    },
+    /**
      * @description: ssQlxxchange
      * @param {*} val
      * @author: renchao
      */
-      ssQlxxchange (val) {
+    ssQlxxchange(val) {
       this.ruleForm.ssQlxx = val;
       this.ruleForm.qlxx.ssywh = val.ywh;
       this.ssQlxxchangediolog(val);
     },
     // 弹框事件
-      ssQlxxchangediolog (val) {
+    ssQlxxchangediolog(val) {
       this.$confirm("是否将上手权利信息同步到表单", "提示", {
         iconClass: "el-icon-question", //自定义图标样式
         confirmButtonText: "确认", //确认按钮文字更换
         cancelButtonText: "取消", //取消按钮文字更换
         showClose: true, //是否显示右上角关闭按钮
         type: "warning",
-
-
-        }).then(() => {
+      })
+        .then(() => {
           getQlxxByQlxxBsm({ qlxxBsm: val.bsmQlxx }).then((res) => {
             if (res.code == 200) {
               this.nowlist = res.result;
-              for (var key in this.ruleForm.fdcq2) {
+              for (var key in this.ruleForm.yydj) {
                 if (
-                  this.ruleForm.fdcq2[key] == "" ||
-                  this.ruleForm.fdcq2[key] == null
+                  this.ruleForm.yydj[key] == "" ||
+                  this.ruleForm.yydj[key] == null
                 ) {
-                  this.ruleForm.fdcq2[key] = this.nowlist.fdcq2[key];
+                  this.ruleForm.yydj[key] = this.nowlist.yydj[key];
                 }
               }
               for (var key in this.ruleForm.qlxx) {
                 if (
                   this.ruleForm.qlxx[key] == "" ||
-                  this.ruleForm.qlxx[key] == null &&
+                  (this.ruleForm.qlxx[key] == null &&
                     key != "ywh" &&
                     key != "dbr" &&
                     key != "djsj" &&
                     key != "ssywh" &&
                     key != "ssywh" &&
-                  key != "bdcqzh") {
+                    key != "bdcqzh")
+                ) {
                   this.ruleForm.qlxx[key] = this.nowlist.qlxx[key];
-
                 }
               }
               if (!this.ruleForm.tdytqxList.length) {
@@ -629,7 +589,8 @@
               });
             }
           });
-        }).catch(() => {
+        })
+        .catch(() => {
           this.$message({
             type: "info",
             message: "已取消同步",
@@ -641,7 +602,7 @@
      * @param {*} val
      * @author: renchao
      */
-      djlxchange (val) {
+    djlxchange(val) {
       if (val == null || val == 100) {
         this.ssqlxxshow = false;
       } else {
@@ -652,28 +613,17 @@
      * @description: loadData
      * @author: renchao
      */
-      loadData () {
+    loadData() {
       this.$startLoading();
       this.propsParam.isEdit = this.$parent.isEdit;
       init(this.propsParam).then((res) => {
         if (res.code == 200) {
           this.ruleForm = res.result;
-            this.ruleForm.qlrList.forEach((item, index) => {
-              if (item.sfczr == 1) {
-                this.ruleForm.czr = item.zjh
-              }
-            })
           let djlx = this.ruleForm.qlxx.djlx;
           if (djlx == null || djlx == 100) {
             this.ssqlxxshow = false;
           }
-            this.ruleForm.fdcq2.jedw = "1";
           this.$endLoading();
-            if (this.ruleForm.tdytqxList.length > 0) {
-              this.tdxz = this.ruleForm.tdytqxList[0].qlxzbm;
-            } else {
-              this.tdxz = null;
-            }
           this.isShow = true;
           //获取主体信息
           getSsQlxx({
@@ -685,6 +635,15 @@
               this.ssQlxxList = res.result;
             }
           });
+          //获取上手信息
+          getZtQlxx({
+            bdcdyid: this.propsParam.bdcdyid,
+            bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
+          }).then((res) => {
+            if (res.code == 200) {
+              this.ztQlxxList = res.result;
+            }
+          });
         }
       });
     },
@@ -694,7 +653,7 @@
      * @param {*} val
      * @author: renchao
      */
-      upDateTdytxxList (val) {
+    upDateTdytxxList(val) {
       this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
       this.key++;
     },
@@ -704,7 +663,7 @@
      * @param {*} val
      * @author: renchao
      */
-      upDateQlrxxList (val) {
+    upDateQlrxxList(val) {
       this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
       this.czrOptions = this.ruleForm.qlrData;
       this.key++;
@@ -715,7 +674,7 @@
      * @param {*} val
      * @author: renchao
      */
-      upDateYwrxxList (val) {
+    upDateYwrxxList(val) {
       this.ruleForm.ywrData && (this.ruleForm.ywrData = _.cloneDeep(val));
       this.key++;
     },
@@ -723,7 +682,7 @@
      * @description: onSubmit
      * @author: renchao
      */
-      onSubmit () {
+    onSubmit() {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           if (this.ruleForm.qlrData.length == 0) {
@@ -742,7 +701,7 @@
             });
             return false;
           }
-            if (this.ruleForm.sldy.gyfs == "0") {
+          if (this.ruleForm.qlxx.gyfs == "0") {
             if (this.ruleForm.qlrData.length > 1) {
               this.$message({
                 showClose: true,
@@ -752,31 +711,16 @@
               return false;
             }
             this.ruleForm.qlrData[0].sfczr = "1";
-            } else {
-              if (this.ruleForm.qlrList.length <= 1) {
-                this.$message({
-                  showClose: true,
-                  message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
-                  type: "error",
-                });
-                return false;
           }
+          if (this.ruleForm.qlxx.gyfs == "1") {
             //是否分别持证
-              if (this.ruleForm.sldy.sqfbcz == "1") {
+            if (this.ruleForm.qlxx.sqfbcz == "1") {
               //是
-                this.ruleForm.qlrList.forEach((item, index) => {
+              this.ruleForm.qlrData.forEach((item, index) => {
                 item.sfczr = "1";
               });
             } else {
-                if (!that.ruleForm.czr) {
-                  that.$message({
-                    showClose: true,
-                    message: "请选择持证人",
-                    type: "error",
-                  });
-                  return false;
-                }
-                this.ruleForm.qlrList.forEach((item, index) => {
+              this.ruleForm.qlrData.forEach((item, index) => {
                 if (item.zjh == this.ruleForm.czr) {
                   item.sfczr = "1";
                 } else {
@@ -808,9 +752,9 @@
       });
     },
   },
-  };
+};
 </script>
 <style scoped lang="scss">
-  @import "~@/styles/public.scss";
-  @import "~@/styles/slxx/slxx.scss";
+@import "~@/styles/public.scss";
+@import "~@/styles/slxx/slxx.scss";
 </style>

@@ -113,14 +113,6 @@ export default {
     },
   },
   mounted() {
-    console.log(
-      "bestepid: this.$route.query.bestepid,",
-      this.$route.query.bestepid
-    );
-    console.log(
-      "bestepid: this.$route.query.sqywbm,",
-      this.$route.query.sqywbm
-    );
     this.ableOperation = this.$parent.ableOperation;
   },
   methods: {
@@ -162,7 +154,6 @@ export default {
       return new Promise((resolve) => {
         this.unitData = this.$parent.unitData;
         var formdata = new FormData();
-
         formdata.append("bsmSlsq", this.$parent.bsmSlsq);
         if (this.$route.query.sqywbm == "DJBBL") {
           formdata.append("bsmSldy", this.$parent.bsmRepair);
@@ -259,6 +250,9 @@ export default {
         sjlx: data.cllx,
         sfxjcl: "1", // 是否必选
       };
+       if (this.$route.query.sqywbm == "DJBBL") {
+          obj.bsmSldy=this.$parent.bsmRepair
+        }
       saveClml(obj).then(async (res) => {
         if (res.code == 200) {
           let res = await this.clmlInitList(2);
@@ -324,6 +318,7 @@ export default {
           data: this.tableData,
           unitData: this.$parent.unitData,
           ableOperation: this.$parent.ableOperation,
+          bsmRepair:this.$parent.bsmRepair
         },
         "60%",
         true

@@ -209,9 +209,14 @@
         return new Promise(resolve => {
           this.unitData = this.$parent.unitData;
           var formdata = new FormData();
-          formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy);
         formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
+        if (Vue.prototype.$currentRoute.query.sqywbm == "DJBBL") {
+          formdata.append("bsmSldy", this.formData.bsmRepair);
+          formdata.append("clfl", 3);
+        } else {
+             formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy);
           formdata.append("clfl", 2);
+        }
           InitClml(formdata).then((res) => {
             if (res.code == 200) {
               resolve(res.code)

@@ -485,8 +485,19 @@
         //  this.taskList =this.formData.allCommentList;
         //  处理数据之后赋值
         this.taskCommentList = this.taskList;
+      this.taskCommentList=this.taskCommentList.sort(this.sortDownDate)
       },
+      /**
+       *  时间排序函数
+       * @description: formatDate
+       * @param {*} row
+       * @param {*} column
+       * @author: renchao
+       */
 
+      sortDownDate(a, b) {
+     return Date.parse(a.createTime) - Date.parse(b.createTime);
+     },
       // 设置流程图元素状态
       /**
        * @description: 设置流程图元素状态

@@ -9,7 +9,7 @@
       <i class="el-icon-question invalid-icon"></i>
       <div class="invalid-body">您是否确定终止该业务办理？</div>
     </div>
-    <div class="invalid-reson">终止原因：</div>
+    <div class="invalid-reson">退件原因：</div>
     <el-input
       v-model="stopMessage"
       placeholder="请输入终止原因"

@@ -60,7 +60,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="不动产单元号：">
-              <el-input v-model="ruleForm.zdjbxx.bdcdyh"></el-input>
+              <el-input v-model="ruleForm.sldy.bdcdyh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">

@@ -11,7 +11,8 @@
         :model="queryForm"
         ref="queryForm"
         @submit.native.prevent
-        label-width="80px">
+        label-width="80px"
+      >
         <el-row>
           <el-col :span="5">
             <el-form-item label="业务来源" label-width="70px">
@@ -22,12 +23,14 @@
                 class="width100"
                 filterable
                 clearable
-                placeholder="请选择业务来源">
+                placeholder="请选择业务来源"
+              >
                 <el-option
                   v-for="item in dictData['ywly']"
                   :key="item.dcode"
                   :label="item.dname"
-                  :value="item.dcode">
+                  :value="item.dcode"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
@@ -41,12 +44,14 @@
                 class="width100"
                 filterable
                 clearable
-                placeholder="请选择权利类型">
+                placeholder="请选择权利类型"
+              >
                 <el-option
                   v-for="item in dictData['A8']"
                   :key="item.dcode"
                   :label="item.dname"
-                  :value="item.dcode">
+                  :value="item.dcode"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
@@ -60,12 +65,14 @@
                 class="width100"
                 filterable
                 clearable
-                placeholder="请选择登记类型">
+                placeholder="请选择登记类型"
+              >
                 <el-option
                   v-for="item in dictData['A21']"
                   :key="item.dcode"
                   :label="item.dname"
-                  :value="item.dcode">
+                  :value="item.dcode"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
@@ -76,14 +83,20 @@
                 placeholder="请输入业务号"
                 v-model="queryForm.ywh"
                 clearable
-                class="width200px">
+                class="width200px"
+              >
               </el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="4" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
+              <el-button
+                type="primary"
+                native-type="submit"
+                @click="handleSearch"
+                >查询</el-button
+              >
               <el-button @click="moreQueryClick">高级查询</el-button>
             </el-form-item>
           </el-col>
@@ -95,14 +108,16 @@
               {{ item.name }}:{{ item.value }}
               <i
                 class="el-icon-circle-close"
-                @click="handelItem(item, index)"></i>
+                @click="handelItem(item, index)"
+              ></i>
             </li>
           </ul>
           <el-button
             class="clean-btn"
             type="text"
             v-if="searchList.length > 0"
-            @click.native="hanldeCleanAll">清除全部
+            @click.native="hanldeCleanAll"
+            >清除全部
           </el-button>
         </el-row>
       </el-form>
@@ -119,30 +134,35 @@
         @size-change="handleSizeChange"
         @p-current-change="handleCurrentChange"
         :column="tableData.columns"
-        :data="tableData.data">
+        :data="tableData.data"
+      >
       </lb-table>
     </div>
-    <searchBox v-model="isSearch" @getSearch="getSearch" :advancedForm="otherForm" />
+    <searchBox
+      v-model="isSearch"
+      @getSearch="getSearch"
+      :advancedForm="otherForm"
+    />
   </div>
 </template>
 <script>
-  import { mapGetters } from "vuex";
-  import searchMin from "../components/mixin/index";
-  import table from "@/utils/mixin/table";
-  import { datas, sendThis } from "./ybxdata";
-  import { searchTaskDone } from "@/api/workflow/search.js";
-  import searchBox from "../components/search.vue";
-  export default {
+import { mapGetters } from "vuex";
+import searchMin from "../components/mixin/index";
+import table from "@/utils/mixin/table";
+import { datas, sendThis } from "./ybxdata";
+import { searchTaskDone } from "@/api/workflow/search.js";
+import searchBox from "../components/search.vue";
+export default {
   name: "ybx",
   components: { searchBox },
   mixins: [table, searchMin],
-    mounted () {
+  mounted() {
     sendThis(this);
   },
   computed: {
     ...mapGetters(["dictData"]),
   },
-    data () {
+  data() {
     return {
       queryForm: {
         ywly: "",
@@ -163,11 +183,11 @@
       },
     };
   },
-    activated () {
-      this.queryClick()
+  activated() {
+    this.queryClick();
     window["getBpageList"] = () => {
-        this.queryClick()
-      }
+      this.queryClick();
+    };
   },
   methods: {
     // 列表渲染接口
@@ -175,7 +195,7 @@
      * @description: 列表渲染接口
      * @author: renchao
      */
-      queryClick () {
+    queryClick() {
       this.$startLoading();
       this.searchForm.ywh = this.queryForm.ywh;
       this.iterationData();
@@ -203,7 +223,7 @@
      * @param {*} val
      * @author: renchao
      */
-      handleSort (val) {
+    handleSort(val) {
       this.queryForm.sortField = val.prop;
       this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc";
       this.queryClick();
@@ -213,14 +233,17 @@
      * @param {*} item
      * @author: renchao
      */
-      ywhClick (item) {
+    ywhClick(item) {
       //有任务权限
       if (item.sjlx == "3") {
+        item.djywbm = "DJBBL";
         const { href } = this.$router.resolve(
           "/djbworkFrameview?bsmSlsq=" +
             item.bsmSlsq +
             "&bestepid=" +
-            item.bestepid
+            item.bestepid +
+            "&sqywbm=" +
+            item.djywbm
         );
         window.open(href, `djbworkFrameview${item.bsmSlsq}`);
       } else {
@@ -232,10 +255,10 @@
         );
         window.open(href, `workFrameView${item.bsmSlsq}`);
       }
-      }
-    }
-  }
+    },
+  },
+};
 </script>
 <style scoped lang="scss">
-  @import "~@/styles/public.scss";
+@import "~@/styles/public.scss";
 </style>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-02 10:02:46
+ * @LastEditTime: 2023-08-07 17:31:43
 -->
 <template>
   <div class="from-clues">
@@ -96,16 +96,16 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="7">
+            <el-col :span="6">
               <el-form-item label="项目名称">
                 <el-input placeholder="请输入项目名称" v-model="querydzForm.xmmc"></el-input>
               </el-form-item>
             </el-col>
 
-            <el-col :span="3" class="btnColRight">
+            <el-col :span="18" class="btnColRight">
               <el-form-item>
                 <el-button type="primary" @click="resetForm(true)">重置</el-button>
-                <el-button type="primary" @click="handleSearch">查询11</el-button>
+                <el-button type="primary" @click="handleSearch">查询</el-button>
               </el-form-item>
             </el-col>
           </el-row>

@@ -198,6 +198,7 @@
         if (data[index].sffqlc == "1") {
           this.selectParam = data[index];
           this.btnDisabled = false;
+          this.djqxList = []
         } else {
           this.btnDisabled = true;
           this.getNextNode(data[index].bsmSqyw);