Merge remote-tracking branch 'remotes/origin/v0.1.0' into v0.1.1

src/components/date-picker/src/panel/week-range.vue

@@ -334,7 +334,7 @@
         visible: '',
         disabledDate: '',
         cellClassName: '',
-        firstDayOfWeek: 7,
+        firstDayOfWeek: 1,
         minTimePickerVisible: false,
         maxTimePickerVisible: false,
         format: '',

src/views/board/charts/comprehesive/report.vue

@@ -160,7 +160,7 @@ export default {
               // show:false,
               color: "#fff",
               formatter: (p) => {
-                return `${p.name}\r\n(${p.value} , ${p.percent==undefined?0:p.percent}%)`;
+                return `${p.name}\r\n(${p.value} ; ${p.percent==undefined?0:p.percent}%)`;
               },
             },
             labelLine: {
@@ -348,10 +348,10 @@ export default {
     height: calc(100% - 10px);
   }
   & > div:first-child {
-    width: 35%;
+    width: 30%;
   }
   & > div:nth-child(2) {
-    width: 65% !important;
+    width: 70% !important;
   }
 }
 

src/views/core/outIn/approve/dialog.approve.letter.detail.vue

@@ -40,7 +40,7 @@
         </el-row>
         <el-table border size="small" :data="formData.userInfos" height="300">
           <el-table-column label="序号"  align="center"  type="index" width="70" />
-          <el-table-column label="出入单位" width="100" align="center" prop="companyName" />
+          <el-table-column label="所属单位" width="100" align="center" prop="companyName" />
           <el-table-column label="出入人员" width="100" align="center" prop="userName" />
           <el-table-column label="证件类型" width="100" align="center" prop="idType">
             <template slot-scope="scope">

src/views/core/outIn/approve/dialog.approve.letter.vue

@@ -70,7 +70,7 @@
           </el-row>
           <el-table border size="small" :data="formData.userInfos" height="300">
                   <el-table-column label="序号"  align="center"  type="index" width="70" />
-                  <el-table-column label="出入单位" width="100" align="center" prop="companyName" />
+                  <el-table-column label="所属单位" width="100" align="center" prop="companyName" />
                   <el-table-column label="出入人员" width="100" align="center" prop="userName" />
                   <el-table-column label="证件类型" width="100" align="center" prop="idType">
                     <template slot-scope="scope">

src/views/core/outIn/letter/dialog.addletter.vue

@@ -118,7 +118,7 @@
 
           <el-table border size="small" :data="formData.userInfos" max-height="500" style="margin-bottom: 10px;">
             <el-table-column label="序号"  align="center"  type="index" width="70" />
-            <el-table-column label="出入单位" width="100" align="center" prop="companyName" />
+            <el-table-column label="所属单位" width="100" align="center" prop="companyName" />
             <el-table-column label="出入人员" width="100" align="center" prop="userName" />
             <el-table-column label="证件类型" width="100" align="center" prop="idType">
               <template slot-scope="scope">
@@ -163,8 +163,8 @@
           :rules="userInfoRules"
           label-width="140px"
         >
-          <el-form-item label="出入单位" prop="companyName">
-            <el-input v-model="userInfo.companyName" maxlength="20" placeholder="请输入出入单位" />
+          <el-form-item label="所属单位" prop="companyName">
+            <el-input v-model="userInfo.companyName" maxlength="20" placeholder="请输入所属单位" />
           </el-form-item>
           <el-form-item label="出入人员" prop="userName">
             <el-input v-model="userInfo.userName" maxlength="10" placeholder="请输入出入人员" />
