Browse Source

Merge branch 'develop_temp0509' of jianguan-web/qpls-md-html into pre-release

李磊 3 years ago
parent
commit
b7bfaa403b

+ 4 - 8
src/libs/JGPrint.js

@@ -151,23 +151,19 @@ export const jGPrint = function (data, type, printerType) {
     LODOP.SET_SHOW_MODE('HIDE_PAPER_BOARD', 1) //  隐藏底图上有模拟走纸板的条纹线
     // LODOP.SET_PRINT_MODE('POS_BASEON_PAPER', true) // 可使输出以纸张边缘为基点
     if (type == 'preview') { //  预览
-      // blobToBaseByPdf(data,function(result){
-      //     LODOP.ADD_PRINT_PDF(0, 0, '100%', '100%', result.split('base64,')[1])
-      //     LODOP.SET_PRINT_PAGESIZE(3,2090,65,"");
-      //     LODOP.PREVIEW()
-      // })
-      if(data.data.length > 1){
+      const dlen = data.data.length
+      if(dlen > 1){
         LODOP.SET_SHOW_MODE("HIDE_PBUTTIN_PREVIEW",1);//隐藏打印按钮
       }
       LODOP.ADD_PRINT_PDF(0, 0, '100%', '100%', data.data[0])
-      LODOP.SET_PRINT_PAGESIZE(3,2090,40,"");
+      LODOP.SET_PRINT_PAGESIZE(3,2090,dlen>1?0:50,"");
       LODOP.PREVIEW()
     } else if (type == 'print') { //  打印
       const dlen = data.data.length
       for(let i=0;i<dlen;i++){
         LODOP.PRINT_INIT("")
         LODOP.ADD_PRINT_PDF(0, 0, '100%', '100%', data.data[i])
-        LODOP.SET_PRINT_PAGESIZE(3, 2090, 40, '')
+        LODOP.SET_PRINT_PAGESIZE(3, 2090, (i==dlen-1)?50:0, '')
         LODOP.PRINT()
       }
     }

+ 22 - 22
src/libs/getDate.js

@@ -12,8 +12,8 @@ export default {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment(moment().startOf('day').valueOf()).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment(moment().startOf('day').valueOf()).format('YYYY-MM-DD 00:00:00')
+    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   },
   // 获取今日的开始结束时间  年月日时分秒
@@ -32,8 +32,8 @@ export default {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment().subtract('days', 6).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment().subtract('days', 6).format('YYYY-MM-DD 00:00:00')
+    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   },
   //  近7天  年月日时分秒
@@ -52,8 +52,8 @@ export default {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment().subtract('days', 2).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment().subtract('days', 2).format('YYYY-MM-DD 00:00:00')
+    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   },
   // 获取昨日的开始结束时间
@@ -62,8 +62,8 @@ export default {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment(moment().add(-1, 'days').startOf('day').valueOf()).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().add(-1, 'days').endOf('day').valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment(moment().add(-1, 'days').startOf('day').valueOf()).format('YYYY-MM-DD 00:00:00')
+    obj.endtime = moment(moment().add(-1, 'days').endOf('day').valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   },
   // 获取当前周的开始到当天结束时间
@@ -72,8 +72,8 @@ export default {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment(moment().week(moment().week()).startOf('week').add('days').valueOf()).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment(moment().week(moment().week()).startOf('week').add('days').valueOf()).format('YYYY-MM-DD 00:00:00')
+    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   },
   // 获取上一周的开始结束时间
@@ -82,8 +82,8 @@ export default {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment(moment().week(moment().week() - 1).startOf('week').add('days').valueOf()).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().week(moment().week() - 1).endOf('week').add('days').valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment(moment().week(moment().week() - 1).startOf('week').add('days').valueOf()).format('YYYY-MM-DD 00:00:00')
+    obj.endtime = moment(moment().week(moment().week() - 1).endOf('week').add('days').valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   },
   // 获取上一月的今天到当月的今天
@@ -92,8 +92,8 @@ export default {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment(moment().month(moment().month() - 1).valueOf()).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment(moment().month(moment().month() - 1).valueOf()).format('YYYY-MM-DD 00:00:00')
+    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   },
   // 获取当前月的开始到当天结束时间
@@ -102,8 +102,8 @@ export default {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment(moment().month(moment().month()).startOf('month').valueOf()).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment(moment().month(moment().month()).startOf('month').valueOf()).format('YYYY-MM-DD 00:00:00')
+    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   },
   // 获取上一个月的开始结束时间
@@ -112,8 +112,8 @@ export default {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment(moment().month(moment().month() - 1).startOf('month').valueOf()).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().month(moment().month() - 1).endOf('month').valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment(moment().month(moment().month() - 1).startOf('month').valueOf()).format('YYYY-MM-DD 00:00:00')
+    obj.endtime = moment(moment().month(moment().month() - 1).endOf('month').valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   },
   // 获取三月前的今天到当月的今天
@@ -122,8 +122,8 @@ export default {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment(moment().month(moment().month() - 3).valueOf()).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().month(moment().month() - 3).endOf('month').valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment(moment().month(moment().month() - 3).valueOf()).format('YYYY-MM-DD 00:00:00')
+    obj.endtime = moment(moment().month(moment().month() - 3).endOf('month').valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   },
   // 获取近三个月的开始结束时间
@@ -132,8 +132,8 @@ export default {
       starttime: '',
       endtime: ''
     }
-    obj.starttime = moment(moment().month(moment().month() - 2).startOf('month').valueOf()).format('YYYY-MM-DD')
-    obj.endtime = moment(moment().month(moment().month() - 2).endOf('month').valueOf()).format('YYYY-MM-DD')
+    obj.starttime = moment(moment().month(moment().month() - 2).startOf('month').valueOf()).format('YYYY-MM-DD 00:00:00')
+    obj.endtime = moment(moment().month(moment().month() - 2).endOf('month').valueOf()).format('YYYY-MM-DD 23:59:59')
     return obj
   }
 }

+ 9 - 0
src/views/common/rangeDate.vue

@@ -22,6 +22,10 @@ export default {
     size: {
       type: String,
       default: 'default'
+    },
+    showTime: {
+      type: Boolean,
+      default: true
     }
   },
   data () {
@@ -55,6 +59,11 @@ export default {
       this.date = date
       if (dateStrings[0] == '' && dateStrings[1] == '') {
         dateStrings = []
+      } else {
+        if (this.showTime) {
+          dateStrings[0] = dateStrings[0] + ' 00:00:00'
+          dateStrings[1] = dateStrings[1] + ' 23:59:59'
+        }
       }
       this.$emit('change', dateStrings)
     },

+ 2 - 2
src/views/customerManagement/customerInfo/list.vue

@@ -187,8 +187,8 @@ export default {
   methods: {
     //  时间  change
     dateSaleChange (date) {
-      this.queryParam.saleBeginDate = date[0] ? date[0] + ' 00:00:00' : ''
-      this.queryParam.saleEndDate = date[1] ? date[1] + ' 23:59:59' : ''
+      this.queryParam.saleBeginDate = date[0] ? date[0] : ''
+      this.queryParam.saleEndDate = date[1] ? date[1] : ''
     },
     //  重置
     resetSearchForm () {

+ 2 - 2
src/views/financialManagement/fundAccountManagement/detail.vue

@@ -152,8 +152,8 @@ export default {
     //  时间  change
     dateChange (date) {
       if (date.length) {
-        this.queryParam.beginDate = date[0] + ' 00:00:00'
-        this.queryParam.endDate = date[1] + ' 00:00:00'
+        this.queryParam.beginDate = date[0]
+        this.queryParam.endDate = date[1]
       } else {
         this.queryParam.beginDate = ''
         this.queryParam.endDate = ''

+ 6 - 6
src/views/financialManagement/ledgerRecord/list.vue

@@ -91,8 +91,8 @@ export default {
           name: '',
           code: ''
         },
-        beginDate: getDate.getRecentday().starttime + ' 00:00:00',
-        endDate: getDate.getRecentday().endtime + ' 23:59:59'
+        beginDate: getDate.getRecentday().starttime,
+        endDate: getDate.getRecentday().endtime
       },
       // 表头
       columns: [
@@ -134,8 +134,8 @@ export default {
   methods: {
     //  时间  change
     dateChange (date) {
-      this.queryParam.beginDate = date[0] ? date[0] + ' 00:00:00' : ''
-      this.queryParam.endDate = date[1] ? date[1] + ' 23:59:59' : ''
+      this.queryParam.beginDate = date[0] ? date[0] : ''
+      this.queryParam.endDate = date[1] ? date[1] : ''
     },
     // 合计
     getTotal (params) {
@@ -153,8 +153,8 @@ export default {
     //  重置
     resetSearchForm () {
       this.$refs.rangeDate.resetDate(this.createDate)
-      this.queryParam.beginDate = getDate.getRecentday().starttime + ' 00:00:00'
-      this.queryParam.endDate = getDate.getRecentday().endtime + ' 23:59:59'
+      this.queryParam.beginDate = getDate.getRecentday().starttime
+      this.queryParam.endDate = getDate.getRecentday().endtime
       this.queryParam.customer.customerSn = undefined
       this.queryParam.dealerProduct.name = ''
       this.queryParam.dealerProduct.code = ''

+ 8 - 8
src/views/financialManagement/warehousingAudit/list.vue

@@ -116,14 +116,14 @@ export default {
       advanced: true, //  高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       auditTime: [
-        moment(getDate.getThreeMonthDays().starttime + ' 00:00:00', 'YYYY-MM-DD'),
-        moment(getDate.getCurrMonthDays().endtime + ' 23:59:59', 'YYYY-MM-DD')
+        getDate.getThreeMonthDays().starttime,
+        getDate.getCurrMonthDays().endtime
       ], //  入库时间
       tableHeight: 0,
       // 查询参数
       queryParam: {
-        beginDate: getDate.getThreeMonthDays().starttime + ' 00:00:00',
-        endDate: getDate.getCurrMonthDays().endtime + ' 23:59:59',
+        beginDate: getDate.getThreeMonthDays().starttime,
+        endDate: getDate.getCurrMonthDays().endtime,
         purchaseBillNo: '',
         receivingBillNo: '',
         auditState: 'WAIT_PUT_WAREHOUSE_AUDIT'
@@ -175,8 +175,8 @@ export default {
   methods: {
     //  时间  change
     dateChange (date) {
-      this.queryParam.beginDate = date[0] ? date[0] + ' 00:00:00' : ''
-      this.queryParam.endDate = date[1] ? date[1] + ' 23:59:59' : ''
+      this.queryParam.beginDate = date[0] ? date[0] : ''
+      this.queryParam.endDate = date[1] ? date[1] : ''
     },
     // 合计
     getTotal (param) {
@@ -223,8 +223,8 @@ export default {
     // 重置数据
     resetData (flag) {
       this.$refs.rangeDate.resetDate(flag ? '' : this.auditTime)
-      this.queryParam.beginDate = flag ? '' : (getDate.getThreeMonthDays().starttime + ' 00:00:00')
-      this.queryParam.endDate = flag ? '' : (getDate.getCurrMonthDays().endtime + ' 23:59:59')
+      this.queryParam.beginDate = flag ? '' : (getDate.getThreeMonthDays().starttime)
+      this.queryParam.endDate = flag ? '' : (getDate.getCurrMonthDays().endtime)
       this.queryParam.purchaseBillNo = ''
       this.queryParam.receivingBillNo = ''
       this.queryParam.auditState = flag ? '' : 'WAIT_PUT_WAREHOUSE_AUDIT'

+ 2 - 2
src/views/notice/list.vue

@@ -105,8 +105,8 @@ export default {
     ]),
     //  时间  change
     dateChange (date) {
-      this.queryParam.beginDate = date[0] ? date[0] + ' 00:00:00' : ''
-      this.queryParam.endDate = date[1] ? date[1] + ' 23:59:59' : ''
+      this.queryParam.beginDate = date[0] ? date[0]: ''
+      this.queryParam.endDate = date[1] ? date[1]: ''
     },
     // 查询列表
     handelSearch (pageNo) {

+ 0 - 1
src/views/numsGoodsShelves/settlementManagement/settlementDetail.vue

@@ -38,7 +38,6 @@
           ref="table"
           size="small"
           rowKey="id"
-          :showPagination="false"
           :columns="columns"
           :data="loadData"
           :defaultLoadData="false"

+ 0 - 1
src/views/numsGoodsShelves/settlementManagement/unSettlementDetail.vue

@@ -75,7 +75,6 @@
           ref="table"
           size="small"
           rowKey="id"
-          :showPagination="false"
           :columns="columns"
           :data="loadData"
           :defaultLoadData="false"

+ 2 - 2
src/views/numsGoodsShelves/shelfMonitoring/warehouseDetail.vue

@@ -144,8 +144,8 @@ export default {
     },
     //  时间  change
     dateChange (date) {
-      this.queryParam.beginDate = date[0] ? date[0] + ' 00:00:00' : null
-      this.queryParam.endDate = date[1] ? date[1] + ' 23:59:59' : null
+      this.queryParam.beginDate = date[0] ? date[0] : null
+      this.queryParam.endDate = date[1] ? date[1] : null
     }
   },
   mounted () {

+ 6 - 6
src/views/purchasingManagement/signWarehousing/list.vue

@@ -107,12 +107,12 @@ export default {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
       time: [
-        getDate.getCurrMonthDays().starttime + ' 00:00:00',
-        getDate.getCurrMonthDays().endtime + ' 23:59:59'
+        getDate.getCurrMonthDays().starttime,
+        getDate.getCurrMonthDays().endtime
       ],
       queryParam: { //  查询条件
-        beginDate: getDate.getCurrMonthDays().starttime + ' 00:00:00',
-        endDate: getDate.getCurrMonthDays().endtime + ' 23:59:59',
+        beginDate: getDate.getCurrMonthDays().starttime,
+        endDate: getDate.getCurrMonthDays().endtime,
         purchaseBillNo: '', //  采购单号
         sendBillNo: '', //  发货单号
         auditState: undefined
@@ -158,8 +158,8 @@ export default {
     //  重置
     resetSearchForm () {
       this.$refs.rangeDate.resetDate(this.time)
-      this.queryParam.beginDate = getDate.getCurrMonthDays().starttime + ' 00:00:00'
-      this.queryParam.endDate = getDate.getCurrMonthDays().endtime + ' 23:59:59'
+      this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
+      this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.purchaseBillNo = ''
       this.queryParam.sendBillNo = ''
       this.queryParam.auditState = undefined

+ 9 - 5
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -365,10 +365,12 @@ export default {
       })
     },
     // 获取单据详细
-    getOrderDetail () {
+    getOrderDetail (flag) {
       salesReturnDetail({ sn: this.orderSn }).then(res => {
         this.ordeDetail = res.data || null
-        this.$refs.queryPart.pageInit(this.buyerSn, this.ordeDetail && this.ordeDetail.priceType || '')
+        if (!flag) {
+          this.$refs.queryPart.pageInit(this.buyerSn, this.ordeDetail && this.ordeDetail.priceType || '')
+        }
       })
     },
     // 打折
@@ -383,7 +385,7 @@ export default {
         id: this.ordeDetail.id
       }).then(res => {
         if (res.status == 200) {
-          this.resetSearchForm()
+          this.getOrderDetail(true)
           this.spinning = false
         } else {
           this.spinning = false
@@ -437,7 +439,9 @@ export default {
     //  重置
     resetSearchForm (flag) {
       this.$refs.table.refresh(!!flag)
-      // this.getOrderDetail()
+      if (flag) {
+        this.getOrderDetail()
+      }
     },
     // 添加或修改产品
     saveProduct (row, type) {
@@ -474,7 +478,7 @@ export default {
       }
       this.spinning = true
       salesReturnSaveProduct(params).then(res => {
-        this.resetSearchForm(type != 'edit')
+        this.resetSearchForm(type == 'edit')
         this.isInster = false
         this.spinning = false
       })

+ 11 - 7
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -351,10 +351,12 @@ export default {
       })
     },
     // 获取单据详细
-    getOrderDetail () {
+    getOrderDetail (flag) {
       salesReturnDetail({ sn: this.orderSn }).then(res => {
         this.ordeDetail = res.data || null
-        this.$refs.queryPart.pageInit(this.buyerSn, this.ordeDetail && this.ordeDetail.priceType || '')
+        if (!flag) {
+          this.$refs.queryPart.pageInit(this.buyerSn, this.ordeDetail && this.ordeDetail.priceType || '')
+        }
       })
     },
     // 打折
@@ -369,7 +371,7 @@ export default {
         id: this.ordeDetail.id
       }).then(res => {
         if (res.status == 200) {
-          this.resetSearchForm()
+          this.getOrderDetail(true)
           this.spinning = false
         } else {
           this.spinning = false
@@ -389,7 +391,7 @@ export default {
           _this.spinning = true
           salesReturnDelAll({ sn: _this.ordeDetail.salesReturnSn }).then(res => {
             if (res.status == 200) {
-              _this.resetSearchForm()
+              _this.resetSearchForm(true)
               _this.$refs.queryPart.resetSearchForm()
             }
             _this.$message.info(res.message)
@@ -423,8 +425,10 @@ export default {
     },
     //  重置
     resetSearchForm (flag) {
-      this.$refs.table.refresh(!!flag)
-      // this.getOrderDetail()
+      this.$refs.table.refresh(flag)
+      if (flag) {
+        this.getOrderDetail()
+      }
     },
     // 添加或修改产品
     saveProduct (row, type) {
@@ -458,7 +462,7 @@ export default {
       }
       this.spinning = true
       salesReturnSaveProduct(params).then(res => {
-        this.resetSearchForm(type != 'edit')
+        this.resetSearchForm(type == 'edit')
         this.isInster = false
         this.spinning = false
       })