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/factory_change_personnel/factory_change_personnel.vue | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/wx/pages/factory_change_personnel/factory_change_personnel.vue b/wx/pages/factory_change_personnel/factory_change_personnel.vue
index 57e8de2..9f9e3c9 100644
--- a/wx/pages/factory_change_personnel/factory_change_personnel.vue
+++ b/wx/pages/factory_change_personnel/factory_change_personnel.vue
@@ -65,6 +65,14 @@
<u--input v-model="model.workTypeName" disabled disabledColor="#ffffff" placeholder="璇烽�夋嫨" border="none"></u--input>
<u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
+ <u-form-item
+ label="澶囨敞锛�"
+ prop="remark"
+ borderBottom
+ required
+ >
+ <u--input v-model="model.remark" maxlength="18" border="none" placeholder="璇疯緭鍏�"></u--input>
+ </u-form-item>
</u--form>
</view>
<view class="box_footer">
@@ -93,6 +101,7 @@
model: {
memberName: '',
memberId: '',
+ remark:'',
idcardNo: '',
oldDuName: '',
oldDuId: '',
@@ -161,6 +170,7 @@
this.model.memberId = item.id
this.model.idcardNo = item.idcardNo
this.model.oldDuName = item.duName
+ this.model.remark = item.remark
this.model.oldDuId = item.duId
this.model.oldWorkTypeName = item.workTypeName
this.model.oldWorktypeId = item.worktypeId
@@ -168,13 +178,21 @@
},
// 鎼滅储
changeSearch(name) {
+ if (!name) {
+ this.user = []
+ return
+ }
this.$u.api.memberFindListByDTO({
name,
insuranceApplyId: this.insuranceApplyId,
validTime: this.validTime
}).then(res => {
if (res.code === 200) {
- this.user = res.data
+ if (res.data.length > 0) {
+ this.user = res.data
+ } else {
+ uni.showToast({ title: '鏈壘鍒拌浜哄憳', icon: 'none' })
+ }
}
})
},
@@ -217,6 +235,7 @@
this.model.duName = e.value[0].label
this.duSolutionId = e.value[0].duSolutionId
this.model.worktypeId = ''
+ this.model.remark=''
this.model.workTypeName = ''
this.getGZ()
this.show = false
@@ -227,6 +246,10 @@
this.show1 = false
},
submit() {
+ if (!this.model.memberId) return uni.showToast({
+ title: '璇烽�夋嫨浜哄憳',
+ icon: 'none'
+ })
this.$refs.uForm.validate().then(res => {
uni.$emit('data', this.model)
uni.navigateBack({ delta: 1 });
@@ -250,7 +273,8 @@
box-sizing: border-box;
.box_list {
width: 100%;
- height: calc(100vh - 158rpx - env(safe-area-inset-bottom));
+ height: auto;
+ // height: calc(100vh - 158rpx - env(safe-area-inset-bottom));
background: #FFFFFF;
border-radius: 16rpx;
padding: 32rpx 30rpx;
--
Gitblit v1.9.3