From 16e8c7adbee6c9ee9bac09a80d44d3bfd3fe2f0c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:38 +0800
Subject: [PATCH] Merge branch '2.0.2' into 2.0.1
---
wx/pages/addPersonnel/addPersonnel.vue | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/wx/pages/addPersonnel/addPersonnel.vue b/wx/pages/addPersonnel/addPersonnel.vue
index 5a5ca53..b97ed5d 100644
--- a/wx/pages/addPersonnel/addPersonnel.vue
+++ b/wx/pages/addPersonnel/addPersonnel.vue
@@ -19,7 +19,13 @@
</view>
<view class="box_head_info_list_item" v-if="info.type !== 1">
<view class="label">璐圭敤锛�</view>
- <view class="value">{{info.price}}鍏�</view>
+ <view class="value">
+ {{info.price}}鍏�
+ <text v-if="info.timeUnit === 0">/澶�</text>
+ <text v-if="info.timeUnit === 1">/鍗婃湀</text>
+ <text v-if="info.timeUnit === 2">/鏈�</text>
+ <text v-if="info.timeUnit === 3">/骞�</text>
+ </view>
</view>
</view>
</view>
@@ -38,6 +44,7 @@
<text>{{IdCard(item.idCard, 2)}}锝渰{IdCard(item.idCard, 3)}}宀�</text>
</view>
<view class="top_b">韬唤璇佸彿锛歿{item.idCard}}</view>
+ <view class="top_b">澶囨敞锛歿{item.remark||''}}</view>
</view>
<view class="center"></view>
<view class="bottom">
@@ -126,6 +133,7 @@
</view>
</view>
</u-popup>
+ <u-toast ref="uToast"></u-toast>
</view>
</template>
@@ -156,7 +164,14 @@
this.getDetails()
}
uni.$on('add', (data) => {
- this.list.unshift(data.model)
+ if (JSON.stringify(this.list).indexOf(data.model.idCard) !== -1) {
+ this.$refs.uToast.show({
+ type: 'default',
+ message: `[${data.model.name}]浜哄憳韬唤璇侀噸澶峘
+ })
+ } else {
+ this.list.unshift(data.model)
+ }
})
},
methods: {
@@ -167,6 +182,7 @@
idcardNo: item.idCard,
duId: item.pqId,
duName: item.pqName,
+ remark:item.remark,
workTypeName: item.gzName,
worktypeId: item.gzId,
fee: this.info.price
--
Gitblit v1.9.3