Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

wtt

2025-08-12 dcaeb50c5b48eb0c14750e779f1ed32ac7f317dd

Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

 pages/caigouruku/form.vue

@@ -31,7 +31,7 @@
                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
                </view>
                <view class="righton" v-show="!showHStockPlaceName"><input v-model="hform.HStockPlaceName"
                        placeholder="不可操作" /></view>
                        placeholder="不可操作" :disabled="!showHStockPlaceName" /></view>
            </view>

            <view class="tabs">
@@ -60,6 +60,20 @@
                <view class="form-item">
                    <view class="title">源单单号:</view>
                    <view class="right" v-show="showHSourceBillNo">
                        <!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="请输入源单单号"
                            v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
                        <input :focus="HSourceBillNoFocus" type="text" name="HSourceBillNo"
                            v-model="hform.HSourceBillNo" @confirm="onSourceBillBlurHandler" placeholder="请输入源单单号" />

                    </view>
                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
                        <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
                    </view>

                    <view class="righton" v-show="!showHSourceBillNo">
                        <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="请输入源单单号" />
                    </view>
                    <!-- <view class="right" v-show="showHSourceBillNo">
                        <uni-combox ref="uniComboxSourceBill" :isFocus="HSourceBillNoFocus"
                            :confirm-call="onSourceBillBlurHandler" v-if="reHSourceBillNo"
                            :candidates="arrayHSourceBillNo" placeholder="请输入源单单号" v-model="hform.HSourceBillNo"
@@ -67,7 +81,7 @@
                    </view>
                    <view class="righton" v-show="!showHSourceBillNo">
                        <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="请输入源单单号" />
                    </view>
                    </view> -->
                </view>
                <view class="form-item">
                    <view class="title">日期:</view>
@@ -121,12 +135,12 @@
                </view>
                <view class="form-item">
                    <view class="title">供应商:</view>
                    <view class="right" v-show="showHSupName">
                    <!-- <view class="right" v-show="showHSupName">
                        <uni-combox :candidates="arrayHSupName" placeholder="请选择供应商" v-model="hform.HSupName"
                            @input="HSupNameChange"></uni-combox>
                    </view>
                    <view class="righton" v-show="!showHSupName">
                        <input name="HSupName" disabled v-model="hform.HSupName" placeholder="请选择供应商" />
                    </view> -->
                    <view class="righton">
                        <input name="HSupName" disabled v-model="hform.HSupName" placeholder="" />
                    </view>
                </view>
                <view class="form-item">
@@ -229,6 +243,8 @@
                <button class="btn-c" size="mini" @tap="goBack">退出</button>
            </view>
        </view>
        <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
            :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
    </view>
</template>
<script>
@@ -242,6 +258,7 @@
    import {
        getUserStockRelation
    } from "@/utils/userRelationManager.js"
    import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
    export default {
        data() {
            return {
@@ -255,7 +272,8 @@
                HInterID_Temp: '',
                HPageTitle: '采购入库单',

                showHStockPlaceName: true,

                showHStockPlaceName: false,
                showHMainSourceBillType: true,
                showHSourceBillNo: true,
                reHSourceBillNo: true,
@@ -328,6 +346,7 @@
                }
            }
        },
        components: {BillListPopupVue},
        onLoad(e) {
            console.log(e, this.userInfo)
            this.OperationType = e.OperationType
@@ -346,6 +365,12 @@
            this.getHDeptList()
            this.GetSourceBillType()
            this.getRelationStore()
			
            uni.$on('BillSelectComplete', (e) => {
                console.log("接收到的消息: ", e.HBillNo)
                this.getHBarCodeData(e.HBillNo)
                this.$refs.billList.exit()
            })
        },
        methods: {
            async getRelationStore() {
@@ -568,7 +593,7 @@
                    },
                });

                this.getHYDList()
                // this.getHYDList()
            },
            // 通过单据类型获取源单类型
            async GetSourceBillType() {
@@ -656,6 +681,13 @@
                    if (this.HWHNameList[i].仓库名称 == e) {
                        this.hform.HWHName = this.HWHNameList[i].仓库名称
                        this.hform.HWHID = this.HWHNameList[i].HItemID
						
                        if (this.HWHNameList[i]['启用仓位'] == 'Y') {
                            this.showHStockPlaceName = true
                        } else {
                            this.hform.HStockPlaceName = ''
                            this.showHStockPlaceName = false
                        }
                    }
                }
            },
@@ -685,7 +717,7 @@
                let index = this.arrayHMainSourceBillType.findIndex(e => e == this.HMainSourceBillType)
                if (index != -1) {
                    this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[index]
                    this.getHYDList()
                    // this.getHYDList()
                }
            },

