Ver Fonte

有效gmv

yumeng há 10 meses atrás
pai
commit
cf8ad64caa

+ 17 - 0
src/api/goodsManagement/goods.js

@@ -63,6 +63,14 @@ export function checkItem(query) {
   })
 }
 
+export function checkUser(query) {
+  return request({
+    url: '/item/checkUser',
+    method: 'get',
+    params: query
+  })
+}
+
 
 // 新增商品
 
@@ -113,6 +121,14 @@ export function getRegimental(query) {
   })
 }
 
+export function getDataOwnership(query) {
+  return request({
+    url: '/item/getDataOwnership',
+    method: 'get',
+    params: query
+  })
+}
+
 //领样预览
 
 export function preview(query) {
@@ -493,6 +509,7 @@ export function detailList(query) {
     params: query
   })
 }
+
 export function updateFinancialReviewDetails(query) {
   return request({
     url: '/financialReview/updateFinancialReviewDetails',

+ 8 - 0
src/api/index.js

@@ -124,6 +124,14 @@ export function getMediaId(query) {
   })
 }
 
+export function getGmvHour(query) {
+  return request({
+    url: '/itemCollectSamples/getGmvHour',
+    method: 'get',
+    params: query
+  })
+}
+
 
 
 

+ 4 - 4
src/utils/request.js

@@ -14,10 +14,10 @@ export let isRelogin = {show: false};
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 const service = axios.create({
-     baseURL: 'http://ruixuan.api.tjyourong.com.cn',
-  //   baseURL: 'http://rocket.api.tjyourong.com.cn',
-  //   baseURL: 'http://mgs.api.tjyourong.com.cn',
-  //     baseURL: 'http://127.0.0.1:9003',
+    baseURL: 'http://ruixuan.api.tjyourong.com.cn',
+   // baseURL: 'http://rocket.api.tjyourong.com.cn',
+  //    baseURL: 'http://mgs.api.tjyourong.com.cn',
+   //  baseURL: 'http://127.0.0.1:9003',
   // 超时
   timeout: 300000
 })

+ 52 - 21
src/views/goodsManagement/goodsDetail.vue

@@ -8,18 +8,20 @@
       style="float: right; position: fixed; right: 40px; bottom: 2%; z-index: 10"
       :loading="loading"
       v-if="itemInfo.type != 'lookElse'"
-      >{{ itemInfo.type != "look" ? "新增" : "修改" }}</el-button
+    >{{ itemInfo.type != "look" ? "新增" : "修改" }}
+    </el-button
     >
     <el-button
       size="mini"
       @click="addClose"
       style="float: right; position: fixed; right: 120px; bottom: 2%; z-index: 10"
       v-if="itemInfo.type == 'look'"
-      >取消</el-button
+    >取消
+    </el-button
     >
     <el-card shadow="never" class="card-show" v-if="itemJson" style="margin-bottom: 24px">
       <div>
-        <h3 style="font-weight: blod" >
+        <h3 style="font-weight: blod">
           {{ itemJson.itemTitle }}( {{ itemJson.itemId }})
           <el-button
             type="primary"
@@ -29,7 +31,8 @@
             style="float: right"
             :loading="loading"
             v-if="itemInfo.type != 'look' && itemInfo.type != 'lookElse'"
-            >{{ itemInfo.type != "look" ? "新增" : "修改" }}</el-button
+          >{{ itemInfo.type != "look" ? "新增" : "修改" }}
+          </el-button
           >
         </h3>
       </div>
@@ -38,7 +41,7 @@
       <el-col :span="6">
         <el-card shadow="never" class="card-show">
           <div>
-            <img :src="itemJson.itemImgUrl" alt="" style="width: 100%; height: auto" />
+            <img :src="itemJson.itemImgUrl" alt="" style="width: 100%; height: auto"/>
           </div>
           <div>
             <div class="swiper">
@@ -88,8 +91,8 @@
               <p>
                 领样要求:
                 <span v-if="!editSampleRequirement">{{
-                  itemInfo.sampleRequirement
-                }}</span>
+                    itemInfo.sampleRequirement
+                  }}</span>
                 <el-input
                   v-else
                   v-model="itemInfo.sampleRequirement"
@@ -129,11 +132,11 @@
 
               <p>
                 商品链接:<a
-                  style="display: inline"
-                  :href="itemJson.detailUrl"
-                  target="_block"
-                  >{{ itemJson.detailUrl }}</a
-                >
+                style="display: inline"
+                :href="itemJson.detailUrl"
+                target="_block"
+              >{{ itemJson.detailUrl }}</a
+              >
               </p>
             </div>
           </el-card>
@@ -252,8 +255,9 @@ import {
   editItem,
   getItemDetailByItemId,
 } from "@/api/goodsManagement/goods";
-import { swiper, swiperSlide } from "vue-awesome-swiper";
+import {swiper, swiperSlide} from "vue-awesome-swiper";
 import "swiper/dist/css/swiper.css";
