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

@@ -173,10 +173,15 @@ export default {
 .bgc{
 
    td{
-  background-color: rgb(182, 203, 207) !important;
+  // background-color: rgb(182, 203, 207) !important;
 
     }
   }
+.xxTable tr td{
+
+    min-width: 520px!important;
+
+}
   .red{
     color: red;
   }

@@ -72,6 +72,8 @@ export default {
       //左侧树形结构数据
       treedata: [],
        sfqdata: [],
+         keyy: "",
+        iskey: "",
        activeName: 0,
       // 查询参数
       queryForm: {},
@@ -170,16 +172,16 @@ export default {
         }).then((res) => {
           if (res.code === 200) {
             if (this.sfqdata.some((item) => item.bdcdyid === val.bdcdyid)) {
-          let index= this.sfqdata.findIndex((item) => {
-              return item.bdcdyid ==val.bdcdyid;
+              let index = this.sfqdata.findIndex((item) => {
+                return item.bdcdyid == val.bdcdyid;
               });
-            this.activeName=index
-            this.setstyle(index,0);
+              this.activeName = index
+              this.setstyle(index, 0, this.iskey);
             } else {
               this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid));
               this.activeName = this.sfqdata.length - 1;
               this.$nextTick(() => {
-              this.setstyle(this.sfqdata.length - 1,0);
+                this.setstyle(this.sfqdata.length - 1, 0, this.iskey);
               })
             }
           }
@@ -187,8 +189,8 @@ export default {
       this.currentSelectProps = {
         bdcdyid: val.bdcdyid,
         bdcdyh: val.bdcdyh,
-        qllx: this.formData.qllx,
-        bsmQlxx: this.formData.bsmQlxx,
+        qllx: this.currentSelectProps.qllx,
+        bsmQlxx: this.currentSelectProps.bsmQlxx,
       };
     },
     /**
@@ -201,9 +203,7 @@ export default {
         bdcdyh: val,
       }).then((res) => {
         if (res.code === 200) {
-          this.treedata = loadTreeData(
-            val
-          );
+          this.treedata = loadTreeData(val);
             this.sfqdata.push(
             loadsfqData(res.result, val, this.currentSelectProps.bdcdyid)
           );
@@ -211,11 +211,19 @@ export default {
             this.defaultNode = getNode(
               this.currentSelectProps.qllx,
               { linShi: 0, xianShi: 0, liShi: 0 },
-              ""
+                res.result.bdcdylx|| ""
               );
-            this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
-            this.loadComponent(this.defaultNode.form);
-            this.setstyle(0,0);
+                this.sfqdata[0].children.forEach((item, index) => {
+                if (item.id == this.defaultNode.id) {
+                  this.iskey = index
+                }
+              })
+              // this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
+              // this.loadComponent(this.defaultNode.form);
+
+              this.setstyle(0, 0, this.iskey);
+
+
             });
           }
         });
@@ -244,20 +252,26 @@ export default {
      * @author: renchao
      * 设置样式和点击定位到当前功能
      */
-    setstyle(newindex,index) {
-      if(index==0){
-         this.loadComponent(this.$refs.sfq[newindex].$children[0].$attrs.re.form);
+      setstyle (newindex, index, key) {
+        if (key != undefined || this.keyy == index) {
+          if (key != undefined) {
+            this.keyy = key
           }
-      let dpme = this.$refs.sfq[newindex].$children[0].$el
-      if (index != 0) {
-        dpme.style.backgroundColor = "#ffffff";
-        dpme.style.color = "black";
-        dpme.style.border = "none";
-      } else {
+          this.loadComponent(this.$refs.sfq[newindex].$children[this.keyy].$attrs.re.form);
+          let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el
           dpme.style.backgroundColor = "#f5f5f5";
           dpme.style.color = "#0079fe";
           dpme.style.borderRight = "4px solid #0079fe";
+        } else {
+          let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el
+          dpme.style.backgroundColor = "#ffffff";
+          dpme.style.color = "black";
+          dpme.style.border = "none";
         }
+
+
+
+
       },
        /**
      * @description: addlist
@@ -265,13 +279,22 @@ export default {
      * @author: renchao
      * 新增列表功能
      */
-    addlist(data, index) {
-       let newindex= this.sfqdata.findIndex((item) => {
-              return item.bdcdyid ==data.bdcdyid;
+  addlist (data, index) {
+        if (index != undefined) {
+          let newindex = this.sfqdata.findIndex((item) => {
+            return item.bdcdyid == data.bdcdyid;
           });
-      this.setstyle(newindex,index);
+          this.setstyle(newindex, index);
           this.currentSelectProps.bdcdyid = data.bdcdyid;
           this.loadComponent(data.form);
+        } else {
+          let newindex = this.sfqdata.findIndex((item) => {
+            return item.bdcdyid == data.bdcdyid;
+          });
+          this.setstyle(newindex, index, this.iskey);
+          this.currentSelectProps.bdcdyid = data.bdcdyid;
+        }
+
       },
       /**
      * @description: loadComponent

@@ -239,7 +239,7 @@ export default {
      * @author: renchao
      */
     add(val) {
-      if (val != "") {
+      if (val != ""&&this.tableData.length>0) {
         this.$set(this.tableData[this.currentindex], "shyj", val);
       }
     },

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-23 15:07:51
+ * @LastEditTime: 2023-08-28 09:56:03
 -->
 <template>
   <div class="from-clues">
@@ -349,4 +349,16 @@
 </script>
 <style scoped lang="scss">
   @import "~@/styles/public.scss";
+  /deep/ .back{
+    display: inline-block;
+    font-size: 14px;
+    width: 20px;
+    height: 20px;
+    border-radius: 10px;
+    line-height: 20px;
+    margin-right: 4px;
+    text-align: center;
+    background-color: rgba(171,12,12,0.1);
+    color: #B44747;
+  }
 </style>

 /*
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-08-28 15:33:05
+ * @LastEditTime: 2023-08-28 09:01:00
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -48,7 +48,14 @@ class data extends filter {
       {
         prop: "zbhj",
         label: "在办环节",
-        minWidth: '80'
+        width: '80',
+        render: (h, scope) => {
+          if (scope.row.stepnum > 1) {
+            return <span><span class="back">退</span>{scope.row.zbhj}</span>
+          } else {
+            return <span>{scope.row.zbhj}</span>
+          }
+        }
       },
       {
         label: '业务号',

@@ -9,7 +9,7 @@
       label-width="120px">
       <div class="slxx_con">
         <div class="slxx_title title-block">
-          受理信息
+          申请业务信息
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10">

@@ -14,7 +14,7 @@
       label-width="120px">
       <div class="slxx_con">
         <div class="slxx_title title-block">
-          受理信息
+          申请业务信息
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10">

@@ -17,7 +17,7 @@
     >
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
-          受理信息
+          申请业务信息
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10">

@@ -15,7 +15,7 @@
     >
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
-          受理信息
+          申请业务信息
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10" v-if="ruleForm.slsq">
@@ -69,7 +69,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="坐落：">
-              <el-input v-model="ruleForm.sldy.zl"></el-input>
+              <el-input maxlength="100" v-model="ruleForm.sldy.zl"></el-input>
             </el-form-item>
           </el-col>
         </el-row>

@@ -14,7 +14,7 @@
       label-width="120px">
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
-          受理信息
+          申请业务信息
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10" v-if="ruleForm.slsq">
@@ -68,7 +68,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="坐落：">
-              <el-input v-model="ruleForm.sldy.zl" disabled></el-input>
+              <el-input maxlength="100" v-model="ruleForm.sldy.zl" disabled></el-input>
             </el-form-item>
           </el-col>
         </el-row>

@@ -15,7 +15,7 @@
     >
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
-          受理信息
+          申请业务信息
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10" v-if="ruleForm.slsq">

@@ -15,7 +15,7 @@
     >
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
-          受理信息
+          申请业务信息
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10" v-if="ruleForm.slsq">

@@ -16,7 +16,7 @@
     >
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
-          受理信息
+          申请业务信息
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10">

@@ -17,7 +17,7 @@
       label-width="120px">
       <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
-          受理信息
+          申请业务信息
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10">
@@ -70,8 +70,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="权利性质：">
-              <el-input v-model="ruleForm.zdjbxx.qlxzmc"></el-input>
+            <el-form-item label="权利性质1：">
+              <el-input maxlength="25" v-model="ruleForm.zdjbxx.qlxzmc"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -121,7 +121,7 @@
 
           <el-col :span="16">
             <el-form-item label="坐落：">
-              <el-input v-model="ruleForm.sldy.zl"></el-input>
+              <el-input maxlength="100" v-model="ruleForm.sldy.zl"></el-input>
             </el-form-item>
           </el-col>
         </el-row>

@@ -17,7 +17,7 @@
     >
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
-          受理信息
+          申请业务信息
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10">

@@ -14,7 +14,7 @@
       label-width="140px">
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
-          受理信息
+          申请业务信息
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10" v-if="ruleForm.slsq">

@@ -12,7 +12,7 @@
     >
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
-          受理信息
+          申请业务信息
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10">

@@ -12,7 +12,7 @@
     >
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
-          受理信息
+          申请业务信息
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10">

@@ -14,7 +14,7 @@
       label-width="140px">
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
-          受理信息
+          申请业务信息
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10" v-if="ruleForm.slsq">

@@ -17,7 +17,7 @@
     >
       <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
-          受理信息
+          申请业务信息
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10">

@@ -12,7 +12,7 @@
     >
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
-          受理信息
+          申请业务信息
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10" v-if="ruleForm.slsq">

@@ -12,7 +12,7 @@
     >
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
-          受理信息
+          申请业务信息
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10" v-if="ruleForm.slsq">

@@ -12,7 +12,7 @@
     >
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
-          受理信息
+          申请业务信息
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10" v-if="ruleForm.slsq">

@@ -9,7 +9,7 @@
     >
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
-          受理信息
+          申请业务信息
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10" v-if="ruleForm.flow">

@@ -12,7 +12,7 @@
     >
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
-          受理信息
+          申请业务信息
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10">

@@ -104,7 +104,7 @@ export default {
           zslx: 1
         },
         {
-          name: '不动产权登记证明',
+          name: '不动产登记证明',
           ksysxlh: '',
           jsysxlh: '',
           bs: 0,