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

src/components/sale/orderlist.vue

@@ -145,8 +145,6 @@
               <span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==1"
                 style="color:#2961FE;margin-right: 5px">{{x.GuestName}} </span>
             </div>
-            <!-- <div v-if="AuthorityObj.isShowContract&&item.GuestList&&item.GuestList.length>0&&item.ContractList&&item.ContractList.length==0"
-              class="takeContract" @click="takeContract(item)">领取合同</div> -->
             <div v-if="AuthorityObj.isShowContract&&item.GuestList&&item.GuestList.length>0" class="takeContract">
               <span @click="isShowPop=true">查看合同</span>
               <q-popup-proxy v-if="isShowPop">
@@ -648,7 +646,7 @@
           isShowRewardEdit: false, //是否显示修改额外提成按钮
           isShowBackClass: false, //是否显示退课按钮
           isShowRenewClass: false, //是否显示续课按钮
-          isShowContract:true,//是都显示合同
+          isShowContract:false,//是都显示合同
         },
 
         isShowEduForm:false,

src/pages/contractView.vue

@@ -150,7 +150,7 @@
         甲方：成都市锦江区甲鹤外语培训学校有限公司
       </div>
       <div class="contractCompany">
-        乙方：<div class="contractInput" style="width:360px;"></div>
+        乙方：<div class="contractInput" style="width:360px;">{{dataList.StudentName}}</div>
       </div>
       <div class="operationAgree">甲鹤日语课程协议</div>
       <div class="operationDate">
@@ -324,7 +324,7 @@
             <div class="contractInput">{{dataList.ThirdClassHours}}</div>
           </td>
           <td>
-            <div class="contractInput">总课时</div>
+            <div class="contractInput">{{dataList.TotalClassHours}}</div>
           </td>
         </tr>
         <tr>
@@ -339,7 +339,7 @@
             <div class="contractInput">{{dataList.ThirdCourseFee}}</div>
           </td>
           <td>
-            <div class="contractInput">总课程费</div>
+            <div class="contractInput">{{dataList.TotalCourseFee}}</div>
           </td>
         </tr>
         <tr>
@@ -354,7 +354,7 @@
             <div class="contractInput">{{dataList.ThirdBookFee}}</div>
           </td>
           <td>
-            <div class="contractInput">总教材费</div>
+            <div class="contractInput">{{dataList.TotalBookFee}}</div>
           </td>
         </tr>
         <tr>
@@ -369,22 +369,22 @@
             <div class="contractInput">{{dataList.ThirdClassFee}}</div>
           </td>
           <td>
-            <div class="contractInput">总课件费</div>
+            <div class="contractInput">{{dataList.TotalClassFee}}</div>
           </td>
         </tr>
         <tr>
           <td>费用小计</td>
           <td>
-            <div class="contractInput"></div>
+            <div class="contractInput">{{dataList.FirstSubTotal}}</div>
           </td>
           <td>
-            <div class="contractInput"></div>
+            <div class="contractInput">{{dataList.SecondSubTotal}}</div>
           </td>
           <td>
-            <div class="contractInput"></div>
+            <div class="contractInput">{{dataList.ThirdSubTotal}}</div>
           </td>
           <td>
-            <div class="contractInput"></div>
+            <div class="contractInput">{{dataList.TotalSub}}</div>
           </td>
         </tr>
         <tr>
@@ -399,7 +399,7 @@
             <div class="contractInput">{{dataList.ThirdDiscountMoney}}</div>
           </td>
           <td>
-            <div class="contractInput">总优惠</div>
+            <div class="contractInput">{{dataList.TotalDiscountMoney}}</div>
           </td>
         </tr>
         <tr>
@@ -416,7 +416,7 @@
             <div class="contractInput">{{dataList.ThirdMoney}}</div>
           </td>
           <td>
-            <div class="contractInput"></div>
+            <div class="contractInput">{{dataList.TotalMoney}}</div>
           </td>
         </tr>
         <tr>
@@ -431,7 +431,7 @@
             <div class="contractInput">{{dataList.ThirdPayDateStr}}</div>
           </td>
           <td>
-            <div class="contractInput"></div>
+            <div class="contractInput" style="height:30px;"></div>
           </td>
         </tr>