Merge branch 'develop' of http://code.dashoo.cn/chengjian/opms_frontend into develop

src/views/customer/follow.vue

@@ -222,6 +222,9 @@
         if (this.queryForm.date && this.queryForm.date.length === 2) {
           params.beginTime = this.queryForm.date[0]
           params.endTime = this.queryForm.date[1]
+          params.daysBeforeToday = undefined
+        } else {
+          params.daysBeforeToday = 20
         }
         const [err, res] = await to(api.getListByDay(params))
         if (err) return console.log(err, 'err')
@@ -344,6 +347,7 @@
   ::v-deep .el-input-group__prepend {
     width: 40%;
   }
+
   .follow {
     display: flex;
 

src/views/customer/followsell.vue

@@ -213,6 +213,9 @@
         if (this.queryForm.date && this.queryForm.date.length === 2) {
           params.beginTime = this.queryForm.date[0]
           params.endTime = this.queryForm.date[1]
+          params.daysBeforeToday = undefined
+        } else {
+          params.daysBeforeToday = 20
         }
         params['Sell'] = '1'
         const [err, res] = await to(api.getListByDay(params))

src/views/proj/business/components/DetailsRecords.vue

@@ -36,7 +36,7 @@
                   }}
                 </span>
               </p>
-              <p v-if="['41', '51', '61', '81'].includes(item.opnType)">
+              <p v-if="['11', '41', '51', '61', '81'].includes(item.opnType)">
                 审批结果：
                 <span>{{ selectDictLabel(approStatusOptions, item.opnContent.approStatus) }}</span>
               </p>