Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/pages/course/achievements.vue

@@ -74,7 +74,7 @@
           <div class="List-title">KPI指标</div>
           <div class="row d-div"><span class="d2-n">满班率</span>{{item.FullClassRate}}%</div>
           <div class="row d-div"><span class="d2-n">平均上课率</span>{{item.AvgCheckRate}}%</div>
-          <div class="row d-div"><span class="d2-n">累计上课课时</span>{{item.ClassHours}}课时</div>
+          <div class="row d-div"><span class="d2-n" style="width: 80px;">累计上课课时</span>{{item.ClassHours}}课时</div>
         </div>
         <div class="d4">
           <div class="List-title">绩效奖励</div>
@@ -115,14 +115,14 @@
               </q-popup-proxy>
           </span> *{{item.ClassHours}}课时</div>
         </div>
-        <div class="d5" v-if="msg.Q_IsComfirm==1">
+        <div class="d5" v-if="msg.Q_IsComfirm==1" style="width: 12%;">
           <div class="List-title">财务单据</div>
           <div  style="width: 100%;" class="row wrap">
             <div class="d5-item" v-if="item.FinanceId && item.FinanceId>0">
               {{item.FinanceId}}
             </div>
             <div v-else style="color:#999999;">
-              未生成财务单据
+              暂无
             </div>
           </div>
         </div>
@@ -184,15 +184,15 @@
         <div class="d7">
           <div class="row" style="align-items: center;color: #3FC4FF;cursor: pointer" v-if="item.PerfState==2 && item.FinanceId==0" @click="systemShan(item)">
             <img src="../../assets/images/course/zhidan.png" alt="" style="width: 16px;height: 12px;margin-right: 5px;">
-            自动生成单据
+            生成单据
           </div>
           <div class="row" style="align-items: center;color: #2961FE;cursor: pointer" v-if="item.PerfState==2">
             <img src="../../assets/images/course/xiaoxi.png" alt="" style="width: 16px;height: 12px;margin-right: 5px;">
-            发送账单信息
+            账单信息
           </div>
           <div class="row" style="align-items: center;color: #02C499;cursor: pointer" @click="IsShowRemarkDialog=true,RemarkMsg.PerfId=item.Id">
             <img src="../../assets/images/course/addreamke.png" alt="" style="width: 16px;height: 12px;margin-right: 5px;">
-            添加备注说明
+            添加备注
           </div>
           <div class="row" style="align-items: center;color: #8175FB;cursor: pointer" @click="gostudent(item,1)" v-if="item.PerfState==1">
             <img src="../../assets/images/course/queren.png" alt="" style="width: 16px;height: 12px;margin-right: 5px;">
@@ -547,14 +547,14 @@
   .achievements li .List-title{font-size: 16px;color: #111111;font-weight: bold;margin-bottom: 10px}
   .achievements li .d-div{margin-top: 5px;align-items: center;font-size: 14px}
   .achievements li .dline{display: table;width: 100%;display: flex;flex-direction: row}
-  .achievements li .d1{flex: 1;width: 1px;padding:20px 20px 10px;}
-  .achievements li .d2,.achievements li .d3,.achievements li .d4,.achievements li .d5{width: 17%;padding:20px 20px 10px;}
-  .achievements li .d7{width: 12%;padding: 20px 20px 10px;}
+  .achievements li .d1{flex: 1;width: 1px;padding:20px 13px 10px;}
+  .achievements li .d2,.achievements li .d3,.achievements li .d4,.achievements li .d5{width: 16.5%;padding:20px 13px 10px;}
+  .achievements li .d7{width: 11%;padding: 20px 13px 10px;}
   .achievements li .d7 div{margin-bottom: 5px}
   .achievements li .d1 .di-title{font-size: 16px;color: #111111;}
   .achievements li .d1 .di-c{font-size: 14px;display: flex;align-items: center;line-height: 28px;color: #111111}
   .achievements li .d6{padding: 20px;width: 100%;height: inherit;position: relative;border-top: 1px solid #DDDEE0}
-  .achievements li  .d2-n{font-size: 12px;color: #999999;display: inline-block;width: 80px}
+  .achievements li  .d2-n{font-size: 12px;color: #999999;display: inline-block;width: 70px}
   .achievements li .d3 .d3-s{color: #f5576c;font-weight: bold}
   .achievements .d5-item{padding: 3px 10px ;background: #EEEEEF;color: #111111;align-items: center;justify-content: center;border-radius: 4px}
   .achievements .price-popup{border-radius: 4px;}