From 2871cb99e018f6bf9e2ef76a424a1429a7c818f0 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 13 七月 2023 11:40:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/flow-cycle/components/DetailPanel.vue | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/flow-cycle/components/DetailPanel.vue b/Source/UBCS-WEB/src/components/flow-cycle/components/DetailPanel.vue
index 1fb051b..75a9bab 100644
--- a/Source/UBCS-WEB/src/components/flow-cycle/components/DetailPanel.vue
+++ b/Source/UBCS-WEB/src/components/flow-cycle/components/DetailPanel.vue
@@ -11,20 +11,20 @@
<el-form-item label="鍚嶇О" prop="name">
<el-input v-model.trim="newRowData.name" :maxLength="20" clearable />
</el-form-item>
- <el-form-item label="鏍囩" prop="label">
- <el-input v-model.trim="newRowData.label" clearable />
+ <el-form-item label="鏍囩" prop="id">
+ <el-input v-model.trim="newRowData.id" clearable />
</el-form-item>
- <el-form-item label="璧峰鐘舵��" prop="startState">
+ <el-form-item label="璧峰鐘舵��" prop="startStatus">
<el-select
- v-model="newRowData.startState"
+ v-model="newRowData.startStatus"
placeholder="璇烽�夋嫨璧峰鐘舵��"
style="width: 100%"
>
<el-option
- v-for="item in []"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ v-for="item in existNodes"
+ :key="item.id"
+ :label="item.id"
+ :value="item.id"
>
</el-option>
</el-select>
@@ -74,15 +74,23 @@
DetailPanel,
DetailForm,
},
- props: ["readOnly", "rowData"],
+ props: ["rowData", "existNodes"],
data() {
return {
- newRowData: {},
+ newRowData: {
+ startStatus: undefined,
+ name: undefined,
+ id: undefined,
+ remark: undefined
+ },
rules: {
name: [{ required: true, message: "鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
- label: [{ required: true, message: "鏍囩涓嶈兘涓虹┖", trigger: "blur" }],
- startState: [
- // { required: true, message: "璧峰鐘舵�佷笉鑳戒负绌�", trigger: "change" },
+ id: [
+ { required: true, message: "鏍囩涓嶈兘涓虹┖", trigger: "blur" },
+ { pattern: /^[A-z]+$/g, message: "鏍囩鍙兘杈撳叆鑻辨枃", trigger: "blur" }
+ ],
+ startStatus: [
+ { required: true, message: "璧峰鐘舵�佷笉鑳戒负绌�", trigger: "change" },
],
},
};
@@ -114,6 +122,12 @@
}
},
},
+ existNodes(newV) {
+ const flag = newV.some((item) => item.id === this.newRowData.startStatus);
+ if (!flag) {
+ this.newRowData.startStatus = undefined;
+ }
+ },
},
};
</script>
--
Gitblit v1.9.3