From 78a173f85f8a4666d83cf8d900f04dd9f8e3e127 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 17 六月 2025 08:53:12 +0800
Subject: [PATCH] 提交一把订单
---
company/src/views/business/member.vue | 67 ++++++++++++++++-----------------
1 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/company/src/views/business/member.vue b/company/src/views/business/member.vue
index 3aaa5b9..a550abb 100644
--- a/company/src/views/business/member.vue
+++ b/company/src/views/business/member.vue
@@ -8,13 +8,13 @@
<el-form-item label="韬唤璇佸彿" prop="idcardNo">
<el-input v-model="searchForm.idcardNo" placeholder="璇疯緭鍏�" maxlength="18" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="淇濋櫓鏂规" prop="solutionId">
- <el-select v-model="searchForm.solutionId" placeholder="璇烽�夋嫨" @change="search">
+ <el-form-item label="淇濋櫓鏂规" prop="solutionsId">
+ <el-select v-model="searchForm.solutionsId" filterable placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="item in solutions"
- :key="item.id"
+ :key="item.baseId"
:label="item.name"
- :value="item.id">
+ :value="item.baseId">
</el-option>
</el-select>
</el-form-item>
@@ -25,7 +25,7 @@
</el-select>
</el-form-item>
<el-form-item v-if="userInfo.type === 0" label="鎵�灞炰紒涓�" prop="companyId">
- <el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨" @change="search">
+ <el-select v-model="searchForm.companyId" filterable placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="(item, index) in companyList"
:key="index"
@@ -62,40 +62,41 @@
:data="tableData.list"
stripe
>
- <el-table-column label="搴忓彿" width="80px">
+ <el-table-column align="center" label="搴忓彿" width="50px" fixed>
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column label="淇濋櫓鐘舵��" min-width="100px">
+ <el-table-column align="center" label="淇濋櫓鐘舵��" min-width="80px" fixed>
<template slot-scope="{row}">
<span style="color: green;" v-if="row.solutionsStatus === 1">淇濋殰涓�</span>
<span v-else-if="row.solutionsStatus === 2">涓嶅湪淇�</span>
</template>
</el-table-column>
- <el-table-column prop="companyName" label="鎵�灞炰紒涓�" min-width="100px" v-if="userInfo.type === 0"></el-table-column>
- <el-table-column prop="name" label="鍛樺伐濮撳悕" min-width="100px"></el-table-column>
- <el-table-column label="鎬у埆" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.sex === 0">鐢�</span>
- <span v-else>濂�</span>
+ <el-table-column align="center" prop="companyName" fixed label="鎵�灞炰紒涓�" min-width="150px" v-if="userInfo.type === 0"></el-table-column>
+ <el-table-column align="center" prop="name" label="鍛樺伐濮撳悕" fixed min-width="100px"></el-table-column>
+ <el-table-column align="center" prop="solutionName" label="淇濋櫓鏂规" fixed min-width="150px"></el-table-column>
+ <el-table-column align="center" prop="idcardNo" label="韬唤璇佸彿鐮�" fixed min-width="150px"></el-table-column>
+ <el-table-column align="center" label="鎬у埆" min-width="50px" fixed>
+ <template slot-scope="{row}">
+ <span v-if="row.sex === 0">鐢�</span>
+ <span v-if="row.sex === 1">濂�</span>
</template>
- </el-table-column>
- <el-table-column prop="idcardNo" label="韬唤璇佸彿鐮�" min-width="100px"></el-table-column>
- <el-table-column label="骞撮緞" min-width="100px">
+ </el-table-column>
+ <el-table-column align="center" label="骞撮緞" min-width="50px" fixed>
<template slot-scope="{row}">
{{ calculateAge(row.idcardNo) }}
</template>
</el-table-column>
- <el-table-column prop="solutionName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
- <el-table-column prop="duName" label="娲鹃仯鍗曚綅" min-width="100px"></el-table-column>
- <el-table-column prop="workTypeName" label="鎵�灞炲伐绉�" min-width="100px"></el-table-column>
- <el-table-column prop="startTime" label="瀹為檯淇濋櫓鐢熸晥璧锋湡" min-width="100px"></el-table-column>
- <el-table-column prop="endTime" label="瀹為檯淇濋櫓鐢熸晥姝㈡湡" min-width="100px"></el-table-column>
- <el-table-column label="鎿嶄綔"
+ <el-table-column align="center" prop="duName" label="娲鹃仯鍗曚綅" min-width="150px"></el-table-column>
+ <el-table-column align="center" prop="workTypeName" label="鎵�灞炲伐绉�" min-width="150px"></el-table-column>
+ <el-table-column align="center" prop="startTime" label="瀹為檯淇濋櫓鐢熸晥璧锋湡" min-width="150px"></el-table-column>
+ <el-table-column align="center" prop="endTime" label="瀹為檯淇濋櫓鐢熸晥姝㈡湡" min-width="150px"></el-table-column>
+ <el-table-column align="center" label="鎿嶄綔"
fixed="right"
min-width="120px">
<template slot-scope="{row}">
+ <el-button type="text" @click="$refs.editMemberWindow.open('缂栬緫', row)" v-if="userInfo.type === 0">缂栬緫</el-button>
<el-button type="text" @click="$refs.insuranceRecords.open('鎶曚繚璁板綍', row)">鎶曚繚璁板綍</el-button>
</template>
</el-table-column>
@@ -109,6 +110,8 @@
</template>
<!-- 鏂板缓/淇敼 -->
<OperaMemberWindow ref="operaMemberWindow" @success="handlePageChange" />
+ <!-- 缂栬緫 -->
+ <EditMemberWindow ref="editMemberWindow" @success="handlePageChange" />
<!-- 鎶曚繚璁板綍 -->
<insuranceRecords ref="insuranceRecords" @success="handlePageChange" />
</TableLayout>
@@ -119,6 +122,7 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaMemberWindow from '@/components/business/OperaMemberWindow'
+ import EditMemberWindow from '@/components/business/EditMemberWindow'
import insuranceRecords from '@/components/enterprise/insuranceRecords'
import { all } from '@/api/business/solutions'
import { findListByDTO } from '@/api/business/dispatchUnit'
@@ -128,7 +132,7 @@
export default {
name: 'Member',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaMemberWindow, insuranceRecords },
+ components: { TableLayout, Pagination, OperaMemberWindow, EditMemberWindow, insuranceRecords },
data () {
return {
// 鎼滅储
@@ -137,7 +141,7 @@
name: '',
idcardNo: '',
solutionsStatus: '',
- solutionId: ''
+ solutionsId: ''
},
options: [],
solutions: [],
@@ -160,7 +164,7 @@
methods: {
expr() {
memberExportExcel({
- capacity: 1000,
+ capacity: 60000,
page: 1,
model: this.searchForm
}).then(res => {
@@ -172,16 +176,11 @@
.then(res => {
this.solutions = res
})
- /* if(this.userInfo.type ==1){
- findListByDTO({ dataType: 2 })
- .then(res => {
- this.options = res
+ if (this.userInfo.type === 0) {
+ companyAll({}).then(res => {
+ this.companyList = res
})
- }*/
-
- companyAll({}).then(res => {
- this.companyList = res
- })
+ }
},
calculateAge(idNumber) {
if (!idNumber) return
--
Gitblit v1.9.3