From 676fba209b6bd2c0405b06078f05a72585546dc2 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 11 四月 2024 10:15:08 +0800
Subject: [PATCH] 提交一把
---
company/src/components/business/OpearaUnionChange.vue | 2 +-
company/src/components/business/OperaWtbApplyShopWindow.vue | 2 +-
company/src/components/business/OperaInsuranceApplyWindow.vue | 1 +
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 2 ++
company/src/components/business/OpearaUnionChangeUnit.vue | 2 +-
company/src/views/index.vue | 30 ++++++++++++++++++++----------
6 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/company/src/components/business/OpearaUnionChange.vue b/company/src/components/business/OpearaUnionChange.vue
index 94d9c61..5b3991c 100644
--- a/company/src/components/business/OpearaUnionChange.vue
+++ b/company/src/components/business/OpearaUnionChange.vue
@@ -22,7 +22,7 @@
type="date"
:picker-options="pickerOptions"
format="yyyy-MM-dd"
- placeholder="鍓嶉�夋嫨鏃ユ湡"
+ placeholder="璇烽�夋嫨鏃ユ湡"
value-format="yyyy-MM-dd" />
<span style="color: #F95601; font-size: 14px;">锛�2. 娆℃棩鐢熸晥鎶曚繚璇蜂簬17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
</div>
diff --git a/company/src/components/business/OpearaUnionChangeUnit.vue b/company/src/components/business/OpearaUnionChangeUnit.vue
index 8513e06..f8543da 100644
--- a/company/src/components/business/OpearaUnionChangeUnit.vue
+++ b/company/src/components/business/OpearaUnionChangeUnit.vue
@@ -19,7 +19,7 @@
<div style="display: flex; flex-direction: column;">
<el-date-picker
v-model="form.applyDate"
- placeholder="鍓嶉�夋嫨鏃ユ湡"
+ placeholder="璇烽�夋嫨鏃ユ湡"
:picker-options="pickerOptions"
type="date"
format="yyyy-MM-dd"
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index 8461fba..5b506da 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -774,6 +774,7 @@
},
getDetail(){
getDetail(this.dataId).then(res => {
+ console.log(res)
this.model = res
this.tableData = new Array()
this.tableData.push(res)
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index 3f47457..29510f4 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -35,7 +35,7 @@
<el-button v-if="model.status == 20" type="primary" @click="getSignLink(0)">绛剧讲鏂规纭涔�</el-button>
<el-button v-if="model.status == 21" type="primary" @click="getSignLink(1)">绛剧讲鐢宠鍗�</el-button>
<el-button v-if="model.unionApplyTbdStatus == 1" type="primary" @click="getSignLink(2)">绛剧讲鎶曚繚鍗�</el-button>
- <el-button v-if="model.status == 24" type="primary" @click="closeOrder">鍏抽棴璁㈠崟</el-button>
+ <el-button v-if="model.status == 24" type="danger" @click="closeOrder">鍏抽棴璁㈠崟</el-button>
</template>
<template v-if="userInfo.type === 2">
<el-button v-if="[21,22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewFanganshu">鏌ョ湅纭涔�</el-button>
diff --git a/company/src/views/index.vue b/company/src/views/index.vue
index 34ee197..9114581 100644
--- a/company/src/views/index.vue
+++ b/company/src/views/index.vue
@@ -126,7 +126,7 @@
</div>
</div>
<OperaInsuranceApplyWindow ref="operaInsuranceApplyWindow" @success="handleCurrentChange0()"/>
- <OperaInsuranceApplyShopWindow ref="operaInsuranceApplyShopWindow" @success="handleCurrentChange0()"/>
+ <OperaWtbApplyShopWindow ref="OperaWtbApplyShopWindow" @success="handleCurrentChange0()"/>
<dispatchUnitDetailsPlat ref="dispatchUnitDetailsPlat" @success="handleCurrentChange0()"/>
<OperaSettleClaimsWindow ref="operaSettleClaimsWindow" @success="handleCurrentChange2()"/>
<OperaApplyChangeUnitDetailWindow ref="operaApplyChangeUnitDetailWindow" @success="handleCurrentChange0()"/>
@@ -139,22 +139,23 @@
import * as echarts from 'echarts'
import { mapState } from 'vuex'
import OperaInsuranceApplyWindow from '@/components/business/OperaInsuranceApplyWindow'
-import OperaInsuranceApplyShopWindow from '@/components/business/OperaInsuranceApplyShopWindow'
import dispatchUnitDetailsPlat from '@/components/business/dispatchUnitDetailsPlat'
import OperaApplyChangeUnitDetailWindow from '@/components/business/OperaApplyChangeUnitDetailWindow'
import OperaSettleClaimsWindow from '@/components/business/OperaSettleClaimsWindow'
import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
import OperaTaxesWindow from '@/components/business/OperaTaxesWindow'
import { fetchList as noticeList, deleById } from '@/api/business/notices'
+import {getChangeDetail, getDetail} from "@/api/business/insuranceApply";
+import OperaWtbApplyShopWindow from "@/components/business/OperaWtbApplyShopWindow";
export default {
components: {
+ OperaWtbApplyShopWindow,
OperaInsuranceApplyWindow,
dispatchUnitDetailsPlat,
OperaTaxesWindow,
OperaSettleClaimsWindow,
OperaApplyChangeDetailWindow,
OperaApplyChangeUnitDetailWindow,
- OperaInsuranceApplyShopWindow
},
name: 'Index',
data () {
@@ -244,15 +245,24 @@
methods: {
detail (obj) {
if (obj.objType === 0) {
- if(obj.solutionType == 1){
- this.$refs.operaInsuranceApplyWindow.open('鎶曚繚鐢宠璇︽儏', { id: obj.objId })
- }else{
- this.$refs.operaInsuranceApplyWindow.open('鎶曚繚鐢宠璇︽儏', { id: obj.objId })
- }
+ getDetail(obj.objId).then(res => {
+ if( res.solutionType == 0){
+ this.$refs.operaInsuranceApplyWindow.open('鎶曚繚鐢宠璇︽儏', { id: obj.objId })
+ }else{
+ this.$refs.OperaWtbApplyShopWindow.open('濮旀墭鎶曚繚鐢宠璇︽儏', { id: obj.objId })
+ }
+ }).catch(err => {
+ })
} else if (obj.objType === 1) {
- this.$refs.operaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', { id: obj.objId, applyId: obj.param1 })
+ getChangeDetail(obj.objId).then(res => {
+ this.$refs.operaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', { id: obj.objId, applyId: res.applyId })
+ }).catch(err => {
+ })
} else if (obj.objType === 2) {
- this.$refs.operaApplyChangeUnitDetailWindow.open('鏇存崲娲鹃仯鍗曚綅鐢宠璇︽儏', { id: obj.objId, applyId: obj.param1 })
+ getChangeDetail(obj.objId).then(res => {
+ this.$refs.operaApplyChangeUnitDetailWindow.open('鏇存崲娲鹃仯鍗曚綅鐢宠璇︽儏', { id: obj.objId, applyId: res.applyId })
+ }).catch(err => {
+ })
} else if (obj.objType === 3) {
this.$refs.dispatchUnitDetailsPlat.open('娲鹃仯鍗曡鎯�', { id: obj.objId })
} else if (obj.objType === 4) {
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index e86801e..69c148e 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -205,6 +205,7 @@
user.setFixed(Boolean.TRUE);
user.setDeleted(Boolean.FALSE);
user.setCompanyId(company.getId());
+ user.setRealname(company.getLegalName());
user.setMobile(company.getPhone());
user.setCreateUser(company.getCreator());
user.setCreateTime(company.getCreateDate());
@@ -234,6 +235,7 @@
user.setCompanyId(company.getId());
user.setMobile(company.getPhone());
user.setCreateUser(company.getCreator());
+ user.setRealname(company.getLegalName());
user.setCreateTime(company.getCreateDate());
user.setStatus(Constants.ZERO);
systemUserMapper.insert(user);//鎻掑叆鏂扮殑绠＄悊鍛樿处鍙�
--
Gitblit v1.9.3