Merge branch '黄色' into 测试

packageA/invoice/update.js

@@ -2,7 +2,7 @@ const _Http = getApp().globalData.http;
 
 Page({
 	data: {
-		loading: true,
+		loading: false,
 		showAll: false,
 		disabled: true,
 		form: [{

select/orderFormLine/index.js

@@ -24,6 +24,7 @@ Page({
       radio: options.radio ? true : false,
       idname: options.idname || this.data.idname,
       showName: options.showName || this.data.showName,
+      siteid: wx.getStorageSync('userMsg').siteid
     });
     this.getList();
     getApp().globalData.Language.getLanguagePackage(this, 'E-订单');

select/orderFormLine/index.wxml

@@ -1,4 +1,4 @@
-<import src="index.skeleton.wxml"/>
+<import src="index.skeleton.wxml" />
 <template is="skeleton" wx:if="{{loading}}" />
 
 <van-search class="search" value="{{ params.content.where.condition }}" shape="round" placeholder="{{language['关键字']||'请输入搜索关键词'}}" bind:search='startSearch' bind:clear='onClear' />
@@ -22,6 +22,10 @@
 				<view class="subfield line-1">
 					<text>{{language[item.type]||item.type}}：{{item.sonum||' --'}}</text>
 				</view>
+				<view class="subfield line-1" wx:if="{{siteid == 'HY'}}">
+					<text style="margin-right: 6rpx;">{{language['公称通径']||'公称通径'}}：{{item.caliber||' --'}}</text>
+					<text>{{language['公称压力']||'公称压力'}}：{{item.nominalpressure||' --'}}</text>
+				</view>
 				<view class="subfield line-1">
 					<text>{{language['数量']||'数量'}}：{{item.qty||' --'}}</text>
 					<text>{{language['单价']||'单价'}}：{{item.price||' --'}}</text>
@@ -33,7 +37,7 @@
 		</view>
 		<view class="bot">
 			<text>{{language['型号']||'型号'}}:{{language[item.model]||item.model ||' --'}}</text>
-			<text>{{language['规格']||'规格'}}:{{language[item.spec]||item.spec ||' --'}}</text>
+			<text wx:if="{{siteid != 'HY'}}">{{language['规格']||'规格'}}:{{language[item.spec]||item.spec ||' --'}}</text>
 		</view>
 	</navigator>
 	<view wx:if="{{!radio}}" style="height: 130rpx;" />