From 95bdecb4b73270f48bd46c628e9d6cf3ddccc92b Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 21 一月 2026 20:34:24 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/MJGL/Sc_EquipmentProcessList/Sc_EquipmentProcess.vue | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/pages/MJGL/Sc_EquipmentProcessList/Sc_EquipmentProcess.vue b/pages/MJGL/Sc_EquipmentProcessList/Sc_EquipmentProcess.vue
index 73abd63..5875786 100644
--- a/pages/MJGL/Sc_EquipmentProcessList/Sc_EquipmentProcess.vue
+++ b/pages/MJGL/Sc_EquipmentProcessList/Sc_EquipmentProcess.vue
@@ -5,8 +5,8 @@
height: calcContentHeight + 'px',
overflowY: 'auto'
}">
- <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
- <uni-card :title="item.鍗曟嵁鍙�" style="margin: 10px;">
+ <view class="list" v-for="(item,index) in showList" :key="index" v-if="showList.length>0">
+ <uni-card style="margin: 10px;">
<view class="card-detail">
<template v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)">
<view v-if="field.ColmType == 'DateTime'" class="detail">
@@ -19,6 +19,7 @@
</view>
</uni-card>
</view>
+ <view class="over" v-if="showList.length == 0">鏆傛棤鏁版嵁</view>
</view>
<view class="pagination-zone" id="pagination-zone">
<uni-pagination show-icon :page-size="size" :total="dataLength" :current="page"
@@ -82,7 +83,7 @@
},
onShow() {
//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
- this.changeTab(0)
+ // this.changeTab(0)
console.log(this.userInfo, uni.getStorageSync('HUserName'))
},
components: {
@@ -133,9 +134,9 @@
this.page = 1
this.showList = []
- if (this.tabs == 0) {
- this.urls = '/Sc_HEquipStateDistribution/Get_EquipICMOTechParamList_Json'
- }
+ // if (this.tabs == 0) {
+ // this.urls = '/Sc_HEquipStateDistribution/Get_EquipICMOTechParamList_Json'
+ // }
// if (this.tabs == 1) {
// this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
// }
@@ -165,10 +166,10 @@
this.dataLength = data.length
this.HFieldList = CommonUtils.fieldListFilterRole({
FieldList: list,
- ExcludeKeys: ["鍗曟嵁鍙�"]
+ ExcludeKeys: []
}).data
- console.log('this.HFieldList: ', this.HFieldList);
+ console.log('showList: ', this.showList);
} else {
CommonUtils.showTips({
title: "娓╅Θ鎻愮ず",
@@ -205,12 +206,12 @@
HICMOInterID,
HICMOEntryID
} = e
-
if (operationType == 4) {
- this.HInterID = HEquipID
- this.HICMOInterID = HICMOInterID
- this.HICMOEntryID = HICMOEntryID
+ this.hform.HInterID = HEquipID
+ this.hform.HICMOInterID = HICMOInterID
+ this.hform.HICMOEntryID = HICMOEntryID
}
+ this.changeTab(0)
}
}
</script>
--
Gitblit v1.9.1