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

@@ -54,4 +54,11 @@ export function getDetail(qlbsm) {
     method: 'get'
     method: 'get'
   })
   })
 }
 }
-
+// 进度查询列表
+export function getJdcxBysearch (data) {
+  return request({
+      url: 'zhcx/jdcx/getJdcxBysearch',
+      method: 'post',
+      data
+  })
+}

@@ -11,9 +11,7 @@
           <el-form-item label="下一环节办理人:">
           <el-form-item label="下一环节办理人:">
             赵小千
             赵小千
           </el-form-item>
           </el-form-item>
-              <el-form-item label="审批意见:">
-                <el-input type="textarea" v-model="queryForm.shyj"></el-input>
-              </el-form-item>
+        
         </el-form>
         </el-form>
       </div>
       </div>
     </div>
     </div>

@@ -62,12 +62,11 @@ export default {
   components: { zc, thDialog },
   components: { zc, thDialog },
   data () {
   data () {
     return {
     return {
-      zcDialog: false,
-      thflag: false,
-      queryForm: {
-        shyj: "",
-        bsmSlsq: "",
-        bestepid: "",
+      zcDialog:false,
+      thflag:false,
+      queryForm:{
+        bsmSlsq:"",
+        bestepid:"",
       },
       },
       isShowdrawer: true,
       isShowdrawer: true,
       key: 0,
       key: 0,

@@ -46,7 +46,7 @@
     </div>
     </div>
     <!-- 表格 -->
     <!-- 表格 -->
     <div class="from-clues-content">
     <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" @sort-change="handleSort" :current-page.sync="pageData.current"
+      <lb-table :page-size="pageData.pageSize" @sort-change="handleSort" :current-page.sync="pageData.currentPage"
         :total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
         :total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
         :column="tableData.columns" :data="tableData.data">
         :column="tableData.columns" :data="tableData.data">
       </lb-table>
       </lb-table>
@@ -57,6 +57,7 @@
 import { mapGetters } from 'vuex'
 import { mapGetters } from 'vuex'
 import table from "@/utils/mixin/table";
 import table from "@/utils/mixin/table";
 import { datas, sendThis } from "./jdcxdata";
 import { datas, sendThis } from "./jdcxdata";
+import { getJdcxBysearch } from "@/api/zhcx.js"
 export default {
 export default {
   name: "jdcx",
   name: "jdcx",
   components: {},
   components: {},
@@ -75,20 +76,36 @@ export default {
         djlx: "",
         djlx: "",
         ywh: "",
         ywh: "",
       },
       },
+      pageData: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+      },
       tableData: {
       tableData: {
         columns: datas.columns(),
         columns: datas.columns(),
-        data: [
-          {
-            slsj: "2022-5-12",
-            ywh: 111111111111
-          }
-        ]
+        data: []
       }
       }
     }
     }
   },
   },
   methods: {
   methods: {
     // 初始化数据
     // 初始化数据
-    fetchData () { },
+    fetchData () {
+      getJdcxBysearch({ ...this.queryForm, ...this.pageData }).then(res => {
+        if (res.code === 200) {
+          console.log(res)
+          let { total, records } = res.result
+          let str = ''
+          records.forEach(item=>{
+            if(item.userNameList.length!=0){
+               str = String(item.userNameList)
+               item.blStatus = item.zbhj + '('+ str.replace(/,/g,"+") + ')'
+            }
+          })
+          this.pageData.total = total;
+          this.tableData.data = records
+        }
+      })
+     },
     handleSort (name, sort) {
     handleSort (name, sort) {
       console.log(name, sort);
       console.log(name, sort);
     },
     },

@@ -16,17 +16,20 @@ class data extends filter {
         width: '50'
         width: '50'
       },
       },
       {
       {
-        prop: "ywly",
+        prop: "ywlymc",
         label: "业务来源",
         label: "业务来源",
       },
       },
       {
       {
         label: "流程状态",
         label: "流程状态",
         render: (h, scope) => {
         render: (h, scope) => {
-          return (
-            <div>
-              <span>{scope.row.lczt}</span>
-            </div>
-          )
+          switch (scope.row.lczt) {
+            case '1':
+              return <span>进行中</span>
+            case '2':
+              return <span>进行中</span>
+            case '3':
+              return <span>进行中</span>
+          }
         }
         }
       },
       },
       {
       {
@@ -34,7 +37,7 @@ class data extends filter {
         render: (h, scope) => {
         render: (h, scope) => {
           return (
           return (
             <div>
             <div>
-              <span>{scope.row.blzt}</span>
+              <span>{scope.row.blStatus}</span>
             </div>
             </div>
           )
           )
         }
         }
@@ -54,11 +57,11 @@ class data extends filter {
         label: "申请业务名称",
         label: "申请业务名称",
       },
       },
       {
       {
-        prop: "qlr",
+        prop: "qlrmc",
         label: "权利人",
         label: "权利人",
       },
       },
       {
       {
-        prop: "ywr",
+        prop: "ywrmc",
         label: "义务人",
         label: "义务人",
       },
       },
       {
       {
@@ -76,16 +79,6 @@ class data extends filter {
       }
       }
     ]
     ]
   }
   }
-
-  ywlys () {
-    return [
-      { value: 1, label: "办事大厅" },
-      { value: 2, label: "微信小程序" },
-      { value: 3, label: "法院端" },
-      { value: 4, label: "银行端" },
-    ]
-  }
-
 }
 }
 let datas = new data()
 let datas = new data()
 export {
 export {