From cca6dd93779040e13d52981a55afd2dd7ee17b90 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 12 六月 2024 17:16:03 +0800
Subject: [PATCH] sssssssssss
---
company/src/components/business/OperaWtbApplyShopWindow.vue | 6 +-
company/src/components/enterprise/selectEmployees.vue | 40 ++++++++++++++------
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 2 -
company/.env.developmentCom | 4 +
company/src/components/common/CommonHeader.vue | 11 ++---
company/.env.development | 4 +-
6 files changed, 41 insertions(+), 26 deletions(-)
diff --git a/company/.env.development b/company/.env.development
index 37a94ed..f419a10 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -11,5 +11,5 @@
#VUE_APP_API = 'http://localhost:10030/'
-VUE_APP_API = 'http://192.168.0.143:10030/'
-#VUE_APP_API = 'https://www.yyb.red/yyb_admin_api/'
+#VUE_APP_API = 'http://192.168.0.143:10030/'
+VUE_APP_API = 'https://www.yyb.red/yyb_admin_api/'
diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index 3e2a085..360c46c 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -9,4 +9,6 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
#VUE_APP_API = 'http://localhost:10031/'
-VUE_APP_API = 'http://192.168.0.143:10031/'
+#VUE_APP_API = 'http://192.168.0.143:10031/'
+
+VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index b2a0455..35b3080 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -12,8 +12,8 @@
<div class="desc_item_label_left">
<span>淇濋櫓鍒版湡杩樻湁 <b style="color: #F95601;">{{model.loseEfficacyDays ? model.loseEfficacyDays : '-'}}</b> 澶�</span>
<el-button type="primary" v-if="model.status === 27" @click="$refs.OperaInsuranceApplyAddWindow.open('缁繚', {id: dataId,type: 1 })">涓�閿画淇�</el-button>
- <el-button type="primary" v-if="model.status === 27 && model.loseEfficacyDays" @click="$refs.additionSubtractionApplication.open('鍔犲噺淇濈敵璇�', { id: dataId })">鍔犲噺淇濈敵璇�</el-button>
- <el-button type="primary" v-if="model.status === 27 && model.loseEfficacyDays" @click="$refs.factoryChange.open('鏇存崲娲鹃仯鍗曚綅鐢宠', { id: dataId })">鏇存崲娲鹃仯鍗曚綅鐢宠</el-button>
+ <el-button type="primary" v-if="model.status === 27 && ( model.loseEfficacyDays ||!model.loseEfficacyDays)" @click="$refs.additionSubtractionApplication.open('鍔犲噺淇濈敵璇�', { id: dataId })">鍔犲噺淇濈敵璇�</el-button>
+ <el-button type="primary" v-if="model.status === 27 && ( model.loseEfficacyDays ||!model.loseEfficacyDays)" @click="$refs.factoryChange.open('鏇存崲娲鹃仯鍗曚綅鐢宠', { id: dataId })">鏇存崲娲鹃仯鍗曚綅鐢宠</el-button>
</div>
</div>
<div class="desc_item_label">
@@ -26,7 +26,7 @@
<div class="desc_item_label_right">
<el-button type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚璇︽儏鍗�',model,0)">瀵煎嚭璇﹀崟</el-button>
<template v-if="userInfo.type === 1">
- <el-button v-if="model.status == 24" type="primary" @click="$refs.OperaInsuranceApply.open('鎶曚繚鐢宠', {id: dataId})">鍐嶆鎶曚繚</el-button>
+ <el-button v-if="model.status == 24" type="primary" @click="$refs.OperaInsuranceApplyAddWindow.open('鎶曚繚鐢宠', {id: dataId})">鍐嶆鎶曚繚</el-button>
<el-button v-if="[21,22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewFanganshu">鏌ョ湅纭涔�</el-button>
<el-button v-if="[22,23,24,25,26,27].includes(model.status) && model.shenqingdanFile" type="primary" @click="viewShenqingdan">鏌ョ湅鐢宠鍗�</el-button>
<el-button v-if="[1,2,3].includes(model.unionApplyTbdStatus) &&(model.toubaodanFile || model.oubaodanSignedFile)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
diff --git a/company/src/components/common/CommonHeader.vue b/company/src/components/common/CommonHeader.vue
index 90aa22d..a5705fc 100644
--- a/company/src/components/common/CommonHeader.vue
+++ b/company/src/components/common/CommonHeader.vue
@@ -101,14 +101,13 @@
if (userInfo == null) {
return ''
}
- if(userInfo.type === 1){
- if (userInfo.company != null && userInfo.company.name.trim().length > 0) {
+ if (userInfo.type === 1 && userInfo.company != null && userInfo.company.name.trim().length > 0) {
+ if (userInfo.company.username === userInfo.username){
return userInfo.company.name
}
- }else{
- if (userInfo.realname != null && userInfo.realname.trim().length > 0) {
- return userInfo.realname
- }
+ }
+ if (userInfo.realname != null && userInfo.realname.trim().length > 0) {
+ return userInfo.realname
}
return userInfo.username
}
diff --git a/company/src/components/enterprise/selectEmployees.vue b/company/src/components/enterprise/selectEmployees.vue
index db719bb..dfa5994 100644
--- a/company/src/components/enterprise/selectEmployees.vue
+++ b/company/src/components/enterprise/selectEmployees.vue
@@ -6,35 +6,39 @@
:confirm-working="isWorking"
@confirm="confirm"
>
+ <div style="display: inline-block;padding: 20px 10px;color: red" class="el-upload__tip" >
+ 鎿嶄綔鎻愮ず锛� 璇峰湪涓嬮潰鎼滅储妗嗗唴杈撳叆鍛樺伐濮撳悕鎴栬韩浠借瘉鍙疯繘琛屽憳宸ヤ俊鎭悳绱紝骞堕�夋嫨鍛樺伐杩涜鎿嶄綔
+ </div>
<el-select
- v-model="memberIds"
+ value-key="id"
+ v-model="seleData"
filterable
multiple
remote
- style="margin-bottom: 15px;width: 50%;margin-right: 10px"
- placeholder="璇疯緭鍏ュ憳宸ュ鍚嶆垨韬唤璇佸彿"
+ style="margin-bottom: 15px;width: 100%;margin-right: 10px"
+ placeholder="璇疯緭鍏ュ憳宸ュ鍚嶆垨韬唤璇佸彿杩涜閫夋嫨"
:remote-method="searchSelData"
:loading="loading">
<el-option
v-for="item in memberList"
:key="item.id"
:label="item.name+' ' +(item.idcardNo||'')"
- :value="item.id">
+ :value="item">
</el-option>
</el-select>
<!--
<el-input v-model="val" placeholder="璇疯緭鍏ュ憳宸ュ鍚嶅悗锛岀偣鍑绘悳绱㈡寜閽垨鑰呮寜涓媏nter閿繘琛屾煡璇�" @keypress.enter.native="getList" style="margin-bottom: 15px;width: 50%;margin-right: 10px"></el-input>
-->
- <el-button type="primary" @click="getList" style="width: 100px;">鎼滅储</el-button>
+<!-- <el-button type="primary" @click="getList" style="width: 100px;">鎼滅储</el-button>-->
<el-table
- :data="list"
+ :data="seleData"
border
- @selection-change="handleSelectionChange"
+ selection-change1="handleSelectionChange"
style="width: 100%">
- <el-table-column
+<!-- <el-table-column
type="selection"
width="55">
- </el-table-column>
+ </el-table-column>-->
<el-table-column label="搴忓彿" width="80px">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
@@ -103,6 +107,11 @@
this.price = obj.price
this.confirming=false
this.oldList = obj.arr
+ // this.seleData = obj.arr || []
+ this.memberIds=[]
+ this.seleData=[]
+ this.memberList=[]
+ this.confirming=false
if (obj.type) {
this.type = obj.type
}
@@ -126,14 +135,16 @@
}
this.confirming=true
if (this.seleData.length === 0) {
- this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
+ this.$message.warning('鑷冲皯鎼滅储閫夋嫨涓�浣嶅憳宸ヨ繘琛屾搷浣�')
+ this.confirming=false
return
}
for (let i = 0; i < this.seleData.length; i++) {
for (let a = 0; a < this.oldList.length; a++) {
// this.seleData[i].name === this.oldList[a].memberName ||
- if (this.seleData[i].idCard === this.oldList[a].idcardNo) {
+ if (this.seleData[i].idcardNo === this.oldList[a].idCard) {
this.$message.warning(`[${this.seleData[i].name}]鍛樺伐閲嶅`)
+ this.confirming=false
return
}
}
@@ -142,6 +153,7 @@
item.idCard = item.idcardNo
item.memberName = item.name
item.memberId = item.id
+ item.reducePrice = item.fee
if (this.notInInsuranceApplyId || this.type == 1) {
item.workTypeName = ''
item.worktypeId = ''
@@ -150,8 +162,12 @@
}
item.fee = this.price
})
- this.$emit('result', this.seleData)
+
+ console.log(this.oldList)
+ console.log(this.seleData)
this.confirming=false
+ this.$emit('result', this.seleData)
+ this.seleData=[]
this.visible = false
},
handleSelectionChange (e) {
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index 037fd3f..d650b07 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -1183,7 +1183,6 @@
//濡傛灉宸蹭繚鍏�,鍙笅杞界绾﹂檮浠�
String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
- //鐩翠繚 鎶曚繚鐢宠
String r = dealXBTBBiz(path,data,"鐩翠繚-鎶曚繚鐢宠绛剧讲");
if(StringUtils.isNotBlank(r)){
return r;
@@ -1259,7 +1258,6 @@
return null;
}
if( Constants.equalsInteger(unionApply.getStatus(),Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey())){
-
if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
//瀹屾垚绛剧讲宸插畬鎴愭搷浣�
String link = signService.linkFile(data.getApplyNo());
--
Gitblit v1.9.3