Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd

yanzhu-ui-vue3/src/main.js

@@ -45,7 +45,7 @@ import DictTag from '@/components/DictTag'
 // Vue3表单组件
 import VForm3 from '@/lib/vform/designer.umd.js'
 import '@/lib/vform/designer.style.css'
-
+import dayjs from 'dayjs'
 const app = createApp(App)
 
 // 全局方法挂载
@@ -67,7 +67,7 @@ app.config.globalProperties.$tryToJson=(str,df)=>{
     return (df||{});
   }
 }
-
+app.config.globalProperties.$dt=dayjs;
 // 全局组件挂载
 app.component('DictTag', DictTag)
 app.component('Pagination', Pagination)

yanzhu-ui-vue3/src/views/manage/attendanceUbiData/index.vue

@@ -3,14 +3,14 @@
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
      
       <el-form-item label="项目" prop="projectId">
-        <el-select :disabled="data.currentProId != ''" v-model="queryParams.projectId" placeholder="请选择项目" clearable
+        <el-select :disabled="data.currentProId != ''" style="width:150px;" v-model="queryParams.projectId" placeholder="请选择项目" clearable
           @change="()=>{handleQuery();projectChange();}">
           <el-option v-for="prj in data.projects" :key="prj.id" :label="prj.projectName" :value="prj.id">
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="所属单位" prop="subDeptId">
-        <el-select v-model="queryParams.subDeptId" placeholder="请选择所属单位"  clearable @change="()=>{handleQuery();subDeptChange();}">
+        <el-select v-model="queryParams.subDeptId"  style="width:150px;" placeholder="请选择所属单位"  clearable @change="()=>{handleQuery();subDeptChange();}">
           <el-option v-for="(it, idx) in data.subdepts" :key="it.id" :label="it.subDeptName" :value="it.id" />
         </el-select>
       </el-form-item>
@@ -157,6 +157,7 @@ import { listAttendanceUbiData, getAttendanceUbiData, delAttendanceUbiData, addA
 import { findMyProjectList } from "@/api/publics";
 import useUserStore from '@/store/modules/user'
 import { listProProjectInfoSubdepts } from "@/api/manage/proProjectInfoSubdepts";
+
 const { proxy } = getCurrentInstance();
 
 const {  pro_craft_type,  pro_craft_post } = proxy.useDict( 'pro_craft_type',  'pro_craft_post');
@@ -345,8 +346,10 @@ function handleExport() {
   }, `attendanceUbiData_${new Date().getTime()}.xlsx`)
 }
 
+queryParams.value.inTime= proxy.$dt(new Date()).format("YYYY-MM-DD");
 getList();
 getProjectList();
+
 </script>
 <style lang="scss">
 .attendance-ubi-data{