111

src/views/system/schedulingInformation/JiaoZhunModal.vue

@@ -37,7 +37,19 @@
                 @panelChange="handlePanelChange1"
               />
         </a-form-item>
-       
+        
+         <a-form-item
+           :labelCol="labelCol"
+           :wrapperCol="wrapperCol"
+           label="最后校准时间">
+           {{jzTime}}
+         </a-form-item>
+          <a-form-item
+            :labelCol="labelCol"
+            :wrapperCol="wrapperCol"
+            label="备注">
+            {{jzBy}}
+          </a-form-item>
       </a-form>
     </a-spin>
   </j-modal>
@@ -58,6 +70,10 @@
         mode1: 'time',
         startDate:"",
         endDate:"",
+        startDateYs:"",
+        endDateYs:"",
+        jzTime:"",
+        jzBy:"",
         viewDate:"",
         username:"",
         setInfo:"",
@@ -130,13 +146,13 @@
             // }
             //时间格式化
             
-            jiaozhun({shiftTimeS:this.startDate,shiftTimeX:this.endDate,viewDate:this.viewDate,username:this.username,setInfo:this.setInfo}).then((res) => {
+            jiaozhun({shiftTimeSYs:this.startDateYs,shiftTimeXYs:this.endDateYs,shiftTimeS:this.startDate,shiftTimeX:this.endDate,viewDate:this.viewDate,username:this.username,setInfo:this.setInfo}).then((res) => {
               if (res.success) {
                 that.$message.success("已成功校准");
                 that.loadData();
               } else {
                 that.$message.warning(res.message);
-                 that.$emit('ok');
+                that.$emit('ok');
               }
             });
             // httpAction(httpurl,formData,method).then((res)=>{

src/views/system/schedulingInformation/ViewClockUserInfo.vue

@@ -49,10 +49,6 @@
         
         <span slot="shiftType" slot-scope="text, record, index">
           <!-- ruleType 上班类型 1.固定时间上下班，2.按班次上下班，3.自由上下班 -->
-           <!--<span v-if="record.latetimeS < 0 || record.latetimeX > 0 || record.shiftRealTimeS == '' || record.shiftRealTimeS == null">
-            异常 <a>{{record.setInfo}}</a>
-          </span>
-          <span v-else>正常 <a>{{record.setInfo}}</a></span> -->
           
           <a-tag color="pink" v-if="record.latetimeS < 0 || record.latetimeX > 0 
           || (record.ifwork !=0 && record.attendanceCount < 2 && record.name != null)
@@ -104,14 +100,15 @@
     <Jiao-Zhun-Modal ref="modalForm" @ok="modalFormOk"></Jiao-Zhun-Modal>
     <Select-User-Modal ref="selectUserModal" @selectFinished="selectOK"></Select-User-Modal>
     <dept-role-user-modal ref="deptRoleUser"></dept-role-user-modal>
-    <a-modal
+    <a-modal width="1200px"
           v-model="modal2Visible" title="加班信息详情" :footer="null"
           centered @ok="() => (modal2Visible = false)" >
-          <p>加班申请时间 ： {{durationCommitDate}}</p>
+          <!-- <p>加班申请时间 ： {{durationCommitDate}}</p>
           <p>加班开始时间 ： {{durationBeginDate}}</p>
           <p>加班结束时间 ： {{durationEndDate}}</p>
           <p>加班时长 ： {{duration}}</p>
-          <p>加班事由 ： {{demo}}</p>
+          <p>加班事由 ： {{demo}}</p> -->
+           <a-table :columns="columns2" :data-source="data" rowKey="id"></a-table>
     </a-modal>
   </a-card>
 </template>
@@ -127,6 +124,33 @@
   import {
     fuXinInfo
   } from '@/api/api'
+  
+  const data = [
+    {
+      key: '1',
+      durationCommitDate: 'John Brown',
+      durationBeginDate: 32,
+      durationEndDate: 'New York No. 1 Lake Park',
+      duration: ['nice', 'developer'],
+      demo:'11111111'
+    },
+    {
+      key: '2',
+      durationCommitDate: 'John Brown',
+      durationBeginDate: 32,
+      durationEndDate: 'New York No. 1 Lake Park',
+      duration: ['nice', 'developer'],
+      demo:'11111111'
+    },{
+      key: '3',
+      durationCommitDate: 'John Brown',
+      durationBeginDate: 32,
+      durationEndDate: 'New York No. 1 Lake Park',
+      duration: ['nice', 'developer'],
+      demo:'11111111'
+    },
+  ];
+  
   export default {
     name: "DeptUserInfo",
     mixins: [JeecgListMixin],
@@ -151,6 +175,37 @@
         headMonth:'',//标题选择月份
         newMonth:'',//更改时选择的月份
         currentDeptId: '',
+        data : [
+          {
+            key: '1',
+            durationCommitDate: '2022-01-02 11:00:21',
+            durationBeginDate: '2022-01-02 11:00:21',
+            durationEndDate: '2022-01-02 21:00:21',
+            duration: '10',
+            demo:'测试'
+          }
+        ],
+        columns2:[{
+          title: '加班申请时间',
+          align: "center",
+          dataIndex: 'durationCommitDate'
+        },{
+          title: '加班开始时间',
+          align: "center",
+          dataIndex: 'durationBeginDate'
+        },{
+          title: '加班结束时间',
+          align: "center",
+          dataIndex: 'durationEndDate'
+        },{
+          title: '加班时长',
+          align: "center",
+          dataIndex: 'duration'
+        },{
+          title: '加班事由',
+          align: "center",
+          dataIndex: 'demo'
+        }],
         // 表头
         columns: [{
             title: '日期',
@@ -384,6 +439,17 @@
         this.$refs.modalForm.disableSubmit = false;
         this.$refs.modalForm.startDate = record.gotoTime;
         this.$refs.modalForm.endDate = record.closingTime;
+        if(record.gotoTime == null || record.gotoTime == ''){
+          this.$refs.modalForm.startDate = record.viewDate;
+        }
+        if(record.closingTime == null || record.closingTime == ''){
+          this.$refs.modalForm.endDate = record.viewDate;
+        }
+        this.$refs.modalForm.startDateYs = record.gotoTime;
+        this.$refs.modalForm.endDateYs = record.closingTime;
+        this.$refs.modalForm.jzTime = record.jzTime;
+        this.$refs.modalForm.jzBy = record.jzBy;
+        
         this.$refs.modalForm.viewDate = record.viewDate;
         this.$refs.modalForm.username = record.userId;
         this.$refs.modalForm.setInfo = record.setInfo;