+
 export default {
   name: "goods-preview",
   components: {
@@ -325,7 +329,8 @@ export default {
   },
   mounted() {
     this.getItemPreview();
-    this.$nextTick(() => {});
+    this.$nextTick(() => {
+    });
   },
   filters: {},
   watch: {},
@@ -337,20 +342,26 @@ export default {
           itemId: this.itemInfo.itemId,
           regId: this.itemInfo.regId,
           mediaId: this.itemInfo.mediaId,
+          ownershipId: this.itemInfo.dataOwnership,
+          userName: this.$store.getters.name,
           byteDanceItemType: this.itemInfo.byteDanceItemType,
         }).then((res) => {
           this.itemJson = res.itemJson;
           this.judgeStatus = res.judgeStatus;
         });
       } else {
-        getItemDetailByItemId({ itemId: this.itemInfo.itemId ,mediaId:this.itemInfo.mediaId,byteDanceItemType: this.itemInfo.byteDanceItemType}).then((res) => {
+        getItemDetailByItemId({
+          itemId: this.itemInfo.itemId,
+          mediaId: this.itemInfo.mediaId,
+          byteDanceItemType: this.itemInfo.byteDanceItemType
+        }).then((res) => {
           this.itemJson = res.itemJson
             ? {
-                ...res.itemJson,
-                skuList: JSON.parse(res.itemJson.skuList),
-                itemDescUrls: JSON.parse(res.itemJson.itemDescUrls),
-                itemGalleryUrls: JSON.parse(res.itemJson.itemGalleryUrls),
-              }
+              ...res.itemJson,
+              skuList: JSON.parse(res.itemJson.skuList),
+              itemDescUrls: JSON.parse(res.itemJson.itemDescUrls),
+              itemGalleryUrls: JSON.parse(res.itemJson.itemGalleryUrls),
+            }
             : null;
 
           this.judgeStatus = res.judgeStatus;
@@ -382,6 +393,8 @@ export default {
           sampleCount: this.itemInfo.sampleCount,
           noPostArea: this.itemInfo.noPostArea,
           partnerRecommendText: this.itemInfo.partnerRecommendText,
+          ownershipId: this.itemInfo.dataOwnership,
+          userName: this.$store.getters.name,
         };
       } else if (this.judgeStatus == 2) {
         var params = {
@@ -394,6 +407,8 @@ export default {
           postArea: this.itemJson.postArea,
           deliveryRate: this.itemJson.deliveryRate,
           commissionRate: this.itemJson.commissionRate,
+          ownershipId: this.itemInfo.dataOwnership,
+          userName: this.$store.getters.name,
           itemGalleryUrls: this.itemJson.itemGalleryUrls
             ? JSON.stringify(this.itemJson.itemGalleryUrls)
             : null,
@@ -444,25 +459,31 @@ export default {
 <style lang="scss" scoped>
 .entire-line {
   width: 100%;
+
   ::v-deep .el-form-item__content {
     width: 60%;
   }
 }
+
 ::v-deep .el-form-item__label {
   white-space: nowrap;
 }
+
 ::v-deep a {
   color: #409eff;
   display: block;
   text-align: left;
 }
+
 .item-name-calss p {
   margin: 0;
   text-align: left;
 }
+
 .tableBox {
   width: 100%;
 }
+
 ::v-deep .el-tabs__content {
   overflow: initial;
 }
@@ -474,8 +495,10 @@ export default {
 .swiper {
   width: 100%;
   margin-top: 20px;
-  & >>> .swiper-container {
+
+  & > > > .swiper-container {
     width: 100%;
+
     .swiper-slide {
       width: 100%;
       padding-bottom: 28.1%;
@@ -504,26 +527,31 @@ export default {
       }
     }
   }
+
   .swiper-pagination-fraction,
   .swiper-pagination-custom,
   .swiper-container-horizontal > .swiper-pagination-bullets {
     display: none;
   }
 }
+
 ::v-deep a {
   color: #409eff;
   display: block;
   text-align: left;
   line-height: 30px;
 }
+
 .item-name-calss p {
   margin: 0;
   text-align: left;
   line-height: 30px;
 }
+
 .tableBox {
   width: 100%;
 }
+
 .prefix {
   display: inline-block;
   width: 3px;
@@ -533,12 +561,15 @@ export default {
   top: 2px;
   margin-right: 5px;
 }
+
 .dh p {
   font-size: 14px;
 }
+
 .dh-data p {
   font-size: 16px;
 }
+
 .main-box {
   width: 100%;
   display: flex;

Diff do ficheiro suprimidas por serem muito extensas
+ 838 - 775
src/views/goodsManagement/goodslist.vue


+ 0 - 13
src/views/goodsManagement/samplingList.vue

@@ -1207,19 +1207,6 @@
       uploadCvImageVue,
     },
     data() {
-      const equalToPassword = (rule, value, callback) => {
-        if (!!value && !this.edit) {
-          checkItem({itemId: value}).then((res) => {
-            if (res.message == "true") {
-              callback();
-            } else {
-              callback(new Error(res.message));
-            }
-          });
-        } else {
-          callback();
-        }
-      };
       return {
         editUserIdVisible: false,
         userList: [],

+ 185 - 68
src/views/promoter/promoterList.vue

@@ -12,7 +12,7 @@
         <el-select
           filterable
           v-model="queryParams.mediaId"
-          placeholder="择媒体"
+          placeholder="择媒体"
           clearable
           style="width: 240px"
         >
@@ -79,6 +79,24 @@
         </el-input>
       </el-form-item>
 
+      <el-form-item label="地址筛选" prop="searchPhone">
+        <el-select
+          filterable
+          v-model="queryParams.searchPhone"
+          placeholder="筛选地址"
+          clearable
+          style="width: 240px"
+        >
+          <el-option
+            v-for="item in queryParamsList.searchList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
         >搜索
@@ -155,37 +173,35 @@
       </el-table-column>
 
       <el-table-column
-        label="结算规则名称"
+        label="查看"
         align="center"
         prop="ruleName"
         width="150"
       >
         <template slot-scope="scope">
-          <div v-if="!!scope.row.ruleName">
-            <el-button size="mini" type="text" @click="lookDetail(scope.row)"
-            >{{ scope.row.ruleName }}
-            </el-button>
+          <div>
             <el-button
+              v-if="!!scope.row.imageUrl"
               size="mini"
               type="text"
               @click="
-                    ruleEditVisible = true;
-                    formRuleEdit = { ruleId: scope.row.ruleId };
-                    ids = scope.row.promoterId;
+                    lookImageVisible = true;
+                    lookImage = scope.row.imageUrl;
                   "
-            >编辑
+
+            >查看截图
             </el-button>
-          </div>
-          <div v-else>
+
             <el-button
               size="mini"
               type="text"
-              @click="
-                    ruleEditVisible = true;
-                    formRuleEdit = { ruleId: undefined };
-                    ids = scope.row.promoterId;
-                  "
-            >绑定规则
+              icon="el-icon-edit"
+              @click="handleAddbroadcast(scope.row)"
+              :disabled="
+              $store.getters.roles[0] == 'courtship' ||
+              $store.getters.roles[0] == 'courtshipManager'
+            "
+            >修改地址
             </el-button>
           </div>
         </template>
@@ -362,9 +378,8 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            :disabled="
-              $store.getters.roles[0] == 'bdManager' ? false : userId != scope.row.userId
-            "
+            v-if="$store.getters.roles[0] == 'bdManager' || $store.getters.roles[0] == 'admin' || $store.getters.roles[0] == 'supplyChainAdmin' || userId == scope.row.userId"
+
           >删除
           </el-button>
           <el-button
@@ -462,47 +477,68 @@
             >
             </el-input>
           </el-form-item>
-          <el-form-item
-            label="收货人"
-            prop="consignee"
-            style="width: 100%"
-            class="entire-line"
-          >
-            <el-input
-              placeholder="请输入收货人"
-              style="width: 240px"
-              v-model="formBroadcast.consignee"
+
+          <el-tabs v-model="tabName" @tab-click="handleClick">
+            <el-tab-pane label="用户信息" name="1"></el-tab-pane>
+            <el-tab-pane label="上传截图" name="2"></el-tab-pane>
+          </el-tabs>
+
+          <div v-if="tabName == '1'">
+            <el-form-item
+              label="收货人"
+              prop="consignee"
+              style="width: 100%"
+              class="entire-line"
             >
-            </el-input>
-          </el-form-item>
-          <el-form-item
-            label="联系方式"
-            prop="phone"
-            style="width: 100%"
-            class="entire-line"
-          >
-            <el-input
-              placeholder="请输入联系方式"
-              style="width: 240px"
-              v-model="formBroadcast.phone"
+              <el-input
+                placeholder="请输入收货人"
+                style="width: 240px"
+                v-model="formBroadcast.consignee"
+              >
+              </el-input>
+            </el-form-item>
+            <el-form-item
+              label="联系方式"
+              prop="phone"
+              style="width: 100%"
+              class="entire-line"
             >
-            </el-input>
-          </el-form-item>
-          <el-form-item
-            label="发货地址"
-            prop="promoterAddress"
-            style="width: 100%"
-            class="entire-line"
-          >
-            <el-input
-              placeholder="请输入发货地址"
+              <el-input
+                placeholder="请输入联系方式"
+                style="width: 240px"
+                v-model="formBroadcast.phone"
+              >
+              </el-input>
+            </el-form-item>
+            <el-form-item
+              label="发货地址"
+              prop="promoterAddress"
               style="width: 100%"
-              type="textarea"
-              :rows="2"
-              v-model="formBroadcast.promoterAddress"
+              class="entire-line"
             >
-            </el-input>
-          </el-form-item>
+              <el-input
+                placeholder="请输入发货地址"
+                style="width: 100%"
+                type="textarea"
+                :rows="2"
+                v-model="formBroadcast.promoterAddress"
+              >
+              </el-input>
+            </el-form-item>
+          </div>
+
+
+          <div v-if="tabName == '2'">
+            <el-form-item
+              label="上传截图"
+              prop="promoterAddress"
+              style="width: 100%"
+              class="entire-line"
+            >
+              <uploadCvImageVue ref="fileUpload" :multiple="true"/>
+            </el-form-item>
+
+          </div>
         </div>
         <div v-else>
           <el-form-item label="达人名称" prop="promoterNickName" style="width: 100%">
@@ -768,6 +804,34 @@
         </el-button>
       </div>
     </el-dialog>
+
+    <el-dialog
+      title="查看截图"
+      :visible.sync="lookImageVisible"
+      width="800px"
+      append-to-body
+      :close-on-click-modal="false"
+      @before-close="
+        lookImageVisible = false;
+        lookImage = undefined;
+      "
+    >
+      <div v-if="!!lookImage" style="display: flex; justify-content: flex-start; flex-flow:row wrap">
+        <div
+          v-for="(item, index) in lookImage.split(',')"
+          :key="index"
+          style="width: 200px; height: 200px; margin-right: 20px; margin-top: 20px"
+        >
+          <el-image
+            style="width: 100%; height: 100%"
+            :src="item"
+            :preview-src-list="lookImage.split(',')"
+          >
+          </el-image>
+        </div>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -786,15 +850,16 @@ import {
 import {addFollowUpRecords} from "@/api/label";
 import {join} from "path";
 import {getSupplyChainUserList} from "@/api/supplyChain/supplyChain";
+import uploadCvImageVue from "@/views/goodsManagement/uploadCvImage.vue";
 
 export default {
   name: "account-list",
-  components: {},
+  components: {uploadCvImageVue},
   data() {
     let validatePhone = (rule, value, callback) => {
-      /*console.log(rule);
-      console.log(value);
-      console.log(callback);*/
+      if (this.tabName == '2') {
+        callback();
+      }
       if (!value) {
         callback(new Error("联系方式不能为空!"));
       }
@@ -804,7 +869,34 @@ export default {
       }
       callback();
     };
+
+
+    let validatPromoterAddress = (rule, value, callback) => {
+      if (this.tabName == '2') {
+        callback();
+      }
+      if (!value) {
+        callback(new Error("收货地址不能为空!"));
+      }
+
+      callback();
+    };
+    let validateConsignee = (rule, value, callback) => {
+      if (this.tabName == '2') {
+        callback();
+      }
+      if (!value) {
+        callback(new Error("收货人不能为空!"));
+      }
+
+      callback();
+    };
+
+
     return {
+      lookImage: undefined,
+      lookImageVisible: false,
+      tabName: '1',
       openChangeBind: false,
       personList: [],
       ruleInfo: [],
@@ -872,6 +964,12 @@ export default {
           {value: 2, label: "快手"},
           {value: 1, label: "抖音"},
         ],
+
+        searchList: [
+          {value: 1, label: "已填地址"},
+          {value: 2, label: "未填地址"},
+        ],
+
       },
       // 表单参数
       form: {},
@@ -886,7 +984,6 @@ export default {
       //销售线索上传loading
       confirmLoading: false,
       // 表单校验
-      rules: {},
       rulesBroadcast: {
         promoterId: {
           required: true,
@@ -895,19 +992,19 @@ export default {
         },
         consignee: {
           required: true,
-          message: "收货人必填",
+          validator: validateConsignee,
           trigger: "blur",
         },
         phone: {
           required: true,
-          // message: "联系方式必填",
           validator: validatePhone,
           trigger: "blur",
         },
         promoterAddress: [
           {
             required: true,
-            message: "发货地址必填",
+            //    message: "发货地址必填",
+            validator: validatPromoterAddress,
             trigger: "blur",
           },
           {
@@ -943,7 +1040,18 @@ export default {
 
   },
   methods: {
+    handleClick(tab, event) {
+      if (this.tabName == '1') {
+        this.$refs.fileUpload.fileList = [];
+      }
+      if (this.tabName == '2') {
+        this.formBroadcast.consignee = undefined;
+        this.formBroadcast.promoterAddress = undefined;
+        this.formBroadcast.phone = undefined;
+      }
 
+      console.log(tab, event);
+    },
     submitBindFormBroadcast: function () {
       this.$refs["bindFormBroadcast"].validate((valid) => {
         if (valid) {
@@ -1088,6 +1196,7 @@ export default {
       this.edit = false;
       this.ids = null;
       this.confirmLoading = false;
+      this.tabName = '1';
       this.formBroadcast = {};
       setTimeout(() => {
         this.$refs.formBroadcast.clearValidate();
@@ -1183,10 +1292,14 @@ export default {
         if (valid) {
           this.confirmLoading = true;
           let formData = {
-
             ...this.formBroadcast,
           };
-
+          formData.tabName = this.tabName;
+          if (this.tabName == '2') {
+            formData.imageUrl = this.$refs.fileUpload.fileList.map((item) => {
+              return item.url;
+            }).join()
+          }
           if (!this.ids) {
             formData.userId = this.userId
             formData.userName = this.$store.getters.name
@@ -1199,9 +1312,13 @@ export default {
                 this.ids = null;
                 this.cancel();
                 this.handleQuery();
+                this.$refs.fileUpload.fileList = [];
+                this.tabName = '1';
               })
               .catch((err) => {
                 this.confirmLoading = false;
+                this.tabName = '1';
+                this.$refs.fileUpload.fileList = [];
               });
           } else {
             formData.id = this.ids;

+ 246 - 2
src/views/staging.vue

@@ -239,7 +239,7 @@
       </el-row>
     </el-card>
 
-    <el-card shadow="never" class="card-show" v-loading="echartsLoading">
+    <el-card shadow="never" class="card-show" v-loading="echartsLoading" style="height: 450px">
       <div slot="header" class="clearfix">
         <span style="display: inline-block; line-height: 2">数据分析</span>
         <el-select
@@ -261,7 +261,7 @@
         <div
           id="echart"
           ref="echart"
-          style="height: 400px; width: 65%; margin-top: 50px"
+          style="height: 300px; width: 65%; margin-top: 50px"
         ></div>
         <div style="height: 400px; width: 30%; margin-top: 50px" v-if="!!analysis">
           <div class="flex-class top-sum">
@@ -315,6 +315,31 @@
         </div>
       </div>
     </el-card>
+
+
+    <el-row class="top-sum" :gutter="24" style="margin-top: 24px">
+      <el-col :span="24">
+        <el-card
+          shadow="never"
+          class="card-show"
+          style="width: 100%; min-height: 300px"
+          v-loading="hourEchartsLoading"
+        >
+          <div slot="header" class="clearfix">
+              <span style="font-size: 16px; font-weight: bold; float: left"
+              >分时数据</span
+              >
+          </div>
+          <div
+            id="hourEchart"
+            ref="hourEchart"
+            style="height: 280px; width: 100%;"
+          ></div>
+        </el-card>
+      </el-col>
+    </el-row>
+
+
     <el-row class="top-sum" :gutter="24" style="margin-top: 24px">
       <el-col :span="12">
         <el-card shadow="never" class="card-show" style="width: 100%; min-height: 700px">
@@ -466,6 +491,7 @@ import {
   getOrderData,
   getDataAnalysis,
   getMediaId,
+  getGmvHour,
 } from "@/api/index";
 
 var echarts = require("echarts");
@@ -473,6 +499,7 @@ export default {
   name: "sale-html",
   data() {
     return {
+      hourEchartsLoading: false,
       mediaId: 2,
       echartsType: "orderAmount",
       // 遮罩层
@@ -642,6 +669,29 @@ export default {
     this.uploadDate = [`${y}-${MM}-${dd}`, `${y}-${MM}-${dd}`];
   },
   methods: {
+    getGmvHour() {
+      this.hourEchartsLoading = true
+      getGmvHour(
+        this.addDateRange({
+            userId: this.userId, mediaId: this.mediaId, type: this.type
+          },
+          this.uploadDate,
+          "statDate",
+          "endDate"
+        )
+      ).then((res) => {
+        if (res.success) {
+          this.chartList = res.result.today
+          this.initEchart(
+            'hourEchart',
+            this.hourEchartOption(res.result.today, res.result.yesterday, [], [])
+          )
+        }
+        this.hourEchartsLoading = false
+      });
+    },
+
+
     toDataBigScreen() {
       const a = document.createElement("a");
       document.body.appendChild(a);
@@ -660,6 +710,7 @@ export default {
         this.getInfomation();
         this.getOrderData();
         this.getDataAnalysis();
+        this.getGmvHour();
       });
     },
     getTimeState() {
@@ -708,6 +759,7 @@ export default {
         this.getIndexPromoterRank();
         this.getIndexOrderRank();
         this.getDataAnalysis();
+        this.getGmvHour();
       } else {
         this.$message.error("请选择时间");
       }
@@ -734,6 +786,7 @@ export default {
         this.getIndexPromoterRank();
         this.getIndexOrderRank();
         this.getDataAnalysis();
+        this.getGmvHour();
       } else {
         this.$message.error("请选择时间");
       }
@@ -921,6 +974,7 @@ export default {
               if (
                 this.echartsType == "orderAmount" ||
                 this.echartsType == "regimentalPromotionAmount"
+                || this.echartsType == "validOrderAmount"
               ) {
                 return (item[this.echartsType] / 100).toFixed(2);
               } else {
@@ -1087,6 +1141,196 @@ export default {
       }
       return num;
     },
+
+    hourEchartOption(todayList, yesterdayList, timeData, lengthData) {
+      var that = this
+      if (!!yesterdayList) {
+        let option = {
+          tooltip: {
+            trigger: 'axis',
+            formatter: function (params) {
+              if (todayList[0].time == 0) {
+                if (params.length > 1) {
+                  return `${params[0].marker}今天${params[0].name}时: ${params[0].value}<br/>
+                            ${params[1].marker}昨天${params[1].name}时: ${params[1].value}`
+                } else {
+                  return `${params[0].marker}昨天${params[0].name}时: ${params[0].value}`
+                }
+              } else {
+                return `${params[0].marker}${params[0].name}: ${params[0].value}<br/>
+                            ${params[1].marker}${params[1].name}: ${params[1].value}`
+              }
+            },
+          },
+          grid: {
+            left: '3%',
+            right: '4%',
+            bottom: '3%',
+            containLabel: true,
+          },
+          xAxis: [
+            {
+              id: 0,
+              type: 'category',
+              boundaryGap: false,
+              data:
+                todayList.length == yesterdayList.length
+                  ? todayList.map((item) => {
+                    return item.time
+                  })
+                  : yesterdayList.map((item) => {
+                    return item.time
+                  }),
+              position: 'bottom',
+            },
+            {
+              id: 1,
+              type: 'category',
+              boundaryGap: false,
+              data: yesterdayList.map((item) => {
+                return item.time
+              }),
+              axisPointer: {
+                type: 'none',
+              },
+              position: 'bottom',
+              offset: 30,
+            },
+          ],
+
+          yAxis: {
+            type: 'value',
+          },
+          series: [
+            {
+              name: '今天',
+              type: 'line',
+              smooth: true,
+              symbol: 'circle',
+              xAxisIndex: 0,
+              data:
+                this.mediaDimension === 'a'
+                  ? todayList.map((item) => {
+                    return item.cost
+                  })
+                  : todayList.map((item) => {
+                    return item.charge
+                  }),
+
+              lineStyle: {
+                color: '#00BFFF',
+                width: 2,
+              },
+              itemStyle: {
+                color: '#00BFFF',
+                borderWidth: 2,
+                borderColor: '#00BFFF',
+              },
+              id: 0,
+            },
+            {
+              id: 1,
+              name: '昨天',
+              type: 'line',
+              smooth: true,
+              symbol: 'circle',
+              xAxisIndex: 1,
+              data:
+                this.mediaDimension === 'a'
+                  ? yesterdayList.map((item) => {
+                    return item.cost
+                  })
+                  : yesterdayList.map((item) => {
+                    return item.charge
+                  }),
+
+              lineStyle: {
+                color: '#00FF7F',
+                width: 2,
+              },
+              itemStyle: {
+                color: '#00FF7F',
+                borderWidth: 2,
+                borderColor: '#00FF00',
+              },
+            },
+          ],
+        }
+        return option
+      } else {
+        let optionTwo = {
+          tooltip: {
+            trigger: 'axis',
+            formatter: function (params) {
+              // console.log(params)
+              if (
+                that.dataType == 3 &&
+                moment(that.dateValue[0]).format('YYYY-MM-DD') ==
+                moment(that.dateValue[1]).format('YYYY-MM-DD')
+              ) {
+                return `${params[0].marker}${params[0].name}时: ${params[0].value}`
+              } else {
+                return `${params[0].marker}${params[0].name}: ${params[0].value}`
+              }
+            },
+          },
+          grid: {
+            left: '3%',
+            right: '4%',
+            bottom: '3%',
+            containLabel: true,
+          },
+          xAxis: [
+            {
+              id: 0,
+              type: 'category',
+              boundaryGap: false,
+              data: todayList.map((item) => {
+                return item.time
+              }),
+              position: 'bottom',
+            },
+          ],
+
+          yAxis: {
+            type: 'value',
+          },
+          series: [
+            {
+              name: '今天',
+              type: 'line',
+              smooth: true,
+              symbol: 'circle',
+              xAxisIndex: 0,
+              data:
+                this.dataType == 0
+                  ? this.mediaDimension === 'a'
+                    ? todayList.map((item) => {
+                      return item.cost
+                    })
+                    : todayList.map((item) => {
+                      return item.charge
+                    })
+                  : todayList.map((item) => {
+                    return item.count
+                  }),
+              lineStyle: {
+                color: '#00BFFF',
+                width: 2,
+              },
+              itemStyle: {
+                color: '#00BFFF',
+                borderWidth: 2,
+                borderColor: '#00BFFF',
+              },
+              id: 0,
+            },
+          ],
+        }
+        return optionTwo
+      }
+    },
+
   },
 };
 </script>

+ 30 - 12
src/views/supplyChain/channelDetailsV2.vue

@@ -3,6 +3,7 @@
   color: #409eff;
   display: block;
 }
+
 p {
   text-align: left;
   margin: 0;
@@ -52,7 +53,8 @@ p {
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
-          >搜索</el-button
+        >搜索
+        </el-button
         >
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <el-button
@@ -62,7 +64,8 @@ p {
           size="mini"
           @click="handleExport"
           :loading="downLoadLoading"
-          >导出</el-button
+        >导出
+        </el-button
         >
       </el-form-item>
     </el-form>
@@ -108,6 +111,18 @@ p {
           </div>
         </template>
       </el-table-column>
+      <el-table-column label="达人标签" align="center" prop="itemTitle" width="220">
+        <template slot-scope="scope">
+          <div  v-if="scope.row.promoterName != '总计'">
+            <el-tag  size="mini" v-for="tag in scope.row.tags">{{tag.tag}} {{tag.proportion}}</el-tag>
+          </div>
+          <div v-else>
+            -
+          </div>
+        </template>
+      </el-table-column>
+
+
       <el-table-column label="领样数" align="center" prop="sampleCount" sortable="custom">
       </el-table-column>
       <el-table-column label="订单数" align="center" prop="orderNum" sortable="custom">
@@ -193,6 +208,7 @@ import {
   getUserItemDetail,
   getBdTotalV2,
 } from "@/api/supplyChain/supplyChain";
+
 var echarts = require("echarts");
 export default {
   name: "ClaimOk",
@@ -282,7 +298,8 @@ export default {
     }
   },
   mounted() {
-    this.$nextTick(() => {});
+    this.$nextTick(() => {
+    });
   },
   methods: {
     /** 导出按钮操作 */
@@ -296,8 +313,8 @@ export default {
             collectSampleId: !!this.$route.query.id
               ? this.$route.query.id
               : this.$store.getters.remark == "管理员"
-              ? null
-              : this.$store.getters.userId,
+                ? null
+                : this.$store.getters.userId,
           },
           this.uploadDate,
           "orderStartDate",
@@ -318,7 +335,7 @@ export default {
         this.downLoadLoading = false;
       });
     },
-    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+    arraySpanMethod({row, column, rowIndex, columnIndex}) {
       if (rowIndex === 0) {
         if (columnIndex === 0) {
           return [1, 1];
@@ -333,8 +350,8 @@ export default {
             collectSampleId: !!this.$route.query.id
               ? this.$route.query.id
               : this.$store.getters.remark == "管理员"
-              ? null
-              : this.$store.getters.userId,
+                ? null
+                : this.$store.getters.userId,
           },
           this.uploadDate,
           "orderStartDate",
@@ -355,7 +372,8 @@ export default {
       this.sort = !!col.order ? (col.order == "descending" ? "desc" : "asc") : "desc";
       this.handleQuery();
     },
-    toDetail(id) {},
+    toDetail(id) {
+    },
     toIndexDetail(item) {
       this.$router.replace({
         path: "/supplyChain/kuaishou/indexDetails",
@@ -378,8 +396,8 @@ export default {
             collectSampleId: !!this.$route.query.id
               ? this.$route.query.id
               : this.$store.getters.remark == "管理员"
-              ? null
-              : this.$store.getters.userId,
+                ? null
+                : this.$store.getters.userId,
           },
           this.uploadDate,
           "orderStartDate",
@@ -393,7 +411,7 @@ export default {
     },
     getSummaries(param) {
       console.log(param);
-      const { columns, data } = param;
+      const {columns, data} = param;
       const sums = [];
       columns.forEach((column, index) => {
         if (index === 0) {

+ 292 - 261
src/views/supplyChain/goods.vue

@@ -1,22 +1,22 @@
 <style scoped lang="scss">
-  ::v-deep a {
-    color: #409eff;
-    display: block;
-  }
+::v-deep a {
+  color: #409eff;
+  display: block;
+}
 
-  .item-name-calss p {
-    margin: 0;
-    text-align: left;
-  }
+.item-name-calss p {
+  margin: 0;
+  text-align: left;
+}
 
-  .tableBox {
-    width: 100%;
-  }
+.tableBox {
+  width: 100%;
+}
 
-  ::v-deep .el-table {
+::v-deep .el-table {
 
-    height: calc(100vh - 280px);
-  }
+  height: calc(100vh - 280px);
+}
 </style>
 <template>
   <div class="app-container" style="height: 100%">
@@ -177,9 +177,9 @@
                 <p>
                   佣金率:
                   {{
-                  scope.row.itemCommissionRate
-                  ? scope.row.itemCommissionRate / 10 + "%"
-                  : "-"
+                    scope.row.itemCommissionRate
+                      ? scope.row.itemCommissionRate / 10 + "%"
+                      : "-"
                   }}
                 </p>
               </div>
@@ -188,6 +188,37 @@
         </el-table-column>
 
         <el-table-column
+          label="ccr"
+          align="center"
+          prop="ccrValue"
+          sortable="custom"
+        >
+          <template slot-scope="scope">
+            <font v-if="scope.row.ccrInt >= 1.5" color="red">
+              {{ scope.row.ccrValue }}
+            </font>
+            <font v-if="scope.row.ccrInt < 1.5">
+              {{ scope.row.ccrValue }}
+            </font>
+          </template>
+        </el-table-column>
+
+
+        <el-table-column
+          label="小店信息"
+          align="center"
+          width="120"
+        >
+          <template slot-scope="scope">
+            评分:{{ scope.row.shopScore }}<br/>
+            服务:{{ scope.row.mallServiceScore }}<br/>
+            质量:{{ scope.row.mallQualityScore }}<br/>
+            物流:{{ scope.row.mallLogisticsScore }}
+          </template>
+        </el-table-column>
+
+
+        <el-table-column
           label="订单数"
           align="center"
           prop="orderNum"
@@ -208,9 +239,9 @@
         >
           <template slot-scope="scope">
             {{
-            scope.row.validRadio
-            ? (scope.row.validRadio * 100).toFixed(2) + "%"
-            : "-"
+              scope.row.validRadio
+                ? (scope.row.validRadio * 100).toFixed(2) + "%"
+                : "-"
             }}
           </template>
         </el-table-column>
@@ -229,9 +260,9 @@
         >
           <template slot-scope="scope">
             {{
-            scope.row.shippingGreen
-            ? (scope.row.shippingGreen * 100).toFixed(2) + "%"
-            : "-"
+              scope.row.shippingGreen
+                ? (scope.row.shippingGreen * 100).toFixed(2) + "%"
+                : "-"
             }}
           </template>
         </el-table-column>
@@ -251,9 +282,9 @@
         >
           <template slot-scope="scope">
             {{
-            scope.row.deliveryRadio
-            ? (scope.row.deliveryRadio * 100).toFixed(2) + "%"
-            : "-"
+              scope.row.deliveryRadio
+                ? (scope.row.deliveryRadio * 100).toFixed(2) + "%"
+                : "-"
             }}
           </template>
         </el-table-column>
@@ -282,7 +313,7 @@
                 style="text-align: left; display: block"
               >
                 {{ item.promoterNickName }}(Id:{{ item.promoterId }};订单数量:{{
-                item.orderNum
+                  item.orderNum
                 }})
               </asamplingList>
               <a slot="reference">查看</a>
@@ -303,89 +334,236 @@
 </template>
 
 <script>
-  import {
-    listType,
-    getType,
-    delType,
-    addType,
-    updateType,
-    refreshCache,
-  } from "@/api/system/dict/type";
-  import {
-    getItemList,
-    downFilePost,
-    getTopPromoterByItemId,
-    getSupplyChainUserList,
-  } from "@/api/supplyChain/supplyChain";
+import {
+  listType,
+  getType,
+  delType,
+  addType,
+  updateType,
+  refreshCache,
+} from "@/api/system/dict/type";
+import {
+  getItemList,
+  downFilePost,
+  getTopPromoterByItemId,
+  getSupplyChainUserList,
+} from "@/api/supplyChain/supplyChain";
 
-  export default {
-    name: "Goods",
-    dicts: ["sys_normal_disable"],
-    data() {
-      return {
-        downLoadLoading: false,
-        dialogTableVisible: false,
-        logPage: {
-          pageNum: 1,
-          pageSize: 10,
-        },
-        logData: [],
-        logTotal: 0,
-        logLoading: false,
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 字典表格数据
-        typeList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        // 分配销售
-        openAllocation: false,
-        // 选择的销售id
-        saleId: undefined,
-        // 获取用户id
+export default {
+  name: "Goods",
+  dicts: ["sys_normal_disable"],
+  data() {
+    return {
+      downLoadLoading: false,
+      dialogTableVisible: false,
+      logPage: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      logData: [],
+      logTotal: 0,
+      logLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 字典表格数据
+      typeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 分配销售
+      openAllocation: false,
+      // 选择的销售id
+      saleId: undefined,
+      // 获取用户id
+      userId: undefined,
+      // 销售列表
+      saleList: [],
+      // 分配销售确定loading
+      confirmLoadingSale: false,
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
         userId: undefined,
-        // 销售列表
-        saleList: [],
-        // 分配销售确定loading
-        confirmLoadingSale: false,
-        // 日期范围
-        dateRange: [],
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          userId: undefined,
-          itemId: undefined,
-          itemTitle: undefined,
-          orderStartDate: undefined,
-          orderEndDate: undefined,
+        itemId: undefined,
+        itemTitle: undefined,
+        orderStartDate: undefined,
+        orderEndDate: undefined,
+      },
+      uploadDate: [new Date(), new Date()],
+      bindDate: [],
+      //查询参数所用下拉数据
+      queryParamsList: {
+        personList: [],
+      },
+      videoTag: [],
+      videoVisibleChange: undefined,
+      prop: "orderNum",
+      sort: "desc",
+    };
+  },
+  created() {
+    this.userId = this.$store.getters.userId;
+    let date = new Date();
+    let y = date.getFullYear();
+    let MM = date.getMonth() + 1;
+    MM = MM < 10 ? "0" + MM : MM;
+    let dd = date.getDate();
+    dd = dd < 10 ? "0" + dd : dd;
+    this.uploadDate = [`${y}-${MM}-${dd}`, `${y}-${MM}-${dd}`];
+    this.bindDate = [];
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.getPersonList();
+      this.getList();
+    });
+  },
+  methods: {
+    cleanBindDate() {
+      this.bindDate = [];
+    },
+    cleanUploadDate() {
+      this.uploadDate = [];
+    },
+    showTitle(visible) {
+      console.log(visible);
+      if (this.videoVisibleChange != visible.itemId) {
+        this.videoVisibleChange = visible.itemId;
+        this.videoTag = [];
+        getTopPromoterByItemId(
+          this.addDateRange(
+            {itemId: visible.itemId},
+            this.uploadDate,
+            "orderStartDate",
+            "orderEndDate"
+          )
+        ).then((res) => {
+          this.videoTag = res.rows;
+        });
+      } else {
+        return;
+      }
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.downLoadLoading = true;
+      if (!!this.bindDate) {
+        this.queryParams.bindStartDate = this.bindDate[0],
+          this.queryParams.bindEndDate = this.bindDate[1]
+      }
+      downFilePost(
+        "/isv/supply_chain/exportOrder",
+        this.addDateRange(
+          this.queryParams,
+          this.uploadDate,
+          "orderStartDate",
+          "orderEndDate"
+        )
+      ).then((res) => {
+        let blob = new Blob([res], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        let downloadElement = document.createElement("a");
+        let href = window.URL.createObjectURL(blob); //创建下载的链接
+        downloadElement.href = href;
+        downloadElement.download = `商品列表.xlsx`; //下载后文件名
+        document.body.appendChild(downloadElement);
+        downloadElement.click(); //点击下载
+        document.body.removeChild(downloadElement); //下载完成移除元素
+        window.URL.revokeObjectURL(href); //释放掉blob对象
+        this.downLoadLoading = false;
+      });
+    },
+    toDetail(item) {
+      this.$router.replace({
+        path: "/supplyChain/kuaishou/indexDetails",
+        query: {
+          id: item.promoterId,
+          name: item.promoterNickName,
+          orderStartDate: this.uploadDate[0],
+          orderEndDate: this.uploadDate[1],
         },
-        uploadDate: [new Date(), new Date()],
-        bindDate: [],
-        //查询参数所用下拉数据
-        queryParamsList: {
-          personList: [],
+      });
+    },
+    toIndexDetail(item) {
+      this.$router.replace({
+        path: "/supplyChain/kuaishou/goodsDetails",
+        query: {
+          id: item.itemId,
+          name: item.itemTitle,
+          orderStartDate: this.uploadDate[0],
+          orderEndDate: this.uploadDate[1],
         },
-        videoTag: [],
-        videoVisibleChange: undefined,
-        prop: "orderNum",
-        sort: "desc",
-      };
+      });
+    },
+    sortChange(col, prop, order) {
+      this.prop = col.prop;
+      this.sort = !!col.order
+        ? col.order == "descending"
+          ? "desc"
+          : "asc"
+        : "desc";
+      this.handleQuery();
+    },
+    getPersonList() {
+      getSupplyChainUserList().then((response) => {
+        this.queryParamsList.personList = response.rows;
+      });
+    },
+    /** 查询字典类型列表 */
+    getList() {
+      this.loading = true;
+      if (!!this.bindDate) {
+        this.queryParams.bindStartDate = this.bindDate[0],
+          this.queryParams.bindEndDate = this.bindDate[1]
+      }
+      getItemList(
+        this.addDateRange(
+          {...this.queryParams, fieId: this.prop, sort: this.sort},
+          this.uploadDate,
+          "orderStartDate",
+          "orderEndDate"
+        )
+      ).then((response) => {
+        this.typeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.confirmLoading = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {};
+      this.dateFile = null;
+      this.resetForm("form");
     },
-    created() {
-      this.userId = this.$store.getters.userId;
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
       let date = new Date();
       let y = date.getFullYear();
       let MM = date.getMonth() + 1;
@@ -394,163 +572,16 @@
       dd = dd < 10 ? "0" + dd : dd;
       this.uploadDate = [`${y}-${MM}-${dd}`, `${y}-${MM}-${dd}`];
       this.bindDate = [];
+      this.resetForm("queryForm");
+      this.queryParams.pageNum = 1;
+      this.handleQuery();
     },
-    mounted() {
-      this.$nextTick(() => {
-        this.getPersonList();
-        this.getList();
-      });
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
     },
-    methods: {
-      cleanBindDate() {
-        this.bindDate = [];
-      },
-      cleanUploadDate() {
-        this.uploadDate = [];
-      },
-      showTitle(visible) {
-        console.log(visible);
-        if (this.videoVisibleChange != visible.itemId) {
-          this.videoVisibleChange = visible.itemId;
-          this.videoTag = [];
-          getTopPromoterByItemId(
-            this.addDateRange(
-              {itemId: visible.itemId},
-              this.uploadDate,
-              "orderStartDate",
-              "orderEndDate"
-            )
-          ).then((res) => {
-            this.videoTag = res.rows;
-          });
-        } else {
-          return;
-        }
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        this.downLoadLoading = true;
-        if (!!this.bindDate) {
-             this.queryParams.bindStartDate = this.bindDate[0],
-            this.queryParams.bindEndDate = this.bindDate[1]
-        }
-        downFilePost(
-          "/isv/supply_chain/exportOrder",
-          this.addDateRange(
-            this.queryParams,
-            this.uploadDate,
-            "orderStartDate",
-            "orderEndDate"
-          )
-        ).then((res) => {
-          let blob = new Blob([res], {
-            type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-          });
-          let downloadElement = document.createElement("a");
-          let href = window.URL.createObjectURL(blob); //创建下载的链接
-          downloadElement.href = href;
-          downloadElement.download = `商品列表.xlsx`; //下载后文件名
-          document.body.appendChild(downloadElement);
-          downloadElement.click(); //点击下载
-          document.body.removeChild(downloadElement); //下载完成移除元素
-          window.URL.revokeObjectURL(href); //释放掉blob对象
-          this.downLoadLoading = false;
-        });
-      },
-      toDetail(item) {
-        this.$router.replace({
-          path: "/supplyChain/kuaishou/indexDetails",
-          query: {
-            id: item.promoterId,
-            name: item.promoterNickName,
-            orderStartDate: this.uploadDate[0],
-            orderEndDate: this.uploadDate[1],
-          },
-        });
-      },
-      toIndexDetail(item) {
-        this.$router.replace({
-          path: "/supplyChain/kuaishou/goodsDetails",
-          query: {
-            id: item.itemId,
-            name: item.itemTitle,
-            orderStartDate: this.uploadDate[0],
-            orderEndDate: this.uploadDate[1],
-          },
-        });
-      },
-      sortChange(col, prop, order) {
-        this.prop = col.prop;
-        this.sort = !!col.order
-          ? col.order == "descending"
-            ? "desc"
-            : "asc"
-          : "desc";
-        this.handleQuery();
-      },
-      getPersonList() {
-        getSupplyChainUserList().then((response) => {
-          this.queryParamsList.personList = response.rows;
-        });
-      },
-      /** 查询字典类型列表 */
-      getList() {
-        this.loading = true;
-        if (!!this.bindDate) {
-          this.queryParams.bindStartDate = this.bindDate[0],
-            this.queryParams.bindEndDate = this.bindDate[1]
-        }
-        getItemList(
-          this.addDateRange(
-            {...this.queryParams, fieId: this.prop, sort: this.sort},
-            this.uploadDate,
-            "orderStartDate",
-            "orderEndDate"
-          )
-        ).then((response) => {
-          this.typeList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.confirmLoading = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {};
-        this.dateFile = null;
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.dateRange = [];
-        let date = new Date();
-        let y = date.getFullYear();
-        let MM = date.getMonth() + 1;
-        MM = MM < 10 ? "0" + MM : MM;
-        let dd = date.getDate();
-        dd = dd < 10 ? "0" + dd : dd;
-        this.uploadDate = [`${y}-${MM}-${dd}`, `${y}-${MM}-${dd}`];
-        this.bindDate = [];
-        this.resetForm("queryForm");
-        this.queryParams.pageNum = 1;
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map((item) => item.id);
-      },
-    }
-    ,
   }
-  ;
+  ,
+}
+;
 </script>

+ 367 - 425
src/views/supplyChain/investmentDetails.vue

@@ -1,13 +1,13 @@
 <style scoped lang="scss">
-  ::v-deep a {
-    color: #409eff;
-    display: block;
-  }
+::v-deep a {
+  color: #409eff;
+  display: block;
+}
 
-  p {
-    text-align: left;
-    margin: 0;
-  }
+p {
+  text-align: left;
+  margin: 0;
+}
 </style>
 <template>
   <div class="app-container">
@@ -69,74 +69,6 @@
         >
       </el-form-item>
     </el-form>
-    <!-- <el-table
-      v-loading="loadingTotal"
-      :data="itemSummary"
-      style="margin-bottom: 25px"
-      stripe
-    >
-      <el-table-column label="订单数" align="center" prop="orderNum">
-      </el-table-column>
-      <el-table-column label="有效订单数" align="center" prop="validOrderNUm" />
-      <el-table-column label="有效率" align="center" prop="validRadio">
-        <template slot-scope="scope">
-          {{
-            scope.row.validRadio
-              ? (scope.row.validRadio * 100).toFixed(2) + "%"
-              : "-"
-          }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="失效订单数"
-        align="center"
-        prop="invalidOrderNUm"
-      />
-      <el-table-column label="发货数" align="center" prop="deliveryNum">
-      </el-table-column>
-      <el-table-column label="发货率" align="center" prop="deliveryRadio">
-        <template slot-scope="scope">
-          {{
-            scope.row.deliveryRadio
-              ? (scope.row.deliveryRadio * 100).toFixed(2) + "%"
-              : "-"
-          }}
-        </template>
-      </el-table-column>
-      <el-table-column label="未发货数" align="center" prop="notDeliveryNum">
-      </el-table-column>
-      <el-table-column label="实付金额" align="center" prop="payAmount">
-        <template slot-scope="scope">
-          {{ (scope.row.payAmount / 100).toFixed(2) }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="预估服务费收入"
-        align="center"
-        prop="regimentalPromotionAmount"
-      >
-        <template slot-scope="scope">
-          {{
-            scope.row.regimentalPromotionAmount
-              ? (scope.row.regimentalPromotionAmount / 100).toFixed(2)
-              : "-"
-          }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="结算服务费收入"
-        align="center"
-        prop="totalRegimentalSettleAmount"
-      >
-        <template slot-scope="scope">
-          {{
-            scope.row.totalRegimentalSettleAmount
-              ? (scope.row.totalRegimentalSettleAmount / 100).toFixed(2)
-              : "-"
-          }}
-        </template>
-      </el-table-column>
-    </el-table> -->
     <el-table
       v-loading="loading"
       :data="typeList"
@@ -170,9 +102,9 @@
               <p>
                 佣金率:
                 {{
-                scope.row.itemCommissionRate
-                ? scope.row.itemCommissionRate / 10 + "%"
-                : "-"
+                  scope.row.itemCommissionRate
+                    ? scope.row.itemCommissionRate / 10 + "%"
+                    : "-"
                 }}
               </p>
             </div>
@@ -180,6 +112,16 @@
         </template>
       </el-table-column>
       <el-table-column label="认领人" align="center" prop="userName"></el-table-column>
+      <el-table-column label="ccr" align="center" prop="ccrValue">
+        <template slot-scope="scope">
+          <font v-if="scope.row.ccrInt >= 1.5" color="red">
+            {{ scope.row.ccrValue }}
+          </font>
+          <font v-if="scope.row.ccrInt < 1.5">
+            {{ scope.row.ccrValue }}
+          </font>
+        </template>
+      </el-table-column>
       <el-table-column label="商品单价" align="center" prop="reservePrice">
         <template slot-scope="scope">
           <p
@@ -226,9 +168,9 @@
       >
         <template slot-scope="scope">
           {{
-          scope.row.shippingGreen
-          ? (scope.row.shippingGreen * 100).toFixed(2) + "%"
-          : "-"
+            scope.row.shippingGreen
+              ? (scope.row.shippingGreen * 100).toFixed(2) + "%"
+              : "-"
           }}
         </template>
       </el-table-column>
@@ -250,9 +192,9 @@
       >
         <template slot-scope="scope">
           {{
-          scope.row.deliveryRadio
-          ? (scope.row.deliveryRadio * 100).toFixed(2) + "%"
-          : "-"
+            scope.row.deliveryRadio
+              ? (scope.row.deliveryRadio * 100).toFixed(2) + "%"
+              : "-"
           }}
         </template>
       </el-table-column>
@@ -267,9 +209,9 @@
       <el-table-column label="服务费率" align="center" prop="regimentalPromotionRate">
         <template slot-scope="scope">
           {{
-          !!scope.row.regimentalPromotionRate
-          ? scope.row.regimentalPromotionRate / 10 + "%"
-          : "-"
+            !!scope.row.regimentalPromotionRate
+              ? scope.row.regimentalPromotionRate / 10 + "%"
+              : "-"
           }}
         </template>
       </el-table-column>
@@ -285,9 +227,9 @@
       >
         <template slot-scope="scope">
           {{
-          scope.row.regimentalPromotionAmount
-          ? allMoney(scope.row.regimentalPromotionAmount / 100)
-          : "-"
+            scope.row.regimentalPromotionAmount
+              ? allMoney(scope.row.regimentalPromotionAmount / 100)
+              : "-"
           }}
         </template>
       </el-table-column>
@@ -298,9 +240,9 @@
       >
         <template slot-scope="scope">
           {{
-          scope.row.totalRegimentalSettleAmount
-          ? allMoney(scope.row.totalRegimentalSettleAmount / 100)
-          : "-"
+            scope.row.totalRegimentalSettleAmount
+              ? allMoney(scope.row.totalRegimentalSettleAmount / 100)
+              : "-"
           }}
         </template>
       </el-table-column>
@@ -317,86 +259,332 @@
 </template>
 
 <script>
-  import {
-    listType,
-    getType,
-    delType,
-    addType,
-    updateType,
-    refreshCache,
-  } from "@/api/system/dict/type";
-  import {
-    getOrderList,
-    getItemDetail,
-    downFilePost,
-    getUserItemDetail,
-    getUserItemTotal,
-  } from "@/api/supplyChain/supplyChain";
+import {
+  listType,
+  getType,
+  delType,
+  addType,
+  updateType,
+  refreshCache,
+} from "@/api/system/dict/type";
+import {
+  getOrderList,
+  getItemDetail,
+  downFilePost,
+  getUserItemDetail,
+  getUserItemTotal,
+} from "@/api/supplyChain/supplyChain";
 
-  var echarts = require("echarts");
-  export default {
-    name: "ClaimOk",
-    dicts: ["sys_normal_disable"],
-    data() {
-      return {
-        downLoadLoading: false,
-        dialogTableVisible: false,
-        logPage: {
-          pageNum: 1,
-          pageSize: 10,
-        },
-        logData: [],
-        logTotal: 0,
-        logLoading: false,
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 字典表格数据
-        typeList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        // 分配销售
-        openAllocation: false,
-        // 选择的销售id
-        saleId: undefined,
-        // 获取用户id
-        userId: undefined,
-        // 销售列表
-        saleList: [],
-        // 分配销售确定loading
-        confirmLoadingSale: false,
-        // 日期范围
-        dateRange: [],
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          itemId: undefined,
-          itemTitle: undefined,
-          orderStartDate: undefined,
-          orderEndDate: undefined,
+var echarts = require("echarts");
+export default {
+  name: "ClaimOk",
+  dicts: ["sys_normal_disable"],
+  data() {
+    return {
+      downLoadLoading: false,
+      dialogTableVisible: false,
+      logPage: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      logData: [],
+      logTotal: 0,
+      logLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 字典表格数据
+      typeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 分配销售
+      openAllocation: false,
+      // 选择的销售id
+      saleId: undefined,
+      // 获取用户id
+      userId: undefined,
+      // 销售列表
+      saleList: [],
+      // 分配销售确定loading
+      confirmLoadingSale: false,
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        itemId: undefined,
+        itemTitle: undefined,
+        orderStartDate: undefined,
+        orderEndDate: undefined,
+      },
+      uploadDate: [new Date(), new Date()],
+      //查询参数所用下拉数据
+      queryParamsList: {},
+      prop: "orderNum",
+      sort: "desc",
+      itemSummary: [],
+      loadingTotal: false,
+    };
+  },
+  created() {
+    if (
+      this.$route &&
+      this.$route.query.id &&
+      this.$route.query.orderStartDate &&
+      this.$route.query.orderEndDate
+    ) {
+      this.uploadDate = [
+        this.$route.query.orderStartDate,
+        this.$route.query.orderEndDate,
+      ];
+      this.getUserItemTotal();
+      this.getUserItemDetail();
+    } else {
+      let date = new Date();
+      let y = date.getFullYear();
+      let MM = date.getMonth() + 1;
+      MM = MM < 10 ? "0" + MM : MM;
+      let dd = date.getDate();
+      dd = dd < 10 ? "0" + dd : dd;
+      this.uploadDate = [`${y}-${MM}-${dd}`, `${y}-${MM}-${dd}`];
+      this.getUserItemTotal();
+      this.getUserItemDetail();
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+    });
+  },
+  methods: {
+    /** 导出按钮操作 */
+    handleExport() {
+      this.downLoadLoading = true;
+      downFilePost(
+        "/isv/supply_chain/exportUserItemDetail",
+        this.addDateRange(
+          {
+            ...this.queryParams,
+            userId: !!this.$route.query.id
+              ? this.$route.query.id
+              : this.$store.getters.roles[0] == "admin" ||
+              this.$store.getters.roles[0] == "supplyChainAdmin"
+                ? null
+                : this.$store.getters.userId,
+          },
+          this.uploadDate,
+          "orderStartDate",
+          "orderEndDate"
+        )
+      ).then((res) => {
+        let blob = new Blob([res], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        let downloadElement = document.createElement("a");
+        let href = window.URL.createObjectURL(blob); //创建下载的链接
+        downloadElement.href = href;
+        downloadElement.download = `认领列表_${this.uploadDate[0]}-${this.uploadDate[1]}.xlsx`; //下载后文件名
+        document.body.appendChild(downloadElement);
+        downloadElement.click(); //点击下载
+        document.body.removeChild(downloadElement); //下载完成移除元素
+        window.URL.revokeObjectURL(href); //释放掉blob对象
+        this.downLoadLoading = false;
+      });
+    },
+    arraySpanMethod({row, column, rowIndex, columnIndex}) {
+      if (rowIndex === 0) {
+        if (columnIndex === 0) {
+          return [0, 0];
+        } else if (columnIndex === 1) {
+          return [0, 0];
+        } else if (columnIndex === 2) {
+          return [1, 3];
+        }
+      }
+    },
+    getUserItemTotal() {
+      this.loadingTotal = true;
+      getUserItemTotal(
+        this.addDateRange(
+          {
+            userId: !!this.$route.query.id
+              ? this.$route.query.id
+              : this.$store.getters.roles[0] == "admin" ||
+              this.$store.getters.roles[0] == "supplyChainAdmin"
+                ? null
+                : this.$store.getters.userId,
+          },
+          this.uploadDate,
+          "orderStartDate",
+          "orderEndDate"
+        )
+      ).then((res) => {
+        this.loadingTotal = false;
+        this.itemSummary = [res].map((item) => {
+          return {
+            ...item,
+            itemTitle: "总计",
+            userName: "总计",
+            reservePrice: "总计",
+          };
+        });
+      });
+    },
+    sortChange(col, prop, order) {
+      this.prop = col.prop;
+      this.sort = !!col.order ? (col.order == "descending" ? "desc" : "asc") : "desc";
+      this.handleQuery();
+    },
+    toDetail(id) {
+    },
+    toIndexDetail(item) {
+      this.$router.replace({
+        path: "/supplyChain/kuaishou/indexDetails",
+        query: {
+          id: item.promoterId,
+          name: item.promoterNickName,
+          orderStartDate: this.$route.query.orderStartDate,
+          orderEndDate: this.$route.query.orderEndDate,
         },
-        uploadDate: [new Date(), new Date()],
-        //查询参数所用下拉数据
-        queryParamsList: {},
-        prop: "orderNum",
-        sort: "desc",
-        itemSummary: [],
-        loadingTotal: false,
-      };
+      });
+    },
+    getUserItemDetail() {
+      this.loading = true;
+      getUserItemDetail(
+        this.addDateRange(
+          {
+            ...this.queryParams,
+            fieId: this.prop,
+            sort: this.sort,
+            userId: !!this.$route.query.id
+              ? this.$route.query.id
+              : this.$store.getters.roles[0] == "admin" ||
+              this.$store.getters.roles[0] == "supplyChainAdmin"
+                ? null
+                : this.$store.getters.userId,
+          },
+          this.uploadDate,
+          "orderStartDate",
+          "orderEndDate"
+        )
+      ).then((response) => {
+        this.typeList = this.itemSummary.concat(response.rows);
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    getSummaries(param) {
+      console.log(param);
+      const {columns, data} = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "总计";
+          return;
+        } else if (index == 1) {
+          sums[index] = "N/A";
+          return;
+        } else if (index == 9) {
+          sums[index] = "-";
+          return;
+        } else if (index == 2) {
+          sums[index] = "-";
+          return;
+        }
+
+        for (const key in this.itemSummary[0]) {
+          if (key == column.property) {
+            if (key == "validRadio" || key == "deliveryRadio") {
+              sums[index] = this.itemSummary[0][key]
+                ? (this.itemSummary[0][key] * 100).toFixed(2) + "%"
+                : "-";
+            } else if (
+              key == "payAmount" ||
+              key == "regimentalPromotionAmount" ||
+              key == "totalRegimentalSettleAmount"
+            ) {
+              sums[index] = this.itemSummary[0][key]
+                ? this.itemSummary[0][key] / 100
+                : "-";
+            } else {
+              sums[index] = this.itemSummary[0][key];
+            }
+          }
+        }
+
+        // const values = data.map((item) => Number(item[column.property]));
+        // console.log(values)
+        // if (!values.every((value) => isNaN(value))) {
+        //   sums[index] = values.reduce((prev, curr) => {
+        //     const value = Number(curr);
+        //     if (!isNaN(value)) {
+        //       return prev + curr;
+        //     } else {
+        //       return prev;
+        //     }
+        //   }, 0);
+        //   // sums[index] += " 元";
+        // } else {
+        //   sums[index] = "N/A";
+        // }
+      });
+
+      return sums;
+    },
+    /** 查询字典类型列表 */
+    getList() {
+      this.loading = true;
+      getOrderList(
+        this.addDateRange(
+          this.queryParams,
+          this.uploadDate,
+          "orderStartDate",
+          "orderEndDate"
+        )
+      ).then((response) => {
+        this.typeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
     },
-    created() {
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.confirmLoading = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {};
+      this.dateFile = null;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getUserItemTotal();
+      this.getUserItemDetail();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      //   let date = new Date();
+      //   let y = date.getFullYear();
+      //   let MM = date.getMonth() + 1;
+      //   MM = MM < 10 ? "0" + MM : MM;
+      //   let dd = date.getDate();
+      //   dd = dd < 10 ? "0" + dd : dd;
       if (
         this.$route &&
         this.$route.query.id &&
@@ -407,7 +595,6 @@
           this.$route.query.orderStartDate,
           this.$route.query.orderEndDate,
         ];
-        this.getUserItemTotal();
         this.getUserItemDetail();
       } else {
         let date = new Date();
@@ -417,261 +604,16 @@
         let dd = date.getDate();
         dd = dd < 10 ? "0" + dd : dd;
         this.uploadDate = [`${y}-${MM}-${dd}`, `${y}-${MM}-${dd}`];
-        this.getUserItemTotal();
         this.getUserItemDetail();
       }
+      this.resetForm("queryForm");
+      this.queryParams.pageNum = 1;
+      this.handleQuery();
     },
-    mounted() {
-      this.$nextTick(() => {
-      });
-    },
-    methods: {
-      /** 导出按钮操作 */
-      handleExport() {
-        this.downLoadLoading = true;
-        downFilePost(
-          "/isv/supply_chain/exportUserItemDetail",
-          this.addDateRange(
-            {
-              ...this.queryParams,
-              userId: !!this.$route.query.id
-                ? this.$route.query.id
-                : this.$store.getters.roles[0] == "admin" ||
-                this.$store.getters.roles[0] == "supplyChainAdmin"
-                  ? null
-                  : this.$store.getters.userId,
-            },
-            this.uploadDate,
-            "orderStartDate",
-            "orderEndDate"
-          )
-        ).then((res) => {
-          let blob = new Blob([res], {
-            type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-          });
-          let downloadElement = document.createElement("a");
-          let href = window.URL.createObjectURL(blob); //创建下载的链接
-          downloadElement.href = href;
-          downloadElement.download = `认领列表_${this.uploadDate[0]}-${this.uploadDate[1]}.xlsx`; //下载后文件名
-          document.body.appendChild(downloadElement);
-          downloadElement.click(); //点击下载
-          document.body.removeChild(downloadElement); //下载完成移除元素
-          window.URL.revokeObjectURL(href); //释放掉blob对象
-          this.downLoadLoading = false;
-        });
-      },
-      arraySpanMethod({row, column, rowIndex, columnIndex}) {
-        if (rowIndex === 0) {
-          if (columnIndex === 0) {
-            return [0, 0];
-          } else if (columnIndex === 1) {
-            return [0, 0];
-          } else if (columnIndex === 2) {
-            return [1, 3];
-          }
-        }
-      },
-      getUserItemTotal() {
-        this.loadingTotal = true;
-        getUserItemTotal(
-          this.addDateRange(
-            {
-              userId: !!this.$route.query.id
-                ? this.$route.query.id
-                : this.$store.getters.roles[0] == "admin" ||
-                this.$store.getters.roles[0] == "supplyChainAdmin"
-                  ? null
-                  : this.$store.getters.userId,
-            },
-            this.uploadDate,
-            "orderStartDate",
-            "orderEndDate"
-          )
-        ).then((res) => {
-          this.loadingTotal = false;
-          this.itemSummary = [res].map((item) => {
-            return {
-              ...item,
-              itemTitle: "总计",
-              userName: "总计",
-              reservePrice: "总计",
-            };
-          });
-        });
-      },
-      sortChange(col, prop, order) {
-        this.prop = col.prop;
-        this.sort = !!col.order ? (col.order == "descending" ? "desc" : "asc") : "desc";
-        this.handleQuery();
-      },
-      toDetail(id) {
-      },
-      toIndexDetail(item) {
-        this.$router.replace({
-          path: "/supplyChain/kuaishou/indexDetails",
-          query: {
-            id: item.promoterId,
-            name: item.promoterNickName,
-            orderStartDate: this.$route.query.orderStartDate,
-            orderEndDate: this.$route.query.orderEndDate,
-          },
-        });
-      },
-      getUserItemDetail() {
-        this.loading = true;
-        getUserItemDetail(
-          this.addDateRange(
-            {
-              ...this.queryParams,
-              fieId: this.prop,
-              sort: this.sort,
-              userId: !!this.$route.query.id
-                ? this.$route.query.id
-                : this.$store.getters.roles[0] == "admin" ||
-                this.$store.getters.roles[0] == "supplyChainAdmin"
-                  ? null
-                  : this.$store.getters.userId,
-            },
-            this.uploadDate,
-            "orderStartDate",
-            "orderEndDate"
-          )
-        ).then((response) => {
-          this.typeList = this.itemSummary.concat(response.rows);
-          this.total = response.total;
-          this.loading = false;
-        });
-      },
-      getSummaries(param) {
-        console.log(param);
-        const {columns, data} = param;
-        const sums = [];
-        columns.forEach((column, index) => {
-          if (index === 0) {
-            sums[index] = "总计";
-            return;
-          } else if (index == 1) {
-            sums[index] = "N/A";
-            return;
-          } else if (index == 9) {
-            sums[index] = "-";
-            return;
-          } else if (index == 2) {
-            sums[index] = "-";
-            return;
-          }
-
-          for (const key in this.itemSummary[0]) {
-            if (key == column.property) {
-              if (key == "validRadio" || key == "deliveryRadio") {
-                sums[index] = this.itemSummary[0][key]
-                  ? (this.itemSummary[0][key] * 100).toFixed(2) + "%"
-                  : "-";
-              } else if (
-                key == "payAmount" ||
-                key == "regimentalPromotionAmount" ||
-                key == "totalRegimentalSettleAmount"
-              ) {
-                sums[index] = this.itemSummary[0][key]
-                  ? this.itemSummary[0][key] / 100
-                  : "-";
-              } else {
-                sums[index] = this.itemSummary[0][key];
-              }
-            }
-          }
-
-          // const values = data.map((item) => Number(item[column.property]));
-          // console.log(values)
-          // if (!values.every((value) => isNaN(value))) {
-          //   sums[index] = values.reduce((prev, curr) => {
-          //     const value = Number(curr);
-          //     if (!isNaN(value)) {
-          //       return prev + curr;
-          //     } else {
-          //       return prev;
-          //     }
-          //   }, 0);
-          //   // sums[index] += " 元";
-          // } else {
-          //   sums[index] = "N/A";
-          // }
-        });
-
-        return sums;
-      },
-      /** 查询字典类型列表 */
-      getList() {
-        this.loading = true;
-        getOrderList(
-          this.addDateRange(
-            this.queryParams,
-            this.uploadDate,
-            "orderStartDate",
-            "orderEndDate"
-          )
-        ).then((response) => {
-          this.typeList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.confirmLoading = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {};
-        this.dateFile = null;
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getUserItemTotal();
-        this.getUserItemDetail();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.dateRange = [];
-        //   let date = new Date();
-        //   let y = date.getFullYear();
-        //   let MM = date.getMonth() + 1;
-        //   MM = MM < 10 ? "0" + MM : MM;
-        //   let dd = date.getDate();
-        //   dd = dd < 10 ? "0" + dd : dd;
-        if (
-          this.$route &&
-          this.$route.query.id &&
-          this.$route.query.orderStartDate &&
-          this.$route.query.orderEndDate
-        ) {
-          this.uploadDate = [
-            this.$route.query.orderStartDate,
-            this.$route.query.orderEndDate,
-          ];
-          this.getUserItemDetail();
-        } else {
-          let date = new Date();
-          let y = date.getFullYear();
-          let MM = date.getMonth() + 1;
-          MM = MM < 10 ? "0" + MM : MM;
-          let dd = date.getDate();
-          dd = dd < 10 ? "0" + dd : dd;
-          this.uploadDate = [`${y}-${MM}-${dd}`, `${y}-${MM}-${dd}`];
-          this.getUserItemDetail();
-        }
-        this.resetForm("queryForm");
-        this.queryParams.pageNum = 1;
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map((item) => item.id);
-      },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
     },
-  };
+  },
+};
 </script>