From 6d6fadc1ead24fde59386f96d384795c803e4a89 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 23 二月 2024 16:41:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/master'
---
company/src/views/business/switchCourt.vue | 8 +-
company/src/components/business/dispatchReview.vue | 7 +-
company/src/components/business/OperaInsuranceApplyWindow.vue | 44 +++++++++++---
company/src/views/business/applyChange.vue | 8 +-
company/src/components/enterprise/commissionDetails.vue | 21 ++++---
company/src/components/enterprise/entrustedInvoicingApplication.vue | 10 +-
company/src/components/common/UploadFile.vue | 9 +--
company/src/components/enterprise/directInsuranceDetails.vue | 61 ++++++++++---------
8 files changed, 98 insertions(+), 70 deletions(-)
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index 6f49c15..b5210c1 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -98,8 +98,8 @@
</div>
<div class="desc_item_cate">
<el-tabs v-model="activeName" @tab-click="handleClick">
- <el-tab-pane label="鍦ㄤ繚浜哄憳" name="0"></el-tab-pane>
- <el-tab-pane label="鍔�/鍑忎繚璁板綍" name="1"></el-tab-pane>
+ <el-tab-pane label="鍦ㄤ繚浜哄憳" name="0" ></el-tab-pane>
+ <el-tab-pane label="鍔�/鍑忎繚璁板綍" name="1"></el-tab-pane>
<el-tab-pane label="鎹㈠巶璁板綍" name="2"></el-tab-pane>
</el-tabs>
</div>
@@ -200,7 +200,8 @@
ref="table"
v-if="activeName === '0'"
style="width: 100%">
- <el-table-column label="搴忓彿">
+ <el-table-column label="搴忓彿"
+ align="center">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
@@ -208,9 +209,11 @@
<el-table-column
:key="Math.random()"
prop="memberName"
+ align="center"
label="鍛樺伐濮撳悕">
</el-table-column>
<el-table-column
+ align="center"
:key="Math.random()"
label="鎬у埆">
<template slot-scope="{row}">
@@ -221,30 +224,36 @@
<el-table-column
:key="Math.random()"
prop="idcardNo"
+ align="center"
label="韬唤璇佸彿">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="duName"
+ align="center"
label="娲鹃仯鍗曚綅">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="workTypeName"
+ align="center"
label="鎵�灞炲伐绉�">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="startTime"
+ align="center"
label="淇濋櫓鐢熸晥璧锋湡">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="endTime"
+ align="center"
label="淇濋櫓鐢熸晥姝㈡湡">
</el-table-column>
<el-table-column
:key="Math.random()"
+ align="center"
prop="fee"
label="浜х敓璐圭敤锛堝厓锛�">
</el-table-column>
@@ -255,12 +264,14 @@
ref="table"
v-if="activeName === '1'"
style="width: 100%">
- <el-table-column label="搴忓彿">
+ <el-table-column label="搴忓彿"
+ align="center">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column label="淇濆崟鐘舵��" :key="Math.random()">
+ <el-table-column label="淇濆崟鐘舵��" :key="Math.random()"
+ align="center">
<template slot-scope="{row}">
<span :class="'change-status'+row.status" v-if="row.status === 0">寰呯缃�</span>
<span :class="'change-status'+row.status" v-if="row.status === 1">寰呭鏍�</span>
@@ -273,29 +284,35 @@
<el-table-column
:key="Math.random()"
prop="applyCode"
+ align="center"
label="鎵瑰崟鍙�">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="addNum"
+ align="center"
label="澧炲姞浜烘暟锛堜汉锛�">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="delNum"
+ align="center"
label="鍑忓皯浜烘暟锛堜汉锛�">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="createDate"
+ align="center"
label="鎻愪氦鏃堕棿">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="applyStartTime"
+ align="center"
label="鎵瑰崟鐢熸晥璧锋湡">
</el-table-column>
<el-table-column
+ align="center"
:key="Math.random()"
label="鎿嶄綔">
<template slot-scope="{row}">
@@ -309,12 +326,14 @@
ref="table"
v-if="activeName === '2'"
style="width: 100%">
- <el-table-column label="搴忓彿">
+ <el-table-column label="搴忓彿"
+ align="center">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column label="淇濆崟鐘舵��" :key="Math.random()">
+ <el-table-column
+ align="center" label="淇濆崟鐘舵��" :key="Math.random()">
<template slot-scope="{row}">
<span :class="'change-status'+row.status" v-if="row.status === 0">寰呯缃�</span>
<span :class="'change-status'+row.status" v-if="row.status === 1">寰呭鏍�</span>
@@ -326,26 +345,31 @@
</el-table-column>
<el-table-column
:key="Math.random()"
+ align="center"
prop="applyCode"
label="鎵瑰崟鍙�">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="changeNum"
+ align="center"
label="鎹㈠巶浜烘暟">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="createDate"
+ align="center"
label="鎻愪氦鏃堕棿">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="applyStartTime"
+ align="center"
label="鎵瑰崟鐢熸晥璧锋湡">
</el-table-column>
<el-table-column
:key="Math.random()"
+ align="center"
label="鎿嶄綔">
<template slot-scope="{row}">
<el-button type="text" @click="$refs.OperaApplyChangeUnitDetailWindow.open('鎹㈠巶璇︽儏', row)">鏌ョ湅璇︽儏</el-button>
@@ -748,8 +772,10 @@
}
}
</script>
-<style>
-
+<style scoped>
+ ::v-deep .el-tabs__item{
+ font-weight: 600;
+ }
</style>
<style lang="scss" scoped>
.form {
diff --git a/company/src/components/business/dispatchReview.vue b/company/src/components/business/dispatchReview.vue
index 447fac7..3c3e5f8 100644
--- a/company/src/components/business/dispatchReview.vue
+++ b/company/src/components/business/dispatchReview.vue
@@ -14,7 +14,6 @@
</div>
</div>
</div>
-
<div class="box" v-for="(item, index) in duSolutionList" :key="index">
<div class="box_label">淇濋櫓鏂规锛歿{item.solutionName}}</div>
<el-table
@@ -104,10 +103,10 @@
flag = 1;
tempworktyps.push(item1);
}
- if(flag ==1){
- this.duSolutionList.push({duWorktypeList:tempworktyps,solutionName:item.solutionName})
- }
})
+ if(flag ==1){
+ this.duSolutionList.push({duWorktypeList:tempworktyps,solutionName:item.solutionName})
+ }
})
console.log(this.form)
diff --git a/company/src/components/common/UploadFile.vue b/company/src/components/common/UploadFile.vue
index 0ceb06f..45049cb 100644
--- a/company/src/components/common/UploadFile.vue
+++ b/company/src/components/common/UploadFile.vue
@@ -110,17 +110,14 @@
height: 90px !important;
}
::v-deep .el-upload-list__item {
- width: 90px !important;
- height: 90px !important;
+ width: 80% !important;
+ height: 50px !important;
}
.icon {
-webkit-transform: translate(-50%,-50%);
-ms-transform: translate(-50%,-50%);
transform: translate(0%, -85%);
}
-::v-deep .el-upload-list__item {
- width: 90px !important;
- height: 90px !important;
-}
+
</style>
diff --git a/company/src/components/enterprise/commissionDetails.vue b/company/src/components/enterprise/commissionDetails.vue
index 551eec0..8a783f7 100644
--- a/company/src/components/enterprise/commissionDetails.vue
+++ b/company/src/components/enterprise/commissionDetails.vue
@@ -10,29 +10,29 @@
<div class="info_list">
<div class="info_list_item">
<div class="info_list_item_label">寮�绁ㄥ悕绉帮細</div>
- <div class="info_list_item_val">{{userInfo.company.name}}</div>
+ <div class="info_list_item_val">{{model.companyName}}</div>
</div>
<div class="info_list_item">
<div class="info_list_item_label">绾崇◣浜鸿瘑鍒彿锛�</div>
- <div class="info_list_item_val">{{userInfo.company.code}}</div>
+ <div class="info_list_item_val">{{model.taxCode}}</div>
</div>
<div class="info_list_item">
<div class="info_list_item_label">寮�鎴疯锛�</div>
- <div class="info_list_item_val">{{userInfo.company.taxBank}}</div>
+ <div class="info_list_item_val">{{model.taxBank}}</div>
</div>
<div class="info_list_item">
<div class="info_list_item_label">璐﹀彿锛�</div>
<div class="info_list_item_val">
- {{userInfo.company.taxAccount}}
+ {{model.taxAccount}}
</div>
</div>
<div class="info_list_item" style="width: 100%;">
<div class="info_list_item_label">鍦板潃銆佺數璇濓細</div>
- <div class="info_list_item_val">{{userInfo.company.invoiceAddr}} {{userInfo.company.phone}}</div>
+ <div class="info_list_item_val">{{model.taxAddr}}</div>
</div>
<div class="info_list_item" style="width: 100%;">
<div class="info_list_item_label">寮�绁ㄩ噾棰濓細</div>
- <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{totalPrice}}</div>
+ <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{model.price}}</div>
</div>
<div class="list" style="width: 100%;" v-if="form.type === 0">
<div class="list_label">
@@ -40,7 +40,7 @@
</div>
<div class="list_val">
<div class="list_val_label">鎺ユ敹鍦板潃锛�</div>
- <div class="list_val_info">{{form.addr}}</div>
+ <div class="list_val_info">{{model.addr}}</div>
</div>
</div>
<div class="list" style="width: 100%;" v-else>
@@ -49,7 +49,7 @@
</div>
<div class="list_val">
<div class="list_val_label">鎺ユ敹鍦板潃锛�</div>
- <div class="list_val_info">{{form.addr}}</div>
+ <div class="list_val_info">{{model.addr}}</div>
</div>
</div>
</div>
@@ -111,7 +111,8 @@
id: null,
type: '',
addr: ''
- }
+ },
+ model:{}
}
},
created () {
@@ -129,6 +130,7 @@
this.visible = true
this.list1 = []
this.list2 = []
+ this.model ={}
this.$nextTick(() => {
for (const key in this.form) {
this.form[key] = target[key]
@@ -142,6 +144,7 @@
getData() {
getDetail(this.form.id)
.then(res => {
+ this.model =res
let price = 0
this.list1 = res.applyList
this.list2 = res.delTaxList
diff --git a/company/src/components/enterprise/directInsuranceDetails.vue b/company/src/components/enterprise/directInsuranceDetails.vue
index 8fe59ca..c4d92e5 100644
--- a/company/src/components/enterprise/directInsuranceDetails.vue
+++ b/company/src/components/enterprise/directInsuranceDetails.vue
@@ -8,39 +8,39 @@
>
<div class="info">
<div class="info_list">
- <div class="info_list_item">
- <div class="info_list_item_label">寮�绁ㄥ悕绉帮細</div>
- <div class="info_list_item_val">{{userInfo.company.name}}</div>
+ <div class="info_list_item">
+ <div class="info_list_item_label">寮�绁ㄥ悕绉帮細</div>
+ <div class="info_list_item_val">{{model.companyName}}</div>
+ </div>
+ <div class="info_list_item">
+ <div class="info_list_item_label">绾崇◣浜鸿瘑鍒彿锛�</div>
+ <div class="info_list_item_val">{{model.taxCode}}</div>
+ </div>
+ <div class="info_list_item">
+ <div class="info_list_item_label">寮�鎴疯锛�</div>
+ <div class="info_list_item_val">{{model.taxBank}}</div>
+ </div>
+ <div class="info_list_item">
+ <div class="info_list_item_label">璐﹀彿锛�</div>
+ <div class="info_list_item_val">
+ {{model.taxAccount}}
</div>
- <div class="info_list_item">
- <div class="info_list_item_label">绾崇◣浜鸿瘑鍒彿锛�</div>
- <div class="info_list_item_val">{{userInfo.company.code}}</div>
- </div>
- <div class="info_list_item">
- <div class="info_list_item_label">寮�鎴疯锛�</div>
- <div class="info_list_item_val">{{userInfo.company.taxBank}}</div>
- </div>
- <div class="info_list_item">
- <div class="info_list_item_label">璐﹀彿锛�</div>
- <div class="info_list_item_val">
- {{userInfo.company.taxAccount}}
- </div>
- </div>
- <div class="info_list_item" style="width: 100%;">
- <div class="info_list_item_label">鍦板潃銆佺數璇濓細</div>
- <div class="info_list_item_val">{{userInfo.company.invoiceAddr}} {{userInfo.company.phone}}</div>
- </div>
- <div class="info_list_item" style="width: 100%;">
- <div class="info_list_item_label">寮�绁ㄩ噾棰濓細</div>
- <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{totalPrice}}</div>
- </div>
+ </div>
+ <div class="info_list_item" style="width: 100%;">
+ <div class="info_list_item_label">鍦板潃銆佺數璇濓細</div>
+ <div class="info_list_item_val">{{model.taxAddr}}</div>
+ </div>
+ <div class="info_list_item" style="width: 100%;">
+ <div class="info_list_item_label">寮�绁ㄩ噾棰濓細</div>
+ <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{model.price}}</div>
+ </div>
<div class="list" style="width: 100%;" v-if="form.type === 0">
<div class="list_label">
鎺ユ敹鏂瑰紡锛氱數瀛愬彂绁�
</div>
<div class="list_val">
<div class="list_val_label">鎺ユ敹鍦板潃锛�</div>
- <div class="list_val_info">{{form.addr}}</div>
+ <div class="list_val_info">{{model.addr}}</div>
</div>
</div>
<div class="list" style="width: 100%;" v-else>
@@ -49,7 +49,7 @@
</div>
<div class="list_val">
<div class="list_val_label">鎺ユ敹鍦板潃锛�</div>
- <div class="list_val_info">{{form.addr}}</div>
+ <div class="list_val_info">{{model.addr}}</div>
</div>
</div>
</div>
@@ -149,7 +149,8 @@
id: null,
type: '',
addr: ''
- }
+ },
+ model:{}
}
},
created () {
@@ -167,6 +168,7 @@
this.visible = true
this.list1 = []
this.list2 = []
+ this.model={}
this.$nextTick(() => {
for (const key in this.form) {
this.form[key] = target[key]
@@ -181,6 +183,7 @@
getDetail(this.form.id)
.then(res => {
let price = 0
+ this.model = res
this.list1 = res.applyList
this.list2 = res.delTaxList
if (this.list1 && this.list1.length > 0) {
@@ -236,7 +239,7 @@
::v-deep .el-table__footer-wrapper tbody td {
cursor: pointer;
text-align: center;
- &:nth-child(5) {
+ &:nth-child(5),&:nth-child(4) {
color:rgba(249, 86, 1, 0.996078431372549);
}
&:nth-child(4) {
diff --git a/company/src/components/enterprise/entrustedInvoicingApplication.vue b/company/src/components/enterprise/entrustedInvoicingApplication.vue
index 95a98d1..60dfdab 100644
--- a/company/src/components/enterprise/entrustedInvoicingApplication.vue
+++ b/company/src/components/enterprise/entrustedInvoicingApplication.vue
@@ -28,7 +28,7 @@
</div>
<div class="info_list_item" style="width: 100%;">
<div class="info_list_item_label">鍦板潃銆佺數璇濓細</div>
- <div class="info_list_item_val">{{userInfo.company.invoiceAddr}} {{userInfo.company.phone}}</div>
+ <div class="info_list_item_val">{{userInfo.company.taxAddr}}</div>
</div>
<div class="info_list_item" style="width: 100%;">
<div class="info_list_item_label">寮�绁ㄩ噾棰濓細</div>
@@ -38,14 +38,14 @@
<el-radio v-model="type" label="0">鐢靛瓙鍙戠エ</el-radio>
<div class="list_val">
<div class="list_val_label">鎺ユ敹鍦板潃锛�</div>
- <el-input v-model="val" :disabled="type === '1'" placeholder="111222333@qq.com"></el-input>
+ <el-input v-model="val" :disabled="type === '1'" placeholder="" ></el-input>
</div>
</div>
<div class="list" style="width: 100%;">
<el-radio v-model="type" label="1">绾歌川鍙戠エ</el-radio>
<div class="list_val">
<div class="list_val_label">鎺ユ敹鍦板潃锛�</div>
- <el-input v-model="val1" :disabled="type === '0'" placeholder="瀹夊窘鐪佸悎鑲ュ競缁忔祹鎶�鏈紑鍙戝尯鑾茶姳璺互涓溿�佺煶闂ㄨ矾浠ュ崡鑾茶姳璺�1锛� 0551-63450845"></el-input>
+ <el-input v-model="val1" :disabled="type === '0'" placeholder=""></el-input>
</div>
</div>
</div>
@@ -139,14 +139,14 @@
open (title, target) {
this.title = title
this.type = '0'
- this.val = ''
- this.val1 = ''
this.visible = true
this.$nextTick(() => {
for (const key in this.form) {
this.form[key] = target[key]
}
})
+ this.val = this.userInfo.company.invoiceEmail
+ this.val1 = this.userInfo.company.invoiceAddr
},
confirm () {
if (!this.val && !this.val1) {
diff --git a/company/src/views/business/applyChange.vue b/company/src/views/business/applyChange.vue
index 6780e93..3c3421d 100644
--- a/company/src/views/business/applyChange.vue
+++ b/company/src/views/business/applyChange.vue
@@ -5,8 +5,8 @@
<el-form-item label="淇濆崟鐘舵��" prop="status">
<el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" @change="search">
<el-option label="鍏ㄩ儴" value=""></el-option>
- <el-option label="寰呯缃�" value="1"></el-option>
- <el-option label="寰呭鏍�" value="0"></el-option>
+ <el-option label="寰呯缃�" value="0"></el-option>
+ <el-option label="寰呭鏍�" value="1"></el-option>
<el-option label="宸茬敓鏁�" value="2"></el-option>
<el-option label="鐢宠閫�鍥�" value="3"></el-option>
<!-- 3 4 閮芥槸閫�鍥炵敵璇蜂腑-->
@@ -64,8 +64,8 @@
</el-table-column>
<el-table-column prop="status" label="淇濆崟鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <span :class="'change-status'+row.status" v-if="row.status === 1">寰呯缃�</span>
- <span :class="'change-status'+row.status" v-if="row.status === 0">寰呭鏍�</span>
+ <span :class="'change-status'+row.status" v-if="row.status === 0">寰呯缃�</span>
+ <span :class="'change-status'+row.status" v-if="row.status === 1">寰呭鏍�</span>
<span :class="'change-status'+row.status" v-if="row.status === 2">宸茬敓鏁�</span>
<span :class="'change-status'+row.status" v-if="row.status === 3 || row.status === 4">閫�鍥炵敵璇�</span>
<span :class="'change-status'+row.status" v-if="row.status ===5 || row.status === 8">宸查��鍥�</span>
diff --git a/company/src/views/business/switchCourt.vue b/company/src/views/business/switchCourt.vue
index de3094c..d8064f9 100644
--- a/company/src/views/business/switchCourt.vue
+++ b/company/src/views/business/switchCourt.vue
@@ -5,8 +5,8 @@
<el-form-item label="淇濆崟鐘舵��" prop="status">
<el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" @change="search">
<el-option label="鍏ㄩ儴" value=""></el-option>
- <el-option label="寰呯缃�" value="1"></el-option>
- <el-option label="寰呭鏍�" value="0"></el-option>
+ <el-option label="寰呯缃�" value="0"></el-option>
+ <el-option label="寰呭鏍�" value="1"></el-option>
<el-option label="宸茬敓鏁�" value="2"></el-option>
<el-option label="鐢宠閫�鍥�" value="3"></el-option>
<!-- 3 4 閮芥槸閫�鍥炵敵璇蜂腑-->
@@ -64,8 +64,8 @@
</el-table-column>
<el-table-column prop="status" label="淇濆崟鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <span :class="'change-status'+ row.status" v-if="row.status === 1">寰呯缃�</span>
- <span :class="'change-status'+ row.status" v-if="row.status === 0">寰呭鏍�</span>
+ <span :class="'change-status'+ row.status" v-if="row.status === 0">寰呯缃�</span>
+ <span :class="'change-status'+ row.status" v-if="row.status === 1">寰呭鏍�</span>
<span :class="'change-status'+ row.status" v-if="row.status === 2">宸茬敓鏁�</span>
<span :class="'change-status'+ row.status" v-if="row.status === 3 || row.status === 4">閫�鍥炵敵璇�</span>
<span :class="'change-status'+ row.status" v-if="row.status ===5 || row.status === 8">宸查��鍥�</span>
--
Gitblit v1.9.3