lhj-1208

src/components/Enroll.vue

@@ -393,7 +393,7 @@ export default {
         createUserId:0,
         cnName:that.ruleForm.mandarinName,
         enName:that.ruleForm.eflName,
-        email:that.ruleForm.email,
+        email:that.ruleForm.email+'@pan-american-intl.com',
         sex:that.sxechuli(that.ruleForm.sex),
         phone:that.ruleForm.phone,
         urgencyPhone:that.ruleForm.urgentphone,

src/components/OP/OpLtinerary.vue

@@ -4,7 +4,7 @@
             <div class="opltinerary-head">
                 <div class="opltinerary-head-li">
                     <label>团组名称:</label>
-                    <el-select size="medium" v-model="value" filterable placeholder="请选择">
+                    <el-select style="width:210px" size="medium" v-model="value" filterable placeholder="请选择">
                         <el-option
                             v-for="item in options"
                             :key="item.id"
@@ -24,7 +24,7 @@
             <div class="opname-box">
                 <div class="opname-head-li">
                     <label>选择城市:</label>
-                    <el-select size="medium" v-model="value" filterable placeholder="请选择">
+                    <el-select style="width:210px" size="medium" v-model="value" filterable placeholder="请选择">
                         <el-option
                             v-for="item in options"
                             :key="item.id"
@@ -40,7 +40,7 @@
             <div class="opname-box">
                 <div class="opname-head-li">
                     <label>选择行程单:</label>
-                    <el-select size="medium" v-model="value" filterable placeholder="请选择">
+                    <el-select style="width:210px" size="medium" v-model="value" filterable placeholder="请选择">
                         <el-option
                             v-for="item in options"
                             :key="item.id"
@@ -66,10 +66,90 @@
                 </div>
                 <div class="itinerary-table">
                     <div class="table-title">
-                        <div style="">天数</div>
-                        <div>日期</div>
-                        <div>交通</div>
-                        <div>行程</div>
+                        <div style="width: 100px;">天数</div>
+                        <div style="width: 300px;">日期</div>
+                        <div style="width: 200px;">交通</div>
+                        <div style="width: 100%;">行程</div>
+                    </div>
+                    <div class="table-form" v-for="(item,index) in tablearrr" :key="index">
+                        <div class="table-form-li" style="width: 100px;">
+                            <el-input-number style="width: 50px;" size="mini"  :controls="false" v-model="item.days"></el-input-number>
+                        </div>
+                        <div class="table-form-li"  style="width: 300px;">
+                            <el-date-picker
+                            style="width: 150px;" 
+                            size="mini"
+                            v-model="item.date1"
+                            type="date"
+                            placeholder="选择日期">
+                            </el-date-picker>
+                            <br/>
+                            <el-date-picker
+                            style="width: 150px;" 
+                            size="mini"
+                            v-model="item.date2"
+                            type="date"
+                            placeholder="选择日期">
+                            </el-date-picker>
+                        </div>
+                        <div class="table-form-li"  style="width: 200px;">
+                            <el-input style="width: 120px;" size="mini" v-model="item.traffic1"></el-input>
+                            <br/>
+                            <el-input style="width: 120px;" size="mini" v-model="item.traffic2"></el-input>
+                        </div>
+                        <div class="table-form-li"  style="width: 100%;">
+                            <el-input
+                            style="width: 90%;"
+                            type="textarea"
+                            :autosize="{ minRows: 4, maxRows: 4}"
+                            placeholder="请输入内容"
+                            v-model="item.remark">
+                            </el-input>
+                        </div>
+                    </div>
+                </div>
+                <div class="briefly-box">
+                    <div class="briefly-select">
+                        <div class="briefly-select-li">
+                            <label>下拉选择国家:</label>
+                            <el-select style="width:150px" size="medium" v-model="value" filterable placeholder="请选择">
+                                <el-option
+                                    v-for="item in options"
+                                    :key="item.id"
+                                    :label="item.groupName"
+                                    :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </div>
+                        <div class="briefly-select-li">
+                            <label>下拉选择城市:</label>
+                            <el-select style="width:150px" size="medium" v-model="value" filterable placeholder="请选择">
+                                <el-option
+                                    v-for="item in options"
+                                    :key="item.id"
+                                    :label="item.groupName"
+                                    :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </div>
+                    </div>
+                    <div class="briefly-remark"  style="width: 100%;">
+                        <label>国家简介:</label>
+                        <el-input
+                        type="textarea"
+                        :autosize="{ minRows: 4, maxRows: 4}"
+                        placeholder="国家简介"
+                        v-model="textarea2">
+                        </el-input>
+                    </div>
+                    <div class="briefly-remark"  style="width: 100%;">
+                        <label>城市简介:</label>
+                        <el-input
+                        type="textarea"
+                        :autosize="{ minRows: 4, maxRows: 4}"
+                        placeholder="城市简介"
+                        v-model="textarea2">
+                        </el-input>
                     </div>
                 </div>
             </div>
@@ -81,7 +161,43 @@ export default {
     data() {
         return {
             value:"",
-            options:[]
+            options:[],
+            values:'',
+            textarea2:'',
+            tablearrr:[
+                {
+                    days:1,
+                    date1:'时间1',
+                    date2:'时间2',
+                    traffic1:'jiaotongyi',
+                    traffic2:'jiaotonger',
+                    remark:''
+                },
+                {
+                    days:2,
+                    date1:'时间1',
+                    date2:'时间2',
+                    traffic1:'jiaotongyi',
+                    traffic2:'jiaotonger',
+                    remark:''
+                },
+                {
+                    days:3,
+                    date1:'时间1',
+                    date2:'时间2',
+                    traffic1:'jiaotongyi',
+                    traffic2:'jiaotonger',
+                    remark:''
+                },
+                {
+                    days:4,
+                    date1:'时间1',
+                    date2:'时间2',
+                    traffic1:'jiaotongyi',
+                    traffic2:'jiaotonger',
+                    remark:''
+                }
+            ]
         }
     },
 }
@@ -136,8 +252,52 @@ export default {
     font-size: 14px;
     margin-right: 28px;
 }
+.itinerary-table{
+    margin-top: 10px;
+}
 .table-title{
     display: flex;
     border: 1px solid #ebeef5;
+    text-align: center;
+}
+.table-title div{
+    padding: 10px 0px;
+}
+.table-title div:not(:first-child){
+    border-left: 1px solid #ebeef5;
+}
+.table-form{
+    display: flex;
+    align-items: stretch;
+    border: 1px solid #ebeef5;
+    text-align: center;
+    border-top: transparent;
+}
+.table-form .table-form-li{
+    padding: 10px 0px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+}
+.table-form-li:not(:first-child){
+    border-left: 1px solid #ebeef5;
+}
+.briefly-box{
+    margin-top: 30px;
+}
+.briefly-select-li{
+    margin-right: 20px;
+}
+.briefly-select{
+    display: flex;
+    color:red;
+}
+.briefly-remark{
+    margin-top: 10px;
+}
+.briefly-remark label{
+    display: inline-block;
+    margin-bottom: 10px;
 }
 </style>

src/components/system/Payroll.vue

@@ -292,7 +292,7 @@
                             placement="top"
                             width="412"
                             trigger="hover">
-                                <el-table :border="border" :data="transfer">
+                                <el-table height="500px" :border="border" :data="transfer">
                                     <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 width="100" property="EndTimeDt" :formatter="rounddadyjieshu" label="结束时间"></el-table-column>
@@ -338,7 +338,7 @@
                             placement="top"
                             width="412"
                             trigger="hover">
-                                <el-table :border="border" :data="leave">
+                                <el-table height="200px" :border="border" :data="leave">
                                     <el-table-column width="100" 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>
@@ -353,7 +353,15 @@
                             placement="top"
                             width="412"
                             trigger="hover">
-                                <el-table :border="border" :data="sickleave">
+                                <div>
+                                    <div>病假最低发放标准(月)：1680=2100*0.8</div>
+                                    <div>病假最低发放标准(天)：1680/{{salaryinif.workDays}}(工作日)≈{{ (1680/salaryinif.workDays).toFixed(2) }}</div>
+                                    <div>病假最低发放标准(小时)：1680/{{salaryinif.workDays}}(工作日)/7.5(小时)≈{{ (1680/salaryinif.workDays/7.5).toFixed(2) }}</div>
+                                    <span style="color:red;">
+                                        员工在病假医疗期限内的病假工资按照成都市最低工资标准的 80%发放
+                                    </span>
+                                </div>
+                                <el-table height="200px" :border="border" :data="sickleave">
                                     <el-table-column width="100" 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>
@@ -368,7 +376,7 @@
                             placement="top"
                             width="382"
                             trigger="hover">
-                                <el-table :border="border" :data="late">
+                                <el-table height="200px" :border="border" :data="late">
                                     <el-table-column width="170" property="StartTimeDt" :formatter="rounddadykaishi" label="迟到时间"></el-table-column>
                                     <!-- <el-table-column width="100" property="EndTimeDt" label="结束时间"></el-table-column> -->
                                     <el-table-column width="50" property="Duration" label="时长"></el-table-column>
@@ -383,10 +391,10 @@
                             placement="top"
                             width="412"
                             trigger="hover">
-                                <el-table :border="border" :data="early">
-                                    <el-table-column width="100" property="StartTimeDt" :formatter="rounddadykaishi" label="早退时间"></el-table-column>
+                                <el-table height="200px" :border="border" :data="early">
+                                    <el-table-column width="150" property="StartTimeDt" :formatter="rounddadykaishi" label="早退时间"></el-table-column>
                                     <!-- <el-table-column width="100" property="EndTimeDt" label="结束时间"></el-table-column> -->
-                                    <el-table-column width="50" property="Duration" label="时长"></el-table-column>
+                                    <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>
@@ -398,7 +406,7 @@
                             placement="top"
                             width="512"
                             trigger="hover">
-                                <el-table :border="border" :data="absenteeism">
+                                <el-table height="200px" :border="border" :data="absenteeism">
                                     <el-table-column width="100" property="StartTimeDt" :formatter="rounddadykaishi" label="旷工日期"></el-table-column>
                                     <!-- <el-table-column width="100" property="EndTimeDt" label="结束时间"></el-table-column> -->
                                     <el-table-column width="50" property="Duration" label="时长"></el-table-column>
@@ -414,7 +422,7 @@
                             placement="top"
                             width="512"
                             trigger="hover">
-                                <el-table :border="border" :data="notout">
+                                <el-table height="200px" :border="border" :data="notout">
                                     <el-table-column width="200" property="StartTimeDt" :formatter="rounddadykaishi" label="补卡时间"></el-table-column>
                                     <!-- <el-table-column width="100" property="EndTimeDt" label="结束时间"></el-table-column> -->
                                     <!-- <el-table-column width="50" property="Duration" label="时长"></el-table-column> -->
@@ -1567,12 +1575,6 @@ export default {
 .remark-box .el-textarea__inner{
     width: 96.5%;
 }
-.el-popover{
-    max-height: 600px;
-    overflow: hidden;
-    overflow-y: auto;
-}
-
 .payroll-all::-webkit-scrollbar-track-piece {
     background-color: #f1f1f1;
 }