From d32227561023d5347141678102e55f6ca5add619 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 十月 2024 12:01:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/index.vue | 6 +++---
admin/src/components/business/OperaMemberWindow.vue | 4 ++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 4 ++++
admin/src/views/business/relativeMember.vue | 13 +++++++------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 1 -
admin/src/views/platform/components/WaybillDetail.vue | 5 +++--
admin/src/views/business/internalMember.vue | 6 +++---
7 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/admin/src/components/business/OperaMemberWindow.vue b/admin/src/components/business/OperaMemberWindow.vue
index c38445d..c70c0e3 100644
--- a/admin/src/components/business/OperaMemberWindow.vue
+++ b/admin/src/components/business/OperaMemberWindow.vue
@@ -41,7 +41,7 @@
</el-date-picker>
</el-form-item>
<el-form-item label="鏄惁鍏氬憳" prop="isDangyuan">
- <el-radio-group v-model="form.radio" @input="isDangyuan">
+ <el-radio-group v-model="form.isDangyuan" >
<el-radio :label="0">闈炲厷鍛�</el-radio>
<el-radio :label="1">鍏氬憳</el-radio>
</el-radio-group>
@@ -137,7 +137,7 @@
this.department = depart
this.visible = true
this.companyType = companyType
- this.positionList()
+ this.getPositionList()
// 鏂板缓
if (target == null) {
this.$nextTick(() => {
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index bfea847..e52b5e8 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -93,11 +93,11 @@
</template>
</el-table-column>
<el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
- <el-table-column prop="postionName" label="宀椾綅" min-width="100px"></el-table-column>
+ <el-table-column prop="positionName" label="宀椾綅" min-width="100px"></el-table-column>
<el-table-column prop="isDangyuan" label="鏄惁鍏氬憳" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.isDangyuan == 0" style="color: green">鏄�</span>
- <span v-else >鍚�</span>
+ <span v-if="row.isDangyuan ==1 " style="color: green">鍏氬憳</span>
+ <span v-else >闈炲厷鍛�</span>
</template>
</el-table-column>
<el-table-column prop="jobDate" label="鍏ヨ亴鏃ユ湡" min-width="100px"></el-table-column>
diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue
index d2c0841..aa872cc 100644
--- a/admin/src/views/business/relativeMember.vue
+++ b/admin/src/views/business/relativeMember.vue
@@ -98,11 +98,11 @@
</template>
</el-table-column>
<el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
- <el-table-column prop="postionName" label="宀椾綅" min-width="100px"></el-table-column>
+ <el-table-column prop="positionName" label="宀椾綅" min-width="100px"></el-table-column>
<el-table-column prop="isDangyuan" label="鏄惁鍏氬憳" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.statusisDangyuan == 0" style="color: green">鏄�</span>
- <span v-else >鍚�</span>
+ <span v-if="row.isDangyuan ==1 " style="color: green">鍏氬憳</span>
+ <span v-else >闈炲厷鍛�</span>
</template>
</el-table-column>
<el-table-column prop="jobDate" label="鍏ヨ亴鏃ユ湡" min-width="100px"> </el-table-column>
@@ -186,8 +186,8 @@
v-permissions="['business:member:head']">鍙栨秷涓荤</el-button>
<el-button type="text" :loading="heading" icon="el-icon-edit" @click="updateHead(row, 1)"
v-if="row.headStatus == 0" v-permissions="['business:member:head']">璁句负涓荤</el-button>
- <el-button type="text" icon="el-icon-delete" style="color: red" @click="empower(row.id)"
- v-permissions="['business:empower:delete']">鍒犻櫎</el-button>
+ <el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red"
+ v-permissions="['business:member:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -244,7 +244,8 @@
working: false,
canvisiting: false,
companyTree: [],
- department: []
+ department: [],
+ positionList: [],
}
},
created () {
diff --git a/admin/src/views/index.vue b/admin/src/views/index.vue
index c96cdaa..5230e3b 100644
--- a/admin/src/views/index.vue
+++ b/admin/src/views/index.vue
@@ -479,7 +479,7 @@
formatter: function (params) {
return `
<div style="background-color: #15323f;margin: -12px;padding: 14px;border: 2px solid rgba(1,217,254,0.5);color: #fff;">
- <div>${params[0].name}鏃ュ娴�</div>
+ <div>${params[0].name}</div>
<div style="display: flex;align-items: center;">
<div style="width: 10px;height: 10px;border-radius: 50%;background-color: #6feef0;"></div>
<span style="margin-left: 6px;">${params[0].value}</span>
@@ -579,11 +579,11 @@
formatter: function (params) {
return `
<div style="background-color: #15323f;margin: -12px;padding: 14px;border: 2px solid rgba(1,217,254,0.5);color: #fff;">
- <div>${params[0].name}鏃ュ娴�</div>
+ <div>${params[0].name}</div>
<div style="display: flex;align-items: center;">
<div style="width: 10px;height: 10px;border-radius: 50%;background-color: #6feef0;"></div>
<span style="margin-left: 6px;">${params[0].value}</span>
- <div>浜�</div>
+ <div>杈�</div>
</div>
</div>
`
diff --git a/admin/src/views/platform/components/WaybillDetail.vue b/admin/src/views/platform/components/WaybillDetail.vue
index f3a4446..f51878c 100644
--- a/admin/src/views/platform/components/WaybillDetail.vue
+++ b/admin/src/views/platform/components/WaybillDetail.vue
@@ -29,13 +29,14 @@
<div class="item" v-for="item in info.wmsJobContractVOList">
<div class="contract">
<span>鍚堝悓鍙凤細{{ item.contractCode }}</span>
- <div>
+ <!-- <div> -->
<span class="scs" v-if="item.status == 1">WMS浣滀笟宸插畬鎴�</span>
<span class="pad" v-if="item.status == 0">WMS浣滀笟鏈畬鎴�</span>
<span class="err" v-if="item.status == 2">WMS浣滀笟宸插彇娑�</span>
+
<span class="scs" v-if="item.lockStatus == 1">鐢靛瓙閿佸凡涓婇攣</span>
<span class="pad" v-if="item.lockStatus == 0">鐢靛瓙閿佹湭涓婇攣</span>
- </div>
+ <!-- </div> -->
</div>
<div class="placeholder6">鏀惰揣鍦帮細{{ item.address }}</div>
<div class="list">
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
index 6824243..52ddd89 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
@@ -50,7 +50,6 @@
private MemberCardMapper memberCardMapper;
@Autowired
private EmpowerMapper empowerMapper;
-
@Autowired
private DeviceMapper deviceMapper;
@Autowired
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 0a776a5..6a2eaf2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -909,6 +909,10 @@
.set(updateMember.getFaceId()!=null,Member::getFaceId,updateMember.getFaceId())
.set(updateMember.getCompanyId()!=null,Member::getCompanyId,updateMember.getCompanyId())
.set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
+ .set( updateMember.getPositionId()!=null,Member::getPositionId,updateMember.getPositionId())
+ .set( updateMember.getIsDangyuan()!=null,Member::getIsDangyuan,updateMember.getIsDangyuan())
+ .set( updateMember.getJobDate()!=null,Member::getJobDate,updateMember.getJobDate())
+ .set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
.eq(Member::getId,updateMember.getId()));
dealTrainTIme(updateMember,1,loginUserInfo);
cancelAllMemberEmpower(updateMember,memberRoleMapper,empowerMapper);
--
Gitblit v1.9.3