chenhaozhe
2025-08-07 96a8728645134ac212762daffc16ceceea710e0a
合并前保存
6个文件已修改
49 ■■■■■ 已修改文件
pages/gongxuIn/table.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/gongxuOut/form.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/gongxuOut/table.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/shengchanbuliaojiaoyan/form.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/shengchanlingliao/form.vue 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/weiwaigxOut/form.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/gongxuIn/table.vue
@@ -273,7 +273,7 @@
                    url: this.serverUrl + '/Cj_StationInBill/get_Display',
                    data:{ 
                        sWhere: this.sWhere,
                        user: uni.getStorageSync('HUserName'),
                        user: this.userInfo['Czymc'],
                        HBillSubType:'3790',
                    },
                    success: (res) => {
pages/gongxuOut/form.vue
@@ -180,6 +180,12 @@
                    <input v-model="hform.HPRDOrg" disabled />
                </view>
            </view>
            <view class="form-item">
                <view class="title">款号:</view>
                <view class="righton">
                    <input v-model="hform.HStyleNumber" disabled />
                </view>
            </view>
            <!--             
@@ -585,6 +591,8 @@
                    // HCloseDate:'',        
                    HDeleteMan: '',
                    HDeleteDate: '',
                    HStyleNumber: '', // 款号
                    eventType: 'Add',
                }
@@ -1307,7 +1315,8 @@
                            this.hform.HCenterName = data.工作中心
                            this.hform.HCenterID = data.HCenterID
                            this.hform.NoOutboundHqty = (data.流转卡数量 - data.出站报废关联数量 - data.出站关联数量)
                            this.hform.HStyleNumber = data['款号']
                            if (e) {
                                this.getHProcNoData(this.hform.HBarCode, this.hform.HProcNo)
                            }
@@ -1347,7 +1356,8 @@
                            this.hform.HNotReportQty = data['未报工数量']
                            this.hform.HProcNumber = data['工序代码']
                            this.hform.HIsTimeFlag = data['是否计时'] ? 1 : 0
                            // this.hform.HQty = data.合格数量
                           this.hform.HStyleNumber = data['款号']
                            // this.hform.HQty = data.合格数量
                            if (data.首道工序 == "是") {
                                this.FirstEndHProcNo = 1
                            }
pages/gongxuOut/table.vue
@@ -287,7 +287,7 @@
                return newList
            },
            getList(){
                this.sWhere += ` and 制单人 like N'%${this.userInfo.Czymc}'`
                // this.sWhere += ` and 制单人 like N'%${this.userInfo.Czymc}'`
                uni.showLoading({
                    title:'加载中...'
                })
pages/shengchanbuliaojiaoyan/form.vue
@@ -226,7 +226,7 @@
                    HMaker: uni.getStorageSync('HUserName'),
                    HStockOrgName: uni.getStorageSync('Organization'),
                    HStockOrgID: uni.getStorageSync('OrganizationID'),
                    HSourceBarCodeCtl: "N", //是否进行源单对应条码核对('Y'为核对)
                    HSourceBarCodeCtl: "Y", //是否进行源单对应条码核对('Y'为核对)
                    chkHBarflag: false,
                    HBarflag: 'Y',
@@ -762,7 +762,8 @@
                            title: '没有扫描物料条码,请先扫描物料条码,确认无误后再提交!',
                            icon: 'none'
                        })
                    } else {
                    } else
                    {
                        uni.showLoading({
                            title: '请稍候'
                        })
pages/shengchanlingliao/form.vue
@@ -687,24 +687,27 @@
                        title: '单据号获取失败,错误的单据号!',
                        icon: 'none'
                    })
                } else if (!this.Materlist || this.Materlist.length == 0) {
                }
                 else if (!this.Materlist || this.Materlist.length == 0) {
                    uni.showToast({
                        title: '没有扫码信息,请先扫描条码,确认无误后再提交!',
                        icon: 'none'
                    })
                } else {
                }
                else {
                    var s = 0;
                    for (var i = 0; i < this.Materlist.length; i++) {
                        if (this.Materlist[i].数量 > 0) {
                            s = 1;
                        }
                    }
                    if (s == 0) {
                        uni.showToast({
                            title: '没有扫描物料条码,请先扫描物料条码,确认无误后再提交!',
                            icon: 'none'
                        })
                    } else {
                    // if (s == 0) {
                    //     uni.showToast({
                    //         title: '没有扫描物料条码,请先扫描物料条码,确认无误后再提交!',
                    //         icon: 'none'
                    //     })
                    // } else
                    {
                        uni.showLoading({
                            title: '请稍候'
                        })
pages/weiwaigxOut/form.vue
@@ -66,7 +66,7 @@
                </view>
            </view>
            <view class="form-item">
                <view class="title">部门:</view>
                <view class="title"><text>*</text>部门:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHDept" placeholder="请选择部门" v-model="hform.HDept"
                        @input="HHDeptChange"></uni-combox>
@@ -1083,6 +1083,11 @@
                        title: '请选择供应商',
                        icon: 'none'
                    })
                }else if (!this.hform.HDeptID) {
                    uni.showToast({
                        title: '请选择部门',
                        icon: 'none'
                    })
                } else if (!this.hform.HEmpName) {
                    uni.showToast({
                        title: '请选择操作员',