修改

src/views/certManage/certList.vue

@@ -39,7 +39,7 @@
         </el-table-column>
         <el-table-column align="center" label="操作" width="100px" class-name="small-padding fixed-width">
           <template slot-scope="scope">
-            <el-button type="primary" size="small" @click="handleView(scope.row)">审批</el-button>
+            <el-button :disabled="scope.row.status == 0?false:true" type="primary" size="small" @click="handleView(scope.row)">审批</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/giftManage/giftList.vue

@@ -159,18 +159,16 @@
                 </el-form-item>
                 <el-form-item v-if="dataForm.productAttribute==1" label="礼品所在地" prop="location">
                     <el-select v-model="dataForm.location" filterable placeholder="请选择" style="width: 350px">
-                        <el-option :key="item.dictValue" v-for="item in locationList" :label="item.dictLabel" :value="item.dictValue">
+                        <el-option :key="item.dictLabel" v-for="item in locationList" :label="item.dictLabel" :value="item.dictLabel">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item style="width: 800px" label="礼品图片" prop="imgUrl">
-                    <el-tooltip comment="建议图片宽高比260*200" placement="top-start">
-                        <el-upload :action="fileImgUrl" list-type="picture-card" :file-list="dataForm.images"
+                    <el-upload :action="fileImgUrl" list-type="picture-card" :file-list="dataForm.images"
                             :on-success="handleGallerySucess" :on-exceed="handleExceed" :before-upload="uploadBannerImg"
                             :on-remove="handleRemove">
                             <i class="el-icon-plus"></i>
                         </el-upload>
-                    </el-tooltip>
                 </el-form-item>
                 <el-form-item label="库存量" prop="actualStock">
                     <el-input-number :precision="0" :step="1" v-model="dataForm.actualStock"></el-input-number>
@@ -459,6 +457,7 @@ export default {
         },
         handleUpdate(row) {
             this.dataForm = Object.assign({}, row);
+            this.dataForm.productAttribute = row.productAttribute.toString();
             let comment = this.dataForm.comment;
             if (row.productAttribute == 1) {
                 this.deliveryTypeList = [

src/views/goodsManage/goodsList.vue

@@ -155,18 +155,16 @@
                 </el-form-item>
                 <el-form-item v-if="dataForm.productAttribute==1" label="商品所在地" prop="location">
                     <el-select v-model="dataForm.location" filterable placeholder="请选择" style="width: 350px">
-                        <el-option :key="item.dictValue" v-for="item in locationList" :label="item.dictLabel" :value="item.dictValue">
+                        <el-option :key="item.dictLabel" v-for="item in locationList" :label="item.dictLabel" :value="item.dictLabel">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item style="width: 800px" label="商品图片" prop="imgUrl">
-                    <el-tooltip comment="建议图片宽高比260*200" placement="top-start">
-                        <el-upload :limit="1" :action="fileImgUrl" list-type="picture-card" :file-list="dataForm.images"
+                    <el-upload :limit="1" :action="fileImgUrl" list-type="picture-card" :file-list="dataForm.images"
                             :on-success="handleGallerySucess" :on-exceed="handleExceed" :before-upload="uploadBannerImg"
                             :on-remove="handleRemove">
                             <i class="el-icon-plus"></i>
                         </el-upload>
-                    </el-tooltip>
                 </el-form-item>
 
                 <el-form-item label="积分" prop="price">
@@ -423,6 +421,7 @@ export default {
         },
         handleUpdate(row) {
             this.dataForm = Object.assign({}, row);
+            this.dataForm.productAttribute = row.productAttribute.toString();
             let comment = this.dataForm.comment;
             if (row.productAttribute == 1) {
                 this.deliveryTypeList = [

src/views/pointManage/pointRulesList.vue

@@ -34,10 +34,10 @@
         <template slot-scope="scope">
           <el-button type="primary" size="small" @click="handleUpdate(scope.row, false)">编辑</el-button>
           <el-button v-if="scope.row.status == 0" type="success" size="small"
-            @click="changeState(scope.row.ruleId, 1)">开启</el-button>
+            @click="changeState(scope.row.id, 1)">开启</el-button>
           <el-button v-if="scope.row.status == 1" type="warning" size="small"
-            @click="changeState(scope.row.ruleId, 0)">关闭</el-button>
-          <el-button type="danger" size="mini" @click="handleDelete(scope.row.ruleId, -1)">删除</el-button>
+            @click="changeState(scope.row.id, 0)">关闭</el-button>
+          <el-button type="danger" size="mini" @click="handleDelete(scope.row.id, -1)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -54,12 +54,16 @@
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="45%">
       <el-form :rules="rules" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="100px"
         style='width:700px; margin-left:50px;'>
-        <el-form-item label="规则类型" prop="integralType">
+
+        <el-form-item v-if="dialogStatus == 'create'" label="规则类型" prop="integralType">
           <el-select v-model="dataForm.integralType" clearable  style="width: 350px;">
-            <el-option :key="item.type" v-for="item in allTypeList" :label="item.name" :value="item.type">
+            <el-option :key="item.dictValue" v-for="item in allTypeList" :label="item.dictLabel" :value="item.dictValue">
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item v-else label="规则类型">
+          <el-input disabled v-model="dataForm.integralTypeName" style="width: 350px"></el-input>
+              </el-form-item>
         <el-form-item label="积分" prop="integral">
                 <el-input-number
                   :precision="0"