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

# Conflicts:
#	src/api/ywbl.js

@@ -31,7 +31,6 @@ export function getNextNode (bsmSqyw) {
 /* 
 业务办理-选择单元-根据条件进行列表查询
 */
-// 
 export function getselectBdcdy (data) {
     return request({
         url: '/ywbl/ywsq/selectBdcdy',
@@ -47,3 +46,14 @@ export function searchTaskToDo (data) {
         data
     })
 }
+
+/* 
+业务办理-发起业务申请流程
+*/
+export function startBusinessFlow (data) {
+    return request({
+        url: '/business/workFlow/startBusinessFlow',
+        method: 'post',
+        data
+    })
+}

@@ -44,7 +44,8 @@
         <!-- 表格 -->
         <div class="from-clues-content">
           <lb-table :page-size="pageData.pageSize" heightNumSetting :current-page.sync="pageData.currentPage"
-            :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
+            :total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
+            @selection-change="handleSelectionChange"
             :column="tableData.columns" :data="tableData.data">
           </lb-table>
         </div>
@@ -54,11 +55,9 @@
 
 </template>
 <script>
-import { datas } from "../ywsqdata.js";
-import table from "@/utils/mixin/table";
+import { datas } from "./gyjsydsyqdata.js";
 import { getselectBdcdy } from "@/api/ywbl.js"
 export default {
-  mixins: [table],
   props: {
     value: { type: Boolean, default: false },
   },
@@ -70,22 +69,31 @@ export default {
         bdcdyh: "",
         ywh: "",
         bdcqzh: "",
-        sqywbm: 'A03100'
+        sqywbm:'A03100'
       },
       qllxs: [],
-      tableData: {
+      pageData: {
+        pageSize: 10,
+        currentPage: 1,
         total: 0,
+      },
+      tableData: {
         columns: datas.columns(),
-        data: []
+        data: [
+    
+        ]
       }
     }
   },
+  created(){
+    this.list()
+  },
   methods: {
-    fetchData () {
-      getselectBdcdy({ ...this.queryForm, ...this.pageData }).then(res => {
+    list(data){
+      getselectBdcdy({ ...this.queryForm, ...this.pageData,...data }).then(res => {
         if (res.code === 200) {
           let { total, records } = res.result
-          this.tableData.total = total;
+          this.pageData.total = total;
           this.tableData.data = records
         }
       })
@@ -97,7 +105,19 @@ export default {
     },
     closeDialog () {
       this.$emit('input', false)
-    }
+    },
+    handleSizeChange (val) {
+      this.list({
+        pageSize: val,
+        currentPage: this.pageData.currentPage,
+      });
+     },
+    handleCurrentChange (val) {
+      this.list({ pageSize: this.pageData.pageSize, currentPage: val });
+     },
+     handleSelectionChange(val){
+       
+     },
   }
 }
 </script>

+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'
+      },
+      {
+        prop: "status",
+        label: "状态",
+      },
+      {
+        prop: "qllx",
+        label: "权利类型",
+      },
+      {
+        prop: "zddm",
+        label: "宗地代码",
+      },
+      {
+        prop: "bdcdyh",
+        label: "不动产单元号",
+      },
+      {
+        prop: "qlxz",
+        label: "权利性质",
+      },
+      {
+        prop: "zdmj",
+        label: "宗地面积",
+      },
+      {
+        prop: "qlsdfs",
+        label: "权利设定方式",
+      },
+      {
+        prop: "tdyt",
+        label: "土地用途",
+      },
+      {
+        prop: "zl",
+        label: "坐落",
+      },
+    ]
+  }
+
+
+}
+let datas = new data()
+export {
+  datas,
+}

@@ -63,12 +63,12 @@
         <el-button type="primary" :disabled="btnDisabled" @click="btnClick()">选择不动产信息</el-button>
       </div>
     </div>
-    <choiceDialog v-model="isDialog" />
+    <choiceDialog v-model="isDialog" :bsmSqyw="bsmSqyw" />
   </div>
 </template>
 <script>
 import { getCollectBiz, getleftMenu, getNextNode } from "@/api/ywbl"
-import choiceDialog from "./components/selectql.vue"
+import choiceDialog from "./components/gyjsydsyq/gyjsydsyq.vue"
 export default {
   data () {
     return {
@@ -87,6 +87,7 @@ export default {
         }
       ],
       djqxList: [],
+      bsmSqyw: '',
       isDialog: false,
       btnDisabled: true
     }
@@ -125,6 +126,7 @@ export default {
       item.cselect = !item.cselect
       if (item.sffqlc == '1') {
         this.btnDisabled = false
+        this.bsmSqyw = item.bsmSqyw
       }
     },
     handleList (list, obj) {
@@ -165,6 +167,7 @@ export default {
       this.$set(item, 'select', true)
       if (item.sffqlc == '1') {
         this.btnDisabled = false
+        this.bsmSqyw = item.bsmSqyw
       } else {
         this.getNextNode(item.bsmSqyw)
       }

@@ -17,7 +17,14 @@ class data extends filter {
       {
         label: '序号',
         type: 'index',
-        width: '50'
+        width: '50',
+        render: (h, scope) => {
+          return (
+            <div>
+              {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
+            </div>
+          )
+        }
       },
       {
         prop: "status",
@@ -63,4 +70,5 @@ class data extends filter {
 let datas = new data()
 export {
   datas,
+  sendThis
 }