Merge branch 'master' into feat-two

src/components/template/template-page-1.vue

@@ -235,17 +235,35 @@ export default {
     this.getZfireParamList()
   },
   methods: {
+    getTimeDay(num = 0) {
+      var day2 = new Date()
+      if (num > 0) {
+        day2.setTime(day2.getTime() + 24 * 60 * 60 * 1000 * Math.abs(num))
+      } else if (num < 0) {
+        day2.setTime(day2.getTime() - 24 * 60 * 60 * 1000 * Math.abs(num))
+      } else {
+        day2.setTime(day2.getTime())
+      }
+      return (
+        day2.getFullYear() +
+        '-' +
+        (day2.getMonth() + 1 < 10 ? `0${day2.getMonth() + 1}` : day2.getMonth() + 1) +
+        '-' +
+        (day2.getDate() < 10 ? `0${day2.getDate()}` : day2.getDate())
+      )
+    },
     setDefaultPlan(createTimeKey) {
       this.$nextTick(() => {
         if (createTimeKey) {
-          var [y, m, d] = new Date(new Date().getTime()).toJSON().split('T').join(' ').substr(0, 10).split('-')
+          var day = this.getTimeDay()
+          var day1 = this.getTimeDay(-1)
           this.timePlan = [
             {
               name: '今日',
               paramCallback: () => {
                 return [
-                  { param: createTimeKey, compare: '>', value: `${y}-${m}-${Number(d) - 1} 23:59:59` },
-                  { param: createTimeKey, compare: '<', value: `${y}-${m}-${Number(d) + 1} 00:00:00` }
+                  { param: createTimeKey, compare: '>=', value: `${day} 00:00:00` },
+                  { param: createTimeKey, compare: '<=', value: `${day} 23:59:59` }
                 ]
               }
             },
@@ -253,8 +271,8 @@ export default {
               name: '昨日',
               paramCallback: () => {
                 return [
-                  { param: createTimeKey, compare: '>', value: `${y}-${m}-${Number(d) - 2} 23:59:59` },
-                  { param: createTimeKey, compare: '<', value: `${y}-${m}-${Number(d)} 00:00:00` }
+                  { param: createTimeKey, compare: '>=', value: `${day1} 00:00:00` },
+                  { param: createTimeKey, compare: '<=', value: `${day1} 23:59:59` }
                 ]
               }
             }

src/views/sales_policy/components/OperationRecords.vue

@@ -72,6 +72,12 @@ export default {
           label: '模块名称',
           prop: 'moduleName'
         }
+      },
+      {
+        columnAttributes: {
+          label: '操作时间',
+          prop: 'createTime'
+        }
       }]
     }
   },

src/views/sales_policy/components/replaceRecordForm.vue

@@ -184,7 +184,7 @@ export default {
     },
     policyColumns() {
       return [
-      
+
         {
           columnAttributes: {
             label: '政策编码',
@@ -237,6 +237,12 @@ export default {
         },
         {
           columnAttributes: {
+            label: '制单人',
+            prop: 'createBy'
+          }
+        },
+        {
+          columnAttributes: {
             label: '操作',
             prop: ''
           },