fix

virgo.wzfrontend/console/src/components/common/noticeBoard/organization.vue

@@ -6,39 +6,43 @@
 					<div class="organization-information-list">
 						<div class="item">
 							<div class="key">企业名称</div>
-							<div class="value">智慧科技创新有限公司</div>
+							<div class="value">{{detail.name}}</div>
 						</div>
 						<div class="item">
 							<div class="key">信用代码</div>
-							<div class="value">91440300MA5F6XYH2N</div>
+							<div class="value">{{detail.creditCode}}</div>
 						</div>
 						<div class="item">
 							<div class="key">法人代表</div>
-							<div class="value">陈志远</div>
+							<div class="value">{{detail.legalPerson}}</div>
 						</div>
 						<div class="item">
-							<div class="key">主营业务</div>
-							<div class="value">人工智能技术服务</div>
+							<div class="key">联系人</div>
+							<div class="value">{{detail.contacts}}</div>
 						</div>
 						<div class="item">
-							<div class="key">联系人</div>
-							<div class="value">林总-17601274604</div>
+							<div class="key">联系方式</div>
+							<div class="value">{{detail.contactInformation}}</div>
 						</div>
 						<div class="item">
-							<div class="key">入驻时间</div>
-							<div class="value">2023-03-15</div>
+							<div class="key">企业编码</div>
+							<div class="value">{{detail.enterpriseCode}}</div>
 						</div>
 						<div class="item">
-							<div class="key">合同期限</div>
-							<div class="value">2023-03-15 至 2026-03-14</div>
+							<div class="key">企业规模</div>
+							<div class="value">{{detail.corporateScale}}</div>
 						</div>
 						<div class="item">
-							<div class="key">企业编码</div>
-							<div class="value">QY202502080001</div>
+							<div class="key">入驻时间</div>
+							<div class="value">{{detail.entryTime}}</div>
 						</div>
 						<div class="item">
-							<div class="key">房间号码</div>
-							<div class="value">1#-1F-1101、1#-1F-1102</div>
+							<div class="key">入驻房源</div>
+							<div class="value hui-ellipsis">
+								<span v-for="(item,index) in detail.roomMap" :key="index">
+									{{item}}、
+								</span>
+							</div>
 						</div>
 					</div>
 				</box>
@@ -52,30 +56,14 @@
 		<div class="top">
 			<div class="sign-box">
 				<box label="企业标签">
-					<div class="sign">
-						<div class="sign-item">
+					<div class="sign" v-if="detail.enterpriseLabel">
+						<div class="sign-item"
+							v-for="(item,index) in $field.findTypeNameByListArray('organizationTagList',detail.enterpriseLabel)"
+							:key="item.id">
 							<div class="sign-icon">
-								<i class="iconfont huifont-V"></i>
+								<i :class="item.icon" :style="'font-size'+item.size+'px'"></i>
 							</div>
-							<div class="sign-label">国家科技型中小企业</div>
-						</div>
-						<div class="sign-item">
-							<div class="sign-icon">
-								<i class="iconfont huifont-guojiagaoxinqiye" style="font-size: 18px;"></i>
-							</div>
-							<div class="sign-label">国家高新企业</div>
-						</div>
-						<div class="sign-item">
-							<div class="sign-icon">
-								<i class="iconfont huifont-zhuanjingtexinqiye"></i>
-							</div>
-							<div class="sign-label">专业特新企业</div>
-						</div>
-						<div class="sign-item">
-							<div class="sign-icon">
-								<i class="iconfont huifont-yuanshigongzuozhan" style="font-size: 16px;"></i>
-							</div>
-							<div class="sign-label">院士工作站</div>
+							<div class="sign-label">{{item.name}}</div>
 						</div>
 					</div>
 				</box>
@@ -86,48 +74,36 @@
 						<div class="money-item">
 							<div class="money-title">
 								<div class="youshe">房租</div>
