12.31开源admin代码更新

admin/src/views/maintain/devconfig/combineDataList.vue

@@ -20,7 +20,8 @@
         <!--        </el-form-item>-->
       </el-form>
     </div>
-    <el-button type="primary" size="mini" @click="handlerOpenEditData({},0)" v-if="((formData.id==55 || formData.name==='签到天数配置') && dataList.list.length<7) || (formData.id!=55|| formData.name!=='签到天数配置')">添加数据</el-button>
+    <el-button type="primary" size="mini" @click="handlerOpenEditData({},0)" v-hasPermi="['admin:system:group:data:save']">添加数据</el-button>
+    <!-- v-if="((formData.id==55 || formData.name==='签到天数配置') && dataList.list.length<7) || (formData.id!=55|| formData.name!=='签到天数配置')" -->
     <el-dialog
       :title="editDataConfig.isCreate === 0?'添加数据':'编辑数据'"
       :visible.sync="editDataConfig.visible"
@@ -39,6 +40,7 @@
     <el-table
       :data="dataList.list"
       style="width: 100%;margin-bottom: 20px;"
+      :header-cell-style=" {fontWeight:'bold'}"
     >
       <el-table-column label="编号" prop="id" />
       <el-table-column
@@ -65,8 +67,8 @@
       </el-table-column>
       <el-table-column label="操作" width="200">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="handlerOpenEditData(scope.row,1)">编辑</el-button>
-          <el-button type="text" size="small" @click="handlerDelete(scope.row)">删除</el-button>
+          <el-button type="text" size="small" @click="handlerOpenEditData(scope.row,1)" v-hasPermi="['admin:system:group:data:update','admin:system:group:data:info']">编辑</el-button>
+          <el-button type="text" size="small" @click="handlerDelete(scope.row)" v-if="formMark !== 99" v-hasPermi="['admin:system:group:data:delete']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -110,7 +112,8 @@ export default {
         editData: {}
       },
       formConf: { fields: [] },
-      dataList: { list: [], total: 0 }
+      dataList: { list: [], total: 0 },
+      formMark:0
     }
   },
   mounted() {
@@ -145,6 +148,7 @@ export default {
     handlerGetFormConfig() { // 获取表单配置后生成table列
       const _pram = { id: this.formData.formId }
       systemFormConfigApi.getFormConfigInfo(_pram).then(data => {
+        this.formMark = parseInt(data.id);
         this.formConf = JSON.parse(data.content)
       })
     },

admin/src/views/maintain/devconfig/combineEdit.vue

@@ -7,12 +7,8 @@
       <el-form-item
         label="状态"
         prop="status"
-        :rules="[{ required: true, message:'正确操作状态', trigger:['change'] }]"
-      >
-        <el-switch
-          v-model="selfForm.status"
-
-        />
+        :rules="[{ required: true, message:'正确操作状态', trigger:['change'] }]">
+        <el-switch  v-model="selfForm.status"/>
       </el-form-item>
     </el-form>
     <parser
@@ -30,6 +26,7 @@
 import parser from '@/components/FormGenerator/components/parser/Parser'
 import * as systemGroupDataApi from '@/api/systemGroupData.js'
 import * as systemFormConfigApi from '@/api/systemFormConfig.js'
+import {Debounce} from '@/utils/validate'
 export default {
   // name: "combineEdit"
   components: { parser },
@@ -71,9 +68,9 @@ export default {
         this.formConf = JSON.parse(data.content)
       })
     },
-    handlerSubmit(formValue) {
+    handlerSubmit:Debounce(function(formValue) {
       this.isCreate === 0 ? this.handlerSave(formValue) : this.handlerEdit(formValue)
-    },
+    }),
     handlerSave(formValue) {
       const _pram = this.buildFormPram(formValue)
       systemGroupDataApi.groupDataSave(_pram).then(data => {

admin/src/views/maintain/devconfig/combinedData.vue

@@ -11,21 +11,22 @@
             </el-form-item>
           </el-form>
         </div>
-        <el-button size="mini" type="primary" @click="handlerOpenEdit({},0)">添加数据组</el-button>
+        <el-button size="mini" type="primary" @click="handlerOpenEdit({},0)" v-hasPermi="['admin:system:group:save']">添加数据组</el-button>
       </div>
       <el-table
         :data="dataList.list"
         style="width: 100%;margin-bottom: 20px;"
         size="mini"
         highlight-current-row
+        :header-cell-style=" {fontWeight:'bold'}"
       >
         <el-table-column label="数据组名称" prop="name"  min-width="150"/>
         <el-table-column label="简介" prop="info" min-width="150"/>
         <el-table-column label="操作" fixed="right" min-width="180">
           <template slot-scope="scope">
-            <el-button size="small" type="text" @click="handleDataList(scope.row)">数据列表</el-button>
-            <el-button size="small" type="text" @click="handlerOpenEdit(scope.row, 1)">编辑</el-button>
-            <el-button size="small" type="text" @click="handleDelete(scope.row)">删除</el-button>
+            <el-button size="small" type="text" @click="handleDataList(scope.row)" v-hasPermi="['admin:system:group:data:list']">数据列表</el-button>
+            <el-button size="small" type="text" @click="handlerOpenEdit(scope.row, 1)" v-hasPermi="['admin:system:group:info','admin:system:group:update']">编辑</el-button>
+            <el-button size="small" type="text" @click="handleDelete(scope.row)"  v-hasPermi="['admin:system:group:delete']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>

admin/src/views/maintain/devconfig/combinedDataEdit.vue

@@ -37,6 +37,7 @@
 <script>
 import formConfigList from '@/views/maintain/formConfig'
 import * as systemGroupApi from '@/api/systemGroup'
+import {Debounce} from '@/utils/validate'
 export default {
   // name: "combinedDataEdit"
   components: { formConfigList },
@@ -81,12 +82,12 @@ export default {
       this.editPram.formId = this.selectedFormConfigData.id
       this.selectFormDialogConfig.visible = false
     },
-    handlerSubmit(form) {
+    handlerSubmit:Debounce(function(form) {
       this.$refs[form].validate(result => {
         if (!result) return
         this.isCreate === 0 ? this.handlerSave(this.editPram) : this.handlerEdit(this.editPram)
       })
-    },
+    }),
     handlerSave(pram) {
       systemGroupApi.groupSave(pram).then(data => {
         this.$message.success('添加组合数据成功')

admin/src/views/maintain/devconfig/configCategotyEdit.vue

@@ -53,6 +53,7 @@
 <script>
 import * as categoryApi from '@/api/categoryApi.js'
 import * as selfUtil from '@/utils/ZBKJIutil.js'
+import {Debounce} from '@/utils/validate'
 export default {
   // name: "configCategotyEdit"
   props: {
@@ -120,12 +121,12 @@ export default {
         this.editPram.extra = extra
       }
     },
-    handlerSubmit(formName) {
+    handlerSubmit:Debounce(function(formName) {
       this.$refs[formName].validate((valid) => {
         if (!valid) return
         this.handlerSaveOrUpdate(this.isCreate === 0)
       })
-    },
+    }),
     handlerSaveOrUpdate(isSave) {
       if (isSave) {
         this.editPram.pid = this.prent.id