Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -82,4 +82,8 @@
   /deep/.el-form-item__content{
        pointer-events: none!important;
      }
+
+     /deep/.el-input .el-input__inner {
+      background-color: #F5F7FA;
+     }
  }

@@ -182,7 +182,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="是否被续封：">
+            <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"
@@ -473,10 +475,11 @@ export default {
         bdcqzhrules: [
           { required: true, message: "不动产登记证明号", trigger: "blur" },
         ],
-        qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
         djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
         dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
         djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
+        sfbxfrules: [{ required: true, message: "是否被续封", trigger: "change" }],
+
       },
     };
   },

@@ -14,8 +14,6 @@
       ref="ruleForm"
       :label-position="flag ? 'top' : ''"
       :inline="flag"
-      :show-message="false"
-      inline-message
       label-width="145px"
     >
       <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
@@ -44,8 +42,8 @@
           建设用地、宅基地使用权信息
           <div class="triangle"></div>
         </div>
-        <el-row :gutter="10">
-         <el-col :span="8" v-if="ssqlxxshow">
+         <el-row :gutter="10">
+        <el-col :span="8" v-if="ssqlxxshow">
             <el-form-item label="上手权利信息：">
               <select-table
                 v-model="ruleForm.ssQlxx"
@@ -86,8 +84,6 @@
               <el-input disabled v-model="ruleForm.qlxx.ssywh"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="权利类型：">
               <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
@@ -298,17 +294,19 @@
 <script>
 import store from "@/store/index.js";
 import { mapGetters } from "vuex";
-import { init, save } from "@/api/djbRepair.js";
+import { init,getSsQlxx, 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 {
-  components: { qlrCommonTable, tdytTable },
+  components: { qlrCommonTable, tdytTable,selectTable },
   computed: {
     ...mapGetters(["dictData", "flag"]),
     // 根据流程判断表单是否为只读
       editDisabled() {
       if (!this.ableOperation) {
         //只读状态
+        console.log("只读");
         return true;
       }
       return false;
@@ -442,8 +440,12 @@ export default {
       this.propsParam.isEdit = this.$parent.isEdit;
       init(this.propsParam).then((res) => {
         if (res.code == 200) {
-          this.ruleForm = res.result;
-          this.$endLoading();
+            this.ruleForm = res.result;
+          let djlx = this.ruleForm.qlxx.djlx;
+          if (djlx == null || djlx == 100) {
+            this.ssqlxxshow = false;
+          }
+           this.$endLoading();
           if (this.ruleForm.tdytqxList.length > 0) {
             this.tdxz = this.ruleForm.tdytqxList[0].qlxzbm;
           } else {
@@ -483,16 +485,7 @@ export default {
       this.czrOptions = this.ruleForm.qlrData;
       this.key++;
     },
-    // 更新义务人信息
-    /**
-     * @description: 更新义务人信息
-     * @param {*} val
-     * @author: renchao
-     */
-    upDateYwrxxList(val) {
-      this.ruleForm.ywrData && (this.ruleForm.ywrData = _.cloneDeep(val));
-      this.key++;
-    },
+
     /**
      * @description: onSubmit
      * @author: renchao

@@ -175,7 +175,7 @@
                   oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
                 ></el-input>
                 <el-select
-                  v-model="ruleForm.tdsyq.mjdw1"
+                  v-model="ruleForm.tdsyq.mjdw"
                   :disabled="!ableOperation"
                   style="width: 20%"
                 >
@@ -199,7 +199,7 @@
                   oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
                 ></el-input>
                 <el-select
-                  v-model="ruleForm.tdsyq.mjdw2"
+                  v-model="ruleForm.tdsyq.mjdw"
                   :disabled="!ableOperation"
                   style="width: 20%"
                 >
@@ -223,7 +223,7 @@
                   oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
                 ></el-input>
                 <el-select
-                  v-model="ruleForm.tdsyq.mjdw3"
+                  v-model="ruleForm.tdsyq.mjdw"
                   :disabled="!ableOperation"
                   style="width: 20%"
                 >
@@ -249,7 +249,7 @@
                   oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
                 ></el-input>
                 <el-select
-                  v-model="ruleForm.tdsyq.mjdw4"
+                  v-model="ruleForm.tdsyq.mjdw"
                   :disabled="!ableOperation"
                   style="width: 20%"
                 >
@@ -273,7 +273,7 @@
                   oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
                 ></el-input>
                 <el-select
-                  v-model="ruleForm.tdsyq.mjdw5"
+                  v-model="ruleForm.tdsyq.mjdw"
                   :disabled="!ableOperation"
                   style="width: 20%"
                 >
@@ -297,7 +297,7 @@
                   oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
                 ></el-input>
                 <el-select
-                  v-model="ruleForm.tdsyq.mjdw6"
+                  v-model="ruleForm.tdsyq.mjdw"
                   :disabled="!ableOperation"
                   style="width: 20%"
                 >
@@ -323,7 +323,7 @@
                   oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
                 ></el-input>
                 <el-select
-                  v-model="ruleForm.tdsyq.mjdw7"
+                  v-model="ruleForm.tdsyq.mjdw"
                   :disabled="!ableOperation"
                   style="width: 20%"
                 >
@@ -422,6 +422,7 @@ export default {
     editDisabled() {
       if (!this.ableOperation) {
         //只读状态
+          console.log("只读");
         return true;
       }
       return false;
@@ -598,11 +599,7 @@ export default {
       this.czrOptions = this.ruleForm.qlrData;
       this.key++;
     },
-    // // 更新义务人信息
-    // upDateYwrxxList(val) {
-    //   this.ruleForm.ywrData && (this.ruleForm.ywrData = _.cloneDeep(val));
-    //   this.key++;
-    // },
+
     /**
      * @description: onSubmit
      * @author: renchao
@@ -673,6 +670,7 @@ export default {
 </script>
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
+@import "~@/styles/slxx/slxx.scss";
 /deep/.el-form {
   display: flex;
   flex-direction: column;

@@ -17,7 +17,6 @@ import {
   getPrintApplicationInfo,
   unClaimTask
 } from "@/api/workFlow.js";
-import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
@@ -60,7 +59,7 @@ export default {
       stepExpandInfo(formdata).then((res) => {
         if (res.code === 200) {
           this.leftButtonList = res.result.button;
-          if (res.result.properties.length) {
+          if (res.result.properties&&res.result.properties.length) {
             this.showidea = res.result.properties[0].value
           }
 
@@ -73,7 +72,7 @@ export default {
             this.$refs.Menu.getleftMenubl();
           } else {
             this.ableOperation = false
-            this.$refs.Menu.getleftMenubl(1);
+            this.$refs.Menu.getleftMenubl();
           }
         }
       })