From 556227f639fc5d5bc7b35c3da437634d8215d263 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 11 四月 2024 09:31:02 +0800
Subject: [PATCH] 提交一把
---
company/src/components/business/OperaWtbApplyShopWindow.vue | 8 ++-
company/src/components/enterprise/OperaInsuranceApplyWindow.vue | 14 ++++--
company/src/components/business/OperaApplyChangeDetailWindow.vue | 2
server/service/src/main/java/com/doumee/core/utils/Constants.java | 6 +-
company/src/views/enterprise/myPolicy.vue | 3 +
company/src/views/index.vue | 11 ++++-
company/src/views/enterprise/insuranceApply.vue | 2
company/.env.developmentShop | 4 +-
company/src/components/business/OperaApplyChangeUnitDetailWindow.vue | 4 +-
company/src/components/enterprise/editFactoryChange.vue | 10 ++--
company/src/views/business/insuranceApplyShop.vue | 1
11 files changed, 40 insertions(+), 25 deletions(-)
diff --git a/company/.env.developmentShop b/company/.env.developmentShop
index 506b270..962e3ac 100644
--- a/company/.env.developmentShop
+++ b/company/.env.developmentShop
@@ -7,6 +7,6 @@
VUE_APP_SYSTEM_TITLE = '浜戞槗淇濆鎴锋湇鍔＄郴缁�-鍟嗘埛绔�'
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
-#VUE_APP_API = 'http://192.168.0.190:10032/'
+VUE_APP_API = 'http://192.168.0.190:10032/'
-VUE_APP_API = 'http://localhost:10032/'
+#VUE_APP_API = 'http://localhost:10032/'
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index 8f18645..2be1225 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -434,7 +434,7 @@
},
handleCurrentChange(val){
console.log(val)
- this.page = val
+ this.currentPage = val
this.getList()
},
onSubmit(){
diff --git a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
index a2c7f50..1e6f835 100644
--- a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
@@ -23,7 +23,7 @@
</div>
<div class="desc_item_label_right">
<template v-if="userInfo.type === 1">
- <el-button type="primary" v-if="[5,8].includes(model.status)" @click="$refs.reinsurance.open('鏇存崲娲鹃仯鍗曚綅鐢宠', {id: dataId, applyChangId: modelId})">鍐嶆鎶曚繚</el-button>
+ <el-button type="primary" v-if="[5,8].includes(model.status)" @click="$refs.editFactoryChange.open('鏇存崲娲鹃仯鍗曚綅鐢宠', {id: dataId, applyChangId: modelId})">鍐嶆鎶曚繚</el-button>
<el-button type="primary" @click="$refs.ApplyChangeDetails.open('鏇存崲娲鹃仯鍗曚綅璇︽儏',apply,model,0)">瀵煎嚭璇﹀崟</el-button>
<el-button type="primary" v-if="model.status == 0" @click="getSignLink(0)">绛剧讲鐢宠鍗�</el-button>
<el-button v-if="[0, 1, 3, 7].includes(model.status) && model.solutionType == 0" type="danger" @click="$refs.add_subtract_return.open('鐢宠閫�鍥�', { id: modelId })">鐢宠閫�鍥�</el-button>
@@ -431,7 +431,7 @@
},
handleCurrentChange (val) {
console.log(val)
- this.page = val
+ this.currentPage = val
this.getList()
},
onSubmit () {
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index 104cf7f..3f47457 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -28,7 +28,7 @@
<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="[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)" type="primary" @click="viewShenqingdan">鏌ョ湅鐢宠鍗�</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>
<el-button v-if="[3].includes(model.unionApplyTbdStatus) &&(model.baoxiandanFile)" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
<!-- goSign-->
@@ -39,7 +39,7 @@
</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>
- <el-button v-if="[22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewShenqingdan">鏌ョ湅鐢宠鍗�</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>
<el-button v-if="[3].includes(model.unionApplyTbdStatus) &&(model.baoxiandanFile)" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
<el-button v-if="model.status == 22" type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚瀹℃牳',model,1)">鎶曚繚瀹℃牳</el-button>
@@ -48,7 +48,7 @@
</template>
<template v-if="userInfo.type === 0">
<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)" type="primary" @click="viewShenqingdan">鏌ョ湅鐢宠鍗�</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>
<el-button v-if="[3].includes(model.unionApplyTbdStatus) &&(model.baoxiandanFile)" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
</template>
@@ -180,6 +180,8 @@
<el-option label="鐢宠閫�鍥�" value="3"></el-option>
<el-option label="宸查��鍥�" value="5"></el-option>
<el-option label="宸插叧闂�" value="6"></el-option>
+ <el-option label="寰呭嚭鍗�" value="7"></el-option>
+ <el-option label="鎶曚繚涓�" value="9"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鎵瑰崟鐢熸晥璧锋湡" prop="end">
diff --git a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
index 535c8b6..f9e1ff6 100644
--- a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
@@ -298,11 +298,15 @@
if (index === 0) {
sums[index] = '鎬讳环'
} else if (index === 7) {
- let total = 0
- this.tableData.forEach(item => {
- total += item.fee
- })
- sums[index] = total.toFixed(2)
+ if(this.item.type == 1){
+ sums[index] = "-"
+ }else{
+ let total = 0
+ this.tableData.forEach(item => {
+ total += item.fee
+ })
+ sums[index] = total.toFixed(2)
+ }
}
})
return sums
diff --git a/company/src/components/enterprise/editFactoryChange.vue b/company/src/components/enterprise/editFactoryChange.vue
index a46d79b..976d5b3 100644
--- a/company/src/components/enterprise/editFactoryChange.vue
+++ b/company/src/components/enterprise/editFactoryChange.vue
@@ -175,7 +175,7 @@
return {
form: {
id: null,
- applyChangId: '',
+ applyChangeId: '',
solutionId: '',
solutionsName: '',
applyStartTime: '',
@@ -219,7 +219,7 @@
this.$nextTick(() => {
this.$refs.form.resetFields()
this.form.id = target.id
- this.form.applyChangId = target.applyChangId
+ this.form.applyChangeId = target.applyChangId
this.getDetails()
this.getapplyChagneDetailList()
})
@@ -236,7 +236,7 @@
// 鑾峰彇鎹㈠巶浜哄憳
getapplyChagneDetailList() {
applyChagneDetailList({
- applyChangId: this.form.applyChangId,
+ applyChangeId: this.form.applyChangeId,
types: [2]
}).then(res => {
res.forEach(item => {
@@ -282,7 +282,7 @@
this.pickerOptions = {
disabledDate(time) {
// - 8.64e7
- return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date().getTime()
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() <new Date(res.startTime).getTime()
}
};
this.changeSolution1(res.solutionId)
@@ -323,7 +323,7 @@
// })
this.isWorking = true
update({
- id: this.form.applyChangId,
+ id: this.form.applyChangeId,
applyId: this.form.id,
changeDetailList: this.form.factory,
validTime: this.form.applyStartTime,
diff --git a/company/src/views/business/insuranceApplyShop.vue b/company/src/views/business/insuranceApplyShop.vue
index 851e516..44a477f 100644
--- a/company/src/views/business/insuranceApplyShop.vue
+++ b/company/src/views/business/insuranceApplyShop.vue
@@ -11,6 +11,7 @@
<el-option label="宸插叧闂�" value="25"></el-option>
<el-option label="鎶曚繚涓�" value="26"></el-option>
<el-option label="淇濋殰涓�" value="27"></el-option>
+ <el-option label="宸茶繃鏈�" value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鎶曚繚浼佷笟" prop="companyId">
diff --git a/company/src/views/enterprise/insuranceApply.vue b/company/src/views/enterprise/insuranceApply.vue
index 47769b1..e77ea30 100644
--- a/company/src/views/enterprise/insuranceApply.vue
+++ b/company/src/views/enterprise/insuranceApply.vue
@@ -84,7 +84,7 @@
<span>{{row.fee!=null?row.fee: '-'}}</span>
</template>
</el-table-column>
- <el-table-column prop="checkDate" label="鎻愪氦鏃ユ湡"></el-table-column>
+ <el-table-column prop="createDate" label="鎻愪氦鏃ユ湡"></el-table-column>
<el-table-column prop="startTime" label="鎶曚繚鐢熸晥鏃ユ湡"></el-table-column>
<el-table-column prop="endTime" label="鎶曚繚澶辨晥鏃ユ湡"></el-table-column>
<el-table-column
diff --git a/company/src/views/enterprise/myPolicy.vue b/company/src/views/enterprise/myPolicy.vue
index 0498c59..8ba7467 100644
--- a/company/src/views/enterprise/myPolicy.vue
+++ b/company/src/views/enterprise/myPolicy.vue
@@ -25,6 +25,7 @@
<el-option label="宸查��鍥�" value="4"></el-option>
<el-option label="閫�鍥炵敵璇蜂腑" value="5"></el-option>
<el-option label="宸插叧闂�" value="6"></el-option>
+ <el-option label="鎶曚繚涓�" value="26"></el-option>
</el-select>
</el-form-item>
<el-form-item label="淇濋櫓鐢熸晥璧锋湡" prop="time1">
@@ -114,7 +115,7 @@
<span>{{row.fee!=null?row.fee: '-'}}</span>
</template>
</el-table-column>
- <el-table-column prop="checkDate" label="鎻愪氦鏃ユ湡"></el-table-column>
+ <el-table-column prop="createDate" label="鎻愪氦鏃ユ湡"></el-table-column>
<el-table-column prop="startTime" label="鎶曚繚鐢熸晥鏃ユ湡"></el-table-column>
<el-table-column prop="endTime" label="鎶曚繚澶辨晥鏃ユ湡"></el-table-column>
<el-table-column
diff --git a/company/src/views/index.vue b/company/src/views/index.vue
index 48a58aa..34ee197 100644
--- a/company/src/views/index.vue
+++ b/company/src/views/index.vue
@@ -126,6 +126,7 @@
</div>
</div>
<OperaInsuranceApplyWindow ref="operaInsuranceApplyWindow" @success="handleCurrentChange0()"/>
+ <OperaInsuranceApplyShopWindow ref="operaInsuranceApplyShopWindow" @success="handleCurrentChange0()"/>
<dispatchUnitDetailsPlat ref="dispatchUnitDetailsPlat" @success="handleCurrentChange0()"/>
<OperaSettleClaimsWindow ref="operaSettleClaimsWindow" @success="handleCurrentChange2()"/>
<OperaApplyChangeUnitDetailWindow ref="operaApplyChangeUnitDetailWindow" @success="handleCurrentChange0()"/>
@@ -138,6 +139,7 @@
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'
@@ -151,7 +153,8 @@
OperaTaxesWindow,
OperaSettleClaimsWindow,
OperaApplyChangeDetailWindow,
- OperaApplyChangeUnitDetailWindow
+ OperaApplyChangeUnitDetailWindow,
+ OperaInsuranceApplyShopWindow
},
name: 'Index',
data () {
@@ -241,7 +244,11 @@
methods: {
detail (obj) {
if (obj.objType === 0) {
- this.$refs.operaInsuranceApplyWindow.open('鎶曚繚鐢宠璇︽儏', { id: obj.objId })
+ if(obj.solutionType == 1){
+ this.$refs.operaInsuranceApplyWindow.open('鎶曚繚鐢宠璇︽儏', { id: obj.objId })
+ }else{
+ this.$refs.operaInsuranceApplyWindow.open('鎶曚繚鐢宠璇︽儏', { id: obj.objId })
+ }
} else if (obj.objType === 1) {
this.$refs.operaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', { id: obj.objId, applyId: obj.param1 })
} else if (obj.objType === 2) {
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index f6929c8..eff0fee 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -707,7 +707,7 @@
}
public enum ApplyCollectStatus {
- DSP(0, "寰呭鎵�"),
+ DSP(0, "寰呭鏍�"),
DCD(1, "寰呭嚭鍗�"),
BZZ(2, "淇濋殰涓�"),
YGQ(3, "宸茶繃鏈�"),
@@ -1235,9 +1235,9 @@
public enum NoticeType {
- ZERO(0, "寰呭鎵�","","","寰呭鏍�","寰呭鐞�","澶勭悊涓�"),
+ ZERO(0, "寰呭鏍�","","","寰呭鏍�","寰呭鐞�","澶勭悊涓�"),
ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","宸茬粨妗�"),
- TWO(2, "寰呭嚭鍗�","寰呭鎵�","寰呭鎵�","","",""),
+ TWO(2, "寰呭嚭鍗�","寰呭鏍�","寰呭鏍�","","",""),
THREE(3, "鐢宠閫�鍥�","鐢宠閫�鍥�","鐢宠閫�鍥�","","",""),
FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","","宸叉挙閿�"),
FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","",""),
--
Gitblit v1.9.3