@@ -1381,6 +1413,10 @@
                }
            },

            showBillList() {
                this.$refs.billList.showPopup()
            },

            goBack() {
                uni.showModal({
                    title: '提示',
@@ -1447,6 +1483,7 @@
        align-items: center;
        font-size: 30rpx;
        padding: 6rpx 0;
        gap: 12rpx;

        .title {
            width: 208rpx;
@@ -1458,13 +1495,13 @@
        }

        .right {
            width: 450rpx;
            flex: 1;
            border-radius: 22rpx;
            border: 1px solid #acacac;
        }

        .righton {
            width: 450rpx;
            flex: 1;
            border-radius: 22rpx;
            border: 1px solid #e4e4e4;
            background-color: #e4e4e4;
@@ -1564,4 +1601,24 @@
            }
        }
    }
	
    .icon-wrapper {
        background-color: #3A78FF;
        border-radius: 100%;
        width: 52rpx;
        height: 52rpx;
        display: flex;
        justify-content: center;
        align-items: center;
	
        .uni-icons {
            color: #fff !important;
        }
    }
	
    .icon-wrapper[disabled] {
        background-color: rgba(228, 228, 228, 1);
        pointer-events: none;
        touch-action: none;
    }
</style>

 pages/index/tab2.vue

@@ -194,7 +194,51 @@
                    url: '/pages/tiaomachaima/tiaomachaima',
                    id: 26,
                    hidden: false,
                }]
                },
                // , {
                //     img: '../../static/icon/icon1.png',
                //     text: '设备档案查询',
                //     tip: '查看详情',
                //     url: '/pages/shebeidangan/table',
                //     id: 9,
                // }, {
                //     img: '../../static/icon/icon8.png',
                //     text: '设备履历查询',
                //     tip: '查看详情',
                //     url: '/pages/shebeilvli/table',
                //     id: 10,
                // }, {
                //     img: '../../static/icon/icon14.png',
                //     text: '我的报工平台',
                //     tip: '点击进入',
                //     url: '/pages/baogong/table',
                //     id: 11,
                // }, {
                //     img: '../../static/icon/icon13.png',
                //     text: '上模单',
                //     tip: '查看详情',
                //     url: '/pages/MJGL/shangmudan/table',
                //     id: 12,
                // }, {
                //     img: '../../static/icon/icon13.png',
                //     text: '下模单',
                //     tip: '查看详情',
                //     url: '',
                //     id: 13,
                // }, {
                //     img: '../../static/icon/icon32.png',
                //     text: '设备运行状态',
                //     tip: '查看详情',
                //     url: '/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai',
                //     id: 14,
                // }, {
                //     img: '../../static/icon/icon6.png',
                //     text: '模具状态分析',
                //     tip: '查看详情',
                //     url: '/pages/mujvzhuangtai/mujvzhuangtai',
                //     id: 15,
                // },
                ]
            }
        },
        onLoad() {

 pages/xiaoshouchuku/form.vue

@@ -30,8 +30,9 @@
                    <uni-combox :candidates="arrayHStockPlaceName" placeholder="请输入(或扫描)仓位"
                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
                </view>
                <view class="righton" v-show="!showHStockPlaceName"><input v-model="hform.HStockPlaceName"
                        placeholder="不可操作" /></view>
                <view class="righton" v-show="!showHStockPlaceName">
                    <input v-model="hform.HStockPlaceName" disabled placeholder="不可操作" />
                        </view>
            </view>

            <view class="tabs">
@@ -50,6 +51,7 @@
                            @change="HMainSourceBillTypeChange">
                            <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
                                placeholder="请选择源单类型" />
                            <view class="picker-overlay"></view>
                        </picker>
                    </view>
                    <view class="righton" v-show="!showHMainSourceBillType">
@@ -59,12 +61,26 @@
                </view>
                <view class="form-item">
                    <view class="title">源单单号:</view>
                    <view class="right" v-show="showHSourceBillNo">
                    <!-- <view class="right" v-show="showHSourceBillNo">
                        <uni-combox v-if="reHSourceBillNo" :isFocus="HSourceBillNoFocus" ref="uniComboxSourceBill"
                            :confirm-call="onSourceBillConfirmHandler" :candidates="arrayHSourceBillNo"
                            placeholder="请输入源单单号" v-model="hform.HSourceBillNo"
                            @input="HSourceBillNoChange"></uni-combox>
                    </view>
                    <view class="righton" v-show="!showHSourceBillNo">
                        <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="请输入源单单号" />
                    </view> -->
                    <view class="right" v-show="showHSourceBillNo">
                        <!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="请输入源单单号"
                            v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
                        <input :focus="HSourceBillNoFocus" type="text" @confirm="onSourceBillConfirmHandler"
                            name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="请输入源单单号" />
					
                    </view>
                    <view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
                        <uni-icons type="search" size="20" @click="showBillList"></uni-icons>
                    </view>
					
                    <view class="righton" v-show="!showHSourceBillNo">
                        <input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="请输入源单单号" />
                    </view>
@@ -82,6 +98,7 @@
                        <picker mode="date" v-model="hform.HDate" @change="HDateChange">
                            <input disabled v-model="hform.HDate" placeholder="请选择日期" />
                        </picker>
                        <view class="picker-overlay"></view>
                    </view>
                </view>
                <view class="form-item">
@@ -128,11 +145,11 @@
                </view>
                <view class="form-item">
                    <view class="title">客户:</view>
                    <view class="right" v-show="showHSupName">
                    <!-- <view class="right" v-show="showHSupName">
                        <uni-combox :candidates="arrayHSupName" placeholder="请选择客户" v-model="hform.HSupName"
                            @input="HSupNameChange"></uni-combox>
                    </view>
                    <view class="righton" v-show="!showHSupName">
                    </view> -->
                    <view class="righton">
                        <input name="HSupName" disabled v-model="hform.HSupName" placeholder="请选择客户" />
                    </view>
                </view>
@@ -268,6 +285,8 @@
                <button class="btn-c" size="mini" @tap="goBack">退出</button>
            </view>
        </view>
        <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
            :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
    </view>
</template>
<script>
@@ -275,6 +294,7 @@
    import {
        getUserInfo
    } from "@/utils/auth.js";
    import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
    export default {
        data() {
            return {
@@ -285,7 +305,7 @@
                OperationType: 1,
                HInterID_Temp: '',

                showHStockPlaceName: true,
                showHStockPlaceName: false,
                showHMainSourceBillType: true,
                showHSourceBillNo: true,
                reHSourceBillNo: true,
@@ -362,6 +382,7 @@
                }
            }
        },
        components: {BillListPopupVue},
        onLoad(e) {
            console.log(e, this.userInfo)
            this.OperationType = e.OperationType
@@ -375,9 +396,18 @@
                this.getNewData()
            }
            this.getHBaseList()
            this.getHSupList()
            // this.getHSupList()
            this.getHEmpList()
            this.getHDeptList()
			
            uni.$on('BillSelectComplete', (e) => {
                console.log("接收到的消息: ", e.HBillNo)
                this.getHBarCodeData(e.HBillNo)
                this.$refs.billList.exit()
            })
        },
        beforeDestroy() {
            uni.$off('BillSelectComplete')
        },
        methods: {
            async refreshHSourceBillState() {
@@ -439,6 +469,9 @@

                    this.getCode(this.hform.HBarCode)
                })
            },
            showBillList() {
                this.$refs.billList.showPopup()
            },
            //扫其他(仓库，仓位)
            // toScanData(e){
@@ -533,6 +566,8 @@
                            for (var i = 0; i < res.data.data.length; i++) {
                                this.arrayHWHName[i] = res.data.data[i].仓库名称
                            }
							
                            this.HStockPlaceNameChange(res.data.data[0].仓库名称)
                        } else {
                            uni.showToast({
                                title: '仓库数据请求失败',
@@ -578,7 +613,7 @@
                    },
                });

                this.getHYDList()
                // this.getHYDList()
            },
            //源单资料
            getHYDList() {
@@ -625,6 +660,15 @@
                    if (this.HWHNameList[i].仓库名称 == e) {
                        this.hform.HWHName = this.HWHNameList[i].仓库名称
                        this.hform.HWHID = this.HWHNameList[i].HItemID
						
                        console.log(this.HWHNameList[i]['启用仓位'])
						
                        if (this.HWHNameList[i]['启用仓位'] == 'Y') {
                            this.showHStockPlaceName = true
                        } else {
                            this.hform.HStockPlaceName = ''
                            this.showHStockPlaceName = false
                        }
                    }
                }
            },
@@ -1386,6 +1430,7 @@
        align-items: center;
        font-size: 30rpx;
        padding: 6rpx 0;
        gap: 12rpx;

        .title {
            width: 208rpx;
@@ -1397,13 +1442,19 @@
        }

        .right {
            width: 450rpx;
            flex: 1;
            border-radius: 22rpx;
            border: 1px solid #acacac;
            position: relative;
            display: flex;
			
            .uni-combox {
                width: 100%;
            }
        }

        .righton {
            width: 450rpx;
            flex: 1;
            border-radius: 22rpx;
            border: 1px solid #e4e4e4;
            background-color: #e4e4e4;
@@ -1505,4 +1556,23 @@
            }
        }
    }
    .icon-wrapper {
        background-color: #3A78FF;
        border-radius: 100%;
        width: 52rpx;
        height: 52rpx;
        display: flex;
        justify-content: center;
        align-items: center;
	
        .uni-icons {
            color: #fff !important;
        }
    }
	
    .icon-wrapper[disabled] {
        background-color: rgba(228, 228, 228, 1);
        pointer-events: none;
        touch-action: none;
    }
