修改bug

src/views/coupon/coupon/index.vue

@@ -17,7 +17,8 @@
       <el-form-item label="状态">
         <el-select v-model="queryParams.state" placeholder="请选择状态" clearable @keyup.enter.native="handleQuery">
           <el-option label="生效中" value="1"></el-option>
-          <el-option label="未生效" value="2"></el-option>          
+          <el-option label="未生效" value="2"></el-option>   
+          <el-option label="已失效" value="3"></el-option>       
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -445,6 +446,7 @@ export default {
     resetQuery() {
       this.queryParams.name=null;
       this.queryParams.categoryId=null;
+      this.queryParams.state=null;
       this.handleQuery();
     },
     /** 新增按钮操作 */

src/views/coupon/couponCategory/index.vue

@@ -62,7 +62,7 @@
         <el-form-item label="类别名" prop="name">
           <el-input v-model="form.name" placeholder="请输入类别名" minlength="1" maxlength="7"/>
         </el-form-item>
-        <el-form-item label="折扣类别" prop="type">
+        <el-form-item label="折扣形式" prop="type">
           <el-radio-group v-model="form.type">
             <el-radio :label="1">抵扣</el-radio>
             <el-radio :label="2">折扣</el-radio>

src/views/machine/model/modelCom.vue

@@ -45,7 +45,7 @@
               </template>
             </el-table-column>
             <el-table-column label="组件状态" align="center"  prop="state_desc"/>
-            <el-table-column label="原料" align="center">
+            <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-button v-hasPermi="['machine:model:edit']" size="mini" type="text" @click="handleEditDialog(scope.row)" v-show=!scope.row.isShow>编辑组件属性</el-button>
                 <el-button size="mini" type="text" @click="handleEnter(scope.$index, scope.row)"  v-show=scope.row.isShow>确定</el-button>