--no commit message

xiaomiao
Showing 7 changed files with 86 additions and 91 deletions
src/views/djbworkflow/components/dialog/addQlr.vue
src/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue
src/views/ywbl/slsqxx/cfdj/tdslxx.vue
src/views/ywbl/slsqxx/fdcq2/slxx.vue
src/views/ywbl/slsqxx/ygdj/slxx.vue
src/views/ywbl/slsqxx/ygdj/slxx300.vue
src/views/ywbl/slsqxx/ygdy/slxx.vue
--- a/src/views/djbworkflow/components/dialog/addQlr.vue
View file @df3a5b3
+++ b/src/views/djbworkflow/components/dialog/addQlr.vue
View file @df3a5b3
 <!--
- * @Description: 
+ * @Description:
 * @Autor: renchao
 * @LastEditTime: 2023-05-17 10:39:47
 -->
@@ -33,7 +33,7 @@
      <el-row>
        <el-col :span="8">
          <el-form-item label="证件号" prop="zjh">
-            <el-input v-model="ruleForm.zjh" maxlength="15" oninput="this.value=this.value.replace(/[^\X0-9]/g,'')"></el-input>
+            <el-input v-model="ruleForm.zjh" maxlength="15" oninput="value=value.replace(/[^\X0-9]/g,'')"></el-input>
          </el-form-item>
        </el-col>
        <el-col :span="8">
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue
View file @df3a5b3
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue
View file @df3a5b3
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-05-25 08:59:02
+ * @LastEditTime: 2023-06-25 15:52:42
 -->
 <template>
  <!-- 受理信息 -->
@@ -13,8 +13,7 @@
      ref="ruleForm"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
-      label-width="127px"
+      label-width="127px">
-    >
      <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
        <div class="slxx_title title-block">
          补录信息
@@ -38,7 +37,7 @@
          </el-col>
        </el-row>
        <div class="slxx_title title-block">
-         房地产权（独幢、层、套、间房屋）
+          房地产权（独幢、层、套、间房屋）
          <div class="triangle"></div>
        </div>
        <el-row :gutter="10">
@@ -52,7 +51,7 @@
              <el-input v-model="ruleForm.qlxx.ywh"></el-input>
            </el-form-item>
          </el-col>
-           <el-col :span="8">
+          <el-col :span="8">
            <el-form-item label="上手业务号：">
              <el-input v-model="ruleForm.qlxx.ssywh"></el-input>
            </el-form-item>
@@ -66,10 +65,10 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="登记类型：">
-               <el-select v-model="ruleForm.qlxx.djlx">
+              <el-select v-model="ruleForm.qlxx.djlx">
-                  <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
-                  </el-option>
+                </el-option>
-                </el-select>
+              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="8">
@@ -77,35 +76,33 @@
              <el-input v-model="ruleForm.qlxx.zl"></el-input>
            </el-form-item>
          </el-col>
-           <el-col :span="8">
+          <el-col :span="8">
            <el-form-item label="土地使用权人：">
              <el-input v-model="ruleForm.fdcq2.tdsyqr"></el-input>
            </el-form-item>
          </el-col>
-             <el-col :span="8">
+          <el-col :span="8">
            <el-form-item label="独用土地面积：">
              <el-input v-model="ruleForm.fdcq2.dytdmj"></el-input>
            </el-form-item>
          </el-col>
-           <el-col :span="8">
+          <el-col :span="8">
            <el-form-item label="分摊土地面积：">
              <el-input v-model="ruleForm.fdcq2.fttdmj"></el-input>
            </el-form-item>
          </el-col>
-           <el-col :span="8">
+          <el-col :span="8">
-           <!-- 下拉框 -->
+            <!-- 下拉框 -->
-            <el-form-item label="土地性质：">
+            <el-form-item label="土地性质：" style="margin-bottom:3px">
-                 <el-select v-model="ruleForm.fdcq2.jedw">
+              <treeselect v-model="ruleForm.fdcq2.jedw" placeholder=""
-                  <el-option v-for="item in dictData['A45']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                :normalizer="normalizer"
-                  </el-option>
+                :show-count="true" :options="dictData['A45']" />
-                </el-select>
            </el-form-item>
          </el-col>
-           <el-col :span="8">
+          <el-col :span="8">
            <el-form-item label="房地产交易价格：">
-               <div style="display:flex">
+              <div style="display:flex">
-               <el-input v-model="ruleForm.fdcq2.qjjg" style="width:500%"></el-input>
+                <el-input v-model="ruleForm.fdcq2.qjjg" style="width:500%"></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>
@@ -113,38 +110,38 @@
              </div>
            </el-form-item>
          </el-col>
