lilei 1 年之前
父節點
當前提交
a913d40259

+ 17 - 9
src/views/salesManagement/matchSendOutOrder/list.vue

@@ -159,7 +159,9 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
+import moment from 'moment'
 import rangeDate from '@/views/common/rangeDate.vue'
+import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import subarea from '@/views/common/subarea.js'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
@@ -183,12 +185,15 @@ export default {
       detailType: 2,
       bizSn: null,
       tableHeight: 0,
-      time: [],
+      time: [
+        moment(getDate.getCurrMonthDays().starttime, 'YYYY-MM-DD'),
+        moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
+      ],
       checktime: [],
       // 查询参数
       queryParam: {
-        beginDate: '',
-        endDate: '',
+        beginDate: getDate.getThreeMonthDays().starttime, // 开始时间
+        endDate: getDate.getCurrMonthDays().endtime, // 结束时间
         checkBeginDate: '',
         checkEndDate: '',
         buyerSn: undefined, //  客户名称
@@ -247,9 +252,9 @@ export default {
         { title: '对单时间', dataIndex: 'checkDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
       ]
-	  if (this.isShowWarehouse) {
-	    arr.splice(7, 0, { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
-	  }
+      if (this.isShowWarehouse) {
+        arr.splice(7, 0, { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
+      }
       if (this.$hasPermissions('M_matchSendOutOrderList_salesPrice')) { //  售价权限
         arr.splice(this.isShowWarehouse ? 10 : 9, 0, { title: '总售价', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
@@ -311,15 +316,18 @@ export default {
     },
     // 重置
     resetSearchForm () {
-      this.time = []
+      this.time = [
+        getDate.getCurrMonthDays().starttime,
+        getDate.getCurrMonthDays().endtime
+      ]
       this.$refs.rangeDate.resetDate(this.time)
       this.checktime = []
       this.$refs.checkDate.resetDate(this.checktime)
       this.$refs.dealerSubareaScopeList.resetForm()
       this.$refs.shbuyerName.resetForm()
       this.queryParam = {
-        beginDate: '',
-        endDate: '',
+        beginDate: getDate.getCurrMonthDays().starttime,
+        endDate: getDate.getCurrMonthDays().endtime,
         checkBeginDate: '',
         checkEndDate: '',
         buyerSn: undefined, //  客户名称

+ 1 - 1
src/views/salesManagement/salesOrderWarehouse/list.vue

@@ -139,7 +139,7 @@ export default {
       showExport: false, // 导出提示框
       // 校验规则
       rules: {
-        'time': [{ required: true, message: '请选择退货完成时间', trigger: 'change' }]
+        'time': [{ required: true, message: '请选择创建时间', trigger: 'change' }]
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {