0220-lhj

src/components/OP/AirTicketRes.vue

@@ -130,7 +130,6 @@ export default {
             }).then(function (res) {
                 if (res.data.code == 200) {
                     that.AirTicketResSelectData = res.data.data.groupName;
-                    debugger
                     if (that.AirTicketResSelectData.length != 0) {
                         that.DiId = that.AirTicketResSelectData[0].id;
                         that.AirTicketResList()
@@ -191,7 +190,6 @@ export default {
 
         },
         addIf() {
-            debugger
             if (this.DiId != 0 && this.DiId != '' && this.DiId != undefined) {
                 this.$router.push({
                     path: "/home/OpAirTicketRes",

src/components/OP/DecreasePayments.vue

@@ -20,18 +20,19 @@
                         </router-link>
                     </div>
                 </div>
-                <span style="font-weight: bold;">团队名称：</span>
-                {{ delegationInfo.teamName }}&nbsp;&nbsp;&nbsp;
-                <span style="font-weight: bold;">客户：</span>
-                {{ delegationInfo.clientName }}&nbsp;&nbsp;&nbsp;
-                <span style="font-weight: bold;">出访国家：</span>
-                {{ delegationInfo.visitCountry }}&nbsp;&nbsp;&nbsp;
-                <span style="font-weight: bold;">起止日期：</span>
-                {{ delegationInfo.visitStartDate }}—{{ delegationInfo.visitEndDate }}&nbsp;&nbsp;&nbsp;
-                <span style="font-weight: bold;">天数/人数：</span>
-                {{ delegationInfo.visitDays }}天/{{ delegationInfo.visitPNumber }}人
+                <div class="communal-box-title">
+                    <span style="font-weight: bold;">团队名称：</span>
+                    {{ delegationInfo.teamName }}&nbsp;&nbsp;&nbsp;
+                    <span style="font-weight: bold;">客户：</span>
+                    {{ delegationInfo.clientName }}&nbsp;&nbsp;&nbsp;
+                    <span style="font-weight: bold;">出访国家：</span>
+                    {{ delegationInfo.visitCountry }}&nbsp;&nbsp;&nbsp;
+                    <span style="font-weight: bold;">起止日期：</span>
+                    {{ delegationInfo.visitStartDate }}—{{ delegationInfo.visitEndDate }}&nbsp;&nbsp;&nbsp;
+                    <span style="font-weight: bold;">天数/人数：</span>
+                    {{ delegationInfo.visitDays }}天/{{ delegationInfo.visitPNumber }}人
+                </div>
             </div>
-            <hr style='background-color:#5555; height:1px; border:none;' />
             <template>
                 <el-table :data="tableDatas.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border
                     style="width: 100%" v-loading="loading" element-loading-text="拼命加载中...">
@@ -268,4 +269,12 @@ export default {
     margin-left: 10px;
     padding: 8px 20px;
 }
+.communal-box-title{
+    margin: 10px 0;
+}
+.communal-box-title span{
+    font-size: 16px;
+    font-weight: 600;
+    color: #555;
+}
 </style>

src/components/Resource/OfficialActivities.vue

@@ -19,18 +19,19 @@
                         </router-link>
                     </div>
                 </div>
-                <span style="font-weight: bold;">团队名称：</span>
-                {{ delegationInfo.teamName }}&nbsp;&nbsp;&nbsp;
-                <span style="font-weight: bold;">客户：</span>
-                {{ delegationInfo.clientName }}&nbsp;&nbsp;&nbsp;
-                <span style="font-weight: bold;">出访国家：</span>
-                {{ delegationInfo.visitCountry }}&nbsp;&nbsp;&nbsp;
-                <span style="font-weight: bold;">起止日期：</span>
-                {{ delegationInfo.visitStartDate }}—{{ delegationInfo.visitEndDate }}&nbsp;&nbsp;&nbsp;
-                <span style="font-weight: bold;">天数/人数：</span>
-                {{ delegationInfo.visitDays }}天/{{ delegationInfo.visitPNumber }}人
+                <div class="communal-box-title">
+                    <span style="font-weight: bold;">团队名称：</span>
+                    {{ delegationInfo.teamName }}&nbsp;&nbsp;&nbsp;
+                    <span style="font-weight: bold;">客户：</span>
+                    {{ delegationInfo.clientName }}&nbsp;&nbsp;&nbsp;
+                    <span style="font-weight: bold;">出访国家：</span>
+                    {{ delegationInfo.visitCountry }}&nbsp;&nbsp;&nbsp;
+                    <span style="font-weight: bold;">起止日期：</span>
+                    {{ delegationInfo.visitStartDate }}—{{ delegationInfo.visitEndDate }}&nbsp;&nbsp;&nbsp;
+                    <span style="font-weight: bold;">天数/人数：</span>
+                    {{ delegationInfo.visitDays }}天/{{ delegationInfo.visitPNumber }}人
+                </div>
             </div>
-            <hr style='background-color:#5555; height:1px; border:none;' />
             <template>
                 <el-table :data="tableDatas.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border
                     style="width: 100%" v-loading="loading" element-loading-text="拼命加载中...">
@@ -235,6 +236,7 @@ export default {
     padding: 10px;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
+    min-height: 830px;
 }
 
 .communal-title {
@@ -256,4 +258,12 @@ export default {
     margin-left: 10px;
     padding: 8px 20px;
 }
+.communal-box-title{
+    margin: 10px 0;
+}
+.communal-box-title span{
+    font-size: 16px;
+    font-weight: 600;
+    color: #555;
+}
 </style>

src/components/home.vue

@@ -1,5 +1,18 @@
 <template>
   <div class="all-box">
+    <el-dialog
+      style=""
+      top="0"
+      title="提示"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClosezz">
+      <span>这是一段信息</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
     <el-container class="all">
       <el-aside class="delwh">
         <el-menu :default-active="indexs" class="el-menu-vertical-demo menubar" @open="handleOpen" @close="handleClose"
@@ -78,7 +91,7 @@
               <i class="icon-shiyonggongju"></i>
             </div>
             <div class="message">
-              <i class="icon-tongzhi"></i>
+              <i class="icon-tongzhi" @click="dialogVisible = true"></i>
             </div>
             <div class="user-inif" @click="instrumentclick('.user-operate', $event)">
               <div class="user-inifs">
@@ -204,6 +217,7 @@ export default {
       indexs: "1",
       pdinstrument: true,
       userinif: '',
+      dialogVisible: false
     };
   },
   // components: {
@@ -338,6 +352,13 @@ export default {
         });
     },
 
+    handleClosezz(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done();
+        })
+        .catch(_ => {});
+    }
     //实时通讯
     // async startConnection() {
     //   this.connection = new signalR.HubConnectionBuilder()
@@ -418,7 +439,12 @@ body {
   margin: 0;
   padding: 0;
 }
-
+.all-box .el-dialog{
+  position: fixed;
+  right: 0;
+  height: 100%;
+  margin: 0;
+}
 html {
   background-color: #fff;
 }

src/components/system/MyTasksinif.vue

@@ -27,8 +27,9 @@
                     <div class="mytasksinif-form-first">
                         <el-form-item label="实际开始" prop="name">
                             <el-date-picker
+                            :disabled="true"
                             style="width:100%;"
-                            v-model="finish.taskperson"
+                            v-model="finish.actuallyStarted"
                             type="datetime"
                             placeholder="选择日期时间"
                             default-time="12:00:00">
@@ -37,6 +38,7 @@
                         <el-form-item label="实际结束" prop="name">
                             <el-date-picker
                             style="width:100%;"
+                            :disabled="true"
                             v-model="finish.actuallyOver"
                             type="datetime"
                             placeholder="选择日期时间"
@@ -59,7 +61,7 @@
                     </div>
                 </el-form>
                 <div class="mytasksinif-btn">
-                    <el-button size="medium" type="primary">完成</el-button>
+                    <!-- <el-button size="medium" type="primary">完成</el-button> -->
                     <el-button size="medium" @click="goback">取消</el-button>
                 </div>
             </div>
@@ -179,6 +181,8 @@ export default {
                         that.finish.taskperson.push(res.data.data.userTaskInfos[i].userId);
                     }
                     that.content=res.data.data.taskContent;
+                    that.finish.actuallyStarted=res.data.data.predictBeginTime;
+                    that.finish.actuallyOver=res.data.data.predictEndTime;
                 }else{
                     that.$message.error(res.data.msg);
                 }

src/components/system/Payroll.vue

@@ -386,7 +386,7 @@
                         <el-form-item class="biaoji" label="迟到" :label-width="formLabelWidth">
                             <el-popover
                             placement="top"
-                            width="382"
+                            width="582"
                             trigger="hover">
                                 <el-table height="200px" :border="border" :data="late">
                                     <el-table-column width="170" property="StartTimeDt" :formatter="rounddadykaishi" label="迟到时间"></el-table-column>
@@ -394,6 +394,7 @@
                                     <el-table-column width="50" property="Duration" label="时长"></el-table-column>
                                     <el-table-column width="80" property="Unit" label="时长单位"></el-table-column>
                                     <el-table-column width="80" property="Deduction" :formatter="rounding" label="扣款金额"></el-table-column>
+                                    <el-table-column width="200" property="Reason" label="原因"></el-table-column>
                                 </el-table>
                                 <el-input-number slot="reference" :precision="2" size="medium" :controls="false" v-model="salaryinif.lateTo">
                                     <span slot="reference"></span>
@@ -404,7 +405,7 @@
                         <el-form-item class="biaoji" label="早退" :label-width="formLabelWidth">
                             <el-popover
                             placement="top"
-                            width="412"
+                            width="612"
                             trigger="hover">
                                 <el-table height="200px" :border="border" :data="early">
                                     <el-table-column width="150" property="StartTimeDt" :formatter="rounddadykaishi" label="早退时间"></el-table-column>
@@ -412,6 +413,7 @@
                                     <el-table-column width="100" property="Duration" label="时长"></el-table-column>
                                     <el-table-column width="80" property="Unit" label="时长单位"></el-table-column>
                                     <el-table-column width="80" property="Deduction" :formatter="rounding" label="扣款金额"></el-table-column>
+                                    <el-table-column width="200" property="Reason" label="原因"></el-table-column>
                                 </el-table>
                                 <el-input-number slot="reference" :precision="2" size="medium" :controls="false" v-model="salaryinif.leaveEarly">
                                     <span slot="reference"></span>