From e9c0af3fc026823ca54f206bbe8c2666ed5013cd Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 23 二月 2024 20:06:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- company/src/components/business/OperaInsuranceApplyWindow.vue | 48 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 37 insertions(+), 11 deletions(-) diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue index 0920d80..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> @@ -371,7 +395,7 @@ <div style="display: flex; flex-direction: column;"> <span style="font-size: 16px; font-weight: 400; color: black;"> {{activity.title}} - <span style="font-size: 16px; font-weight: 400; color: black; margin-left: 10px;" v-if="[1, 2, 5, 6, 9].includes(activity.objType)"> + <span style="font-size: 16px; font-weight: 400; color: black; margin-left: 10px;" v-if="[1, 2, 5, 6, 9, 11, 22].includes(activity.objType)"> {{activity.content}} </span> </span> @@ -423,7 +447,7 @@ import { mapState } from 'vuex' export default { - name: 'OperaInsuranceApplyWindow', + name: 'OperaInsuranceApplyWindow1', extends: BaseOpera, components: { GlobalWindow, @@ -748,8 +772,10 @@ } } </script> -<style> - +<style scoped> + ::v-deep .el-tabs__item{ + font-weight: 600; + } </style> <style lang="scss" scoped> .form { -- Gitblit v1.9.3