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

chenhaozhe

2026-01-04 08132eb6a645b4a42205d142feb14c9118a4a16a

 components/ZLGL/CheckProjectPopup.vue

@@ -5,7 +5,7 @@
                <view class="search-condition">
                    <view class="title"><text>日期: </text></view>
                    <view class="daterange" style="flex: 1;">
                        <view class="right general">
                        <!-- <view class="right general">
                            <uni-datetime-picker type="date" :clear-icon="false" v-model="HBeginDate">
                                <view>{{HBeginDate}}</view>
                            </uni-datetime-picker>
@@ -15,7 +15,7 @@
                            <uni-datetime-picker type="date" :clear-icon="false" v-model="HEndDate">
                                <view>{{HEndDate}}</view>
                            </uni-datetime-picker>
                        </view>
                        </view> -->
                    </view>
                </view>
                <view class="buttons">
@@ -109,8 +109,8 @@
                panelHeight: 0,
                HProcessName: '',
                HMaterName: '',
                HBeginDate: dayjs(new Date()).subtract(30, 'd').format("YYYY-MM-DD"),
                HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
                // HBeginDate: dayjs(new Date()).subtract(30, 'd').format("YYYY-MM-DD"),
                // HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
                multiSouceBillList: []
            };
        },
@@ -161,9 +161,9 @@
            getsWhere() {
                let sWhere =
                    ` and ISNULL(审核人,'')!=''  and HOrgID  = '${ uni.getStorageSync("OrganizationID")}'`
                if (this.HBeginDate && this.HEndDate) {
                    sWhere += ` and  CONVERT(varchar(100),日期, 23) between '${this.HBeginDate}' and '${this.HEndDate}'`
                }
                // if (this.HBeginDate && this.HEndDate) {
                //     sWhere += ` and  CONVERT(varchar(100),日期, 23) between '${this.HBeginDate}' and '${this.HEndDate}'`
                // }

                if (this.HMaterName && this.HProcessName) {
                    sWhere += ` and 物料名称 = '${this.HMaterName}' and 工序名称 = '${this.HProcessName}'`