From f8b1073fbb28d37e08016eed32c682f8c5eae391 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 02 二月 2024 17:26:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/views/business/member.vue | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/company/src/views/business/member.vue b/company/src/views/business/member.vue
index 032ac7b..3aaa5b9 100644
--- a/company/src/views/business/member.vue
+++ b/company/src/views/business/member.vue
@@ -24,7 +24,20 @@
<el-option label="涓嶅湪淇�" value="2"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="娲鹃仯鍗曚綅" prop="duId">
+ <el-form-item v-if="userInfo.type === 0" label="鎵�灞炰紒涓�" prop="companyId">
+ <el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨" @change="search">
+ <el-option
+ v-for="(item, index) in companyList"
+ :key="index"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="娲鹃仯鍗曚綅" prop="duName">
+ <el-input v-model="searchForm.duName" placeholder="璇疯緭鍏�" maxlength="18" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+<!-- <el-form-item label="娲鹃仯鍗曚綅" prop="duId">
<el-select v-model="searchForm.duId" placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="(item, index) in options"
@@ -33,7 +46,7 @@
:value="item.id">
</el-option>
</el-select>
- </el-form-item>
+ </el-form-item>-->
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -60,7 +73,7 @@
<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="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}">
@@ -111,6 +124,7 @@
import { findListByDTO } from '@/api/business/dispatchUnit'
import { memberExportExcel } from '@/api/business/member'
import { mapState } from 'vuex'
+ import {pageAll as companyAll} from "@/api/business/company";
export default {
name: 'Member',
extends: BaseTable,
@@ -126,7 +140,8 @@
solutionId: ''
},
options: [],
- solutions: []
+ solutions: [],
+ companyList: []
}
},
computed: {
@@ -153,14 +168,20 @@
})
},
getSolutions() {
- all()
+ all({})
.then(res => {
this.solutions = res
})
+ /* if(this.userInfo.type ==1){
findListByDTO({ dataType: 2 })
.then(res => {
- this.options = res
+ this.options = res
})
+ }*/
+
+ companyAll({}).then(res => {
+ this.companyList = res
+ })
},
calculateAge(idNumber) {
if (!idNumber) return
--
Gitblit v1.9.3