From 4d74a6fe5a7127e0689603eff8c08cb81a6985d9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 05 十二月 2023 18:05:41 +0800
Subject: [PATCH] 标准申请回填值bug
---
Source/UBCS-WEB/src/views/modeling/cycle.vue | 2 ++
Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue | 10 +++++++---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 1 +
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 3 ++-
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 2 +-
5 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index d4e40cc..d583d02 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -336,7 +336,7 @@
(formItem.secType == "codeattrsec" ? this.add : null) || (this.status === "apply" && formItem.field === "codeStandardEditType" ? "1" : null) ||
(this.status === "amend" && formItem.field === "codeStandardEditType" ? "2" : null) ||
//鐖剁粍浠跺鏋滄槸鍙傜収鏁版嵁浼氬皢selectRow缃┖,selectRow涓嶄负绌哄氨璇存槑涓嶆槸鍙傜収瑕佸洖濉簮鏍囧噯鍙锋暟鎹�
- (this.status === "amend" && this.selectRow && (formItem.field === "oldcode" ? this.selectValue : null)),
+ (this.status === "amend" ? (this.selectRow && (formItem.field === "oldcode" ? this.selectValue : null)) : null),
placeholder: formItem.inputTip,
comboxKey: formItem.comboxKey,
tip: formItem.tooltips,
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index eb80c97..6d01849 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -43,6 +43,7 @@
:selfColumnType="selfColumnType"
:type="type"
:status="status"
+ :selectRow="selectRow"
data-key="codeApplyForm"
secDTOListv-bind="$attrs"
@attrList="attrListForm"
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 0ffc633..a2b1391 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -437,7 +437,8 @@
if (newval.find(item => item.prop === 'id')) {
this.CodeArray.push(newval.find(item => item.prop === 'id'));
} else {
- this.CodeArray.push([]);
+ // this.CodeArray.push([]);
+ this.CodeArray = [];
}
this.isCodeArrayPushed = true;
}
diff --git a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
index b5cc7aa..5cb22bb 100644
--- a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
+++ b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
@@ -1,4 +1,4 @@
-<template>
+ <template>
<el-dialog
title="涓氬姟绫诲瀷"
:visible.sync="showSubmitDialog"
@@ -11,7 +11,7 @@
<el-form ref="form" :model="btmType" show-message="true" inline size="medium" label-suffix=":" class="btmTypeForm"
:rules="rules" @resetFields="resetForm" status-icon="true">
<el-form-item label="鑻辨枃鍚嶇О" label-width="100px" required="true" prop="id">
- <el-input v-model="btmType.id" :prefix-icon="icons.key"></el-input>
+ <el-input v-model="btmType.id" :prefix-icon="icons.key" :disabled="true"></el-input>
</el-form-item>
<el-form-item label="涓枃鍚嶇О" label-width="100px">
<el-input v-model="btmType.name" :prefix-icon="icons.name"></el-input>
@@ -232,7 +232,8 @@
{
label: '鑻辨枃鍚嶇О',
prop: 'id',
- align: 'center'
+ align: 'center',
+ disabled:true
}, {
label: '涓枃鍚嶇О',
prop: 'name',
@@ -284,6 +285,7 @@
prop: 'id',
align: 'left',
search: true,
+ disabled:true,
width: 230
}, {
label: '涓枃鍚嶇О',
@@ -356,6 +358,7 @@
{
label: '鑻辨枃鍚嶇О',
prop: 'id',
+ disabled:true,
search: true
},
{
@@ -420,6 +423,7 @@
{
label: '鑻辨枃鍚嶇О',
prop: 'id',
+ disabled:true,
search: true
},
{
diff --git a/Source/UBCS-WEB/src/views/modeling/cycle.vue b/Source/UBCS-WEB/src/views/modeling/cycle.vue
index 0fc23e9..6f00942 100644
--- a/Source/UBCS-WEB/src/views/modeling/cycle.vue
+++ b/Source/UBCS-WEB/src/views/modeling/cycle.vue
@@ -229,6 +229,8 @@
const nodes = res.data.data.nodes.map((item) => {
item.label = item.id;
item.index = item.indexNum;
+ item.x = Number(item.x);
+ item.y = Number(item.y);
return item;
});
const edges = res.data.data.edges.map((item) => {
--
Gitblit v1.9.3