From 8932133e2ee2e5708e3506bee3d01d59bff5f1d2 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期日, 12 一月 2025 11:30:52 +0800
Subject: [PATCH] bug
---
company/src/api/business/member.js | 5 +
company/src/components/business/OperaCompanyUserApplyWindow.vue | 9 +
company/src/components/enterprise/OperaDispatchUnitWindow.vue | 2
company/src/views/business/member.vue | 6 +
company/src/components/business/OperaSolutionsBaseWindow.vue | 139 ++++++++++++++++++++--------------
company/src/components/business/detailsEntrustedInsurance.vue | 2
company/.env.developmentCom | 2
company/.env.developmentShop | 4
company/src/components/business/EditMemberWindow.vue | 58 ++++++++++++++
company/.env.development | 2
10 files changed, 161 insertions(+), 68 deletions(-)
diff --git a/company/.env.development b/company/.env.development
index 26cfba6..cabe354 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -12,4 +12,4 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
# 浠诲悍
-VUE_APP_API = 'http://192.168.0.162:10030/'
+VUE_APP_API = 'http://192.168.0.137:10030/'
diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index c2c8c29..239a19b 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -9,6 +9,6 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
-VUE_APP_API = 'http://192.168.0.162:10031/'
+VUE_APP_API = 'http://192.168.0.137:10031/'
# VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
diff --git a/company/.env.developmentShop b/company/.env.developmentShop
index f3cbf46..f3c227f 100644
--- a/company/.env.developmentShop
+++ b/company/.env.developmentShop
@@ -6,9 +6,9 @@
VUE_APP_COOKIE_NAME='dmshop-auth-token'
VUE_APP_SYSTEM_TITLE = '浜戞槗淇濆鎴锋湇鍔＄郴缁�-鍟嗘埛绔�'
VUE_APP_CONTEXT_PATH = '/yyb_shop'
-VUE_APP_API = 'https://dmtest.ahapp.net/yyb_shop_api/'
+# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_shop_api/'
-# VUE_APP_API = 'http://192.168.0.162:10032/'
+VUE_APP_API = 'http://192.168.0.137:10032/'
#VUE_APP_API = 'http://localhost:10032/'
diff --git a/company/src/api/business/member.js b/company/src/api/business/member.js
index e61cad0..7b6a50c 100644
--- a/company/src/api/business/member.js
+++ b/company/src/api/business/member.js
@@ -12,6 +12,11 @@
return request.post('/business/member/create', data)
}
+// 淇敼
+export function updateById (data) {
+ return request.post('/business/member/updateById', data)
+}
+
// 鏁版嵁鍒楄〃
export function findListByDTO (data) {
return request.post('/business/member/findListByDTO', data)
diff --git a/company/src/components/business/EditMemberWindow.vue b/company/src/components/business/EditMemberWindow.vue
new file mode 100644
index 0000000..80674e2
--- /dev/null
+++ b/company/src/components/business/EditMemberWindow.vue
@@ -0,0 +1,58 @@
+<template>
+ <GlobalWindow
+ :title="title"
+ width="40%"
+ :visible.sync="visible"
+ :confirm-working="isWorking"
+ @confirm="confirm"
+ >
+ <el-form :model="form" ref="form" :rules="rules">
+ <el-form-item label="鍛樺伐鍚嶇О" prop="name">
+ <el-input v-model="form.name" placeholder="璇疯緭鍏ュ憳宸ュ悕绉�" v-trim/>
+ </el-form-item>
+ </el-form>
+ </GlobalWindow>
+</template>
+
+<script>
+ import BaseOpera from '@/components/base/BaseOpera'
+ import GlobalWindow from '@/components/common/GlobalWindow'
+ export default {
+ name: 'EditMemberWindow',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ // 琛ㄥ崟鏁版嵁
+ form: {
+ id: null,
+ name: ''
+ },
+ // 楠岃瘉瑙勫垯
+ rules: {
+ name: [
+ { required: true, message: '璇疯緭鍏ュ悎鍚屽悕绉�' }
+ ]
+ }
+ }
+ },
+ created () {
+ this.config({
+ api: '/business/member',
+ 'field.id': 'id'
+ })
+ },
+ methods: {
+ open (title, target) {
+ this.title = title
+ this.visible = true
+ // 缂栬緫
+ this.$nextTick(() => {
+ for (const key in this.form) {
+ this.form[key] = target[key]
+ }
+ })
+ }
+ }
+ }
+</script>
diff --git a/company/src/components/business/OperaCompanyUserApplyWindow.vue b/company/src/components/business/OperaCompanyUserApplyWindow.vue
index 17e1d39..0bbc0a4 100644
--- a/company/src/components/business/OperaCompanyUserApplyWindow.vue
+++ b/company/src/components/business/OperaCompanyUserApplyWindow.vue
@@ -22,9 +22,10 @@
v-model="form.companyIds"
multiple
filterable
+ :filter-method="customFilterMethod"
placeholder="璇烽�夋嫨">
<el-option
- v-for="item in company"
+ v-for="item in searchCompany"
:key="item.id"
:label="item.name"
:value="item.id">
@@ -80,7 +81,8 @@
},
account: [],
fileList: [],
- company: []
+ company: [],
+ searchCompany: []
}
},
created () {
@@ -90,6 +92,9 @@
})
},
methods: {
+ customFilterMethod(query) {
+ this.searchCompany = this.company.filter(item => item.name === query)
+ },
__confirmCreate () {
this.$refs.form.validate((valid) => {
if (!valid) {
diff --git a/company/src/components/business/OperaSolutionsBaseWindow.vue b/company/src/components/business/OperaSolutionsBaseWindow.vue
index bbb4437..b305086 100644
--- a/company/src/components/business/OperaSolutionsBaseWindow.vue
+++ b/company/src/components/business/OperaSolutionsBaseWindow.vue
@@ -87,46 +87,45 @@
placeholder="璇烽�夋嫨鎵规敼鎻愰啋鏃堕棿">
</el-time-picker>
</el-form-item>
- <div style="display: flex; align-items: center;">
- <el-button type="primary" @click="add" style="margin-bottom: 10px;">娣诲姞宸ョ</el-button>
- <el-button type="primary" @click="impor" style="margin-bottom: 10px;">瀵煎叆宸ョ</el-button>
- <el-button type="text" @click="exprot">瀵煎叆妯＄増xls</el-button>
+ <div style="width: 100%; padding: 10px; box-sizing: border-box; border: 1px solid #ececec;">
+ <div style="display: flex; align-items: center; margin-bottom: 10px;">
+ <el-select filterable multiple style="width: 800px;" v-model="worktypeId" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in typeWorkCopy"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ <el-button type="primary" @click="add" :disabled="worktypeId.length === 0" style="margin-left: 10px;">娣诲姞宸ョ</el-button>
+ <el-button type="primary" @click="impor">瀵煎叆宸ョ</el-button>
+ <el-button type="text" @click="exprot">瀵煎叆妯＄増xls</el-button>
+ </div>
+ <u-table
+ :data="form.worktypeIdList"
+ border
+ use-virtual
+ style="width: 100%; margin-bottom: 20px;">
+ <u-table-column
+ label="搴忓彿"
+ width="80">
+ <template slot-scope="scope">
+ <span>{{scope.$index + 1}}</span>
+ </template>
+ </u-table-column>
+ <u-table-column
+ prop="worktypeName"
+ label="鎵�灞炲伐绉�">
+ </u-table-column>
+ <u-table-column
+ label="鎿嶄綔"
+ width="100">
+ <template slot-scope="scope">
+ <el-button type="text" size="small" style="color: red;" @click="dele(scope.$index)">鍒犻櫎</el-button>
+ </template>
+ </u-table-column>
+ </u-table>
</div>
- <el-table
- :data="form.worktypeIdList"
- border
- style="width: 100%; margin-bottom: 20px;">
- <el-table-column
- label="搴忓彿"
- align="center"
- width="80">
- <template slot-scope="scope">
- <span>{{scope.$index + 1}}</span>
- </template>
- </el-table-column>
- <el-table-column
- align="center"
- label="鎵�灞炲伐绉�">
- <template slot-scope="{row}">
- <el-select filterable v-model="row.worktypeId" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in typeWork"
- :key="item.id"
- :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
- </template>
- </el-table-column>
- <el-table-column
- label="鎿嶄綔"
- align="center"
- width="100">
- <template slot-scope="scope">
- <el-button type="text" size="small" style="color: red;" @click="dele(scope.$index)">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
<el-form-item label="鐗瑰埆绾﹀畾" prop="specialAgreement">
<RichEditor :richData="form.specialAgreement" :styleEditor="'border: 1px solid #ccc;display: inline-block;'" @getWangedditor="getWangedditor" :readonly="false"/>
</el-form-item>
@@ -152,10 +151,11 @@
import UploadFile from '@/components/common/UploadFile'
import { numRule } from '@/utils/form'
import RichEditor from '@/components/common/RichEditor'
+ import { UTable, UTableColumn } from 'umy-ui'
export default {
name: 'OperaSolutionsBaseWindow',
extends: BaseOpera,
- components: { GlobalWindow, UploadFile, RichEditor },
+ components: { GlobalWindow, UploadFile, RichEditor, UTable, UTableColumn },
data () {
var validType = (rule, value, callback) => {
if (this.form.validType === 0 && !value) {
@@ -192,8 +192,9 @@
delOnlyReplace: 0,
canAdd: 0,
correctWarnTime: '',
- worktypeIdList: [{ worktypeId: '' }]
+ worktypeIdList: []
},
+ worktypeId: [],
// 楠岃瘉瑙勫垯
rules: {
name: [
@@ -229,7 +230,8 @@
},
shops: [],
company: [],
- typeWork: []
+ typeWork: [],
+ typeWorkCopy: []
}
},
created () {
@@ -246,14 +248,13 @@
formdate.append('insuranceId', this.form.insuranceId)
importExcelForSolution(formdate)
.then(res => {
- console.log(res)
- res.forEach(id => {
- if (this.form.worktypeIdList.length === 1 && !this.form.worktypeIdList[0].worktypeId) {
- this.form.worktypeIdList[0].worktypeId = id
- } else {
- this.form.worktypeIdList.push({ worktypeId: id })
- }
+ let arr = []
+ res.forEach(item => {
+ arr.push({ worktypeId: item.id, worktypeName: item.name })
})
+ this.form.worktypeIdList = [...arr, ...this.form.worktypeIdList]
+ let valData = this.form.worktypeIdList.map(item => item.worktypeName)
+ this.typeWorkCopy = this.typeWorkCopy.filter(item => !valData.includes(item.name))
})
.catch(err => {
this.$message.error(err.message)
@@ -263,7 +264,7 @@
})
},
impor() {
- if (!this.form.insuranceId) return this.$message.warning('璇峰厛閫夋嫨浼佷笟')
+ if (!this.form.insuranceId) return this.$message.warning('璇峰厛閫夋嫨淇濋櫓鍏徃')
this.$refs.upload.click()
},
// 瀵煎嚭妯℃澘
@@ -302,7 +303,7 @@
},
// 鍒囨崲鍏徃
getAllWorktype1 () {
- this.form.worktypeIdList = [{ worktypeId: '' }]
+ this.form.worktypeIdList = []
this.getAllWorktype()
},
changeValidType(e) {
@@ -362,7 +363,9 @@
this.form.delOnlyReplace = 0
this.form.delValidDays = 0
this.form.canAdd = 0
- this.form.worktypeIdList = [{ worktypeId: '' }]
+ this.form.worktypeIdList = []
+ this.typeWork = []
+ this.typeWorkCopy = []
// this.$refs['$upload'].clearFiles()//鍒濆鍖栧鍏ョ粍浠�
this.allCompany()
this.allShops()
@@ -373,7 +376,7 @@
this.form.maxAge = ''
this.form.validTypeNum = ''
this.form.fanganFile = null
- this.form.worktypeIdList = [{ worktypeId: '' }]
+ this.form.worktypeIdList = []
this.form[this.configData['field.id']] = null
})
return
@@ -389,7 +392,8 @@
if (res.worktypeList) {
this.form.worktypeIdList = res.worktypeList.map(item => {
return {
- worktypeId: item.worktypeId
+ worktypeId: item.worktypeId,
+ worktypeName: item.worktypeName
}
})
}
@@ -400,9 +404,16 @@
// 鏌ヨ淇濋櫓鍏徃涓嬪叏閮ㄥ伐绉�
getAllWorktype () {
allWorktype({
- insuranceId: this.form.insuranceId
+ insuranceId: this.form.insuranceId,
+ dataType: 2
}).then(res => {
- this.typeWork = res
+ this.typeWork = res
+ if (!this.form.id) {
+ this.typeWorkCopy = res
+ } else {
+ let valData = this.form.worktypeIdList.map(item => item.worktypeName)
+ this.typeWorkCopy = res.filter(item => !valData.includes(item.name))
+ }
})
},
@@ -410,25 +421,35 @@
allCompany () {
all({ dataType: 2, status: 0 })
.then(res => {
- console.log(res)
this.company = res
})
},
allShops () {
shopList({ type: 1, status: 0 })
.then(res => {
- console.log(res)
this.shops = res
})
},
add () {
- this.form.worktypeIdList.push({ worktypeId: '' })
+ let arr = this.typeWorkCopy.filter(item => this.worktypeId.includes(item.id))
+ let dataVal = arr.map(item => {
+ return {
+ worktypeId: item.id,
+ worktypeName: item.name
+ }
+ })
+ this.form.worktypeIdList = [ ...dataVal, ...this.form.worktypeIdList ]
+ let valData = this.form.worktypeIdList.map(item => item.worktypeName)
+ this.typeWorkCopy = this.typeWorkCopy.filter(item => !valData.includes(item.name))
+ this.worktypeId = []
},
dele (index) {
if (this.form.worktypeIdList.length === 1) {
this.$message.warning('鑷冲皯瑕佷繚鐣欎竴椤�')
return
}
+ let row = this.typeWork.filter(item => item.name === this.form.worktypeIdList[index].worktypeName)
+ this.typeWorkCopy.unshift(row[0])
this.form.worktypeIdList.splice(index, 1)
}
}
diff --git a/company/src/components/business/detailsEntrustedInsurance.vue b/company/src/components/business/detailsEntrustedInsurance.vue
index cae5e24..b93a0cc 100644
--- a/company/src/components/business/detailsEntrustedInsurance.vue
+++ b/company/src/components/business/detailsEntrustedInsurance.vue
@@ -202,7 +202,7 @@
<template slot-scope="{row}">
<span v-if="row.applyStatus === 0" style="color: #00BA92;">淇濋殰涓�</span>
<span v-if="row.applyStatus === 1" style="color: #999;">涓嶅湪淇�</span>
- <span v-if="row.applyStatus === 2" style="color: #00BA92;">寰呯敓鏁�</span>
+ <span v-if="row.applyStatus === 2" style="color: #f95601;">寰呯敓鏁�</span>
</template>
</el-table-column>
<el-table-column
diff --git a/company/src/components/enterprise/OperaDispatchUnitWindow.vue b/company/src/components/enterprise/OperaDispatchUnitWindow.vue
index 117960f..76ac8ef 100644
--- a/company/src/components/enterprise/OperaDispatchUnitWindow.vue
+++ b/company/src/components/enterprise/OperaDispatchUnitWindow.vue
@@ -51,7 +51,7 @@
prop="name"
label="鎵�灞炲伐绉�">
<template slot-scope="scope">
- <el-select v-model="scope.row.workTypeId" @change="changeGZ($event, index, scope.$index)" placeholder="璇烽�夋嫨">
+ <el-select v-model="scope.row.workTypeId" filterable @change="changeGZ($event, index, scope.$index)" placeholder="璇烽�夋嫨">
<el-option
v-for="item in item.typeWork"
:key="item.id"
diff --git a/company/src/views/business/member.vue b/company/src/views/business/member.vue
index c1a976f..a550abb 100644
--- a/company/src/views/business/member.vue
+++ b/company/src/views/business/member.vue
@@ -96,6 +96,7 @@
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 {
// 鎼滅储
--
Gitblit v1.9.3