Merge branch 'dev'

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-07-24 14:10:29
+ * @LastEditTime: 2023-07-24 15:00:14
 -->
 <template>
   <section class="app-main">
     <transition name="fade-transform" mode="out-in">
-      <keep-alive :include="['dbx', 'ybx','jtfc', 'dydjb', 'sqcxjl', 'jdcx','djbcx',
-      'lpcx','zslqcx', 'zxgcdycx', 'zsrk', 'zsff','zssyjl','dictionaries', 'sqywgz', 'qtjfjmb',
-      'xttz','flfg']">
+      <keep-alive :exclude="['home','ywsq']">
         <router-view />
       </keep-alive>
     </transition>

@@ -36,14 +36,14 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="开始日期" class="marginbtm0">
-              <el-date-picker class="width100" v-model="queryForm.kssj" type="date" placeholder="开始日期"
+              <el-date-picker class="width100" v-model="queryForm.startTime" :picker-options="pickerOptionsStart" type="date" placeholder="开始日期"
                 value-format="yyyy-MM-dd" clearable>
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="结束日期" class="marginbtm0">
-              <el-date-picker class="width100" v-model="queryForm.jssj" type="date" placeholder="结束日期"
+              <el-date-picker class="width100" v-model="queryForm.endTime" :picker-options="pickerOptionsEnd" type="date" placeholder="结束日期"
                 value-format="yyyy-MM-dd" clearable>
               </el-date-picker>
             </el-form-item>
@@ -79,10 +79,32 @@
     },
     data () {
       return {
+        // 开始结束日期限制
+        pickerOptionsStart: {
+          disabledDate: (time) => {
+            if (this.queryForm.endTime) {
+              return (
+                time.getTime() >= new Date(this.queryForm.endTime).getTime()
+              );
+            }
+          }
+        },
+        // 结束日期限制
+        pickerOptionsEnd: {
+          disabledDate: (time) => {
+            if (this.queryForm.startTime) {
+              return (
+                time.getTime() <= new Date(this.queryForm.startTime).getTime()
+              );
+            }
+          }
+        },
         queryForm: {
           cxbh: "",
           sqr: "",
           ywh: "",
+          startTime: "",
+          endTime: ""
         },
         tableData: {
           columns: datas.columns(),

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-24 11:25:15
+ * @LastEditTime: 2023-07-24 15:03:20
 -->
 <template>
   <div class="from-clues">
@@ -133,9 +133,6 @@
     },
     mounted () {
       sendThis(this);
-      window["getBpageList"] = () => {
-        this.queryClick();
-      }
     },
     watch: {
       queryForm: {
@@ -145,6 +142,9 @@
     },
     activated () {
       this.queryClick();
+      window["getBpageList"] = () => {
+        this.queryClick();
+      }
     },
     methods: {
       // 列表渲染接口

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-24 11:26:06
+ * @LastEditTime: 2023-07-24 15:03:46
 -->
 <template>
   <div class="from-clues">
@@ -137,9 +137,6 @@
     components: { searchBox },
     mixins: [table, searchMin],
     mounted () {
-      window["getBpageList"] = () => {
-        this.queryClick();
-      };
       sendThis(this);
     },
     computed: {
@@ -167,7 +164,10 @@
       };
     },
     activated () {
-      this.queryClick();
+      this.queryClick()
+      window["getBpageList"] = () => {
+        this.queryClick()
+      }
     },
     methods: {
       // 列表渲染接口

@@ -25,6 +25,7 @@ class data extends filter {
       {
         prop: "ywlymc",
         label: "业务来源",
+        width: '100',
       },
       {
         label: "流程状态",
@@ -48,6 +49,7 @@ class data extends filter {
       },
       {
         label: "业务号",
+        width: '90',
         render: (h, scope) => {
           return <el-button type="text" onClick={() => { vm.ywhClick(scope.row) }}>{scope.row.ywh}</el-button>
         }

@@ -93,6 +93,7 @@
 <script>
   import { getCollectBiz, getleftMenu, getNextNode, getRepairBiz, getTogetherBiz, addCollectBiz, deleteCollectBiz } from "@/api/businessApply.js"
   export default {
+    name: 'ywsq',
     data () {
       return {
         //申请业务类型集合