修改 直接调拨单、生产入库单、销售出库单、分布式调入单、分布式调出单:仓位默认可以编辑。扫描仓位码带出仓库
5个文件已修改
834 ■■■■■ 已修改文件
pages.json 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/fenbushidiaochudan/form_out.vue 284 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/fenbushidiaorudan/form_test.vue 254 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/shengchanrukushengdan/Kf_ProductInBill.vue 141 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/xiaoshouchuku/SellOutBill.vue 143 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages.json
@@ -1063,21 +1063,21 @@
        {
            "path": "pages/fenbushidiaorudan/form_test",
            "style": {
                "navigationBarTitleText": "分布调入单",
                "navigationBarTitleText": "分步调入单",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/fenbushidiaorudan/table",
            "style": {
                "navigationBarTitleText": "分布调入单缓存",
                "navigationBarTitleText": "分步调入单缓存",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/fenbushidiaochudan/form_out",
            "style": {
                "navigationBarTitleText": "分布调出单",
                "navigationBarTitleText": "分步调出单",
                "enablePullDownRefresh": true
            }
        },
@@ -1145,21 +1145,21 @@
        {
            "path": "pages/fenbushidiaorudan/form_test",
            "style": {
                "navigationBarTitleText": "分布调入单",
                "navigationBarTitleText": "分步调入单",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/fenbushidiaorudan/table",
            "style": {
                "navigationBarTitleText": "分布调入单缓存",
                "navigationBarTitleText": "分步调入单缓存",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/fenbushidiaochudan/form_out",
            "style": {
                "navigationBarTitleText": "分布调出单",
                "navigationBarTitleText": "分步调出单",
                "enablePullDownRefresh": true
            }
        },
pages/fenbushidiaochudan/form_out.vue
@@ -26,14 +26,14 @@
            </view>
            <view class="form-item">
                <view class="title">调出仓位:</view>
                <view class="right" v-show="HSCIsStockMgr">
                <view class="right" >
                    <uni-combox :candidates="arrayHStockPlaceNameComputed" placeholder="请输入(或扫描)仓位"
                        v-model="hform.HOutStockPlaceName" @input="HOutStockPlaceNameChange"
                        @confirm="HStockPlaceOutNameScan"></uni-combox>
                </view>
                <view class="righton" v-show="!HSCIsStockMgr">
               <!-- <view class="righton" v-show="!HSCIsStockMgr">
                    <input v-model="hform.HOutStockPlaceName" :disabled="!HIsStockMgr" placeholder="不可操作" />
                </view>
                </view> -->
            </view>
            <view class="tabs">
@@ -148,14 +148,14 @@
                </view>
                <view class="form-item">
                    <view class="title">调入仓位:</view>
                    <view class="right" v-show="HIsStockMgr">
                    <view class="right">
                        <uni-combox :candidates="arrayHStockPlaceInNameComputed" placeholder="请输入(或扫描)仓位"
                            v-model="hform.HStockPlaceName" @input="HStockPlaceInNameChange"
                            @confirm="HStockPlaceNameInScan"></uni-combox>
                    </view>
                    <view class="righton" v-show="!HIsStockMgr">
                    <!-- <view class="righton" v-show="!HIsStockMgr">
                        <input v-model="hform.HStockPlaceName" :disabled="!HIsStockMgr" placeholder="不可操作" />
                    </view>
                    </view> -->
                </view>
               <!-- <view class="form-item">
                    <view class="title">保管:</view>
@@ -655,6 +655,7 @@
            },
            async HWHNameOutScan(e) {
                // 扫描仓库码
                return
                console.log('仓库码: ', e);
                let index = this.HWHNameList.findIndex(elem => elem['条码编号'] == e)
                if (index == -1) {
@@ -669,27 +670,60 @@
            async HStockPlaceOutNameScan(e) {
                // 扫描仓位码
                console.log('仓位码: ', e);
                let index = this.HStockPlaceNameList.findIndex(elem => elem['条码编号'] == e)
                console.log('index: ', index);
               // 不先置空的话,数据再次扫描相同的仓位码 不会触发组件内的刷新
                this.hform.HStockPlaceID = 0
                this.hform.HStockPlaceName = ''
                await this.$nextTick()
                if (index == -1) {
                    uni.showToast({
                        icon: 'none',
                        title: '扫描仓位条码对应的仓位不存在...'
                this.hform.HOutStockPlaceID = 0
                this.hform.HOutStockPlaceName = ''
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Gy_StockPlace/list',
                        data: {
                            sWhere: ` and 条码编号 = '${e}'`,
                            user: uni.getStorageSync('HUserName'),
                            Organization: uni.getStorageSync('Organization')
                        },
                    })
                } else {
                    this.HOutStockPlaceNameChange(this.HStockPlaceNameList[index]['仓位名称'])
                    if (res.data.count == 1) {
                        this.hform.HOutStockPlaceID = res.data.data[0].HMainID
                        this.hform.HOutStockPlaceName = res.data.data[0].仓位名称
                        this.hform.HSCWHID = res.data.data[0].HWHID
                        this.hform.HSCWHName = res.data.data[0].所属仓库
                    } else {
                        uni.showToast({
                            title: '仓位数据请求失败',
                            icon: 'none'
                        })
                    }
                } catch (err) {
                    uni.showToast({
                        title: '仓位数据请求失败',
                        icon: 'none'
                    })
                }
                // let index = this.HStockPlaceNameList.findIndex(elem => elem['条码编号'] == e)
                // console.log('index: ', index);
               /// / 不先置空的话,数据再次扫描相同的仓位码 不会触发组件内的刷新
                // this.hform.HStockPlaceID = 0
                // this.hform.HStockPlaceName = ''
                // await this.$nextTick()
                //
                // if (index == -1) {
                //
                //     uni.showToast({
                //
                //         icon: 'none',
                //
                //         title: '扫描仓位条码对应的仓位不存在...'
                //
                //     })
                // } else {
                //     this.HOutStockPlaceNameChange(this.HStockPlaceNameList[index]['仓位名称'])
                // }
            },
            async HWHNameInScan(e) {
                return
                // 扫描仓库码
                console.log('仓库码: ', e);
                let index = this.HWHInNameList.findIndex(elem => elem['条码编号'] == e)
@@ -706,24 +740,57 @@
                // 扫描仓位码
                console.log('仓位码: ', e);
                let index = this.HStockPlaceInNameList.findIndex(elem => elem['条码编号'] == e)
                console.log('index: ', index);
               // 不先置空的话,数据再次扫描相同的仓位码 不会触发组件内的刷新
                // 不先置空的话,数据再次扫描相同的仓位码 不会触发组件内的刷新
                this.hform.HStockPlaceID = 0
                this.hform.HStockPlaceName = ''
                await this.$nextTick()
                if (index == -1) {
                    uni.showToast({
                        icon: 'none',
                        title: '扫描仓位条码对应的仓位不存在...'
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Gy_StockPlace/list',
                        data: {
                            sWhere: ` and 条码编号 = '${e}'`,
                            user: uni.getStorageSync('HUserName'),
                            Organization: uni.getStorageSync('Organization')
                        },
                    })
                } else {
                    this.HStockPlaceNameChange(this.HStockPlaceInNameList[index]['仓位名称'])
                    if (res.data.count == 1) {
                        this.hform.HStockPlaceID = res.data.data[0].HMainID
                        this.hform.HStockPlaceName = res.data.data[0].仓位名称
                        this.hform.HWHID = res.data.data[0].HWHID
                        this.hform.HWHName = res.data.data[0].所属仓库
                    } else {
                        uni.showToast({
                            title: '仓位数据请求失败',
                            icon: 'none'
                        })
                    }
                } catch (err) {
                    uni.showToast({
                        title: '仓位数据请求失败',
                        icon: 'none'
                    })
                }
                // let index = this.HStockPlaceInNameList.findIndex(elem => elem['条码编号'] == e)
                // console.log('index: ', index);
                // // 不先置空的话,数据再次扫描相同的仓位码 不会触发组件内的刷新
                // this.hform.HStockPlaceID = 0
                // this.hform.HStockPlaceName = ''
                // await this.$nextTick()
                //
                // if (index == -1) {
                //
                //     uni.showToast({
                //
                //         icon: 'none',
                //
                //         title: '扫描仓位条码对应的仓位不存在...'
                //
                //     })
                // } else {
                //     this.HStockPlaceNameChange(this.HStockPlaceInNameList[index]['仓位名称'])
                // }
            },
            async qrCodeDisplay() {
                try {
@@ -767,20 +834,18 @@
                    }
                }
            },
            // 调入仓位修改
            // 调入仓库修改
            HWHInNameChange(e) {
                console.log('e: ', e);
                for (var i = 0; i < this.HWHInNameList.length; i++) {
                    if (this.HWHInNameList[i].仓库名称 == e) {
                        this.hform.HWHName = this.HWHInNameList[i].仓库名称
                        this.hform.HWHID = this.HWHInNameList[i].HItemID
                        if (this.HWHInNameList[i]['启用仓位'] == 'Y') {
                            this.HIsStockMgr = true
                        } else {
                            // this.hform.HStockPlaceName = ''
                            this.HIsStockMgr = false
                        }
                const warehouse = this.HWHInNameList.find(item => item.仓库名称 == e)
                if (warehouse) {
                    this.hform.HWHName = warehouse.仓库名称
                    this.hform.HWHID = warehouse.HItemID
                    this.HIsStockMgr = warehouse['启用仓位'] == 'Y'
                    this.hform.HStockPlaceName = ''
                    this.hform.HStockPlaceID = 0
                    if (this.HIsStockMgr) {
                        this.getStockPlaceRemote(warehouse["HSPGroupID"], 1) // 修改调入仓库
                    }
                }
            },
@@ -1074,34 +1139,34 @@
                    },
                });
                uni.request({
                    url: this.serverUrl + '/Gy_StockPlace/list',
                    data: {
                        sWhere: "",
                        user: uni.getStorageSync('HUserName'),
                        Organization: uni.getStorageSync('Organization')
                    },
                    success: (res) => {
                        if (res.data.count == 1) {
                            this.HStockPlaceNameList = res.data.data
                            for (var i = 0; i < res.data.data.length; i++) {
                                this.arrayHStockPlaceName[i] = res.data.data[i].仓位名称
                            }
                        } else {
                            uni.showToast({
                                title: '仓位数据请求失败',
                                icon: 'none'
                            })
                        }
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                });
                // uni.request({
                //     url: this.serverUrl + '/Gy_StockPlace/list',
                //     data: {
                //         sWhere: "",
                //         user: uni.getStorageSync('HUserName'),
                //         Organization: uni.getStorageSync('Organization')
                //     },
                //     success: (res) => {
                //         if (res.data.count == 1) {
                //             this.HStockPlaceNameList = res.data.data
                //             for (var i = 0; i < res.data.data.length; i++) {
                //                 this.arrayHStockPlaceName[i] = res.data.data[i].仓位名称
                //             }
                //         } else {
                //             uni.showToast({
                //                 title: '仓位数据请求失败',
                //                 icon: 'none'
                //             })
                //         }
                //     },
                //     fail: (res) => {
                //         console.log(res);
                //         uni.showToast({
                //             title: '接口请求失败',
                //             icon: 'none'
                //         })
                //     },
                // });
                // this.getHYDList()
            },
@@ -1247,19 +1312,15 @@
            },
            // 调出仓库修改
            HSCWHNameChange(e) {
                // var name = e.split("(")
                for (var i = 0; i < this.HWHNameList.length; i++) {
                    if (this.HWHNameList[i].仓库名称 == e) {
                        this.hform.HSCWHName = this.HWHNameList[i].仓库名称
                        this.hform.HSCWHID = this.HWHNameList[i].HItemID
                        if (this.HWHNameList[i]['启用仓位'] == 'Y') {
                            this.HSCIsStockMgr = true
                        } else {
                            this.hform.HOutStockPlaceName = ''
                            this.hform.HOutStockPlaceID = ''
                            this.HSCIsStockMgr = false
                        }
                const warehouse = this.HWHNameList.find(item => item.仓库名称 == e)
                if (warehouse) {
                    this.hform.HSCWHName = warehouse.仓库名称
                    this.hform.HSCWHID = warehouse.HItemID
                    this.HSCIsStockMgr = warehouse['启用仓位'] == 'Y'
                    this.hform.HOutStockPlaceName = ''
                    this.hform.HOutStockPlaceID = 0
                    if (this.HSCIsStockMgr) {
                        this.getStockPlaceRemote(warehouse["HSPGroupID"], 2) // 修改调出仓库
                    }
                }
            },
@@ -1299,6 +1360,49 @@
                //     }
                // }
            },
            // 获取仓位
            async getStockPlaceRemote(HSPGroupID, Mode) {
                // Mode=1 -> 调入仓位数据获取; Mode=2 -> 调出仓位数据获取
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Gy_StockPlace/list',
                        data: {
                            sWhere: ` and HSPGroupID = ${HSPGroupID}`,
                            user: uni.getStorageSync('HUserName'),
                            Organization: uni.getStorageSync('Organization')
                        },
                    })
                    if (res.data.count == 1) {
                        if (Mode == 1) {
                            this.HStockPlaceInNameList = res.data.data
                            for (var i = 0; i < res.data.data.length; i++) {
                                this.arrayHStockPlaceInName[i] = res.data.data[i].仓位名称
                            }
                            return
                        }
                        if (Mode == 2) {
                            this.HStockPlaceNameList = res.data.data
                            for (var i = 0; i < res.data.data.length; i++) {
                                this.arrayHStockPlaceName[i] = res.data.data[i].仓位名称
                            }
                            return
                        }
                    } else {
                        uni.showToast({
                            title: '仓位数据请求失败',
                            icon: 'none'
                        })
                    }
                } catch (err) {
                    uni.showToast({
                        title: '仓位数据请求失败',
                        icon: 'none'
                    })
                }
            },
            //选择源单类型
            HMainSourceBillTypeChange(e) {
                this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
pages/fenbushidiaorudan/form_test.vue
@@ -23,23 +23,23 @@
                    <uni-combox :candidates="arrayHWHName" placeholder="请输入(或扫描)仓库" v-model="hform.HSCWHName"
                        @input="HSCWHNameChange" @confirm="HWHNameOutScan"></uni-combox>
                </view>
                <view class="icon-wrapper">
                <!--                <view class="icon-wrapper">
                    <uni-icons type="more" size="20" @click="showWarehouseList('HSCWHID')"></uni-icons>
                </view>
                </view> -->
            </view>
            <view class="form-item">
                <view class="title">调出仓位:</view>
                <view class="right" v-show="HSCIsStockMgr">
                <view class="right">
                    <uni-combox :candidates="arrayHStockPlaceNameComputed" placeholder="请输入(或扫描)仓位"
                        v-model="hform.HOutStockPlaceName" @input="HOutStockPlaceNameChange"
                        @confirm="HStockPlaceOutNameScan"></uni-combox>
                </view>
                <view class="righton" v-show="!HSCIsStockMgr">
                <!-- <view class="righton" v-show="!HSCIsStockMgr">
                    <input v-model="hform.HOutStockPlaceName" :disabled="!HSCIsStockMgr" placeholder="不可操作" />
                </view>
                <view class="icon-wrapper" v-show="HSCIsStockMgr">
                    <uni-icons type="more" size="20" @click="showStockPlaceList('HOSpID')"></uni-icons>
                </view>
                </view> -->
            </view>
            <view class="tabs">
@@ -56,7 +56,8 @@
                    <view class="right" v-show="showHMainSourceBillType">
                        <picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillTypeIndex"
                            @change="HMainSourceBillTypeChange">
                            <input name="HMainSourceBillType" disabled :value="HMainSourceBillType" placeholder="请选择源单类型" />
                            <input name="HMainSourceBillType" disabled :value="HMainSourceBillType"
                                placeholder="请选择源单类型" />
                            <view class="picker-overlay"></view>
                        </picker>
                    </view>
@@ -122,23 +123,23 @@
                        <uni-combox :candidates="arrayHWHInName" placeholder="请输入(或扫描)仓库" v-model="hform.HWHName"
                            @input="HWHInNameChange" @confirm="HWHNameInScan"></uni-combox>
                    </view>
                    <view class="icon-wrapper">
                    <!-- <view class="icon-wrapper">
                        <uni-icons type="more" size="20" @click="showWarehouseList('HWHID')"></uni-icons>
                    </view>
                    </view> -->
                </view>
                <view class="form-item">
                    <view class="title">调入仓位:</view>
                    <view class="right" v-show="HIsStockMgr">
                    <view class="right">
                        <uni-combox :candidates="arrayHStockPlaceInNameComputed" placeholder="请输入(或扫描)仓位"
                            v-model="hform.HStockPlaceName" @input="HStockPlaceInNameChange"
                            @confirm="HStockPlaceNameInScan"></uni-combox>
                    </view>
                    <view class="righton" v-show="!HIsStockMgr">
                    <!-- <view class="righton" v-show="!HIsStockMgr">
                        <input v-model="hform.HStockPlaceName" :disabled="!HIsStockMgr" placeholder="不可操作" />
                    </view>
                    <view class="icon-wrapper" v-show="HIsStockMgr">
                        <uni-icons type="more" size="20" @click="showStockPlaceList('HSpID')"></uni-icons>
                    </view>
                    </view> -->
                </view>
                <view class="form-item">
                    <view class="title">部门:</view>
@@ -166,7 +167,8 @@
            <view v-if="tabs == 2">
                <view class="list" v-for="(item,index) in Materlist" :key="index">
                    <uni-card :title="item.物料名称" :extra="item.物料代码" style="margin: 10px;" @tap="showMaterialDetail(item)">
                    <uni-card :title="item.物料名称" :extra="item.物料代码" style="margin: 10px;"
                        @tap="showMaterialDetail(item)">
                        <view class="card-detail">
                            <view class="detail">
                                <text>源单单号:</text>{{item.源单单号}}
@@ -209,24 +211,24 @@
                            <view class="detail">
                                <text>物料代码:</text>{{item.HMaterNumber}}
                            </view>
                            <view class="detail">
                                <text>物料名称:</text>{{item.HMaterName}}
                            </view>
                            <view class="detail">
                                <text>物料名称:</text>{{item.HMaterName}}
                            </view>
                            <view class="detail">
                                <text>规格型号:</text>{{item.HMaterModel}}
                            </view>
                            <view class="detail">
                                <text>HMaterID:</text>{{item.HMaterID}}
                            </view>
                            <view class="detail">
                                <text>HMaterID:</text>{{item.HMaterID}}
                            </view>
                            <view class="detail" v-if="item.HBatchNo">
                                <text>批号:</text>{{item.HBatchNo}}
                            </view>
                            <view class="detail" v-if="item.HAuxPropName">
                                <text>辅助属性:</text>{{item.HAuxPropName}}
                            </view>
                            <view class="detail" v-if="item.HSourceBillNo">
                                <text>源单单号:</text>{{item.HSourceBillNo}}
                            </view>
                            <view class="detail" v-if="item.HSourceBillNo">
                                <text>源单单号:</text>{{item.HSourceBillNo}}
                            </view>
                        </view>
                    </uni-card>
                </view>
@@ -311,9 +313,9 @@
        </view>
        <!-- 弹窗组件 -->
        <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType || 1250"
            :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
<!--        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue> -->
        <BillListPopupVue ref="billList" :HBillType="hform.HBillType"
            :HSourceBillType="hform.HMainSourceBillType || 1250" :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
        <!--        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue> -->
        <!-- <MaterialEditPopup ref="materialEdit" :materialData="selectedMaterial" @on-save="onMaterialSave"></MaterialEditPopup> -->
    </view>
</template>
@@ -327,7 +329,7 @@
        getUserInfo
    } from "@/utils/auth.js";
    import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
    export default {
        data() {
@@ -394,7 +396,7 @@
                    HOutStockPlaceID: getUserInfo().HSPID,
                    HStockPlaceName: getUserInfo().HSPName,
                    HStockPlaceID: getUserInfo().HSPID,
                    HStockOrgID: uni.getStorageSync('OrganizationID'),
                    HStockOrgID: uni.getStorageSync('OrganizationID'),
                    HMainSourceBillType: 1250,
                    HSourceBillNo: '',
@@ -424,12 +426,12 @@
        components: {
            BillListPopupVue,
        },
        async onLoad(e) {
            console.log('页面参数:', e);
            await this.getOrganization()
            this.OperationType = e.OperationType || 1;
            if (e.HInterID) {
                this.HInterID_Temp = e.HInterID
                this.RoadBillMain(e.HInterID)
@@ -442,7 +444,7 @@
            this.getHBaseList()
            this.getHDeptList()
            this.checkModRight()
            uni.$on('BillSelectComplete', (e) => {
                console.log("接收到的源单: ", e.HBillNo)
                this.getSourceBarCodeData(e.HBillNo)
@@ -576,7 +578,7 @@
                            HBarCode: sBarCode
                        }
                    })
                    if (res.data.count == 1) {
                        CommonUtils.playSound(1)
                        this.hform.HQty = ''
@@ -634,7 +636,7 @@
                            HCustom2: ""
                        }
                    })
                    if (res.data.count == 1) {
                        CommonUtils.playSound(1)
                        await this.handleBarCodeResult(res.data.data)
@@ -807,21 +809,50 @@
                }
            },
            // 扫描仓位码
            // 扫描仓位码
            async HStockPlaceOutNameScan(e) {
                let index = this.HStockPlaceNameList.findIndex(elem => elem['条码编号'] == e)
               // 不先置空的话,数据再次扫描相同的仓位码 不会触发组件内的刷新
                this.hform.HStockPlaceID = 0
                this.hform.HStockPlaceName = ''
                await this.$nextTick()
                if (index == -1) {
                    uni.showToast({
                        icon: 'none',
                        title: '扫描仓位条码对应的仓位不存在...'
                // 不先置空的话,数据再次扫描相同的仓位码 不会触发组件内的刷新
                this.hform.HOutStockPlaceID = 0
                this.hform.HOutStockPlaceName = ''
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Gy_StockPlace/list',
                        data: {
                            sWhere: ` and 条码编号 = '${e}'`,
                            user: uni.getStorageSync('HUserName'),
                            Organization: uni.getStorageSync('Organization')
                        },
                    })
                } else {
                    this.HOutStockPlaceNameChange(this.HStockPlaceNameList[index]['仓位名称'])
                    if (res.data.count == 1) {
                        this.hform.HOutStockPlaceID = res.data.data[0].HMainID
                        this.hform.HOutStockPlaceName = res.data.data[0].仓位名称
                        this.hform.HSCWHID = res.data.data[0].HWHID
                        this.hform.HSCWHName = res.data.data[0].所属仓库
                    } else {
                        uni.showToast({
                            title: '仓位数据请求失败',
                            icon: 'none'
                        })
                    }
                } catch (err) {
                    uni.showToast({
                        title: '仓位数据请求失败',
                        icon: 'none'
                    })
                }
                // await this.$nextTick()
                // if (index == -1) {
                //     uni.showToast({
                //         icon: 'none',
                //         title: '扫描仓位条码对应的仓位不存在...'
                //     })
                // } else {
                //     this.HOutStockPlaceNameChange(this.HStockPlaceNameList[index]['仓位名称'])
                // }
            },
            // 扫描调入仓库码
