零售 和 充值卡

admin-ui/src/views/recharge/card/index.vue

@@ -14,11 +14,11 @@
           <el-input v-model="queryParams.orderNo" placeholder="请输入充值订单号" clearable prefix-icon="el-icon-document" style="width: 240px"
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="使用状态" prop="rechargeStatus">
+        <!-- <el-form-item label="使用状态" prop="rechargeStatus">
           <el-select v-model="queryParams.rechargeStatus" placeholder="请选择使用状态" clearable style="width: 240px">
             <el-option v-for="dict in dict.type.recharge_use_status" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="充值时间">
           <el-date-picker v-model="daterangeRechargeTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="至"
             start-placeholder="开始日期" end-placeholder="结束日期" />
@@ -57,7 +57,9 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </div>
-
+      <el-tabs v-model="queryParams.rechargeStatus" @tab-click="getList">
+        <el-tab-pane :label="item.label" :name="item.value" v-for="(item, i) in dict.type.recharge_use_status" :key="i"></el-tab-pane>
+      </el-tabs>
       <Page uri="/mapi/recharge/card/list" :request-params="queryParams" ref="pagination">
         <el-table-column label="卡号" align="center" prop="cardNo" min-width="180" fixed="left" :show-overflow-tooltip="true" />
         <el-table-column label="批次号" align="center" prop="batchNo" min-width="150" :show-overflow-tooltip="true">
@@ -141,7 +143,7 @@
           <el-form-item label="批次备注" prop="remark">
             <el-input type="textarea" v-model="importForm.remark" placeholder="请输入批次备注" />
           </el-form-item>
-          <el-form-item label="过期时间">
+          <el-form-item label="过期时间" prop="expireTime">
             <el-date-picker v-model="importForm.expireTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%" />
           </el-form-item>
         </el-form>
@@ -239,7 +241,7 @@ export default {
       // 查询参数
       queryParams: {
         cardNo: null,
-        rechargeStatus: null,
+        rechargeStatus: 0,
         rechargeTime: null,
         expireTime: null,
         createTime: null
@@ -260,7 +262,10 @@ export default {
           { required: true, message: '请输入批次名称', trigger: 'blur' },
           { min: 2, max: 50, message: '批次名称长度在 2 到 50 个字符', trigger: 'blur' }
         ],
-        remark: [{ max: 200, message: '备注长度不能超过200个字符', trigger: 'blur' }]
+        remark: [{ max: 200, message: '备注长度不能超过200个字符', trigger: 'blur' }],
+        expireTime: [
+          { required: true, message: '请选择过期时间', trigger: 'blur' }
+        ]
       },
       // 充值卡导入参数
       upload: {
@@ -480,6 +485,10 @@ export default {
         this.$modal.msgError('请输入批次名称')
         return false
       }
+      if (!this.importForm.expireTime) {
+        this.$modal.msgError('请选择过期时间')
+        return false
+      }
       this.$refs.upload.submit()
     },
     /** 消费明细详情 */

admin-ui/src/views/workbench/workRetail/index.vue

@@ -513,7 +513,7 @@ export default {
       if (this.categoryList && this.categoryList.length > 0) {
         this.activeCategory = this.categoryList[0].id.toString();
         this.goodsCategoryId = this.categoryList[0].id;
-        this.getGoodsList();
+        // this.getGoodsList();
       }
     });
     this.getBrandList();
@@ -592,6 +592,11 @@ export default {
     getCategoryList() {
       return listCategory({ ...this.queryParams2, ...{ goodsType: this.goodsType } }).then(response2 => {
         this.categoryList = response2.rows;
+        if (response2.rows.length > 0) {
+          this.activeCategory = response2.rows[0].id.toString();
+          this.goodsCategoryId = response2.rows[0].id;
+          this.getGoodsList();
+        }
       });
     },
     // 获取品牌