Merge branch 'master' of http://s.dev01.dkiboss.com:9001/iBOSS-2.0-Mini/iboss_wx_app

i18n/zh-CN.js

@@ -253,6 +253,7 @@ const home = {
   buyUser:'购买授权',
   buyHistory:'已购记录',
   buyUpgrade:'升级更便宜',
+  buyNow:'购买',
 }
 
 //  基础数据

package-basic-data/pages/activity/activity.js

@@ -51,7 +51,7 @@ Page({
         currentUserCount: null,
         //按钮
         buttonSaveList: [
-            { code: 'save', title: mixins.$t('save'), width: '120rpx' }
+            { code: 'save', title: mixins.$t('buyNow'), width: '120rpx' }
         ],
         noticeInfo: Constants.noticeInfo,
         funcMenu: [
@@ -343,8 +343,7 @@ Page({
                 util.showToast('请选择一个授权或功能包');
                 return false
             }
-            // 判断数量是否超出续约授权
-            console.log(currentUserCount.wxNum - summaryInfo.wxMaxNum);
+            // 判断数量是否超出续约授权 
             if (currentUserCount.wxNum > summaryInfo.wxMaxNum && summaryInfo.reCountFlag
                 && currentUserCount.wxNum > 1 && currentUserCount.wxNum - summaryInfo.wxMaxNum > 1) {
                 let staffInfo = [{ wxMaxNum: Number(this.data.wxMaxNum), title: '当前授权', wxTitle: '手机授权', code: 'current', userTitle: '当前用户' }, { wxMaxNum: this.data.buyUser ? summaryInfo.wxMaxNum : summaryInfo.wxMaxNum + 1, title: '续费授权', wxTitle: '手机授权', code: 'renew' }]
@@ -621,8 +620,7 @@ Page({
     /**
      * 生命周期函数--监听页面加载
      */
-    onLoad(options) {
-        console.log(options, "onLoad");
+    onLoad(options) { 
         // 升级
         if (options && options.upgrade) {
             wx.setNavigationBarTitle({

package-basic-data/pages/activity/activity.wxml

@@ -39,7 +39,7 @@
 	<!--活动（标准版）-->
 	<!--合计（标准版）-->
 	<view class="summary-class-std" wx:if="{{gradeCode == 'STD'}}">
-		<view class="summary-item-class" style="display: flex;padding-left: 20rpx;font-size: 20px;">额外购买授权
+		<view class="summary-item-class" style="display: flex;padding-left: 20rpx;font-size: 18px;">额外购买授权
 		</view>
 		<view style="display:flex;flex-wrap: wrap;">
 			<view class="func-card-std" wx:for="{{activityTable}}" wx:for-item="item" wx:key="index" data-item="{{item}}">
@@ -47,9 +47,9 @@
 				<view class="card-desc-std">
 					<view style="font-size: 13px;margin-left: -15px;">
 						<!-- 价格-->
-						<dk-cell fontSize="21" center="center" contentFontWeight="700" contentColor="#FF7B1A" content="{{item.wxPrice}}"></dk-cell>
+						<dk-cell fontSize="19" center="center" contentFontWeight="700" contentColor="#FF7B1A" content="{{item.wxPrice}}"></dk-cell>
 					</view>
-					<view style="font-size: 11px;width: 80px;">/年/授权</view>
+					<view style="font-size: 11px;width: 85px;">/年/授权</view>
 					<view style="text-align: right;">
 						<van-stepper integer="{{true}}" value="{{ summaryInfo.wxMaxNum}}" min="1" bind:change="changeUserSTD" />
 					</view>
@@ -75,7 +75,7 @@
 		<view class="summary-item-class" style="display: flex;padding-left: 20rpx;color: #000000;">截止日期：<view style="color:#E4002B">{{userEndDate}}</view>
 		</view>
 		<view class="summary-item-class" style="display: flex;padding-left: 20rpx;color: #000000;justify-content:space-between;align-items: center;">包含当前账号可配置{{summaryInfo.wxMaxNum+1}}个授权
-			<dk-cell fontSize="21" center="center" contentFontWeight="600" contentColor="#FF7B1A" content="{{summaryInfo.amount }}"></dk-cell>
+			<dk-cell fontSize="19" center="center" contentFontWeight="700" contentColor="#FF7B1A" content="{{summaryInfo.amount }}"></dk-cell>
 		</view> 
 	</view>
 
@@ -85,7 +85,7 @@
 		<van-cell border="{{ false }}" title-class="cell_title">
 			<view slot="title" style="display: flex;">
 				<view>用户数量</view>
-				<view style="font-size: 10px;">(包含手机和电脑授权)</view>
+				<view style="font-size: 10px;">(含手机和电脑授权)</view>
 			</view>
 			<van-stepper value="{{staffCount.maxNum}}" integer="{{true}}" min="0" max="{{1000}}" data-type="all" bind:change="changeStaffCount" />
 		</van-cell>

package-basic-data/pages/activity/renew/renew.js

@@ -343,8 +343,7 @@ Page({
                 util.showToast('请选择一个授权或功能包');
                 return false
             }
-            // 判断数量是否超出续约授权
-            console.log(currentUserCount.wxNum - summaryInfo.wxMaxNum);
+            // 判断数量是否超出续约授权 
             if (currentUserCount.wxNum > summaryInfo.wxMaxNum && summaryInfo.reCountFlag
                 && currentUserCount.wxNum > 1 && currentUserCount.wxNum - summaryInfo.wxMaxNum > 1) {
                 let staffInfo = [{ wxMaxNum: Number(this.data.wxMaxNum), title: '当前授权', wxTitle: '手机授权', code: 'current', userTitle: '当前用户' }, { wxMaxNum: this.data.buyUser ? summaryInfo.wxMaxNum : summaryInfo.wxMaxNum + 1, title: '续费授权', wxTitle: '手机授权', code: 'renew' }]
@@ -621,8 +620,7 @@ Page({
     /**
      * 生命周期函数--监听页面加载
      */
-    onLoad(options) {
-        console.log(options, "onLoad");
+    onLoad(options) { 
         // 升级
         if (options && options.upgrade) {
             wx.setNavigationBarTitle({

package-basic-data/pages/activity/renew/renew.wxml

@@ -39,7 +39,7 @@
 	<!--活动（标准版）-->
 	<!--合计（标准版）-->
 	<view class="summary-class-std" wx:if="{{gradeCode == 'STD'}}">
-		<view class="summary-item-class" style="display: flex;padding-left: 20rpx;font-size: 20px;">额外购买授权
+		<view class="summary-item-class" style="display: flex;padding-left: 20rpx;font-size: 18px;">额外购买授权
 		</view>
 		<view style="display:flex;flex-wrap: wrap;">
 			<view class="func-card-std" wx:for="{{activityTable}}" wx:for-item="item" wx:key="index" data-item="{{item}}">
@@ -47,7 +47,7 @@
 				<view class="card-title-std">{{item.activityItemName}}
 				</view>
 				<!-- 价格-->
-				<dk-cell fontSize="21" center="center" contentFontWeight="700" contentColor="#FF7B1A" content="{{item.wxPrice}}"></dk-cell>
+				<dk-cell fontSize="19" center="center" contentFontWeight="700" contentColor="#FF7B1A" content="{{item.wxPrice}}"></dk-cell>
 				<!-- 授权-->
 				<view class="card-desc-std">
 					<view style="font-size: 13px;width: 100px;">{{$t['userAuthorize']}}</view>
@@ -80,7 +80,7 @@
 		<view class="summary-item-class" style="display: flex;padding-left: 20rpx;color: #000000;">截止日期：<view style="color:#E4002B">{{userEndDate}}</view>
 		</view>
 		<view class="summary-item-class" style="display: flex;padding-left: 20rpx;color: #000000;justify-content:space-between;align-items: center;">包含当前账号可配置{{summaryInfo.wxMaxNum+1}}个授权
-			<dk-cell fontSize="21" center="center" contentFontWeight="600" contentColor="#FF7B1A" content="{{summaryInfo.amount }}"></dk-cell>
+			<dk-cell fontSize="19" center="center" contentFontWeight="700" contentColor="#FF7B1A" content="{{summaryInfo.amount }}"></dk-cell>
 		</view>
 	</view>
 

package-purchase/pages/purchase-order/add/add.js

@@ -315,6 +315,12 @@ Page({
    * @author : 王英杰
    */
   setValuesByEdit(data) {
+    let searchEditList =  util.copyObj(data.purchaseItemResponseList) 
+    searchEditList.forEach(element => {
+      if (this.data.formMode == 'edit') {
+        element.eidtFlag = true
+      }
+    });
     if (!data.flgAutoHandle) {
       this.setData({
         contentList: [{
@@ -428,12 +434,7 @@ Page({
         card.quantity = data.goodsList.sum("itemQty")
       }
     })
-    let searchEditList = data.goodsList
-    searchEditList.forEach(element => {
-      if (this.data.formMode == 'edit') {
-        element.eidtFlag = true
-      }
-    });
+   
     if (popContent_) {
       let itemQtyindex = popContent_.findIndex(it => it.code == 'itemQty')
       popContent_[itemQtyindex].required = false
@@ -510,7 +511,7 @@ Page({
   setParams(params) {
     let formData = JSON.parse(this.data.formData)
     Object.assign(formData, this.recalculation(formData));
-    let totalAmout = Number(0)
+    let totalAmout = Number(0) 
     formData.goodsList.forEach((element, index) => {
       element.itemId = (this.data.formMode == Constants.formMode.add) ? null : element.itemId
       element.intoQty = Number(element.itemQty)
@@ -522,7 +523,7 @@ Page({
         element.intoStatus = Constants.intoStatus.inBounded
       }
       element.whId = formData.whId // 仓库
-    })
+    }) 
     params.fromIds = formData.fromIds
     params.fromNos = formData.fromNos
     params.amtStd = totalAmout //标价金额

package-purchase/pages/purchase-return/add/add.js

@@ -765,7 +765,7 @@ Page({
 
     })
     formData.goodsList = data.dataItem
-    let searchEditList = data.dataItem
+    let searchEditList = utils.copyObj( formData.goodsList)
     searchEditList.forEach(element => {
       if (this.data.formMode == Constants.formMode.edit) {
         element.eidtFlag = true

package-sales/pages/order-billing/add/add.js

@@ -1205,7 +1205,7 @@ Page({
         }
 
         formData.goodsList = res.data.data.dataItem
-        let searchEditList = res.data.data.dataItem
+        let searchEditList = util.copyObj(formData.goodsList)
         searchEditList.forEach(element => {
           if (this.data.formMode == 'edit') {
             element.eidtFlag = true

package-sales/pages/order-return/add/add.js

@@ -983,7 +983,7 @@ Page({
           item.outingQty_min = item.canReturnQty ? item.canReturnQty : item.invQty * -1 //可出库最大值
         })
         formData.goodsList = res.data.data.dataItem
-        let searchEditList = res.data.data.dataItem
+        let searchEditList = utils.copyObj( formData.goodsList)
         searchEditList.forEach(element => {
           if (this.data.formMode == Constants.formMode.other && this.data.formType == Constants.formMode.edit) {
             element.eidtFlag = true

pages/home-page/home-page.js

@@ -639,8 +639,7 @@ Page({
     if (options.scene) {
       // var scene = options.scene
       var openid = decodeURIComponent(options.scene)
-      // let openid = scene.s
-      // console.log("homepage---", openid;
+      // let openid = scene.s 
       // 邀请员工的确认
       wx.navigateTo({
         url: '/package-basic-data/pages/staff/detail/detail',