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

@@ -31,13 +31,21 @@ export function getNextNode (bsmSqyw) {
 /* 
 业务办理-选择单元-根据条件进行列表查询
 */
-export function getselectBdcdy (data) {
+export function selectBdcdy (data) {
     return request({
         url: '/ywbl/ywsq/selectBdcdy',
         method: 'post',
         data
     })
 }
+// 待办箱列表查询接口
+export function searchTaskToDo (data) {
+    return request({
+        url: '/business/todoBox/searchTaskToDo',
+        method: 'post',
+        data
+    })
+}
 
 /* 
 业务办理-发起业务申请流程
@@ -48,4 +56,4 @@ export function startBusinessFlow (data) {
         method: 'post',
         data
     })
-}
\ No newline at end of file
+}

@@ -80,25 +80,19 @@
       </el-form>
     </div>
     <!-- 表格 -->
-    <div class="from-clues-content">
-      <lb-table
-        :page-size="pageData.size"
-        @sort-change="handleSort"
-        :current-page.sync="pageData.current"
-        :total="pageData.total"
-        @selection-change="handleSelectionChange"
-        @size-change="handleSizeChange"
-        @p-current-change="handleCurrentChange"
-        :column="tableData.columns"
-        :data="tableData.data"
-      >
-      </lb-table>
-    </div>
+       <!-- 表格 -->
+       <div class="from-clues-content">
+        <lb-table :page-size="pageData.size" heightNumSetting :current-page.sync="pageData.current"
+          :total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
+          :column="tableData.columns" :data="tableData.data">
+        </lb-table>
+      </div>
   </div>
 </template>
 <script>
 import table from "@/utils/mixin/table";
 import { datas, sendThis } from "./dbxdata";
+import {searchTaskToDo} from "@/api/ywbl.js"
 export default {
   name: "dbx",
   components: {},
@@ -108,6 +102,8 @@ export default {
   },
   data() {
     return {
+      qllxs:[],
+      djlxs:[],
       queryForm: {
         ywly: "",
         qllx: "",
@@ -117,34 +113,32 @@ export default {
       pageData: {
         current: 1,
         size: 10,
-        total: 2,
+        total: 0,
       },
 
       ywlys: datas.ywlys(),
       
       tableData: {
         columns: datas.columns(),
-        data: [
-          {
-            ywly:"办事大厅",
-            lczt:"进行中",
-            zbhj:"受理",
-            ywh:"20200409146",
-            sqywmc:"预告买卖登记||首次登记",
-            qlr:"张三",
-            ywr:"绿地开发商",
-            zl:"C区沙尾金地名轩塔楼1栋101",
-            slsj: "2022-5-12",
-            slry:"窗口人员1",
-            zrsj:"2016-10-01 10:00:00",
-          },
-        ],
+        data: [],
       },
     };
   },
+  created () { },
   methods: {
-    // 初始化数据
-    fetchData() {},
+    // 列表渲染接口
+    fetchData(){
+      searchTaskToDo({...this.queryForm,...this.pageData}).then(res=>{
+        if (res.code === 200) {
+          let { total, records } = res.result
+          this.pageData.total = total;
+          this.tableData.data = records
+        }
+      })
+    },
+    queryClick(){
+      this.fetchData()
+    },
     handleSort(name, sort) {
       console.log(name, sort);
     },

@@ -5,17 +5,17 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="业务号：" prop="ywh">
-            <el-input v-model="ruleForm.ywh"></el-input>
+            <el-input class="width200px" v-model="ruleForm.ywh"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="受理人员：" prop="slry">
-            <el-input v-model="ruleForm.slry"></el-input>
+            <el-input class="width200px" v-model="ruleForm.slry"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="使用权结束时间：" prop="slsj">
-            <el-date-picker v-model="ruleForm.slsj" type="datetime" placeholder="选择结束时间"
+            <el-date-picker class="width200px" v-model="ruleForm.slsj" type="datetime" placeholder="选择结束时间"
             value-format="yyyy-MM-dd" >
           </el-date-picker>
           </el-form-item>
@@ -24,7 +24,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="权利类型：" prop="qllx">
-            <el-select v-model="ruleForm.qllx" filterable clearable placeholder="请选择权利类型">
+            <el-select class="width200px" v-model="ruleForm.qllx" filterable clearable placeholder="请选择权利类型">
               <el-option v-for="item in qllxOption" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
@@ -32,7 +32,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="登记类型：" prop="djlx">
-            <el-select v-model="ruleForm.djlx" filterable clearable placeholder="请选择登记类型">
+            <el-select class="width200px" v-model="ruleForm.djlx" filterable clearable placeholder="请选择登记类型">
               <el-option v-for="item in djlxOption" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
@@ -40,7 +40,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="登记情形：" prop="djqx">
-            <el-select v-model="ruleForm.djqx" filterable clearable placeholder="请选择登记情形">
+            <el-select class="width200px" v-model="ruleForm.djqx" filterable clearable placeholder="请选择登记情形">
               <el-option v-for="item in djqxOption" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
@@ -51,17 +51,17 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="宗地代码：" prop="zddm">
-            <el-input v-model="ruleForm.zddm"></el-input>
+            <el-input class="width200px" v-model="ruleForm.zddm"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="不动产单元号：" prop="bdcdyh">
-            <el-input v-model="ruleForm.bdcdyh"></el-input>
+            <el-input class="width200px" v-model="ruleForm.bdcdyh"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="权利性质：" prop="qlxz">
-            <el-select v-model="ruleForm.qlxz" filterable clearable placeholder="请选择登记情形">
+            <el-select class="width200px" v-model="ruleForm.qlxz" filterable clearable placeholder="请选择登记情形">
               <el-option v-for="item in qlxzOption" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
@@ -71,19 +71,19 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="宗地面积：" prop="zdmj">
-            <el-input v-model="ruleForm.zdmj"></el-input>
+            <el-input class="width200px" v-model="ruleForm.zdmj"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="16">
           <el-form-item label="坐落：" prop="zl">
-            <el-input v-model="ruleForm.zl"></el-input>
+            <el-input  v-model="ruleForm.zl"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="8">
           <el-form-item label="土地用途：" prop="tdyt">
-            <el-select v-model="ruleForm.tdyt" filterable clearable placeholder="请选择登记情形">
+            <el-select class="width200px" v-model="ruleForm.tdyt" filterable clearable placeholder="请选择登记情形">
               <el-option v-for="item in tdytOption" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
@@ -91,7 +91,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="权利设定方式：" prop="qlsdfs">
-            <el-select v-model="ruleForm.qlsdfs" filterable clearable placeholder="请选择登记情形">
+            <el-select class="width200px" v-model="ruleForm.qlsdfs" filterable clearable placeholder="请选择登记情形">
               <el-option v-for="item in qlsdfsOption" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
@@ -99,28 +99,28 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="取得价格：" prop="qdjg">
-            <el-input v-model="ruleForm.qdjg"></el-input>
+            <el-input class="width200px" v-model="ruleForm.qdjg"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="8">
           <el-form-item label="使用权起始时间：" prop="syqqssj">
-            <el-date-picker v-model="ruleForm.syqqssj" type="datetime" placeholder="选择起始时间"
+            <el-date-picker class="width200px" v-model="ruleForm.syqqssj" type="datetime" placeholder="选择起始时间"
             value-format="yyyy-MM-dd" >
           </el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="使用权结束时间：" prop="syqjssj">
-            <el-date-picker v-model="ruleForm.syqjssj" type="datetime" placeholder="选择结束时间"
+            <el-date-picker class="width200px" v-model="ruleForm.syqjssj" type="datetime" placeholder="选择结束时间"
             value-format="yyyy-MM-dd" >
           </el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="使用期限：" prop="syqx">
-            <el-date-picker v-model="ruleForm.syqx" type="datetime" placeholder="选择使用期限"
+            <el-date-picker class="width200px" v-model="ruleForm.syqx" type="datetime" placeholder="选择使用期限"
             value-format="yyyy-MM-dd" >
           </el-date-picker>
           </el-form-item>
@@ -129,7 +129,7 @@
       <el-row>
         <el-col>
           <el-form-item label="附记：" prop="fj">
-            <el-input type="textarea" v-model="ruleForm.fj"></el-input>
+            <el-input  type="textarea" v-model="ruleForm.fj"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -208,6 +208,7 @@ export default {
 }
 </script>
 <style scoped lang='scss'>
+  @import "~@/styles/public.scss";
 .slxx_title {
     border-bottom: 1px solid $borderColor;
     padding-left: 10px;

+<template>
+  <div>
+    <dialogBox
+      title="查询权利信息"
+      @submitForm="submitForm"
+      saveButton="发起申请"
+      width="85%"
+      @closeDialog="closeDialog"
+      v-model="value"
+    >
+      <div class="from-clues">
+        <!-- 表单部分 -->
+        <div class="from-clues-header">
+          <el-form :model="queryForm" ref="queryForm" label-width="100px">
+            <el-row>
+              <el-col :span="5">
+                <el-form-item label="权利类型">
+                  <el-select
+                    v-model="queryForm.qllx"
+                    filterable
+                    clearable
+                    placeholder="请选择权利类型"
+                  >
+                    <el-option
+                      v-for="item in qllxs"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="不动产单元号">
+                  <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.ywh"
+                    clearable
+                    class="width200px"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="不动产权证号">
+                  <el-input
+                    placeholder="请输入不动产权证号"
+                    v-model="queryForm.bdcqzh"
+                    clearable
+                    class="width200px"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="2" 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
+            :page-size="pageData.pageSize"
+            heightNumSetting
+            :current-page.sync="pageData.currentPage"
+            :total="pageData.total"
+            @size-change="handleSizeChange"
+            @p-current-change="handleCurrentChange"
+            @selection-change="handleSelectionChange"
+            :column="tableData.columns"
+            :data="tableData.data"
+          >
+          </lb-table>
+        </div>
+      </div>
+    </dialogBox>
+  </div>
+</template>
+<script>
+import { datas } from "./gyjsydsyqdata.js";
+import { selectBdcdy } from "@/api/ywbl.js";
+export default {
+  props: {
+    value: { type: Boolean, default: false },
+  },
+  data() {
+    return {
+      appliDialog: false,
+      queryForm: {
+        qllx: "",
+        bdcdyh: "",
+        ywh: "",
+        bdcqzh: "",
+        sqywbm: "A03100",
+      },
+      qllxs: [],
+      pageData: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      tableData: {
+        columns: datas.columns(),
+        data: [],
+      },
+    };
+  },
+  created() {
+    this.init();
+  },
+  methods: {
+    init(data) {
+      selectBdcdy({ ...this.queryForm, ...this.pageData, ...data })
+        .then((res) => {
+          if (res.code === 200) {
+            let { total, records } = res.result;
+            this.pageData.total = total;
+            this.tableData.data = records;
+          }
+        })
+        .catch(() => {});
+    },
+
+    submitForm() {
+      this.$emit("input", false);
+      const { href } = this.$router.resolve("/fqsq");
+      window.open(href, "_blank");
+    },
+
+    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>
+<style scoped lang="scss">
+@import "~@/styles/mixin.scss";
+@import "~@/styles/public.scss";
+</style>

+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,
+}

-<template>
-  <div>
-    <dialogBox title="查询权利信息" @submitForm="submitForm" saveButton="发起申请" width="85%" @closeDialog="closeDialog"
-      v-model="value">
-      <div class="from-clues">
-        <!-- 表单部分 -->
-        <div class="from-clues-header">
-          <el-form :model="queryForm" ref="queryForm" label-width="100px">
-            <el-row>
-              <el-col :span="5">
-                <el-form-item label="权利类型">
-                  <el-select v-model="queryForm.qllx" filterable clearable placeholder="请选择权利类型">
-                    <el-option v-for="item in qllxs" :key="item.value" :label="item.label" :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="不动产单元号">
-                  <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.ywh" clearable class="width200px">
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="不动产权证号">
-                  <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width200px">
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="2" 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 :page-size="pageData.pageSize" heightNumSetting :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>
-    </dialogBox>
-  </div>
-
-</template>
-<script>
-import { datas, sendThis } from "./ywsqdata.js";
-import table from "@/utils/mixin/table";
-import { getselectBdcdy, startBusinessFlow } from "@/api/ywbl.js"
-export default {
-  mixins: [table],
-  props: {
-    value: { type: Boolean, default: false },
-    bsmSqyw: { type: String, default: '' },
-  },
-  data () {
-    return {
-      appliDialog: false,
-      queryForm: {
-        qllx: "",
-        bdcdyh: "",
-        ywh: "",
-        bdcqzh: "",
-        sqywbm: 'A03100'
-      },
-      qllxs: [],
-      tableData: {
-        total: 0,
-        columns: datas.columns(),
-        data: []
-      },
-      bdcdyid: '',
-      bdcdyh: ''
-    }
-  },
-  watch: {
-    value (val) {
-      if (val) this.fetchData()
-    }
-  },
-  mounted () {
-    sendThis(this);
-  },
-  methods: {
-    fetchData () {
-      if (this.value) {
-        getselectBdcdy({ ...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.bdcdyid == '') {
-        this.$message.error('请至少选择一条数据');
-        return
-      }
-      startBusinessFlow({
-        bsmSqyw: this.bsmSqyw,
-        bdcdyid: this.bdcdyid,
-        bdcdyh: this.bdcdyh
-      }).then(res => {
-        this.$emit('input', false)
-        const { href } = this.$router.resolve('/fqsq?bsmSqyw=' + this.bsmSqyw)
-        window.open(href, '_blank');
-      })
-    },
-    closeDialog () {
-      this.$emit('input', false)
-    },
-    handleSelectionChange (val) {
-      this.bdcdyid = val.map(item => item.dyhbsm ? item.dyhbsm : '').join(',')
-      this.bdcdyh = val.map(item => item.bdcdyh ? item.bdcdyh : '').join(',')
-    }
-  }
-}
-</script>
-<style scoped lang="scss">
-@import "~@/styles/mixin.scss";
-
-.qtjfjmb-edit-title {
-  padding-bottom: 10px;
-  border-bottom: 1px solid $borderColor;
-  margin-bottom: 10px;
-}
-
-/deep/.el-input {
-  width: 187px;
-}
-
-ul {
-  @include flex;
-  border-radius: 5px;
-  overflow: hidden;
-  margin-bottom: 20px;
-
-  .active {
-    background: $light-blue;
-    color: #fff;
-  }
-
-  li {
-    flex: 1;
-    line-height: 36px;
-    @include flex-center;
-    border: 1px solid $borderColor;
-    margin-left: -1px;
-    cursor: pointer;
-    transition: all 0.3s;
-
-    &:hover {
-      @extend .active;
-    }
-  }
-}
-</style>

@@ -68,7 +68,7 @@
 </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 {