From ae3919d6406ac4a796ff3ffc35a5b4bd129e8a7c Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 18 三月 2026 09:13:44 +0800
Subject: [PATCH] 报工台 首巡末 检验单 修改
---
pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue | 23 ++++++-
pages/ZLGL/shoujianjianyan/firstCheckBillList.vue | 8 +-
pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport.vue | 39 ++++++++++--
pages/ZLGL/mojianjianyan/ProcessCheckBillList.vue | 43 ++++++++------
manifest.json | 4
pages/index/login.vue | 14 ++--
pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList.vue | 8 +-
pages/baogong/DayPlanBillList.vue | 2
8 files changed, 94 insertions(+), 47 deletions(-)
diff --git a/manifest.json b/manifest.json
index c9a76dc..28e3156 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "2.096",
- "versionCode" : 296,
+ "versionName" : "2.098",
+ "versionCode" : 298,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport.vue b/pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport.vue
index cfba498..734b410 100644
--- a/pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport.vue
+++ b/pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport.vue
@@ -55,9 +55,9 @@
<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
<!-- 椤电鍐呭鍖哄煙 -->
- <scroll-view v-for="(tab, tabIndex) in tabs" :key="tabIndex" v-show="activeTab === tabIndex" id="pageContent"
+ <scroll-view v-for="(tab, tabIndex) in tabs" :key="tabIndex" v-show="activeTab == tabIndex" id="pageContent"
scroll-y class="page-content" :style="{height: pageContentHeight + 'px'}">
- <view class="list" v-for="(item,index) in tab.listData" :key="index">
+ <view class="list" v-for="(item,index) in tab.showData" :key="index">
<uni-card :title="item.鍣ㄥ叿鍙�" :extra="item.鍣ㄥ叿淇濆吇璁″垝鍗曞彿" style="margin: 10px;"
@tap="showDetail = showDetail==item.hmainid?-1:item.hmainid">
<view class="card-detail">
@@ -183,9 +183,10 @@
type: 0,
count: 0,
listData: [], // 娣诲姞杩欎釜
+ showData: [],
pageMeta: { // 娣诲姞杩欎釜
curPage: 1,
- size: 50,
+ size: 20,
total: 0,
}
},
@@ -194,9 +195,10 @@
type: 1,
count: 0,
listData: [], // 娣诲姞杩欎釜
+ showData: [],
pageMeta: { // 娣诲姞杩欎釜
curPage: 1,
- size: 50,
+ size: 20,
total: 0,
}
},
@@ -205,9 +207,10 @@
type: 2,
count: 0,
listData: [], // 娣诲姞杩欎釜
+ showData: [],
pageMeta: { // 娣诲姞杩欎釜
curPage: 1,
- size: 50,
+ size: 20,
total: 0,
}
}
@@ -288,6 +291,8 @@
this.activeTab = index
this.showDetail = -1
this.operations = -1
+
+ this.onPageChangeHandler({current: 1})
},
onDateRangePickerChangeHandler({
@@ -373,6 +378,10 @@
if (data && data.h_p_Sc_MouldMaintainTaskReport_APP) {
// 鏇存柊寰呯鍒伴〉绛�
this.tabs[0].listData = data.h_p_Sc_MouldMaintainTaskReport_APP
+ this.tabs[0].showData = data.h_p_Sc_MouldMaintainTaskReport_APP.slice(
+ (this.tabs[0].pageMeta.curPage-1)*this.tabs[0].pageMeta.size,
+ (this.tabs[0].pageMeta.curPage)*this.tabs[0].pageMeta.size
+ )
this.tabs[0].pageMeta.total = data.h_p_Sc_MouldMaintainTaskReport_APP.length
this.tabs[0].count = data.h_p_Sc_MouldMaintainTaskReport_APP.length
}
@@ -380,6 +389,11 @@
if (data && data.h_p_Sc_MouldMaintainTaskReport_APP1) {
// 鏇存柊寰呭鐞嗛〉绛�
this.tabs[1].listData = data.h_p_Sc_MouldMaintainTaskReport_APP1
+
+ this.tabs[1].showData = data.h_p_Sc_MouldMaintainTaskReport_APP.slice(
+ (this.tabs[1].pageMeta.curPage-1)*this.tabs[1].pageMeta.size,
+ (this.tabs[1].pageMeta.curPage)*this.tabs[1].pageMeta.size
+ )
this.tabs[1].pageMeta.total = data.h_p_Sc_MouldMaintainTaskReport_APP1.length
this.tabs[1].count = data.h_p_Sc_MouldMaintainTaskReport_APP1.length
}
@@ -387,6 +401,10 @@
if (data && data.h_p_Sc_MouldMaintainTaskReport_APP2) {
// 鏇存柊寰呴獙鏀堕〉绛�
this.tabs[2].listData = data.h_p_Sc_MouldMaintainTaskReport_APP2
+ this.tabs[2].showData = data.h_p_Sc_MouldMaintainTaskReport_APP.slice(
+ (this.tabs[2].pageMeta.curPage-1)*this.tabs[2].pageMeta.size,
+ (this.tabs[2].pageMeta.curPage)*this.tabs[2].pageMeta.size
+ )
this.tabs[2].pageMeta.total = data.h_p_Sc_MouldMaintainTaskReport_APP2.length
this.tabs[2].count = data.h_p_Sc_MouldMaintainTaskReport_APP2.length
}
@@ -397,8 +415,15 @@
})
},
- onPageChangeHandler() {
- this.onSearchClickHandler()
+ onPageChangeHandler({current}) {
+ // this.onSearchClickHandler()
+ this.tabs[this.activeTab].curPage = current
+ this.tabs[this.activeTab].showData
+ = this.tabs[this.activeTab].listData.slice(
+ (this.tabs[this.activeTab].pageMeta.curPage-1)*this.tabs[this.activeTab].pageMeta.size,
+ (this.tabs[this.activeTab].pageMeta.curPage)*this.tabs[this.activeTab].pageMeta.size
+ )
+
this.goTop()
},
},
diff --git a/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue b/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
index 0098e9b..ffa51c1 100644
--- a/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
+++ b/pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
@@ -48,6 +48,9 @@
</view>
<!-- 宸ヤ綔鑱旂郴鍗� 鍒楄〃 -->
+ <view>
+
+ </view>
<view class="list" v-for="(item,index) in BillsDisplay" :key="index">
<uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
@tap="showDetail = showDetail==index?-1:index">
@@ -102,6 +105,7 @@
</uni-card>
</view>
<view class="over" v-if="BillsDisplay.length == 0">鏆傛棤鏁版嵁</view>
+
</view>
</template>
@@ -132,7 +136,15 @@
sWhere: "",
showDetail: -1,
operations: -1,
+
+ page: 1,
+ size: 20,
+
};
+ },
+ // 瑙﹀簳鍔犺浇
+ onReachBottom() {
+ console.log('瑙﹀彂瑙﹀簳鍔犺浇...');
},
methods: {
onDateRangePickerChangeHandler({
@@ -175,7 +187,7 @@
}
},
onSearchClickHandler() {
- this.switchTab(this.tabs)
+ this.switchTab(this.tabs)
},
onResetClickHandler() {
this.dateRangePicker = ["浠绘剰闂撮殧", "浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"],
@@ -208,14 +220,17 @@
this.getWorkLinkList()
},
async getWorkLinkList() {
- this.sWhere += ` and 鏃ユ湡 >= CONVERT(VARCHAR(10), '${this.startDate}', 23) and 鏃ユ湡 <= CONVERT(VARCHAR(10), '${this.endDate}', 23)`
+ this.sWhere +=
+ ` and 鏃ユ湡 >= CONVERT(VARCHAR(10), '${this.startDate}', 23) and 鏃ユ湡 <= CONVERT(VARCHAR(10), '${this.endDate}', 23)`
try {
-
+
let res = await CommonUtils.doRequest2Async({
url: 'Sc_MESTransFerWorkBill/GetOA_WorkLinkBillList',
data: {
sWhere: this.sWhere,
- user: getUserInfo()["Czymc"]
+ user: getUserInfo()["Czymc"],
+ page: this.page,
+ size: this.size
}
})
diff --git a/pages/ZLGL/mojianjianyan/ProcessCheckBillList.vue b/pages/ZLGL/mojianjianyan/ProcessCheckBillList.vue
index 23a4e45..bfeb7d9 100644
--- a/pages/ZLGL/mojianjianyan/ProcessCheckBillList.vue
+++ b/pages/ZLGL/mojianjianyan/ProcessCheckBillList.vue
@@ -38,9 +38,9 @@
<uni-card :title="item['鍗曟嵁鍙�']" :extra="'鏃ユ湡:' + item['鏃ユ湡'].split('T')[0]"
@tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
- <view class="detail" v-if="item['鍗曟嵁绫诲瀷']">
+ <!-- <view class="detail" v-if="item['鍗曟嵁绫诲瀷']">
<text>鍗曟嵁绫诲瀷锛�</text>{{item['鍗曟嵁绫诲瀷']}}
- </view>
+ </view> -->
<view class="detail" v-if="item['鍗曟嵁鐘舵��']">
<text>鍗曟嵁鐘舵�侊細</text>{{item['鍗曟嵁鐘舵��']}}
</view>
@@ -59,8 +59,8 @@
<view class="detail" v-if="item['妫�楠屾柟妗�']">
<text>妫�楠屾柟妗堬細</text>{{item['妫�楠屾柟妗�']}}
</view>
- <view class="detail" v-if="item['瑙勬牸鍨嬪彿']">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item['瑙勬牸鍨嬪彿']}}
+ <view class="detail" v-if="item['鍒ゅ畾缁撹']">
+ <text>妫�楠岀姸鎬侊細</text>{{item['鍒ゅ畾缁撹']}}
</view>
</view>
<view class="card-detail" v-if="showDetail == index">
@@ -122,8 +122,10 @@
</view>
<view class="op" v-if="operations == index">
<button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
- <button class="op3" size="mini" plain @tap.stop="audit(item, 0)" v-if="!listDataShow[index]['瀹℃牳浜�']">瀹℃牳</button>
- <button class="op3" size="mini" plain @tap.stop="audit(item, 1)" v-if="listDataShow[index]['瀹℃牳浜�']">鍙嶅鏍�</button>
+ <button class="op3" size="mini" plain @tap.stop="audit(item, 0)"
+ v-if="!listDataShow[index]['瀹℃牳浜�']">瀹℃牳</button>
+ <button class="op3" size="mini" plain @tap.stop="audit(item, 1)"
+ v-if="listDataShow[index]['瀹℃牳浜�']">鍙嶅鏍�</button>
<button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
</view>
@@ -193,7 +195,7 @@
},
cmdAdd() {
uni.redirectTo({
- url: "/pages/ZLGL/mojianjianyan/ProcessCheckBill?operationType=1"
+ url: "/pages/ZLGL/mojianjianyan/ProcessCheckBill?operationType=1"
})
},
async cmdSearch() {
@@ -251,9 +253,9 @@
},
async audit(item, mode) {
- console.log('瀹℃牳鍗曟嵁: ',item);
-
- try{
+ console.log('瀹℃牳鍗曟嵁: ', item);
+
+ try {
let res = await CommonUtils.doRequest2Sync({
method: 'GET',
url: '/QC_ProcessCheckBill/QC_ProcessCheckBillMainValue',
@@ -263,14 +265,18 @@
CurUserName: getUserInfo()["Czymc"]
}
})
-
- if(!res) {
+
+ if (!res) {
return
}
-
- let {count, data, Message} = res.data
-
- if(count == 1) {
+
+ let {
+ count,
+ data,
+ Message
+ } = res.data
+
+ if (count == 1) {
CommonUtils.showTips({
message: `${item["瀹℃牳浜�"]?'鍙嶅鏍�':'瀹℃牳'}鎴愬姛`
})
@@ -278,13 +284,13 @@
setTimeout(() => {
this.cmdSearch()
}, 2000)
- }else {
+ } else {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
message: `鍗曟嵁${item["瀹℃牳浜�"]?'鍙嶅鏍�':'瀹℃牳'}澶辫触: ${Message}`
})
}
- }catch(err) {
+ } catch (err) {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
message: `鍗曟嵁${item["瀹℃牳浜�"]?'鍙嶅鏍�':'瀹℃牳'}閿欒: ${err}`
@@ -519,6 +525,7 @@
margin-top: 20rpx;
flex-wrap: wrap;
align-content: flex-start;
+
button {
margin: 0;
flex-shrink: 0;
diff --git a/pages/ZLGL/shoujianjianyan/firstCheckBillList.vue b/pages/ZLGL/shoujianjianyan/firstCheckBillList.vue
index a1551d8..3825082 100644
--- a/pages/ZLGL/shoujianjianyan/firstCheckBillList.vue
+++ b/pages/ZLGL/shoujianjianyan/firstCheckBillList.vue
@@ -38,9 +38,9 @@
<uni-card :title="item['鍗曟嵁鍙�']" :extra="'鏃ユ湡:' + item['鏃ユ湡'].split('T')[0]"
@tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
- <view class="detail" v-if="item['鍗曟嵁绫诲瀷']">
+ <!-- <view class="detail" v-if="item['鍗曟嵁绫诲瀷']">
<text>鍗曟嵁绫诲瀷锛�</text>{{item['鍗曟嵁绫诲瀷']}}
- </view>
+ </view> -->
<view class="detail" v-if="item['鍗曟嵁鐘舵��']">
<text>鍗曟嵁鐘舵�侊細</text>{{item['鍗曟嵁鐘舵��']}}
</view>
@@ -59,8 +59,8 @@
<view class="detail" v-if="item['妫�楠屾柟妗�']">
<text>妫�楠屾柟妗堬細</text>{{item['妫�楠屾柟妗�']}}
</view>
- <view class="detail" v-if="item['瑙勬牸鍨嬪彿']">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item['瑙勬牸鍨嬪彿']}}
+ <view class="detail" v-if="item['鍒ゅ畾缁撹']">
+ <text>妫�楠岀姸鎬侊細</text>{{item['鍒ゅ畾缁撹']}}
</view>
</view>
<view class="card-detail" v-if="showDetail == index">
diff --git a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList.vue b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList.vue
index 5df530d..d2e9c6c 100644
--- a/pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList.vue
+++ b/pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList.vue
@@ -38,9 +38,9 @@
<uni-card :title="item['鍗曟嵁鍙�']" :extra="'鏃ユ湡:' + item['鏃ユ湡'].split('T')[0]"
@tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
- <view class="detail" v-if="item['鍗曟嵁绫诲瀷']">
+ <!-- <view class="detail" v-if="item['鍗曟嵁绫诲瀷']">
<text>鍗曟嵁绫诲瀷锛�</text>{{item['鍗曟嵁绫诲瀷']}}
- </view>
+ </view> -->
<view class="detail" v-if="item['鍗曟嵁鐘舵��']">
<text>鍗曟嵁鐘舵�侊細</text>{{item['鍗曟嵁鐘舵��']}}
</view>
@@ -59,8 +59,8 @@
<view class="detail" v-if="item['妫�楠屾柟妗�']">
<text>妫�楠屾柟妗堬細</text>{{item['妫�楠屾柟妗�']}}
</view>
- <view class="detail" v-if="item['瑙勬牸鍨嬪彿']">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item['瑙勬牸鍨嬪彿']}}
+ <view class="detail" v-if="item['鍒ゅ畾缁撹']">
+ <text>妫�楠岀姸鎬侊細</text>{{item['鍒ゅ畾缁撹']}}
</view>
</view>
<view class="card-detail" v-if="showDetail == index">
diff --git a/pages/baogong/DayPlanBillList.vue b/pages/baogong/DayPlanBillList.vue
index b49420d..fabca34 100644
--- a/pages/baogong/DayPlanBillList.vue
+++ b/pages/baogong/DayPlanBillList.vue
@@ -14,7 +14,7 @@
<text>宸℃娆℃暟锛�</text>{{currentOrder[0].宸℃娆℃暟?currentOrder[0].宸℃娆℃暟:0}}
</view>
<view class="detail">
- <text>杩囩▼妫�娆℃暟锛�</text>{{currentOrder[0].杩囩▼妫�娆℃暟?currentOrder[0].杩囩▼妫�娆℃暟:0}}
+ <text>鏈娆℃暟锛�</text>{{currentOrder[0].杩囩▼妫�娆℃暟?currentOrder[0].杩囩▼妫�娆℃暟:0}}
</view>
<view class="detail" v-if="currentOrder[0].褰撴棩鐐规瀹屾垚鎯呭喌">
<text>鐐规瀹屾垚鎯呭喌锛�</text>{{currentOrder[0].褰撴棩鐐规瀹屾垚鎯呭喌}}
diff --git a/pages/index/login.vue b/pages/index/login.vue
index a70be31..789859c 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -168,13 +168,13 @@
methods: {
async ApplyLanguagePack(lang, forceUpdate = false) {
// 璇诲彇璇█鍖呭苟鍔犺浇
- let {
- data,
- getRemoteFile
- } = await getLanguagePackJson(lang)
- if (getRemoteFile) {
- this.$i18n.setLocaleMessage(lang, data)
- }
+ // let {
+ // data,
+ // getRemoteFile
+ // } = await getLanguagePackJson(lang)
+ // if (getRemoteFile) {
+ // this.$i18n.setLocaleMessage(lang, data)
+ // }
this.$i18n.locale = lang
},
onLanguageChangeHandler(e) {
--
Gitblit v1.9.1