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

蔡俊立
Showing 5 changed files with 109 additions and 71 deletions
src/views/workflow/flowform.js
src/views/ywbl/jsydsyq/slxx300.vue
src/views/zhcx/djbcx/djbcx.vue
src/views/zhcx/djbcx/djbcxdata.js
src/views/zhcx/lpcx/lpcxdata.js
--- a/src/views/workflow/flowform.js
View file @4ae342b
+++ b/src/views/workflow/flowform.js
View file @4ae342b
@@ -41,7 +41,7 @@ export function getForm(tabName, djywbm) {
        case "cfdjxx":
            form = require("@/views/registerBook/cfdj.vue");
            break;    
-        case "qlxx":
+        case "jsydsyqQlxx":
            form = require("@/views/registerBook/jsydsyq.vue");
            break;
        case "fdcq2Qlxx":
--- a/src/views/ywbl/jsydsyq/slxx300.vue
View file @4ae342b
+++ b/src/views/ywbl/jsydsyq/slxx300.vue
View file @4ae342b
@@ -11,111 +11,105 @@
        <el-row :gutter="10">
          <el-col :span="8">
            <el-form-item :class="flag ? 'marginBot0' : ''" label="业务号：">
-              <el-input disabled v-model="ruleForm.ywh"></el-input>
+              <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.slry"></el-input>
+              <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.slsj"></el-input>
+              <el-input disabled v-model="ruleForm.slywxx.slsj"></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-select disabled v-model="ruleForm.qllx" filterable clearable placeholder="请选择权利类型">
+               <el-input disabled v-model="ruleForm.slywxx.qllxmc"></el-input>
-                <el-option v-for="item in dictData['A8']" :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 :class="flag ? 'marginBot0' : ''" label="登记类型：">
-              <el-select disabled v-model="ruleForm.djlx" filterable clearable placeholder="请选择登记类型">
+                <el-input disabled v-model="ruleForm.slywxx.djlxmc"></el-input>
-                <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="8">
            <el-form-item :class="flag ? 'marginBot0' : ''" label="登记情形：">
-              <el-input disabled v-model="ruleForm.djqxmc"></el-input>
+              <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 @click="compare">变化情况对比+</el-button></div>
        </div>
        <el-row :gutter="10">
          <el-col :span="8">
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="宗地代码：">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="原不动产权证号：">
-              <el-input disabled v-model="ruleForm.zddm"></el-input>
+              <el-input disabled v-model="ruleForm.slywxx.ybdcqzsh"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item :class="flag ? 'marginBot0' : ''" label="不动产单元号：">
-              <el-input disabled v-model="ruleForm.bdcdyh"></el-input>
+              <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item :class="flag ? 'marginBot0' : ''" label="权利性质：">
-              <el-input disabled v-model="ruleForm.qlxzmc"></el-input>
+              <el-input disabled v-model="ruleForm.zdjbxx.qlxzmc"></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.zdmj"></el-input>
+              <el-input disabled v-model="ruleForm.zdjbxx.zdmj"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item :class="flag ? 'marginBot0' : ''" label="土地用途：">
-              <el-input disabled v-model="ruleForm.ghytmc"></el-input>
+              <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.qlsdfsmc"></el-input>
+              <el-input disabled v-model="ruleForm.zdjbxx.qlsdfsmc"></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.qdjg"></el-input>
+              <el-input disabled v-model="ruleForm.jsydsyq.qdjg"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="16">
            <el-form-item :class="flag ? 'marginBot0' : ''" label="坐落：">
-              <el-input disabled v-model="ruleForm.zl"></el-input>
+              <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.tdsyqx"></el-input>
+              <el-input disabled v-model="ruleForm.jsydsyq.tdsyqx"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="16">
            <el-form-item :class="flag ? 'marginBot0' : ''" label="使用权起止时间：">
-              <el-input disabled v-model="ruleForm.syqqzsj"></el-input>
+              <el-input disabled v-model="ruleForm.jsydsyq.syqqzsj"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="10">
          <el-col>
            <el-form-item :class="flag ? 'marginBot0' : ''" label="附记：" prop="fj">
-              <el-input type="textarea" v-model="ruleForm.fj" :disabled="$route.query.viewtype==1"></el-input>
+              <el-input type="textarea" v-model="ruleForm.jsydsyq.fj" :disabled="$route.query.viewtype==1"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
@@ -126,7 +120,7 @@
        <el-row :gutter="10">
          <el-col :span="14">
            <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
-              <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.gyfs">
+              <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>
@@ -135,7 +129,7 @@
          </el-col>
          <el-col :span="5" v-show="ruleForm.gyfs == '2'">
            <el-form-item :class="flag ? 'marginBot0' : ''" label="是否分别持证：">
-              <el-radio-group v-model="ruleForm.sffbcz">
+              <el-radio-group v-model="ruleForm.slywxx.sffbcz">
                <el-radio label="1">是</el-radio>
                <el-radio label="0">否</el-radio>
              </el-radio-group>
@@ -150,7 +144,7 @@
            </el-form-item>
          </el-col>
        </el-row>
-        <InformationTable :tableData="ruleForm.qlrxx" :viewtype="$route.query.viewtype" :gyfs="ruleForm.gyfs" />
+        <InformationTable :tableData="ruleForm.qlrList" :viewtype="$route.query.viewtype" :gyfs="ruleForm.slywxx.gyfs" />
        <div class="slxx_title title-block">
          登记原因
          <div class="triangle"></div>
@@ -158,7 +152,7 @@
        <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.djyy">
+              <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype==1" v-model="ruleForm.jsydsyq.djyy">
              </el-input>
            </el-form-item>
          </el-col>
@@ -174,13 +168,14 @@
 </template>
 <script>
 import InformationTable from "@/views/workflow/components/InformationTable";
-import { Init, fristReg } from "@/api/jsydsyqFlow.js";
+import { Init, saveData } from "@/api/jsydsyqFlow.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;     
@@ -207,8 +202,8 @@ export default {
      this.ruleForm.qlrList = _.cloneDeep(val);
    }, 
    onSubmit () {
-      fristReg(this.ruleForm).then((res) => {
+      saveData(this.ruleForm).then((res) => {
-        if (res.code === 200 && res.result) {
+        if (res.code === 200) {
           this.$message({
            showClose: true,
            message: "保存成功！",
@@ -223,7 +218,26 @@ export default {
        }
      });
    },
+     compare(){
+    this.$popup({
+            titleStyle: "left",
+            title: "土地变化情况比对", // 弹窗标题
+            editItem: "registerBook/jsydsyq", // 弹窗内容
+            formData: this.propsParam,
+            width: "1220px",
+            height: "790px",
+            // cancelText: '取消摆烂', // 右边按钮文本
+            // confirmText: '确定点击', //左边按钮文本
+            cancel: () => {
+              console.log("取消回调");
            },
+            confirm: () => {
+              console.log("确认回调");
+            },
+          });
+  }
+  },
 };
 </script>
 <style scoped lang='scss'>
--- a/src/views/zhcx/djbcx/djbcx.vue
View file @4ae342b
+++ b/src/views/zhcx/djbcx/djbcx.vue
View file @4ae342b
@@ -6,27 +6,52 @@
        <el-row>
          <el-col :span="5">
            <el-form-item label="权利类型">
-              <el-select v-model="queryForm.qllx" filterable clearable placeholder="请选择权利类型">
+              <el-select
-                <el-option v-for="item in dictData['权利类型']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+                v-model="queryForm.qllx"
+                filterable
+                clearable
+                placeholder="请选择权利类型"
+              >
+                <el-option
+                  v-for="item in dictData['A8']"
+                  :key="item.dcode"
+                  :label="item.dname"
+                  :value="item.dcode"
+                >
                </el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="不动产单元号">
-              <el-input placeholder="请输入不动产单元号" v-model="queryForm.bdcdyh" clearable class="width200px">
+              <el-input
+                placeholder="请输入不动产单元号"
+                v-model="queryForm.bdcdyh"
+                clearable
+                class="width200px"
+              >
              </el-input>
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="不动产权证号">
-              <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width200px">
+              <el-input
+                placeholder="请输入不动产权证号"
+                v-model="queryForm.bdcqzh"
+                clearable
+                class="width200px"
+              >
              </el-input>
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="业务号">
-              <el-input placeholder="请输入业务号" v-model="queryForm.ywh" clearable class="width200px">
+              <el-input
+                placeholder="请输入业务号"
+                v-model="queryForm.ywh"
+                clearable
+                class="width200px"
+              >
              </el-input>
            </el-form-item>
          </el-col>
@@ -42,9 +67,17 @@
    </div>
    <!-- 表格 -->
    <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" border @sort-change="handleSort" :current-page.sync="pageData.current"
+      <lb-table
-        :total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
+        :page-size="pageData.size"
-        :column="tableData.columns" :data="tableData.data">
+        border
+        @sort-change="handleSort"
+        :current-page.sync="pageData.current"
+        :total="tableData.total"
+        @size-change="handleSizeChange"
+        @p-current-change="handleCurrentChange"
+        :column="tableData.columns"
+        :data="tableData.data"
+      >
      </lb-table>
    </div>
  </div>
@@ -58,10 +91,10 @@ import { mapGetters } from "vuex";
 export default {
  name: "djbcx",
  mixins: [table],
-  mounted () {
+  mounted() {
    sendThis(this);
  },
-  data () {
+  data() {
    return {
      queryForm: {
        qllx: "",
@@ -74,7 +107,6 @@ export default {
        size: 10,
        total: 0,
      },
-      ywlys: datas.ywlys(),
      tableData: {
        columns: datas.columns(),
        data: [],
@@ -89,42 +121,43 @@ export default {
  },
  methods: {
    // 初始化数据
-    fetchData () {
+    fetchData() {
+      debugger;
      getDjbBysearch({ ...this.queryForm, ...this.pageData }).then((res) => {
        if (res.code === 200) {
          let { total, records } = res.result;
-          this.pageData.total = total;
          this.tableData.data = records;
+          this.tableData.total = total;
        }
      });
    },
-    handleSort (name, sort) {
+    handleSort(name, sort) {
      console.log(name, sort);
    },
    // 查询
-    queryClick () {
+    queryClick() {
-      this.pageData.current = 1;
+      // this.pageData.current = 1;
-      this.pageData.currentPage = 1;
+      // this.pageData.currentPage = 1;
      this.fetchData();
    },
    // 高级查询
-    moreQueryClick () { },
+    moreQueryClick() {},
-    openDialog (scroll) {     
+    openDialog(scroll) {
      this.$popup({
-         titleStyle:"left",
+        titleStyle: "left",
-          title: '登记簿详情', // 弹窗标题
+        title: "登记簿详情", // 弹窗标题
-          editItem: 'registerBook/djbFrame', // 弹窗内容   
+        editItem: "registerBook/djbFrame", // 弹窗内容
        formData: scroll,
-          width:"1220px",
+        width: "1220px",
-          height:"790px",
+        height: "790px",
        // cancelText: '取消摆烂', // 右边按钮文本
        // confirmText: '确定点击', //左边按钮文本
        cancel: () => {
-            console.log('取消回调')
+          console.log("取消回调");
        },
        confirm: () => {
-            console.log('确认回调')
+          console.log("确认回调");
-          }        
+        },
      });
    },
  },
--- a/src/views/zhcx/djbcx/djbcxdata.js
View file @4ae342b
+++ b/src/views/zhcx/djbcx/djbcxdata.js
View file @4ae342b
@@ -35,7 +35,7 @@ class data extends filter {
              text: '历史',
              color: '#AAAAAA'
            },
-            "3": {
+            "0": {
              text: '临时',
              color: '#FE9400'
            }
@@ -110,15 +110,6 @@ class data extends filter {
    ]
  }
-  ywlys () {
-    return [
-      { value: 1, label: "办事大厅" },
-      { value: 2, label: "微信小程序" },
-      { value: 3, label: "法院端" },
-      { value: 4, label: "银行端" },
-    ]
-  }
 }
 let datas = new data()
 export {
--- a/src/views/zhcx/lpcx/lpcxdata.js
View file @4ae342b
+++ b/src/views/zhcx/lpcx/lpcxdata.js
View file @4ae342b
@@ -36,7 +36,7 @@ class data extends filter {
        label: "坐落",
      },
      {
-        prop: "yt",
+        prop: "showFwyt",
        label: "用途",
      },
      {