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

renchao@pashanhoo.com
Showing 10 changed files with 230 additions and 158 deletions
src/views/djbworkflow/djbBook/components/blxxtabs/cfdj.vue
src/views/djbworkflow/djbBook/components/blxxtabs/dyaq.vue
src/views/djbworkflow/djbBook/components/blxxtabs/dyiq.vue
src/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue
src/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue
src/views/djbworkflow/djbBook/components/blxxtabs/ygdj.vue
src/views/djbworkflow/djbBook/components/blxxtabs/yydj.vue
src/views/djbworkflow/djbBook/spyj.vue
src/views/workflow/components/tdytTable.vue
src/views/zhcx/djbcx/djbcx.vue
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/cfdj.vue
View file @9e9ccac
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/cfdj.vue
View file @9e9ccac
@@ -13,7 +13,7 @@
      ref="ruleForm"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
-      label-width="127px"
+      label-width="145px"
    >
      <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
        <div class="slxx_title title-block">
@@ -39,9 +39,37 @@
        </el-row>
        <div class="slxx_title title-block">
          查封不动产情况
-          <div>请选择查封不动产信息，请选择上手权利信息</div>
+           <div class="triangle"></div>
-          <div class="triangle"></div>
        </div>
+         <el-row :gutter="10">
+            <el-col :span="8">
+              <el-form-item label="抵押不动产信息：">
+                <select-table v-model="ruleForm.ztQlxx" :table-width="550" :tableData="ztQlxxList"
+                  :props="props" @change="ztQlxxchange">
+                  <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" v-if="ssqlxxshow">
+              <el-form-item label="上手权利信息：">
+                <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-row>
        <el-row :gutter="10" v-if="ruleForm.ztQlxx != null">
          <el-col :span="8">
            <el-form-item label="权利人：">
@@ -94,7 +122,7 @@
          </el-col>
        </el-row>
        <div class="slxx_title title-block">
-          房地产权（独幢、层、套、间房屋）
+          查封登记信息
          <div class="triangle"></div>
        </div>
        <el-row :gutter="10">
@@ -115,14 +143,14 @@
          </el-col>
        </el-row>
        <el-row :gutter="10">
-          <!-- <el-col :span="8">
+          <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="登记类型：">
-              <el-select v-model="ruleForm.qlxx.djlx">
+              <el-select v-model="ruleForm.qlxx.djlx" @change="djlxchange">
                <el-option
                  v-for="item in dictData['A21']"
                  :key="item.dcode"
@@ -141,7 +169,7 @@
            <el-form-item label="不动产权证号：">
              <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
            </el-form-item>
-          </el-col> -->
+          </el-col>
          <el-col :span="8">
            <el-form-item label="登记机构：">
              <el-input v-model="ruleForm.qlxx.djjg"></el-input>
@@ -263,18 +291,6 @@
          :gyfs="ruleForm.qlxx.gyfs"
        />
-        <div>
-          <div class="slxx_title title-block">
-            义务人信息
-            <div class="triangle"></div>
-          </div>
-          <ywrCommonTable
-            v-if="ruleForm.ywrData"
-            :tableData="ruleForm.ywrData"
-            :key="key"
-            @upDateQlrxxList="upDateYwrxxList"
-          />
-        </div>
      </div>
      <el-row class="btn">
        <el-form-item>
@@ -286,12 +302,13 @@
 </template>
 <script>
 import { mapGetters } from "vuex";
-import { init, save } from "@/api/djbbl.js";
+import { init,getSsQlxx, getZtQlxx, save } from "@/api/djbbl.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 {
-  components: { qlrCommonTable, ywrCommonTable, tdytTable },
+  components: { qlrCommonTable, ywrCommonTable, tdytTable,selectTable },
  computed: {
    ...mapGetters(["dictData", "flag"]),
  },
