2022.6.23 18:02

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

@@ -259,17 +259,12 @@
                             });
                             this.getSub();
                         } else {
-                            if(res.msg.indexOf("无法删除1") == '-1') {
-                                this.$message({
-                                    message: '该数据正在使用，无法删除',
-                                    type: "error"
-                                });
-                            } else {
+                            
                                 this.$message({
                                     message: res.msg,
                                     type: "error"
                                 });
-                            }
+                            
                         }
                     },
                     error => {

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -1,7 +1,7 @@
 <template>
   <section>
     <div>
-    <div class="sidebars" ref="sidebars" style="width: 200px;display: block;background: #fff">
+    <div class="sidebars" ref="sidebars" style="width: 200px;display: block;background: #fff;overflow-y:auto;overflow-x:hidden;">
       <div ref="abbisd" style="width: 100%;overflow: hidden;">
         <el-col :span="12">
           <el-menu

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -42,7 +42,12 @@
         </el-radio>
         <el-radio v-model="timeType.hourCostInputType" :label="1" style="width:100%;margin-left:10px;">方式二：直接录入时薪<span class="tip">(适合计时发放酬劳的小时工，兼职员工)</span></el-radio>
         </div>
-        <el-divider></el-divider>
+        <p style="margin-left:10px;color:#666;">工时填报必填项设置</p>
+        <el-row :gutter="20" style="padding-top:10px;width:100%;margin:0 auto;padding-left:10px;padding-right:10px;">
+            <el-col :span="24" >
+                
+            </el-col>
+        </el-row>
         <!--设置时长样式内容-->
         <p style="margin-left:10px;color:#666;">员工工作时长上报方式设置</p>
         <el-row :gutter="20" style="padding-top:10px;width:100%;margin:0 auto;padding-left:10px;padding-right:10px;">
@@ -286,7 +291,9 @@
                 </div>
             </el-col>
         </el-row>
-        
+        <span style="margin-left:10px;color:#666;">工作事项</span>
+        <el-switch style="margin-left: 40px" v-model="timeType.workContentState" active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
+        <span style="margin-left:10px;color:#999;">是否为必填项</span>
         <!-- 是否开启导入审核 -->
         <div class="yanjiu">
             <p style="margin-left:10px;color:#666;">是否开启导入审核</p>
@@ -712,6 +719,11 @@
                 } else {
                     this.timeType.customTextActive = true
                 }
