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

src/components/SalesVisa/saleOrderSettlement.vue

@@ -28,17 +28,18 @@
     	</div>
 	    <table class="saleOrderSettlementTable"  border="0" cellspacing="0" cellpadding="0">
 				<tr>
-					<th width="15%">单号</th>
-					<th width="10%">单据类型</th>
+					<th width="5%">单号</th>
+					<th width="8%">单据类型</th>
 					<th width="15%">交易方式</th>
-					<th width="15%">金额</th>
-					<th width="10%">付款对象</th>
-					<th width="15%">制单人员</th>
-					<th width="10%">当前状态</th>
-					<th width="10%">操作</th>
+					<th width="12%">金额</th>
+					<th width="8%">付款对象</th>
+					<th width="15%">备注</th>
+					<th width="5%">制单人员</th>
+					<th width="5%">当前状态</th>
+					<th width="5%">操作</th>
 				</tr>
 				<tr class='h40'>
-					<td colspan="8" align="center" class="fz14" v-show="payList.length==0">
+					<td colspan="9" align="center" class="fz14" v-show="payList.length==0">
 						暂无数据
 					</td>
 				</tr>
@@ -66,6 +67,7 @@
 						<p class="fz12 fbold">{{item.RemitterName}}</p>
 						<p class="fz12">地接供应商</p>
 					</td>
+					<td>{{item.Description}}</td>
 					<td>
 						 <img class="saleOrderSettlementPerson"  v-if='!item.EmPhoto' src="../../assets/img/litheader.png"/>
 				         <img class="saleOrderSettlementPerson"  v-if='item.EmPhoto' :onerror="defaultImg" :src='item.EmPhoto'/>
@@ -106,14 +108,15 @@
     	</div>
 	    <table class="saleOrderSettlementTable"  border="0" cellspacing="0" cellpadding="0">
 				<tr>
-					<th width="15%">单号</th>
-					<th width="10%">单据类型</th>
+					<th width="5%">单号</th>
+					<th width="8%">单据类型</th>
 					<th width="15%">交易方式</th>
-					<th width="15%">金额</th>
-					<th width="10%">收款对象</th>
-					<th width="15%">制单人员</th>
-					<th width="10%">当前状态</th>
-					<th width="10%">操作</th>
+					<th width="12%">金额</th>
+					<th width="8%">收款对象</th>
+					<th width="15%">备注</th>
+					<th width="5%">制单人员</th>
+					<th width="5%">当前状态</th>
+					<th width="5%">操作</th>
 				</tr>
 				<tr v-for="item in collectList">
 					<td class="fz14 fbold">{{item.FrID}}</td>
@@ -139,6 +142,7 @@
 						<p class="fz12 fbold">{{item.RemitterName}}</p>
 						<p class="fz12">地接供应商</p>
 					</td>
+					<td>{{item.Description}}</td>
 					<td>
 						 <img class="saleOrderSettlementPerson"  v-if='!item.EmPhoto' src="../../assets/img/litheader.png"/>
 				         <img class="saleOrderSettlementPerson"  v-if='item.EmPhoto' :onerror="defaultImg" :src='item.EmPhoto'/>
@@ -165,7 +169,7 @@
 					</td>
 				</tr>				
 				<tr class='h40'>
-					<td colspan="8" align="center" class="fz14" v-show="collectList.length==0">
+					<td colspan="9" align="center" class="fz14" v-show="collectList.length==0">
 						暂无数据
 					</td>
 				</tr>				
@@ -199,7 +203,7 @@
 					<td><input type="checkbox" :value="item.Id" v-model="OrderIds"></td>
 				</tr>
 				<tr class="h40" v-show="tichengList.length==0"> 
-					<td colspan="4" align="center">
+					<td colspan="10" align="center">
 						暂无提成发放
 					</td>
 				</tr>