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

@@ -8,23 +8,23 @@ export function Init(data) {
             apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/fristInit";
             break;
         case "200":
-            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/transferInit";
+            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/transferInit";
             break;
         case "300":
-            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/changeInit";
+            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/changeInit";
             break;
         case "400":
-            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/logoutInit";
+            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/logoutInit";
             break;
         case "500":
-            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/riviseInit";
-            break;
+          apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/riviseInit";
+          break;
         case "901":
-            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/renewalInit";
-            break;
+          apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/renewalInit";
+          break;
         case "902":
-            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/replaceInit";
-            break;
+          apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/replaceInit";
+          break;
     }
     return request({
         url: apiUrl,
@@ -34,7 +34,7 @@ export function Init(data) {
 }
 // 初始化内容
 export function saveData (data) {
-  console.log("222222222222222");
+  console.log("222222222222222"+data);
   return request({
     url: SERVER.SERVERAPI + '/rest/ywbl/ygdj/saveData',
     method: 'post',

@@ -7,8 +7,10 @@
       <div style="margin-right:5px"></div>
       <div ref="back" class="back">
         <div ref="text" class="text" @mouseover="mouseOver" @mouseleave="mouseLeave">
-          <p v-for="(item, index) in noticeList" :key="index" @click="handleNotice(item)">
-            {{ item.noticeTitle }}
+          <p v-for="(item, index) in noticeList" :key="index">
+            <span> {{ item.noticeTitle }}</span>
+            <span class="noticePublishTime">{{ item.noticePublishTime }}</span>
+            <el-button type="text" @click="handleNotice(item)" style="color:#F56C6C;font-size: 14px;">[点击查看]</el-button>
           </p>
         </div>
       </div>
@@ -113,7 +115,6 @@ export default {
   align-items: center;
   width: 100%;
   height: 28px;
-  line-height: 28px;
   background: rgba(0, 0, 0, 0.1);
 
   .icon {
@@ -141,7 +142,11 @@ export default {
       display: flex;
 
       p {
-        margin-right: 10px;
+        margin-right: 80px;
+        display: flex;
+        align-items: center;
+        height: 28px;
+        line-height: 28px;
       }
     }
   }

@@ -76,7 +76,7 @@ class data extends filter {
         {
           prop: "qlrzjhm",
           label: "证件号",
-        },      
+        },
         {
           prop: "mj",
           label: "使用权面积(m²)",
@@ -198,7 +198,7 @@ class data extends filter {
         {
           prop: "tdsyqzsj",
           label: "土地使用期限",
-        },       
+        },
         {
           prop: "syqqzsj",
           label: "使用权起止时间",
@@ -235,7 +235,7 @@ class data extends filter {
           prop: "zyjzmj",
           label: "专有建筑面积（m2）",
         },
-       
+
         {
           prop: "ftjzmj",
           label: "分摊建筑面积（m2）",
@@ -317,7 +317,7 @@ class data extends filter {
         {
           prop: "qlrzjhm",
           label: "证件号",
-        },      
+        },
         {
           prop: "mj",
           label: "使用权面积(m²)",
@@ -424,7 +424,7 @@ class data extends filter {
           prop: "zjjzwzl",
           label: "在建建筑物坐落",
         },
-        
+
         {
           prop: "dyqr",
           label: "抵押权人",
@@ -646,7 +646,7 @@ class data extends filter {
           label: "坐落",
         },
         {
-          prop: "qlr",
+          prop: "qlrmc",
           label: "权利人",
         },
         {
@@ -654,11 +654,11 @@ class data extends filter {
           label: "证件种类",
         },
         {
-          prop: "qlrzjh",
+          prop: "qlrzjhm",
           label: "证件号",
         },
         {
-          prop: "ywr",
+          prop: "ywrmc",
           label: "义务人",
         },
         {
@@ -666,7 +666,7 @@ class data extends filter {
           label: "证件种类",
         },
         {
-          prop: "ywrzjh",
+          prop: "ywrzjhm",
           label: "证件号",
         },
         {
@@ -714,7 +714,7 @@ class data extends filter {
           label: "登记时间",
         },
         {
-          prop: "bdcdjzmh",
+          prop: "bdcqzh",
           label: "不动产登记证明号",
         },
         {
@@ -722,21 +722,17 @@ class data extends filter {
           label: "登簿人",
         },
         {
-          prop: "zxygywh",
+          prop: "zxywh",
           label: "注销预告业务号",
         },
         {
-          prop: "zxygyy",
+          prop: "zxyy",
           label: "注销预告原因",
         },
         {
           prop: "zxsj",
           label: "注销时间",
-        },
-        {
-          prop: "qszt",
-          label: "权属状态",
-        },
+        }
       ],
       CFDJ: [
         {
@@ -782,8 +778,8 @@ class data extends filter {
         {
           prop: "qlrzjhm",
           label: "证件号",
-        },        
-        
+        },
+
         {
           prop: "cfwh",
           label: "查封文号",
@@ -937,4 +933,4 @@ let datas = new data()
 
 export {
   datas
-}
\ No newline at end of file
+}

 //流程环节操作按钮
 export function getForm(tabName, djywbm) {
+  console.log("88888888"+tabName);
     let form;
     switch (tabName) {
         case "jsydsyqslxx100":
@@ -51,10 +52,10 @@ export function getForm(tabName, djywbm) {
             form = require("@/views/registerBook/zdjbxx.vue");
             break;
         case "ygmm100":
-            form = require("@/views/ywbl/ygdj/slxx.vue");
+            form=require("@/views/ywbl/ygdj/slxx.vue");
             break;
         case "ygmm300":
-            form = require("@/views/ywbl/fdcq2/slxx.vue");
+            form=require("@/views/ywbl/ygdj/slxx300.vue");
             break;
         case "cfdjxx":
             form = require("@/views/registerBook/cfdj.vue");

@@ -196,7 +196,7 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="最高债权确定事实和数额：" label-width="200px">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="最高债权确定事实和数额：" >
               <el-input v-model="ruleForm.diyaq.zgzqqdss"></el-input>
             </el-form-item>
           </el-col>

@@ -134,28 +134,13 @@
           <el-col :span="14" v-if="ruleForm.qlxx">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
               <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs">
-                <el-radio label="1">单独所有</el-radio>
-                <el-radio label="2">共同共有</el-radio>
-                <el-radio label="3">按份所有</el-radio>
+                <el-radio label="0">单独所有</el-radio>
+                <el-radio label="1">共同共有</el-radio>
+                <el-radio label="2">按份所有</el-radio>
+                <el-radio label="3">其它共有</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="5" v-show="ruleForm.qlxx&&ruleForm.qlxx.gyfs == '2'">
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="是否分别持证：">
-              <el-radio-group v-model="ruleForm.sffbcz">
-                <el-radio label="1">是</el-radio>
-                <el-radio label="0">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="5" v-show="ruleForm.qlxx&&ruleForm.qlxx.gyfs == '2'">
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="持证人：">
-              <el-select v-model="ruleForm.czr" placeholder="持证人">
-                <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
         </el-row>
         <InformationTable v-if="ruleForm.qlxx" @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList"
           :gyfs="ruleForm.qlxx.gyfs" />

+<template>
+  <!-- 受理信息 -->
+  <div class="slxx">
+    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag"
+      label-width="120px">
+      <div class="slxx_con">
+        <div class="slxx_title title-block">
+          受理信息
+          <div class="triangle"></div>
+        </div>
+        <el-row :gutter="10" v-if="ruleForm.slywxx">
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="业务号：">
+              <el-input disabled v-model="ruleForm.slywxx.ywh"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="受理人员：">
+              <el-input disabled v-model="ruleForm.slywxx.slry"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="受理时间：">
+              <el-input disabled v-model="ruleForm.slywxx.slsj"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10" v-if="ruleForm.slywxx">
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="权利类型：">
+              <el-input disabled v-model="ruleForm.slywxx.qllxmc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="登记类型：">
+              <el-input disabled v-model="ruleForm.slywxx.djlxmc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="登记情形：">
+              <el-input disabled v-model="ruleForm.slywxx.djqxmc"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="slxx_title title-block">
+          不动产单元情况
+          <div class="triangle"></div>
+        </div>
+
+<!--        <el-button type="primary" style="float: right;margin-right: 20px; " @click="onClick">数据查看</el-button>-->
+
+        <el-row :gutter="10" v-if="ruleForm.qlxx">
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="不动产单元号：">
+              <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="坐落：">
+              <el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="规划用途：">
+              <el-input disabled v-model="ruleForm.ygdj.ghyt"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="土地使用起止时间：">
+              <el-input disabled v-model="ruleForm.ygdj.ghyt"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="土地使用期限：">
+              <el-input disabled v-model="ruleForm.ygdj.ghyt"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10" v-if="ruleForm.qlxx">
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="房屋用途：">
+              <el-input disabled v-model="ruleForm.qlxx.ytmc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="房屋性质：">
+              <el-input disabled v-model="ruleForm.ygdj.fwxzmc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="房屋结构：">
+              <el-input disabled v-model="ruleForm.ygdj.fwjgmc"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10" >
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="所在层：">
+              <el-input disabled v-model="ruleForm.ygdj.szc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="总层数：">
+              <el-input disabled v-model="ruleForm.ygdj.zcs"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="竣工时间：">
+              <el-input disabled v-model="ruleForm.ygdj.jgsj"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10" v-if="ruleForm.qlxx">
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="建筑面积：">
+              <el-input disabled v-model="ruleForm.qlxx.mj"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="专有建筑面积：">
+              <el-input disabled v-model="ruleForm.ygdj.zyjzmj"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="分摊建筑面积：">
+              <el-input disabled v-model="ruleForm.ygdj.ftjzmj"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="slxx_title title-block">
+          权利人信息
+          <div class="triangle"></div>
+        </div>
+        <el-row :gutter="10">
+          <el-col :span="14" v-if="ruleForm.qlxx">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
+              <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs">
+                <el-radio label="0">单独所有</el-radio>
+                <el-radio label="1">共同共有</el-radio>
+                <el-radio label="2">按份所有</el-radio>
+                <el-radio label="3">其它共有</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <InformationTable v-if="ruleForm.qlxx" @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList"
+                          :gyfs="ruleForm.qlxx.gyfs" />
+        <div class="slxx_title title-block">
+          义务人信息
+          <div class="triangle"></div>
+        </div>
+        <InformationTable v-if="ruleForm.qlxx" @upDateQlrxxList="upDateYwrxxList" :tableData="ruleForm.ywrList"
+                          :gyfs="ruleForm.qlxx.gyfs" />
+        <div class="slxx_title title-block">
+          登记原因
+          <div class="triangle"></div>
+        </div>
+        <el-row :gutter="10">
+          <el-col>
+            <el-form-item  :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy">
+              <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype==1"
+                        v-model="ruleForm.ygdj.djyy">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+      <el-row class="btn" v-if="!$route.query.viewtype">
+        <el-form-item :class="flag ? 'marginBot0' : ''">
+          <el-button type="primary" @click="onSubmit">保存</el-button>
+        </el-form-item>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+<script>
+import InformationTable from "@/views/workflow/components/InformationTable";
+import { Init, saveData } from "@/api/ygdjFlow.js";
+import { mapGetters } from "vuex";
+export default {
+  async created () {
+    this.propsParam = this.$attrs;
+    var formdata = new FormData();
+    formdata.append("bsmSldy", this.propsParam.bsmSldy);
+    formdata.append("djlx", this.propsParam.djlx);
+    Init(formdata).then((res) => {
+      if (res.code === 200 && res.result) {
+        this.ruleForm = res.result;
+      }
+    });
+  },
+  components: { InformationTable },
+  computed: {
+    ...mapGetters(["dictData", "flag"]),
+  },
+  data () {
+    return {
+      disabled: true,
+      tdytOption: [],
+      czrOptions: [],
+      ruleForm: {},
+      //传递参数
+      propsParam: this.$attrs,
+      rules: {},
+    };
+  },
+  methods: {
+    onClick(){
+      this.$popup("房屋信息比对","ywbl/ygdj/slxxCompareDetai",
+         {
+         formData: {
+           bsmSldy: this.propsParam.bsmSldy,
+           qllx: this.propsParam.qllx
+         }
+      });
+    },
+    // 更新权利人信息
+    upDateQlrxxList (val) {
+      this.ruleForm.qlrList =  _.cloneDeep(val);
+    },
+    // 更新权利人信息
+    upDateYwrxxList (val) {
+      this.ruleForm.ywrList = _.cloneDeep(val);
+    },
+
+    onSubmit () {
+      saveData(this.ruleForm).then((res) => {
+        if (res.code === 200) {
+          this.$message({
+            showClose: true,
+            message: "保存成功！",
+            type: "success",
+          });
+        } else {
+          this.$message({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+  },
+};
+</script>
+<style scoped lang='scss'>
+@import "~@/styles/public.scss";
+
+/deep/.el-form {
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - 130px);
+  background-color: aqua;
+}
+
+/deep/.el-form-item__label {
+  padding: 0;
+}
+
+/deep/.el-radio {
+  margin-right: 10px;
+}
+
+/deep/.el-select {
+  width: 100%;
+}
+
+/deep/.el-form-item {
+  margin-bottom: 8px;
+}
+
+.marginBot0 {
+  margin-bottom: 0 !important;
+}
+
+.slxx {
+  box-sizing: border-box;
+}
+
+.slxx_con {
+  flex: 1;
+  height: 100%;
+  background-color: #ffffff;
+  overflow-y: auto;
+  padding-right: 3px;
+  overflow-x: hidden;
+}
+
+.submit_btn {
+  height: 50px;
+}
+
+.slxx_title {
+  border-bottom: 1px solid $borderColor;
+  padding-left: 10px;
+  padding-bottom: 5px;
+  margin-bottom: 10px;
+  margin-top: 5px;
+  font-size: 16px;
+  font-weight: 500;
+  color: #4a4a4a;
+}
+
+.btn {
+  text-align: center;
+  padding-top: 10px;
+  height: 36px;
+  background-color: #ffffff;
+  padding: 5px 0;
+}
+
+.textArea {
+  /deep/.el-textarea__inner {
+    min-height: 90px !important;
+  }
+}
+
+/deep/.el-form-item__label {
+  padding-bottom: 0px;
+}
+</style>

@@ -166,7 +166,6 @@ export default {
       });
     },
     handleSelectionChange(val) {
-      debugger;
       val.forEach((item, index) => {
         item.bsmSsql = item.bsmQlxx;
         item.ybdcqzsh = item.bdcqzh;

@@ -157,7 +157,6 @@ export default {
             message: "发起申请成功",
             type: "success",
           });
-          debugger;
           if (!this.isJump) {
             this.jump(res.result, this.djywbm);
           } else {
@@ -169,7 +168,6 @@ export default {
       });
     },
     handleSelectionChange(val) {
-      debugger;
       val.forEach((item, index) => {
         item.bsmSsql = item.bsmQlxx;
         item.ybdcqzsh = item.bdcqzh;