-								<div class="money-label">合同期限内房租<span class="color-cyan">12</span>万元</div>
 							</div>
 							<div class="record-list">
-								<div class="record-item">
+								<div class="record-item" v-for="item in houseBill" :key="item.id">
 									<div class="value">
-										<div class="hui-ellipsis">2025年1月第一期租金<span class="color-cyan">1</span>万元</div>
-									</div>
-									<div class="state color-green">已支付</div>
-								</div>
-								<div class="record-item">
-									<div class="value">
-										<div class="hui-ellipsis">2025年2月第二期租金<span class="color-cyan">1</span>万元</div>
+										<div class="hui-ellipsis">
+											<span>{{'第' + item.phase + '期'}}</span>
+											<span class="color-cyan">{{item.amount}}</span>元
+										</div>
 									</div>
-									<div class="state color-orange">待支付</div>
-								</div>
-								<div class="record-item">
-									<div class="value">
-										<div class="hui-ellipsis">2025年3月第三期租金<span class="color-cyan">1</span>万元</div>
-									</div>
-									<div class="state color-orange">待支付</div>
+									<div class="state color-gray" v-if="!item.status">待付款</div>
+									<div class="state color-orange" v-if="item.status === 1">付款中</div>
+									<div class="state color-green" v-if="item.status === 2">已付款</div>
 								</div>
 							</div>
 						</div>
 						<div class="money-item" style="margin: 10px 0;">
 							<div class="money-title">
 								<div class="youshe">物业费</div>
-								<div class="money-label">合同期限内<span class="color-cyan">1.2</span>万元</div>
 							</div>
 							<div class="record-list">
-								<div class="record-item">
+								<div class="record-item" v-for="item in propertyBill" :key="item.id">
 									<div class="value">
-										<div class="hui-ellipsis">2025年1月第一期物业费<span class="color-cyan">1000</span>元
+										<div class="hui-ellipsis">
+											<span>{{item.name}}</span>
+											<span class="color-cyan">{{item.amount}}</span>元
 										</div>
 									</div>
-									<div class="state color-green">已支付</div>
-								</div>
-								<div class="record-item">
-									<div class="value">
-										<div class="hui-ellipsis">2025年2月第二期物业费<span class="color-cyan">1000</span>元
-										</div>
-									</div>
-									<div class="state color-orange">待支付</div>
+									<div class="state color-gray" v-if="!item.status">待付款</div>
+									<div class="state color-orange" v-if="item.status === 1">付款中</div>
+									<div class="state color-green" v-if="item.status === 2">已付款</div>
 								</div>
 							</div>
 						</div>
@@ -136,11 +112,16 @@
 								<div class="youshe">水电费</div>
 							</div>
 							<div class="record-list">
-								<div class="record-item">
+								<div class="record-item" v-for="item in hydropowerBill" :key="item.id">
 									<div class="value">
-										<div class="hui-ellipsis">2025年1月水电费<span class="color-cyan">564.7</span>元</div>
+										<div class="hui-ellipsis">
+											<span>{{item.name}}</span>
+											<span class="color-cyan">{{item.amount}}</span>元
+										</div>
 									</div>
-									<div class="state color-green">已支付</div>
+									<div class="state color-gray" v-if="!item.status">待付款</div>
+									<div class="state color-orange" v-if="item.status === 1">付款中</div>
+									<div class="state color-green" v-if="item.status === 2">已付款</div>
 								</div>
 							</div>
 						</div>
@@ -150,27 +131,14 @@
 		</div>
 		<div class="right">
 			<div class="right-chart">
-				<box label="当年产出">
+				<box label="年产出">
 					<div ref="chart1" class="echarts-box"></div>
 				</box>
 			</div>
 			<div class="right-bottom">
 				<box label="企业里程碑">
 					<div class="process-box">
