Merge branch 'bochk-poc-1113' of http://192.168.0.110:11080/fukai/vue-gjjs into bochk-poc-1113

src/business/inflid/event/index.js

@@ -156,6 +156,7 @@ export default {
      let filterRoute = this.btnRouteMap.filter((item) => {
         return item.label === btn.label
       })
+
       this.$router.history.push({
         path: filterRoute[0].route,
         query: {

src/business/inflid/views/index.vue

@@ -45,6 +45,7 @@ export default {
       let datetime = new Date();
       datetime = datetime.setDate(datetime.getDate() - 10);
       this.model.infcon.opndatfrom = new Date(datetime);
+      this.model.infcon.opndatto = new Date();
     }
     },
     mounted () {

src/business/litdck/event/index.js

@@ -34,6 +34,9 @@ export default {
         params.brdgrp.rec.inr = null
       }
       const frmSpt = this.$route.query.frm||false;
+      if(!frmSpt){
+        params.spt = {};
+      }
       debugger
       const res = await Api.post('/service/litdck/init', {
         ...params,
@@ -41,7 +44,7 @@ export default {
         userId: window.sessionStorage.userId || 'ZL',
         lidgrp:{
           rec:{
-            inr: frmSpt?this.$route.query.inr:null
+            inr: !frmSpt ? this.$route.query.inr : null
           }
         },
     

src/business/sptsel/event/index.js

@@ -22,10 +22,10 @@ export default {
     },
     //点击查询按钮时，判断“来源”是否有数据
     async handleSearch() {
-      if (!this.sourceList.length) {
-        this.$notify.error({ title: '错误', message: '来源不能为空！' });
-        return;
-      }
+      // if (!this.sourceList.length) {
+      //   this.$notify.error({ title: '错误', message: '来源不能为空！' });
+      //   return;
+      // }
       const params = {
         ...this.model,
         sourceList: this.sourceList,