Sfoglia il codice sorgente

创建/修改商品 “回收折扣”可以为0,优惠券 上架/下架状态允许编辑

DELL 3 anni fa
parent
commit
94a43ff5a1

+ 6 - 4
src/views/business/coupon/add.vue

@@ -8,7 +8,7 @@
             <el-input v-model="addData.title" :readonly="readonly" placeholder="请输入券名称" :maxlength="32" show-word-limit />
           </el-form-item>
           <el-form-item label="使用场景:" prop="type">
-            <el-radio-group v-model="addData.type" :disabled="readonly">
+            <el-radio-group v-model="addData.type" :disabled="readonly || addData.status !== 'init'">
               <el-radio :label="2">门店消费</el-radio>
               <el-radio :label="1">盲票购买</el-radio>
             </el-radio-group>
@@ -54,14 +54,14 @@
             <el-input type="textarea" rows="4" :readonly="readonly" v-model="addData.description" placeholder="请输入使用说明 对用户可见"/>
           </el-form-item>
           <el-form-item v-if="addData.type === 2" label="使用范围:" prop="useArea">
-            <el-radio-group v-model="addData.useArea" :disabled="readonly">
+            <el-radio-group v-model="addData.useArea" :disabled="readonly || addData.status !== 'init'">
               <el-radio :label="2">进票门店</el-radio>
               <el-radio :label="1">指定门店</el-radio>
               <el-radio :label="0">所有门店</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item v-else label="使用范围:" prop="useArea">
-            <el-radio-group v-model="addData.useArea" :disabled="readonly">
+            <el-radio-group v-model="addData.useArea" :disabled="readonly || addData.status !== 'init'">
               <el-radio :label="0">所有盲票</el-radio>
               <el-radio :label="3">线上盲票</el-radio>
               <el-radio :label="4">线下盲票</el-radio>
@@ -172,6 +172,7 @@ export default {
         type: 2,
         channelSharedRate:0,
         minOrderAmt:0,
+        status: '',
       },
       addIng: false,
       excludeBoxIds: [],
@@ -209,10 +210,11 @@ export default {
   created() {
     if (this.id) {
       getCouponDetail(this.id).then(res => {
-        const { couponId, title, quantity, discount, channelSharedRate, minOrderAmt, dueDays, description, ticketBoxList, channelList } = res.data
+        const { couponId, title, quantity, discount, channelSharedRate, minOrderAmt, dueDays, description, ticketBoxList, channelList, status } = res.data
         this.addData = {
           type: JSON.parse(res.data.type).value,
           useArea: JSON.parse(res.data.useArea).value,
+          status: JSON.parse(res.data.status).value,
           discount: accDiv(discount, 100),
           minOrderAmt: accDiv(minOrderAmt, 100),
           couponId, title, quantity, channelSharedRate, dueDays, description, ticketBoxList

+ 1 - 1
src/views/business/coupon/index.vue

@@ -73,7 +73,7 @@
       <el-table-column fixed="right" align="right" label="操作" width="150">
         <template slot-scope="{row}">
           <el-button v-hasPermi="['business:coupon:query']" type="text" @click="$router.push({ name: 'CouponQuery', query: { id: row.couponId } })">查看</el-button>
-          <el-button v-if="JSON.parse(row.status).value === 'init'" v-hasPermi="['business:coupon:edit']" type="text" @click="$router.push({ name: 'CouponEdit', query: { id: row.couponId } })">编辑</el-button>
+          <el-button v-hasPermi="['business:coupon:edit']" type="text" @click="$router.push({ name: 'CouponEdit', query: { id: row.couponId } })">编辑</el-button>
           <el-button v-if="JSON.parse(row.status).value === 'off' || JSON.parse(row.status).value === 'init'" v-hasPermi="['business:coupon:on']" type="text" @click="setStatus(row, 'on')">上架</el-button>
           <el-button v-if="JSON.parse(row.status).value === 'on'" v-hasPermi="['business:coupon:off']" type="text" @click="setStatus(row, 'off')">下架</el-button>
           <el-button v-if="JSON.parse(row.status).value === 'init'" v-hasPermi="['business:coupon:remove']" class="del" type="text" @click="del(row)">删除</el-button>

+ 1 - 1
src/views/business/goods/add.vue

@@ -232,7 +232,7 @@ export default {
           { required: true,message:'请输入回收折扣', trigger: 'blur' },
           {
             pattern:
-              /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/,
+              /^([0-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/,
             message: "请输入合法的数字,最多两位小数",
             trigger: ["blur", "change"],
           },