htc il y a 22 heures
Parent
commit
8712812052

+ 5 - 1
src/views/modules/activity/classify.vue

@@ -17,7 +17,11 @@
           </div>
           <el-table :data="dataList" border cell-class-name="vertical-top-cell" v-loading="loading" empty-text="暂无活动分类" style="margin-top: 12px;">
             <el-table-column prop="categoryName" label="分类名称"></el-table-column>
-            <el-table-column prop="activityCount" label="关联活动数"></el-table-column>
+            <el-table-column prop="activityCount" label="关联活动数">
+              <template #default="scope">
+                <div>{{ scope.row.activityCount||0 }}</div>
+              </template>
+            </el-table-column>
             <!-- <el-table-column prop="categoryNo" label="分类编码"></el-table-column> -->
             <!-- <el-table-column prop="enable" label="状态">
               <template #default="scope">

+ 4 - 4
src/views/modules/activity/type.vue

@@ -28,7 +28,7 @@
                       <el-button link type="text" @click="handleEdit(scope.row)" v-if="$hasPermission('core:activitytype:update')">编辑</el-button>
                       <!-- <el-button link type="text" @click="handleOpenClose(scope.row,1)" v-if="$hasPermission('core:activitytype:openClose')&&scope.row.enable==0">启用</el-button>
                       <el-button link type="text" @click="handleOpenClose(scope.row,0)" v-if="$hasPermission('core:activitytype:openClose')&&scope.row.enable==1">停用</el-button> -->
-                      <el-button link type="text" @click="handleDelete(scope.row)" v-if="$hasPermission('core:activitytype:delete')">删除</el-button>
+                      <el-button link type="text" @click="handleDelete(scope.row)" v-if="$hasPermission('core:activitytype:delete')&&scope.row.enable!=1">删除</el-button>
                   </template>
               </el-table-column>
             </el-table>
@@ -39,7 +39,7 @@
               <el-input v-model="form.typeName" placeholder="请输入类型名称"></el-input>
             </el-form-item>
             <el-form-item label="类型编码" prop="typeNo">
-              <el-input v-model="form.typeNo" placeholder="请输入类型编码"></el-input>
+              <el-input v-model="form.typeNo" placeholder="请输入类型编码" :disabled="form.enable==1"></el-input>
             </el-form-item>
             <!-- <el-form-item label="状态" prop="enable">
               <el-radio v-model="form.enable" :label="1">启用</el-radio>
@@ -72,7 +72,7 @@ export default {
         id: '',
         typeName: '',
         typeNo: '',
-        enable: 1
+        enable: 0
       },
       rules: {
         typeName: [
@@ -120,7 +120,7 @@ export default {
         id: '',
         typeName: '',
         typeNo: '',
-        enable: 1
+        enable: 0
       }
       this.$refs.typeRef.resetFields()
     },