-           <el-col :span="8">
+          <el-col :span="8">
            <el-form-item label="规划用途：">
-               <el-select v-model="ruleForm.fdcq2.ghyt">
+              <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 v-for="item in dictData['A17']" :key="item.dcode" :label="item.dname" :value="item.dcode">
-                  </el-option>
+                </el-option>
-                </el-select>
+              </el-select>
            </el-form-item>
          </el-col>
-           <el-col :span="8">
+          <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-col :span="8">
            <el-form-item label="实际用途：">
              <el-input v-model="ruleForm.fdcq2.sjyt"></el-input>
            </el-form-item>
          </el-col>
-           <el-col :span="8">
+          <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 v-for="item in dictData['A19']" :key="item.dcode" :label="item.dname" :value="item.dcode">
-                  </el-option>
+                </el-option>
-                </el-select>
+              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="房屋结构：">
              <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 v-for="item in dictData['A46']" :key="item.dcode" :label="item.dname" :value="item.dcode">
-                  </el-option>
+                </el-option>
-                </el-select>
+              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="8">
@@ -205,14 +202,14 @@
          </el-col>
        </el-row>
        <el-row>
-           <el-col :span="24">
+          <el-col :span="24">
            <el-form-item label="登记原因：">
              <el-input v-model="ruleForm.fdcq2.djyy"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
-         <el-row>
+        <el-row>
-           <el-col :span="24">
+          <el-col :span="24">
            <el-form-item label="附记：">
              <el-input v-model="ruleForm.fdcq2.fj"></el-input>
            </el-form-item>
@@ -222,7 +219,7 @@
          土地用途
          <div class="triangle"></div>
        </div>
-         <tdytTable
+        <tdytTable
          :tableData="ruleForm.tdytqxList"
          @upDateTdytxxList="upDateTdytxxList"
        />
@@ -235,8 +232,7 @@
            <el-form-item label="共有方式：">
              <el-radio-group
                :disabled="$route.query.viewtype == 0"
-                v-model="ruleForm.qlxx.gyqk"
+                v-model="ruleForm.qlxx.gyqk">
-              >
                <el-radio label="0">单独所有</el-radio>
                <el-radio label="1">共同共有</el-radio>
                <el-radio label="2">按份所有</el-radio>
@@ -266,8 +262,7 @@
          @upDateQlrxxList="upDateQlrxxList"
          :key="key"
          :viewtype="$route.query.viewtype"
-          :gyfs="ruleForm.qlxx.gyfs"
+          :gyfs="ruleForm.qlxx.gyfs" />
-        />
        <div v-if="ruleForm.ywrList && ruleForm.ywrList.length > 0">
          <div class="slxx_title title-block">
@@ -279,8 +274,7 @@
            :tableData="ruleForm.ywrList"
            :key="key"
            @upDateQlrxxList="upDateYwrxxList"
-            :viewtype="$route.query.viewtype"
+            :viewtype="$route.query.viewtype" />
-          />
        </div>
      </div>
      <el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
@@ -325,29 +319,21 @@ export default {
        console.log("房地产权",this.propsParam);
      init(this.propsParam.bsmRepair).then((res) => {
        if (res.code == 200) {
          this.ruleForm = res.result;
          this.isShow = true;
-          // this.tableData = res.result;
-          // if (this.tableData.length < datas.columns().emptycolNum) {
-          //   this.emptycolNum =
-          //     datas.columns().emptycolNum - this.tableData.length;
-          // } else {
-          //   this.emptycolNum = 0;
-          // }
        }
      });
    },
      // 更新土地用途信息
    upDateTdytxxList(val) {
-      console.log("VALlllll",val);
+      console.log("VAL",val);
      this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
      this.key++;
    },
    // 更新权利人信息
    upDateQlrxxList(val) {
-      this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
+      this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val));
-      this.czrOptions = this.ruleForm.qlrData;
+      this.czrOptions = this.ruleForm.qlrList;
      this.key++;
    },
    // 更新义务人信息
