Merge branch '修改/调整订货单列表样式' into 楚楚/楚楚master

# Conflicts:
#	packageA/orderForm/detail.js

components/Yl_Attachment/index.wxml

@@ -8,11 +8,11 @@
 				<text class="iconfont icon-webqiyeshuiyintupian" />
 			</navigator>
 		</Yl_Upload>
-		<Yl_Upload accept='file' bind:uploadCallback='addFiles'>
+<!-- 		<Yl_Upload accept='file' bind:uploadCallback='addFiles'>
 			<navigator url="#" class="but">
 				<text class="iconfont icon-a-biaoqianlanzhiku" />
 			</navigator>
-		</Yl_Upload>
+		</Yl_Upload> -->
 	</view>
 </view>
 

packageA/orderForm/modules/product/list/index.wxml

@@ -16,7 +16,7 @@
                     型号：{{item.model||' --'}}
                 </view>
                 <view class="subfield">
-                    <text class="line-1">规格：{{item.standards||' --'}}</text>
+                    规格：{{item.standards||' --'}}
                 </view>
                 <view wx:if="{{item.iscustomsize}}" class="subfield" style="margin-top: 8rpx;">
                     定制属性：{{item.customproperties}}

packageA/remitVoucher/detail.js

@@ -24,6 +24,10 @@ Page({
 			label: "打款明细",
 			icon: "icon-tabcaozuojilu1",
 			model: "#remitVoucher"
+		}, {
+			label: "附件",
+			icon: "icon-tabfujian1",
+			model: "#Yl_Attachment"
 		}],
 		tabbarsList: []
 	},
@@ -63,7 +67,7 @@ Page({
 				label: "审核",
 				icon: "icon-shenhe"
 			}, */
-			if (res.data.status == '提交') tabbarsList = [ {
+			if (res.data.status == '提交') tabbarsList = [{
 				label: "撤回",
 				icon: "icon-a-fanshenhetuihui"
 			}]

packageA/remitVoucher/detail.json

@@ -1,8 +1,9 @@
 {
   "usingComponents": {
-    "Preview":"/packageA/shipment/modules/preview/index",
-    "remitVoucher":"/packageA/remitVoucher/modules/remitDetail",
+    "Preview": "/packageA/shipment/modules/preview/index",
+    "remitVoucher": "/packageA/remitVoucher/modules/remitDetail",
     "van-datetime-picker": "@vant/weapp/datetime-picker/index",
-    "van-popup": "@vant/weapp/popup/index"
+    "van-popup": "@vant/weapp/popup/index",
+    "Yl_Attachment": "/components/Yl_Attachment/index"
   }
 }

packageA/remitVoucher/detail.wxml

@@ -1,4 +1,4 @@
-<import src="detail.skeleton.wxml"/>
+<import src="detail.skeleton.wxml" />
 <template is="skeleton" wx:if="{{loading}}" />
 
 <view class="intr">
@@ -15,27 +15,15 @@
 </view>
 <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
 	<Preview slot='详细信息' list1='{{list1}}' list2='{{list2}}' />
-    <remitVoucher disabled="{{detail.status != '新建'}}" detail="{{detail}}" slot="打款明细" id="remitVoucher" bind:onSuccess="getDetail"></remitVoucher>
+	<remitVoucher disabled="{{detail.status != '新建'}}" detail="{{detail}}" slot="打款明细" id="remitVoucher" bind:onSuccess="getDetail"></remitVoucher>
+	<Yl_Attachment slot='附件' id='Yl_Attachment' ownertable="sa_paybill" ownerid="{{detail.sa_paybillid}}" disabled="{{detail.status!='新建'}}" />
 	<view style="height: 160rpx;" />
 </Yl_FunTabs>
 
 <!-- 底部 -->
-<Yl_Tabbar list='{{tabbarsList}}' bind:callback="tabbarOnClick" />
+<Yl_Tabbar wx:if="{{tabbarsList.length}}" list='{{tabbarsList}}' bind:callback="tabbarOnClick" />
 
 
-<van-popup
-  show="{{ show }}"
-  position="bottom"
-  custom-style="height: 50%;"
-  bind:close="onClose"
-  bind:click-overlay="onClose"
-  z-index="9999"
->
-	<van-datetime-picker
-		type="date"
-		value="{{ currentDate }}"
-		formatter="{{ formatter }}"
-		bind:confirm="checkSubmit"
-		bind:cancel="onClose"
-	/>
-</van-popup>
+<van-popup show="{{ show }}" position="bottom" custom-style="height: 50%;" bind:close="onClose" bind:click-overlay="onClose" z-index="9999">
+	<van-datetime-picker type="date" value="{{ currentDate }}" formatter="{{ formatter }}" bind:confirm="checkSubmit" bind:cancel="onClose" />
+</van-popup>

packageA/remitVoucher/modules/remitDetail.wxml

@@ -1,7 +1,7 @@
 <view class="head">
   <view class="count">打款明细</view>
   <view class="expand">
-    <navigator url="#" class="but" bindtap="addProduct">
+    <navigator wx:if="{{!disabled}}" url="#" class="but" bindtap="addProduct">
       <van-icon name="plus" />
     </navigator>
   </view>
@@ -15,7 +15,7 @@
 			<input type="text" bindtap="isEdit" disabled="{{detail.status != '新建'}}" class="input" value="{{item.amount}}" data-data="{{item}}" bindblur="priceChange"/>
 		</view>
 	</view>
-	<view class="delete" data-data="{{item}}" catchtap="deleteProduct">
+	<view class="delete" wx:if="{{!disabled}}" data-data="{{item}}" catchtap="deleteProduct">
 		<text class="iconfont icon-guanlian-shanchu" />
 	</view>
 </view>