@@ -836,22 +867,50 @@
                    this.HWHInNameChange(this.HWHInNameList[index]['仓库名称'])
                }
            },
            // 扫描调入仓位码
            async HStockPlaceNameInScan(e) {
                let index = this.HStockPlaceInNameList.findIndex(elem => elem['条码编号'] == e)
               // 不先置空的话,数据再次扫描相同的仓位码 不会触发组件内的刷新
                // 不先置空的话,数据再次扫描相同的仓位码 不会触发组件内的刷新
                this.hform.HStockPlaceID = 0
                this.hform.HStockPlaceName = ''
                await this.$nextTick()
                if (index == -1) {
                    uni.showToast({
                        icon: 'none',
                        title: '扫描仓位条码对应的仓位不存在...'
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Gy_StockPlace/list',
                        data: {
                            sWhere: ` and 条码编号 = '${e}'`,
                            user: uni.getStorageSync('HUserName'),
                            Organization: uni.getStorageSync('Organization')
                        },
                    })
                } else {
                    this.HStockPlaceInNameChange(this.HStockPlaceInNameList[index]['仓位名称'])
                    if (res.data.count == 1) {
                        this.hform.HStockPlaceID = res.data.data[0].HMainID
                        this.hform.HStockPlaceName = res.data.data[0].仓位名称
                        this.hform.HWHID = res.data.data[0].HWHID
                        this.hform.HWHName = res.data.data[0].所属仓库
                    } else {
                        uni.showToast({
                            title: '仓位数据请求失败',
                            icon: 'none'
                        })
                    }
                } catch (err) {
                    uni.showToast({
                        title: '仓位数据请求失败',
                        icon: 'none'
                    })
                }
                // await this.$nextTick()
                // if (index == -1) {
                //     uni.showToast({
                //         icon: 'none',
                //         title: '扫描仓位条码对应的仓位不存在...'
                //     })
                // } else {
                //     this.HStockPlaceInNameChange(this.HStockPlaceInNameList[index]['仓位名称'])
                // }
            },
            // 源单类型变更
