2022.5.30

fhKeeper/formulahousekeeper/timesheet/src/views/Login.vue

@@ -275,6 +275,13 @@
                         this.http.post(this.port.manage.login, this.ruleForm , res => {
                             this.logining = false;
                             if (res.code == "ok") {
+                                if(res.data.functionList.length == 0){
+                                    this.$message({
+                                        message: '请联系管理员为\u3000' + res.data.roleName + '\u3000分配权限',
+                                        type: 'error'
+                                    })
+                                    return
+                                }
                                 var user = res.data;
                                 sessionStorage.setItem('user', JSON.stringify(res.data));
                                 this.permissionsList(res.data)
@@ -311,7 +318,7 @@
                 }
                 var ssAkl = this.StringUtil.permissions(arr)
                 sessionStorage.setItem('permissions', JSON.stringify(ssAkl));
-                console.log(ssAkl, '返回过来的数据原--------')
+                // console.log(ssAkl, '返回过来的数据原--------')
             },
         },
     }

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -231,7 +231,7 @@
 
         <!-- 新增/编辑人员的Dialog -->
         <el-dialog :title="title" :visible.sync="dialogVisible" width="550px" >
-            <el-form ref="form1" :model="insertForm" :rules="rules" label-width="80px">
+            <el-form ref="form12" :model="insertForm" :rules="rules" label-width="80px">
                 <el-form-item label="名字" prop="name">
                     <el-input v-model="insertForm.name" placeholder="请输入姓名" clearable></el-input>
                 </el-form-item>
@@ -276,7 +276,7 @@
                     <el-input v-model="insertForm.position" placeholder="请输入岗位职级别" clearable></el-input>
                 </el-form-item>
 
-                <div class="zhaunye"><p>专业证书</p><p><el-link type="primary" @click="addCertificateList()">添加更多证书</el-link><el-link v-if="permissions.structureCertificate" type="primary" @click="managementDiolog = true" style="margin-left: 20px">管理专业证书</el-link></p></div>
+                <div class="zhaunye"><p>专业证书</p><p><el-link type="primary" @click="addCertificateList()">添加更多证书123</el-link><el-link v-if="permissions.structureCertificate" type="primary" @click="managementDiolog = true" style="margin-left: 20px">管理专业证书</el-link></p></div>
                 <div class="certificateList">
                     <div class="moreList">
                         <div class="moreLiList" v-for="(item,index) in insertForm.certJson" :key="index">
@@ -294,7 +294,7 @@
             </el-form>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible=false">取消</el-button>
-                <el-button type="primary" @click="submitInsert" :loading="submitLoading">提交</el-button>
+                <el-button type="primary" @click="submitInsert('insertForm')" :loading="submitLoading">提交</el-button>
             </span>
         </el-dialog>
         <!-- 编辑超级管理员的Dialog -->
@@ -1215,7 +1215,7 @@
                 var form = {}
                 var ssR = this.upRepeat(this.insertForm.certJson)
                 var trs = true
-                this.$refs.form1.validate(valid => {
+                this.$refs.form12.validate(valid => {
                     if (valid) {
                         this.submitLoading = true;
                         if(ssR) {
@@ -1261,38 +1261,40 @@
                         if (this.insertForm.departmentId != null) {
                             form.departmentId = this.insertForm.departmentId[this.insertForm.departmentId.length-1];
                         }
+
+                        if(!ssR && trs) {
+                            this.http.post( this.port.manage.insert, form,
+                            res => {
+                                this.submitLoading = false;
+                                if (res.code == "ok") {
+                                    this.$message({
+                                        message: this.insertForm.id != null ? "修改" : "创建" + "成功",
+                                        type: "success"
+                                    });
+                                    this.dialogVisible = false;
+                                    this.getUser();
+                                    this.getUsers()
+                                } else {
+                                    this.$message({
+                                        message: res.msg,
+                                        type: "error"
+                                    });
+                                }
+                            },
+                            error => {
+                                this.listLoading = false;
+                                this.$message({
+                                    message: error,
+                                    type: "error"
+                                });
+                            });
+                        }
                     }
                 });
                 // console.log(form, '提交的数据')
                 // return
                 // console.log(ssR, trs)
-                if(!ssR && trs) {
-                    this.http.post( this.port.manage.insert, form,
-                    res => {
-                        this.submitLoading = false;
-                        if (res.code == "ok") {
-                            this.$message({
-                                message: this.insertForm.id != null ? "修改" : "创建" + "成功",
-                                type: "success"
-                            });
-                            this.dialogVisible = false;
-                            this.getUser();
-                            this.getUsers()
-                        } else {
-                            this.$message({
-                                message: res.msg,
-                                type: "error"
-                            });
-                        }
-                    },
-                    error => {
-                        this.listLoading = false;
-                        this.$message({
-                            message: error,
-                            type: "error"
-                        });
-                    });
-                }
+                
                 
             },
 

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -1064,17 +1064,23 @@
             v-loading="tbload"
             lazy
           >
-            <el-table-column min-width="300" label="部门" prop="department">
+            <el-table-column min-width="150" label="部门" prop="department">
             </el-table-column>
-            <el-table-column min-width="300" prop="name" label="姓名" >
+            <el-table-column min-width="150" prop="name" label="姓名" >
             </el-table-column>
             <el-table-column
-              min-width="300"
+              min-width="200"
               label="未填日期"
               align="center"
               prop="createDate"
             >
             </el-table-column>
+            <el-table-column
+              min-width="200"
+              label="考勤数据"
+              prop="cardTime"
+              align="center"
+              v-if="user.timeType.syncCorpwxTime == 1"></el-table-column>
           </el-table>
           <el-alert style="position:absolute;bottom:0;z-index:10;" v-if="isFlag" title="加载中..." type="success" center :closable="false" show-icon></el-alert>
           <el-alert style="position:absolute;bottom:0;z-index:10;" v-if="isMore" title="无更多数据" type="success" center show-icon></el-alert>

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/weekEdit.vue

@@ -99,17 +99,6 @@
                         <van-stepper v-model="pItem.progress" integer min="0" max="100" />%
                     </template>
                     </van-field>
-                    <van-field v-if="user.company.packageProject == 1"  readonly name="taskId" :value="item.taskName" label="关联任务" placeholder="请选择关联任务" @click="clickPickerTask(index)"
-                    ></van-field>
-                    <van-field name="taskFinish" label="是否已完成" v-if="item.taskId != null">
-                        <template #input>
-                            <van-checkbox v-model="item.taskFinish" shape="square">已完成</van-checkbox>
-                        </template>
-                        
-                    </van-field>
-                    <van-popup v-model="item.showPickerTask" position="bottom">
-                        <van-picker show-toolbar :columns="item.taskList" value-key="taskName" @confirm="choseTask" @cancel="item.showPickerTask = false;$forceUpdate()" />
-                    </van-popup>
                     
                     <!-- 常规选择时间的方式 -->
                     <!-- 全天上下午模式 -->
@@ -1092,7 +1081,7 @@
                 // if (!this.canEdit) return;
                 // this.clickIndex = i;
                 // this.showPickerProject = true;
-                // console.log(i, item, this.currentForm)
+                console.log(i, item, this.currentForm)
                 this.proIdx = i
                 this.showPickerUserddp = true
                 // this.$router.push({