更新

src/api/order.js

@@ -15,6 +15,12 @@ import request from './request'
 export function orderListApi (data) {
   return request.get('store/order/lst', data)
 }
+/**
+ * @description 赊账订单 -- 列表
+ */
+export function orderOtherListApi (data) {
+  return request.get('store/order/other/lst', data)
+}
 
 /**
  * @description 订单 -- 表头
@@ -22,6 +28,12 @@ export function orderListApi (data) {
 export function chartApi () {
   return request.get('store/order/chart')
 }
+/**
+ * @description 其他订单 -- 表头
+ */
+export function otherChartApi () {
+  return request.get('store/order/other/chart')
+}
 /**
  * @description 订单 -- 卡片
  */
@@ -46,6 +58,12 @@ export function orderDeliveryApi (id, data) {
 export function orderDetailApi (id) {
   return request.get(`store/order/detail/${id}`)
 }
+/**
+ * @description 其他订单 -- 详情
+ */
+export function otherOrderDetailApi (id) {
+  return request.get(`store/order/other/detail/${id}`)
+}
 /**
  * @description 订单 -- 子订单
  */
@@ -58,6 +76,12 @@ export function getChildrenOrderApi (id) {
 export function orderLogApi (id, data) {
   return request.get(`store/order/log/${id}`, data)
 }
+/**
+ * @description 其他订单 -- 记录
+ */
+export function otherOrderLogApi (id, data) {
+  return request.get(`store/order/other/log/${id}`, data)
+}
 /**
  * @description 订单 -- 备注from
  */
@@ -172,6 +196,12 @@ export function goCancellationApi (id, data) {
 export function orderHeadListApi () {
   return request.get(`store/order/filtter`)
 }
+/**
+ * @description 其他订单 -- 头部
+ */
+export function otherOrderHeadListApi () {
+  return request.get(`store/order/other/filtter`)
+}
 /**
  * @description 核销订单 -- 表头
  */
@@ -287,6 +317,12 @@ export function getStoreLst () {
 export function getLogisticsCode (id) {
   return request.get(`store/order/logistics_code/${id}`)
 }
+/**
+ * @description 其他发送货 -- 取件码
+ */
+export function otherGetLogisticsCode (id) {
+  return request.get(`store/order/other/logistics_code/${id}`)
+}
 
 /**
  * @description 发送货 -- 门店列表

src/api/product.js

@@ -75,6 +75,12 @@ export function templateLsitApi () {
 export function productLstApi (data) {
   return request.get(`store/product/lst`, data)
 }
+/**
+ * @description 导入商品列表 -- 列表
+ */
+export function xlsxProductLstApi (data) {
+  return request.get(`store/product/xlsx_import_list`, data)
+}
 /**
  * @description 商品列表 -- 删除
  */

src/router/modules/order.js

@@ -52,6 +52,14 @@ const orderRouter =
         title: '核销订单'
       },
       component: () => import('@/views/order/orderCancellate/index')
+    },
+    {
+      path: 'creditList',
+      name: 'OrderCreditList',
+      meta: {
+        title: '赊账订单'
+      },
+      component: () => import('@/views/order/index_credit')
     }
   ]
 }

src/router/modules/product.js

@@ -92,6 +92,15 @@ const productRouter =
         },
         component: () => import('@/views/product/specs/create.vue')
       },
+      {
+        path: 'importList',
+        name: `importList`,
+        meta: {
+          title: '商品导入记录',
+          noCache: true
+        },
+        component: () => import('@/views/product/productImport')
+      },
     ]
   }
 

src/views/order/index.vue

@@ -209,7 +209,7 @@
                 @click="orderCancellation('')"
                 >订单核销</el-button
               >
-              <el-upload
+              <!-- <el-upload
                 style="display: inline-block"
                 class="upload-demo"
                 :headers="myHeaders"
@@ -222,7 +222,7 @@
               <el-button @click="getDeliveryList">批量发货记录</el-button>
               <el-button @click="downloadLogistics"
                 >下载物流公司对照表</el-button
-              >
+              > -->
               <!-- <el-button size="small" type="primary" @click="batchSend">批量发rr送货</el-button> -->
             </el-form-item>
           </el-form>
@@ -427,7 +427,7 @@
             </p>
           </template>
         </el-table-column>
