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

田浩浩
Showing 9 changed files with 43 additions and 59 deletions
src/api/ygdjFlow.js
src/components/NoticeBar/index.vue
src/views/registerBook/qlxxFormData.js
src/views/workflow/flowform.js
src/views/ywbl/diyaq/slxx.vue
src/views/ywbl/ygdj/slxx.vue
src/views/ywbl/ygdj/slxx300.vue
src/views/ywbl/ywsq/components/bdcqlMain.vue
src/views/ywbl/ywsq/components/diyaq.vue
--- a/src/api/ygdjFlow.js
View file @60bbadf
+++ b/src/api/ygdjFlow.js
View file @60bbadf
@@ -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";
+          apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/riviseInit";
-            break;
+          break;
        case "901":
-            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/renewalInit";
+          apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/renewalInit";
-            break;
+          break;
        case "902":
-            apiUrl = SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/replaceInit";
+          apiUrl = SERVER.SERVERAPI+"/rest/ywbl/ygdj/replaceInit";
-            break;
+          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',
--- a/src/components/NoticeBar/index.vue
View file @60bbadf
+++ b/src/components/NoticeBar/index.vue
View file @60bbadf
@@ -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)">
+          <p v-for="(item, index) in noticeList" :key="index">
-            {{ item.noticeTitle }}
+            <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;
      }
    }
  }
--- a/src/views/registerBook/qlxxFormData.js
View file @60bbadf
+++ b/src/views/registerBook/qlxxFormData.js
View file @60bbadf
@@ -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
+}
--- a/src/views/workflow/flowform.js
View file @60bbadf
+++ b/src/views/workflow/flowform.js
View file @60bbadf
 //流程环节操作按钮
 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");
--- a/src/views/ywbl/diyaq/slxx.vue
View file @60bbadf
+++ b/src/views/ywbl/diyaq/slxx.vue
View file @60bbadf
@@ -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>
--- a/src/views/ywbl/ygdj/slxx.vue
View file @60bbadf
+++ b/src/views/ywbl/ygdj/slxx.vue
View file @60bbadf
@@ -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="0">单独所有</el-radio>
-                <el-radio label="2">共同共有</el-radio>
+                <el-radio label="1">共同共有</el-radio>
-                <el-radio label="3">按份所有</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" />
--- a/src/views/ywbl/ygdj/slxx300.vue 0 → 100644
View file @60bbadf
+++ b/src/views/ywbl/ygdj/slxx300.vue 0 → 100644
View file @60bbadf
--- a/src/views/ywbl/ywsq/components/bdcqlMain.vue
View file @60bbadf
+++ b/src/views/ywbl/ywsq/components/bdcqlMain.vue
View file @60bbadf
@@ -166,7 +166,6 @@ export default {
      });
    },
    handleSelectionChange(val) {
-      debugger;
      val.forEach((item, index) => {
        item.bsmSsql = item.bsmQlxx;
        item.ybdcqzsh = item.bdcqzh;
--- a/src/views/ywbl/ywsq/components/diyaq.vue
View file @60bbadf
+++ b/src/views/ywbl/ywsq/components/diyaq.vue
View file @60bbadf
@@ -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;