导粉记录，订单条件筛选，食谱计划生成优化

stdiet-ui/src/views/custom/importFanRecord/index.vue

@@ -92,10 +92,15 @@
           <span>{{ parseTime(scope.row.importFanDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="进粉账号渠道" align="center" prop="importFanChannelName" />
+      <el-table-column label="账号渠道" align="center" prop="importFanChannelName" />
       <el-table-column label="所属直播间" align="center" prop="liveRoomName" >
         <template slot-scope="scope">
-            {{(scope.row.liveRoomName != null || scope.row.liveNutritionistName != null) ? (scope.row.liveRoomName + "—" + scope.row.liveNutritionistName) : ""}}
+            {{(scope.row.liveRoomName != null ? scope.row.liveRoomName : "无")}}
+        </template>
+      </el-table-column>
+      <el-table-column label="直播营养师" align="center" prop="liveNutritionistName" >
+        <template slot-scope="scope">
+            {{scope.row.liveNutritionistName != null ? scope.row.liveNutritionistName : "无"}}
         </template>
       </el-table-column>
       <el-table-column label="导粉总数" align="center" prop="wxAccountList" :formatter="getTotalFanNum">
@@ -104,9 +109,9 @@
         <template slot-scope="scope">
           <el-popover
           placement="left"
-          width="520"
+          width="700"
           trigger="click">
-          <el-table :data="scope.row.wxAccountList" style="width:450;height: 400px;overflow: auto;">
+          <el-table :data="scope.row.wxAccountList" style="width:700;height: 400px;overflow: auto;">
             <el-table-column width="80" property="saleName" label="销售" align="center"></el-table-column>
             <el-table-column width="160" property="wxAccount" label="微信号" align="center"></el-table-column>
             <el-table-column width="120" property="importFanNum" label="导粉数量" align="center">
@@ -119,6 +124,8 @@
                   </div>
                 </template>
             </el-table-column>
+            <el-table-column width="160" property="importTime" label="导粉时间" align="center">     
+            </el-table-column>
             <el-table-column width="120" label="操作" align="center">
               <template slot-scope="scope">
                 <el-button

stdiet-ui/src/views/custom/order/index.vue

@@ -88,6 +88,24 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="6" v-if="!isPartner">
+          <el-form-item label="售中" prop="onSaleId">
+            <el-select
+              v-model="queryParams.onSaleId"
+              placeholder="请选择售中"
+              clearable
+              filterable
+              size="small"
+            >
+              <el-option
+                v-for="dict in onSaleIdOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="parseInt(dict.dictValue)"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="6" v-if="!isPartner">
           <el-form-item label="售后" prop="afterSaleId">
             <el-select
@@ -248,7 +266,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="6">
           <el-form-item label="订单类型" prop="searchOrderTypeArray">
             <el-cascader
               placeholder="请选择订单类型"
@@ -257,13 +275,13 @@
               :props="orderTypeProps"
               collapse-tags
               clearable
-              style="width: 300px"
             ></el-cascader> </el-form-item
           ><!--   -->
         </el-col>
-        <el-col :span="12">
+        <el-col :span="20">
           <el-form-item label="成交日期" prop="orderTime">
             <el-date-picker
+              style="width:300px"
               v-model="daterange"
               type="daterange"
               size="small"
@@ -276,10 +294,7 @@
             >
             </el-date-picker>
           </el-form-item>
-        </el-col>
-
-        <el-col>
-          <el-form-item>
+          <el-form-item style="margin-left:50px">
             <el-button
               type="cyan"
               icon="el-icon-search"
@@ -292,6 +307,20 @@
             </el-button>
           </el-form-item>
         </el-col>
+        <!--<el-col>
+          <el-form-item>
+            <el-button
+              type="cyan"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >搜索
+            </el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>-->
       </el-form>
     </el-row>
 
@@ -337,9 +366,11 @@
         width="100"
       >
         <template slot-scope="scope">
+          <div v-if="scope.row.orderTime != undefined && scope.row.orderTime != null">
           <div v-for="time in scope.row.orderTime.split(' ')" :key="time">
             {{ time }}
           </div>
+          </div>
         </template>
       </el-table-column>
       <el-table-column
@@ -362,7 +393,11 @@
         width="90"
       />
       <el-table-column label="服务时长" align="center" prop="serveTime" />
-      <el-table-column label="销售" align="center" prop="preSale" />
+      <el-table-column label="销售/售中" align="center" prop="preSale" >
+          <template slot-scope="scope">
+              {{ scope.row.preSaleId ? scope.row.preSale : scope.row.onSale }}
+          </template>
+      </el-table-column>
       <el-table-column
         v-if="!isMobile"
         label="售后"
@@ -561,6 +596,7 @@ export default {
         phone: null,
         payTypeId: null,
         preSaleId: null,
+        onSaleId: null,
         afterSaleId: null,
         nutritionistId: null,
         nutriAssisId: null,
@@ -592,6 +628,7 @@ export default {
     ...mapGetters([
       // 售前字典
       "preSaleIdOptions",
+      "onSaleIdOptions",
       // 售后字典
       "afterSaleIdOptions",
       // 主营养师字典