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

dytyqx

2026-04-03 80e62bd996ac2b0e462035bc2eb7fd8a80c390cf

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

 pages/ZLGL/QualityReport/SB_EquipRunningStatusReport.vue

@@ -32,13 +32,13 @@
            <view class="form-item">
                <view class="title">{{$t("Gy.EquipNumber_Search")}}:</view>
                <view class="right">
                    <input type="text" :value="condition.HNumber" />
                    <input type="text" v-model="condition.HNumber" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">{{$t("Gy.EquipName_Search")}}:</view>
                <view class="right">
                    <input type="text" :value="condition.HName" />
                    <input type="text" v-model="condition.HName" />
                </view>
            </view>
            <view class="search-buttons">
@@ -49,8 +49,7 @@
        
        <!-- 显示列表 -->
        <view class="list" v-for="(item,index) in displayData" :key="index">
            <uni-card :title="item.设备名称" style="margin: 10px;"
                >
            <uni-card :title="item.设备名称" style="margin: 10px;">
                <view class="card-detail">
                    <template v-for="(HBillField, index) in CommonUtils.emptyValueFilter(item,fieldData).slice(0,10)">
                        <view class="detail" v-if="HBillField.ColmType == 'DateTime'">
@@ -157,10 +156,18 @@
        methods: {
            search() {
                this.page = 1
                this.displayData = []
                this.getReport()
            },
            clear() {

                this.page = 1
                this.displayData = []
                this.condition.HDeptID = 0
                this.condition.HDeptName = ""
                this.condition.HBeginDate = dayjs(new Date()).format("YYYY-MM-DD")
                this.condition.HEndDate = dayjs(new Date()).format("YYYY-MM-DD")
                this.condition.HNumber = ""
                this.condition.HName = ""
            },
            showPicker() {
                this.$refs.treePicker._show();
@@ -176,7 +183,7 @@
                    sWhere += this.combineSWhereStr(sWhere)
                    
                    let res = await CommonUtils.doRequest2Async({
                        url: "/SB_EquipRunningStatus/Report",
                        url: "/SB_EquipRunningStatus/ReportPage",
                        data: {
                            sWhere,
                            user: getUserInfo()["Czymc"],
@@ -185,7 +192,12 @@
                        }
                    })
                    
                    let {data, count, Message, list} = res.data
                    let {
                        data,
                        count,
                        Message,
                        list
                    } = res.data
                    
                    if(count == 1) {
                        if(data.length == 0) {
@@ -254,11 +266,11 @@
                }

                if (this.condition.HNumber) {
                    sWhere += ` and 设备编码 like '%${this.condition.HNumber}'%`
                    sWhere += ` and 设备编码 like '%${this.condition.HNumber}%' `
                }

                if (this.condition.HName) {
                    sWhere += ` and 设备名称 like '%${this.condition.HName}'%`
                    sWhere += ` and 设备名称 like '%${this.condition.HName}%' `
                }

                return sWhere