套餐相关

src/views/bst/order/index.vue

@@ -9,50 +9,18 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="店铺ID" prop="storeId">
+      <el-form-item label="下单用户" prop="userName">
         <el-input
-          v-model="queryParams.storeId"
+          v-model="queryParams.userName"
-          placeholder="请输入店铺ID"
+          placeholder="请输入下单用户名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="店铺名称" prop="storeName">
+      <el-form-item label="支付单号" prop="payNo">
         <el-input
-          v-model="queryParams.storeName"
+          v-model="queryParams.payNo"
-          placeholder="请输入店铺名称"
+          placeholder="请输入支付单号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用户ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入用户ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="支付成功的支付单ID" prop="payId">
-        <el-input
-          v-model="queryParams.payId"
-          placeholder="请输入支付成功的支付单ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="支付金额" prop="payAmount">
-        <el-input
-          v-model="queryParams.payAmount"
-          placeholder="请输入支付金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="套餐ID" prop="suitId">
-        <el-input
-          v-model="queryParams.suitId"
-          placeholder="请输入套餐ID"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -65,37 +33,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="套餐次数" prop="suitNum">
+      <el-form-item label="订单状态" prop="status">
-        <el-input
+        <el-select
-          v-model="queryParams.suitNum"
+          v-model="queryParams.status"
-          placeholder="请输入套餐次数"
+          placeholder="请选择订单状态"
           clearable
           @keyup.enter.native="handleQuery"
+        >
+          <el-option
+            v-for="item in dict.type.order_status"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
           />
-      </el-form-item>
+        </el-select>
-      <el-form-item label="套餐金额" prop="suitAmount">
-        <el-input
-          v-model="queryParams.suitAmount"
-          placeholder="请输入套餐金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="订单取消备注" prop="cancelRemark">
-        <el-input
-          v-model="queryParams.cancelRemark"
-          placeholder="请输入订单取消备注"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="支付超时时间" prop="payExpireTime">
-        <el-date-picker clearable
-          v-model="queryParams.payExpireTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择支付超时时间">
-        </el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -156,6 +107,16 @@
             <template v-if="column.key === 'id'">
               {{d.row[column.key]}}
             </template>
+            <template v-else-if="column.key === 'suitName'">
+              {{d.row.suitName | dv}}<br/>
+              <dict-tag :options="dict.type.order_status" :value="d.row.status" size="mini" style="margin-left: 4px;"/>
+                <div>
+                  <el-row :gutter="8">
+                    <el-col :span="12" v-if="d.row.suitNum" >套餐次数：{{d.row.suitNum | fix2 | dv}} 次</el-col>
+                    <el-col :span="12" v-if="d.row.suitAmount">套餐金额：{{d.row.suitAmount | fix2 | dv}} 元</el-col>
+                  </el-row>
+                </div>
+            </template>
             <template v-else>
               {{d.row[column.key]}}
             </template>
@@ -189,62 +150,6 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 添加或修改订单列表对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <form-col :span="span"  label="订单号" prop="orderNo">
-            <el-input v-model="form.orderNo" placeholder="请输入订单号" />
-          </form-col>
-          <form-col :span="span"  label="店铺ID" prop="storeId">
-            <el-input v-model="form.storeId" placeholder="请输入店铺ID" />
-          </form-col>
-          <form-col :span="span"  label="店铺名称" prop="storeName">
-            <el-input v-model="form.storeName" placeholder="请输入店铺名称" />
-          </form-col>
-          <form-col :span="span"  label="用户ID" prop="userId">
-            <el-input v-model="form.userId" placeholder="请输入用户ID" />
-          </form-col>
-          <form-col :span="span"  label="支付成功的支付单ID" prop="payId">
-            <el-input v-model="form.payId" placeholder="请输入支付成功的支付单ID" />
-          </form-col>
-          <form-col :span="span"  label="支付金额" prop="payAmount">
-            <el-input v-model="form.payAmount" placeholder="请输入支付金额" />
-          </form-col>
-          <form-col :span="span"  label="备注" prop="mark">
-            <el-input v-model="form.mark" type="textarea" placeholder="请输入内容" />
-          </form-col>
-          <form-col :span="span"  label="套餐ID" prop="suitId">
-            <el-input v-model="form.suitId" placeholder="请输入套餐ID" />
-          </form-col>
-          <form-col :span="span"  label="套餐名称" prop="suitName">
-            <el-input v-model="form.suitName" placeholder="请输入套餐名称" />
-          </form-col>
-          <form-col :span="span"  label="套餐次数" prop="suitNum">
-            <el-input v-model="form.suitNum" placeholder="请输入套餐次数" />
-          </form-col>
-          <form-col :span="span"  label="套餐金额" prop="suitAmount">
-            <el-input v-model="form.suitAmount" placeholder="请输入套餐金额" />
-          </form-col>
-          <form-col :span="span"  label="订单取消备注" prop="cancelRemark">
-            <el-input v-model="form.cancelRemark" placeholder="请输入订单取消备注" />
-          </form-col>
-          <form-col :span="span"  label="支付超时时间" prop="payExpireTime">
-            <el-date-picker clearable
-              v-model="form.payExpireTime"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="请选择支付超时时间">
-            </el-date-picker>
-          </form-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
@@ -262,27 +167,18 @@ const defaultSort = {
 export default {
   name: "Order",
   mixins: [$showColumns],
+  dicts:['order_status'],
   components: {FormCol},
   data() {
     return {
       span: 24,
       // 字段列表
       columns: [
-        {key: 'id', visible: true, label: '订单ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'orderNo', visible: true, label: '订单号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'storeId', visible: true, label: '店铺ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'userName', visible: true, label: '用户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'storeName', visible: true, label: '店铺名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'userId', visible: true, label: '用户ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'payId', visible: true, label: '支付成功的支付单ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'payAmount', visible: true, label: '支付金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'mark', visible: true, label: '备注', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'status', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'status', visible: true, label: '状态（WAIT_PAY待支付 PROCESSING进行中 FINISHED已结束 CANCELED已取消）', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'suitName', visible: true, label: '套餐', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'suitId', visible: true, label: '套餐ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'suitName', visible: true, label: '套餐名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'suitNum', visible: true, label: '套餐次数', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'suitAmount', visible: true, label: '套餐金额（单位：元）', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'cancelRemark', visible: true, label: '订单取消备注', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'payExpireTime', visible: true, label: '支付超时时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
       ],
       // 排序方式
       orderSorts: ['ascending', 'descending', null],