</style>

 pages/zhijiediaobo/form.vue

@@ -18,14 +18,14 @@
                </view>
            </view>
            <view class="form-item">
                <view class="title">仓库:</view>
                <view class="title">调出仓库:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHWHName" placeholder="请输入(或扫描)仓库" v-model="hform.HSCWHName"
                        @input="HSCWHNameChange"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title">仓位:</view>
                <view class="title">调出仓位:</view>
                <view class="right" v-show="HSCIsStockMgr">
                    <uni-combox :candidates="arrayHStockPlaceName" placeholder="请输入(或扫描)仓位"
                        v-model="hform.HOutStockPlaceName" @input="HOutStockPlaceNameChange"></uni-combox>
@@ -96,16 +96,24 @@
                </view>
                <view class="form-item">
                    <view class="title">调拨类型:</view>
                    <view class="right">
<!--                     <view class="right" v-show="showHMainSourceBillType">
                        <uni-combox :candidates="HStockStyleArray" placeholder="请选择" v-model="hform.HStockStyle"
                            @input="HStockStyleChange"></uni-combox>
                    </view> -->
                    <view class="righton" >
                        <input name="HStockStyle" disabled v-model="hform.HStockStyle"
                            placeholder="请选择调拨类型" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">调拨方向:</view>
                    <view class="right">
                    <!-- <view class="right" v-show="showHMainSourceBillType">
                        <uni-combox :candidates="arrayHTransferDirect" placeholder="请选择" v-model="hform.HTransferDirect"
                            @input="HTransferDirectChange"></uni-combox>
                    </view> -->
                    <view class="righton" >
                        <input name="HTransferDirect" disabled v-model="hform.HTransferDirect"
                            placeholder="请选择调拨方向" />
                    </view>
                </view>
                <view class="form-item">
@@ -186,24 +194,29 @@
                </view>
                <view class="form-item">
                    <view class="title">客户:</view>
                    <view class="right" v-show="showHSupName">
                    <!-- <view class="right" v-show="showHSupName">
                        <uni-combox :candidates="arrayHSupName" placeholder="请选择客户" v-model="hform.HSupName"
                            @input="HSupNameChange"></uni-combox>
                    </view>
                    <view class="righton" v-show="!showHSupName">
                    </view> -->
                    <view class="righton">
                        <input name="HSupName" disabled v-model="hform.HSupName" placeholder="请选择客户" />
                    </view>
                </view>
                <!-- TODO: 跨组织调用可修改 选中组织后，仓库仓位也要发生变化 -->
                <view class="form-item">
                    <view class="title">调出组织:</view>
                    <view class="righton">
                        <input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
                        <input name="HStockOutOrgName" disabled v-model="hform.HStockOutOrgName" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">调入组织:</view>
                    <view class="righton">
                        <input name="HStockOrgName" disabled v-model="hform.HStockOrgName" />
                    <view class="right" v-show="!HIsStockInner">
                        <uni-combox :candidates="arrayHOrgName" placeholder="请选择调入组织" v-model="hform.HStockInOrgName"
                            @input="HStockInOrgNameChange"></uni-combox>
                    </view>
                    <view class="righton" v-show="HIsStockInner">
                        <input name="HStockInOrgName" disabled v-model="hform.HStockInOrgName" />
                    </view>
                </view>
            </view>
@@ -404,6 +417,8 @@
                HSourceBillNoList: [],
                arrayHTransferDirect: [], // 调拨方向
                arrayHShipType: [], // 出货类型
                arrayHOrgName: [], // 组织
                arrayHOrgValue: [], // 组织对应ID

                arrayHBillSubType: [],
                arrayHBillSubTypeValue: [],