+                if(this.timeType.workContentState == 1) {
+                    this.timeType.workContentState = true
+                } else {
+                    this.timeType.workContentState = false
+                }
                 // this.customDegreeName = this.timeType.customDegreeName
             },
             initTime() {
@@ -906,7 +918,9 @@
                         param.customTextStatus = param.customTextStatus && param.customTextActive ? 1 : 0
                         param.customDegreeStatus = param.customDegreeStatus && param.customDegreeActive ? 1 : 0
                         param.customDataStatus = param.customDataStatus && param.customDataActive ? 1 : 0
-                        
+
+
+                        param.workContentState = param.workContentState ? 1 : 0
                         // console.log(param, '将要提交的值')
                         // return
                         this.http.post('/time-type/save',param,

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

@@ -117,16 +117,16 @@
                         {{scope.$index+1+(page-1)*size}}
                     </template>
                 </el-table-column>
-                <el-table-column prop="name" label="姓名" sortable></el-table-column>
+                <el-table-column prop="name" label="姓名" ></el-table-column>
                 <el-table-column prop="phone" label="手机" width="120"></el-table-column>
-                <el-table-column prop="departmentName" label="部门" sortable></el-table-column>
+                <el-table-column prop="departmentName" label="部门" ></el-table-column>
                 <el-table-column label="角色" width="100">
                     <template slot-scope="scope">{{scope.row.roleName}}</template>
                 </el-table-column>
-                <el-table-column prop="monthCost" label="月成本" sortable v-if="permissions.structurePersonnel">
+                <el-table-column prop="monthCost" label="月成本"  v-if="permissions.structurePersonnel">
                     <template slot-scope="scope">{{user.timeType.isSecretSalary==0?(scope.row.monthCost==null?0:scope.row.monthCost):'*'}} 元</template>
                 </el-table-column>
-                <el-table-column prop="cost" label="时薪" sortable v-if="permissions.structurePersonnel">
+                <el-table-column prop="cost" label="时薪"  v-if="permissions.structurePersonnel">
                     <template slot-scope="scope">{{user.timeType.isSecretSalary==0?(scope.row.cost==null?0:scope.row.cost):'*'}} 元
                         <el-link v-if="user.timeType.isSecretSalary==0" @click.native="showSalaryList(scope.row)"><i class="iconfont firerock-iconrecord"></i></el-link>
                     </template>

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

@@ -416,7 +416,8 @@
                         </el-select>
                         <el-checkbox v-model="domain.taskFinish" v-if="domain.taskId != undefined">已完成</el-checkbox>
                     </el-form-item>
-                    <el-form-item :label="user.companyId==781?'具体内容与结果':'工作事项'" :prop="'domains.' + index + '.content'" >
+                    <el-form-item :label="user.companyId==781?'具体内容与结果':'工作事项'" :prop="'domains.' + index + '.content'" 
+                    :rules="user.timeType.workContentState == 1 ? { required: true, message: user.companyId==781?'填写具体内容与结果':'填写工作事项', trigger: 'blur' } : null">
                         <el-input v-model="domain.content" type="textarea" :rows="4" placeholder="请填写" clearable
                          :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)"></el-input>
                     </el-form-item>
@@ -554,7 +555,7 @@
                             </span>
                         </el-form-item>
                         <el-form-item label="工作事项" :prop="'domains.' + index + '.worktimeList.'+tIndex+'.content'" 
-                        :rules="{ required: true, message: '填写工作事项', trigger: 'blur' }">
+                        :rules="user.timeType.workContentState == 1 ? { required: true, message: '填写工作事项', trigger: 'blur' } : null">
                             <el-input v-model="timeItem.content" type="textarea" :rows="2" placeholder="请填写工作事项" clearable
                             :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)"
                             ></el-input>
@@ -590,9 +591,9 @@
             <el-form ref="workForm" :model="workForm" :rules="workRules" label-width="100px" v-if="!selConShow">
                 <el-form-item label="工作日期" prop="createDate">
                      <el-date-picker v-model="zhoRqi" format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="zhoRqis()" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="margin-right: 18px"></el-date-picker>
-                     <el-button @click="handleGetPrevWeek()">上周</el-button>
+                     <el-button @click="handleGetPrevWeek()">上一周</el-button>
+                     <el-button @click="handleGetNextvWeek()">下一周</el-button>
                      <el-button @click="getCurrentWeek()">本周</el-button>
-                     <el-button @click="handleGetNextvWeek()">下周</el-button>
                      <el-button @click="newDates()">新增日期</el-button>
                 </el-form-item>
                 <el-table :data="zhoData" style="width: 100%" v-loading="zhoLoading">
@@ -714,7 +715,7 @@
                     <el-input-number :id="'weekData_num'" :disabled="!canEdit" v-model="zhoBao.customData" style="width:200px;margin-right:155px;" @keyup.native="restrictNumber('weekData_num')"></el-input-number>
                 </div>
                 <!-- 自定义文本 -->
-                <div class="zhoFel" v-if="user.timeType.customTextActive">
+                <div class="zhoFel" v-if="user.timeType.customTextActive == 1">
                     <p>{{user.timeType.customTextName}}</p>
                     <el-input :disabled="!canEdit" v-model="zhoBao.customText" style="width:355px;" maxlength="25" show-word-limit></el-input>
                 </div>
@@ -3833,11 +3834,14 @@
                     if(this.user.timeType.customTextStatus == 1 && !this.zhoBao.customText){
                         errtips += this.user.timeType.customTextName + '、'
                     }
-                    if(errtips != ''){
+                    if(this.user.timeType.workContentState == 1 && !this.zhoBao.con){
+                        errtips +=  this.user.companyId==781?'具体内容与结果、':'工作事项、'
+                    }
+                    if(errtips){
                         errtips = errtips.substring(0,errtips.length - 1)
                         this.$message({
                             message: '请对' + errtips + '进行填写',
-                            type: 'error'
+                            type: 'warning'
                         })
                     }else {
                         this.tianxieDialogVisible = false