-        <el-table-column label="订单佣金" min-width="100">
+        <!-- <el-table-column label="订单佣金" min-width="100">
           <template slot-scope="scope">
             <span>{{
               (
@@ -451,7 +451,7 @@
               }})</em
             >
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="支付类型" min-width="80">
           <template slot-scope="scope">
             <span v-if="scope.row.paid === 1">{{
@@ -705,12 +705,12 @@
         </el-form-item>
         <el-form-item label="选择类型：" prop="delivery_type">
           <el-radio-group v-model="shipment.delivery_type" @change="changeSend">
-            <el-radio :label="6">扫码发货</el-radio>
             <!-- <el-radio v-if="!isBatch && tableFrom.order_type != 2 && orderType != 1" :label="1">手动发货</el-radio>
             <el-radio :label="3" class="radio"> {{orderType == 1 ? '虚拟发货' : '无需物流'}}</el-radio>
-            <el-radio v-if="isDump==1 && tableFrom.order_type != 2 && orderType !=1" :label="4" class="radio">电子面单打印</el-radio>
+            <el-radio v-if="isDump==1 && tableFrom.order_type != 2 && orderType !=1" :label="4" class="radio">电子面单打印</el-radio> -->
-            <el-radio v-if="tableFrom.order_type != 2 && orderType !=1" :label="2">自己配送</el-radio>
+            <el-radio v-if="$store.state.user.merchantType.type_code!='TypeSupplyChain'" :label="6">扫码发货</el-radio>
-            <el-radio v-if="tableFrom.order_type != 2 && orderType !=1 && !isBatch" :label="5">同城配送</el-radio> -->
+            <el-radio v-else-if="tableFrom.order_type != 2 && orderType !=1" :label="2">自己配送</el-radio>
+            <!-- <el-radio v-if="tableFrom.order_type != 2 && orderType !=1 && !isBatch" :label="5">同城配送</el-radio> -->
           </el-radio-group>
         </el-form-item>
         <el-form-item
@@ -1313,12 +1313,12 @@ export default {
     },
     // 是否开启电子面单
     isOpenDump () {
-      serveInfoApi().then((res) => {
+      // serveInfoApi().then((res) => {
-        this.isDump = res.data.crmeb_serve_dump
+      //   this.isDump = res.data.crmeb_serve_dump
-        if (res.data.crmeb_serve_dump == 1) this.getEleTempData()
+      //   if (res.data.crmeb_serve_dump == 1) this.getEleTempData()
-      }).catch((res) => {
+      // }).catch((res) => {
-        this.$message.error(res.message)
+      //   this.$message.error(res.message)
-      })
+      // })
     },
     // 获取快递公司列表
     getExpressLst () {
@@ -1786,7 +1786,8 @@ export default {
       this.productNum = row.orderProduct && row.orderProduct[0] && row.orderProduct[0]['product_num'] || 0
       delete this.shipment.order_id
       if (this.tableFrom.order_type == 2) this.shipment.delivery_type = 3
-      this.shipment.delivery_type = 6
+      if(this.$store.state.user.merchantType.type_code=='TypeSupplyChain')this.shipment.delivery_type = 2;
+      else this.shipment.delivery_type = 6;
     },
     sendReset () {
       this.shipment = {

src/views/order/otherOrderDetails.vue

@@ -0,0 +1,805 @@
+<template>
+  <div>
+    <el-drawer
+      :with-header="false"
+      :visible.sync="drawer"
+      size="1000px"
+      :direction="direction"
+      :before-close="handleClose"
+    >
+      <div v-loading="loading">
+        <div class="head">
+          <div class="full">
+            <img class="order_icon" :src="orderImg" alt="" />
+            <div class="text">
+              <div class="title">{{ orderDetailList.order_type == 0 ? '赊账订单' : '核销订单' }}</div>
+              <div>
+                <span class="mr20">订单编号：{{ orderDetailList.order_sn }}</span>
+              </div>
+            </div>
+            <div>
+              <el-button
+                v-if="orderDetailList.order_type != 0 && orderDetailList.status == 0"
+                type="primary"
+                size="small"
+                @click="orderCancellation"
+                >订单核销</el-button
+              >
+              <el-button
+                 v-if="(orderDetailList.order_type == 0 || orderDetailList.order_type == 2) && orderDetailList.status === 0 && orderDetailList.paid === 1"
+                type="primary"
+                size="small"
+                @click="send"
+                >发送货</el-button
+              >
+              <el-button
+                v-if="orderDetailList.order_type == 0 && orderDetailList.paid == 1"
+                type="success"
+                size="small"
+                @click="printOrder"
+                >小票打印</el-button
+              >
+
+              <el-dropdown @command="handleCommand">
+                <el-button icon="el-icon-more" size="small"></el-button>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="mark">订单备注</el-dropdown-item>
+                  <el-dropdown-item v-if="orderDetailList.order_type == 0 && orderDetailList.status === 1 && orderDetailList.paid === 1" command="modify">修改发货信息</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+          </div>
+          <ul class="list">
+            <li class="item">
+              <div class="title">订单状态</div>
+              <div>
+                <div v-if="orderDetailList.order_type === 0 && !orderDetailList.pay_time" class="value1">待付款</div>
+                <div v-if="orderDetailList.order_type === 0 && orderDetailList.pay_time" class="value1">
+                  <span>{{ orderDetailList.status | orderStatusFilter }}</span>
+                </div>
+                <div v-if="orderDetailList.order_type === 1 && orderDetailList.pay_time" class="value1">
+                  <span>{{ orderDetailList.status | cancelOrderStatusFilter }}</span>
+                </div>
+              </div>
+            </li>
+            <li class="item">
+              <div class="title">实际支付</div>
+              <div>¥ {{ orderDetailList.pay_price }}</div>
+            </li>
+            <li class="item">
+              <div class="title">支付方式</div>
+              <div>{{ orderDetailList.pay_type | payTypeFilter }}</div>
+            </li>
+            <li class="item">
+              <div class="title">创建时间</div>
+              <div>{{ orderDetailList.create_time }}</div>
+            </li>
+          </ul>
+        </div>
+        <el-tabs type="border-card" v-model="activeName" @tab-click="tabClick">
+          <el-tab-pane label="订单信息" name="detail">
+            <div v-if="orderDetailList.user" class="section">
+              <div class="title">用户信息</div>
+              <ul class="list">
+                <li class="item">
+                  <div>用户昵称：</div>
+                  <div class="value">
+                    {{
+                      orderDetailList.user.real_name ? orderDetailList.user.real_name : orderDetailList.user.nickname
+                    }}
+                  </div>
+                </li>
+                <li class="item">
+                  <div>用户ID：</div>
+                  <div class="value">{{ orderDetailList.user.uid ? orderDetailList.user.uid : '-' }}</div>
+                </li>
+                <li class="item">
+                  <div>绑定电话：</div>
+                  <div class="value">{{ orderDetailList.user.phone ? orderDetailList.user.phone : '-' }}</div>
+                </li>
+              </ul>
+            </div>
+            <div class="section">
+              <div class="title">收货信息</div>
+              <ul class="list">
+                <li class="item">
+                  <div>收货人：</div>
+                  <div class="value">{{ orderDetailList.real_name ? orderDetailList.real_name : '-' }}</div>
+                </li>
+                <li class="item">
+                  <div>收货电话：</div>
+                  <div class="value">{{ orderDetailList.user_phone ? orderDetailList.user_phone : '-' }}</div>
+                </li>
+                <li class="item">
+                  <div>收货地址：</div>
+                  <div class="value">{{ orderDetailList.user_address ? orderDetailList.user_address : '-' }}</div>
+                </li>
+              </ul>
+            </div>
+            <div class="section" v-if="orderDetailList.order_extend">
+              <div class="title">自定义留言</div>
+              <ul class="list">
+                <li class="item" v-for="(item,i) in orderDetailList.order_extend" :key="i">
+                  <div>{{ i }}：</div>
+                  <template v-if="!Array.isArray(item)">
+                    <div class="value">{{ item }}</div>
+                  </template>
+                  <template v-else>
+                    <img v-for="(pic,idx) in item" :key="idx" :src="pic" style="width:40px;height:40px;margin-right:12px;"/>
+                  </template>
+                </li>
+              </ul>
+            </div>
+            <div class="section">
+              <div class="title">订单信息</div>
+              <ul class="list">
+                <li class="item">
+                  <div>创建时间：</div>
+                  <div class="value">{{ orderDetailList.create_time ? orderDetailList.create_time : '-' }}</div>
+                </li>
+                <li class="item">
+                  <div>商品总数：</div>
+                  <div class="value">{{ orderDetailList.total_num ? orderDetailList.total_num : '-' }}</div>
+                </li>
+                <li class="item">
+                  <div>实际支付：</div>
+                  <div></div>
+                  <!-- <div class="value">{{ orderDetailList.finalOrder ? (parseFloat(orderDetailList.finalOrder.pay_price) + parseFloat(orderDetailList.pay_price)) : orderDetailList.pay_price }}</div> -->
+                </li>
+                 <li class="item">
+                  <div>优惠券金额：</div>
+                  <div class="value">{{ orderDetailList.coupon_price ? orderDetailList.coupon_price : '-' }}</div>
+                </li>
+                 <li v-if="orderDetailList.integral" class="item">
+                  <div>积分抵扣：</div>
+                  <div v-if="orderDetailList.integral && orderDetailList.integral != 0" class="value">使用了{{ orderDetailList.integral }}个积分，抵扣了{{ orderDetailList.integral_price }}元</div>
+                </li>
+                <li class="item">
+                  <div>订单总价：</div>
+                  <div class="value">{{ orderDetailList.total_price ? orderDetailList.total_price : '-' }}</div>
+                </li>
+                <!-- <li class="item" v-if="orderDetailList.svip_discount">
+                  <div>会员商品优惠：</div>
+                  <div class="value">{{ orderDetailList.svip_discount }}</div>
+                </li> -->
+                <li class="item">
+                  <div>支付运费：</div>
+                  <div class="value">{{ orderDetailList.pay_postage }}</div>
+                </li>
+                <li v-if="orderDetailList.TopSpread" class="item">
+                  <div>推广人：</div>
+                  <div class="value">{{ orderDetailList.TopSpread.nickname }}</div>
+                </li>
+                <li v-if="!orderDetailList.activity_type" class="item">
+                  <div>一级佣金：</div>
+                  <div class="value">
+                    {{ parseFloat(orderDetailList.extension_one) + parseFloat(orderDetailList.refund_extension_one) }}
+                    <em v-if="orderDetailList.refund_extension_one > 0" style="color: red;font-style: normal;">(-{{ orderDetailList.refund_extension_one }})</em>
+                  </div>
+                </li>
+                <li v-if="!orderDetailList.activity_type" class="item">
+                  <div>二级佣金：</div>
+                  <div class="value">
+                    {{ parseFloat(orderDetailList.extension_two) + parseFloat(orderDetailList.refund_extension_two) }}
+                    <em v-if="orderDetailList.refund_extension_two > 0" style="color: red;font-style: normal;">(-{{ orderDetailList.refund_extension_two }})</em>
+                  </div>
+                </li>
+              </ul>
+            </div>
+            <div class="section" v-if="orderDetailList.mark">
+              <div class="title">买家留言</div>
+              <ul class="list">
+                <li class="item">
+                  <div>{{ orderDetailList.mark ? orderDetailList.mark : '-' }}</div>
+                </li>
+              </ul>
+            </div>
+            <div class="section" v-if="orderDetailList.remark">
+              <div class="title">商家备注</div>
+              <ul class="list">
+                <li class="item">
+                  <div>{{ orderDetailList.remark ? orderDetailList.remark : '-' }}</div>
+                </li>
+              </ul>
+            </div>
+            <div class="section" v-if="orderDetailList.delivery_type === '1'">
+              <div class="title">物流信息</div>
+              <ul class="list">
+                <li class="item">
+                  <div>快递公司：</div>
+                  <div class="value">{{ orderDetailList.delivery_name ? orderDetailList.delivery_name : '-' }}</div>
+                </li>
+                <li class="item">
+                  <div>快递单号：</div>
+                  <div class="value">{{ orderDetailList.delivery_id ? orderDetailList.delivery_id : '-' }}</div>
+                  <el-button type="primary" size="mini" style="margin-left: 5px" @click="openLogistics">物流查询</el-button>
+                </li>
+              </ul>
+            </div>
+
+          </el-tab-pane>
+          <el-tab-pane label="商品信息" name="goods">
+            <el-table :data="orderDetailList.orderProduct">
+              <el-table-column label="商品信息" min-width="300">
+                <template slot-scope="scope">
+                  <div class="tab">
+                    <div class="demo-image__preview">
+                      <el-image
+                        :src="scope.row.cart_info.product.image"
+                        :preview-src-list="[scope.row.cart_info.product.image]"
+                      />
+                    </div>
+                    <div>
+                      <div class="line1">{{ scope.row.cart_info.product.store_name }}</div>
+                      <div class="line1 gary">
+                        规格：{{
+                          scope.row.cart_info.productAttr.sku ? scope.row.cart_info.productAttr.sku : '默认'
+                        }}
+                      </div>
+                    </div>
+                  </div>
+                </template>
+              </el-table-column>
+
+              <el-table-column label="售价" min-width="90">
+                <template slot-scope="scope">
+                  <div class="tab">
+                    <div class="line1">
+                      {{ scope.row.cart_info.productAttr.price ? scope.row.cart_info.productAttr.price : '-' }}
+                    </div>
+                  </div>
+                </template>
+              </el-table-column>
+               <el-table-column label="实付金额"  min-width="90">
+                <template slot-scope="scope">
+                  <div class="tab">
+                    <div class="line1">
+                      {{ scope.row.product_price ? scope.row.product_price : '-' }}
+                    </div>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column label="购买数量" min-width="90">
+                <template slot-scope="scope">
+                  <div class="tab">
+                    <div class="line1">
+                      {{ scope.row.product_num }}
+                    </div>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+
+          <el-tab-pane label="订单记录" name="orderList">
+            <div>
+              <el-form size="small" label-width="80px">
+                <div class="acea-row">
+                  <el-form-item label="操作端：">
+                    <el-select
+                      v-model="tableFromLog.user_type"
+                      placeholder="请选择"
+                      style="width: 140px; margin-right: 20px"
+                      clearable
+                      filterable
+                      @change="onOrderLog(orderId)"
+                    >
+                      <el-option label="系统" value="0" />
+                      <el-option label="用户" value="1" />
+                      <el-option label="平台" value="2" />
+                      <el-option label="商户" value="3" />
+                      <el-option label="商家客服" value="4" />
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item label="操作时间：">
+                    <el-date-picker
+                      style="width: 380px; margin-right: 20px"
+                      v-model="timeVal"
+                      type="datetimerange"
+                      placeholder="选择日期"
+                      value-format="yyyy/MM/dd HH:mm:ss"
+                      clearable
+                      @change="onchangeTime"
+                    >
+                    </el-date-picker>
+                  </el-form-item>
+                  <!-- <div>
+                    <el-button type="primary" size="small" @click="onOrderLog(orderId)">查询</el-button>
+                  </div> -->
+                </div>
+              </el-form>
+            </div>
+            <el-table :data="tableDataLog.data">
+              <el-table-column prop="order_id" label="订单编号" min-width="200">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.order_sn }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作记录" min-width="200">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.change_message }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作角色" min-width="150">
+                <template slot-scope="scope">
+                  <div class="tab">
+                    <div>{{ operationType(scope.row.user_type) }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作人" min-width="150">
+                <template slot-scope="scope">
+                  <div class="tab">
+                    <div>{{ scope.row.nickname }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作时间" min-width="150">
+                <template slot-scope="scope">
+                  <div class="tab">
+                    <div class="line1">{{ scope.row.change_time }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div class="block">
+              <el-pagination :page-sizes="[20, 40, 60, 80]" :page-size="tableFromLog.limit" :current-page="tableFromLog.page" layout="total, sizes, prev, pager, next, jumper" :total="tableDataLog.total" @size-change="handleSizeChangeLog" @current-change="pageChangeLog" />
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="childOrder.length>0" label="关联订单" name="subOrder">
+            <el-table :data="childOrder">
+             <el-table-column label="订单编号" prop="order_sn" min-width="150">
+               <template slot-scope="scope">
+                  <div>{{ scope.row.order_sn }}</div>
+                </template>
+              </el-table-column>
+              <el-table-column label="商品信息" min-width="200">
+                <template slot-scope="scope">
+                  <div
+                    v-for="(val, i) in scope.row.orderProduct"
+                    :key="i"
+                    class="tabBox acea-row row-middle"
+                  >
+                    <div class="demo-image__preview">
+                      <el-image
+                        :src="val.cart_info.product.image"
+                        :preview-src-list="[val.cart_info.product.image]"
+                      />
+                    </div>
+                    <span
+                      class="tabBox_tit"
+                    >{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }}</span>
+                    <span class="tabBox_pice">
+                      {{ '￥'+ val.cart_info.productAttr.price + ' x '+ val.product_num }}
+                      <em
+                        v-if="val.refund_num < val.product_num && val.refund_num  > 0"
+                        style="color: red;font-style: normal;"
+                      >(-{{ val.product_num - val.refund_num }})</em>
+                    </span>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column label="实际支付" min-width="80" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.pay_price }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="订单生成时间" prop="create_time" min-width="120" />
+              <el-table-column label="操作" min-width="50" fixed="right" align="center">
+                <template slot-scope="scope">
+                  <el-button type="text" size="small" @click="getChildOrderDetail(scope.row.order_id)">详情</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </el-drawer>
+    <el-dialog
+      title="物流查询"
+      :visible.sync="dialogLogistics"
+      width="350px"
+      v-if="dialogLogistics"
+    >
+      <div class="logistics acea-row row-top">
+        <div class="logistics_img"><img src="@/assets/images/expressi.jpg"></div>
+        <div class="logistics_cent">
+          <span>物流公司：{{ orderDetailList.delivery_name }}</span>
+          <span>物流单号：{{ orderDetailList.delivery_id }}</span>
+        </div>
+      </div>
+      <div class="acea-row row-column-around trees-coadd">
+        <div class="scollhide">
+          <el-timeline>
+            <el-timeline-item v-for="(item,i) in result" :key="i">
+              <p class="time" v-text="item.time" />
+              <p class="content" v-text="item.status" />
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </div>
+    </el-dialog>
+    <!--订单核销-->
+    <order-cancellate ref="orderCancellate" @getList="getList" />
+  </div>
+</template>
+<script>
+import {
+  getExpress,
+  orderDeliveryApi,
+  otherOrderDetailApi,
+  otherOrderLogApi,
+  orderPrintApi,
+  orderRemarkApi,
+  getChildrenOrderApi
+} from '@/api/order';
+import orderCancellate from './orderCancellate'
+export default {
+   components: {
+    orderCancellate
+  },
+  props: {
+    drawer: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      loading: true,
+      orderId: '',
+      direction: 'rtl',
+      activeName: 'detail',
+      goodsList: [],
+      timeVal: [],
+      orderConfirm: false,
+      sendGoods: false,
+      dialogLogistics: false,
+      confirmReceiptForm: {
+        id: '',
+      },
+      tableDataLog: {
+        data: [],
+        total: 0
+      },
+      contentList: [],
+      nicknameList: [],
+      result: [],
+      orderDetailList: {
+        user: {
+          real_name: '',
+        },
+        groupOrder: {
+          group_order_sn: '',
+        },
+      },
+      orderImg: require('@/assets/images/order_icon.png'),
+      tableFromLog: {
+        user_type: '',
+        date: [],
+        page: 1,
+        limit: 10
+      },
+      childOrder: []
+    };
+  },
+  filters: {
+  },
+  methods: {
+    // 具体日期
+    onchangeTime(e) {
+      this.timeVal = e
+      this.tableFromLog.date = e ? this.timeVal.join('-') : ''
+      this.onOrderLog(this.orderId)
+    },
+    handleClose() {
+      this.activeName = 'detail';
+      this.$emit('closeDrawer');
+      this.sendGoods = false;
+      this.orderRemark = false;
+    },
+    openLogistics() {
+      this.getOrderData()
+      this.dialogLogistics = true
+    },
+    // 订单核销
+    orderCancellation() {
+      const that = this
+      that.$refs.orderCancellate.dialogVisible = true;
+      that.$refs.orderCancellate.productDetails(that.orderDetailList.verify_code)
+      that.$refs.orderCancellate.isColum = true;
+    },
+    // 发送货
+    send(){
+      this.$emit('send',this.orderDetailList,this.orderId);
+    },
+    // 小票打印
+    printOrder() {
+      orderPrintApi(this.orderId)
+        .then((res) => {
+          this.$message.success(res.message)
+        })
+        .catch((res) => {
+          this.$message.error(res.message)
+        })
+    },
+     // 备注
+    onOrderMark() {
+      this.$modalForm(orderRemarkApi(this.orderId)).then(() => this.getInfo(this.orderId))
+    },
+     //下拉
+    handleCommand(command) {
+       if (command == 'mark') {
+        this.onOrderMark();
+      } else {
+        this.reSend(this.orderId);
+      }
+    },
+    // 修改发货信息
+    reSend(id){
+      this.$emit('reSend',id);
+    },
+    // 修改订单信息
+    getList() {
+      this.$emit('getList','');
+    },
+    // 获取子订单信息
+    getChildOrder() {
+      this.loading = true;
+      getChildrenOrderApi(this.orderId)
+        .then((res) => {
+          this.activeName = 'detail'
+          this.childOrder = res.data
+          setTimeout(()=>{
+            this.loading = false;
+          },500)
+        })
+        .catch((res) => {
+          this.$message.error(res.message)
+        })
+    },
+     // 获取订单物流信息
+    getOrderData() {
+      getExpress(this.orderId).then(async res => {
+        this.result = res.data
+      }).catch(res => {
+        this.$message.error(res.message)
+      })
+    },
+    //发送货
+    toSendGoods() {
+      this.sendGoods = true;
+    },
+    getDelivery() {
+      orderDeliveryApi(this.orderId)
+        .then((res) => {
+          this.$message.success(res.message);
+          this.sendGoods = false;
+        })
+        .catch((res) => {
+          this.$message.error(res.message);
+        });
+    },
+    getChildOrderDetail(id){
+      this.getInfo(id);
+    },
+    getInfo(id) {
+      this.loading = true;
+      this.orderId = id;
+      otherOrderDetailApi(id)
+        .then((res) => {
+          this.drawer = true;
+          this.orderDetailList = res.data;
+          this.getChildOrder()
+        })
+        .catch((res) => {
+          this.$message.error(res.message);
+        });
+    },
+    tabClick(tab) {
+      if (tab.name === 'orderList') {
+       this.onOrderLog(this.orderId)
+      }
+    },
+    onOrderLog(id){
+      otherOrderLogApi(id, this.tableFromLog).then((res) => {
+        this.tableDataLog.data = res.data.list
+        this.tableDataLog.total = res.data.count
+      });
+    },
+    pageChangeLog(page) {
+      this.tableFromLog.page = page
+      this.onOrderLog(this.orderId)
+    },
+    handleSizeChangeLog(val) {
+      this.tableFromLog.limit = val
+      this.onOrderLog(this.orderId)
+    },
+
+    operationType(type) {
+      if (type == 0) {
+        return '系统';
+      } else if (type == 1) {
+        return '用户';
+      } else if (type == 2) {
+        return '平台';
+      } else if (type == 3) {
+        return '商户';
+      } else if (type == 4) {
+        return '商家客服';
+      } else {
+        return '未知';
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.head {
+  padding: 30px 35px 25px;
+  .full {
+    display: flex;
+    align-items: center;
+    .order_icon {
+      width: 60px;
+      height: 60px;
+    }
+    .iconfont {
+      color: #1890ff;
+      &.sale-after {
+        color: #90add5;
+      }
+    }
+    .text {
+      align-self: center;
+      flex: 1;
+      min-width: 0;
+      padding-left: 12px;
+      font-size: 13px;
+      color: #606266;
+      .title {
+        margin-bottom: 10px;
+        font-weight: 500;
+        font-size: 16px;
+        line-height: 16px;
+        color: rgba(0, 0, 0, 0.85);
+      }
+      .order-num {
+        padding-top: 10px;
+        white-space: nowrap;
+      }
+    }
+  }
+  .list {
+    display: flex;
+    margin-top: 20px;
+    overflow: hidden;
+    list-style: none;
+    padding: 0;
+    .item {
+      flex: none;
+      width: 200px;
+      font-size: 14px;
+      line-height: 14px;
+      color: rgba(0, 0, 0, 0.85);
+      .title {
+        margin-bottom: 12px;
+        font-size: 13px;
+        line-height: 13px;
+        color: #666666;
+      }
+      .value1 {
+        color: #f56022;
+      }
+
+      .value2 {
+        color: #1bbe6b;
+      }
+
+      .value3 {
+        color: #1890ff;
+      }
+
+      .value4 {
+        color: #6a7b9d;
+      }
+
+      .value5 {
+        color: #f5222d;
+      }
+    }
+  }
+}
+.el-tabs--border-card {
+  box-shadow: none;
+  border-bottom: none;
+}
+.section {
+  padding: 20px 0 5px;
+  border-bottom: 1px dashed #eeeeee;
+  .title {
+    padding-left: 10px;
+    border-left: 3px solid #1890ff;
+    font-size: 15px;
+    line-height: 15px;
+    color: #303133;
+  }
+  .list {
+    display: flex;
+    flex-wrap: wrap;
+    list-style: none;
+    padding: 0;
+  }
+  .item {
+    flex: 0 0 calc(100% / 3);
+    display: flex;
+    margin-top: 16px;
+    font-size: 13px;
+    color: #606266;
+    &:nth-child(3n + 1) {
+      padding-right: 20px;
+    }
+
+    &:nth-child(3n + 2) {
+      padding-right: 10px;
+      padding-left: 10px;
+    }
+
+    &:nth-child(3n + 3) {
+      padding-left: 20px;
+    }
+  }
+  .value {
+    flex: 1;
+    image {
+      display: inline-block;
+      width: 40px;
+      height: 40px;
+      margin: 0 12px 12px 0;
+      vertical-align: middle;
+    }
+  }
+}
+.tab {
+  display: flex;
+  align-items: center;
+  .el-image {
+    width: 36px;
+    height: 36px;
+    margin-right: 10px;
+  }
+}
+/deep/.el-drawer__body {
+  overflow: auto;
+}
+.gary {
+  color: #aaa;
+}
+.logistics{
+  align-items: center;
+  padding: 10px 0px;
+  .logistics_img{
+    width: 45px;
+    height: 45px;
+    margin-right: 12px;
+    img{
+      width: 100%;
+      height: 100%;
+    }
+  }
+  .logistics_cent{
+    span{
+      display: block;
+      font-size: 12px;
+    }
+  }
+}
+.tabBox_tit {
+  width: 53%;
+  font-size: 12px !important;
+  margin: 0 2px 0 10px;
+  letter-spacing: 1px;
+  padding: 5px 0;
+  box-sizing: border-box;
+}
+</style>

src/views/product/productImport/index.vue

@@ -0,0 +1,771 @@
+<template>
+  <div class="divBox">
+    <el-card class="box-card">
+      <el-table
+        v-loading="listLoading"
+        :data="tableData.data"
+        style="width: 100%"
+        size="mini"
+        :row-class-name="tableRowClassName"
+        :row-key="
+          (row) => {
+            return row.product_id;
+          }
+        "
+        @selection-change="handleSelectionChange"
+        @rowclick.stop="closeEdit"
+      >
+        <el-table-column
+          type="selection"
+          :reserve-selection="true"
+          width="55"
+        />
+        <el-table-column type="expand">
+          <template slot-scope="props">
+            <el-form
+              label-position="left"
+              inline
+              class="demo-table-expand demo-table-expand1"
+            >
+              <el-form-item label="平台分类：">
+                <span>{{
+                  props.row.storeCategory
+                    ? props.row.storeCategory.cate_name
+                    : "-"
+                }}</span>
+              </el-form-item>
+              <el-form-item label="商品分类：">
+                <template v-if="props.row.merCateId.length">
+                  <span
+                    v-for="(item, index) in props.row.merCateId"
+                    :key="index"
+                    class="mr10"
+                    >{{ item.category.cate_name }}</span
+                  >
+                </template>
+                <span v-else>-</span>
+              </el-form-item>
+              <el-form-item label="品牌：">
+                <span class="mr10">{{
+                  props.row.brand ? props.row.brand.brand_name : "-"
+                }}</span>
+              </el-form-item>
+              <el-form-item label="市场价格：">
+                <span>{{ props.row.ot_price | filterEmpty }}</span>
+              </el-form-item>
+              <el-form-item label="成本价：">
+                <span>{{ props.row.cost | filterEmpty }}</span>
+              </el-form-item>
+              <el-form-item label="收藏：">
+                <span>{{ props.row.care_count | filterEmpty }}</span>
+              </el-form-item>
+              <el-form-item
+                v-if="tableFrom.type === '7'"
+                key="1"
+                label="未通过原因："
+              >
+                <span>{{ props.row.refusal }}</span>
+              </el-form-item>
+            </el-form>
+          </template>
+        </el-table-column>
+        <el-table-column prop="product_id" label="ID" min-width="50" />
+        <el-table-column label="商品图" min-width="80">
+          <template slot-scope="scope">
+            <div class="demo-image__preview">
+              <el-image
+                :src="scope.row.image"
+                :preview-src-list="[scope.row.image]"
+              />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="store_name" label="商品名称" min-width="200">
+          <template slot-scope="scope">
+            <div v-if="scope.row.attrValue && scope.row.attrValue.length > 1">
+              <span style="color: #fe8c51; font-size: 10px; margin-right: 4px"
+                >[多规格]</span
+              >{{ scope.row.store_name }}
+            </div>
+            <span v-else>{{ scope.row.store_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="price" label="商品售价" min-width="90" />
+        <el-table-column prop="price" label="批发价" min-width="90">
+          <template slot-scope="scope">
+            <span v-if="scope.row.attrValue[0]">
+              {{ scope.row.attrValue[0].procure_price || "-" }}</span
+            >
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column prop="svip_price" label="会员价" min-width="90">
+          <template slot-scope="scope">
+            <span>{{ scope.row.svip_price || "-" }}</span>
+          </template>
+        </el-table-column> -->
+        <el-table-column prop="sales" label="销量" min-width="90" />
+        <el-table-column prop="stock" label="库存" min-width="70" />
+        <!-- <el-table-column prop="integral_total" label="积分抵扣" min-width="70" />
+        <el-table-column prop="integral_price_total" label="积分抵扣金额" min-width="90" /> -->
+        <el-table-column prop="sort" align="center" label="排序" min-width="80">
+          <template slot-scope="scope">
+            <span v-if="scope.row.index === tabClickIndex">
+              <el-input
+                v-model.number="scope.row['sort']"
+                type="number"
+                maxlength="300"
+                size="mini"
+                autofocus
+                @blur="inputBlur(scope)"
+              />
+            </span>
+            <span v-else @dblclick.stop="tabClick(scope.row)">{{
+              scope.row["sort"]
+            }}</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column
+          v-if="Number(tableFrom.type) < 5"
+          key="1"
+          prop="status"
+          label="上/下架"
+          min-width="150"
+        >
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.is_show"
+              :active-value="1"
+              :inactive-value="0"
+              active-text="上架"
+              inactive-text="下架"
+              @change="onchangeIsShow(scope.row)"
+            />
+          </template>
+        </el-table-column> -->
+        <el-table-column prop="stock" label="商品状态" min-width="90">
+          <template slot-scope="scope">
+            <span>{{ scope.row.us_status | productStatusFilter }}</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column prop="stock" label="标签" min-width="90">
+          <template slot-scope="scope">
+            <div
+              v-for="(item, index) in scope.row.mer_labels"
+              :key="index"
+              class="label-list"
+            >
+              {{ item.name }}
+            </div>
+          </template>
+        </el-table-column> -->
+        <el-table-column prop="create_time" label="创建时间" min-width="150" />
+      </el-table>
+      <div class="block">
+        <el-pagination
+          :page-sizes="[20, 40, 60, 80]"
+          :page-size="tableFrom.limit"
+          :current-page="tableFrom.page"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
+      </div>
+    </el-card>
+  </div>
+</template>
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import {
+  xlsxProductLstApi,
+  productDeleteApi,
+  categorySelectApi,
+  lstFilterApi,
+  statusApi,
+  categoryListApi,
+  destoryApi,
+  restoreApi,
+  productSort,
+  getProductLabelApi,
+  updatetProductLabel,
+  batchesOnOffApi,
+  productConfigApi,
+  batchesLabelsApi,
+  shippingListApi,
+  batchesTempApi,
+  productBathExtApi,
+  productBathSvipApi,
+  importProduct,
+  importImages
+} from "@/api/product";
+import { getBaseInfo } from "@/api/user";
+import { roterPre } from "@/settings";
+import SettingMer from "@/libs/settingMer"
+import { Message } from 'element-ui';
+export default {
+  name: "ProductList",
+  data () {
+    return {
+      props: {
+        emitPath: false
+      },
+      roterPre: roterPre,
+      BASE_URL: SettingMer.https,
+      headeNum: [],
+      labelList: [],
+      tempList: [],
+      listLoading: true,
+      tableData: {
+        data: [],
+        total: 0
+      },
+      tableFrom: {
+        page: 1,
+        limit: 20,
+        mer_cate_id: "",
+        cate_id: "",
+        keyword: "",
+        temp_id: "",
+        type: this.$route.query.type ? this.$route.query.type : "1",
+        is_gift_bag: "",
+        us_status: "",
+        mer_labels: "",
+        svip_price_type: "",
+        product_id: this.$route.query.id ? this.$route.query.id : "",
+        product_type: ''
+      },
+      categoryList: [], // 平台
+      merCateList: [], // 商户分类筛选
+      modals: false,
+      tabClickIndex: "",
+      multipleSelection: [],
+      productStatusList: [
+        { label: "上架显示", value: 1 },
+        { label: "下架", value: 0 },
+        { label: "平台关闭", value: -1 }
+      ],
+
+      tempRule: {
+        temp_id: [
+          { required: true, message: "请选择运费模板", trigger: "change" }
+        ]
+      },
+      commisionRule: {
+        extension_one: [
+          { required: true, message: "请输入一级佣金", trigger: "change" }
+        ],
+        extension_two: [
+          { required: true, message: "请输入二级佣金", trigger: "change" }
+        ]
+      },
+      importInfo: {}, //导入商品的信息
+      commisionForm: { extension_one: 0, extension_two: 0 },
+      svipForm: { svip_price_type: 0 },
+      goodsId: "",
+      previewKey: "",
+      product_id: "",
+      previewVisible: false,
+      dialogLabel: false,
+      dialogFreight: false,
+      dialogCommision: false,
+      dialogSvip: false,
+      dialogImport: false,
+      dialogImportImg: false,
+      is_audit: false,
+      deliveryType: [],
+      deliveryList: [],
+      labelForm: {},
+      tempForm: {},
+      isBatch: false,
+      open_svip: false,
+      product: '',
+      merchantType: {
+        type_code: ''
+      }
+    };
+  },
+  mounted () {
+    this.merchantType = this.$store.state.user.merchantType;
+    let typeName = this.merchantType.type_name;
+    if (typeName !== "市级供应链") {
+      this.product = 0;
+      this.tableFrom.product_type = ''
+    } else {
+      this.product = 98;
+      this.tableFrom.product_type = 98
+    }
+    console.log(this.product);
+    this.getLstFilterApi();
+    this.getCategorySelect();
+    this.getCategoryList();
+    this.getList(1);
+    this.getLabelLst();
+    this.getTempLst();
+    this.productCon();
+  },
+  updated () {
+
+  },
+  methods: {
+    // 把每一行的索引放进row
+    tableRowClassName ({ row, rowIndex }) {
+      row.index = rowIndex;
+    },
+    // 添加明细原因 row 当前行 column 当前列
+    tabClick (row) {
+      this.tabClickIndex = row.index;
+    },
+    // 失去焦点初始化
+    inputBlur (scope) {
+      if (!scope.row.sort || scope.row.sort < 0) scope.row.sort = 0;
+      productSort(scope.row.product_id, { sort: scope.row.sort })
+        .then(res => {
+          this.closeEdit();
+        })
+        .catch(res => { });
+    },
+    closeEdit () {
+      this.tabClickIndex = null;
+    },
+    handleSelectionChange (val) {
+      this.multipleSelection = val;
+      const data = [];
+      this.multipleSelection.map(item => {
+        data.push(item.product_id);
+      });
+      this.product_ids = data;
+    },
+    productCon () {
+      productConfigApi()
+        .then(res => {
+          this.is_audit = res.data.is_audit;
+          this.open_svip =
+            res.data.mer_svip_status == 1 && res.data.svip_switch_status == 1;
+          this.deliveryType = res.data.delivery_way.map(String);
+          if (this.deliveryType.length == 2) {
+            this.deliveryList = [
+              { value: "1", name: "到店自提" },
+              { value: "2", name: "快递配送" }
+            ];
+          } else {
+            if (this.deliveryType.length == 1 && this.deliveryType[0] == "1") {
+              this.deliveryList = [{ value: "1", name: "到店自提" }];
+            } else {
+              this.deliveryList = [{ value: "2", name: "快递配送" }];
+            }
+          }
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    getSuccess () {
+      this.getLstFilterApi();
+      this.getList(1);
+    },
+    handleClose () {
+      this.dialogLabel = false;
+    },
+    handleFreightClose () {
+      this.dialogFreight = false;
+    },
+    // 添加淘宝商品成功
+    onClose () {
+      this.modals = false;
+    },
+    // 复制淘宝
+    onCopy () {
+      // this.$refs.taoBao.modals = true
+      // this.$refs.taoBao.soure_link = ''
+      // this.$refs.taoBao.formValidate = {}
+      // this.$refs.taoBao.isData = false
+      this.$router.push({
+        path: this.roterPre + "/product/list/addProduct",
+        query: { type: 1 }
+      });
+    },
+    // 获取标签项
+    getLabelLst () {
+      getProductLabelApi()
+        .then(res => {
+          this.labelList = res.data;
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    // 获取运费模板
+    getTempLst () {
+      shippingListApi()
+        .then(res => {
+          this.tempList = res.data;
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    // 免审编辑
+    onAuditFree (row) {
+      this.$refs.editAttr.getAttrDetail(row.product_id);
+    },
+    // 批量设置佣金
+    batchCommision () {
+      if (this.multipleSelection.length === 0)
+        return this.$message.warning("请先选择商品");
+      this.dialogCommision = true;
+    },
+    // 批量设置会员价
+    batchSvip () {
+      if (this.multipleSelection.length === 0)
+        return this.$message.warning("请先选择商品");
+      this.dialogSvip = true;
+    },
+    submitCommisionForm (name) {
+      this.$refs[name].validate(valid => {
+        if (valid) {
+          this.commisionForm.ids = this.product_ids;
+          productBathExtApi(this.commisionForm).then(({ message }) => {
+            this.$message.success(message);
+            this.getList("");
+            this.dialogCommision = false;
+          });
+        } else {
+          return;
+        }
+      });
+    },
+    // 提交会员价
+    submitSvipForm (name) {
+      this.svipForm.ids = this.product_ids;
+      productBathSvipApi(this.svipForm).then(({ message }) => {
+        this.$message.success(message);
+        this.getList("");
+        this.dialogSvip = false;
+      });
+    },
+    // 批量上架
+    batchShelf () {
+      if (this.multipleSelection.length === 0)
+        return this.$message.warning("请先选择商品");
+      let data = { status: 1, ids: this.product_ids };
+      batchesOnOffApi(data)
+        .then(res => {
+          this.$message.success(res.message);
+          this.getLstFilterApi();
+          this.getList("");
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    // 批量下架
+    batchOff () {
+      if (this.multipleSelection.length === 0)
+        return this.$message.warning("请先选择商品");
+      let data = { status: 0, ids: this.product_ids };
+      batchesOnOffApi(data)
+        .then(res => {
+          this.$message.success(res.message);
+          this.getLstFilterApi();
+          this.getList("");
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    // 批量设置标签
+    batchLabel () {
+      this.labelForm = {
+        mer_labels: [],
+        ids: this.product_ids
+      };
+      this.isBatch = true;
+      this.dialogLabel = true;
+    },
+    // 批量设置运费模板
+    batchFreight () {
+      this.dialogFreight = true;
+    },
+    submitTempForm (name) {
+      this.$refs[name].validate(valid => {
+        if (valid) {
+          this.tempForm.ids = this.product_ids;
+          batchesTempApi(this.tempForm).then(({ message }) => {
+            this.$message.success(message);
+            this.getList("");
+            this.dialogFreight = false;
+          });
+        } else {
+          return;
+        }
+      });
+    },
+    handleRestore (id) {
+      this.$modalSure("恢复商品").then(() => {
+        restoreApi(id)
+          .then(res => {
+            this.$message.success(res.message);
+            this.getLstFilterApi();
+            this.getList("");
+          })
+          .catch(res => {
+            this.$message.error(res.message);
+          });
+      });
+    },
+    // 预览
+    handlePreview (id) {
+      console.log(id);
+      console.log("123");
+      this.previewVisible = true;
+      this.goodsId = id;
+      this.previewKey = "";
+    },
+    // 商户分类；
+    getCategorySelect () {
+      categorySelectApi()
+        .then(res => {
+          this.merCateList = res.data;
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    // 平台分类；
+    getCategoryList () {
+      categoryListApi()
+        .then(res => {
+          this.categoryList = res.data;
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    // 列表表头；
+    getLstFilterApi () {
+      lstFilterApi()
+        .then(res => {
+          this.headeNum = res.data;
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    // 列表
+    getList (num) {
+      this.listLoading = true;
+      this.tableFrom.page = num || this.tableFrom.page;
+      xlsxProductLstApi(this.tableFrom)
+        .then(res => {
+          this.tableData.data = res.data.list;
+          this.tableData.total = res.data.count;
+          this.listLoading = false;
+        })
+        .catch(res => {
+          this.listLoading = false;
+          this.$message.error(res.message);
+        });
+      this.getLstFilterApi();
+    },
+    pageChange (page) {
+      this.tableFrom.page = page;
+      this.getList("");
+    },
+    handleSizeChange (val) {
+      this.tableFrom.limit = val;
+      this.getList("");
+    },
+    // 删除
+    handleDelete (id, idx) {
+      this.$modalSure(
+        this.tableFrom.type !== "5" ? "加入回收站" : "删除该商品"
+      ).then(() => {
+        this.tableFrom.type === "5"
+          ? destoryApi(id)
+            .then(({ message }) => {
+              this.$message.success(message);
+              this.getList("");
+              this.getLstFilterApi();
+            })
+            .catch(({ message }) => {
+              this.$message.error(message);
+            })
+          : productDeleteApi(id)
+            .then(({ message }) => {
+              this.$message.success(message);
+              this.getList("");
+              this.getLstFilterApi();
+            })
+            .catch(({ message }) => {
+              this.$message.error(message);
+            });
+      });
+    },
+    // 编辑标签
+    onEditLabel (row) {
+      this.dialogLabel = true;
+      this.product_id = row.product_id;
+      if (row.mer_labels && row.mer_labels.length) {
+        const arrNew = row.mer_labels.map(item => {
+          return item.product_label_id;
+        });
+        this.labelForm = {
+          mer_labels: arrNew
+        };
+      } else {
+        this.labelForm = {
+          mer_labels: []
+        };
+      }
+    },
+    submitForm (name) {
+      this.$refs[name].validate(valid => {
+        if (valid) {
+          this.isBatch
+            ? batchesLabelsApi(this.labelForm).then(({ message }) => {
+              this.$message.success(message);
+              this.getList("");
+              this.dialogLabel = false;
+              this.isBatch = false;
+            })
+            : updatetProductLabel(this.product_id, this.labelForm).then(
+              ({ message }) => {
+                this.$message.success(message);
+                this.getList("");
+                this.dialogLabel = false;
+              }
+            );
+        } else {
+          return;
+        }
+      });
+    },
+    onchangeIsShow (row) {
+      statusApi(row.product_id, row.is_show)
+        .then(({ message }) => {
+          this.$message.success(message);
+          this.getList("");
+          this.getLstFilterApi();
+        })
+        .catch(({ message }) => {
+          this.$message.error(message);
+        });
+    },
+    // 导入商品
+    importShort () {
+      this.dialogImport = true;
+    },
+    importClose () {
+      this.dialogImport = false;
+    },
+    // 导入商品图片
+    importShortImg () {
+      this.dialogImportImg = true;
+    },
+    importCloseImg () {
+      this.dialogImportImg = false;
+    },
+    // 上传文档
+    async importXlsUpload (options) {
+      console.log('上传', options);
+      const file = options.file;
+      const formData = new FormData();
+      formData.append('file', file);
+      importProduct(formData).then((res) => {
+        Message.success(res.message);
+      }).catch(e => {
+        Message.error(e);
+      })
+      // const chunkSize = 2 * 1024 * 1024; // 每个分片的大小，这里设置为2MB
+
+      // // 计算文件总共需要分成多少个分片
+      // const totalChunks = Math.ceil(file.size / chunkSize);
+
+      // try {
+      //   // 循环上传每个分片
+      //   for (let i = 0; i < totalChunks; i++) {
+      //     const start = i * chunkSize;
+      //     const end = Math.min((i + 1) * chunkSize, file.size);
+      //     const chunk = file.slice(start, end);
+
+      //     // 构建FormData对象，用于传输分片数据
+      //     const formData = new FormData();
+      //     formData.append('file', chunk);
+      //     formData.append('chunkIndex', i);
+      //     formData.append('totalChunks', totalChunks);
+      //     formData.append('filename', file.name);
+
+      //     // 使用axios发送分片请求
+      //     await axios.post('store/import/product', formData);
+      //   }
+
+      //   // 分片上传完成后，在这里进行合并操作
+      //   // ...
+
+      //   Message.success('文件上传成功！');
+      // } catch (error) {
+      //   Message.error('文件上传失败！');
+      // }
+    },
+    // 上传图片压缩包
+    async importZipUpload (options) {
+      console.log('上传', options);
+      const file = options.file;
+      const formData = new FormData();
+      formData.append('file', file);
+      importImages(formData).then((res) => {
+        Message.success(res.message);
+      }).catch(e => {
+        Message.error(e);
+      })
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.bg {
+  z-index: 100;
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.5);
+}
+.goods_detail .goods_detail_wrapper {
+  z-index: -10;
+}
+/deep/ table.el-input__inner {
+  padding: 0;
+}
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand1 {
+  /deep/ label {
+    width: 77px !important;
+    color: #99a9bf;
+  }
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 33.33%;
+}
+.selWidth {
+  width: 350px !important;
+}
+.seachTiele {
+  line-height: 35px;
+}
+</style>