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

-//*****start*通用查询条件，列表样式******//
+//*****start*通用表单查询条件，列表样式******//
 .from-clues {
     min-width: 1280px;
     height: 100%;
@@ -7,7 +7,7 @@
 
     &-header {
         width: 100%;
-        padding: 20px 20px 0 20px;
+        padding: 15px 15px 0 15px;
         box-sizing: border-box;
         background: #FFFFFF;
         border-radius: 2px;
@@ -32,7 +32,13 @@
             width: auto;
         }
     }
+
+    .el-form-item--small.el-form-item{
+        margin-bottom: 15px;
+
+    }
 }
+//*****end*通用表单查询条件，列表样式******//
 
 
 .width200px {

@@ -6,31 +6,66 @@
         <el-row>
           <el-col :span="5">
             <el-form-item label="业务来源">
-              <el-select v-model="queryForm.ywly" filterable clearable placeholder="请选择业务来源">
-                <el-option v-for="item in ywlys" :key="item.value" :label="item.label" :value="item.value">
+              <el-select
+                v-model="queryForm.ywly"
+                filterable
+                clearable
+                placeholder="请选择业务来源"
+              >
+                <el-option
+                  v-for="item in ywlys"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <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-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="5">
             <el-form-item label="登记类型">
-              <el-select v-model="queryForm.djlx" filterable clearable placeholder="请选择登记类型">
-                <el-option v-for="item in djlxs" :key="item.value" :label="item.label" :value="item.value">
+              <el-select
+                v-model="queryForm.djlx"
+                filterable
+                clearable
+                placeholder="请选择登记类型"
+              >
+                <el-option
+                  v-for="item in djlxs"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
             </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>
@@ -38,7 +73,7 @@
           <el-col :span="4" class="btnCol">
             <el-form-item>
               <el-button type="primary" @click="queryClick()">查询</el-button>
-              <el-button @click="moreScreeningClick()">更多选项</el-button>
+              <el-button @click="moreQueryClick()">高级查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -46,24 +81,32 @@
     </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
+        :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>
 </template>
 <script>
-import table from '@/utils/mixin/table'
-import { datas, sendThis } from "./dbxdata"
+import table from "@/utils/mixin/table";
+import { datas, sendThis } from "./dbxdata";
 export default {
   name: "dbx",
   components: {},
   mixins: [table],
-  mounted () {
+  mounted() {
     sendThis(this);
   },
-  data () {
+  data() {
     return {
       queryForm: {
         ywly: "",
@@ -74,34 +117,35 @@ export default {
       pageData: {
         current: 1,
         size: 10,
-        total: 2
+        total: 2,
       },
+
+      ywlys: datas.ywlys(),
+      
       tableData: {
         columns: datas.columns(),
         data: [
           {
-            slsj: '2022-5-12'
+            slsj: "2022-5-12",
           },
           {
-            slsj: '2022-5-13'
-          }
-        ]
-      }
-    }
+            slsj: "2022-5-13",
+          },
+        ],
+      },
+    };
   },
   methods: {
     // 初始化数据
-    fetchData () {
-
-    },
-    handleSort (name, sort) {
+    fetchData() {},
+    handleSort(name, sort) {
       console.log(name, sort);
     },
-    openDialog () {
+    openDialog() {
       console.log(999999999999999);
-    }
+    },
   },
-}
+};
 </script>
 <style scoped lang="scss">
 @import "~@/styles/public.scss";

@@ -72,6 +72,16 @@ class data extends filter {
       }
     ]
   }
+
+  ywlys(){
+    return[
+      { value: 1, label: "办事大厅" },
+      { value: 2, label: "微信小程序" },
+      { value: 3, label: "法院端" },
+      { value: 4, label: "银行端" },
+    ]
+  } 
+
 }
 let datas = new data()
 export {