-						<div class="process-item">
-							<div class="line"></div>
-							<div class="icon">
-								<div class="icon1">
-									<div class="icon2"></div>
-								</div>
-							</div>
-							<div class="article">
-								<div class="date youshe">2023.06.24</div>
-								<div class="article-title youshe">时间轴大标题</div>
-								<div class="article-content">我是内容我是内容我是内容</div>
-							</div>
-						</div>
-						<div class="process-item">
+						<div class="process-item" v-for="(item,index) in customList" :key="index">
 							<div class="line"></div>
 							<div class="icon">
 								<div class="icon1">
@@ -178,22 +146,9 @@
 								</div>
 							</div>
 							<div class="article">
-								<div class="date youshe">2023.06.24</div>
-								<div class="article-title youshe">时间轴大标题</div>
-								<div class="article-content">我是内容我是内容我是内容</div>
-							</div>
-						</div>
-						<div class="process-item">
-							<div class="line"></div>
-							<div class="icon">
-								<div class="icon1">
-									<div class="icon2"></div>
-								</div>
-							</div>
-							<div class="article">
-								<div class="date youshe">2023.06.24</div>
-								<div class="article-title youshe">时间轴大标题</div>
-								<div class="article-content">我是内容我是内容我是内容</div>
+								<div class="date youshe">{{item.keyName}}</div>
+								<div class="article-title youshe">{{item.value}}</div>
+								<div class="article-content">{{item.value1}}</div>
 							</div>
 						</div>
 					</div>
@@ -205,31 +160,82 @@
 
 <script>
 	import box from '@/components/common/noticeBoard/box'
