商品订单

src/views/order/list/index.vue

@@ -37,13 +37,13 @@
         </el-select>
       </el-form-item>
       <!-- 会员订单 -->
-      <el-form-item v-if="form.searchType === '4'" label="资源平台:">
+      <el-form-item v-if="form.searchType === '1' || form.searchType === '4'" label="资源平台:">
         <el-select v-model="form.platformId" placeholder="请选择资源平台">
-          <el-option v-for="item in platformIdOptions" :key="item.value" :value="item.value" :label="item.label" />
+          <el-option v-for="item in platformOptions" :key="item.value" :value="item.value" :label="item.label" />
         </el-select>
       </el-form-item>
       <el-form-item label="支付状态:">
-        <el-select v-model="form.status" placeholder="请选择订单状态">
+        <el-select v-model="form.status" placeholder="请选择支付状态">
           <el-option v-for="item in statusOptions" :key="item.value" :value="item.value" :label="item.label" />
         </el-select>
       </el-form-item>
@@ -52,6 +52,12 @@
           <el-option v-for="item in payOptions" :key="item.value" :value="item.value" :label="item.label" />
         </el-select>
       </el-form-item>
+      <!-- 商品订单 -->
+      <el-form-item v-if="form.searchType === '1'" label="订单内容类型：">
+        <el-select v-model="form.goodsType" placeholder="请选择订单内容类型">
+          <el-option v-for="item in goodsTypeOptions" :key="item.value" :value="item.value" :label="item.label" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="下单时间:">
         <el-date-picker v-model="form.listDate" type="datetimerange" start-placeholder="开始日期" end-placeholder="结束日期"
           format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" :picker-options="pickerOptions" />
@@ -66,47 +72,59 @@
     </el-form>
     <!-- 列表 -->
     <el-table :data="tableData" v-loading="loading">
-      <el-table-column label="订单编号" prop="orderCode" key="orderCode" align="center" />
-      <el-table-column v-if="form.searchType === '2'" label="第三方订单编号" key="thirdOrderId" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.thirdOrderId | empty(scope.row.thirdOrderId) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="商品ID" prop="goodsid" key="goodsid" align="center" />
+      <el-table-column label="订单编号" prop="orderCode" key="orderCode" align="center" show-overflow-tooltip />
+      <!-- 流量订单 -->
+      <span v-if="form.searchType === '2'">
+        <el-table-column label="第三方订单编号" key="thirdOrderId" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.thirdOrderId | empty(scope.row.thirdOrderId) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="SIM卡号" prop="simCode" key="simCode" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.simCode | empty(scope.row.simCode) }}</span>
+          </template>
+        </el-table-column>
+      </span>
+      <el-table-column label="商品ID" prop="goodsid" key="goodsid" align="center" show-overflow-tooltip />
       <el-table-column label="商品名称" prop="goodsName" key="goodsName" align="center" show-overflow-tooltip />
       <el-table-column label="订单金额 / 元" prop="amount" key="amount" align="center" :formatter="amountFormatter" />
-      <el-table-column v-if="form.searchType === '2'" label="SIM卡号" prop="simCode" key="simCode" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.simCode | empty(scope.row.simCode) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-if="form.searchType === '1'" label="购买类型" prop="charging" key="charging" align="center"
-        :formatter="chargingFormatter" />
+      <!-- 商品订单 -->
+      <span v-if="form.searchType === '1'">
+        <el-table-column label="购买类型" prop="charging" key="charging" align="center" :formatter="chargingFormatter" />
+        <el-table-column label="订单内容类型" prop="goodsType" key="goodsType" align="center" :formatter="goodsTypeFormatter" />
+      </span>
+      <!-- 充值订单 -->
       <el-table-column v-if="form.searchType === '3'" label="订单来源" prop="platform" key="platform" align="center"
         :formatter="platformFormatter" />