@@ -937,9 +996,10 @@
                    this.hform.HSCWHName = warehouse.仓库名称
                    this.hform.HSCWHID = warehouse.HItemID
                    this.HSCIsStockMgr = warehouse['启用仓位'] == 'Y'
                    if (!this.HSCIsStockMgr) {
                        this.hform.HOutStockPlaceName = ''
                        this.hform.HOutStockPlaceID = ''
                    this.hform.HOutStockPlaceName = ''
                    this.hform.HOutStockPlaceID = 0
                    if (this.HSCIsStockMgr) {
                        this.getStockPlaceRemote(warehouse["HSPGroupID"], 2) // 修改调出仓库
                    }
                }
            },
@@ -960,9 +1020,10 @@
                    this.hform.HWHName = warehouse.仓库名称
                    this.hform.HWHID = warehouse.HItemID
                    this.HIsStockMgr = warehouse['启用仓位'] == 'Y'
                    if (!this.HIsStockMgr) {
                        this.hform.HStockPlaceName = ''
                        this.hform.HStockPlaceID = ''
                    this.hform.HStockPlaceName = ''
                    this.hform.HStockPlaceID = 0
                    if (this.HIsStockMgr) {
                        this.getStockPlaceRemote(warehouse["HSPGroupID"], 1) // 修改调入仓库
                    }
                }
            },
