Merge branch '红色' into 更新

packageA/orderForm/detail.js

@@ -40,6 +40,7 @@ Page({
             isRecall: checkPermission("recall"),
             isSure: checkPermission("sure"),
             ProductFile: checkPermission("ProductFile"),
+            siteid: wx.getStorageSync('userMsg').siteid
         });
         this.getDetail(true);
         //销售分类

packageA/orderForm/detail.wxml

@@ -16,6 +16,7 @@
 	<view class="exp">{{language['订单状态']||'订单状态'}}：<text style="color:{{sColors[detail.status]}};">{{language[detail.status]||detail.status}}</text></view>
 	<view class="exp">{{language['单据日期']||'单据日期'}}：{{detail.billdate || language['暂无']||'暂无'}}</view>
 	<view class="exp">{{language['创建日期']||'创建日期'}}：{{detail.createdate}}</view>
+	<view class="exp" wx:if="{{siteid=='HY'}}">{{language['备货状态']||'备货状态'}}：<text style="color:{{sColors[detail.goodsstatus]}};">{{language[detail.goodsstatus]||detail.goodsstatus}}</text></view>
 	<view class="exp">{{language['核销状态']||'核销状态'}}：<text style="color:{{sColors[detail.writeoffstatus]}};">{{language[detail.writeoffstatus]||detail.writeoffstatus}}</text></view>
 	<view class="exp">{{language['开票状态']||'开票状态'}}：<text style="color:{{sColors[detail.invoicestatus]}};">{{language[detail.invoicestatus]||detail.invoicestatus}}</text></view>
 	<van-button custom-class='copy' bindtap="copyItem">{{language['一键复制订单']||'一键复制订单'}}</van-button>
@@ -145,7 +146,7 @@
 	<view class="but-box">
 		<block wx:if="{{detail.status=='预提交'}}">
 			<van-button wx:if="{{isSure}}" custom-class='but' bind:click="confirmSubmit">{{language['确认提交']||'确认提交'}}</van-button>
-			<van-button  wx:if="{{isRecall}}" custom-class='but' color='#FF9933' bind:click="recall">{{language['撤回']||'撤回'}}</van-button>
+			<van-button wx:if="{{isRecall}}" custom-class='but' color='#FF9933' bind:click="recall">{{language['撤回']||'撤回'}}</van-button>
 		</block>
 		<block wx:else>
 			<block wx:if="{{isDelete}}">

packageA/orderForm/modules/product/index.js

@@ -74,6 +74,8 @@ Component({
                     v.marketprice = CNY(v.marketprice)
                     v.defaultamount = CNY(v.defaultamount)
                     v.aftersalesmagamount = CNY(v.aftersalesmagamount)
+                    v.writeoffamount = CNY(v.writeoffamount)
+                    v.invoiceamount = CNY(v.invoiceamount)
                     return v;
                 })
                 let page = getCurrentPages().find(v => v.__route__ == 'packageA/orderForm/detail').data.detail;

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

@@ -15,12 +15,12 @@
       box-sizing: border-box;
 
       .img {
+        position: relative;
         flex-shrink: 0;
         width: 112rpx;
         height: 112rpx;
         border-radius: 16rpx;
         margin-right: 20rpx;
-        overflow: hidden;
 
         .err {
           display: flex;
@@ -32,6 +32,26 @@
           border: 1px solid #ddd;
           box-sizing: border-box;
           color: #666;
+          border-radius: 16rpx;
+        }
+
+        .tag-box {
+          display: flex;
+          justify-content: center;
+          width: 100%;
+          position: absolute;
+          top: 94rpx;
+
+          .tag {
+            max-width: 70rpx;
+            font-family: PingFang SC, PingFang SC;
+            font-size: 18rpx;
+            color: #FFFFFF;
+            line-height: 32rpx;
+            border-radius: 16rpx;
+            background-color: #52C41A;
+            padding: 0 12rpx;
+          }
         }
       }
 

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

@@ -6,6 +6,11 @@
                     <van-loading slot="loading" type="spinner" size="20" vertical />
                 </van-image>
                 <text wx:else class="err">{{language['暂无图片']||'暂无图片'}}</text>