@@ -424,13 +439,18 @@
                    HBillerID: uni.getStorageSync('HBillerID'),
                    HRedBlueFlag: false,

                    HStockOutOrgName: uni.getStorageSync('Organization'),
                    HStockInOrgName: uni.getStorageSync('Organization'),
                    HStockInOrgID: uni.getStorageSync('OrganizationID'),
                    HStockOutOrgID: uni.getStorageSync('OrganizationID'),

                    HBarCode: '',
                    HQty: '',
                    HSCWHName: getUserInfo().HWHName,
                    HSCWHID: getUserInfo().HWhID,
                    HWHName: "",
                    HWHID: "",
                    HStockStyle: '组织内调拨',
                    HStockStyle: '',
                    HOutStockPlaceName: getUserInfo().HSPName,
                    HOutStockPlaceID: getUserInfo().HSPID,
                    HStockPlaceName: getUserInfo().HSPName,
@@ -473,7 +493,8 @@
        components: {
            BillListPopupVue
        },
        onLoad(e) {
        async onLoad(e) {
            await this.getOrganization()
            console.log(e, this.userInfo)
            this.OperationType = e.OperationType
            if (e.HInterID) {
@@ -485,6 +506,7 @@
                this.HSourcebillNoFocus = true
                this.getNewData()
            }
			
            this.getHBaseList()
            this.getHSupList()
            this.getHEmpList()
@@ -504,7 +526,50 @@
        beforeDestroy() {
            uni.$off('BillSelectComplete')
        },
        computed: {
            HIsStockInner: {
                get: function() {
                    if(this.hform.HStockStyle == '组织内调拨') {
                        return true
                    }
                    return false
                }
            }
        },
        methods: {
            getOrganization() {
                return new Promise((resolve, reject) => {
                    CommonUtils.doRequest2({
                        url: '/Web/GetOrganizations',
                        resFunction: (res) => {
                            console.log("Organizations: ", res.data)
                            let {data, count, Message} = res.data
                            if(count == 1) {
                                this.arrayHOrgName = []
                                this.arrayHOrgValue = []
                                Array.from(data).forEach(e => {
                                    this.arrayHOrgName.push(e.Name)
                                    this.arrayHOrgValue.push(e.ID)
                                })
                                resolve()
                            }else {
                                uni.showToast({
                                    icon:'none',
                                    title: Message
                                })
                                reject()
                            }
							
                        }
                    })
                })
            },
            HStockInOrgNameChange(e) {
                let index = this.arrayHOrgName.findIndex(elem => elem == e)
                if(index != -1) {
                    this.hform.HStockInOrgID = this.arrayHOrgValue[index]
                }
            },
            set_InitBillSubType() { // 初始化单据子类型
                this.arrayHBillSubType = []
                this.arrayHBillSubTypeValue = []
@@ -662,7 +727,6 @@
            },
            // 调拨方向修改
            HStockStyleChange(e) {
                console.log(e)
                this.hform.HStockStyle = e
            },
            //基础仓库资料
@@ -725,7 +789,7 @@
                    },
                });

                this.getHYDList()
                // this.getHYDList()
            },
            // 调拨方向
            InitTransferDirect() {
@@ -777,6 +841,8 @@
                            this.arrayHShipType = Array.from(data).map(e => {
                                return e.HName
                            })
							
                            this.hform.HShipType = this.arrayHShipType[0]
                        } else {
                            uni.showToast({
                                icon: 'none',
@@ -1597,8 +1663,21 @@
                            this.hform.HDeptName = data.HDeptName
                            this.hform.HSupID = data.HCusID
                            this.hform.HSupName = data.HCusName
                            this.DisBillEntryList()
                            this.hform.HStockStyle = data.HStockStyle
							
                            let HStockInOrgIndex = this.arrayHOrgValue.findIndex(e => e == data.HStockInOrgID)
                            let HStockOutOrgIndex = this.arrayHOrgValue.findIndex(e => e == data.HStockOutOrgID)
                            this.hform.HStockInOrgID = data.HStockInOrgID
                            this.hform.HStockOutOrgID = data.HStockOutOrgID
                            if(HStockInOrgIndex != -1) {
                                this.hform.HStockInOrgName = this.arrayHOrgName[HStockInOrgIndex]
                            }
							
                            if(HStockOutOrgIndex != -1) {
                                this.hform.HStockOutOrgName = this.arrayHOrgName[HStockOutOrgIndex]
                            }
                            this.tabs = 2
                            this.DisBillEntryList()
                        } else {
                            uni.showToast({
                                title: '获取数据回填失败',

 utils/userRelationManager.js

@@ -12,6 +12,9 @@
                console.log('getUserStockRelation res: ',res);
                let {data, count, Message} = res.data
                resolve({data:data, count: count})
            },
            errFunction: (err) => {
                reject()
            }
        })
    })