修改订单组件

src/components/orderParts/card-2.vue

@@ -19,7 +19,7 @@ const { mapActions: shop } = createNamespacedHelpers('shop');
 export default {
   name: 'card-1',
   props: { statusList: { type: Array } },
-  components: { search1: () => import('./search-1.vue') },
+  components: { search1: () => import('./search-2.vue') },
   data: function () {
     return {
       searchForm: {},

src/components/orderParts/parts/detail-1.vue

@@ -41,7 +41,7 @@ const { mapActions: shop } = createNamespacedHelpers('shop');
 export default {
   name: 'card-1',
   props: { statusList: { type: Array } },
-  components: { search1: () => import('../search-1.vue') },
+  components: { search1: () => import('../search-2.vue') },
   data: function () {
     return {
       loadings: true,

src/views/platmanag/order/index.vue

@@ -12,94 +12,33 @@
           <el-col :span="24" class="one"> <span>订单管理</span> </el-col>
           <el-col :span="24" class="four">
             <el-tabs v-model="activeName" @tab-click="handleClick" type="border-card">
-              <el-tab-pane label="待付款" name="1">
+              <el-tab-pane name="1" label="待付款"> </el-tab-pane>
+              <el-tab-pane name="2" label="待发货"> </el-tab-pane>
+              <el-tab-pane name="3" label="部分发货"> </el-tab-pane>
+              <el-tab-pane name="4" label="待收货"> </el-tab-pane>
+              <el-tab-pane name="5" label="已收货"> </el-tab-pane>
+              <el-tab-pane name="6" label="取消订单"> </el-tab-pane>
+              <el-tab-pane name="7" label="申请售后"> </el-tab-pane>
+              <el-tab-pane name="8" label="正在处理售后"> </el-tab-pane>
+              <el-tab-pane name="9" label="售后结束"> </el-tab-pane>
+
+              <!-- 待付款 -->
+              <el-col :span="24" v-if="activeName == '1'">
                 <card-1 :statusList="statusList" @toDetail="toDetail" @toSales="toSales"></card-1>
-              </el-tab-pane>
-              <el-tab-pane label="待发货" name="2">
-                <el-col :span="24" class="one">
-                  <search-1 :form="searchForm" @onSubmit="search" @querySearch="querySearch" @toReset="toClose" :shopList="shopList"> </search-1>
-                </el-col>
-                <data-table :fields="fields" :opera="opera" @query="search" :data="list" :total="total" @detail="toDetails" @sales="toSaless">
-                  <template #is_afterSale="{ row }">
-                    <span :style="{ color: row.is_afterSale === true ? 'red' : '' }">
-                      {{ row.is_afterSale === true ? '该订单有商品申请售后' : '未申请售后' }}</span
-                    >
-                  </template>
-                </data-table>
-              </el-tab-pane>
-              <el-tab-pane label="部分发货" name="3">
-                <el-col :span="24" class="one">
-                  <search-1 :form="searchForm" @onSubmit="search" @querySearch="querySearch" @toReset="toClose" :shopList="shopList"> </search-1>
-                </el-col>
-                <data-table :fields="fields" :opera="opera" @query="search" :data="list" :total="total" @detail="toDetails" @sales="toSaless">
-                  <template #is_afterSale="{ row }">
-                    <span :style="{ color: row.is_afterSale === true ? 'red' : '' }">
-                      {{ row.is_afterSale === true ? '该订单有商品申请售后' : '未申请售后' }}</span
-                    >
-                  </template>
-                </data-table>
-              </el-tab-pane>
-              <el-tab-pane label="待收货" name="4">
-                <el-col :span="24" class="one">
-                  <search-1 :form="searchForm" @onSubmit="search" @querySearch="querySearch" @toReset="toClose" :shopList="shopList"> </search-1>
-                </el-col>
-                <data-table :fields="fields" :opera="opera" @query="search" :data="list" :total="total" @detail="toDetails" @sales="toSaless">
-                  <template #is_afterSale="{ row }">
-                    <span :style="{ color: row.is_afterSale === true ? 'red' : '' }">
-                      {{ row.is_afterSale === true ? '该订单有商品申请售后' : '未申请售后' }}</span
-                    >
-                  </template>
-                </data-table>
-              </el-tab-pane>
-              <el-tab-pane label="已收货" name="5">
-                <el-col :span="24" class="one">
-                  <search-1 :form="searchForm" @onSubmit="search" @querySearch="querySearch" @toReset="toClose" :shopList="shopList"> </search-1>
-                </el-col>
-                <data-table :fields="fields" :opera="opera" @query="search" :data="list" :total="total" @detail="toDetails" @sales="toSaless">
-                  <template #is_afterSale="{ row }">
-                    <span :style="{ color: row.is_afterSale === true ? 'red' : '' }">
-                      {{ row.is_afterSale === true ? '该订单有商品申请售后' : '未申请售后' }}</span
-                    >
-                  </template>
-                </data-table>
-              </el-tab-pane>
-              <el-tab-pane label="取消订单" name="6">
-                <el-col :span="24" class="one">
-                  <search-1 :form="searchForm" @onSubmit="search" @querySearch="querySearch" @toReset="toClose" :shopList="shopList"> </search-1>
-                </el-col>
-                <data-table :fields="fields" :opera="opera" @query="search" :data="list" :total="total" @detail="toDetails" @sales="toSaless">
-                  <template #is_afterSale="{ row }">
-                    <span :style="{ color: row.is_afterSale === true ? 'red' : '' }">
-                      {{ row.is_afterSale === true ? '该订单有商品申请售后' : '未申请售后' }}</span
-                    >
-                  </template>
-                </data-table>
-              </el-tab-pane>
-              <el-tab-pane label="申请售后" name="7">
-                <el-col :span="24" class="one">
-                  <search-1 :form="searchForm" @onSubmit="search" @querySearch="querySearch" @toReset="toClose" :shopList="shopList"> </search-1>
-                </el-col>
-                <data-table :fields="fields" :opera="opera" @query="search" :data="list" :total="total" @detail="toDetails" @sales="toSaless">
-                  <template #is_afterSale="{ row }">
-                    <span :style="{ color: row.is_afterSale === true ? 'red' : '' }">
-                      {{ row.is_afterSale === true ? '该订单有商品申请售后' : '未申请售后' }}</span
-                    >
-                  </template>
-                </data-table>
-              </el-tab-pane>
-              <el-tab-pane label="正在处理售后" name="8">
-                <el-col :span="24" class="one">
-                  <search-1 :form="searchForm" @onSubmit="search" @querySearch="querySearch" @toReset="toClose" :shopList="shopList"> </search-1>
-                </el-col>
-                <data-table :fields="fields" :opera="opera" @query="search" :data="list" :total="total" @detail="toDetails" @sales="toSaless">
-                  <template #is_afterSale="{ row }">
-                    <span :style="{ color: row.is_afterSale === true ? 'red' : '' }">
-                      {{ row.is_afterSale === true ? '该订单有商品申请售后' : '未申请售后' }}</span
-                    >
-                  </template>
-                </data-table>
-              </el-tab-pane>
-              <el-tab-pane label="售后结束" name="9">
+              </el-col>
+              <el-col
+                :span="24"
+                v-else-if="
+                  activeName == '2' ||
+                  activeName == '3' ||
+                  activeName == '4' ||
+                  activeName == '5' ||
+                  activeName == '6' ||
+                  activeName == '7' ||
+                  activeName == '8' ||
+                  activeName == '9'
+                "
+              >
                 <el-col :span="24" class="one">
                   <search-1 :form="searchForm" @onSubmit="search" @querySearch="querySearch" @toReset="toClose" :shopList="shopList"> </search-1>
                 </el-col>
@@ -110,7 +49,7 @@
                     >
                   </template>
                 </data-table>
-              </el-tab-pane>
+              </el-col>
             </el-tabs>
           </el-col>
         </span>

src/views/selfShop/order/index.vue

@@ -12,85 +12,36 @@
           <el-col :span="24" class="one"> <span>订单管理</span> </el-col>
           <el-col :span="24" class="four">
             <el-tabs v-model="activeName" @tab-click="handleClick" type="border-card">
-              <el-tab-pane label="待付款" name="1">
+              <el-tab-pane name="1" label="待付款"> </el-tab-pane>
+              <el-tab-pane name="2" label="待发货"> </el-tab-pane>
+              <el-tab-pane name="3" label="部分发货"> </el-tab-pane>
+              <el-tab-pane name="4" label="待收货"> </el-tab-pane>
+              <el-tab-pane name="5" label="已收货"> </el-tab-pane>
+              <el-tab-pane name="6" label="取消订单"> </el-tab-pane>
+              <el-tab-pane name="7" label="申请售后"> </el-tab-pane>
+              <el-tab-pane name="8" label="正在处理售后"> </el-tab-pane>
+              <el-tab-pane name="9" label="售后结束"> </el-tab-pane>
+
+              <!-- 待付款 -->
+              <el-col :span="24" v-if="activeName == '1'">
                 <card-1 :statusList="statusList" @toDetail="toDetail" @toSales="toSales"></card-1>
-              </el-tab-pane>
-              <el-tab-pane label="待发货" name="2">
+              </el-col>
+              <!-- 待发货 -->
+              <el-col :span="24" v-else-if="activeName == '2'">
                 <card-2 :statusList="statusList" @toDetails="toDetail_t" @toSaless="toSales_t"></card-2>
-              </el-tab-pane>
-              <el-tab-pane label="部分发货" name="3">
-                <el-col :span="24" class="one">
-                  <search-1 :form="searchForm" @onSubmit="search" @querySearch="querySearch" @toReset="toClose" :shopList="shopList"> </search-1>
-                </el-col>
-                <data-table :fields="fields" :opera="opera" @query="search" :data="list" :total="total" @detail="toDetails" @sales="toSaless">
-                  <template #is_afterSale="{ row }">
-                    <span :style="{ color: row.is_afterSale === true ? 'red' : '' }">
-                      {{ row.is_afterSale === true ? '该订单有商品申请售后' : '未申请售后' }}</span
-                    >
-                  </template>
-                </data-table>
-              </el-tab-pane>
-              <el-tab-pane label="待收货" name="4">
-                <el-col :span="24" class="one">
-                  <search-1 :form="searchForm" @onSubmit="search" @querySearch="querySearch" @toReset="toClose" :shopList="shopList"> </search-1>
-                </el-col>
-                <data-table :fields="fields" :opera="opera" @query="search" :data="list" :total="total" @detail="toDetails" @sales="toSaless">
-                  <template #is_afterSale="{ row }">
-                    <span :style="{ color: row.is_afterSale === true ? 'red' : '' }">
-                      {{ row.is_afterSale === true ? '该订单有商品申请售后' : '未申请售后' }}</span
-                    >
-                  </template>
-                </data-table>
-              </el-tab-pane>
-              <el-tab-pane label="已收货" name="5">
-                <el-col :span="24" class="one">
-                  <search-1 :form="searchForm" @onSubmit="search" @querySearch="querySearch" @toReset="toClose" :shopList="shopList"> </search-1>
-                </el-col>
-                <data-table :fields="fields" :opera="opera" @query="search" :data="list" :total="total" @detail="toDetails" @sales="toSaless">
-                  <template #is_afterSale="{ row }">
-                    <span :style="{ color: row.is_afterSale === true ? 'red' : '' }">
-                      {{ row.is_afterSale === true ? '该订单有商品申请售后' : '未申请售后' }}</span
-                    >
-                  </template>
-                </data-table>
-              </el-tab-pane>
-              <el-tab-pane label="取消订单" name="6">
-                <el-col :span="24" class="one">
-                  <search-1 :form="searchForm" @onSubmit="search" @querySearch="querySearch" @toReset="toClose" :shopList="shopList"> </search-1>
-                </el-col>
-                <data-table :fields="fields" :opera="opera" @query="search" :data="list" :total="total" @detail="toDetails" @sales="toSaless">
-                  <template #is_afterSale="{ row }">
-                    <span :style="{ color: row.is_afterSale === true ? 'red' : '' }">
-                      {{ row.is_afterSale === true ? '该订单有商品申请售后' : '未申请售后' }}</span
-                    >
-                  </template>
-                </data-table>
-              </el-tab-pane>
-              <el-tab-pane label="申请售后" name="7">
-                <el-col :span="24" class="one">
-                  <search-1 :form="searchForm" @onSubmit="search" @querySearch="querySearch" @toReset="toClose" :shopList="shopList"> </search-1>
-                </el-col>
-                <data-table :fields="fields" :opera="opera" @query="search" :data="list" :total="total" @detail="toDetails" @sales="toSaless">
-                  <template #is_afterSale="{ row }">
-                    <span :style="{ color: row.is_afterSale === true ? 'red' : '' }">
-                      {{ row.is_afterSale === true ? '该订单有商品申请售后' : '未申请售后' }}</span
-                    >
-                  </template>
-                </data-table>
-              </el-tab-pane>
-              <el-tab-pane label="正在处理售后" name="8">
-                <el-col :span="24" class="one">
-                  <search-1 :form="searchForm" @onSubmit="search" @querySearch="querySearch" @toReset="toClose" :shopList="shopList"> </search-1>
-                </el-col>
-                <data-table :fields="fields" :opera="opera" @query="search" :data="list" :total="total" @detail="toDetails" @sales="toSaless">
-                  <template #is_afterSale="{ row }">
-                    <span :style="{ color: row.is_afterSale === true ? 'red' : '' }">
-                      {{ row.is_afterSale === true ? '该订单有商品申请售后' : '未申请售后' }}</span
-                    >
-                  </template>
-                </data-table>
-              </el-tab-pane>
-              <el-tab-pane label="售后结束" name="9">
+              </el-col>
+              <el-col
+                :span="24"
+                v-else-if="
+                  activeName == '3' ||
+                  activeName == '4' ||
+                  activeName == '5' ||
+                  activeName == '6' ||
+                  activeName == '7' ||
+                  activeName == '8' ||
+                  activeName == '9'
+                "
+              >
                 <el-col :span="24" class="one">
                   <search-1 :form="searchForm" @onSubmit="search" @querySearch="querySearch" @toReset="toClose" :shopList="shopList"> </search-1>
                 </el-col>
@@ -101,7 +52,7 @@
                     >
                   </template>
                 </data-table>
-              </el-tab-pane>
+              </el-col>
             </el-tabs>
           </el-col>
         </span>