@@ -357,7 +343,7 @@ export default {
    },
    onSubmit() {
      console.log("this.ruleForm大信息",this.ruleForm);
-      if (this.ruleForm.qlrData.length == 0) {
+      if (this.ruleForm.qlrList.length == 0) {
        this.$message({
          showClose: true,
          message: "请确认权利人信息",
@@ -367,7 +353,7 @@ export default {
      }
      if (this.ruleForm.qlxx.gyfs == "0") {
-        if (this.ruleForm.qlrData.length > 1) {
+        if (this.ruleForm.qlrList.length > 1) {
          this.$message({
            showClose: true,
            message: "共有方式：单独所有，权利人只能是一个人",
@@ -375,17 +361,17 @@ export default {
          });
          return false;
        }
-        this.ruleForm.qlrData[0].sfczr = "1";
+        this.ruleForm.qlrList[0].sfczr = "1";
      }
      if (this.ruleForm.qlxx.gyfs == "1") {
        //是否分别持证
        if (this.ruleForm.qlxx.sqfbcz == "1") {
          //是
-          this.ruleForm.qlrData.forEach((item, index) => {
+          this.ruleForm.qlrList.forEach((item, index) => {
            item.sfczr = "1";
          });
        } else {
-          this.ruleForm.qlrData.forEach((item, index) => {
+          this.ruleForm.qlrList.forEach((item, index) => {
            if (item.zjh == this.ruleForm.czr) {
              item.sfczr = "1";
            } else {
--- a/src/views/ywbl/slsqxx/cfdj/tdslxx.vue
View file @df3a5b3
+++ b/src/views/ywbl/slsqxx/cfdj/tdslxx.vue
View file @df3a5b3
 <!--
- * @Description: 
+ * @Description:
 * @Autor: renchao
 * @LastEditTime: 2023-05-17 10:43:10
 -->
@@ -314,6 +314,7 @@ export default {
  async created() {
    this.propsParam = this.$attrs;
    this.ableEdit = this.$parent.showBatch;
+    this.ableOperation = this.$parent.currentSelectTab.ableOperation
    if (this.propsParam.djlx == "400") {
      this.isJfOperation = true;
    }
@@ -364,4 +365,4 @@ export default {
 <style scoped lang='scss'>
 @import "~@/styles/public.scss";
 @import "~@/styles/slxx/slxx.scss";
-</style>
\ No newline at end of file
+</style>
--- a/src/views/ywbl/slsqxx/fdcq2/slxx.vue
View file @df3a5b3
+++ b/src/views/ywbl/slsqxx/fdcq2/slxx.vue
View file @df3a5b3
@@ -191,7 +191,7 @@
          <el-col>
            <el-form-item v-if="ruleForm.sldy" label="登记原因：" prop="djyy">
              <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1"
-                v-model="ruleForm.sldy.djyy">
+                v-model="ruleForm.fdcq2.djyy">
              </el-input>
            </el-form-item>
          </el-col>
--- a/src/views/ywbl/slsqxx/ygdj/slxx.vue
View file @df3a5b3
+++ b/src/views/ywbl/slsqxx/ygdj/slxx.vue
View file @df3a5b3
@@ -75,7 +75,7 @@
            </el-form-item>
          </el-col>
        </el-row>
-        <el-row :gutter="10" v-if="ruleForm.qlxx">          
+        <el-row :gutter="10" v-if="ruleForm.qlxx">
          <el-col :span="8">
            <el-form-item label="房屋结构：">
              <el-input disabled v-model="ruleForm.ygdj.fwjgmc"></el-input>
@@ -102,8 +102,8 @@
            <el-form-item label="总层数：">
              <el-input disabled v-model="ruleForm.ygdj.zcs"></el-input>
            </el-form-item>
-          </el-col>          
+          </el-col>
-        </el-row>       
+        </el-row>
        <div class="slxx_title title-block">
          权利人信息
          <div class="triangle"></div>
@@ -111,7 +111,7 @@
        <el-row :gutter="10">
          <el-col :span="14" v-if="ruleForm.qlxx">
            <el-form-item label="共有方式：">
-              <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs">
+              <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.qlxx.gyfs">
                <el-radio label="0">单独所有</el-radio>
                <el-radio label="1">共同共有</el-radio>
                <el-radio label="2">按份所有</el-radio>
@@ -155,8 +155,9 @@
  import { Init, saveData } from "@/api/workflow/ygdjFlow.js";
  import { mapGetters } from "vuex";
  export default {
-    mounted () {
+    created () {
      this.ableOperation = this.$parent.currentSelectTab.ableOperation
+      this.propsParam = this.$attrs;
      this.$startLoading();
      var formdata = new FormData();
      formdata.append("bsmSldy", this.propsParam.bsmSldy);
@@ -164,8 +165,9 @@
      formdata.append("isEdit", this.ableOperation);
      Init(formdata).then(res => {
        if (res.code === 200 && res.result) {
-          this.$endLoading();
+          console.log(res.result.ygdj.ygdjzlmc);
          this.ruleForm = res.result;
+          this.$endLoading();
        }
      })
    },
@@ -180,7 +182,13 @@
        disabled: true,
        tdytOption: [],
        czrOptions: [],
-        ruleForm: {},
+        ruleForm: {
+          qlxx:{}
+          ,sldy:{}
+          ,slsq:{}
+          ,ygdj:{}
+          ,zdjbxx:{}
+        },
        //传递参数
        propsParam: this.$attrs,
        rules: {},
--- a/src/views/ywbl/slsqxx/ygdj/slxx300.vue
View file @df3a5b3
+++ b/src/views/ywbl/slsqxx/ygdj/slxx300.vue
View file @df3a5b3
@@ -78,7 +78,7 @@
            </el-form-item>
          </el-col>
        </el-row>
-        <el-row :gutter="10" v-if="ruleForm.qlxx">          
+        <el-row :gutter="10" v-if="ruleForm.qlxx">
          <el-col :span="8">
            <el-form-item label="房屋结构：">
              <el-input disabled v-model="ruleForm.ygdj.fwjgmc"></el-input>
@@ -105,8 +105,8 @@
            <el-form-item label="总层数：">
              <el-input disabled v-model="ruleForm.ygdj.zcs"></el-input>
            </el-form-item>
-          </el-col>          
+          </el-col>
-        </el-row>    
+        </el-row>
        <div class="slxx_title title-block">
          权利人信息
          <div class="triangle"></div>
@@ -114,7 +114,7 @@
        <el-row :gutter="10">
          <el-col :span="14" v-if="ruleForm.qlxx">
            <el-form-item label="共有方式：">
-              <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs">
+              <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.qlxx.gyfs">
                <el-radio label="0">单独所有</el-radio>
                <el-radio label="1">共同共有</el-radio>
                <el-radio label="2">按份所有</el-radio>
--- a/src/views/ywbl/slsqxx/ygdy/slxx.vue
View file @df3a5b3
+++ b/src/views/ywbl/slsqxx/ygdy/slxx.vue
View file @df3a5b3
@@ -54,21 +54,21 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="不动产权证号：">
-              <el-input disabled v-model="ruleForm.qlxxold.bdcqzh"></el-input>
+              <el-input disabled v-model="ruleForm.ssQlxx.bdcqzh"></el-input>
            </el-form-item>
          </el-col>
           <el-col :span="8">
            <el-form-item label="不动产单元号：">
-              <el-input disabled v-model="ruleForm.qlxxold.bdcdyh"></el-input>
+              <el-input disabled v-model="ruleForm.ssQlxx.bdcdyh"></el-input>
            </el-form-item>
-          </el-col>          
+          </el-col>
        </el-row>
        <el-row :gutter="10">
          <el-col :span="8">
            <el-form-item label="权利人：">
              <el-input disabled v-model="ruleForm.ssQlxx.qlrmc"></el-input>
            </el-form-item>
-          </el-col>         
+          </el-col>
          <el-col :span="8">
            <el-form-item label="证件种类：">
              <el-input disabled v-model="ruleForm.ssQlxx.qlrzjzl"></el-input>
@@ -79,8 +79,8 @@
              <el-input disabled v-model="ruleForm.ssQlxx.qlrzjhm"></el-input>
            </el-form-item>
          </el-col>
-        </el-row>     
+        </el-row>
-        <el-row :gutter="10">         
+        <el-row :gutter="10">
          <el-col :span="8">
            <el-form-item label="房屋面积：">
              <el-input disabled v-model="ruleForm.ssQlxx.mjmc"></el-input>
@@ -97,7 +97,7 @@
            </el-form-item>
          </el-col>
        </el-row>
-         <el-row :gutter="10">         
+         <el-row :gutter="10">
          <el-col :span="8">
            <el-form-item label="房屋取得价格：">
              <el-input disabled v-model="ruleForm.ssQlxx.qdjg"></el-input>
@@ -132,10 +132,10 @@
            </el-form-item>
          </el-col>
        </el-row>
-        <el-row>
+        <el-row  :gutter="10">
-           <el-col :span="8">
+           <el-col :span="16">
            <el-form-item label="是否存在禁止或限制转让抵押不动产的约定：">
-              <el-input v-model="ruleForm.ygdj.dbfw"
+              <el-input v-model="ruleForm.ygdj.sfczjzhxz"
                :disabled="$route.query.viewtype == 1 || ruleForm.slsq.djlx == '300'"></el-input>
            </el-form-item>
          </el-col>
@@ -145,7 +145,7 @@
                :disabled="$route.query.viewtype == 1 || ruleForm.slsq.djlx == '300'"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
         <el-row>
             <el-col :span="24">
@@ -161,7 +161,7 @@
        <el-row :gutter="10">
          <el-col :span="14" v-if="ruleForm.qlxx">
            <el-form-item label="共有方式：">
-              <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs">
+              <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.qlxx.gyfs">
                <el-radio label="0">单独所有</el-radio>
                <el-radio label="1">共同共有</el-radio>
                <el-radio label="2">按份所有</el-radio>