From 14cbe4f1e07a9b542176edff4f682fcbc6d5c220 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 04 二月 2024 17:46:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/views/business/dispatchUnit.vue | 4 +-
company/src/components/business/dispatchReview.vue | 6 +-
company/src/components/business/OperaApplyChangeDetailWindow.vue | 14 +++----
company/src/components/business/OperaInsuranceApplyWindow.vue | 2
company/src/assets/style/style.scss | 8 ++--
company/src/views/business/dispatchUnitReview.vue | 4 +-
company/src/components/business/dispatchUnitDetailsPlat.vue | 10 ++--
company/src/components/business/OperaApplyChangeUnitDetailWindow.vue | 20 +++++-----
company/src/components/business/OperaSettleClaimsWindow.vue | 10 ++++-
9 files changed, 41 insertions(+), 37 deletions(-)
diff --git a/company/src/assets/style/style.scss b/company/src/assets/style/style.scss
index 2ea5ee6..5a90314 100644
--- a/company/src/assets/style/style.scss
+++ b/company/src/assets/style/style.scss
@@ -82,15 +82,15 @@
.settle-status0,.settle-status2,.settle-status3,
.tax-status0,
.du-status0 {
- color: #216EEE;
+ color: #216EEE !important;
}
.apply-status1 , .apply-status4, .apply-status6, .apply-status7, .apply-status8,
.change-status3,.change-status4,.change-status5,.change-status8,
.settle-status1,
.tax-status2,
.du-status2 {
- color: #F95601;
+ color: #F95601 !important;
}
- .apply-status5,.change-status7,.settle-status7,.tax-status1,.du-status1 {
- color: #00BA92;
+ .apply-status5,.change-status7,.settle-status7,.tax-status1,.du-status1,.settle-status4 {
+ color: #00BA92 !important;
}
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index b2eb734..aebc85a 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -11,14 +11,12 @@
<div class="desc_item_label">
<div class="desc_item_label_left">
<span>鎶曚繚浼佷笟锛歿{ apply.companyName }}</span>
- <span v-if="model.status === 0">淇濆崟鐘舵�侊細寰呯缃�</span>
- <span v-if="model.status === 1">淇濆崟鐘舵�侊細寰呭鏍�</span>
- <span v-if="model.status === 2">淇濆崟鐘舵�侊細宸蹭笂浼犳壒鍗�</span>
- <span v-if="model.status === 1">淇濆崟鐘舵�侊細宸茬绔�</span>
- <span v-if="model.status === 2">淇濆崟鐘舵�侊細宸茬敓鏁�</span>
- <span v-if="model.status === 3 || model.status === 4">淇濆崟鐘舵�侊細閫�鍥炵敵璇�</span>
- <span v-if="model.status === 5 || model.status === 8">淇濆崟鐘舵�侊細宸查��鍥�</span>
- <span v-if="model.status === 7 || model.status === 6">淇濆崟鐘舵�侊細宸插叧闂�</span>
+ <span v-if="model.status === 0">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >寰呯缃�</span></span>
+ <span v-if="model.status === 1">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >寰呭鏍�</span></span>
+ <span v-if="model.status === 2">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >宸茬敓鏁�</span></span>
+ <span v-if="model.status === 3 || model.status === 4">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >閫�鍥炵敵璇�</span></span>
+ <span v-if="model.status === 5 || model.status === 8">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >宸查��鍥�</span></span>
+ <span v-if="model.status === 7 || model.status === 6">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >宸插叧闂�</span></span>
<span>鎻愪氦鏃堕棿锛歿{ model.createDate }}</span>
</div>
<div class="desc_item_label_right">
diff --git a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
index 22f4c6d..54e3d2e 100644
--- a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
@@ -9,16 +9,16 @@
<div class="desc">
<div class="desc_item">
<div class="desc_item_label">
- <div class="desc_item_label_left">
- <span>鎶曚繚浼佷笟锛歿{ apply.companyName }}</span>
- <span v-if="model.status === 0">淇濆崟鐘舵�侊細寰呯缃�</span>
- <span v-if="model.status === 1">淇濆崟鐘舵�侊細寰呭鏍�</span>
- <span v-if="model.status === 2">淇濆崟鐘舵�侊細宸茬敓鏁�</span>
- <span v-if="model.status === 3 || model.status === 4">淇濆崟鐘舵�侊細閫�鍥炵敵璇�</span>
- <span v-if="model.status ===5 || model.status === 8">淇濆崟鐘舵�侊細宸查��鍥�</span>
- <span v-if="model.status ===7">淇濆崟鐘舵�侊細宸插叧闂�</span>
- <span>鎻愪氦鏃堕棿锛歿{ model.createDate }}</span>
- </div>
+ <div class="desc_item_label_left">
+ <span>鎶曚繚浼佷笟锛歿{ apply.companyName }}</span>
+ <span v-if="model.status === 0">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >寰呯缃�</span></span>
+ <span v-if="model.status === 1">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >寰呭鏍�</span></span>
+ <span v-if="model.status === 2">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >宸茬敓鏁�</span></span>
+ <span v-if="model.status === 3 || model.status === 4">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >閫�鍥炵敵璇�</span></span>
+ <span v-if="model.status === 5 || model.status === 8">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >宸查��鍥�</span></span>
+ <span v-if="model.status === 7 || model.status === 6">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >宸插叧闂�</span></span>
+ <span>鎻愪氦鏃堕棿锛歿{ model.createDate }}</span>
+ </div>
<div class="desc_item_label_right">
<template v-if="userInfo.type === 1">
<el-button type="primary" @click="$refs.ApplyChangeDetails.open('鎹㈠巶鐢宠璇﹀崟',apply,model)">瀵煎嚭璇﹀崟</el-button>
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index fdbfc1c..2dae778 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -19,7 +19,7 @@
<div class="desc_item_label">
<div class="desc_item_label_left">
<span>鎶曚繚浼佷笟锛歿{ model.companyName }}</span>
- <span>淇濆崟鐘舵�侊細{{ model.statusInfo }}</span>
+ <span>淇濆崟鐘舵�侊細<span :class="'apply-status'+model.status" >{{ model.statusInfo }}</span></span>
<span>鎻愪氦鏃堕棿锛歿{ model.createDate }}</span>
</div>
<div class="desc_item_label_right">
diff --git a/company/src/components/business/OperaSettleClaimsWindow.vue b/company/src/components/business/OperaSettleClaimsWindow.vue
index 3d84e88..4186418 100644
--- a/company/src/components/business/OperaSettleClaimsWindow.vue
+++ b/company/src/components/business/OperaSettleClaimsWindow.vue
@@ -18,6 +18,12 @@
<span class="desc_label_left_code">
鎶ユ鍙凤細{{ model.reportNum || '-' }}
</span>
+ <span class="desc_label_left_code">
+ 鐘舵�侊細
+ <span :class="'settle-status'+model.status" v-if="model.status==0 || model.status==2|| model.status==3">澶勭悊涓� </span>
+ <span :class="'settle-status'+model.status" v-if="model.status==1">宸叉挙妗� </span>
+ <span :class="'settle-status'+model.status" v-if="model.status==4">宸茬粨妗� </span>
+ </span>
</div>
<div class="desc_label_right">
<template v-if="userInfo.type === 0">
@@ -50,7 +56,7 @@
</div>
</div>
<div class="desc_list_item">
- <div class="desc_list_item_label">
+ <div class="desc_list_item_label" >
浜嬫晠鍙戠敓鏃堕棿锛�
</div>
<div class="desc_list_item_val" :style="contrast24(model.createDate, model.baoxianStartTime) ? 'rgba(249, 86, 1, 0.996)' : 'black'">
@@ -444,7 +450,7 @@
list: [],
model: {},
activeName: 'first',
- reverse: false
+ reverse: false,
}
},
computed: {
diff --git a/company/src/components/business/dispatchReview.vue b/company/src/components/business/dispatchReview.vue
index 431b072..635f4a9 100644
--- a/company/src/components/business/dispatchReview.vue
+++ b/company/src/components/business/dispatchReview.vue
@@ -41,9 +41,9 @@
<el-table-column
label="鐘舵��">
<template slot-scope="{row}">
- <span :class="'du-status'+row.status" v-if="row.status === 0">寰呭鏍�</span>
- <span :class="'du-status'+row.status" v-if="row.status === 1">瀹℃牳閫氳繃</span>
- <span :class="'du-status'+row.status" v-if="row.status === 2">瀹℃牳涓嶉�氳繃</span>
+ <span :class="'du-status'+row.status" v-if="row.unitStatus === 0">寰呭鏍�</span>
+ <span :class="'du-status'+row.status" v-if="row.unitStatus === 1">瀹℃牳閫氳繃</span>
+ <span :class="'du-status'+row.status" v-if="row.unitStatus === 2">瀹℃牳涓嶉�氳繃</span>
</template>
</el-table-column>
</el-table>
diff --git a/company/src/components/business/dispatchUnitDetailsPlat.vue b/company/src/components/business/dispatchUnitDetailsPlat.vue
index a074359..ef21f89 100644
--- a/company/src/components/business/dispatchUnitDetailsPlat.vue
+++ b/company/src/components/business/dispatchUnitDetailsPlat.vue
@@ -23,13 +23,13 @@
</div>
<div class="info_list_item">
<div class="info_list_item_label">娲鹃仯鍗曚綅鐘舵�侊細</div>
- <div class="info_list_item_val" :class="'du-status'+row.status" v-if="form.unitStatus === 0">寰呭鏍�</div>
+ <div class="info_list_item_val" :class="'du-status'+form.unitStatus" v-if="form.unitStatus === 0">寰呭鏍�</div>
<div class="info_list_item_val" v-if="form.unitStatus === 1">
- <span :class="'du-status'+row.worktypeStatus" style="color:#2E68EC;" v-if="form.worktypeStatus ==null||form.worktypeStatus === 0">宸ョ寰呭</span>
- <span :class="'du-status'+row.worktypeStatus" v-if="form.worktypeStatus === 1">瀹℃牳閫氳繃</span>
- <span :class="'du-status'+row.worktypeStatus" v-if="form.worktypeStatus === 2">宸ョ瀹℃牳涓嶉�氳繃</span>
+ <span :class="'du-status'+form.worktypeStatus" style="color:#2E68EC;" v-if="form.worktypeStatus ==null||form.worktypeStatus === 0">宸ョ寰呭</span>
+ <span :class="'du-status'+form.worktypeStatus" v-if="form.worktypeStatus === 1">瀹℃牳閫氳繃</span>
+ <span :class="'du-status'+form.worktypeStatus" v-if="form.worktypeStatus === 2">宸ョ瀹℃牳涓嶉�氳繃</span>
</div>
- <div class="info_list_item_val" :class="'du-status'+row.status" v-if="form.unitStatus === 2">瀹℃牳涓嶉�氳繃</div>
+ <div class="info_list_item_val" :class="'du-status'+form.unitStatus" v-if="form.unitStatus === 2">瀹℃牳涓嶉�氳繃</div>
</div>
<div class="info_list_item">
<div class="info_list_item_label">娲鹃仯鍗曚綅璇﹁堪锛�</div>
diff --git a/company/src/views/business/dispatchUnit.vue b/company/src/views/business/dispatchUnit.vue
index 2466165..39b3bad 100644
--- a/company/src/views/business/dispatchUnit.vue
+++ b/company/src/views/business/dispatchUnit.vue
@@ -36,13 +36,13 @@
<el-table-column prop="name" label="娲鹃仯鍗曚綅" min-width="100px"></el-table-column>
<el-table-column label="娲鹃仯鍗曚綅鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <span :class="'du-status'+row.status" v-if="row.unitStatus === 0">寰呭鏍�</span>
+ <span :class="'du-status'+row.unitStatus" v-if="row.unitStatus === 0">寰呭鏍�</span>
<span v-if="row.unitStatus === 1">
<span :class="'du-status'+row.worktypeStatus" v-if="row.worktypeStatus ==null || row.worktypeStatus === 0">宸ョ寰呭</span>
<span :class="'du-status'+row.worktypeStatus" v-else-if="row.worktypeStatus === 1">瀹℃牳閫氳繃</span>
<span :class="'du-status'+row.worktypeStatus" v-else-if="row.worktypeStatus === 2">宸ョ瀹℃牳涓嶉�氳繃</span>
</span>
- <span :class="'du-status'+row.status" v-if="row.unitStatus === 2">瀹℃牳涓嶉�氳繃</span>
+ <span :class="'du-status'+row.unitStatus" v-if="row.unitStatus === 2">瀹℃牳涓嶉�氳繃</span>
</template>
</el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃ユ湡" min-width="100px"></el-table-column>
diff --git a/company/src/views/business/dispatchUnitReview.vue b/company/src/views/business/dispatchUnitReview.vue
index d88ba52..29f5cfb 100644
--- a/company/src/views/business/dispatchUnitReview.vue
+++ b/company/src/views/business/dispatchUnitReview.vue
@@ -36,13 +36,13 @@
<el-table-column prop="name" label="娲鹃仯鍗曚綅" min-width="100px"></el-table-column>
<el-table-column label="娲鹃仯鍗曚綅鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <span :class="'du-status'+row.status" v-if="row.unitStatus === 0">寰呭鏍�</span>
+ <span :class="'du-status'+row.unitStatus" v-if="row.unitStatus === 0">寰呭鏍�</span>
<span v-if="row.unitStatus === 1">
<span :class="'du-status'+row.worktypeStatus" v-if="row.worktypeStatus ==null || row.worktypeStatus === 0">宸ョ寰呭</span>
<span :class="'du-status'+row.worktypeStatus" v-else-if="row.worktypeStatus === 1">瀹℃牳閫氳繃</span>
<span :class="'du-status'+row.worktypeStatus" v-else-if="row.worktypeStatus === 2">宸ョ瀹℃牳涓嶉�氳繃</span>
</span>
- <span :class="'du-status'+row.status" v-if="row.unitStatus === 2">瀹℃牳涓嶉�氳繃</span>
+ <span :class="'du-status'+row.unitStatus" v-if="row.unitStatus === 2">瀹℃牳涓嶉�氳繃</span>
</template>
</el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃ユ湡" min-width="100px"></el-table-column>
--
Gitblit v1.9.3