Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/OP/GroupsTaskAssignment.vue

@@ -6,7 +6,7 @@
         <div>
             <div style="display: flex;">
                 <div style="width: 30%;">
-                    <el-select v-model="diId" filterable clearable placeholder="请选择" style="width: 90%;"
+                    <el-select v-model="diId" filterable clearable placeholder="请选择" style="width:90%;"
                         @change="diidChange()">
                         <el-option v-for="item1 in delegationInfos" :key=item1.id :label=item1.name
                             :value=item1.id></el-option>
@@ -23,7 +23,7 @@
                 </div>
             </div>
         </div>
-        <div>
+        <div class="tzinif">
             <span style="font-weight: bold;">团 号：</span>{{ DelegationInfo.tourCode }}
             <span style="font-weight: bold;">客 户：</span>{{ DelegationInfo.clientName }}
             <span style="font-weight: bold;">出访国家：</span>{{ DelegationInfo.visitCountry }}
@@ -31,7 +31,7 @@
                 DelegationInfo.visitEndDate }}
             <span style="font-weight: bold;">天数/人数：</span>{{ DelegationInfo.visitDays }}天/{{ DelegationInfo.visitPNumber }}人
         </div>
-        <div style="background-color:#215CA6;color: aliceblue;">
+        <div>
             <div>人员安排</div>
         </div>
         <div style="margin-top: 10px;">
