【新增】销售执行明细

src/views/supply/implement/implement_list.vue

@@ -68,7 +68,21 @@
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="下单日期" prop="date">
+                  <el-form-item label="制单日期" prop="date">
+                    <el-date-picker
+                      v-model="screenForm.date"
+                      type="datetimerange"
+                      range-separator="至"
+                      style="width: 100%"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      start-placeholder="开始日期"
+                      end-placeholder="结束日期"
+                    >
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="订单日期" prop="orderDate">
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
@@ -114,6 +128,18 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="钱包" prop="walletIds">
+                    <el-select v-model="screenForm.walletIds" size="mini" multiple filterable>
+                      <el-option
+                        v-for="item in NoRebateWalletList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
               </el-row>
             </el-form>
           </template>
@@ -153,14 +179,14 @@
             </el-table-column>
             <el-table-column
               align="left"
-              label="下单日期"
+              label="制单日期"
               prop="createTime"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="left"
-              label="受订日期"
+              label="订单日期"
               prop="theTime"
               min-width="160"
               show-overflow-tooltip
@@ -397,6 +423,7 @@
 import { getList } from '@/api/supply/implement'
 import { getCategoryList } from '@/api/common'
 import DisplaceDetail from '@/views/supply/implement/components/displace_detail'
+import { getNoRebateWalletList } from '@/api/policy_list'
 
 let that
 export default {
@@ -436,7 +463,9 @@ export default {
         k3CategoryNumber: [],
         policyCode: '',
         policyRemark: '',
-        isOver: ''
+        isOver: '',
+        walletIds: [],
+        orderDate: ''
       },
       categoryList: [],
       statusList: [
@@ -447,7 +476,8 @@ export default {
       ],
       isCollapse: true,
       queryItem: {},
-      isShowDisplaceDetail: false
+      isShowDisplaceDetail: false,
+      NoRebateWalletList: []
     }
   },
 
@@ -500,6 +530,8 @@ export default {
         specification: this.screenForm.model,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
+        orderStartTime: this.screenForm.orderDate ? this.screenForm.orderDate[0] : '',
+        orderEndTime: this.screenForm.orderDate ? this.screenForm.orderDate[1] : '',
         serviceName: this.screenForm.serviceName,
         newServiceName: this.screenForm.newServiceName,
         itemServiceName: this.screenForm.itemServiceName,
@@ -508,7 +540,8 @@ export default {
         k3CategoryNumber: this.screenForm.k3CategoryNumber.join(','),
         policyCode: this.screenForm.policyCode,
         policyRemark: this.screenForm.policyRemark,
-        isOver: this.screenForm.isOver
+        isOver: this.screenForm.isOver,
+        walletIds: this.screenForm.walletIds.join(',')
       }
       getList(params).then(res => {
         res.data.records.forEach(item => {
@@ -530,6 +563,12 @@ export default {
       }).then(res => {
         this.categoryList = res.data.records
       })
+      getNoRebateWalletList({
+        walletName: ''
+      }).then(res => {
+        console.log(res)
+        this.NoRebateWalletList = res.data
+      })
     },
 
     // 提交筛选表单

src/views/supply/retail/retail_list.vue

@@ -40,7 +40,7 @@
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="订单日期" prop="date">
+                  <el-form-item label="订单日期" prop="date" size="mini">
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
@@ -55,7 +55,7 @@
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="是否直调" prop="isDirectTransfer">
-                    <el-select v-model="screenForm.isDirectTransfer" placeholder="请选择是否直调">
+                    <el-select v-model="screenForm.isDirectTransfer" placeholder="请选择是否直调" size="mini">
                       <el-option label="是" :value="true"></el-option>
                       <el-option label="否" :value="false"></el-option>
                     </el-select>
@@ -89,7 +89,7 @@
                     <el-select
                       v-model="screenForm.k3ServiceId"
                       placeholder="选择表头业务员"
-                      size="small"
+                      size="mini"
                       clearable
                       filterable
                       style="width: 100%"
@@ -109,7 +109,7 @@
                     <el-select
                       v-model="screenForm.serviceId"
                       placeholder="选择表体业务员"
-                      size="small"
+                      size="mini"
                       clearable
                       filterable
                       style="width: 100%"