|  | @@ -40,6 +40,10 @@
 | 
	
		
			
				|  |  |            <el-radio v-model="form.type" :label="1">满减券</el-radio>
 | 
	
		
			
				|  |  |            <el-radio v-model="form.type" :label="2">折扣券</el-radio>
 | 
	
		
			
				|  |  |          </el-form-item>
 | 
	
		
			
				|  |  | +        <el-form-item label="使用门槛" prop="useThresholdType" required>
 | 
	
		
			
				|  |  | +          <el-radio v-model="form.useThresholdType" :label="1">无条件</el-radio>
 | 
	
		
			
				|  |  | +          <el-radio v-model="form.useThresholdType" :label="2">指定条件</el-radio>
 | 
	
		
			
				|  |  | +        </el-form-item>
 | 
	
		
			
				|  |  |          <el-form-item label="优惠额度" prop="quota" required>
 | 
	
		
			
				|  |  |            <el-input placeholder="优惠额度" v-model="form.quota">
 | 
	
		
			
				|  |  |              <template slot="append">
 | 
	
	
		
			
				|  | @@ -48,10 +52,12 @@
 | 
	
		
			
				|  |  |              </template>
 | 
	
		
			
				|  |  |            </el-input>
 | 
	
		
			
				|  |  |          </el-form-item>
 | 
	
		
			
				|  |  | -        <el-form-item label="使用门槛" prop="useThresholdType" required>
 | 
	
		
			
				|  |  | -          <el-radio v-model="form.useThresholdType" :label="1">无条件</el-radio>
 | 
	
		
			
				|  |  | -          <el-radio v-model="form.useThresholdType" :label="2">指定条件</el-radio>
 | 
	
		
			
				|  |  | +        <el-form-item v-if="form.useThresholdType==2" label="累计消费满" prop="useThresholdAmount" required>
 | 
	
		
			
				|  |  | +          <el-input placeholder="" v-model="form.useThresholdAmount">
 | 
	
		
			
				|  |  | +            <template slot="append">元</template>
 | 
	
		
			
				|  |  | +          </el-input>
 | 
	
		
			
				|  |  |          </el-form-item>
 | 
	
		
			
				|  |  | +        
 | 
	
		
			
				|  |  |          <el-form-item label="使用对象" prop="useUserType" required>
 | 
	
		
			
				|  |  |            <el-radio-group v-model="form.useUserType" :disabled ="isDisabled" @input="handleChange">
 | 
	
		
			
				|  |  |              <el-radio :label="1">所有用户</el-radio>
 | 
	
	
		
			
				|  | @@ -89,7 +95,7 @@
 | 
	
		
			
				|  |  |                  ></el-option>
 | 
	
		
			
				|  |  |                </el-select>
 | 
	
		
			
				|  |  |          </el-form-item>
 | 
	
		
			
				|  |  | -        <el-form-item label="使用票务" prop="useGood" required>
 | 
	
		
			
				|  |  | +        <!-- <el-form-item label="使用票务" prop="useGood" required>
 | 
	
		
			
				|  |  |            <el-select v-model="form.useGood" multiple placeholder="请选择使用票务">
 | 
	
		
			
				|  |  |                  <el-option
 | 
	
		
			
				|  |  |                    v-for="dict in goodsList"
 | 
	
	
		
			
				|  | @@ -98,12 +104,7 @@
 | 
	
		
			
				|  |  |                    :value="dict.goodsId"
 | 
	
		
			
				|  |  |                  ></el-option>
 | 
	
		
			
				|  |  |                </el-select>
 | 
	
		
			
				|  |  | -        </el-form-item>
 | 
	
		
			
				|  |  | -        <el-form-item v-if="form.useThresholdType==2" label="累计消费满" prop="useThresholdAmount" required>
 | 
	
		
			
				|  |  | -          <el-input placeholder="" v-model="form.useThresholdAmount">
 | 
	
		
			
				|  |  | -            <template slot="append">元</template>
 | 
	
		
			
				|  |  | -          </el-input>
 | 
	
		
			
				|  |  | -        </el-form-item>
 | 
	
		
			
				|  |  | +        </el-form-item> -->
 | 
	
		
			
				|  |  |          <el-form-item label="发放数量" prop="issuseNum" required>
 | 
	
		
			
				|  |  |            <el-input placeholder="" v-model="form.issuseNum" @change="changeNumber('issuseNum')">
 | 
	
		
			
				|  |  |              <template slot="append">张</template>
 | 
	
	
		
			
				|  | @@ -203,7 +204,7 @@ export default {
 | 
	
		
			
				|  |  |            { required: true, message: "请选择使用剧目", trigger: ["change","blur"] },
 | 
	
		
			
				|  |  |          ],
 | 
	
		
			
				|  |  |          useUserId:[{ required: true, message: "请选择分销商", trigger: ["change","blur"] }],
 | 
	
		
			
				|  |  | -        useGood	: [{ required: true, message: "请选择使用票务", trigger: ["change","blur"] }],
 | 
	
		
			
				|  |  | +        // useGood	: [{ required: true, message: "请选择使用票务", trigger: ["change","blur"] }],
 | 
	
		
			
				|  |  |          useThresholdType: [{ required: true, message: "请选择使用门槛", trigger: ["change","blur"] }],
 | 
	
		
			
				|  |  |          useThresholdAmount: [{ required: true, message: "请输入累计消费满", trigger: ["change","blur"] }],
 | 
	
		
			
				|  |  |          channelType	: [{ required: true, message: "请选择发放渠道", trigger: ["change","blur"] }],
 | 
	
	
		
			
				|  | @@ -281,8 +282,9 @@ export default {
 | 
	
		
			
				|  |  |            this.$set(this.form, 'useDay', obj.useDay);
 | 
	
		
			
				|  |  |            this.$set(this.form, 'useDate', [obj.useStartDate, obj.useEndDate]);
 | 
	
		
			
				|  |  |            this.performChange(obj.usePerform);
 | 
	
		
			
				|  |  | -          this.$set(this.form, 'useGood', obj.useGood);
 | 
	
		
			
				|  |  | -          this.form.useGood= this.getGoodsIds(this.form.useGood);
 | 
	
		
			
				|  |  | +          this.$set(this.form, 'useGood', '');
 | 
	
		
			
				|  |  | +          // this.$set(this.form, 'useGood', obj.useGood);
 | 
	
		
			
				|  |  | +          //this.form.useGood= this.getGoodsIds(this.form.useGood);
 | 
	
		
			
				|  |  |          });
 | 
	
		
			
				|  |  |        } else {
 | 
	
		
			
				|  |  |          this.title = "新增优惠券";
 | 
	
	
		
			
				|  | @@ -400,7 +402,7 @@ export default {
 | 
	
		
			
				|  |  |              this.loading = true;
 | 
	
		
			
				|  |  |              let params = JSON.parse(JSON.stringify(this.form))
 | 
	
		
			
				|  |  |              params.useUserId  = this.form.useUserId.join(",");
 | 
	
		
			
				|  |  | -            params.useGood = this.getGoodsIds(params.useGood, "array")
 | 
	
		
			
				|  |  | +            // params.useGood = this.getGoodsIds(params.useGood, "array")
 | 
	
		
			
				|  |  |              console.log(this.form,'this.form');
 | 
	
		
			
				|  |  |              console.log(params,'params');
 | 
	
		
			
				|  |  |              const { code } = await saveAndEdit({ ...params });
 | 
	
	
		
			
				|  | @@ -461,7 +463,7 @@ export default {
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      performChange(e){
 | 
	
		
			
				|  |  |        // console.log('performChange',e);
 | 
	
		
			
				|  |  | -      console.log('this.performList',this.performList);
 | 
	
		
			
				|  |  | +      // console.log('this.performList',this.performList);
 | 
	
		
			
				|  |  |        // this.$set(this.form, 'useGood', '');
 | 
	
		
			
				|  |  |        console.log('performChange',e);
 | 
	
		
			
				|  |  |        let goodsList = this.performList.filter(item => {return item.value == e})[0].goodsList;
 | 
	
	
		
			
				|  | @@ -479,10 +481,9 @@ export default {
 | 
	
		
			
				|  |  |          this.goodsList = [];
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        // this.goodsList = goodsList;
 | 
	
		
			
				|  |  | -      console.log('useGood', goodsList, this.dataList);
 | 
	
		
			
				|  |  | -      console.log('goodsList',this.goodsList);
 | 
	
		
			
				|  |  |        // console.log('useGood',this.form.useGood);
 | 
	
		
			
				|  |  | -      this.$set(this.form, 'useGood', null);
 | 
	
		
			
				|  |  | +      // this.$set(this.form, 'useGood', null);
 | 
	
		
			
				|  |  | +      this.$set(this.form, 'useGood', '');
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      /**
 |