@@ -975,7 +1036,49 @@
                    this.hform.HStockPlaceID = stockPlace.HMainID
                }
            },
            // 获取仓位
            async getStockPlaceRemote(HSPGroupID, Mode) {
                // Mode=1 -> 调入仓位数据获取; Mode=2 -> 调出仓位数据获取
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Gy_StockPlace/list',
                        data: {
                            sWhere: ` and HSPGroupID = ${HSPGroupID}`,
                            user: uni.getStorageSync('HUserName'),
                            Organization: uni.getStorageSync('Organization')
                        },
                    })
                    if (res.data.count == 1) {
                        if (Mode == 1) {
                            this.HStockPlaceInNameList = res.data.data
                            for (var i = 0; i < res.data.data.length; i++) {
                                this.arrayHStockPlaceInName[i] = res.data.data[i].仓位名称
                            }
                            return
                        }
                        if (Mode == 2) {
                            this.HStockPlaceNameList = res.data.data
                            for (var i = 0; i < res.data.data.length; i++) {
                                this.arrayHStockPlaceName[i] = res.data.data[i].仓位名称
                            }
                            return
                        }
                    } else {
                        uni.showToast({
                            title: '仓位数据请求失败',
                            icon: 'none'
                        })
                    }
                } catch (err) {
                    uni.showToast({
                        title: '仓位数据请求失败',
                        icon: 'none'
                    })
                }
            },
            // 部门变更
            HDeptNameChange(e) {
                const dept = this.HDeptNameList.find(item => item.部门名称 == e)
@@ -1006,22 +1109,22 @@
                })
                // 获取仓位列表
                CommonUtils.doRequest2({
                    url: '/Gy_StockPlace/list',
                    data: {
                        sWhere: "",
                        user: uni.getStorageSync('HUserName'),
                        Organization: uni.getStorageSync('Organization')
                    },
                    resFunction: (res) => {
                        if (res.data.count == 1) {
                            this.HStockPlaceNameList = res.data.data
                            this.HStockPlaceInNameList = res.data.data
                            this.arrayHStockPlaceName = res.data.data.map(item => item.仓位名称)
                            this.arrayHStockPlaceInName = res.data.data.map(item => item.仓位名称)
                        }
                    }
                })
                // CommonUtils.doRequest2({
                //     url: '/Gy_StockPlace/list',
                //     data: {
                //         sWhere: "",
                //         user: uni.getStorageSync('HUserName'),
                //         Organization: uni.getStorageSync('Organization')
                //     },
                //     resFunction: (res) => {
                //         if (res.data.count == 1) {
                //             this.HStockPlaceNameList = res.data.data
                //             this.HStockPlaceInNameList = res.data.data
                //             this.arrayHStockPlaceName = res.data.data.map(item => item.仓位名称)
                //             this.arrayHStockPlaceInName = res.data.data.map(item => item.仓位名称)
                //         }
                //     }
                // })
            },
            // 获取部门列表
