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

@@ -127,11 +127,9 @@ export default {
     handleSelectionChange (val) {
       this.bdcdysz = val;
     },
-    queryClick () {
-      this.fetchData();
-    },
-  },
-};
+    
+  }
+}
 </script>
 <style scoped lang="scss">
 @import "~@/styles/mixin.scss";

+<template>
+  <div class="from-clues">
+    <!-- 表单部分 -->
+    <div class="from-clues-header">
+      <el-tabs v-model="activeName">
+        <el-tab-pane label="自然幢" name="first"></el-tab-pane>
+        <el-tab-pane label="户" name="second"></el-tab-pane>
+      </el-tabs>
+      <el-form :model="queryForm" ref="queryForm" label-width="100px">
+        <el-row>
+          <el-col :span="5">
+            <el-form-item label="权利类型" label-width="70px">
+              <el-select v-model="queryForm.qllx" filterable class="width100" 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>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="业务号" label-width="70px">
+              <el-input placeholder="业务号" v-model="queryForm.ywh" clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="不动产权证号">
+              <el-input placeholder="不动产权证号" v-model="queryForm.bdcqzh" clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="btnCol">
+            <el-form-item>
+              <el-button type="primary" @click="queryClick()">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 表格 -->
+    <div class="from-clues-content">
+      <lb-table border :page-size="pageData.pageSize" :heightNum="400" :current-page.sync="pageData.currentPage"
+        :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
+        @selection-change="handleSelectionChange" :column="tableData.columns" :data="tableData.data">
+      </lb-table>
+    </div>
+    <div class="submit_button">
+      <el-button @click="closeDialog">取消</el-button>
+      <el-button type="primary" plain @click="submitForm" :loading="saveloding">发起申请</el-button>
+    </div>
+  </div>
+</template>
+<script>
+//国有建设用地使用权/房屋使用权
+import { mapGetters } from 'vuex'
+import { datas, sendThis } from "../javascript/houseOwnership.js";
+import table from "@/utils/mixin/table";
+import jump from "../components/mixin/jump";
+import { selectScBdcdy, startBusinessFlow } from "@/api/ywbl.js";
+export default {
+  props: {
+    bsmSqyw: { type: String, default: "" },
+    djqxObj: { type: Object, default: "" },
+    djywbm: { type: String, default: "" }
+  },
+  mixins: [table, jump],
+  data () {
+    return {
+      activeName: 'first',
+      queryForm: {
+        qllx: '',
+        bdcdyh: '',
+        ywh: '',
+        bdcqzh: ''
+      },
+
+      tableData: {
+        total: 0,
+        columns: datas.columns(),
+        data: [],
+      },
+      bdcdysz: [],
+      saveloding: false,
+    };
+  },
+  watch: {
+    bsmSqyw (val) {
+      this.fetchData();
+    },
+  },
+  mounted () {
+    sendThis(this);
+  },
+  computed: {
+    ...mapGetters(['dictData']),
+  },
+  methods: {
+    closeDialog () {
+      this.$emit("closeDialog");
+    },
+    fetchData () {
+      if (this.bsmSqyw) {
+        this.queryForm.sqywbm = this.djywbm;
+
+        selectScBdcdy({ ...this.queryForm, ...this.pageData }).then((res) => {
+          if (res.code === 200) {
+            let { total, records } = res.result;
+            this.tableData.total = total;
+            this.tableData.data = records;
+          }
+        });
+      }
+    },
+    submitForm () {
+      if (this.bdcdysz.length == 0) {
+        this.$message.error("请至少选择一条数据");
+        return;
+      }
+      this.saveloding = true;
+      startBusinessFlow({
+        bsmSqyw: this.bsmSqyw,
+        bdcdysz: this.bdcdysz,
+        djqxbm: this.djqxObj.djqxbm,
+        djqxmc: this.djqxObj.djqxmc,
+      }).then((res) => {
+        this.saveloding = false;
+        if (res.code == 200) {
+          this.jump(res.result)
+        } else {
+          this.$message.error(res.message);
+        }
+      });
+    },
+    handleSelectionChange (val) {
+      this.bdcdysz = val;
+    }
+  },
+};
+</script>
+<style scoped lang="scss">
+@import "~@/styles/mixin.scss";
+@import "~@/styles/public.scss";
+</style>

 <template>
   <div class="from-clues">
-    <!-- 表单部分 -->
+    <!-- 表单部分 国有建设用地使用权 -->
     <div class="from-clues-header">
       <el-form :model="queryForm" ref="queryForm" label-width="120px">
         <el-row>