@@ -242,7 +242,7 @@ export default {
       },
       userInfoRules: {
         userName: [{ required: true, message: "请输入出入人员" }],
-        companyName: [{ required: true, message: "请输入出入单位" }],
+        companyName: [{ required: true, message: "请输入所属单位" }],
         idType: [{ required: true, message: "请选择证件类型" }],
         idCard: [{ required: true, message: "请输入证件号码" }],
         //imgFile: [{ required: true, message: "请上传证件图片" }],

src/views/core/outIn/letter/dialog.letter.detail.vue

@@ -114,7 +114,7 @@
         </el-row>
         <el-table border size="small" :data="formData.userInfos" max-height="500" style="margin-bottom: 10px;">
           <el-table-column label="序号"  align="center"  type="index" width="70" />
-          <el-table-column label="出入单位" width="150" align="center" prop="companyName" />
+          <el-table-column label="所属单位" width="150" align="center" prop="companyName" />
           <el-table-column label="出入人员" width="100" align="center" prop="userName" />
           <el-table-column label="证件类型" width="100" align="center" prop="idType">
             <template slot-scope="scope">

src/views/core/outIn/outInLog/dialog.outIn.detail.vue

@@ -33,7 +33,7 @@
           <el-descriptions-item label="有效天数">{{
             formData.effectiveDays
           }}</el-descriptions-item>
-          <el-descriptions-item label="出入单位">{{
+          <el-descriptions-item label="所属单位">{{
             formData.companyName
           }}</el-descriptions-item>
           <el-descriptions-item label="出入人员">{{

src/views/core/outIn/outInLog/index.vue

@@ -106,7 +106,7 @@
             :data="outInRecrodList"
           >
             <el-table-column
-              label="出入单位"
+              label="所属单位"
               prop="companyName"
               align="center"
               width="180"

src/views/core/reportForms/monitorAccessReport.vue

@@ -99,6 +99,7 @@ import {deptTreeSelect,businessTreeSelect} from "@/api/system/public";
 // import orgTree from "@/components/orgTree";
 import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 import {Message} from "element-ui";
+import dayjs from "dayjs";
 export default {
   dicts: ['sys_normal_disable','sys_org_type','repot_cycle'],
   name: "Check",
@@ -220,24 +221,43 @@ setWeekNum() {
   this.queryParams.endDate = this.endDate;
 },
     //时间是周日就往前推一天
-    getStartAndEndOfWeek(newDate){
-      let date = new Date(newDate);
-      let newTime = date.getTime();
-      let day = date.getDay();
-      if (day === 0){
-        date.setDate(date.getDate() - 1);
-        newTime = date.getTime();
-        day = date.getDay();
-      }
-      const oneDayTime = 24 * 60 * 60 * 1000;
-      const fromTime = newTime - day * oneDayTime;
-      const endTime = newTime + (7 - day) * oneDayTime;
-      const fromDate = new Date(fromTime);
-      const toDate = new Date(endTime);
-      let startDate = fromDate.getFullYear() + '-' + this.p((fromDate.getMonth() + 1)) + '-' + this.p(fromDate.getDate() + 1);
-      let endDate = toDate.getFullYear() + '-' + this.p((toDate.getMonth() + 1)) + '-' + this.p(toDate.getDate());
+    // getStartAndEndOfWeek(newDate){
+    //   let date = new Date(newDate);
+    //   let newTime = date.getTime();
+    //   let day = date.getDay();
+    //   if (day === 0){
+    //     date.setDate(date.getDate() - 1);
+    //     newTime = date.getTime();
+    //     day = date.getDay();
+    //   }
+    //   const oneDayTime = 24 * 60 * 60 * 1000;
+    //   const fromTime = newTime - day * oneDayTime;
+    //   const endTime = newTime + (7 - day) * oneDayTime;
+    //   const fromDate = new Date(fromTime);
+    //   const toDate = new Date(endTime);
+    //   let tempDay = new Date(fromTime);
+    //   // tempDay.setDate(tempDay.getDate() - 1);
+    //   let startDate = fromDate.getFullYear() + '-' + this.p((fromDate.getMonth() + 1)) + '-' + this.p(tempDay.getDate());
+    //   let endDate = toDate.getFullYear() + '-' + this.p((toDate.getMonth() + 1)) + '-' + this.p(toDate.getDate());
 
-      return [startDate,endDate];
+    //   return [startDate,endDate];
+    // },
+    getStartAndEndOfWeek(newDate) {
+      const nowDay = dayjs(newDate).day()
+      // 这周的第一天
+      let str=null;
+      console.log("getStartAndEndOfWeek",nowDay);
+      if (nowDay){
+        // 非周天，即当周
+        str = dayjs(newDate).startOf('week')
+      }else {
+        // 周天，先减去一天，当作是上周的，然后算出来是上周的周天是第一天，最后再加上一天就是周一
+        console.log("getStartAndEndOfWeek",dayjs(newDate).subtract(1, 'day').format('YYYY-MM-DD'));  
+        str = dayjs(newDate).subtract(1, 'day').startOf('week')
+      }
+      const startOfWeek = dayjs(str).add(0,'day').format('YYYY-MM-DD');
+      const endOfWeek =dayjs(str).add(6,'day').format('YYYY-MM-DD');
+      return [startOfWeek,endOfWeek];
     },
 
 /** 查询机构树数据 */