焕焕狗要求修改

1

src/views/couponManager/couponUpdate.vue

@@ -180,7 +180,7 @@
       <el-row :gutter="20">
         <el-col style="width: 395px">
           <el-form-item
-            label="库存总量"
+            label="库存总量(-1为不限制)"
             prop="stockCount"
             :rules="[{ required: true, message: '请输入库存总量' }]"
           >

src/views/couponManager/index.vue

@@ -66,7 +66,6 @@
           style="width: 100%"
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
           :data="tableList"
-
         >
           <el-table-column
             align="center"
@@ -262,22 +261,31 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="stockCount"
-            label="总库存"
-          ></el-table-column>
+          <el-table-column align="center" prop="stockCount" label="总库存">
+            <template slot-scope="scope">
+              <div>
+                {{
+                  scope.row.stockCount == -1 ? "不限制" : scope.row.stockCount
+                }}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             prop="warningStockNum"
-            label="剩余库存"
+            label="领取值"
           >
             <template slot-scope="scope">
               <div>
-                {{ scope.row.stockCount - scope.row.consumeNum }}
+                {{scope.row.consumeNum }}
               </div>
             </template>
           </el-table-column>
+          <el-table-column
+            align="center"
+            prop="warningStockNum"
+            label="预警值"
+          ></el-table-column>
           <el-table-column align="center" prop="status" label="状态">
             <template slot-scope="scope">
               <div>
@@ -294,24 +302,24 @@
             <template slot-scope="scope">
               <div>
                 <auth auths="sysCoupon/updateCoupon">
-                <!-- <el-button type="text" @click="gotoDetail(scope.row)"
+                  <!-- <el-button type="text" @click="gotoDetail(scope.row)"
                   >查看</el-button
                 > -->
-                <el-button
-                  type="text"
-                  v-if="scope.row.status"
-                  @click="stop(scope.row)"
-                  >停用</el-button
-                >
-                <el-button type="text" v-else @click="start(scope.row)"
-                  >启用</el-button
-                >
-                <el-button
-                  type="text"
-                  v-if="!scope.row.status"
-                  @click="gotoDetail(scope.row)"
-                  >修改</el-button
-                >
+                  <el-button
+                    type="text"
+                    v-if="scope.row.status"
+                    @click="stop(scope.row)"
+                    >停用</el-button
+                  >
+                  <el-button type="text" v-else @click="start(scope.row)"
+                    >启用</el-button
+                  >
+                  <el-button
+                    type="text"
+                    v-if="!scope.row.status"
+                    @click="gotoDetail(scope.row)"
+                    >修改</el-button
+                  >
                 </auth>
                 <auth auths="sysCoupon/delete">
                   <el-button