Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/customerBuler-crm/src/main.ts

@@ -2,7 +2,8 @@ import { createApp } from 'vue'
 import { createPinia } from 'pinia'
 import ElementPlus from 'element-plus'
 import "./TailWindCss/index.css";
-import 'element-plus/dist/index.css'
+// import 'element-plus/dist/index.css'
+// import './styles/index.scss'
 import 'animate.css/animate.min.css' //引入动画
 import * as ElementPlusIconsVue from '@element-plus/icons-vue'
 import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'

fhKeeper/formulahousekeeper/customerBuler-crm/src/styles/element-plus.scss

@@ -0,0 +1,9 @@
+@forward "element-plus/theme-chalk/src/common/var.scss" with (
+  $colors: (
+    "primary": (
+      "base": #075985,
+    ),
+  )
+);
+
+@use "element-plus/theme-chalk/src/index.scss" as *;

fhKeeper/formulahousekeeper/customerBuler-crm/src/styles/global.scss

@@ -1,3 +1,5 @@
+@use './index.scss' as *;
+
 $darkBlue: #3475c5;
 $ashen: #fefefe;
 $backColor: #eef3f6;
@@ -50,4 +52,4 @@ $modena: #6f4afe;
 .el-dialog__header, .el-dialog__body{
   margin: 0 !important;
   padding: 0 !important;
-}
+}

fhKeeper/formulahousekeeper/customerBuler-crm/src/styles/index.scss

@@ -0,0 +1 @@
+@use './element-plus.scss' as *;

fhKeeper/formulahousekeeper/timesheet/src/views/project/cost.vue

@@ -32,8 +32,8 @@
                 <el-radio-button :label="$t('other.project')"></el-radio-button>
                 <el-radio-button :label="$t('zhu-xiang-mu')" v-if="user.timeType.mainProjectState"></el-radio-button>
                 <el-radio-button :label="$t('projectclassification')" v-if="user.companyId != '1071'"></el-radio-button>
-                <el-radio-button :label="$t('lable.department')" v-if="permissions.viewAllSummary || permissions.viewMagDeptSummary"></el-radio-button>
-                <el-radio-button :label="$t('ren-yuan')" v-if="permissions.countPersonnel"></el-radio-button>
+                <el-radio-button :label="$t('lable.department')" v-if="(permissions.viewAllSummary || permissions.viewMagDeptSummary) && !user.dingdingUserid"></el-radio-button>
+                <el-radio-button :label="$t('ren-yuan')" v-if="permissions.countPersonnel && !user.dingdingUserid"></el-radio-button>
                 <el-radio-button :label="namess" v-if="jichu.customDegreeActive == 1 && !jichu.customDegreeMultiple"></el-radio-button>
                 <el-radio-button v-for="item in theCustomList" :key="item.id" :label="item.name"></el-radio-button>
             </el-radio-group>

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

@@ -268,7 +268,7 @@
                 @size-change="reviewHandleSizeChange"
                 @current-change="reviewHandleCurrentChange"
                 :current-page="reviewTableObj.reviewTableIndex"
-                :page-sizes="[10, 30, 50, 100, 200, 300]"
+                :page-sizes="[50, 200, 500, 1000, 2000]"
                 :page-size="reviewTableObj.reviewTableSize"
                 layout="total, prev, pager, next, sizes"
                 :total="reviewTableObj.reviewTableTotal"
@@ -536,7 +536,7 @@
                 reviewTableObj: {
                     reviewTableTotal: 0,
                     reviewTableIndex: 1,
-                    reviewTableSize: 50,
+                    reviewTableSize: +(localStorage.getItem("reviewTableSize") || '50'),
                 },
                 listBackup: []
             };
@@ -818,6 +818,7 @@
                 this.showListLoading()
                 this.reviewTableObj.reviewTableSize = val,
                 this.reviewTableObj.reviewTableIndex = 1
+                localStorage.setItem('reviewTableSize', JSON.stringify(val))
                 this.list = this.currentChangePage(val, 1, this.listBackup);
             },
             reviewHandleCurrentChange(val) {

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

@@ -2539,11 +2539,11 @@ export default {
                     return;
                 }
 
-                if(this.user.timeType.userWithMultiDept == 1) {
+                if(this.user.timeType.userWithMultiDept == 1 && this.userReportDeptList.length > 0) {
                     if(this.form.domains[i].reportTargetDeptId) {
                         formData.append('reportTargetDeptId', this.form.domains[i].reportTargetDeptId || '');
                     } else {
-                        this.$toast.fail("请选择[" + this.form.domains[i].projectName + "]审核部门");
+                        this.$toast.fail("请选择[" + this.form.domains[i].projectName + "]填报部门");
                         return;
                     }
                 }