~jhz/STUWMS.git

parent: 86bf08f2 | 补丁 | 提交 | ignore whitespace

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

chenhaozhe

2025-08-08 1fb0f238e0be9272cc5074e279f5d2548cb5f7c9

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

3个文件已修改

	pages/gongxuOut/form.vue	36 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/gongxuOut/table.vue	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/weiwaigxOut/table.vue	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 pages/gongxuOut/form.vue

@@ -38,12 +38,12 @@
                    <input v-model="hform.HQty" placeholder="请输入合格数量" />
                </view>
            </view>
            <!--             <view class="form-item">
            <view class="form-item">
                <view class="title">不良数量:</view>
                <view class="right">
                    <input v-model="hform.HPieceQty" placeholder="请输入不良数量" />
                    <input v-model="hform.HBadCount"  placeholder="请输入不良数量" />
                </view>
            </view> -->
            </view>
            <view class="form-item">
                <view class="title">报废数量:</view>
                <view class="right">
@@ -159,6 +159,12 @@
                    <input v-model="hform.HMaterModel" disabled />
                </view>
            </view>
            <view class="form-item">
                <view class="title">款号:</view>
                <view class="righton">
                    <input v-model="hform.HStyleNumber" disabled />
                </view>
            </view>
            <view class="form-item">
                <view class="title">计量单位:</view>
                <view class="righton">
@@ -180,12 +186,7 @@
                    <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> -->
			


            <!--             
@@ -509,7 +510,8 @@
                    HBillNo: '',
                    HBarCode: '',
                    HProcNo: '',
                    HQty: 0,
                    HQty: '',
                    HBadCount:0,
                    HProcNumber: '',
                    HNotReportQty: 0,
                    HIsTimeFlag: 0,
@@ -593,7 +595,7 @@
                    HDeleteMan: '',
                    HDeleteDate: '',
                    
                    // HStyleNumber: '', // 款号
                    HStyleNumber: '', // 款号

                    eventType: 'Add',
                }
