From d9c6b0881d0868511b68f6d0542eb3cff6adeda4 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 11 八月 2025 15:20:50 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
manifest.json | 4 ++--
pages/gongxuOut/table.vue | 9 ++++++---
pages/weiwaigxOut/table.vue | 8 ++++----
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/manifest.json b/manifest.json
index 6a80a16..3507e24 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "1.0.46",
- "versionCode" : 146,
+ "versionName" : "1.0.48",
+ "versionCode" : 148,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/gongxuOut/table.vue b/pages/gongxuOut/table.vue
index 8a5a1c5..1eed4d0 100644
--- a/pages/gongxuOut/table.vue
+++ b/pages/gongxuOut/table.vue
@@ -108,6 +108,9 @@
<view class="detail" v-if="item.浜у搧浠ｇ爜">
<text>浜у搧浠ｇ爜锛�</text>{{item.浜у搧浠ｇ爜}}
</view>
+ <view class="detail" v-if="item.娆惧彿">
+ <text>娆惧彿锛�</text>{{item.娆惧彿}}
+ </view>
<view class="detail" v-if="item.褰撳墠宸ュ簭">
<text>褰撳墠宸ュ簭锛�</text>{{item.褰撳墠宸ュ簭}}
</view>
@@ -215,8 +218,8 @@
<!-- <button class="op1" size="mini" plain @tap.stop="check(item)">瀹℃牳</button>
<button class="op2" size="mini" plain @tap.stop="antiCheck(item)">鍙嶅鏍�</button> -->
<!-- <button class="op1" size="mini" plain @tap.stop="qcCheck(item)">宸ュ簭妫�</button> -->
- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
- <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+ <button class="op3" size="mini" plain @tap.stop="edit(item)" v-if="false">缂栬緫</button>
+ <button class="op4" size="mini" plain @tap.stop="del(item)" v-if="false">鍒犻櫎</button>
<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
</view>
</uni-card>
@@ -241,7 +244,7 @@
arrayComparator:['=','>=','>','<=','<','<>','鍖呭惈','宸﹀寘鍚�','鍙冲寘鍚�','涓嶅寘鍚�'],
hform:{
HStatus:'鍏ㄩ儴',
- HBeginDate: new Date().toLocaleDateString(),
+ HBeginDate: new Date().toISOString().split('T')[0],
HEndDate:'',
HWorkBillNo:'',
HBillNo:'',
diff --git a/pages/weiwaigxOut/table.vue b/pages/weiwaigxOut/table.vue
index 5531bad..eb8f27e 100644
--- a/pages/weiwaigxOut/table.vue
+++ b/pages/weiwaigxOut/table.vue
@@ -210,9 +210,9 @@
<view class="op" v-if="operations == index">
<!-- <button class="op1" size="mini" plain @tap.stop="check(item)">瀹℃牳</button>
<button class="op2" size="mini" plain @tap.stop="antiCheck(item)">鍙嶅鏍�</button> -->
- <button class="op1" size="mini" plain @tap.stop="firstCheck(item)">棣栨</button>
- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
- <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
+ <button class="op1" size="mini" plain @tap.stop="firstCheck(item)" v-if="false">棣栨</button>
+ <button class="op3" size="mini" plain @tap.stop="edit(item)" v-if="false">缂栬緫</button>
+ <button class="op4" size="mini" plain @tap.stop="del(item)" v-if="false">鍒犻櫎</button>
<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
</view>
</uni-card>
@@ -235,7 +235,7 @@
arrayStatus:['鍏ㄩ儴','鏈鏍�','宸插鏍�','宸插叧闂�'],
hform:{
HStatus:'鍏ㄩ儴',
- HBeginDate:new Date().toLocaleDateString(),
+ HBeginDate:new Date().toISOString().split('T')[0],
HEndDate:'',
HICMOBillNo:'',
HBillNo:'',
--
Gitblit v1.9.1