@@ -181,6 +181,7 @@ export default {
     padding: 10px;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
+    min-height: 820px;
 }
 
 .communal-title {
@@ -202,4 +203,7 @@ export default {
     margin-left: 10px;
     padding: 8px 20px;
 }
+.tzinif{
+    margin: 10px 0;
+}
 </style>

src/components/system/Payroll.vue

@@ -292,9 +292,9 @@
                             placement="top"
                             width="412"
                             trigger="hover">
-                                <el-table height="500px" :border="border" :data="transfer">
+                                <el-table height="500px" :border="border" :data="transfer" :default-sort="{prop:'StartTimeDt',order:'ascending'}">
                                     <el-table-column width="80" property="SubType" label="请假类型"></el-table-column>
-                                    <el-table-column width="100" property="StartTimeDt" :formatter="rounddadykaishi" label="开始时间"></el-table-column>
+                                    <el-table-column :sortable="true" width="108" property="StartTimeDt" :formatter="rounddadykaishi" label="开始时间"></el-table-column>
                                     <el-table-column width="100" property="EndTimeDt" :formatter="rounddadyjieshu" label="结束时间"></el-table-column>
                                     <el-table-column width="50" property="Duration" label="时长"></el-table-column>
                                     <el-table-column width="80" property="Unit" label="时长单位"></el-table-column>
@@ -339,7 +339,7 @@
                         </el-form-item>
                     </div>
                     <div class="leave-inif">
-                        <el-form-item label="事假" :label-width="formLabelWidth">
+                        <el-form-item class="biaoji" label="事假" :label-width="formLabelWidth">
                             <el-popover
                             placement="top"
                             width="412"
@@ -351,10 +351,13 @@
                                     <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>
-                                <span slot="reference">{{salaryinif.somethingFalse.toFixed(2)}}</span>
+                                <el-input-number slot="reference" :precision="2" size="medium" :controls="false" v-model="salaryinif.somethingFalse">
+                                    <span slot="reference"></span>
+                                </el-input-number>
+                                <!-- <span slot="reference">{{salaryinif.somethingFalse.toFixed(2)}}</span> -->
                             </el-popover>
                         </el-form-item>
-                        <el-form-item label="病假" :label-width="formLabelWidth">
+                        <el-form-item class="biaoji" label="病假" :label-width="formLabelWidth">
                             <el-popover
                             placement="top"
                             width="412"
@@ -374,10 +377,13 @@
                                     <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>
-                                <span slot="reference">{{salaryinif.sickLeave.toFixed(2)}}</span>
+                                <el-input-number slot="reference" :precision="2" size="medium" :controls="false" v-model="salaryinif.sickLeave">
+                                    <span slot="reference"></span>
+                                </el-input-number>
+                                <!-- <span slot="reference">{{salaryinif.sickLeave.toFixed(2)}}</span> -->
                             </el-popover>
                         </el-form-item>
-                        <el-form-item label="迟到" :label-width="formLabelWidth">
+                        <el-form-item class="biaoji" label="迟到" :label-width="formLabelWidth">
                             <el-popover
                             placement="top"
                             width="382"
@@ -389,10 +395,13 @@
                                     <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>
-                                <span slot="reference">{{salaryinif.lateTo.toFixed(2)}}</span>
+                                <el-input-number slot="reference" :precision="2" size="medium" :controls="false" v-model="salaryinif.lateTo">
+                                    <span slot="reference"></span>
+                                </el-input-number>
+                                <!-- <span slot="reference">{{salaryinif.lateTo.toFixed(2)}}</span> -->
                             </el-popover>
                         </el-form-item>
-                        <el-form-item label="早退" :label-width="formLabelWidth">
+                        <el-form-item class="biaoji" label="早退" :label-width="formLabelWidth">
                             <el-popover
                             placement="top"
                             width="412"
@@ -404,10 +413,13 @@
                                     <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>
-                                <span slot="reference">{{salaryinif.leaveEarly.toFixed(2)}}</span>
+                                <el-input-number slot="reference" :precision="2" size="medium" :controls="false" v-model="salaryinif.leaveEarly">
+                                    <span slot="reference"></span>
+                                </el-input-number>
+                                <!-- <span slot="reference">{{salaryinif.leaveEarly.toFixed(2)}}</span> -->
                             </el-popover>
                         </el-form-item>
-                        <el-form-item label="旷工" :label-width="formLabelWidth">
+                        <el-form-item class="biaoji" label="旷工" :label-width="formLabelWidth">
                             <el-popover
                             placement="top"
                             width="512"
@@ -420,7 +432,10 @@
                                     <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>
-                                <span class="sx" slot="reference">{{salaryinif.absenteeism.toFixed(2)}}</span>
+                                <el-input-number slot="reference" :precision="2" size="medium" :controls="false" v-model="salaryinif.absenteeism">
+                                    <span slot="reference"></span>
+                                </el-input-number>
+                                <!-- <span class="sx" slot="reference">{{salaryinif.absenteeism.toFixed(2)}}</span> -->
                             </el-popover>
                         </el-form-item>
                         <el-form-item class="biaoji" label="补卡" :label-width="formLabelWidth">
@@ -865,6 +880,7 @@ export default {
                         console.log(jiaqininif)
                         console.log(dakainif)
                         if(jiaqininif!=undefined){
+                            that.transfer=jiaqininif.Ex_ItemInfo
                             for(let j=0;j<jiaqininif.Ex_ItemInfo.length;j++){
                                 if(jiaqininif.Ex_ItemInfo[j].SubType=="事假"){
                                     that.leave.push(jiaqininif.Ex_ItemInfo[j])
@@ -872,9 +888,9 @@ export default {
                                 if(jiaqininif.Ex_ItemInfo[j].SubType=="病假"){
                                     that.sickleave.push(jiaqininif.Ex_ItemInfo[j])
                                 }
-                                if(jiaqininif.Ex_ItemInfo[j].SubType=="调休假"||jiaqininif.Ex_ItemInfo[j].SubType=="年假"||jiaqininif.Ex_ItemInfo[j].SubType=="婚假"||jiaqininif.Ex_ItemInfo[j].SubType=="产假"||jiaqininif.Ex_ItemInfo[j].SubType=="陪产假"||jiaqininif.Ex_ItemInfo[j].SubType=="丧假"||jiaqininif.Ex_ItemInfo[j].SubType=="出差"){
-                                    that.transfer.push(jiaqininif.Ex_ItemInfo[j])
-                                }
+                                // if(jiaqininif.Ex_ItemInfo[j].SubType=="调休假"||jiaqininif.Ex_ItemInfo[j].SubType=="年假"||jiaqininif.Ex_ItemInfo[j].SubType=="婚假"||jiaqininif.Ex_ItemInfo[j].SubType=="产假"||jiaqininif.Ex_ItemInfo[j].SubType=="陪产假"||jiaqininif.Ex_ItemInfo[j].SubType=="丧假"||jiaqininif.Ex_ItemInfo[j].SubType=="出差"){
+                                //     that.transfer.push(jiaqininif.Ex_ItemInfo[j])
+                                // }
                             }
                         }
                         console.log(that.transfer)
@@ -888,6 +904,7 @@ export default {
                                 }
                                 if(dakainif.Ex_ItemInfo[x].SubType=="旷工"){
                                     that.absenteeism.push(dakainif.Ex_ItemInfo[x])
+                                    that.transfer.push(dakainif.Ex_ItemInfo[x])
                                 }
                                 if(dakainif.Ex_ItemInfo[x].SubType=="打卡补卡"){
                                     that.notout.push(dakainif.Ex_ItemInfo[x])
@@ -1250,6 +1267,7 @@ export default {
                         console.log(jiaqin)
                         console.log(daka)
                         if(jiaqin!=undefined){
+                            that.transfer=jiaqin.Ex_ItemInfo;
                             for(let j=0;j<jiaqin.Ex_ItemInfo.length;j++){
                                 if(jiaqin.Ex_ItemInfo[j].SubType=="事假"){
                                     that.leave.push(jiaqin.Ex_ItemInfo[j])
@@ -1257,9 +1275,9 @@ export default {
                                 if(jiaqin.Ex_ItemInfo[j].SubType=="病假"){
                                     that.sickleave.push(jiaqin.Ex_ItemInfo[j])
                                 }
-                                if(jiaqin.Ex_ItemInfo[j].SubType=="调休假"||jiaqin.Ex_ItemInfo[j].SubType=="年假"||jiaqin.Ex_ItemInfo[j].SubType=="婚假"||jiaqin.Ex_ItemInfo[j].SubType=="产假"||jiaqin.Ex_ItemInfo[j].SubType=="陪产假"||jiaqin.Ex_ItemInfo[j].SubType=="丧假"||jiaqin.Ex_ItemInfo[j].SubType=="出差"){
-                                    that.transfer.push(jiaqin.Ex_ItemInfo[j])
-                                }
+                                // if(jiaqin.Ex_ItemInfo[j].SubType=="调休假"||jiaqin.Ex_ItemInfo[j].SubType=="年假"||jiaqin.Ex_ItemInfo[j].SubType=="婚假"||jiaqin.Ex_ItemInfo[j].SubType=="产假"||jiaqin.Ex_ItemInfo[j].SubType=="陪产假"||jiaqin.Ex_ItemInfo[j].SubType=="丧假"||jiaqin.Ex_ItemInfo[j].SubType=="出差"){
+                                //     that.transfer.push(jiaqin.Ex_ItemInfo[j])
+                                // }
                             }
                         }
                         console.log(that.transfer)
@@ -1273,6 +1291,7 @@ export default {
                                 }
                                 if(daka.Ex_ItemInfo[x].SubType=="旷工"){
                                     that.absenteeism.push(daka.Ex_ItemInfo[x])
+                                    that.transfer.push(daka.Ex_ItemInfo[x])
                                 }
                                 if(daka.Ex_ItemInfo[x].SubType=="打卡补卡"){
                                     that.notout.push(daka.Ex_ItemInfo[x])