Browse Source

bug修复

chenrui 4 năm trước cách đây
mục cha
commit
b10ca83949

+ 1 - 1
src/views/common/chooseCustomerModal.vue

@@ -59,7 +59,7 @@
         ref="table"
         size="small"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
-        :rowKey="(record) => record.id"
+        :rowKey="(record) => record.dealerSn"
         :columns="columns"
         :data="loadData"
         :defaultLoadData="false"

+ 4 - 3
src/views/promotionRulesManagement/promotionRules/list.vue

@@ -132,8 +132,8 @@ export default {
         }
         // 创建时间
         if (this.createDate && this.createDate.length > 0) {
-          this.queryParam.beginDate = moment(this.createDate[0]).format(this.dateFormat)
-          this.queryParam.endDate = moment(this.createDate[1]).format(this.dateFormat)
+          this.queryParam.beginDate = moment(this.createDate[0]).format(this.dateFormat) + ' 00:00:00'
+          this.queryParam.endDate = moment(this.createDate[1]).format(this.dateFormat) + ' 23:59:59'
         } else {
           this.queryParam.beginDate = undefined
           this.queryParam.endDate = undefined
@@ -146,8 +146,9 @@ export default {
             let str = ''
             const promoBuyerList = data.list[i].promoBuyerList ? data.list[i].promoBuyerList : []
             promoBuyerList.map(item => {
-              str += item.buyerName
+              str += item.buyerName + ','
             })
+            str = str.substr(0, str.length - 1)
             data.list[i].promoBuyerName = str
           }
           this.total = data.count