Browse Source

2022.6.16

ggooalice 2 years ago
parent
commit
76b2caeed9

+ 2 - 0
fhKeeper/formulahousekeeper/timesheet/src/permissions.js

@@ -21,6 +21,7 @@ const StringUtil = {
         structureExport: false, // 导出人员 // 
         structureImport: false, // 导入人员 // 
         structureCertificate: false, // 管理专业证书 //
+        structureCustomConfig: false, // 自定义配置 //
 
         // 工时报告
         reportsCompany: false, // 查看全公司工时 // 后台
@@ -133,6 +134,7 @@ const StringUtil = {
         arr[i] == '工时成本预警表' ? obj.reportCostWarning = true : ''
         arr[i] == '查看阶段成本' ? obj.reportPhaseCost = true : ''
         arr[i] == '查看人员工时分配' ? obj.reportTimeDivide = true : ''
+        arr[i] == '自定义配置' ? obj.structureCustomConfig = true : ''
     }
 
     return obj

+ 11 - 6
fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -51,7 +51,7 @@
                     <el-form-item>
                         <div style="color:#999;font-size:13px;">共{{total}}人</div>
                     </el-form-item>
-                    <el-form-item style="float:right;" v-if="permissions.structureExport">
+                    <el-form-item style="float:right;" v-if="permissions.structureCustomConfig">
                         <el-link type="primary" :underline="false" @click="customConfigShow">自定义配置</el-link>
                     </el-form-item>
                     <el-form-item style="float:right;" v-if="permissions.structureExport">
@@ -469,8 +469,11 @@
                 <el-input size="medium" v-model="item.name" placeholder="请输入自定义配置项名称" style="width:200px;margin-right:20px" maxlength="8"></el-input>
                     <el-radio size="medium" :disabled="!item.name" v-model="item.type" :label="0" style="margin-right:10px;margin-left:10px">下拉</el-radio>
                     <el-radio size="medium" :disabled="!item.name" v-model="item.type" :label="1">输入</el-radio>
-                <span style="display:inline-block;width:100px"><el-button v-if="cusItemTypes[index] == 0" type="primary" size="small" @click="getConfigItemBtn(item)">配置选项</el-button></span>
-                <el-button type="danger" size="small" @click="customConfigDelete(item,index)" style="">删除</el-button>
+                <span style="display:inline-block;">
+                    <el-button v-if="cusItemTypes[index] == 0" type="primary" size="small" @click="getConfigItemBtn(item)">配置选项</el-button>
+                    <span v-if="!item.id && item.name && item.type == 0" style="color:#999;font-size:13px">保存后可配置选项</span>
+                </span>
+                <el-button style="margin-left:20px" type="danger" size="small" v-if="item.id" @click="customConfigDelete(item,index)">删除</el-button>
             </p>
             
             </div>
@@ -1861,10 +1864,8 @@
                         if (this.insertForm.superiorId){
                             form.superiorId = this.insertForm.superiorId
                         }
-                    }
-                });
 
-                this.http.post( this.port.manage.insert, form,
+                        this.http.post( this.port.manage.insert, form,
                         res => {
                             this.submitLoading = false;
                             if (res.code == "ok") {
@@ -1890,6 +1891,10 @@
                                 type: "error"
                             });
                         });
+                    }
+                });
+
+                
             },
 
             // 获取部门列表