Browse Source

修复已发放优惠券显示错误

xdd 1 month ago
parent
commit
079941420b

+ 5 - 0
src/views/store/components/productOrder.vue

@@ -244,6 +244,11 @@
             <p>{{JSON.parse(scope.row.jsonInfo).groupBarCode}}</p>
           </template>
         </el-table-column>
+        <el-table-column label="所属仓库" width="300" align="center">
+          <template slot-scope="scope">
+            <p>{{scope.row.warehouseCode}}</p>
+          </template>
+        </el-table-column>
         <el-table-column label="商品名称" width="300" align="center">
           <template slot-scope="scope">
             <p>{{JSON.parse(scope.row.jsonInfo).productName}}</p>

+ 2 - 2
src/views/store/storeCouponIssue/index.vue

@@ -31,7 +31,7 @@
       </el-form-item>
       <el-form-item label="发布时间">
             <el-date-picker v-model="dateRange" size="small" style="width: 220px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-        </el-form-item>  
+        </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -65,7 +65,7 @@
       <el-table-column label="最低消费" align="center" prop="useMinPrice" />
       <el-table-column label="优惠券有效期限(天)" align="center" prop="couponTime" />
       <el-table-column label="总数量" align="center" prop="totalCount" />
-      <el-table-column label="剩余领取数量" align="center" prop="remainCount" />
+      <el-table-column label="领取数量" align="center" prop="remainCount" />
       <el-table-column label="类型" align="center" prop="couponType" >
           <template slot-scope="scope">
               <el-tag prop="couponType" v-for="(item, index) in couponTypeOptions"    v-if="scope.row.couponType==item.dictValue">{{item.dictLabel}}</el-tag>