From 8850d55ebadd112b30ef7783e2f6cb382cd130af Mon Sep 17 00:00:00 2001
From: 李喆(开发组) <lzhe@yxqiche.com>
Date: 星期三, 30 七月 2025 16:40:54 +0800
Subject: [PATCH] 1
---
src/views/basesetting/machine.vue | 111 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 80 insertions(+), 31 deletions(-)
diff --git a/src/views/basesetting/machine.vue b/src/views/basesetting/machine.vue
index 8326167..43c1e73 100644
--- a/src/views/basesetting/machine.vue
+++ b/src/views/basesetting/machine.vue
@@ -17,8 +17,8 @@
>
<template #menu-left>
<el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleExport">瀵煎嚭</el-button>
- <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleView">瀵煎叆</el-button>
- <!-- <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleAdd">鏂板</el-button> -->
+ <!-- <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleView">瀵煎叆</el-button> -->
+ <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleAdd">鏂板</el-button>
</template>
<template #menu="scope">
<el-button type="primary" text size="default" icon="el-icon-upload" @click.stop="handleEdit(scope.row, scope.index)">缂栬緫</el-button>
@@ -32,7 +32,11 @@
</avue-crud>
<el-dialog :title="machineTitle" append-to-body v-model="editBox" width="60%">
- <avue-form ref="editFormModal1" :option="editFormModal" v-model="editForm" @submit="formSubmit" @resetForm="resetForm"/>
+ <avue-form ref="editFormModal1" :option="editFormModal" v-model="editForm" @submit="formSubmit" @resetForm="resetForm">
+ <template #ownerDept="{}">
+ <el-tree-select v-model="editForm.ownerDept" :data="organizationTreeList"/>
+ </template>
+ </avue-form>
</el-dialog>
</basic-container>
</template>
@@ -46,8 +50,8 @@
export default {
data() {
var that = this;
- var aurl = "/blade-system/dept/lazy-list";
return {
+ organizationTreeList: [],
machineTitle: "鏂板",
isAdd: true,
editBox: false,
@@ -79,7 +83,7 @@
hide: true
},
{
- label: '鏈哄簥缂栧彿',
+ label: '鏈哄簥缂栧彿4',
prop: 'code'
},
{
@@ -129,6 +133,13 @@
type: 'input',
span: 12,
dataType: 'string',
+ rules: [
+ {
+ required: true,
+ message: '璇疯緭鍏ユ満搴婄紪鍙�',
+ trigger: 'blur'
+ }
+ ]
},
{
label: '鏈哄簥鍨嬪彿',
@@ -136,6 +147,13 @@
type: 'input',
span: 12,
dataType: 'string',
+ rules: [
+ {
+ required: true,
+ message: '璇疯緭鍏ユ満搴婂瀷鍙�',
+ trigger: 'blur'
+ }
+ ]
},
{
label: '鏈哄簥绫诲瀷',
@@ -146,7 +164,14 @@
props: {
label: 'dictValue',
value: 'dictKey',
- }
+ },
+ rules: [
+ {
+ required: true,
+ message: '璇烽�夋嫨鏈哄簥绫诲瀷',
+ trigger: 'change'
+ }
+ ]
},
{
label: '鎵�灞炴満搴婄粍',
@@ -157,7 +182,14 @@
props: {
label: 'dictValue',
value: 'dictKey',
- }
+ },
+ rules: [
+ {
+ required: true,
+ message: '璇烽�夋嫨鎵�灞炴満搴婄粍',
+ trigger: 'change'
+ }
+ ]
},
{
label: '鎿嶄綔鍛�',
@@ -169,13 +201,7 @@
{
label: '鎵�灞炵粍缁�',
prop: 'ownerDept',
- type: 'tree',
- span: 12,
- props: {
- label: 'deptName',
- value: 'id'
- },
- dicUrl: aurl
+ span: 12
},
{
label: '鐢熶骇鍟�',
@@ -333,25 +359,17 @@
var url = '/blade-mdm/machine/update';
}
this.loading = true;
- axios({
- url: url,
- method: 'post',
- data: obj,
- }).then(
- res => {
- this.loading = false;
- this.$message({
- type: 'success',
- message: '鎿嶄綔鎴愬姛!',
- });
+ axios({url: url,method: 'post',data: obj}).then(res => {
+ this.loading = false;
+ if(res,res.data.success) {
this.editBox = false;
+ this.$message({type: 'success',message: '鎿嶄綔鎴愬姛!'});
this.onLoad();
- done();
- },
- error => {
-
+ }else {
+ this.$message({type: 'error',message: res.data.msg});
}
- );
+ done();
+ });
},
handleView() {
@@ -396,9 +414,40 @@
}
);
-
+ },
+ traversalLabelValueToTree(tree) { //閬嶅巻鏁扮粍
+ return tree.map(node => {
+ // 1. 娣诲姞 label 鍜� value 瀛楁
+ const newNode = {
+ ...node,
+ label: node.fullName,
+ value: node.id,
+ };
+ // 2. 濡傛灉鏈� children锛岄�掑綊澶勭悊
+ if (node.children && node.children.length > 0) {
+ newNode.children = this.traversalLabelValueToTree(node.children);
+ }
+ return newNode;
+ });
}
},
+ mounted() {
+ //鍒ゆ柇鐗堟湰 0:娑夊瘑缃戯紝1:宸ユ帶缃戯紱//宸ユ帶缃�5涓紝娑夊瘑缃�4涓� 宸ユ帶缃戜笉鍋氫簡
+ // 宸ユ帶缃戞槸/blade-mdm/system/dept/lazy-list
+ // 娑夊瘑缃戞槸/blade-mdm/dept/lazy-list
+ axios({url: '/blade-mdm/system/param/getValue?paramKey=networkType',method: 'get'}).then(res => {
+ // if(res.data.data === "0") {
+ // var aurl = "/blade-mdm/dept/lazy-list";
+ // }else {
+ // var aurl = "/blade-mdm/system/dept/lazy-list";
+ // }
+ var aurl = "/blade-mdm/system/dept/lazy-list";
+ axios({url: aurl,method: 'get'}).then(resp => {
+ this.organizationTreeList = this.traversalLabelValueToTree(resp.data.data);
+ })
+ }
+ );
+ }
};
</script>
--
Gitblit v1.9.3