From 3d828ba07224d1935f47cb0c20dcb959281361d6 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 07 十二月 2023 14:06:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/integration/integrationTransfer.vue | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue b/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue
index 892bd7a..e070be9 100644
--- a/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue
+++ b/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog :title="title" :visible.sync="dialogVisible" append-to-body="true" destroy-on-close width="30%"
+ <el-dialog :title="title" :visible.sync="dialogVisible" append-to-body="true" destroy-on-close width="35%"
@close="handelClose">
<el-form :model="form">
<el-form-item label="鏌ヨ鏉′欢" label-width="70px" size="small">
@@ -81,15 +81,18 @@
pinyin.setOptions({ checkPolyphone: false, charCase: 1 });
let name = this.props.label
let key = this.props.key
- let data = this.data.map(item => {
- let objitem = { disabled: false, ...item }
- if (this.disabledData.length !== 0) {
- this.disabledData.forEach(element => {
- if (objitem[name] === element) objitem.disabled = true
- });
- }
- return objitem
- })
+ if(this.data){
+ let data = this.data.map(item => {
+ let objitem = { disabled: false, ...item }
+ if (this.disabledData.length !== 0) {
+ this.disabledData.forEach(element => {
+ if (objitem[name] === element) objitem.disabled = true
+ });
+ }
+ return objitem
+ })
+ return
+ }
return data.map(item => {
let pinYin = pinyin.getFullChars(item[this.props.label])
let renPing = pinyin.getCamelChars(item[this.props.label])
@@ -138,4 +141,4 @@
padding: 10px 0;
color: #F56C6C;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3