-	import model from '@/components/work/common/model'
+	import {
+		getOrganizationDetailById
+	} from '@/httpApi/business'
+	import {
+		getPaymentListByPage
+	} from '@/httpApi/contract'
+	import {
+		getPaymentsListByPage
+	} from '@/httpApi/bill'
 	export default {
+		props: ['detailId'],
 		data() {
 			return {
-				optionData: [{
-					name: '专利产权',
-					value: 3
-				}, {
-					name: '商标产权',
-					value: 6
-				}, {
-					name: '著作权产权',
-					value: 5
-				}]
+				detail: {},
+				customList: [],
+				houseBill: [],
+				optionData: [],
+				propertyBill: [],
+				hydropowerBill: []
 			}
 		},
 		mounted() {
-			this.$nextTick(() => {
-				this.initChart();
-				this.chart(this.$refs.chart1, [1200, 1340, 1580, 1600, 1640, 1640, 1700], [1000, 1140, 1380, 1400,
-					1440, 1440, 1500
-				])
-			})
+			this.init();
 		},
 		methods: {
+			init() {
+				this.initDetail();
+				this.initBill();
+			},
+			initDetail() {
+				getOrganizationDetailById(this.detailId || 3).then(res => {
+					if (res.state) {
+						this.detail = res.data;
+						if (this.detail.intellectualPropertyRight) { //知识产权
+							this.optionData = JSON.parse(this.detail.intellectualPropertyRight).map(node => {
+								return {
+									name: node.keyName,
+									value: parseInt(node.value) || 0
+								}
+							});
+							this.initChart();
+						}
+						//企业标签
+						if (this.detail.enterpriseMilestones) this.customList = JSON.parse(this.detail
+							.enterpriseMilestones);
+						if (this.detail.produce) {
+							let produceList = JSON.parse(this.detail.produce).sort((a, b) => a.keyName - b
+								.keyName);
+							this.chart(this.$refs.chart1, produceList.map(node => node.keyName), produceList.map(
+								node => parseInt(node.value1) || 0), produceList.map(node => parseInt(node
+								.value) || 0))
+						}
+					}
+				})
+			},
+			initBill() {
+				let postData = {
+					currPage: 1,
+					pageSize: 100,
+					projectId: this.$store.getters.project.id,
+					organizationId: this.$store.getters.organization.id,
+					payMerchantId: this.detailId || 3
+				}
+				getPaymentListByPage(postData).then(res => {
+					if (res.state) {
+						this.houseBill = res.data.dataList;
+					}
+				})
+				getPaymentsListByPage(postData).then(res => {
+					if (res.state) {
+						this.propertyBill = res.data.dataList.filter(node => node.type === 1);
+						this.hydropowerBill = res.data.dataList.filter(node => node.type === 2);
+						console.log(this.propertyBill);
+					}
+				})
+			},
 			initChart() {
 				var chartDom = this.$refs.chart;
 				var myChart = echarts.init(chartDom);
@@ -260,7 +266,7 @@
 				option && myChart.setOption(option);
 
 			},
-			chart(elem, data, data1) {
+			chart(elem, x, data, data1) {
 				let chart = echarts.init(elem);
 				let option = {
 					legend: {
@@ -290,7 +296,7 @@
 					},
 					xAxis: {
 						type: 'category',
-						data: ['01', '02', '03', '04', '05', '06', '07'],
+						data: x,
 						axisLabel: {
 							margin: 10,
 							color: '#D0DEEE',
@@ -357,8 +363,7 @@
 			},
 		},
 		components: {
-			box,
-			model
+			box
 		}
 	}
 </script>
@@ -544,6 +549,10 @@
 				width: 100%;
 				border-left: 2px solid #6EA3FF;
 				margin-bottom: 4px;
+
+				.color-cyan {
+					margin-left: 10px;
+				}
 			}
 
 			.record-item .value {

virgo.wzfrontend/console/src/components/work/bim/modelDetail/organization.vue

@@ -2,7 +2,9 @@
 	<div class="user-list">
 		<div class="user-item">
 			<div class="user-key">企业名称</div>
-			<div class="user-value">{{detail.name}}</div>
+			<div class="user-value color-blue" style="cursor: pointer;" @click="$emit('clickName','1')">
+				{{detail.name}}
+			</div>
 		</div>
 		<div class="user-item">
 			<div class="user-key">入驻时间</div>

virgo.wzfrontend/console/src/components/work/bim/operationModel.vue

@@ -672,7 +672,6 @@
 				}
 			},
 			returnRGBA(color) {
-				console.log(color);
 				let [r, g, b, a] = color.match(/\d+(\.\d+)?/g).map(Number);
 				return {
 					r,

virgo.wzfrontend/console/src/components/work/bim/operationModels.vue

@@ -8,7 +8,8 @@
 				<i id="close" class="el-icon-circle-close" @click="drapShow = false"></i>
 			</div>
 			<div class="distribution-drap-content">
-				<organization v-if="type === 'organizationDetail'" :detail="detail"></organization>
+				<organization v-if="type === 'organizationDetail'" :detail="detail" @clickName="clickName">
+				</organization>
 				<house v-else-if="type === 'roomDetail'" :detail="detail"></house>
 			</div>
 			<div class="image-box" v-if="detail.imageBox">
@@ -20,9 +21,9 @@
 			</div>
 			<div style="padding: 5px;" v-else></div>
 		</div>
-		<el-dialog :close-on-click-modal="false" :title="type === '1' ? '企业看板':'设备看板'" :visible.sync="modelVisible"
-			width="1100px" :append-to-body="true">
-			<notice-board v-if="modelVisible" :type="type"></notice-board>
+		<el-dialog :close-on-click-modal="false" :title="noticeBoardType === '1' ? '企业看板':'设备看板'"
+			:visible.sync="modelVisible" width="1100px" :append-to-body="true">
+			<notice-board v-if="modelVisible" :type="noticeBoardType" :detailId="detail.id"></notice-board>
 		</el-dialog>
 	</div>
 </template>
@@ -46,7 +47,7 @@
 		data() {
 			return {
 				bimViewer: null,
-				type: '1',
+				noticeBoardType: '1',
 				modelVisible: false,
 				drapShow: false,
 				detail: {},
@@ -94,6 +95,10 @@
 			house
 		},
 		methods: {
+			clickName(noticeBoardType) {
+				this.modelVisible = true;
+				this.noticeBoardType = noticeBoardType;
+			},
 			init(type) {
 				if (type != '1') this.$loading();
 				let postData = {

virgo.wzfrontend/console/src/components/work/business/organization/customData.vue

@@ -2,30 +2,26 @@
 	<div class="custom-data">
 		<table border="1" cellspacing="0" cellpadding="0">
 			<tr class="th-title">
-				<th style="width: 300px;">{{keyLabel}}</th>
-				<th>{{valueLabel}}</th>
+				<th v-for="(item,index) in option" :key="item.id" :width="item.width">{{item.label}}</th>
 			</tr>
 			<tr v-for="(item,index) in listData" :key="index">
-				<td>
-					<el-date-picker v-if="keyType === 'date'" v-model="item.keyName" value-format="yyyy-MM-dd"
-						type="date" placeholder="请选择日期">
-					</el-date-picker>
-					<el-date-picker v-else-if="keyType === 'yearDate'" v-model="item.keyName" type="year"
-						value-format="yyyy" placeholder="选择年">
-					</el-date-picker>
-					<el-input :type="keyType" v-model="item.keyName" v-else></el-input>
-				</td>
-				<td>
+				<td v-for="(node,i) in option" :key="node.id">
 					<div class="td-input">
-						<el-input :type="valueType" v-model="item.value"></el-input>
-						<div class="td-icon" @click="deleteRow(index)">
+						<el-date-picker v-if="node.type === 'date'" v-model="item[node.value]" value-format="yyyy-MM-dd"
+							type="date" placeholder="请选择日期">
+						</el-date-picker>
+						<el-date-picker v-else-if="node.type === 'yearDate'" v-model="item[node.value]" type="year"
+							value-format="yyyy" placeholder="选择年">
+						</el-date-picker>
+						<el-input :type="node.type" v-model="item[node.value]" v-else></el-input>
+						<div class="td-icon" @click="deleteRow(index)" v-if="i === option.length-1">
 							<i class="iconfont huifont-guanbi"></i>
 						</div>
 					</div>
 				</td>
 			</tr>
 			<tr>
-				<td colspan="2">
+				<td :colspan="option.length">
 					<div class="insert-icon color-primary" @click="insertRow()">
 						<i class="iconfont huifont-xinzeng"></i>
 						新增
@@ -45,21 +41,11 @@
 					return []
 				}
 			},
-			keyLabel: {
-				type: String,
-				default: ''
-			},
-			keyType: {
-				type: String,
-				default: 'text'
-			},
-			valueLabel: {
-				type: String,
-				default: ''
-			},
-			valueType: {
-				type: String,
-				default: 'text'
+			option: {
+				type: Array,
+				default: () => {
+					return []
+				}
 			}
 		},
 		data() {
@@ -72,10 +58,11 @@
 		},
 		methods: {
 			insertRow() {
-				this.listData.push({
-					keyName: '',
-					value: ''
-				});
+				let obj = {};
+				for (let i = 0; i < this.option.length; i++) {
+					obj[this.option[i].value] = '';
+				}
+				this.listData.push(obj);
 			},
 			deleteRow(index) {
 				this.$confirm('确定要删除该项数据?', () => {

virgo.wzfrontend/console/src/components/work/business/organization/detail.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="hui-detail">
+	<div class="hui-detail organization-detail">
 		<div class="hui-detail-title">基础信息</div>
 		<div class="hui-detail-content">
 			<div class="hui-detail-item">
@@ -76,6 +76,19 @@
 				</div>
 			</div>
 		</div>
+		<div v-if="detail.enterpriseLabel">
+			<div class="hui-detail-title">企业标签</div>
+			<div class="hui-detail-content">
+				<div class="sign-item"
+					v-for="(item,index) in $field.findTypeNameByListArray('organizationTagList',detail.enterpriseLabel)"
+					:key="item.id">
+					<div class="sign-icon">
+						<i :class="item.icon" :style="'font-size'+item.size+'px'"></i>
+					</div>
+					<div class="sign-label">{{item.name}}</div>
+				</div>
+			</div>
+		</div>
 		<div v-if="detail.intellectualPropertyRight && detail.intellectualPropertyRight != '[]'">
 			<div class="hui-detail-title">知识产权</div>
 			<div class="hui-detail-content">
@@ -167,5 +180,38 @@
 	}
 </script>
 <style lang="scss">
+	.organization-detail {
+		.sign-item {
+			display: flex;
+			align-items: center;
+			height: 32px;
+			width: 50%;
+			margin: 5px 0;
+
+			.sign-label {
+				font-weight: 400;
+				font-size: 13px;
+				color: #FFFFFF;
+				margin-left: 6px;
+			}
 
+			.sign-icon {
+				width: 30px;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+
+			.iconfont {
+				font-size: 20px;
+				display: inline-block; //使元素成为行内块元素
+				line-height: 1; //设置宽度和高度
+				background: linear-gradient(0deg, #0080FF, #FFFFFF);
+				-webkit-background-clip: text; //指定背景只在文本内部显示
+				-webkit-text-fill-color: transparent; //使文本颜色透明
+			}
+		}
+
+
+	}
 </style>

virgo.wzfrontend/console/src/components/work/business/organization/edit.vue

@@ -72,22 +72,25 @@
 				</el-form-item>
 				<el-form-item label="企业标签" class="hui-textarea">
 					<el-checkbox-group v-model="checkList">
-						<el-checkbox :label="item.name" v-for="(item,index) in tagList" :key="index" :value="item.id">
+						<el-checkbox :label="item.id" v-for="(item,index) in $field.field.organizationTagList"
+							:key="index">
+							{{item.name}}
 						</el-checkbox>
 					</el-checkbox-group>
 				</el-form-item>
 				<el-form-item label="知识产权" class="hui-textarea">
-					<custom-data ref="ownershipData" :list="ownershipList" keyLabel="产权名称" valueLabel="产权数量"
-						valueType="number">
+					<custom-data ref="ownershipData" :list="ownershipList"
+						:option="[{id:1,label:'产权名称',type:'text',value:'keyName',width:'300px'},{id:2,label:'产权数量',type:'number',value:'value'}]">
 					</custom-data>
 				</el-form-item>
 				<el-form-item label="企业里程碑" class="hui-textarea">
-					<custom-data ref="customData" :list="customList" keyLabel="日期" keyType="date" valueLabel="里程内容">
+					<custom-data ref="customData" :list="customList"
+						:option="[{id:1,label:'日期',type:'date',value:'keyName',width:'300px'},{id:2,label:'里程碑标题',type:'text',value:'value'},{id:3,label:'里程碑内容',type:'text',value:'value1'}]">
 					</custom-data>
 				</el-form-item>
 				<el-form-item label="历年产出" class="hui-textarea">
-					<custom-data ref="produceData" :list="produceList" keyLabel="日期" keyType="yearDate"
-						valueLabel="产出金额(万元)" valueType="number">
+					<custom-data ref="produceData" :list="produceList"
+						:option="[{id:1,label:'年份',type:'yearDate',value:'keyName',width:'300px'},{id:2,label:'税收(万元)',type:'number',value:'value'},{id:3,label:'营收(万元)',type:'number',value:'value1'}]">
 					</custom-data>
 				</el-form-item>
 			</el-form>
@@ -130,27 +133,6 @@
 					fax: '',
 					email: ''
 				},
-				tagList: [{
-					id: 1,
-					name: '国家科技型中小企业',
-					icon: 'iconfont huifont-V',
-					size: '20'
-				}, {
-					id: 2,
-					name: '国家高新企业',
-					icon: 'iconfont huifont-guojiagaoxinqiye',
-					size: '18'
-				}, {
-					id: 3,
-					name: '专业特新企业',
-					icon: 'iconfont huifont-zhuanjingtexinqiye',
-					size: '20'
-				}, {
-					id: 4,
-					name: '院士工作站',
-					icon: 'iconfont huifont-yuanshigongzuozhan',
-					size: '16'
-				}],
 				checkList: [],
 				ownershipList: [],
 				customList: [],

virgo.wzfrontend/console/src/components/work/common/noticeBoard.vue

@@ -1,14 +1,14 @@
 <template>
 	<div class="notice-board-box">
-		<organization v-if="type === '1'"></organization>
-		<device v-else></device>
+		<organization v-if="type === '1'" :detailId="detailId"></organization>
+		<device v-else :detailId="detailId"></device>
 	</div>
 </template>
 <script>
 	import organization from '@/components/common/noticeBoard/organization'
 	import device from '@/components/common/noticeBoard/device'
 	export default {
-		props: ['type'],
+		props: ['type', 'detailId'],
 		data() {
 			return {
 

virgo.wzfrontend/console/src/config/field.js

@@ -329,6 +329,28 @@ const remindType = [{
 	name: '看房提醒'
 }];
 
+const organizationTagList = [{
+	id: 1,
+	name: '国家科技型中小企业',
+	icon: 'iconfont huifont-V',
+	size: '20'
+}, {
+	id: 2,
+	name: '国家高新企业',
+	icon: 'iconfont huifont-guojiagaoxinqiye',
+	size: '18'
+}, {
+	id: 3,
+	name: '专业特新企业',
+	icon: 'iconfont huifont-zhuanjingtexinqiye',
+	size: '20'
+}, {
+	id: 4,
+	name: '院士工作站',
+	icon: 'iconfont huifont-yuanshigongzuozhan',
+	size: '16'
+}]
+
 const findItem = (type, id) => {
 	return eval(type).find(node => node.id == id) || {
 		id: 0,
@@ -363,15 +385,22 @@ export default {
 		supportingFacilities,
 		modelType,
 		sealType,
-		contractType,
-		remindType
+		contractType,
+		remindType,
+		organizationTagList
 	},
 	findTypeName(type, id) {
 		return findItem(type, id).name;
 	},
 	findTypeNameByList(type, ids) {
+		console.log(ids);
 		return ids.split(',').map(id => {
 			return findItem(type, id)
 		});
+	},
+	findTypeNameByListArray(type, ids) {
+		return JSON.parse(ids).map(id => {
+			return findItem(type, id)
+		});
 	}
 }

virgo.wzfrontend/console/src/httpApi/bill.js

@@ -16,7 +16,7 @@ export function insertPayment(data) {
  * 
  * 
  */
-export function getPaymentListByPage(data) {
+export function getPaymentsListByPage(data) {
 	return request({
 		url: `/api/payment/ordinary/${data.currPage}/${data.pageSize}`,
 		method: 'post',

virgo.wzfrontend/console/src/views/work/bill/routine/payment.vue

@@ -96,7 +96,7 @@
 	import edit from '@/components/work/bill/routine/edit'
 	import listFilter from '@/components/common/listFilter'
 	import {
-		getPaymentListByPage,
+		getPaymentsListByPage,
 		deletePaymentById,
 		updatePayment
 	} from '@/httpApi/bill'
@@ -135,7 +135,7 @@
 					type: this.nowTitle.id
 				}
 				postData = Object.assign(postData, this.filterOption);
-				getPaymentListByPage(postData).then(res => {
+				getPaymentsListByPage(postData).then(res => {
 					if (res.state) {
 						this.tableData = res.data.dataList;
 						this.totalCount = res.data.totalCount;