Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/tasks/ImportModal.vue

@@ -13,8 +13,10 @@
         </div>
       </div>
     </template>
-    <div class="text-lg p-5">
-      <div class="pb-5">1. 点击下载 <a @click="getTemplate()" class="text-[#79BBFF] cursor-pointer">任务导入模板</a></div>
+    <div class="p-5">
+      <div class="pb-5">1. 点击下载 <el-link type="primary"
+          @click="downloadTemplate('Task', '任务导入模板.xlsx')">任务导入模板.xlsx</el-link>
+      </div>
       <div>2. 填写excel文件, 任务名称与优先级必填</div>
 
     </div>
@@ -24,6 +26,8 @@
 <script lang="ts" setup>
 import { ref, watch } from "vue";
 import { Props, Emits } from "./type"
+import { downloadTemplate } from '@/utils/tools'
+
 
 const props = defineProps<Props>();
 const emits = defineEmits<Emits>();

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/tasks/api.ts

@@ -30,9 +30,9 @@ export const defaultSearchForm = {
 };
 export const PRIORITY = [
   //优先级
-  { label: "高", value: 0 },
+  { label: "高", value: 2 },
   { label: "中", value: 1 },
-  { label: "低", value: 2 },
+  { label: "低", value: 0 },
 ];
 export const STATUS: StatusType[] = [
   //任务状态

fhKeeper/formulahousekeeper/octopus/src/views/customer/list.vue

@@ -236,6 +236,8 @@
                             <el-option :value="3" label="员工自由选择审批人"></el-option>
                             <el-option :value="4" label="项目所属BU审核"></el-option>
                             <el-option :value="5" label="所属部门负责人审核"></el-option>
+                            <el-option :value="6" label="直属或部门负责人审核->项目日报审核人审核"></el-option>
+                            <el-option :value="7" label="项目和部门并行审核"></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item>

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

@@ -90,7 +90,7 @@
                                     :props="{ checkStrictly: true, expandTrigger: 'hover' }" :show-all-levels="false"
                                     clearable @change="getTaskTimeCompare()" size="mini"></el-cascader>
                                 
-                                <vueCascader :size="'mini'" :widthStr="'200'" :clearable="true" :subject="departmentOption" :radios="false" :distinction="'1'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1"></vueCascader>
+                                <vueCascader :size="'mini'" :widthStr="'200'" :clearable="true" :subject="departmentOption" :radios="true" :distinction="'1'" @vueCasader="vueCasader" v-if="user.userNameNeedTranslate == 1"></vueCascader>
                                 
 
                                 <el-link @click="exportTaskCompare" style="float:right;"><i