海盐站点规格改公称通径 公称压力

packageA/account/detail.js

@@ -22,7 +22,8 @@ Page({
     let item = JSON.parse(options.item);
     this.setData({
       detail: item,
-      userrole:wx.getStorageSync('userrole')
+      userrole: wx.getStorageSync('userrole'),
+      siteid: wx.getStorageSync('userMsg').siteid
     })
     this.getList(true);
     getApp().globalData.Language.getLanguagePackage(this, '明细');

packageA/account/detail.wxml

@@ -38,9 +38,17 @@
 			<view class="col">
 				{{language['型号']||'型号'}}：{{language[item.model]||item.model}}
 			</view>
-			<view class="col">
+			<view class="col" wx:if="{{siteid!='HY'}}">
 				{{language['规格']||'规格'}}：{{language[item.spec]||item.spec}}
 			</view>
+			<block wx:if="{{siteid=='HY'}}">
+				<view class="col">
+					{{language['公称通径']||'公称通径'}}：{{item.caliber||'--'}}
+				</view>
+				<view class="col">
+					{{language['公称压力']||'公称压力'}}：{{item.nominalpressure||'--'}}
+				</view>
+			</block>
 			<view class="col">
 				{{language['订单单价']||'订单单价'}}：{{item.showOrderprice}}
 			</view>

packageA/invoice/modules/detailLine/list/index.js

@@ -16,6 +16,9 @@ Component({
     lifetimes: {
         attached: function () {
             getApp().globalData.Language.getLanguagePackage(this)
+            this.setData({
+                siteid: wx.getStorageSync('userMsg').siteid
+            })
         }
     },
     options: {

packageA/invoice/modules/detailLine/list/index.wxml

@@ -20,7 +20,12 @@
                 </view>
                 <view class="subfield">
                     <text class="line-1" style="margin-right: 6rpx;">{{language['型号']||'型号'}}：{{language[item.model]||item.model||' --'}}</text>
-                    <text class="line-1">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec||' --'}}</text>
+                    <text class="line-1" wx:if="{{siteid!='HY'}}">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec||' --'}}</text>
+                </view>
+
+                <view class="subfield" wx:if="{{siteid=='HY'}}">
+                    <text class="line-1" style="margin-right: 6rpx;">{{language['公称通径']||'公称通径'}}：{{language[item.caliber]||item.caliber||' --'}}</text>
+                    <text class="line-1">{{language['公称压力']||'公称压力'}}：{{language[item.nominalpressure]||item.nominalpressure||' --'}}</text>
                 </view>
             </view>
             <view wx:if="{{!disabled}}" class="delete" data-item="{{item}}" catchtap="deleteProduct">

packageA/returnOne/modules/product/index.js

@@ -143,13 +143,13 @@ Component({
       getApp().globalData.handleSelect = this.handleSelect.bind(this);
     },
     /* 处理新增产品 */
-    handleSelect(detail) {
+    async handleSelect(detail) {
       let that = this;
       wx.showModal({
         cancelText: getApp().globalData.Language.getMapText('取消'),
         confirmText: getApp().globalData.Language.getMapText('确定'),
         title: getApp().globalData.Language.getMapText('提示'),
-        content: getApp().globalData.Language.modeBoxPrompts([{
+        content: getApp().globalData.Language.joint([{
           t: 1,
           v: '是否确认添加'
         }, {
@@ -162,6 +162,7 @@ Component({
           r: "?"
         }]),
         complete: (res) => {
+          console.log(res)
           if (res.confirm) _Http.basic({
             "id": 20230105111003,
             "content": {

packageA/shipment/modules/binding/index.js

@@ -12,6 +12,9 @@ Component({
   lifetimes: {
     attached: function () {
       getApp().globalData.Language.getLanguagePackage(this)
+      this.setData({
+        siteid: wx.getStorageSync('userMsg').siteid
+      })
     }
   },
   methods: {

packageA/shipment/modules/binding/index.wxml

@@ -18,12 +18,16 @@
 				<view class="content-title">{{it.itemname||' --'}}</view>
 				<view class="row">
 					<text>{{language['编号']||'编号'}}：{{it.itemno || ' --'}}</text>
-					<text>{{language['规格']||'规格'}}：{{it.spec || ' --'}}</text>
+					<text wx:if="{{siteid!='HY'}}">{{language['规格']||'规格'}}：{{it.spec || ' --'}}</text>
 				</view>
 				<view class="row">
 					<text>{{language['型号']||'型号'}}：{{it.model || ' --'}}</text>
 					<text class="qty">x{{it.qty||0}}</text>
 				</view>
+				<view class="row" wx:if="{{siteid=='HY'}}">
+					<text>{{language['公称通径']||'公称通径'}}：{{it.caliber || ' --'}}</text>
+					<text>{{language['公称压力']||'公称压力'}}：{{it.nominalpressure || ' --'}}</text>
+				</view>
 			</view>
 		</view>
 	</block>

packageA/toolBill/modules/selectProduct/index.js

@@ -11,6 +11,9 @@ Page({
 		showName: "itemname"
 	},
 	onLoad(options) {
+		this.setData({
+			siteid: wx.getStorageSync('userMsg').siteid
+		})
 		if (options.item) {
 			let item = JSON.parse(options.item);
 			this.setData({

packageA/toolBill/modules/selectProduct/index.wxml

@@ -20,6 +20,10 @@
                     <text>{{language['单价']||'单价'}}:{{item.price}}</text>
                     {{language['数量']||'数量'}}:{{item.qty}}
                 </view>
+                <view class="subfield line-1">
+                    <text>{{language['公称通径']||'公称通径'}}:{{item.caliber||'--'}}</text>
+                    {{language['公称压力']||'公称压力'}}:{{item.nominalpressure||'--'}}
+                </view>
                 <view class="price line-1">
                     {{language['总金额']||'总金额'}}<text class="num">￥{{item.gradeprice || item.amount}}{{language['元']||'元'}}</text>
                 </view>
@@ -27,7 +31,7 @@
         </view>
         <view class="bot">
             <text>{{language['订单']||'订单'}}:{{item.sonum||' --'}}</text>
-            <text>{{language['型号']||'型号'}}:{{language[item.model]||item.model||' --'}}</text>
+            <text wx:if="{{siteid!='HY'}}">{{language['型号']||'型号'}}:{{language[item.model]||item.model||' --'}}</text>
         </view>
     </navigator>
     <view wx:if="{{!radio}}" style="height: 130rpx;" />

packageA/toolBill/modules/toolDetail/list/index.js

@@ -19,6 +19,9 @@ Component({
 	lifetimes: {
 		attached: function () {
 			getApp().globalData.Language.getLanguagePackage(this)
+			this.setData({
+				siteid: wx.getStorageSync('userMsg').siteid
+			})
 		}
 	},
 	methods: {

packageA/toolBill/modules/toolDetail/list/index.wxml

@@ -17,7 +17,11 @@
 				</view>
 				<view class="subfield">
 					<text class="line-1" style="margin-right: 6rpx;">{{language['型号']||'型号'}}：{{language[item.model]||item.model||' --'}}</text>
-					<text class="line-1">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec||' --'}}</text>
+					<text class="line-1" wx:if="{{siteid!='HY'}}">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec||' --'}}</text>
+				</view>
+				<view class="subfield" wx:if="{{siteid=='HY'}}">
+					<text class="line-1" style="margin-right: 6rpx;">{{language['公称通径']||'公称通径'}}：{{language[item.caliber]||item.caliber||' --'}}</text>
+					<text class="line-1">{{language['公称压力']||'公称压力'}}：{{language[item.nominalpressure]||item.nominalpressure||' --'}}</text>
 				</view>
 				<view class="subfield">
 					<text class="line-1" style="margin-right: 6rpx;">{{language['材质']||'材质'}}：{{language[item.material]||item.material||' --'}}</text>

packageA/toolBill/update.js

@@ -171,6 +171,7 @@ Page({
 			...this.selectComponent("#Form").submit()
 		}
 		content.sa_orderid = content.sa_orderid[1][0] || ''
+		content.sys_enterpriseid = content.sys_enterpriseid[1][0] || ''
 		let res = await _Http.basic({
 			"id": "20230104160503",
 			content