chenrui 3 سال پیش
والد
کامیت
515c1e7c02

+ 1 - 1
src/components/Exception/ExceptionPage.vue

@@ -32,7 +32,7 @@ export default {
   },
   methods: {
     handleToHome () {
-      this.$router.push({ name: 'dashboard' })
+      this.$router.push({ name: 'home' })
     }
   }
 }

+ 10 - 2
src/components/MultiTab/MultiTab.vue

@@ -161,8 +161,16 @@ export default {
           this.$store.state.app.isNewTab = true
           this.activeKey = newVal.name
         } else {
-          this.$message.info('您当前打开窗口太多,请关闭一些,窗口不能超过' + this.maxTabNums + '个')
-          this.$router.go(-1)
+          // this.$message.info('您当前打开窗口太多,请关闭一些,窗口不能超过' + this.maxTabNums + '个')
+          // this.$router.go(-1)
+          const _this = this
+          this.$warning({
+            title: '提示',
+            content: '您当前打开窗口太多,请关闭一些,窗口不能超过' + this.maxTabNums + '个',
+            onOk () {
+              _this.$router.go(-1)
+            }
+          })
         }
       } else { // 已存在
         console.log(this.pages.length, '已存在')

+ 5 - 0
src/components/index.less

@@ -364,6 +364,11 @@
   .ant-table-small > .ant-table-content .ant-table-body{
     margin: 0;
   }
+  input:disabled{
+    opacity: 1!important;
+    color: #fff!important;
+    -webkit-text-fill-color: #fff!important;
+  }
 }
 .sTable.fixPagination{
   >.ant-table-wrapper{

+ 0 - 1
src/views/reportData/salesDetails/list.vue

@@ -171,7 +171,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDateTime from '@/views/common/rangeDateTime.vue'

+ 8 - 8
src/views/reportData/salesOrderTotal/list.vue

@@ -157,11 +157,11 @@ export default {
       tableHeight: 0,
       queryParam: { //  查询条件
         time: [
-          getDate.getCurrMonthDays().starttime,
-          getDate.getCurrMonthDays().endtime
+          getDate.getCurrMonthDays().starttime + ' 00:00:00',
+          getDate.getCurrMonthDays().endtime + ' 23:59:59'
         ],
-        beginDate: getDate.getCurrMonthDays().starttime,
-        endDate: getDate.getCurrMonthDays().endtime,
+        beginDate: getDate.getCurrMonthDays().starttime + ' 00:00:00',
+        endDate: getDate.getCurrMonthDays().endtime + ' 23:59:59',
         salesBillNo: '',
         dealerName: '',
         dealerLevel: undefined,
@@ -258,12 +258,12 @@ export default {
     //  重置
     resetSearchForm () {
       this.queryParam.time = [
-        getDate.getCurrMonthDays().starttime,
-        getDate.getCurrMonthDays().endtime
+        getDate.getCurrMonthDays().starttime + ' 00:00:00',
+        getDate.getCurrMonthDays().endtime + ' 23:59:59'
       ]
       this.$refs.rangeDate.resetDate(this.queryParam.time)
-      this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
-      this.queryParam.endDate = getDate.getCurrMonthDays().endtime
+      this.queryParam.beginDate = getDate.getCurrMonthDays().starttime + ' 00:00:00'
+      this.queryParam.endDate = getDate.getCurrMonthDays().endtime + ' 23:59:59'
       this.queryParam.salesBillNo = ''
       this.queryParam.dealerName = ''
       this.queryParam.dealerLevel = undefined