Merge remote-tracking branch 'origin/nbncPda' into nbncPda

野心家

2024-11-20 324945af3a5eee3f6e58843823a1e6ffa3a96b21

Merge remote-tracking branch 'origin/nbncPda' into nbncPda

 pages/order/orderComb.vue

@@ -113,7 +113,7 @@
                    <view class="popup-item">
                        <view class="popup-item-left">数量:</view>
                        <view class="popup-item-right" style="border: none;justify-content: center;">
                            <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474"
                            <uni-number-box :value="count" :step='1' :max="9999999" color="#747474"
                                @change="changeValue" />
                        </view>
                    </view>

 pages/pakin/WarehouseIn.vue

@@ -101,7 +101,7 @@
                    <view class="popup-item">
                        <view class="popup-item-left">数量:</view>
                        <view class="popup-item-right" style="border: none;justify-content: center;">
                            <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
                            <uni-number-box :value="count" :step='1' :max="9999999" color="#747474" @change="changeValue" />
                        </view>
                    </view>
                    <view class="btn">

 pages/pakin/pakin.vue

@@ -124,7 +124,7 @@
                    <view class="popup-item">
                        <view class="popup-item-left">数量:</view>
                        <view class="popup-item-right" style="border: none;justify-content: center;">
                            <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
                            <uni-number-box :value="count" :step='1' :max="9999999" color="#747474" @change="changeValue" />
                        </view>
                    </view>
                    <view class="btn">

 pages/pakin/pickAgain.vue

@@ -40,7 +40,7 @@
                    <view class="popup-item">
                        <view class="popup-item-left">数量:</view>
                        <view class="popup-item-right" style="border: none;justify-content: center;">
                            <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
                            <uni-number-box :value="count" :step='1' :max="9999999" color="#747474" @change="changeValue" />
                        </view>
                    </view>
                    <view class="btn">

 pages/warehouse/outMats.vue

@@ -49,7 +49,7 @@
                    </view>
                    <view style="display: flex;">
                        <text class="desc_name">数量：</text>
                        <uni-number-box :value="item.anfme" :step='1' :min="0" :max="item.maxCount" color="#747474" @change="changeValue(item,index,item.anfme)" />
                        <uni-number-box :value="item.anfme" :step='1' :min="0" :max="item.maxCount" color="#747474" @change="changeValue($event,item)" />
                        <!-- <text class="desc_connect">{{item.anfme}}</text> -->
                        
                    </view>
@@ -123,8 +123,8 @@
            back() {
                uni.navigateBack({})
            },
            changeValue(item,index,value) {
                this.dataList[index].anfme = value
            changeValue(e,item) {
                item.anfme = e
            },
            checkboxChange(e) {
                let items = this.dataList,