chenhaozhe
2025-08-12 54f15d5e4c4ac99dd516eb1dfb249fa910167729
Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

# Conflicts:
# manifest.json
1个文件已修改
8 ■■■■ 已修改文件
pages/gongxuOut/form.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/gongxuOut/form.vue
@@ -99,7 +99,7 @@
                <view class="form-item">
                    <view class="title">工时:</view>
                    <view class="right">
                        <input v-model="hform.HWorkTimes" placeholder="请输入工时" @blur="HWorkTimesChange"/>
                        <input v-model="hform.HWorkTimes" placeholder="请输入工时" @blur="HWorkTimesChange" :disabled="hform.HIsTimeFlag!=1"/>
                    </view>
                </view>
                <view class="form-item">
@@ -656,6 +656,7 @@
            onCGChangeHandler({
                detail
            }) {
                console.log(detail.value[0])
                this.hform.HIsTimeFlag = detail.value[0] || 0
                if(detail.value[0]){
                    this.getNewHRelBeginDate()
@@ -1447,7 +1448,7 @@
                            }else{
                                // 从对象数组中提取所有日期字段并找到最大值
                                const maxDate = listData.reduce((max, obj) => {
                                    const date = new Date(obj[出站时间]);
                                    const date = new Date(obj.出站时间);
                                    return date > max ? date : max;
                                }, new Date(0)); // 初始值为最小日期
                                // 比较最大日期和今天的日期部分(不比较时间)
@@ -1513,6 +1514,9 @@
                })
            },
            submit() {
                //去除分号以免后端分解报错
                this.hform.HMaterName= this.hform.HMaterName.replace(/;/g, '');
                this.hform.HMaterModel = this.hform.HMaterModel.replace(/;/g, '');
                if (!this.hform.HBarCode) {
                    uni.showToast({
                        title: '请扫描设备条形码',