+                <view class="tag-box" wx:if="{{siteid=='HY' && item.goodsstatus=='已备货'}}">
+                    <view class="tag">
+                        {{language['备货完']||'备货完'}}
+                    </view>
+                </view>
             </view>
             <view class="dec">
                 <view class="title">
@@ -31,7 +36,21 @@
                     <text class="line-1" style="margin-right: 6rpx;">{{language['退货数量']||'退货数量'}}：{{item.aftersalesmagqty||'0'}}</text>
                     <text class="line-1" style="margin-right: 6rpx;">{{language['退款金额']||'退款金额'}}：{{item.aftersalesmagamount||' --'}}</text>
                 </view>
+                <block wx:if="{{siteid=='HY'}}">
+                    <view class="subfield" style="border-top: 1rpx solid #ddd;margin-top: 16rpx;padding-top: 16rpx;">
+                        <text class="line-1" style="margin-right: 6rpx;">{{language['未发货数量']||'未发货数量'}}：{{item.undeliqty||0}}</text>
+                        <text class="line-1" style="margin-right: 6rpx;">{{language['已出货数量']||'已出货数量'}}：{{item.logisticsqty||'0'}}</text>
+                    </view>
+                    <view class="subfield">
+                        <text class="line-1" style="margin-right: 6rpx;">{{language['已备货数量']||'已备货数量'}}：{{item.bookedqty||'0'}}</text>
+                    </view>
+                    <view class="subfield">
+                        <text class="line-1" style="margin-right: 6rpx;">{{language['退货数量']||'退货数量'}}：{{item.invoiceamount||'0'}}</text>
+                        <text class="line-1" style="margin-right: 6rpx;">{{language['退货金额']||'退货金额'}}：{{item.writeoffamount||' --'}}</text>
+                    </view>
+                </block>
                 <view style="margin-top: 8rpx;">
+                    {{language['单价']||'单价'}}：
                     <text class="price">{{item.defaultprice}}{{language['元']||'元'}}</text>
                     <text class="old-price" wx:if="{{item.isShowOldPrice}}">{{item.marketprice}}{{language['元']||'元'}}</text>
                 </view>

packageA/receivables/index.js

@@ -27,7 +27,7 @@ Page({
       name: getApp().globalData.Language.getMapText('按客户'),
       value: 1
     }],
-    points: ['全部', '订单', '出货', '开票'],
+    points: ['全部', '订单', '出货', '开票', '质保金'],
     filtratelist: [],
     table: [{
       title: '客户名称',

pages/login/phone.js

@@ -21,12 +21,19 @@ Page({
 			console.log("语言包列表", res)
 			if (res.code == '1') {
 				let item = res.data.find(v => v.languagecode == (wx.getStorageSync('languagecode')))
-				console.log("item", item)
-				this.setData({
-					languages: res.data,
-					languagename: item.languagename || '简体中文',
-					rowIndex: item.rowindex - 1
-				})
+				try {
+					this.setData({
+						languages: res.data,
+						languagename: item.languagename || '简体中文',
+						rowIndex: item.rowindex - 1
+					})
+				} catch (error) {
+					this.setData({
+						languages: res.data,
+						languagename: '简体中文',
+						rowIndex: 0
+					})
+				}
 				this.changeTitle();
 			}
 		})
@@ -35,11 +42,19 @@ Page({
 	changeLanguages(e) {
 		let item = this.data.languages[e.detail.value];
 		getApp().globalData.Language.getLanguages(item.languagecode).then(res => {
-			this.setData({
-				language: res,
-				languagename: item.languagename || '简体中文',
-				rowIndex: item.rowindex - 1
-			})
+			try {
+				this.setData({
+					language: res,
+					languagename: item.languagename || '简体中文',
+					rowIndex: item.rowindex - 1
+				})
+			} catch (error) {
+				this.setData({
+					language: res,
+					languagename: '简体中文',
+					rowIndex: item.rowindex - 1
+				})
+			}
 			this.changeTitle();
 		})
 	},