-      <el-table-column v-if="form.searchType === '4'" label="栏目" prop="groupId" key="groupId" align="center"
-        :formatter="groupFormatter" />
-      <el-table-column v-if="form.searchType === '4'" label="服务时长" prop="expirationTime" key="expirationTime"
-        align="center" :formatter="timeFormatter" />
-      <el-table-column v-if="form.searchType === '4'" label="资源平台" prop="platformId" key="platformId" align="center"
-        :formatter="platformIdFormatter" />
-      <el-table-column label="下单时间" prop="createTime" key="createTime" align="center" />
+      <!-- 会员订单 -->
+      <span v-if="form.searchType === '4'">
+        <el-table-column label="栏目" prop="groupId" key="groupId" align="center" :formatter="groupFormatter" />
+        <el-table-column label="服务时长" prop="expirationTime" key="expirationTime" align="center"
+          :formatter="timeFormatter" />
+      </span>
+      <!-- 商品订单 或 会员订单 -->
+      <el-table-column v-if="['1', '4'].includes(form.searchType)" label="资源平台" prop="platformId" key="platformId"
+        align="center" :formatter="platformIdFormatter" />
+      <el-table-column label="下单时间" prop="createTime" key="createTime" align="center" show-overflow-tooltip />
       <el-table-column label="支付方式" prop="payType" key="payType" align="center" :formatter="payTypeFormatter" />
       <el-table-column label="支付状态" prop="status" key="status" align="center" :formatter="statusFormatter" />
-      <el-table-column label="支付时间" prop="goodsUpdateTime" key="goodsUpdateTime" align="center" />
-      <el-table-column label="用户账号" prop="userName" key="userName" align="center" />
-      <el-table-column label="支付流水号" key="payId" align="center">
+      <el-table-column label="支付时间" prop="goodsUpdateTime" key="goodsUpdateTime" align="center" show-overflow-tooltip />
+      <el-table-column label="用户账号" prop="userName" key="userName" align="center" show-overflow-tooltip />
+      <el-table-column label="支付流水号" key="payId" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ scope.row.payId | empty(scope.row.payId) }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="form.searchType === '2'" label="生效状态" prop="flowStatus" key="flowStatus" align="center"
-        :formatter="flowFormatter" />
-      <el-table-column v-if="form.searchType === '2'" label="生效时间" key="effectTime" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.effectTime | empty(scope.row.effectTime) }}</span>
-        </template>
-      </el-table-column>
+      <!-- 流量订单 -->
+      <span v-if="form.searchType === '2'">
+        <el-table-column label="生效状态" prop="flowStatus" key="flowStatus" align="center" :formatter="flowFormatter" />
+        <el-table-column label="生效时间" key="effectTime" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.effectTime | empty(scope.row.effectTime) }}</span>
+          </template>
+        </el-table-column>
+      </span>
     </el-table>
     <pagination v-show="total > 0" :total="total" :page.sync="form.pageNum" :limit.sync="form.pageSize"
       @pagination="getList" />
@@ -134,9 +152,9 @@
 <script>
 import { list, dialogList, download, downLoadHistory } from '@/api/order/list'
 import { list as sceneList } from '@/api/operation/scene'
-import { payTypeMixin, systemMixin, serviceTimeMixin } from '@/mixin/index'
+import { payTypeMixin, systemMixin, serviceTimeMixin, platformMixin } from '@/mixin/index'
 export default {
-  mixins: [payTypeMixin, systemMixin, serviceTimeMixin],
+  mixins: [payTypeMixin, systemMixin, serviceTimeMixin, platformMixin],
   data() {
     return {
       // 遮罩层
@@ -193,15 +211,13 @@ export default {
         value: 2,
         label: '已失效'
       }],
-      platformIdOptions: [{
-        value: 6,
-        label: 'QQ音乐'
+      // 订单内容类型
+      goodsTypeOptions: [{
+        value: 4,
+        label: '播客专辑'
       }, {
-        value: 9,
-        label: '酷狗音乐'
-      }, {
-        value: 10,
-        label: '爱听音乐'
+        value: 17,
+        label: '歌单'
       }],
       // 时间搜索不超过1个月
       selectDate: '',
@@ -226,6 +242,7 @@ export default {
   mounted() {
     this.getScene()
     this.getList()
+    this.getPlatform({})
     this.payOptions.push(this.form.searchType === '3' ? {
       value: 3,
       label: '苹果支付'
@@ -341,7 +358,7 @@ export default {
     },
 
     platformIdFormatter(row) {
-      return row.platformId === null ? '-' : this.selectDictLabel(this.platformIdOptions, row.platformId)
+      return row.platformId === null ? '-' : this.selectDictLabel(this.platformOptions, row.platformId)
     },
 
     flowFormatter(row) {
@@ -351,9 +368,13 @@ export default {
     amountFormatter(row) {
       return row.amount.toFixed(2)
     },
-    
+
     timeFormatter(row) {
       return this.selectDictLabel(this.serviceTimeOptions, row.expirationTime)
+    },
+
+    goodsTypeFormatter(row) {
+      return this.selectDictLabel(this.goodsTypeOptions, row.goodsType)
     }
   },
   // 过滤器