@@ -1135,7 +1238,7 @@
                        if (res.data.count == 1) {
                            const data = res.data.data
                            this.Materlist = data.Materlist
                            if (data.ICMOReportlist[0].HSourceInterID !=0 ) {
                            if (data.ICMOReportlist[0].HSourceInterID != 0) {
                                this.FIFOlist = data.ICMOReportlist
                            }
@@ -1213,7 +1316,8 @@
                            this.hform.HSourceBillNo = data.HSourceBillNo
                            // 设置源单类型
                            const index = this.arrayHMainSourceBillValue.findIndex(e => e == data.HSourceBillType)
                            const index = this.arrayHMainSourceBillValue.findIndex(e => e == data
                                .HSourceBillType)
                            if (index !== -1) {
                                this.HMainSourceBillType = this.arrayHMainSourceBillType[index]
                                this.HMainSourceBillTypeIndex = index
pages/shengchanrukushengdan/Kf_ProductInBill.vue
@@ -26,14 +26,15 @@
            </view>
            <view class="form-item">
                <view class="title">仓位:</view>
                <view class="right" v-show="showHStockPlaceName">
                <!-- 四维尔需扫仓位码带出仓库和仓位信息,先去除仓位扫码的控制 -->
                <view class="right">
                    <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="请输入(或扫描)仓位"
                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
                        @confirm="HStockPlaceNameScan"></uni-combox>
                </view>
                <view class="righton" v-show="!showHStockPlaceName">
<!--                <view class="righton" v-show="!showHStockPlaceName">
                    <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="不可操作" />
                </view>
                </view> -->
            </view>
            <view class="tabs">
@@ -450,6 +451,7 @@
        },
        methods: {
            async HWHNameScan(e) {
                return
                // 扫描仓库码
                console.log('仓库码: ', e);
                let index = this.HWHNameList.findIndex(elem => elem['条码编号'] == e)
@@ -465,19 +467,37 @@
            async HStockPlaceNameScan(e) {
                // 扫描仓位码
                console.log('仓位码: ', e);
                let index = this.HStockPlaceNameList.findIndex(elem => elem['条码编号'] == e)
                console.log('index: ', index);
               // 不先置空的话,数据再次扫描相同的仓位码 不会触发组件内的刷新
                // 不先置空的话,数据再次扫描相同的仓位码 不会触发组件内的刷新
                this.hform.HStockPlaceID = 0
                this.hform.HStockPlaceName = ''
                await this.$nextTick()
                if (index == -1) {
                    uni.showToast({
                        icon: 'none',
                        title: '扫描仓位条码对应的仓位不存在...'
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Gy_StockPlace/list',
                        data: {
                            sWhere: ` and 条码编号 = '${e}'`,
                            user: uni.getStorageSync('HUserName'),
                            Organization: uni.getStorageSync('Organization')
                        },
                    })
                } else {
                    this.HStockPlaceNameChange(this.HStockPlaceNameList[index]['仓位名称'])
                    if (res.data.count == 1) {
                        this.hform.HStockPlaceID = res.data.data[0].HMainID
                        this.hform.HStockPlaceName = res.data.data[0].仓位名称
                        this.hform.HWHID = res.data.data[0].HWHID
                        this.hform.HWHName = res.data.data[0].所属仓库
                    } else {
                        uni.showToast({
                            title: '仓位数据请求失败',
                            icon: 'none'
                        })
                    }
                } catch (err) {
                    uni.showToast({
                        title: '仓位数据请求失败',
                        icon: 'none'
                    })
                }
            },
            async qrCodeDisplay() {
@@ -677,34 +697,34 @@
                    },
                });
                uni.request({
                    url: this.serverUrl + '/Gy_StockPlace/list',
                    data: {
                        sWhere: "",
                        user: uni.getStorageSync('HUserName'),
                        Organization: uni.getStorageSync('Organization')
                    },
                    success: (res) => {
                        if (res.data.count == 1) {
                            this.HStockPlaceNameList = res.data.data
                            for (var i = 0; i < res.data.data.length; i++) {
                                this.arrayHStockPlaceName[i] = res.data.data[i].仓位名称
                            }
                        } else {
                            uni.showToast({
                                title: '仓位数据请求失败',
                                icon: 'none'
                            })
                        }
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                });
                // uni.request({
                //     url: this.serverUrl + '/Gy_StockPlace/list',
                //     data: {
                //         sWhere: "",
                //         user: uni.getStorageSync('HUserName'),
                //         Organization: uni.getStorageSync('Organization')
                //     },
                //     success: (res) => {
                //         if (res.data.count == 1) {
                //             this.HStockPlaceNameList = res.data.data
                //             for (var i = 0; i < res.data.data.length; i++) {
                //                 this.arrayHStockPlaceName[i] = res.data.data[i].仓位名称
                //             }
                //         } else {
                //             uni.showToast({
                //                 title: '仓位数据请求失败',
                //                 icon: 'none'
                //             })
                //         }
                //     },
                //     fail: (res) => {
                //         console.log(res);
                //         uni.showToast({
                //             title: '接口请求失败',
                //             icon: 'none'
                //         })
                //     },
                // });
                // this.getHYDList()
            },
@@ -791,16 +811,45 @@
                    if (this.HWHNameList[i].仓库名称 == e) {
                        this.hform.HWHName = this.HWHNameList[i].仓库名称
                        this.hform.HWHID = this.HWHNameList[i].HItemID
                        this.HStockPlaceNameChange(null)
                        this.showHStockPlaceName = false
                        if (this.HWHNameList[i]['启用仓位'] == 'Y') {
                            this.showHStockPlaceName = true
                        } else {
                            this.hform.HStockPlaceName = ''
                            this.showHStockPlaceName = false
                        }
                            this.getStockPlaceRemote(this.HWHNameList[i]["HSPGroupID"])
                        }
                    }
                }
            },
            async getStockPlaceRemote(HSPGroupID){
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Gy_StockPlace/list',
                        data: {
                            sWhere: ` and HSPGroupID = ${HSPGroupID}`,
                            user: uni.getStorageSync('HUserName'),
                            Organization: uni.getStorageSync('Organization')
                        },
                    })
                    if (res.data.count == 1) {
                        this.HStockPlaceNameList = res.data.data
                        for (var i = 0; i < res.data.data.length; i++) {
                            this.arrayHStockPlaceName[i] = res.data.data[i].仓位名称
                        }
                    } else {
                        uni.showToast({
                            title: '仓位数据请求失败',
                            icon: 'none'
                        })
                    }
                } catch (err) {
                    uni.showToast({
                        title: '仓位数据请求失败',
                        icon: 'none'
                    })
                }
            },
            HFIFOWHNameChange(e) {
                for (var i = 0; i < this.HWHNameList.length; i++) {
                    if (this.HWHNameList[i].仓库名称 == e) {
pages/xiaoshouchuku/SellOutBill.vue
@@ -26,14 +26,15 @@
            </view>
            <view class="form-item">
                <view class="title">仓位:</view>
                <view class="right" v-show="showHStockPlaceName">
                <!-- 四维尔启用仓位扫码 其他客户按需启用控制 -->
                <view class="right" >
                    <uni-combox :candidates="HStockPlaceNameListComputed" placeholder="请输入(或扫描)仓位"
                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
                        @confirm="HStockPlaceNameScan"></uni-combox>
                </view>
                <view class="righton" v-show="!showHStockPlaceName">
<!--                <view class="righton" v-show="!showHStockPlaceName">
                    <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="不可操作" />
                </view>
                </view> -->
            </view>
            <view class="tabs">
@@ -464,6 +465,7 @@
        },
        methods: {
            async HWHNameScan(e) {
                return
                // 扫描仓库码
                console.log('仓库码: ', e);
                let index = this.HWHNameList.findIndex(elem => elem['条码编号'] == e)
@@ -479,19 +481,37 @@
            async HStockPlaceNameScan(e) {
                // 扫描仓位码
                console.log('仓位码: ', e);
                let index = this.HStockPlaceNameList.findIndex(elem => elem['条码编号'] == e)
                console.log('index: ', index);
               // 不先置空的话,数据再次扫描相同的仓位码 不会触发组件内的刷新
                // 不先置空的话,数据再次扫描相同的仓位码 不会触发组件内的刷新
                this.hform.HStockPlaceID = 0
                this.hform.HStockPlaceName = ''
                await this.$nextTick()
                if (index == -1) {
                    uni.showToast({
                        icon: 'none',
                        title: '扫描仓位条码对应的仓位不存在...'
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Gy_StockPlace/list',
                        data: {
                            sWhere: ` and 条码编号 = '${e}'`,
                            user: uni.getStorageSync('HUserName'),
                            Organization: uni.getStorageSync('Organization')
                        },
                    })
                } else {
                    this.HStockPlaceNameChange(this.HStockPlaceNameList[index]['仓位名称'])
                    if (res.data.count == 1) {
                        this.hform.HStockPlaceID = res.data.data[0].HMainID
                        this.hform.HStockPlaceName = res.data.data[0].仓位名称
                        this.hform.HWHID = res.data.data[0].HWHID
                        this.hform.HWHName = res.data.data[0].所属仓库
                    } else {
                        uni.showToast({
                            title: '仓位数据请求失败',
                            icon: 'none'
                        })
                    }
                } catch (err) {
                    uni.showToast({
                        title: '仓位数据请求失败',
                        icon: 'none'
                    })
                }
            },
            async qrCodeDisplay() {
@@ -709,34 +729,34 @@
                    },
                });
                uni.request({
                    url: this.serverUrl + '/Gy_StockPlace/list',
                    data: {
                        sWhere: "",
                        user: uni.getStorageSync('HUserName'),
                        Organization: uni.getStorageSync('Organization')
                    },
                    success: (res) => {
                        if (res.data.count == 1) {
                            this.HStockPlaceNameList = res.data.data
                            for (var i = 0; i < res.data.data.length; i++) {
                                this.arrayHStockPlaceName[i] = res.data.data[i].仓位名称
                            }
                        } else {
                            uni.showToast({
                                title: '仓位数据请求失败',
                                icon: 'none'
                            })
                        }
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                });
                // uni.request({
                //     url: this.serverUrl + '/Gy_StockPlace/list',
                //     data: {
                //         sWhere: "",
                //         user: uni.getStorageSync('HUserName'),
                //         Organization: uni.getStorageSync('Organization')
                //     },
                //     success: (res) => {
                //         if (res.data.count == 1) {
                //             this.HStockPlaceNameList = res.data.data
                //             for (var i = 0; i < res.data.data.length; i++) {
                //                 this.arrayHStockPlaceName[i] = res.data.data[i].仓位名称
                //             }
                //         } else {
                //             uni.showToast({
                //                 title: '仓位数据请求失败',
                //                 icon: 'none'
                //             })
                //         }
                //     },
                //     fail: (res) => {
                //         console.log(res);
                //         uni.showToast({
                //             title: '接口请求失败',
                //             icon: 'none'
                //         })
                //     },
                // });
                // this.getHYDList()
            },
@@ -785,18 +805,45 @@
                    if (this.HWHNameList[i].仓库名称 == e) {
                        this.hform.HWHName = this.HWHNameList[i].仓库名称
                        this.hform.HWHID = this.HWHNameList[i].HItemID
                        console.log(this.HWHNameList[i]['启用仓位'])
                        this.HStockPlaceNameChange(null)
                        this.showHStockPlaceName = false
                        if (this.HWHNameList[i]['启用仓位'] == 'Y') {
                            this.showHStockPlaceName = true
                        } else {
                            this.hform.HStockPlaceName = ''
                            this.showHStockPlaceName = false
                        }
                            this.getStockPlaceRemote(this.HWHNameList[i]["HSPGroupID"])
                        }
                    }
                }
            },
            async getStockPlaceRemote(HSPGroupID) {
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Gy_StockPlace/list',
                        data: {
                            sWhere: ` and HSPGroupID = ${HSPGroupID}`,
                            user: uni.getStorageSync('HUserName'),
                            Organization: uni.getStorageSync('Organization')
                        },
                    })
                    if (res.data.count == 1) {
                        this.HStockPlaceNameList = res.data.data
                        for (var i = 0; i < res.data.data.length; i++) {
                            this.arrayHStockPlaceName[i] = res.data.data[i].仓位名称
                        }
                    } else {
                        uni.showToast({
                            title: '仓位数据请求失败',
                            icon: 'none'
                        })
                    }
                } catch (err) {
                    uni.showToast({
                        title: '仓位数据请求失败',
                        icon: 'none'
                    })
                }
            },
            HFIFOWHNameChange(e) {
                for (var i = 0; i < this.HWHNameList.length; i++) {
                    if (this.HWHNameList[i].仓库名称 == e) {