xiaohaizhao hace 2 semanas
padre
commit
1a01b214c9

+ 16 - 12
packageA/orderForm/alteration.js

@@ -155,12 +155,6 @@ Page({
             loading: true,
             disabled: true
         });
-        
-        // 直接提交订单变更申请
-        this.submitChangeRequest();
-    },
-    /* 提交订单变更申请 */
-    submitChangeRequest() {
         // 构建itemifnos数组
         let itemifnos = this.data.selectedProducts.map(item => {
             return {
@@ -186,13 +180,23 @@ Page({
             });
 
             if (res.code == '1') {
-                wx.showToast({
-                    title: '提交成功',
-                    icon: 'success'
+                // 获取详情页面实例
+                let pages = getCurrentPages();
+                let detailPage = pages.find(v => v.__route__ == 'packageA/orderForm/detail');
+                if (detailPage) {
+                    // 调用详情页面的getDetail方法更新数据
+                    detailPage.getDetail(false, false);
+                }
+                // 先返回详情页面,在回调中显示提示
+                wx.navigateBack({
+                    success: () => {
+                        // 显示提交成功的提示
+                        wx.showToast({
+                            title: '提交成功',
+                            icon: 'success'
+                        });
+                    }
                 });
-                setTimeout(() => {
-                    wx.navigateBack();
-                }, 1000);
             } else {
                 wx.showToast({
                     title: res.msg,

+ 3 - 3
packageA/orderForm/alteration.wxml

@@ -39,12 +39,12 @@
         <view class="row">
             <view>
                 <view class="label">{{language['变更数量']||'变更数量'}}<text wx:if="{{item.auxunit}}">({{item.auxunit}})</text></view>
-                <input class="input" style="width: 180rpx;" type="digit" value="{{item.newvalue || item.qty}}" data-index="{{index}}" bindinput="onChangeValue" />
+                <input class="input" style="width: 180rpx;" type="digit" value="{{item.newvalue || item.qty}}" data-index="{{index}}" bindblur="onChangeValue" />
             </view>
             <view>
                 <view class="label">{{language['变更交期']||'变更交期'}}</view>
                 <picker mode="date" value="{{item.newdeliverydate || item.deliverydate}}" start="{{today}}" bindchange="onChangeDate" data-index="{{index}}">
-                    <view class="input" style="width: 156rpx;padding:0 30rpx;">
+                    <view class="input" style="width: 170rpx;padding:0 20rpx;">
                         {{item.newdeliverydate || item.deliverydate || language['选择日期']||'选择日期'}}
                     </view>
                 </picker>
@@ -58,4 +58,4 @@
     <van-button custom-class='but' bindclick='cancel'>{{language['取消']||'取消'}}</van-button>
     <van-button custom-class='new-submit but' disabled='{{disabled || loading}}' loading='{{loading}}' bindclick='submit'>{{language['提交']||'提交'}}</van-button>
 </view>
-<wxs src="../../../utils/nominalpressure.wxs" module="join"></wxs>
+<wxs src="/utils/nominalpressure.wxs" module="join"></wxs>

+ 2 - 13
packageA/orderForm/detail.js

@@ -27,7 +27,7 @@ Page({
         showMYModel: false,
         reminddays: 0,
         selectedProducts: [],
-        canAlter: true, // 是否可以进行订单变更
+        canAlter: false, // 是否可以进行订单变更
     },
     onLoad(options) {
         const authOptions = wx.getStorageSync('auth').worderform.options;
@@ -151,18 +151,7 @@ Page({
                         canAlter: this.data.isAlteration && !hasAlterTag,
                         hasAlterTag
                     });
-                }).catch(err => {
-                    console.error('获取标签列表失败', err);
-                    // 即使获取标签列表失败,也考虑isAlteration权限
-                    this.setData({
-                        canAlter: this.data.isAlteration
-                    });
-                });
-            } else {
-                // 非审核状态,考虑isAlteration权限
-                this.setData({
-                    canAlter: this.data.isAlteration
-                });
+                })
             }
 
             if (init) {

+ 5 - 5
packageA/orderForm/detail.wxml

@@ -123,9 +123,9 @@
 		</van-radio-group>
 	</view>
 	<view class="row" wx:if="{{canAlter}}">
-	<view class="label">{{language['订单变更申请驳回原因']||'订单变更申请驳回原因'}}</view>
-	<view class="label" style="flex:1;color:#333;">{{language[detail.reject_reason]||detail.reject_reason || '--' }}</view>
-</view>
+		<view class="label">{{language['订单变更申请驳回原因']||'订单变更申请驳回原因'}}</view>
+		<view class="label" style="flex:1;color:#333;">{{language[detail.reject_reason]||detail.reject_reason || '--' }}</view>
+	</view>
 </view>
 <view style="height: 20rpx;" />
 <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
@@ -172,8 +172,8 @@
 				<van-button custom-class='but' wx:if="{{detail.status=='新建'}}" bind:click="submit">{{language['提交订单']||'提交订单'}}</van-button>
 			</block>
 			<block wx:if="{{canAlter}}">
-	<van-button disabled="{{selectedProducts.length == 0}}" custom-class='but' wx:if="{{detail.status=='审核'}}" bind:click="alteration">{{language['订单变更申请']||'订单变更申请'}}</van-button>
-</block>
+				<van-button disabled="{{selectedProducts.length == 0}}" custom-class='but' wx:if="{{detail.status=='审核'}}" bind:click="alteration">{{language['订单变更申请']||'订单变更申请'}}</van-button>
+			</block>
 			<block wx:if="{{fixATime}}">
 				<van-button custom-class='but' wx:if="{{detail.status=='交期待确认'}}" bind:click="notarize">{{language['确认交期']||'确认交期'}}</van-button>
 			</block>