@@ -628,6 +630,11 @@
            this.getDefValByUser()
        },
        methods: {
            //选中全部文本
            selectAllText(e) {
              console.log(e.target)
              console.log(e)
            },
            onCGChangeHandler({
                detail
            }) {
@@ -1207,8 +1214,8 @@
                        console.log(1, res.data.data[0]);
                        if (res.data.code == 1) {
                            var data = res.data.data[0]
                            this.getHBarCodeData(data.HBarCode)
                            this.getHProcNoData(data.HBarCode, data.HProcNo)
                            this.getHBarCodeData(data.HBarCode,1)
                            //this.getHProcNoData(data.HBarCode, data.HProcNo)

                            this.hform.HInterID = data.HInterID
                            this.hform.HBillNo = data.HBillNo
@@ -1220,6 +1227,7 @@
                            this.hform.HNotReportQty = data.HNotReportQty
                            this.hform.HProcNumber = data.HProcNumber || ''
                            this.hform.HWasterQty = data.HWasterQty
                            this.hform.HBadCount = data.HBadCount
                            this.hform.HSourceID = data.HSourceID
                            this.hform.HSourceName = data.HSourceName
                            this.hform.HGroupID = data.HGroupID
@@ -1316,7 +1324,7 @@
                            this.hform.HCenterName = data.工作中心
                            this.hform.HCenterID = data.HCenterID
                            this.hform.NoOutboundHqty = (data.流转卡数量 - data.出站报废关联数量 - data.出站关联数量)
                            // this.hform.HStyleNumber = data['款号']
                            this.hform.HStyleNumber = data['款号']
                            
                            if (e) {
                                this.getHProcNoData(this.hform.HBarCode, this.hform.HProcNo)

 pages/gongxuOut/table.vue

@@ -13,7 +13,7 @@
                <view class="title">开始时间:</view>
                <view class="right">
                    <picker mode="date" :value="hform.HBeginDate" @change="HBeginDateChange">
                        <input name="HBeginDate" disabled :value="hform.HBeginDate" placeholder="请选择" />
                        <input name="HBeginDate" disabled :value="hform.HBeginDate" placeholder="请选择"  style="pointer-events: none;"/>
                    </picker>
                </view>
            </view>
@@ -21,7 +21,7 @@
                <view class="title">结束时间:</view>
                <view class="right">
                    <picker mode="date" :value="hform.HEndDate" @change="HEndDateChange">
                        <input name="HEndDate" disabled :value="hform.HEndDate" placeholder="请选择" />
                        <input name="HEndDate" disabled :value="hform.HEndDate" placeholder="请选择" style="pointer-events: none;"/>
                    </picker>
                </view>
            </view>
@@ -241,7 +241,7 @@
                arrayComparator:['=','>=','>','<=','<','<>','包含','左包含','右包含','不包含'],
                hform:{
                    HStatus:'全部',
                    HBeginDate:'',
                    HBeginDate: new Date().toLocaleDateString(),
                    HEndDate:'',
                    HWorkBillNo:'',
                    HBillNo:'',
@@ -376,11 +376,11 @@
                        this.sWhere += " and 关闭人<>''";
                    }
                }
                if (this.hform.BenginHCreateDate) {
                    this.sWhere += " and CONVERT(varchar(100),进站时间, 23) >= '" + this.hform.BenginHCreateDate + "'";
                if (this.hform.HBeginDate) {
                    this.sWhere += " and CONVERT(varchar(100),出站时间, 23) >= '" + this.hform.HBeginDate + "'";
                }
                if (this.hform.EndHCreateDate) {
                    this.sWhere += " and CONVERT(varchar(100),进站时间, 23) >= '" + this.hform.EndHCreateDate + "'";
                if (this.hform.HEndDate) {
                    this.sWhere += " and CONVERT(varchar(100),出站时间, 23) >= '" + this.hform.HEndDate + "'";
                }
                if (this.hform.HBillNo) {
                    this.sWhere += " and 单据号 like '%" + this.hform.HBillNo + "%'";
@@ -532,6 +532,9 @@
        width: 640rpx;
        margin: 20rpx auto;
    }
    picker input{
        pointer-events: none;
    }
    .other{
        margin-top: 8rpx;
        text-align: center;

 pages/weiwaigxOut/table.vue

@@ -5,7 +5,7 @@
                <view class="title">状态:</view>
                <view class="right">
                    <picker :range="arrayStatus" :value="hform.HStatus" @change="HStatusChange">
                        <input name="HStatus" disabled :value="hform.HStatus" placeholder="请选择状态" />
                        <input name="HStatus" disabled :value="hform.HStatus" placeholder="请选择状态"  style="pointer-events: none;"/>
                    </picker>
                </view>
            </view>
@@ -13,7 +13,7 @@
                <view class="title">开始时间:</view>
                <view class="right">
                    <picker mode="date" :value="hform.HBeginDate" @change="HBeginDateChange">
                        <input name="HBeginDate" disabled :value="hform.HBeginDate" placeholder="请选择" />
                        <input name="HBeginDate" disabled :value="hform.HBeginDate" placeholder="请选择" style="pointer-events: none;"/>
                    </picker>
                </view>
            </view>
@@ -21,7 +21,7 @@
                <view class="title">结束时间:</view>
                <view class="right">
                    <picker mode="date" :value="hform.HEndDate" @change="HEndDateChange">
                        <input name="HEndDate" disabled :value="hform.HEndDate" placeholder="请选择" />
                        <input name="HEndDate" disabled :value="hform.HEndDate" placeholder="请选择" style="pointer-events: none;"/>
                    </picker>
                </view>
            </view>
@@ -235,7 +235,7 @@
                arrayStatus:['全部','未审核','已审核','已关闭'],
                hform:{
                    HStatus:'全部',
                    HBeginDate:'',
                    HBeginDate:new Date().toLocaleDateString(),
                    HEndDate:'',
                    HICMOBillNo:'',
                    HBillNo:'',
@@ -349,11 +349,11 @@
                        this.sWhere += " and 关闭人<>''";
                    }
                }
                if (this.hform.BenginHCreateDate) {
                    this.sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + this.hform.BenginHCreateDate + "'";
                if (this.hform.HBeginDate) {
                    this.sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + this.hform.HBeginDate + "'";
                }
                if (this.hform.EndHCreateDate) {
                    this.sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + this.hform.EndHCreateDate + "'";
                if (this.hform.HEndDate) {
                    this.sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + this.hform.HEndDate + "'";
                }
                if (this.hform.HBillNo) {
                    this.sWhere += " and 单据号 like '%" + this.hform.HBillNo + "%'";
@@ -481,6 +481,9 @@
        width: 640rpx;
        margin: 20rpx auto;
    }
    picker input{
        pointer-events: none;
    }
    .other{
        margin-top: 8rpx;
        text-align: center;

			@@ -38,12 +38,12 @@
			<input v-model="hform.HQty" placeholder="请输入合格数量" />
			</view>
			</view>
			<!-- <view class="form-item">
			<view class="form-item">
			<view class="title">不良数量:</view>
			<view class="right">
			<input v-model="hform.HPieceQty" placeholder="请输入不良数量" />
			<input v-model="hform.HBadCount" placeholder="请输入不良数量" />
			</view>
			</view> -->
			</view>
			<view class="form-item">
			<view class="title">报废数量:</view>
			<view class="right">
			@@ -159,6 +159,12 @@
			<input v-model="hform.HMaterModel" disabled />
			</view>
			</view>
			<view class="form-item">
			<view class="title">款号:</view>
			<view class="righton">
			<input v-model="hform.HStyleNumber" disabled />
			</view>
			</view>
			<view class="form-item">
			<view class="title">计量单位:</view>
			<view class="righton">
			@@ -180,12 +186,7 @@
			<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> -->



			<!--
			@@ -509,7 +510,8 @@
			HBillNo: '',
			HBarCode: '',
			HProcNo: '',
			HQty: 0,
			HQty: '',
			HBadCount:0,
			HProcNumber: '',
			HNotReportQty: 0,
			HIsTimeFlag: 0,
			@@ -593,7 +595,7 @@
			HDeleteMan: '',
			HDeleteDate: '',

			// HStyleNumber: '', // 款号
			HStyleNumber: '', // 款号

			eventType: 'Add',
			}
			@@ -628,6 +630,11 @@
			this.getDefValByUser()
			},
			methods: {
			//选中全部文本
			selectAllText(e) {
			console.log(e.target)
			console.log(e)
			},
			onCGChangeHandler({
			detail
			}) {
			@@ -1207,8 +1214,8 @@
			console.log(1, res.data.data[0]);
			if (res.data.code == 1) {
			var data = res.data.data[0]
			this.getHBarCodeData(data.HBarCode)
			this.getHProcNoData(data.HBarCode, data.HProcNo)
			this.getHBarCodeData(data.HBarCode,1)
			//this.getHProcNoData(data.HBarCode, data.HProcNo)

			this.hform.HInterID = data.HInterID
			this.hform.HBillNo = data.HBillNo
			@@ -1220,6 +1227,7 @@
			this.hform.HNotReportQty = data.HNotReportQty
			this.hform.HProcNumber = data.HProcNumber \|\| ''
			this.hform.HWasterQty = data.HWasterQty
			this.hform.HBadCount = data.HBadCount
			this.hform.HSourceID = data.HSourceID
			this.hform.HSourceName = data.HSourceName
			this.hform.HGroupID = data.HGroupID
			@@ -1316,7 +1324,7 @@
			this.hform.HCenterName = data.工作中心
			this.hform.HCenterID = data.HCenterID
			this.hform.NoOutboundHqty = (data.流转卡数量 - data.出站报废关联数量 - data.出站关联数量)
			// this.hform.HStyleNumber = data['款号']
			this.hform.HStyleNumber = data['款号']

			if (e) {
			this.getHProcNoData(this.hform.HBarCode, this.hform.HProcNo)

			@@ -13,7 +13,7 @@
			<view class="title">开始时间:</view>
			<view class="right">
			<picker mode="date" :value="hform.HBeginDate" @change="HBeginDateChange">
			<input name="HBeginDate" disabled :value="hform.HBeginDate" placeholder="请选择" />
			<input name="HBeginDate" disabled :value="hform.HBeginDate" placeholder="请选择" style="pointer-events: none;"/>
			</picker>
			</view>
			</view>
			@@ -21,7 +21,7 @@
			<view class="title">结束时间:</view>
			<view class="right">
			<picker mode="date" :value="hform.HEndDate" @change="HEndDateChange">
			<input name="HEndDate" disabled :value="hform.HEndDate" placeholder="请选择" />
			<input name="HEndDate" disabled :value="hform.HEndDate" placeholder="请选择" style="pointer-events: none;"/>
			</picker>
			</view>
			</view>
			@@ -241,7 +241,7 @@
			arrayComparator:['=','>=','>','<=','<','<>','包含','左包含','右包含','不包含'],
			hform:{
			HStatus:'全部',
			HBeginDate:'',
			HBeginDate: new Date().toLocaleDateString(),
			HEndDate:'',
			HWorkBillNo:'',
			HBillNo:'',
			@@ -376,11 +376,11 @@
			this.sWhere += " and 关闭人<>''";
			}
			}
			if (this.hform.BenginHCreateDate) {
			this.sWhere += " and CONVERT(varchar(100),进站时间, 23) >= '" + this.hform.BenginHCreateDate + "'";
			if (this.hform.HBeginDate) {
			this.sWhere += " and CONVERT(varchar(100),出站时间, 23) >= '" + this.hform.HBeginDate + "'";
			}
			if (this.hform.EndHCreateDate) {
			this.sWhere += " and CONVERT(varchar(100),进站时间, 23) >= '" + this.hform.EndHCreateDate + "'";
			if (this.hform.HEndDate) {
			this.sWhere += " and CONVERT(varchar(100),出站时间, 23) >= '" + this.hform.HEndDate + "'";
			}
			if (this.hform.HBillNo) {
			this.sWhere += " and 单据号 like '%" + this.hform.HBillNo + "%'";
			@@ -532,6 +532,9 @@
			width: 640rpx;
			margin: 20rpx auto;
			}
			picker input{
			pointer-events: none;
			}
			.other{
			margin-top: 8rpx;
			text-align: center;

			@@ -5,7 +5,7 @@
			<view class="title">状态:</view>
			<view class="right">
			<picker :range="arrayStatus" :value="hform.HStatus" @change="HStatusChange">
			<input name="HStatus" disabled :value="hform.HStatus" placeholder="请选择状态" />
			<input name="HStatus" disabled :value="hform.HStatus" placeholder="请选择状态" style="pointer-events: none;"/>
			</picker>
			</view>
			</view>
			@@ -13,7 +13,7 @@
			<view class="title">开始时间:</view>
			<view class="right">
			<picker mode="date" :value="hform.HBeginDate" @change="HBeginDateChange">
			<input name="HBeginDate" disabled :value="hform.HBeginDate" placeholder="请选择" />
			<input name="HBeginDate" disabled :value="hform.HBeginDate" placeholder="请选择" style="pointer-events: none;"/>
			</picker>
			</view>
			</view>
			@@ -21,7 +21,7 @@
			<view class="title">结束时间:</view>
			<view class="right">
			<picker mode="date" :value="hform.HEndDate" @change="HEndDateChange">
			<input name="HEndDate" disabled :value="hform.HEndDate" placeholder="请选择" />
			<input name="HEndDate" disabled :value="hform.HEndDate" placeholder="请选择" style="pointer-events: none;"/>
			</picker>
			</view>
			</view>
			@@ -235,7 +235,7 @@
			arrayStatus:['全部','未审核','已审核','已关闭'],
			hform:{
			HStatus:'全部',
			HBeginDate:'',
			HBeginDate:new Date().toLocaleDateString(),
			HEndDate:'',
			HICMOBillNo:'',
			HBillNo:'',
			@@ -349,11 +349,11 @@
			this.sWhere += " and 关闭人<>''";
			}
			}
			if (this.hform.BenginHCreateDate) {
			this.sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + this.hform.BenginHCreateDate + "'";
			if (this.hform.HBeginDate) {
			this.sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + this.hform.HBeginDate + "'";
			}
			if (this.hform.EndHCreateDate) {
			this.sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + this.hform.EndHCreateDate + "'";
			if (this.hform.HEndDate) {
			this.sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + this.hform.HEndDate + "'";
			}
			if (this.hform.HBillNo) {
			this.sWhere += " and 单据号 like '%" + this.hform.HBillNo + "%'";
			@@ -481,6 +481,9 @@
			width: 640rpx;
			margin: 20rpx auto;
			}
			picker input{
			pointer-events: none;
			}
			.other{
			margin-top: 8rpx;
			text-align: center;