From a52ce4c9a594e78b5931d487e05d0dd54ac8cd36 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 07 十月 2024 22:38:28 +0800
Subject: [PATCH] Merge branch 'release' of http://122.9.151.159:9090/r/smart-web into release

---
 src/views/tpm/machine/Dialog.vue |   48 +++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/views/tpm/machine/Dialog.vue b/src/views/tpm/machine/Dialog.vue
index c81c2c8..e993647 100644
--- a/src/views/tpm/machine/Dialog.vue
+++ b/src/views/tpm/machine/Dialog.vue
@@ -51,7 +51,7 @@
                     <el-form-item label="鐢熷懡鐘舵��" prop="machineLifeStatus">
                         <el-select v-model="form.machineLifeStatus" placeholder="" style="width: 240px">
                             <el-option v-for="item in options.machineLifeStatus" :key="item.value" :label="item.label"
-                                :value="item.value" />
+                                :value="item.value - 0" />
                         </el-select>
                     </el-form-item>
                 </el-col>
@@ -107,7 +107,9 @@
                 </el-col>
                 <el-col :span="8">
                     <el-form-item label="鎵�灞炴満鍣ㄧ粍" prop="groupId">
-                        <el-input style="width: 240px" v-model="form.groupId" placeholder="鎵�灞炴満鍣ㄧ粍" clearable></el-input>
+                        <!-- <el-input style="width: 240px" v-model="form.groupId" placeholder="鎵�灞炴満鍣ㄧ粍" clearable></el-input> -->
+                        <el-tree-select v-model="form.groupId" node-key="id" :props="props" :data="options.groupId"
+                            filterable style="width: 240px" />
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -219,8 +221,8 @@
                 </el-col>
                 <el-col :span="8">
                     <el-form-item label="浣跨敤閮ㄩ棬" prop="organizationId">
-                        <el-input style="width: 240px" v-model="form.organizationId" placeholder="浣跨敤閮ㄩ棬"
-                            clearable></el-input>
+                        <el-tree-select v-model="form.organizationId" node-key="id" :props="props"
+                            :data="options.organizationId" filterable style="width: 240px" />
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -241,13 +243,15 @@
                     <el-form-item label="浣跨敤鐘舵��" prop="machineUseStatus">
                         <el-select v-model="form.machineUseStatus" placeholder="" style="width: 240px">
                             <el-option v-for="item in options.machineUseStatus" :key="item.value" :label="item.label"
-                                :value="item.value" />
+                                :value="item.value - 0" />
                         </el-select>
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
                     <el-form-item label="璐ｄ换浜�" prop="employeeId">
-                        <el-input style="width: 240px" v-model="form.employeeId" placeholder="璐ｄ换浜�" clearable></el-input>
+                        <!-- <el-input style="width: 240px" v-model="form.employeeId" placeholder="璐ｄ换浜�" clearable></el-input> -->
+                        <el-tree-select v-model="form.employeeId" node-key="id" :props="props"
+                            :data="options.employeeId" filterable style="width: 240px" />
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -294,6 +298,9 @@
     },
     data() {
         return {
+            props: {
+                label: 'name',
+            },
             options: {
                 machineTypeId: [],
                 machineLifeStatus: [],
@@ -317,7 +324,10 @@
                         value: 0
                     }
                 ],
-                machineUseStatus: []
+                machineUseStatus: [],
+                employeeId: [],
+                groupId: [],
+                organizationId: []
             },
             mode: "add",
             titleMap: {
@@ -476,6 +486,21 @@
                     }))
                 }
             })
+            this.$HTTP.get('/api/blade-cps/employee/tree').then(res => {
+                if (res.code === 200) {
+                    this.options.employeeId = res.data
+                }
+            })
+            this.$HTTP.get('/api/blade-cps/group/tree?groupCategory=1&groupType=group_machine').then(res => {
+                if (res.code === 200) {
+                    this.options.groupId = res.data
+                }
+            })
+            this.$HTTP.get('/api/blade-cps/organization/tree?groupType=group_organization&groupCategory=1').then(res => {
+                if (res.code === 200) {
+                    this.options.organizationId = res.data
+                }
+            })
         },
         //鏄剧ず
         open(mode = 'add', params) {
@@ -486,7 +511,7 @@
             Object.keys(this.form).forEach(item => {
                 this.form[item] = ''
             })
-            if (params) {
+            if (params.id) {
                 this.$HTTP.get(`/api/blade-cps/machine/detail/${params.id}`).then(res => {
                     if (res.code === 200) {
                         this.form = {
@@ -495,6 +520,11 @@
                         }
                     }
                 })
+            } else {
+                this.form = {
+                    ...this.form,
+                    ...params
+                }
             }
 
             return this
@@ -528,7 +558,7 @@
                         this.visible = false;
                         this.$message.success("鎿嶄綔鎴愬姛")
                     } else {
-                        this.$alert(res.message, "鎻愮ず", { type: 'error' })
+                        this.$alert(res.msg, "鎻愮ず", { type: 'error' })
                     }
                 } else {
                     return false;

--
Gitblit v1.9.3