chenhaozhe
2025-09-09 0754d4ecd609271565cbaebea8b31bfe13ab04a9
Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

# Conflicts:
# manifest.json
8个文件已修改
33 ■■■■■ 已修改文件
pages/caigouruku/form.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/qitachuku_v2/form.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/qitaruku_v2/form.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/shengchanbuliao/form.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/shengchanlingliaoshengdan/form.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/shengchanrukushengdan/form.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/weiwailingliao/form.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/zhijiediaobo/form.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/caigouruku/form.vue
@@ -180,6 +180,12 @@
                            <view class="detail" v-if="item.款号">
                                <text>款号:</text>{{item.款号}}
                            </view>
                            <view class="detail" v-if="item.合计数量">
                                <text>合计数量:</text>{{item.合计数量}}
                            </view>
                            <view class="detail" v-if="item.单价">
                                <text>单价:</text>{{item.单价}}
                            </view>
                        </view>
                    </uni-card>
                </view>
@@ -1141,14 +1147,15 @@
                                        }
                                        //供应商不可编辑
                                        this.showHSupName = false
                                        //光标对准物料
                                        this.barCodeFocus = true;
                                    }
                                }
                                //显示表体明细
                                this.DisBillEntryList()
                                //清空数量
                                this.hform.HQty = ''
                                //光标对准条码
                                this.refreshBarCodeState()
                            } else {
                                this.playSound(0)
                                this.refreshBarCodeState()
pages/qitachuku_v2/form.vue
@@ -1187,6 +1187,7 @@
                                this.DisBillEntryList()
                                //清空数量
                                this.hform.HQty = ''
                                this.refreshBarCodeState()
                            } else {
                                this.playSound(0)
                                this.refreshBarCodeState()
pages/qitaruku_v2/form.vue
@@ -1212,6 +1212,7 @@
                                this.DisBillEntryList()
                                //清空数量
                                this.hform.HQty = ''
                                this.refreshBarCodeState()
                            } else {
                                this.playSound(0)
                                this.refreshBarCodeState()
pages/shengchanbuliao/form.vue
@@ -168,6 +168,9 @@
                            <view class="detail">
                                <text>数量:</text>{{item.数量}}
                            </view>
                            <view class="detail" v-if="item.合计数量">
                                <text>合计数量:</text>{{item.合计数量}}
                            </view>
                            <view class="detail">
                                <text>条码个数:</text>{{item.条码个数}}
                            </view>
@@ -180,6 +183,7 @@
                            <view class="detail" v-if="item.款号">
                                <text>款号:</text>{{item.款号}}
                            </view>
                        </view>
                    </uni-card>
                </view>
@@ -1104,6 +1108,7 @@
                                this.DisBillEntryList()
                                //清空数量
                                this.hform.HQty = ''
                                this.refreshBarCodeState()
                            } else {
                                this.playSound(0)
                                this.refreshBarCodeState()
pages/shengchanlingliaoshengdan/form.vue
@@ -168,6 +168,9 @@
                            <view class="detail">
                                <text>数量:</text>{{item.数量}}
                            </view>
                            <view class="detail" v-if="item.合计数量">
                                <text>合计数量:</text>{{item.合计数量}}
                            </view>
                            <view class="detail">
                                <text>条码个数:</text>{{item.条码个数}}
                            </view>
@@ -1208,6 +1211,7 @@
                                this.DisBillEntryList()
                                //清空数量
                                this.hform.HQty = ''
                                this.refreshBarCodeState()
                            } else {
                                this.playSound(0)
                                this.refreshBarCodeState()
pages/shengchanrukushengdan/form.vue
@@ -1168,6 +1168,7 @@
                                this.DisBillEntryList()
                                //清空数量
                                this.hform.HQty = ''
                                this.refreshBarCodeState()
                            } else {
                                this.playSound(0)
                                this.refreshBarCodeState()
pages/weiwailingliao/form.vue
@@ -168,6 +168,9 @@
                            <view class="detail">
                                <text>数量:</text>{{ item.数量 }}
                            </view>
                            <view class="detail" v-if="item.合计数量">
                                <text>合计数量:</text>{{item.合计数量}}
                            </view>
                            <view class="detail">
                                <text>条码个数:</text>{{ item.条码个数 }}
                            </view>
@@ -1151,6 +1154,7 @@
                                this.DisBillEntryList()
                                //清空数量
                                this.hform.HQty = ''
                                this.refreshBarCodeState()
                            } else {
                                this.playSound(0)
                                this.refreshBarCodeState()
pages/zhijiediaobo/form.vue
@@ -1592,6 +1592,12 @@
                                this.DisBillEntryList()
                                //清空数量
                                this.hform.HQty = ''
                                //光标对准
                                this.barCodeFocus = false
                                this.$nextTick(() => {
                                    this.barCodeFocus = true
                                    this.hform.HBarCode = ""
                                })
                            } else {
                                this.playSound(0)
                                uni.showToast({