@@ -301,11 +318,18 @@ export default {
      propsParam: this.$attrs,
      key: 0,
      isShow: false,
+      ssqlxxshow:true,
      disabled: true,
      czrOptions: [],
      ruleForm: {},
      //传递参数\
      rules: {},
+      props: {
+          label: "bdcqzh",
+          value: "bdcdyid"
+        },
+           ssQlxxList: [],
+        ztQlxxList: [],
    };
  },
  created() {
@@ -313,28 +337,53 @@ export default {
  },
  mounted() {},
  methods: {
+      ztQlxxchange (val) {
+        this.ruleForm.ztQlxx = val
+      },
+      ssQlxxchange (val) {
+        this.ruleForm.ssQlxx = val
+      },
+        djlxchange(val){
+           if(val==null||val==100){
+             this.ssqlxxshow=false
+          }else{
+             this.ssqlxxshow=true
+          }
+      },
    loadData() {
-      console.log("查封登记", this.propsParam);
      this.propsParam.isEdit = this.$parent.isEdit;
      init(this.propsParam).then((res) => {
        if (res.code == 200) {
          this.ruleForm = res.result;
-          console.log("this.ruleForm", this.ruleForm);
          this.isShow = true;
+            let djlx=  this.ruleForm.qlxx.djlx
+          if(djlx==null||djlx==100){
+            this.ssqlxxshow=false
+          }
        }
      });
+          //获取主体信息
+        getSsQlxx({ bdcdyid: this.propsParam.bdcdyid, qllx: this.propsParam.qllx }).then((res) => {
+          if (res.code == 200) {
+            this.ssQlxxList = res.result;
+          }
+        });
+        //获取上手信息
+        getZtQlxx({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
+          if (res.code == 200) {
+            this.ztQlxxList = res.result;
+          }
+        });
    },
    // 更新土地用途信息
    upDateTdytxxList(val) {
-      console.log("VAL", val);
      this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
      this.key++;
    },
    // 更新权利人信息
    upDateQlrxxList(val) {
-      console.log("val", val);
      this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
-      console.log("this.ruleForm.qlrData", this.ruleForm.qlrData);
      this.czrOptions = this.ruleForm.qlrData;
      this.key++;
    },
@@ -344,7 +393,6 @@ export default {
      this.key++;
    },
    onSubmit() {
-      console.log("this.ruleForm大信息", this.ruleForm);
      if (this.ruleForm.qlrData.length == 0) {
        this.$message({
          showClose: true,
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/dyaq.vue
View file @9e9ccac
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/dyaq.vue
View file @9e9ccac
@@ -36,8 +36,10 @@
            </el-form-item>
          </el-col>
        </el-row>
-        <div class="slxx_title title-block flex">
+        <div class="slxx_title title-block">
-          抵押不动产情况 <el-divider direction="vertical"></el-divider>
+          抵押不动产情况
+           <div class="triangle"></div>
+        </div>
          <el-row :gutter="10">
            <el-col :span="8">
              <el-form-item label="抵押不动产信息：">
@@ -53,7 +55,7 @@
              </el-form-item>
            </el-col>
-            <el-col :span="8">
+            <el-col :span="8" v-if="ssqlxxshow">
              <el-form-item label="上手权利信息：">
                <select-table v-model="ruleForm.ssQlxx" :table-width="550" :tableData="ssQlxxList"
                  :props="props" @change="ssQlxxchange">
@@ -67,8 +69,7 @@
              </el-form-item>
            </el-col>
          </el-row>
-          <div class="triangle"></div>
-        </div>
        <el-row :gutter="10" v-if="ruleForm.ztQlxx!=null">
          <el-col :span="8">
            <el-form-item label="权利人：">
@@ -125,6 +126,51 @@
          <div class="triangle"></div>
        </div>
        <el-row :gutter="10">
+           <el-col :span="8">
+            <el-form-item label="抵押方式：">
+              <!-- <el-input disabled v-model="ruleForm.slywxx.djqxmc"></el-input> -->
+              <el-radio-group v-model="ruleForm.diyaq.dyfs">
+                <el-radio label="1">一般抵押</el-radio>
+                <el-radio label="2">最高额抵押</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+         <el-col :span="8" v-show="ruleForm.diyaq.dyfs == 2">
+            <el-form-item label="最高债权额">
+              <div style="display: flex">
+                <el-input
+                  v-model="ruleForm.diyaq.zgzqse"
+                  style="width: 500%"
+                  oninput="value=value.replace(/[^\d.]/g,'')"></el-input>
+                <el-select v-model="ruleForm.diyaq.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" v-show="ruleForm.diyaq.dyfs == 1">
+            <el-form-item label="被担保主债权数额">
+              <div style="display: flex">
+                <el-input
+                  v-model="ruleForm.diyaq.bdbzzqse"
+                  style="width: 500%"
+                  oninput="value=value.replace(/[^\d.]/g,'')"></el-input>
+                <el-select v-model="ruleForm.diyaq.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-row>
+          <el-row :gutter="10">
          <el-col :span="8">
            <el-form-item label="不动产单元号：">
              <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
@@ -137,7 +183,7 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="上手业务号：">
-              <el-input v-model="ruleForm.qlxx.ssywh"></el-input>
+              <el-input disabled v-model="ruleForm.qlxx.ssywh"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
@@ -149,7 +195,7 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="登记类型：">
-              <el-select v-model="ruleForm.qlxx.djlx">
+              <el-select v-model="ruleForm.qlxx.djlx"  @change="djlxchange">
                <el-option
                  v-for="item in djlxlist"
                  :key="item.dcode"
@@ -204,40 +250,7 @@
              <el-input v-model="ruleForm.qlxx.djsj"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8">
-            <!-- <el-form-item label="抵押不动产类型">
-              <el-input v-model="ruleForm.qlxx.djsj"></el-input>
-            </el-form-item>-->
-            <el-form-item label="抵押不动产类型：">
-              <el-select v-model="ruleForm.diyaq.djlx">
-                <el-option
-                  v-for="item in dictData['A27']"
-                  :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.diyaq.dyr"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="抵押人类型：">
-              <el-input v-model="ruleForm.diyaq.dyrlx"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="抵押方式：">
-              <el-input v-model="ruleForm.diyaq.dyfs"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="抵押权顺位：">
-              <el-input v-model="ruleForm.diyaq.dyqsw"></el-input>
-            </el-form-item>
-          </el-col>
          <el-col :span="8">
            <el-form-item label="抵押金额类型：">
              <el-input v-model="ruleForm.diyaq.dyjelx"></el-input>
@@ -281,45 +294,7 @@
              </div>
            </el-form-item>
          </el-col>
-          <el-col :span="8">
-            <el-form-item label="最高债权额">
-              <div style="display: flex">
-                <el-input
-                  v-model="ruleForm.diyaq.zgzqse"
-                  style="width: 500%"
-                  oninput="value=value.replace(/[^\d.]/g,'')"></el-input>
-                <el-select v-model="ruleForm.diyaq.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="被担保主债权数额">
-              <div style="display: flex">
-                <el-input
-                  v-model="ruleForm.diyaq.bdbzzqse"
-                  style="width: 500%"
-                  oninput="value=value.replace(/[^\d.]/g,'')"></el-input>
-                <el-select v-model="ruleForm.diyaq.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-input v-model="ruleForm.diyaq.bz"></el-input>
-            </el-form-item>
-          </el-col>
          <el-col :span="8">
            <el-form-item label="担保范围">
              <el-input v-model="ruleForm.diyaq.dbfw"></el-input>
@@ -327,7 +302,7 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="债务履行期限（债务确定期间）">
-              <el-input v-model="ruleForm.diyaq.bdbzzqse"></el-input>
+              <el-input v-model="ruleForm.diyaq.dyqx"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
@@ -403,7 +378,7 @@
          :key="key"
          :gyfs="ruleForm.qlxx.gyfs" />
-        <div>
+        <div v-if="ruleForm.ywrData && ruleForm.ywrData.length > 0">
          <div class="slxx_title title-block">
            义务人信息
            <div class="triangle"></div>
@@ -412,7 +387,8 @@
            v-if="ruleForm.ywrData"
            :tableData="ruleForm.ywrData"
            :key="key"
-            @upDateQlrxxList="upDateYwrxxList" />
+            @upDateQlrxxList="upDateYwrxxList"
+          />
        </div>
      </div>
      <el-row class="btn">
@@ -446,6 +422,7 @@
        key: 0,
        isShow: false,
        disabled: true,
+        ssqlxxshow:true,
        czrOptions: [],
        ruleForm: {},
        //传递参数
@@ -496,12 +473,23 @@
    created () {
      this.loadData();
    },
    methods: {
      ztQlxxchange (val) {
        this.ruleForm.ztQlxx = val
      },
      ssQlxxchange (val) {
        this.ruleForm.ssQlxx = val
+        this.ruleForm.qlxx.ssywh=val.ssywh
+      },
+      djlxchange(val){
+           if(val==null||val==100){
+             this.ssqlxxshow=false
+          }else{
+             this.ssqlxxshow=true
+          }
      },
      loadData () {
        this.propsParam.isEdit = this.$parent.isEdit;
@@ -509,6 +497,12 @@
          if (res.code == 200) {
            this.ruleForm = res.result;
            this.isShow = true;
+          let djlx=  this.ruleForm.qlxx.djlx
+          if(djlx==null||djlx==100){
+            this.ssqlxxshow=false
+          }
          }
        });
        //获取主体信息
@@ -532,7 +526,6 @@
      // 更新权利人信息
      upDateQlrxxList (val) {
        this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
-        console.log("this.ruleForm.qlrData", this.ruleForm.qlrData);
        this.czrOptions = this.ruleForm.qlrData;
        this.key++;
      },
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/dyiq.vue
View file @9e9ccac
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/dyiq.vue
View file @9e9ccac
@@ -13,7 +13,7 @@
      ref="ruleForm"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
-      label-width="127px">
+      label-width="145px">
      <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
        <div class="slxx_title title-block">
          补录信息
@@ -37,7 +37,7 @@
          </el-col>
        </el-row>
        <div class="slxx_title title-block">
-          房地产权（独幢、层、套、间房屋）
+          地役权信息
          <div class="triangle"></div>
        </div>
        <el-row :gutter="10">
@@ -303,27 +303,22 @@
    mounted () { },
    methods: {
      loadData () {
-        console.log("地役权", this.propsParam);
        this.propsParam.isEdit=this.$parent.isEdit
        init(this.propsParam).then((res) => {
          if (res.code == 200) {
            this.ruleForm = res.result;
-            console.log("this.ruleForm", this.ruleForm);
            this.isShow = true;
          }
        });
      },
      // 更新土地用途信息
      upDateTdytxxList (val) {
-        console.log("VAL", val);
        this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
        this.key++;
      },
      // 更新权利人信息
      upDateQlrxxList (val) {
-        console.log("val", val);
        this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
-        console.log("this.ruleForm.qlrData", this.ruleForm.qlrData);
        this.czrOptions = this.ruleForm.qlrData;
        this.key++;
      },
@@ -333,7 +328,6 @@
        this.key++;
      },
      onSubmit () {
-        console.log("this.ruleForm大信息", this.ruleForm);
        if (this.ruleForm.qlrData.length == 0) {
          this.$message({
            showClose: true,
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue
View file @9e9ccac
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue
View file @9e9ccac
@@ -13,7 +13,7 @@
      ref="ruleForm"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
-      label-width="127px"
+      label-width="145px"
    >
      <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
        <div class="slxx_title title-block">
@@ -314,14 +314,14 @@
          :gyfs="ruleForm.qlxx.gyfs"
        />
-        <div v-if="ruleForm.ywrList && ruleForm.ywrList.length > 0">
+        <div v-if="ruleForm.ywrData && ruleForm.ywrData.length > 0">
          <div class="slxx_title title-block">
            义务人信息
            <div class="triangle"></div>
          </div>
          <qlrCommonTable
-            v-if="ruleForm.ywrList"
+            v-if="ruleForm.ywrData"
-            :tableData="ruleForm.ywrList"
+            :tableData="ruleForm.ywrData"
            :key="key"
            @upDateQlrxxList="upDateYwrxxList"
          />
@@ -419,7 +419,7 @@ export default {
    },
    // 更新义务人信息
    upDateYwrxxList(val) {
-      this.ruleForm.ywrList && (this.ruleForm.ywrList = _.cloneDeep(val));
+      this.ruleForm.ywrData && (this.ruleForm.ywrData = _.cloneDeep(val));
      this.key++;
    },
    onSubmit() {
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue
View file @9e9ccac
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue
View file @9e9ccac
@@ -13,7 +13,7 @@
      ref="ruleForm"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
-      label-width="127px"
+      label-width="145px"
    >
      <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
        <div class="slxx_title title-block">
@@ -238,14 +238,14 @@
          :gyfs="ruleForm.qlxx.gyfs"
        />
-        <div v-if="ruleForm.ywrList && ruleForm.ywrList.length > 0">
+        <div v-if="ruleForm.ywrData && ruleForm.ywrData.length > 0">
          <div class="slxx_title title-block">
            义务人信息
            <div class="triangle"></div>
          </div>
-          <qlrCommonTable
+          <ywrCommonTable
-            v-if="ruleForm.ywrList"
+            v-if="ruleForm.ywrData"
-            :tableData="ruleForm.ywrList"
+            :tableData="ruleForm.ywrData"
            :key="key"
            @upDateQlrxxList="upDateYwrxxList"
            :viewtype="$route.query.viewtype"
@@ -327,32 +327,27 @@ export default {
          }else{
            this.tdxz=null
          }
-          console.log("this.ruleForm", this.ruleForm);
          this.isShow = true;
        }
      });
    },
    // 更新土地用途信息
    upDateTdytxxList(val) {
-      console.log("VAL", val);
      this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
      this.key++;
    },
    // 更新权利人信息
    upDateQlrxxList(val) {
-      console.log("val", val);
      this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
-      console.log("this.ruleForm.qlrData", this.ruleForm.qlrData);
      this.czrOptions = this.ruleForm.qlrData;
      this.key++;
    },
    // 更新义务人信息
    upDateYwrxxList(val) {
-      this.ruleForm.ywrList && (this.ruleForm.ywrList = _.cloneDeep(val));
+      this.ruleForm.ywrData && (this.ruleForm.ywrData = _.cloneDeep(val));
      this.key++;
    },
    onSubmit() {
-      console.log("this.ruleForm大信息", this.ruleForm);
      if (this.ruleForm.qlrData.length == 0) {
        this.$message({
          showClose: true,
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/ygdj.vue
View file @9e9ccac
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/ygdj.vue
View file @9e9ccac
@@ -13,7 +13,7 @@
      ref="ruleForm"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
-      label-width="127px"
+      label-width="145px"
    >
      <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
        <div class="slxx_title title-block">
@@ -38,7 +38,7 @@
          </el-col>
        </el-row>
        <div class="slxx_title title-block">
-          预告买卖登记信息
+          预告登记信息
          <div class="triangle"></div>
        </div>
        <el-row :gutter="10">
@@ -277,7 +277,7 @@
          :gyfs="ruleForm.qlxx.gyfs"
        />
-        <div>
+      <div v-if="ruleForm.ywrData && ruleForm.ywrData.length > 0">
          <div class="slxx_title title-block">
            义务人信息
            <div class="triangle"></div>
@@ -344,22 +344,18 @@ export default {
      init(this.propsParam).then((res) => {
        if (res.code == 200) {
          this.ruleForm = res.result;
-          console.log("this.ruleForm", this.ruleForm);
          this.isShow = true;
        }
      });
    },
    // 更新土地用途信息
    upDateTdytxxList(val) {
-      console.log("VAL", val);
      this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
      this.key++;
    },
    // 更新权利人信息
    upDateQlrxxList(val) {
-      console.log("val", val);
      this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
-      console.log("this.ruleForm.qlrData", this.ruleForm.qlrData);
      this.czrOptions = this.ruleForm.qlrData;
      this.key++;
    },
@@ -369,7 +365,6 @@ export default {
      this.key++;
    },
    onSubmit() {
-      console.log("this.ruleForm大信息", this.ruleForm);
      if (this.ruleForm.qlrData.length == 0) {
        this.$message({
          showClose: true,
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/yydj.vue
View file @9e9ccac
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/yydj.vue
View file @9e9ccac
@@ -13,7 +13,7 @@
      ref="ruleForm"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
-      label-width="127px"
+      label-width="145px"
    >
      <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
        <div class="slxx_title title-block">
@@ -38,7 +38,7 @@
          </el-col>
        </el-row>
        <div class="slxx_title title-block">
-          房地产权（独幢、层、套、间房屋）
+          异议登记信息
          <div class="triangle"></div>
        </div>
        <el-row :gutter="10">
@@ -189,8 +189,7 @@
          :key="key"
          :gyfs="ruleForm.qlxx.gyfs"
        />
+       <div v-if="ruleForm.ywrData && ruleForm.ywrData.length > 0">
-        <div>
          <div class="slxx_title title-block">
            义务人信息
            <div class="triangle"></div>
@@ -257,22 +256,18 @@ export default {
      init(this.propsParam).then((res) => {
        if (res.code == 200) {
          this.ruleForm = res.result;
-          console.log("this.ruleForm", this.ruleForm);
          this.isShow = true;
        }
      });
    },
    // 更新土地用途信息
    upDateTdytxxList(val) {
-      console.log("VAL", val);
      this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
      this.key++;
    },
    // 更新权利人信息
    upDateQlrxxList(val) {
-      console.log("val", val);
      this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
-      console.log("this.ruleForm.qlrData", this.ruleForm.qlrData);
      this.czrOptions = this.ruleForm.qlrData;
      this.key++;
    },
@@ -282,7 +277,6 @@ export default {
      this.key++;
    },
    onSubmit() {
-      console.log("this.ruleForm大信息", this.ruleForm);
      if (this.ruleForm.qlrData.length == 0) {
        this.$message({
          showClose: true,
--- a/src/views/djbworkflow/djbBook/spyj.vue
View file @9e9ccac
+++ b/src/views/djbworkflow/djbBook/spyj.vue
View file @9e9ccac
@@ -101,7 +101,7 @@
        getSpyjList(formdata).then((res) => {
          this.$endLoading()
          if (res.code === 200 && res.result) {
+            console.log("this.tableData this.tableData this.tableData ",this.tableData );
            this.tableData = res.result ? res.result : []
              console.log("this.tableDatathis.tableDatathis.tableDatathis.tableData",this.tableData);
            if (res.result.length == 0) {
--- a/src/views/workflow/components/tdytTable.vue
View file @9e9ccac
+++ b/src/views/workflow/components/tdytTable.vue
View file @9e9ccac
@@ -131,6 +131,7 @@ export default {
              },
            ]);
              if( that.tableDataList.length>0){
+                console.log("that.tableDataList",that.tableDataList);
            this.tdyt=that.tableDataList[0].yt?that.tableDataList[0].yt:null
          }else{
            this.tdyt=null
@@ -138,6 +139,7 @@ export default {
          } else {
            that.tableDataList = _.cloneDeep(val);
             if( that.tableDataList.length>0){
+                console.log("that.tableDataList",that.tableDataList);
            this.tdyt=that.tableDataList[0].yt?that.tableDataList[0].yt:null
          }else{
            this.tdyt=null
--- a/src/views/zhcx/djbcx/djbcx.vue
View file @9e9ccac
+++ b/src/views/zhcx/djbcx/djbcx.vue
View file @9e9ccac
@@ -4,7 +4,7 @@
    <div class="from-clues-header">
      <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="70px">
        <el-row>
-          <el-col :span="5">
+          <el-col :span="4">
            <el-form-item label="权利类型">
              <el-select v-model="queryForm.qllx" filterable class="width100" clearable placeholder="请选择权利类型">
                <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
@@ -12,24 +12,63 @@
              </el-select>
            </el-form-item>
          </el-col>
-          <el-col :span="5">
+           <el-col :span="4">
+            <el-form-item label="登记类型">
+              <el-select v-model="queryForm.djlx" filterable class="width100" clearable placeholder="请选择登记类型">
+                <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="权属状态">
+              <el-select v-model="queryForm.qszt" filterable class="width100" clearable placeholder="请选择登记类型">
+              <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="6">
            <el-form-item label="不动产单元号" label-width="105px">
              <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100">
              </el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="5">
+          <el-col :span="6">
            <el-form-item label="不动产权证号" label-width="105px">
              <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width100">
              </el-input>
            </el-form-item>
-          </el-col>
+          </el-col>      
+        </el-row>
+         <el-row>
          <el-col :span="5">
-            <el-form-item label="业务号">
+            <el-form-item label="业务号:">
              <el-input placeholder="请输入业务号" v-model="queryForm.ywh" clearable class="width100">
              </el-input>
            </el-form-item>
          </el-col>
+          <el-col :span="5">
+            <el-form-item label="坐落:" label-width="105px">
+              <el-input v-model="queryForm.zl" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="权利人:" label-width="105px">
+              <el-input v-model="queryForm.qlrmc" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="义务人:">
+              <el-input v-model="queryForm.ywrmc" clearable class="width100">
+              </el-input>
+            </el-form-item>
+          </el-col>
          <el-col :span="4" class="btnColRight">
            <el-form-item>
@@ -64,7 +103,19 @@ export default {
  },
  data () {
    return {
+      // 权属状态
+       qsztlist: [
+          {
+            dcode: "1",
+            dname: "现势",
+          },
+          {
+            dcode: "2",
+            dname: "历史",
+          },
+       ],
      queryForm: {
+        qszt: "1",
        qllx: "",
        bdcdyh: "",
        bdcqzh: "",