@@ -54,7 +54,7 @@ export default {
   data () {
     return {
       queryForm: defaultParameters.defaultParameters(),
-      
+
       qllxs: [],
       tableData: {
         total: 0,
@@ -79,7 +79,7 @@ export default {
     },
     fetchData () {
       if (this.bsmSqyw) {
-        this.queryForm.sqywbm=this.djywbm;
+        this.queryForm.sqywbm = this.djywbm;
 
         selectScBdcdy({ ...this.queryForm, ...this.pageData }).then((res) => {
           if (res.code === 200) {
@@ -113,11 +113,8 @@ export default {
     handleSelectionChange (val) {
       this.bdcdysz = val;
     },
-    queryClick () {
-      this.fetchData();
-    },
-  },
-};
+  }
+}
 </script>
 <style scoped lang="scss">
 @import "~@/styles/mixin.scss";

@@ -94,7 +94,7 @@ export default {
     },
     fetchData () {
       if (this.bsmSqyw) {
-        this.queryForm.sqywbm=this.djywbm;
+        this.queryForm.sqywbm = this.djywbm;
 
         selectQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
           if (res.code === 200) {
@@ -131,13 +131,9 @@ export default {
         item.ybdcqzsh = item.bdcqzh
       })
       this.bdcdysz = val;
-
-    },
-    queryClick () {
-      this.fetchData();
-    },
-  },
-};
+    }
+  }
+}
 </script>
 <style scoped lang="scss">
 @import "~@/styles/mixin.scss";

@@ -9,6 +9,10 @@ export default {
         data.bestepid + '&bsmBusiness='
       );
       window.open(href, "_blank");
+    },
+    queryClick () {
+      this.pageData.currentPage = 1
+      this.fetchData();
     }
   }
 }

+import filter from '@/utils/filter.js'
+let vm = null
+
+const sendThis = (_this) => {
+  vm = _this
+}
+class data extends filter {
+  constructor() {
+    super()
+  }
+  columns () {
+    return [
+      {
+        type: 'selection',
+        label: '全选'
+      },
+      {
+        label: '序号',
+        type: 'index',
+        width: '50',
+        render: (h, scope) => {
+          return (
+            <div>
+              {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
+            </div>
+          )
+        }
+      },
+      {
+        prop: "status",
+        label: "状态",
+      },
+      {
+        prop: "qllxmc",
+        label: "权利类型",
+      },
+      {
+        prop: "zrzh",
+        label: "自然幢号",
+      },
+      {
+        prop: "bdcdyh",
+        label: "不动产单元号",
+      },
+      {
+        prop: "showQlxz",
+        label: "权利性质",
+      },
+      {
+        prop: "zdmj",
+        label: "宗地面积",
+      },
+      {
+        prop: "qlsdfsmc",
+        label: "权利设定方式",
+      },
+      {
+        prop: "showFwyt",
+        label: "房屋用途",
+      },
+      {
+        prop: "zl",
+        label: "坐落",
+      },
+    ]
+  }
+
+
+}
+let datas = new data()
+export {
+  datas,
+  sendThis
+}

@@ -48,7 +48,7 @@ class data extends filter {
       },
       {
         prop: "zdmj",
-        label: "宗地面积",
+        label: "宗地面积(㎡)",
       },
       {
         prop: "qlsdfsmc",

@@ -10,20 +10,16 @@ class data extends filter {
   constructor() {
     super()
   }
-  defaultParameters(){
-    return [
-      {
-        qllx: "",
-        bdcdyh: "",
-        ywh: "",
-        bdcqzh: "",
-        fwfl:"",
-        zl:"",    
-      }
-    ]
+  defaultParameters () {
+    return {
+      qllx: "",
+      bdcdyh: "",
+      ywh: "",
+      bdcqzh: "",
+      fwfl: "",
+      zl: "",
+    }
   }
-
-
 }
 let defaultParameters = new data()
 export {

@@ -23,6 +23,7 @@ export default {
       this.myValue = val
     },
     djywbm (val) {
+      console.log(val);
       let dd = queueDjywmc(val);
       this.editItem = this.loadView(dd);
     },

-export function queueDjywmc(djywbm) {
+export function queueDjywmc (djywbm) {
     let vm = null;
     switch (djywbm) {
         case "A03100"://建设用地使用权（首次登记）
@@ -9,6 +9,9 @@ export function queueDjywmc(djywbm) {
         case "A03200":
         case "A03300":
         case "A03400":
+        case "A04100":
+            vm = "houseOwnership";
+            break;
         case "A05200":
         case "A05300":
         case "A05400":