Merge branch '黄色' into 测试

packageA/invoiceforecast/modules/orderForm/index.wxml

@@ -33,14 +33,6 @@
             {{language['部门']||'部门'}}：{{language[item.depname]||item.depname}}
         </view>
     </view>
-    <view class="row" wx:if="{{siteid == 'HY'}}" style="margin-top: 16rpx;">
-        <view class="left">
-            {{language['公称通径']||'公称通径'}}：{{language[item.caliber]||item.caliber||' --'}}
-        </view>
-        <view class="right">
-            {{language['公称压力']||'公称压力'}}：{{item.nominalpressure||' --'}}
-        </view>
-    </view>
     <view class="row" style="margin-top: 8rpx;">
         <view class="left">
             {{language['企业名称']||'企业名称'}}：{{item.enterprisename||' --'}}

packageA/select/orderForm/select.wxml

@@ -24,14 +24,14 @@
                         {{language['业务员']||'业务员'}}：{{item.name||' --'}}
                     </view>
                 </view>
-                <view class="row" wx:if="{{siteid == 'HY'}}" style="margin-top: 16rpx;">
+                <!-- <view class="row" wx:if="{{siteid == 'HY'}}" style="margin-top: 16rpx;">
                     <view class="left">
                         {{language['公称通径']||'公称通径'}}：{{language[item.caliber]||item.caliber||' --'}}
                     </view>
                     <view class="right">
                         {{language['公称压力']||'公称压力'}}：{{item.nominalpressure||' --'}}
                     </view>
-                </view>
+                </view> -->
                 <view class="row" style="margin-top: 16rpx;">
                     <view class="left">
                         {{language['项目名称']||'项目名称'}}：{{item.projectname||' --'}}