diff --git a/src/api/lessor/equipType.js b/src/api/lessor/equipType.js
index bff7e64f..caa33a79 100644
--- a/src/api/lessor/equipType.js
+++ b/src/api/lessor/equipType.js
@@ -16,6 +16,14 @@ export function getMaTypeList(query) {
     params: query,
   });
 }
+export function getList(query) {
+  return request({
+    url: "/material-mall/type/getList",
+    method: "get",
+    params: query,
+  });
+}
+
 
 //机具类型-详情
 export function getMaType(typeId) {
@@ -33,6 +41,21 @@ export function addMaType(data) {
     data: data,
   });
 }
+export function addProperties(data) {
+  return request({
+    url: "/material-mall/type/addProperties",
+    method: "post",
+    data: data,
+  });
+}
+export function updateProperties(data) {
+  return request({
+    url: "/material-mall/type/updateProperties",
+    method: "post",
+    data: data,
+  });
+}
+
 // 机具类型--修改
 export function updateMaType(data) {
   return request({
diff --git a/src/views/lessor/equipment/equipType/child/addChildNode.vue b/src/views/lessor/equipment/equipType/child/addChildNode.vue
new file mode 100644
index 00000000..88a88606
--- /dev/null
+++ b/src/views/lessor/equipment/equipType/child/addChildNode.vue
@@ -0,0 +1,218 @@
+<template>
+  <el-dialog :modal-append-to-body="false" :visible.sync="dialogVisible" title="新增" width="70%" @close="handleClose"
+             :close-on-click-modal="false"
+  >
+    <!-- 基础信息 -->
+    <el-divider content-position="left">基础信息</el-divider>
+    <el-form :model="form" :rules="rules" ref="form" label-width="120px">
+      <el-row :gutter="20">
+        <el-col :span="8">
+          <el-form-item label="所属专业" prop="major">
+            <el-input v-model="form.major" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="主工序" prop="mainProcedure">
+            <el-input v-model="form.mainProcedure" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="子工序" prop="subProcedure">
+            <el-input v-model="form.subProcedure" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input v-model="form.deviceName"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="计量单位" prop="unit">
+            <el-input v-model="form.unit"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <!-- 特征值信息 -->
+      <el-row type="flex" align="middle">
+        <el-col :span="22">
+          <el-divider content-position="left">特征值信息</el-divider>
+        </el-col>
+        <el-col :span="2" style="text-align: right;">
+          <el-button type="primary" size="mini" @click="addFeature">新增特征项</el-button>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20" style="margin-bottom: 10px">
+        <el-col
+          v-for="(item, index) in form.features"
+          :key="index"
+          :span="8"
+        >
+          <el-form-item
+            style="margin: unset"
+            :label="item.featureName"
+            :prop="`features.${index}.value`"
+            required
+            :rules="[{ required: true, message: `请输入${item.featureName}`, trigger: ['blur', 'change'] }]"
+          >
+            <!-- 普通输入框 -->
+            <el-input
+              v-if="item.inputType === 'input'"
+              v-model="item.value"
+            >
+              <template #suffix>
+                <i
+                  class="el-icon-delete"
+                  @click="removeFeature(index)"
+                  style="font-size: 16px; color: red;"
+                ></i>
+              </template>
+            </el-input>
+
+            <!-- 可输入下拉 -->
+            <InputSelect
+              :label="item.featureName"
+              v-else-if="item.inputType === 'select'"
+              v-model="item.value"
+              @update:modelValue="item.value = $event"
+              :optionsList="item.options"
+              @update:optionsList="item.options = $event"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+    </el-form>
+
+
+    <!-- 底部按钮 -->
+    <template #footer>
+      <el-button @click="handleClose">取消</el-button>
+      <el-button type="primary" @click="submit">确定</el-button>
+    </template>
+
+
+    <Feature :visible.sync="featureOpen" @submit-success="handleSubmitSuccess"/>
+
+  </el-dialog>
+</template>
+
+<script>
+import InputSelect from '@/views/lessor/equipment/equipType/child/inputSelect.vue'
+import Feature from '@/views/lessor/equipment/equipType/child/feature.vue'
+import { addProperties } from '@/api/lessor/equipType'
+
+export default {
+  name: 'AddDeviceDialog',
+  components: { Feature, InputSelect },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    parentNode: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      featureOpen: false,
+      form: {
+        major: '',
+        mainProcedure: '',
+        subProcedure: '',
+        deviceName: '',
+        unit: '',
+        powerType: '',
+        ratedForce: '',
+        maxForce: '',
+        smartControl: '',
+        features: []
+      },
+      rules: {
+        deviceName: [{ required: true, message: '请输入设备名称', trigger: 'blur' }],
+        unit: [{ required: true, message: '请输入计量单位', trigger: 'blur' }],
+        powerType: [{ required: true, message: '请输入动力方式', trigger: 'blur' }],
+        ratedForce: [{ required: true, message: '请输入额定牵引力', trigger: 'blur' }],
+        maxForce: [{ required: true, message: '请输入最大牵引力', trigger: 'blur' }],
+        smartControl: [{ required: true, message: '请输入智能集控能力', trigger: 'blur' }]
+      }
+    }
+  },
+  computed: {
+    dialogVisible: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:visible', val)
+      }
+    }
+  },
+  watch: {
+    parentNode: {
+      immediate: true,
+      handler(newVal) {
+        this.form.subProcedure = newVal?.label || null
+        this.form.major = newVal?.major || null
+        this.form.mainProcedure = newVal?.mainProcedure || null
+      }
+    }
+  },
+  methods: {
+    handleSubmitSuccess(data) {
+      const formData = JSON.parse(data) // 解析数据
+      const isDuplicate = this.form.features.some(
+        (item) => item.featureName === formData.featureName
+      )
+      if (!isDuplicate) {
+        if (formData.inputType === 'input') {
+          formData.value = ''
+        } else {
+          formData.value = ''
+          formData.options = []
+        }
+        this.form.features.push(formData) // 不重复才添加
+        this.featureOpen = false
+      } else {
+        this.$message.warning(`特征项 "${formData.featureName}" 已存在！`)
+      }
+    },
+    addFeature() {
+      this.featureOpen = true
+    },
+    removeFeature(index) {
+      this.form.features.splice(index, 1)
+    },
+
+    handleClose() {
+      this.$emit('update:visible', false)
+      this.$emit('refresh', false)
+      this.resetForm()
+    },
+    submit() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          const formData = {
+            typeName: this.form.deviceName || null,
+            parentId: this.parentNode?.id || null,
+            companyId: this.parentNode?.companyId || null,
+            unitName: this.form.unit || null,
+            formFeature: this.form.features || null
+          }
+          addProperties(formData).then((response) => {
+            this.$modal.msgSuccess('新增成功')
+          })
+          this.handleClose()
+        }
+      })
+    },
+    resetForm() {
+      this.form.features = []
+      this.$refs.form?.resetFields()
+    }
+  }
+}
+</script>
diff --git a/src/views/lessor/equipment/equipType/child/addNode.vue b/src/views/lessor/equipment/equipType/child/addNode.vue
new file mode 100644
index 00000000..b09a1c44
--- /dev/null
+++ b/src/views/lessor/equipment/equipType/child/addNode.vue
@@ -0,0 +1,122 @@
+<template>
+  <el-dialog
+    title="新增"
+    :visible.sync="dialogVisible"
+    width="50%"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="handleClose"
+  >
+    <el-form
+      label-width="80px"
+      :model="form"
+      :rules="rules"
+      ref="formRef"
+    >
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="所属上级">
+            <el-input
+              style="width: 100%"
+              disabled
+              v-model="form.parentName"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="名称" prop="name">
+            <el-input
+              style="width: 100%"
+              v-model="form.name"
+              placeholder="请输入名称"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row style="text-align: right; margin-top: 20px">
+        <el-form-item>
+          <el-button size="small" @click="handleClose">取 消</el-button>
+          <el-button size="small" type="primary" @click="onSubmit">确 定</el-button>
+        </el-form-item>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<script>
+import { addMaType } from '@/api/lessor/equipType'
+
+export default {
+  name: 'AddNodeDialog',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    parentNode: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      form: {
+        parentName: '',
+        name: ''
+      },
+      rules: {
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' },
+          { min: 2, max: 20, message: '长度在2到20个字符', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  computed: {
+    dialogVisible: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:visible', val)
+      }
+    }
+  },
+  watch: {
+    parentNode: {
+      immediate: true,
+      handler(newVal) {
+        this.form.parentName = newVal?.label || newVal?.name || ''
+      }
+    }
+  },
+  methods: {
+    onSubmit() {
+      this.$refs.formRef.validate(valid => {
+        if (valid) {
+          const formData = {
+            typeName: this.form.name || null,
+            parentId: this.parentNode?.id || null,
+            companyId: this.parentNode?.companyId || null
+          }
+          addMaType(formData).then((response) => {
+            this.$modal.msgSuccess('新增成功')
+          })
+          this.handleClose()
+        }
+      })
+    },
+    handleClose() {
+      this.resetForm()
+      this.$emit('update:visible', false)
+      this.$emit('refresh', false)
+    },
+    resetForm() {
+      this.$refs.formRef?.resetFields()
+    }
+  }
+}
+</script>
+
diff --git a/src/views/lessor/equipment/equipType/child/editChildNode.vue b/src/views/lessor/equipment/equipType/child/editChildNode.vue
new file mode 100644
index 00000000..53c8a06d
--- /dev/null
+++ b/src/views/lessor/equipment/equipType/child/editChildNode.vue
@@ -0,0 +1,265 @@
+<template>
+  <el-dialog :modal-append-to-body="false" :visible.sync="dialogVisible" title="修改" width="70%" @close="handleClose"
+             :close-on-click-modal="false"
+  >
+    <!-- 基础信息 -->
+    <el-divider content-position="left">基础信息</el-divider>
+    <el-form :model="form" :rules="rules" ref="form" label-width="120px">
+      <el-row :gutter="20">
+        <el-col :span="8">
+          <el-form-item label="所属专业" prop="major">
+            <el-input v-model="form.major" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="主工序" prop="mainProcedure">
+            <el-input v-model="form.mainProcedure" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="子工序" prop="subProcedure">
+            <el-input v-model="form.subProcedure" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input v-model="form.deviceName"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="计量单位" prop="unit">
+            <el-input v-model="form.unit"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <!-- 特征值信息 -->
+      <el-row type="flex" align="middle">
+        <el-col :span="22">
+          <el-divider content-position="left">特征值信息</el-divider>
+        </el-col>
+        <el-col :span="2" style="text-align: right;">
+          <el-button type="primary" size="mini" @click="addFeature">新增特征项</el-button>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20" style="margin-bottom: 10px">
+        <el-col
+          v-for="(item, index) in form.features"
+          :key="index"
+          :span="8"
+        >
+          <el-form-item
+            style="margin: unset"
+            :label="item.featureName"
+            :prop="`features[${index}].value`"
+            required
+            :rules="[{ required: true, message: `请输入${item.featureName}`, trigger: ['blur', 'change'] }]"
+          >
+            <!-- 普通输入框 -->
+            <el-input
+              v-if="item.inputType === 'input'"
+              v-model="item.value"
+            >
+              <template #suffix>
+                <i
+                  class="el-icon-delete"
+                  @click="removeFeature(index)"
+                  style="font-size: 16px; color: red;"
+                ></i>
+              </template>
+            </el-input>
+
+            <!-- 可输入下拉 -->
+            <InputSelect
+              :label="item.featureName"
+              v-else-if="item.inputType === 'select'"
+              v-model="item.value"
+              @update:modelValue="item.value = $event"
+              :optionsList="item.options"
+              @update:optionsList="item.options = $event"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+    </el-form>
+
+
+    <!-- 底部按钮 -->
+    <template #footer>
+      <el-button @click="handleClose">取消</el-button>
+      <el-button type="primary" @click="submit">确定</el-button>
+    </template>
+
+
+    <Feature :visible.sync="featureOpen" @submit-success="handleSubmitSuccess"/>
+
+  </el-dialog>
+</template>
+
+<script>
+import InputSelect from '@/views/lessor/equipment/equipType/child/inputSelect.vue'
+import Feature from '@/views/lessor/equipment/equipType/child/feature.vue'
+import { updateProperties } from '@/api/lessor/equipType'
+
+export default {
+  name: 'AddDeviceDialog',
+  components: { Feature, InputSelect },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    parentNode: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      featureOpen: false,
+      form: {
+        major: '',
+        mainProcedure: '',
+        subProcedure: '',
+        deviceName: '',
+        unit: '',
+        powerType: '',
+        ratedForce: '',
+        maxForce: '',
+        smartControl: '',
+        features: [] // 特征项数组
+      },
+      rules: {
+        deviceName: [{ required: true, message: '请输入设备名称', trigger: 'blur' }],
+        unit: [{ required: true, message: '请输入计量单位', trigger: 'blur' }],
+        powerType: [{ required: true, message: '请输入动力方式', trigger: 'blur' }],
+        ratedForce: [{ required: true, message: '请输入额定牵引力', trigger: 'blur' }],
+        maxForce: [{ required: true, message: '请输入最大牵引力', trigger: 'blur' }],
+        smartControl: [{ required: true, message: '请输入智能集控能力', trigger: 'blur' }]
+      }
+    }
+  },
+  computed: {
+    dialogVisible: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:visible', val)
+      }
+    }
+  },
+  watch: {
+    parentNode: {
+      immediate: true,
+      handler(newVal) {
+        this.form.subProcedure = newVal?.label || null
+        this.form.major = newVal?.major || null
+        this.form.mainProcedure = newVal?.mainProcedure || null
+        this.form.deviceName = newVal?.label || newVal?.typeName
+        this.form.unit = newVal?.unitName || null
+        // 解析特征值数据并生成特征项
+        this.analyzeData(newVal?.maTypeProperties || [])
+      }
+    }
+  },
+  methods: {
+    /**
+     * 分析特征值数据，统计重复的propertyName并设置输入类型
+     * @param {Array} data - 特征值数据数组
+     */
+    analyzeData(data) {
+      // 清空现有特征项
+      this.form.features = []
+      if (!data || !data.length) return
+
+      // 统计每个propertyName的出现次数和对应值
+      const result = {}
+      data.forEach(item => {
+        if (!result[item.propertyName]) {
+          result[item.propertyName] = {
+            count: 0,
+            options: []
+          }
+        }
+        // 累加计数
+        result[item.propertyName].count++
+        // 收集不重复的属性值
+        if (item.propertyValue && !result[item.propertyName].options.includes(item.propertyValue)) {
+          result[item.propertyName].options.push(item.propertyValue)
+        }
+      })
+
+      // 转换统计结果为特征项数组
+      Object.entries(result).forEach(([name, info]) => {
+        this.form.features.push({
+          featureName: name,
+          // 出现次数>1的显示为下拉选，否则为输入框
+          inputType: info.count > 1 ? 'select' : 'input',
+          options: info.options, // 下拉选项
+          value: info.options[0] // 默认值为空
+        })
+      })
+    },
+
+    handleSubmitSuccess(data) {
+      const formData = JSON.parse(data)
+      const isDuplicate = this.form.features.some(
+        (item) => item.featureName === formData.featureName
+      )
+      if (!isDuplicate) {
+        if (formData.inputType === 'input') {
+          formData.value = ''
+        } else {
+          formData.value = ''
+          formData.options = []
+        }
+        this.form.features.push(formData)
+        this.featureOpen = false
+      } else {
+        this.$message.warning(`特征项 "${formData.featureName}" 已存在！`)
+      }
+    },
+
+    addFeature() {
+      this.featureOpen = true
+    },
+
+    removeFeature(index) {
+      this.form.features.splice(index, 1)
+    },
+
+    handleClose() {
+      //this.resetForm()
+      this.$emit('update:visible', false)
+      this.$emit('refresh', false)
+    },
+
+    submit() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          const formData = {
+            typeName: this.form.deviceName || null,
+            typeId: this.parentNode?.id || null,
+            parentId: this.parentNode?.parentId || null,
+            companyId: this.parentNode?.companyId || null,
+            unitName: this.form.unit || null,
+            formFeature: this.form.features || null
+          }
+          updateProperties(formData).then((response) => {
+            this.$modal.msgSuccess('修改成功')
+            this.handleClose()
+          })
+        }
+      })
+    },
+
+    resetForm() {
+      this.form.features = []
+      this.$refs.form?.resetFields()
+    }
+  }
+}
+</script>
diff --git a/src/views/lessor/equipment/equipType/child/editNode.vue b/src/views/lessor/equipment/equipType/child/editNode.vue
new file mode 100644
index 00000000..f2d1e2ff
--- /dev/null
+++ b/src/views/lessor/equipment/equipType/child/editNode.vue
@@ -0,0 +1,112 @@
+<template>
+  <el-dialog
+    title="修改"
+    :visible.sync="dialogVisible"
+    width="50%"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="handleClose"
+  >
+    <el-form
+      label-width="80px"
+      :model="form"
+      :rules="rules"
+      ref="formRef"
+    >
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="名称" prop="name">
+            <el-input
+              style="width: 100%"
+              v-model="form.name"
+              placeholder="请输入名称"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row style="text-align: right; margin-top: 20px">
+        <el-form-item>
+          <el-button size="small" @click="handleClose">取 消</el-button>
+          <el-button size="small" type="primary" @click="onSubmit">确 定</el-button>
+        </el-form-item>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<script>
+import { updateMaType } from '@/api/lessor/equipType'
+
+export default {
+  name: 'EditNodeDialog',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    parentNode: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      form: {
+        name: ''
+      },
+      rules: {
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' },
+          { min: 2, max: 20, message: '长度在2到20个字符', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  computed: {
+    dialogVisible: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:visible', val)
+      }
+    }
+  },
+  watch: {
+    parentNode: {
+      immediate: true,
+      handler(newVal) {
+        console.log(newVal)
+        this.form.name = newVal?.label || newVal?.name || ''
+      }
+    }
+  },
+  methods: {
+    onSubmit() {
+      this.$refs.formRef.validate(valid => {
+        if (valid) {
+          const formData = {
+            typeName: this.form.name || null,
+            typeId: this.parentNode?.id || null
+          }
+          updateMaType(formData).then((response) => {
+            this.$modal.msgSuccess('修改成功')
+          })
+          this.handleClose()
+        }
+      })
+    },
+    handleClose() {
+      this.resetForm()
+      this.$emit('update:visible', false)
+      this.$emit('refresh', false)
+    },
+    resetForm() {
+      this.$refs.formRef?.resetFields()
+      this.form.name = this.parentNode?.label || this.parentNode?.name || ''
+    }
+  }
+}
+</script>
diff --git a/src/views/lessor/equipment/equipType/child/feature.vue b/src/views/lessor/equipment/equipType/child/feature.vue
new file mode 100644
index 00000000..a1889252
--- /dev/null
+++ b/src/views/lessor/equipment/equipType/child/feature.vue
@@ -0,0 +1,95 @@
+<template>
+  <el-dialog :visible.sync="dialogVisible" :append-to-body="true" title="新增" width="20%" @close="handleClose"
+             :close-on-click-modal="false"
+  >
+    <!-- 基础信息 -->
+    <el-form :model="form" :rules="rules" ref="form" label-width="120px">
+      <el-row :gutter="20">
+        <!-- 第1行：特征项名称（占满整行） -->
+        <el-col :span="24">
+          <el-form-item label="特征项名称" prop="featureName">
+            <el-input v-model="form.featureName"/>
+          </el-form-item>
+        </el-col>
+
+        <!-- 第2行：类型 + 是否必填（各占一半） -->
+        <el-col :span="24">
+          <el-form-item label="类型" prop="inputType">
+            <el-radio-group v-model="form.inputType">
+              <el-radio :label="'input'">输入框</el-radio>
+              <el-radio :label="'select'">下拉选</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+          <el-form-item label="是否必填" prop="required">
+            <el-radio-group v-model="form.required">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <!-- 底部按钮 -->
+    <template #footer>
+      <el-button @click="handleClose">取消</el-button>
+      <el-button type="primary" @click="submit">确定</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+
+export default {
+  name: 'feature',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      form: {
+        featureName: '',
+        inputType: 'input',
+        required: true
+      },
+      rules: {
+        featureName: [{ required: true, message: '请输入特征项名称', trigger: 'blur' }]
+      }
+    }
+  },
+  computed: {
+    dialogVisible: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:visible', val)
+      }
+    }
+  },
+  methods: {
+    handleClose() {
+      this.resetForm()
+      this.$emit('update:visible', false)
+    },
+    submit() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.$emit('submit-success', JSON.stringify(this.form))
+          // 发送接口逻辑...
+          this.handleClose()
+        }
+      })
+    },
+    resetForm() {
+      this.$refs.form?.resetFields()
+    }
+  }
+}
+</script>
diff --git a/src/views/lessor/equipment/equipType/child/inputSelect.vue b/src/views/lessor/equipment/equipType/child/inputSelect.vue
new file mode 100644
index 00000000..9af1b0d6
--- /dev/null
+++ b/src/views/lessor/equipment/equipType/child/inputSelect.vue
@@ -0,0 +1,88 @@
+<template>
+  <div>
+    <el-select
+      v-model="value"
+      filterable
+      allow-create
+      default-first-option
+      placeholder="请选择或输入"
+      @change="handleChange"
+    >
+      <el-option
+        v-for="item in options"
+        :key="item"
+        :label="renderLabel(item)"
+        :value="item"
+      >
+        <!-- 默认插槽，允许父组件自定义内容 -->
+        <slot name="option" :item="item">
+          <!-- 默认内容 -->
+          <span style="float: left">{{ item }}</span>
+          <span
+            style="float: right; color: #8492a6; font-size: 13px; cursor: pointer"
+            @click.stop="deleteOption(item)"
+          >
+            <i class="el-icon-close"></i>
+          </span>
+        </slot>
+      </el-option>
+    </el-select>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    modelValue: { type: String, default: '' },
+    optionsList: { type: Array, default: () => [] }
+  },
+  data() {
+    return {
+      options: [...this.optionsList],
+      value: this.modelValue
+    }
+  },
+  watch: {
+    modelValue(val) {
+      this.value = val
+    },
+    value(newVal) {
+      this.$emit('update:modelValue', newVal)
+    },
+    optionsList(newList) {
+      this.options = [...newList]
+    }
+  },
+  emits: ['update:modelValue', 'update:optionsList'],
+  methods: {
+    handleChange(val) {
+      if (val && !this.options.includes(val)) {
+        this.options.push(val)
+        this.$emit('update:optionsList', [...this.options])
+      }
+    },
+    deleteOption(item) {
+      const index = this.options.indexOf(item)
+      if (index !== -1) {
+        this.options.splice(index, 1)
+        this.$emit('update:optionsList', [...this.options])
+        if (this.value === item) {
+          this.value = ''
+        }
+      }
+    },
+    renderLabel(item) {
+      return item
+    }
+  }
+}
+</script>
+
+<style scoped>
+.el-select-dropdown__item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+}
+</style>
diff --git a/src/views/lessor/equipment/equipType/index.vue b/src/views/lessor/equipment/equipType/index.vue
index 844c90c6..8a06ecaa 100644
--- a/src/views/lessor/equipment/equipType/index.vue
+++ b/src/views/lessor/equipment/equipType/index.vue
@@ -15,69 +15,13 @@
             style="margin-bottom: 20px"
           />
         </div>
-        <div class="head-container" style>
-          <el-tree
-            style="height: 700px; overflow: scroll"
-            :data="treeOptions"
-            :props="defaultProps"
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            ref="tree"
-            node-key="id"
-            default-expand-all
-            highlight-current
-            @node-click="handleNodeClick"
-          >
-            <span
-              class="custom-tree-node"
-              slot-scope="{ node, data }"
-              @mousemove="onMousemove(data)"
-              @mouseleave="onMouseleave()"
-            >
-              <span v-if="isMousemoveId === data.id && node.label.length > 5">{{
-                node.label.slice(0, 3) + "..."
-              }}</span>
-              <span v-else>{{ node.label }}</span>
-
-              <span class="btn-items" v-if="isMousemoveId === data.id">
-                <el-button
-                  type="text"
-                  size="mini"
-                  icon="el-icon-plus"
-                  @click.stop="() => appendTreeNode(data)"
-                >
-                </el-button>
-                <el-button
-                  type="text"
-                  size="mini"
-                  icon="el-icon-edit-outline"
-                  style="color: #67c23a"
-                  v-if="data.id !== 0"
-                  @click.stop="() => editTreeNode(data)"
-                >
-                </el-button>
-                <el-button
-                  type="text"
-                  size="mini"
-                  icon="el-icon-delete"
-                  style="color: #f56c6c"
-                  v-if="data.id !== 0"
-                  @click.stop="() => removeTreeNode(data)"
-                >
-                </el-button>
-              </span>
-            </span>
-          </el-tree>
-        </div>
       </el-col>
-      <!--用户数据-->
       <el-col :span="19" :xs="24">
         <el-form
           :model="queryParams"
           ref="queryForm"
           size="small"
           :inline="true"
-          v-show="showSearch"
           label-width="68px"
         >
           <el-form-item label="关键字" prop="typeName">
@@ -86,7 +30,7 @@
               placeholder="请输入关键字"
               clearable
               style="width: 240px"
-              @keyup.enter.native="handleQuery"
+              @keyup.enter.native="getList"
             />
           </el-form-item>
 
@@ -95,175 +39,116 @@
               type="primary"
               icon="el-icon-search"
               size="mini"
-              @click="handleQuery"
-              >查询</el-button
+              @click="getList"
+            >查询
+            </el-button
             >
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-              >重置</el-button
+            >重置
+            </el-button
             >
           </el-form-item>
         </el-form>
-
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-edit"
-              size="mini"
-              @click="onBatchEditPrice"
-              >批量修改租赁价</el-button
+      </el-col>
+    </el-row>
+    <el-row :gutter="20" style="height: 93%">
+      <!--树数据-->
+      <el-col :span="5" :xs="24" style="height: 100%">
+        <div class="head-container" style="height: 100%">
+          <el-tree
+            style="height: 100%;overflow-y: auto;"
+            :data="treeOptions"
+            :props="{children: 'children',label: 'label'}"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            node-key="id"
+            default-expand-all
+            highlight-current
+            @node-click="handleNodeClick"
+          >
+            <div
+              class="custom-tree-node"
+              slot-scope="{ node, data }"
+              @mousemove="onMousemove(data)"
+              @mouseleave="onMouseleave()"
             >
-          </el-col>
-          <!-- <el-col :span="1.5">
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-          >导出
-          </el-button>
-        </el-col>-->
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-          ></right-toolbar>
-        </el-row>
-
+              <span v-if="isMousemoveId === data.id && node.label.length > 10">{{
+                  node.label.slice(0, 10) + '...'
+                }}</span>
+              <span v-else>{{ node.label }}</span>
+              <span class="btn-items" v-if="isMousemoveId === data.id">
+                <el-button
+                  type="text"
+                  size="mini"
+                  icon="el-icon-plus"
+                  v-show="data.level !==4"
+                  @click.stop="() => appendTreeNode(data)"
+                />
+                <el-button
+                  type="text"
+                  size="mini"
+                  icon="el-icon-edit-outline"
+                  style="color: #67c23a"
+                  v-if="data.id !== 0"
+                  @click.stop="() => editTreeNode(data)"
+                />
+                <el-button
+                  type="text"
+                  size="mini"
+                  icon="el-icon-delete"
+                  style="color: #f56c6c"
+                  v-if="data.id !== 0"
+                  @click.stop="() => removeTreeNode(data)"
+                />
+              </span>
+            </div>
+          </el-tree>
+        </div>
+      </el-col>
+      <el-col :span="18" style="height: 100%">
         <el-table
           v-loading="loading"
           :data="typeList"
           border
-          @selection-change="handleSelectionChange"
+
         >
-          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column type="selection" width="50" align="center"/>
           <el-table-column
-            label="名称"
+            label="所属专业"
+            align="center"
+            key="major"
+            prop="major"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="主工序"
+            align="center"
+            key="mainProcedure"
+            prop="mainProcedure"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="子工序"
+            align="center"
+            key="subProcedure"
+            prop="subProcedure"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="装备名称"
             align="center"
             key="typeName"
             prop="typeName"
             show-overflow-tooltip
           />
-          <el-table-column
-            label="计量单位"
-            align="center"
-            key="unitName"
-            prop="unitName"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            label="内部租赁价"
-            align="center"
-            key="leasePrice"
-            prop="leasePrice"
-            show-overflow-tooltip
-            width="100"
-          />
-          <!-- <el-table-column
-                      label="原值"
-                      align="center"
-                      key="buyPrice"
-                      prop="buyPrice"
-                      show-overflow-tooltip
-                  /> -->
-          <!--                    <el-table-column-->
-          <!--                        label="丢失赔偿"-->
-          <!--                        align="center"-->
-          <!--                        key="payPrice"-->
-          <!--                        prop="payPrice"-->
-          <!--                        show-overflow-tooltip-->
-          <!--                    />-->
-          <!-- <el-table-column
-                      label="库管员"
-                      align="center"
-                      key="keeperUserName"
-                      prop="keeperUserName"
-                      show-overflow-tooltip
-                  /> -->
-          <el-table-column
-            label="管理模式"
-            align="center"
-            key="manageType"
-            prop="manageType"
-          >
-            <template slot-scope="{ row }">
-              <el-tag size="mini" v-if="row.manageType == '0'">
-                编码管理
-              </el-tag>
-              <el-tag size="mini" type="success" v-if="row.manageType == '1'">
-                数量管理
-              </el-tag>
-              <!--                            <el-tag-->
-              <!--                                size="mini"-->
-              <!--                                type="warning"-->
-              <!--                                v-if="row.manageType == '2'"-->
-              <!--                            >-->
-              <!--                                成套管理-->
-              <!--                            </el-tag>-->
-            </template>
-          </el-table-column>
-          <!-- <el-table-column
-                      label="图片"
-                      align="center"
-                      key="photoName"
-                      prop="photoName"
-                      show-overflow-tooltip
-                  >
-                      <template slot-scope="scope">
-                          <span
-                              @click="openImg(scope.row.photoUrl)"
-                              style="color: #02a7f0; cursor: pointer"
-                              >{{ scope.row.photoName }}</span
-                          >
-                      </template>
-                  </el-table-column> -->
-          <!-- <el-table-column
-                      label="文档资料"
-                      align="center"
-                      key="documentName"
-                      prop="documentName"
-                      show-overflow-tooltip
-                  >
-                      <template slot-scope="scope">
-                          <a
-                              :href="uploadUrl + scope.row.documentUrl"
-                              style="color: #02a7f0; cursor: pointer"
-                              :download="scope.row.documentName"
-                          >
-                              {{ scope.row.documentName }}
-                          </a>
-                      </template>
-                  </el-table-column>
-                  <el-table-column
-                      label="资产属性"
-                      align="center"
-                      key="propName"
-                      prop="propName"
-                      show-overflow-tooltip
-                  /> -->
-          <el-table-column
-            label="厂家规格型号"
-            align="center"
-            key="facModel"
-            prop="facModel"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            label="备注信息"
-            align="center"
-            key="remark"
-            prop="remark"
-            show-overflow-tooltip
-          />
-
           <el-table-column label="操作" align="center" width="180">
             <template slot-scope="scope" v-if="scope.row.typeId !== 1">
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-edit"
-                @click="handleConfig(scope.row)"
+                @click="editTreeNode(scope.row)"
                 v-hasPermi="['machinery:type:config']"
               >
                 配置
@@ -272,7 +157,7 @@
                 size="mini"
                 type="text"
                 icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
+                @click="editTreeNode(scope.row)"
                 v-hasPermi="['machinery:type:edit']"
               >
                 修改
@@ -281,21 +166,11 @@
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
+                @click="removeTreeNode(scope.row)"
                 v-hasPermi="['machinery:type:del']"
               >
                 删除
               </el-button>
-
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleUpdateLeasePrice(scope.row)"
-                v-hasPermi="['machinery:type:edit']"
-              >
-                租赁改价
-              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -310,1180 +185,209 @@
       </el-col>
     </el-row>
 
-    <!-- 添加或修改用户配置对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="850px"
-      append-to-body
-      :close-on-click-modal="false"
-    >
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="所属上级" prop="parentId">
-              <!-- <treeselect
-                              v-model="form.parentId"
-                              :options="treeOptions"
-                              :show-count="true"
-                              noChildrenText="没有数据了"
-                              noOptionsText="没有数据"
-                              noResultsText="没有搜索结果"
-                              placeholder="请选择所属上级分类"
-                              @select="treeChange"
-                          /> -->
-              <el-input v-model="form.label" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="名称" prop="typeName">
-              <el-input
-                v-model="form.typeName"
-                placeholder="请输入名称"
-                maxlength="30"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="内部租赁价" prop="leasePrice">
-              <el-input
-                v-model="form.leasePrice"
-                type="number"
-                placeholder="请输入租赁价格"
-                maxlength="10"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="管理模式" prop="manageType">
-              <el-select
-                v-model="form.manageType"
-                filterable
-                placeholder="请选择管理模式"
-                style="width: 100%"
-              >
-                <el-option value="0" label="编码管理">编码管理</el-option>
-                <el-option value="1" label="数量管理">数量管理</el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
+    <AddNode :visible.sync="addOpen" :parentNode="addParentNode" @refresh="refresh"/>
+    <EditNode :visible.sync="editOpen" :parentNode="editParentNode" @refresh="refresh"/>
+    <AddChildNode :visible.sync="addChildOpen" :parentNode="addChildNode"
+                  @refresh="refresh"
+    />
 
-        <!-- <el-row> 
-                   <el-col :span="12">
-                      <el-form-item label="原值" prop="buyPrice">
-                          <el-input
-                              v-model="form.buyPrice"
-                              type="number"
-                              placeholder="请输入原值"
-                              maxlength="30"
-                          />
-                      </el-form-item>
-                  </el-col> -->
+    <EditChildNode :visible.sync="editChildOpen" :parentNode="editChildNode"
+                   @refresh="refresh"
+    />
 
-        <!-- <el-col :span="12">
-                      <el-form-item label="外部租赁价" prop="rentPrice">
-                          <el-input
-                              v-model="form.rentPrice"
-                              type="number"
-                              placeholder="请输入外部租赁价"
-                              maxlength="30"
-                          />
-                      </el-form-item>
-                  </el-col> 
-              </el-row>-->
-
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="计量单位" prop="unitName">
-              <el-input
-                v-model="form.unitName"
-                placeholder="请输入计量单位"
-                maxlength="20"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="厂家规格型号" prop="facModel">
-              <el-input
-                v-model="form.facModel"
-                placeholder="请输入厂家规格型号"
-                maxlength="100"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row>
-                  <el-col :span="12">
-                      <el-form-item label="资产属性" prop="propId">
-                          <el-select
-                              v-model="form.propId"
-                              filterable
-                              placeholder="请选择资产属性"
-                              style="width: 100%"
-                          >
-                              <el-option
-                                  v-for="keeper in propList"
-                                  :key="keeper.propId"
-                                  :label="keeper.propName"
-                                  :value="keeper.propId"
-                              ></el-option>
-                          </el-select>
-                      </el-form-item>
-                  </el-col>
-
-                  <el-col :span="12">
-                      <el-form-item label="库管员">
-                          <el-select
-                              v-model="form.keeperUserId"
-                              filterable
-                              placeholder="请选择库管员"
-                              style="width: 100%"
-                          >
-                              <el-option
-                                  v-for="keeper in keeperList"
-                                  :key="keeper.userId"
-                                  :label="keeper.userName"
-                                  :value="keeper.userId"
-                              ></el-option>
-                          </el-select>
-                      </el-form-item>
-                  </el-col>
-              </el-row> -->
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
-              <el-input
-                v-model="form.remark"
-                type="textarea"
-                placeholder="请输入备注内容"
-                maxlength="150"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="检测预警天数" prop="maintenanceAlarmDay">
-              <el-input
-                v-model="form.maintenanceAlarmDay"
-                placeholder="请输入检测预警天数"
-                maxlength="100"
-                type="number"
-                min="1"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :span="12">
-                      <el-form-item label="文档资料" prop="field101">
-                          <el-upload
-                              ref="field101"
-                              :file-list="field101fileList"
-                              action="#"
-                              :limit="1"
-                              accept=".docx"
-                              :http-request="
-                                  (obj) => fileUpLoad(obj, 'fileUrl')
-                              "
-                              :on-exceed="exceedFile"
-                          >
-                              <el-button
-                                  size="small"
-                                  type="primary"
-                                  icon="el-icon-upload"
-                                  >点击上传</el-button
-                              ><span style="color: red; margin-left: 10px">文件需小于20M</span>
-                          </el-upload>
-                      </el-form-item>
-                  </el-col> -->
-        </el-row>
-        <!-- <el-row>
-                  <el-col :span="12">
-                      <el-form-item label="图片" prop="photoName">
-                          <el-upload
-                              :http-request="
-                                  (obj) => imgUpLoad(obj, 'fileUrl')
-                              "
-                              action="#"
-                              :file-list="fileList"
-                              list-type="picture-card"
-                              :show-file-list="false"
-                              accept=".png, .jpg, .jpeg"
-                              :on-success="handleAvatarSuccess"
-                              :on-preview="handlePictureCardPreview"
-                              :on-remove="handleRemove"
-                          >
-                              <img
-                                  v-if="imageUrl"
-                                  :src="uploadUrl + imageUrl"
-                                  style="width: 140px; height: 140px"
-                                  class="avatar"
-                              />
-                              <i
-                                  v-else
-                                  class="el-icon-plus avatar-uploader-icon"
-                              ></i>
-                          </el-upload>
-                      </el-form-item>
-                  </el-col>
-              </el-row> -->
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <el-dialog :visible.sync="dialogVisible">
-      <img width="100%" height="650px" :src="dialogImageUrl" alt />
-    </el-dialog>
-
-    <!--    配置弹窗  -->
-    <el-dialog
-      :title="title"
-      :visible.sync="configOpen"
-      width="650px"
-      append-to-body
-      :close-on-click-modal="false"
-    >
-      <el-form ref="cform" :model="cform" :rules="crules" label-width="110px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="调整前价格">
-              <el-input
-                v-model="leasePrice"
-                placeholder="调整前价格"
-                disabled
-              ></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="调整后价格" prop="leasePrice">
-              <el-input-number
-                v-model="cform.leasePrice"
-                style="width: 100%"
-                controls-position="right"
-                :min="0"
-                maxlength="10"
-              ></el-input-number>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="开始使用日期" prop="effTime">
-              <el-date-picker
-                v-model="cform.effTime"
-                style="width: 100%"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                type="datetime"
-                placeholder="开始使用日期"
-              ></el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitConfig">确 定</el-button>
-        <el-button @click="cancelConfig">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 新增弹框 -->
-    <el-dialog
-      :title="addTitle"
-      :visible.sync="addTitleVisible"
-      v-if="addTitleVisible"
-      width="50%"
-      append-to-body
-      :close-on-click-modal="false"
-    >
-      <el-form
-        label-width="80px"
-        :model="addFormParams"
-        :rules="addFormParamsRules"
-        ref="addFormParamsRef"
-      >
-        <el-row :gutter="24">
-          <el-col :span="12" v-if="addTitle === '新增'">
-            <el-form-item label="所属上级">
-              <el-input
-                style="width: 100%"
-                disabled
-                v-model="addFormParams.label"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="名称" prop="typeName">
-              <el-input style="width: 100%" v-model="addFormParams.typeName" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-          <el-row :gutter="20">
-                <el-col
-                  :span="24"
-                  style="
-                    margin-bottom: 10px;
-                    display: flex;
-                    justify-content: left;
-                    align-items: center;
-                  "
-                >
-                  <el-button
-                      v-if="visiableAttr"
-                      class="primary-lease"
-                      type="primary"
-                      @click="addPartItem"
-                  >
-                     新增属性
-                  </el-button>
-                  <!-- <i
-                    class="el-icon-plus"
-                    style="font-size: 20px; color: blue"
-                    @click="addPartItem"
-                  ></i>
-                  <i
-                    class="el-icon-minus"
-                    style="font-size: 20px; color: red"
-                    v-if="index != 0"
-                    @click="removePartItem(index)"
-                  ></i> -->
-                </el-col>
-          </el-row>
-      </el-form>
-      <el-form
-            label-width="80px"
-            v-for="(item, index) in maTypeProperties"
-            :key="index"
-            :model="item"
-            :rules="maTypeRules"
-            ref="maTypeRef"
-            class="dynamic-item"
-            >
-              <el-row :gutter="24">
-                <el-col :span="12">
-                  <el-form-item label="属性描述" prop="propertyName">
-                    <el-input
-                      v-model="item.propertyName"
-                      placeholder="请输入"
-                      maxlength="20"
-                      style="width: 100%"
-                    >
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="是否必填" prop="mustHave">
-                    <el-radio-group v-model="item.mustHave">
-                      <el-radio label="1">是</el-radio>
-                      <el-radio label="0">否</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </el-col>
-               <el-col :span="4" v-if="index !== 0">
-                        <el-button
-                            size="small"
-                            type="danger"
-                            class="primary-lease"
-                            @click="removePartItem(index)"
-                        >
-                            移除
-                        </el-button>
-                </el-col>
-              </el-row>
-      </el-form>
-        <el-row style="text-align: right">
-          
-            <el-button size="small" type="primary" @click="onSubmit"
-              >确 定</el-button
-            >
-            <el-button size="small" @click="onCancel">取 消</el-button>
-        </el-row>
-    </el-dialog>
-
-    <!-- 修改价格弹框 -->
-    <el-dialog
-      title="修改租赁价"
-      :visible.sync="editLeasePriceVisible"
-      v-if="editLeasePriceVisible"
-      width="30%"
-      append-to-body
-      :close-on-click-modal="false"
-    >
-      <el-form
-        :inline="true"
-        :model="editPriceForm"
-        ref="editPriceFormRef"
-        :rules="editPriceFormRules"
-      >
-        <el-form-item label="修改后租赁价" prop="leasePrice">
-          <el-input v-model="editPriceForm.leasePrice" />
-        </el-form-item>
-        <el-row style="text-align: right">
-          <el-form-item>
-            <el-button size="small" @click="onEditCancel">取 消</el-button>
-            <el-button size="small" type="primary" @click="onEditSubmit"
-              >确 定</el-button
-            >
-          </el-form-item>
-        </el-row>
-      </el-form>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {
-  getListByMaType,
-  getMaTypeList,
-  getMaType,
-  addMaType,
-  updateMaType,
-  delMaType,
-  updateLeasePriceApi,
-} from "@/api/lessor/equipType";
+import { getMaTypeList, delMaType, getList } from '@/api/lessor/equipType'
+import AddNode from '@/views/lessor/equipment/equipType/child/addNode.vue'
+import EditNode from '@/views/lessor/equipment/equipType/child/editNode.vue'
+import AddChildNode from '@/views/lessor/equipment/equipType/child/addChildNode.vue'
+import EditChildNode from '@/views/lessor/equipment/equipType/child/editChildNode.vue'
 
-// import { getUserByRoleList, getMaUserList } from '@/api/system/user'
-// import { getProLists } from '@/api/base/base'
-// import { imgUpLoad, fileUpLoad } from '@/api/system/upload'
 export default {
-  name: "ToolsType",
-  components: { Treeselect },
+  name: 'ToolsType',
+  components: { AddNode, EditNode, AddChildNode, EditChildNode },
   data() {
     return {
-      editPriceForm: {
-        leasePrice: "",
-      },
-      editLeasePriceVisible: false,
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
       // 总条数
       total: 0,
-      // 库管员用户数据
-      keeperList: null,
-      //维修员用户数据
-      repairUserList: null,
-      //资产类型数据
-      propList: null,
-      // 类型名称
-      typeName: undefined,
-      // 树选项
-      treeOptions: undefined,
       //列表数据
       typeList: undefined,
-      // 是否显示弹出层
-      open: false,
-      // 弹出层标题
-      title: "",
-      // 默认密码
-      initPassword: undefined,
-      // 日期范围
-      dateRange: [],
-      // 岗位选项
-      postOptions: [],
-      // 角色选项
-      roleOptions: [],
-      // 表单参数
-      form: {
-        companyId: "",
-      },
-      chosenTypeId: "",
-      leasePrice: "",
-      uploadHeader: process.env.VUE_APP_BASE_API,
-      imageUrl: "",
-      imageName: "",
-      fileList: [],
-      field101fileList: [],
-      //上传地址
-      // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
-      // uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
-      // uploadUrl:'http://192.168.5.12:9201',//本地测试
-      uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址
-      defaultProps: {
-        children: "children",
-        label: "label",
-      },
+      // 遮罩层
+      loading: true,
+      typeName: undefined,
+      treeOptions: undefined,
+      addOpen: false,
+      addParentNode: {},
+      editOpen: false,
+      editParentNode: {},
 
-      // 查询参数
+      addChildOpen: false,
+      addChildNode: {},
+      editChildOpen: false,
+      editChildNode: {},
+      isMousemoveId: null,
+      addFormParams: {
+        label: '',
+        typeName: '',
+        companyId: 101
+      },
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         typeName: undefined,
-        level: 0,
-        // phonenumber: undefined,
-        // status: undefined,
-        // typeId: undefined
+        level: 1
       },
-
-      editPriceFormRules: {
-        leasePrice: [
-          {
-            required: true,
-            message: "请输入修改后租赁价格",
-            trigger: "blur",
-          },
-          {
-            pattern: /^(0(\.\d{0,2})?|([1-9]\d*)(\.\d{0,2})?)$/,
-            message: "请输入正确的费用金额，最多两位小数点",
-            trigger: "blur",
-          },
-        ],
-      },
-
-      maTypeRules:{
-        propertyName: [
-          {
-            required: true,
-            message: "属性描述不能为空",
-            trigger: "blur",
-          },
-        ],
-        mustHave: [
-          {
-            required: true,
-            message: "请选择是否为空",
-            trigger: "blur",
-          },
-        ],
-      },
-
-      // 表单校验
-      rules: {
-        typeName: [
-          {
-            required: true,
-            message: "设备名称不能为空",
-            trigger: "blur",
-          },
-          {
-            min: 2,
-            max: 20,
-            message: "设备名称长度必须介于 2 和 20 之间",
-            trigger: "blur",
-          },
-        ],
-        parentId: [
-          {
-            required: true,
-            message: "所属上级不能为空",
-            trigger: "blur",
-          },
-        ],
-        manageType: [
-          {
-            required: true,
-            message: "请选择管理模式",
-            trigger: "change",
-          },
-        ],
-        leasePrice: [
-          {
-            required: true,
-            message: "内部租赁价格不能为空",
-            trigger: "blur",
-          },
-        ],
-        unitName: [
-          {
-            required: true,
-            message: "计量单位不能为空",
-            trigger: "blur",
-          },
-        ],
-        maintenanceAlarmDay: [
-          {
-            required: true,
-            message: "检测预警天数不能为空",
-            trigger: "blur",
-          },
-        ],
-        // buyPrice: [
-        //     {
-        //         required: true,
-        //         message: '原值不能为空',
-        //         trigger: 'blur',
-        //     },
-        // ],
-        // keeperUserId: [
-        //     {
-        //         required: true,
-        //         message: '库管员不能为空',
-        //         trigger: 'change',
-        //     },
-        // ],
-        // password: [
-        //   {required: true, message: "用户密码不能为空", trigger: "blur"},
-        //   {min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur'}
-        // ],
-        // email: [
-        //   {
-        //     type: "email",
-        //     message: "请输入正确的邮箱地址",
-        //     trigger: ["blur", "change"]
-        //   }
-        // ],
-        // phonenumber: [
-        //   {
-        //     pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-        //     message: "请输入正确的手机号码",
-        //     trigger: "blur"
-        //   }
-        // ]
-      },
-
-
-      companyId: undefined,
-      dialogImageUrl: "",
-      dialogVisible: false,
-      configOpen: false,
-      cform: {
-        price: "",
-        afterPrice: "",
-        useDate: "",
-      },
-      crules: {
-        leasePrice: [
-          {
-            required: true,
-            message: "调整后价格不能为空",
-            trigger: "blur",
-          },
-          // { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
-        ],
-        // effTime: [
-        //   {required: true, message: "开始日期不能为空", trigger: "blur"}
-        // ],
-      },
-
-
-      /* 新增弹框等数据源定义 */
-      addTitleVisible: false,
-      addTitle: "", // 新增弹框标题
-      addFormParams: {
-        label: "",
-        typeName: "",
-        companyId: 101,
-      },
-
       addFormParamsRules: {
         typeName: [
           {
             required: true,
-            message: "名称不能为空",
-            trigger: "blur",
-          },
-        ],
+            message: '名称不能为空',
+            trigger: 'blur'
+          }
+        ]
       },
-      isMousemoveId: null,
-      editTypeIds: [],
-      batchEdit: true,
-
-      maTypeProperties: [{'propertyName':'','mustHave': "0"}],
-      visiableAttr:false,
-      allPass:true,
-    };
+      addTitleVisible: false,
+      addTitle: ''
+    }
   },
   watch: {
-    // 根据名称筛选部门树
     typeName(val) {
-      this.$refs.tree.filter(val);
-    },
+      this.$refs.tree.filter(val)
+    }
   },
   created() {
-    this.getList();
-    this.getTreeData();
-    // this.getUserList()
-    // this.getPropData()
+    this.getTreeData()
+    this.getList()
   },
   methods: {
-    /** 查询用户列表--库管员，维修员 */
-    // getUserList() {
-    //     getMaUserList().then((response) => {
-    //         console.log(response, '库管员')
-    //         this.keeperList = response.data
-    //     })
-    //     getUserByRoleList({ roleIds: [133, 134] }).then((response) => {
-    //         console.log(response, '维修员')
-    //         this.repairUserList = response.data
-    //     })
-    // },
-    /** 查询新增页面-上级类型下拉树结构 */
-   async getTreeData() {
-      getMaTypeList().then((response) => {
-        this.treeOptions = [
-          {
-            label: "机具类型",
-            id: 0,
-            children: response.data,
-            level: 0,
-          },
-        ];
-      });
-    },
-    /** 查询资产属性下拉 */
-    // getPropData() {
-    //     getProLists().then((response) => {
-    //         this.propList = response.rows
-    //     })
-    // },
-    /** 查询列表 */
     getList() {
-      this.loading = true;
-      getListByMaType(this.queryParams).then((response) => {
-        this.typeList = response.data.rows;
-        this.total = response.data.total;
-        this.loading = false;
-      });
+      this.loading = true
+      getList(this.queryParams).then((response) => {
+        this.typeList = response.data.rows
+        this.total = response.data.total
+        this.loading = false
+      })
+    },
+    async getTreeData() {
+      const response = await getMaTypeList()
+      this.treeOptions = [
+        {
+          label: '机具类型',
+          id: 0,
+          children: response.data,
+          level: 0
+        }
+      ]
     },
-    // 筛选节点 - 左侧树
     filterNode(value, data) {
-      if (!value) return true;
-      return data.label.indexOf(value) !== -1;
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
     },
-    // 节点单击事件 - 左侧树
+
     handleNodeClick(data) {
-      this.queryParams.typeId = data.id;
-      this.queryParams.level = data.level;
-      this.handleQuery();
+      console.log('节点点击', data)
+      this.queryParams.typeId = data.id
+      this.queryParams.level = data.level
+      this.queryParams.typeName = data.label
+      this.getList()
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        photoUrl: "",
-        photoName: "",
-        documentUrl: "",
-        documentName: "",
-        parentId: "",
-      };
-      this.imageUrl = "";
-      this.fileList = [];
-      this.field101fileList = [];
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      // this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
+
     resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.queryParams.typeId = undefined;
-      this.queryParams.pageNum = 1;
-      this.queryParams.pageSize = 10;
-      this.queryParams.level = 0;
-      this.$refs.tree.setCurrentKey(null);
-      this.handleQuery();
+      this.dateRange = []
+      this.resetForm('queryForm')
+      this.queryParams.typeId = undefined
+      this.queryParams.pageNum = 1
+      this.queryParams.pageSize = 10
+      this.queryParams.level = 0
+      this.$refs.tree.setCurrentKey(null)
+      this.getList()
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection;
-      //   this.ids = selection.map((item) => item.typeId);
-      //   this.single = selection.length != 1;
-      //   this.multiple = !selection.length;
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const typeId = row.typeId || this.ids;
-      getMaType(typeId).then((response) => {
-        if (response.data.propId == 0) {
-          response.data.propId = null;
-        }
-        if (response.data.repairUserId == 0) {
-          response.data.repairUserId = null;
-        }
-        this.form = response.data;
-        if (this.form.documentUrl) {
-          let file = {
-            name: this.form.documentName,
-            type: this.form.documentUrl,
-          };
-          this.field101fileList.push(file);
-        } else {
-          this.field101fileList = [];
-        }
-
-        this.imageUrl = this.form.photoUrl;
-
-        console.log(row, "---");
-        this.getParentName(this.treeOptions, row.parentId);
-        // console.log(this.form, '表单数据--')
-
-        this.open = true;
-        this.title = "修改";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function () {
-      console.log(this.form, "提交参数---");
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          if (this.form.typeId != undefined) {
-            updateMaType(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-              this.getTreeData();
-            });
-          } else {
-            // this.form.companyId = this.companyId
-            addMaType(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-              this.getTreeData();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const typeIds = row.typeId;
-      this.$modal
-        .confirm("是否确认删除数据项？")
-        .then(function () {
-          return delMaType(typeIds);
-        })
-        .then(() => {
-          this.$modal.msgSuccess("删除成功");
-          this.getList();
-          this.getTreeData();
-        })
-        .catch(() => {});
-    },
-    //配置操作
-    handleConfig(row) {
-      this.resetForm("cform");
-      this.chosenTypeId = row.typeId;
-      this.leasePrice = row.leasePrice;
-      // this.cform.leasePrice = row.leasePrice;
-      this.$set(this.cform, "leasePrice", row.leasePrice);
-      this.configOpen = true;
-      this.title = "租赁价格调整";
-    },
-    submitConfig() {
-      let param = {
-        typeId: this.chosenTypeId,
-        effTime: this.cform.effTime,
-        leasePrice: this.cform.leasePrice,
-      };
-      console.log(param);
-      this.$refs["cform"].validate((valid) => {
-        if (valid) {
-          updateMaType(param).then((response) => {
-            this.$modal.msgSuccess("调整成功");
-            this.configOpen = false;
-            this.getList();
-            this.getTreeData();
-          });
-        }
-      });
-      // this.configOpen = false;
-    },
-    cancelConfig() {
-      this.configOpen = false;
-    },
-    // 图片上传
-    imgUpLoad(param, name, index) {
-      console.log(param, "image");
-      param.type = "ma";
-      // imgUpLoad(param)
-      //     .then((res) => {
-      //         if (res.code == 200) {
-      //             this.form.photoUrl = res.data.fileUrl
-      //             this.form.photoName = res.data.fileName
-      //             this.imageUrl = res.data.fileUrl
-      //             this.imageName = res.data.fileName
-      //         } else {
-      //             // this.$msgError(res.msg)
-      //             this.$modal.msgError(res.msg)
-      //         }
-      //     })
-      //     .catch((error) => {
-      //         // this.$msgError(error)
-      //         this.$modal.msgError(error)
-      //     })
-    },
-    handleAvatarSuccess(res, file) {
-      console.log("success");
-    },
-    handleRemove(file, fileList) {
-      console.log(file, fileList);
-      this.imageUrl = "";
-      this.form.photoUrl = "";
-      this.form.photoName = "";
-    },
-    //图片点击查看
-    handlePictureCardPreview(file) {
-      console.log(file);
-      this.dialogImageUrl = file.url;
-      this.dialogVisible = true;
-    },
-    //图片查看
-    openImg(url) {
-      this.dialogImageUrl = this.uploadUrl + url;
-      this.dialogVisible = true;
-    },
-    //文件上传
-    fileUpLoad(param, name, index) {
-      console.log(param, "fileUpLoad");
-      param.type = "ma";
-      // imgUpLoad(param)
-      //     .then((res) => {
-      //         if (res.code == 200) {
-      //             this.form.documentUrl = res.data.fileUrl
-      //             this.form.documentName = res.data.fileName
-      //             this.field101fileList[0] = param.file
-      //             console.log(this.field101fileList)
-      //         } else {
-      //             // this.$msgError(res.msg)
-      //             this.$modal.msgError(res.msg)
-      //         }
-      //     })
-      //     .catch((error) => {
-      //         // this.$msgError(error)
-      //         this.$modal.msgError(error)
-      //     })
-    },
-    exceedFile(files, fileList) {
-      this.$message.warning(
-        `只能选择 1 个文件导入，共选择了 ${
-          files.length + fileList.length
-        } 个文件`
-      );
-    },
-
-    /** 导出按钮操作 */
-    handleExport() {
-      // this.download('system/user/export', {
-      //   ...this.queryParams
-      // }, `user_${new Date().getTime()}.xlsx`)
-    },
-
-    /* 树节点操作 */
-    treeChange(val) {
-      console.log(val, "树节点");
-
-      this.form.companyId = val.companyId;
-    },
-
-    /* 树节点增加 */
     appendTreeNode(data) {
-      this.visiableAttr = false;
-      this.maTypeProperties = [];
-      if (data.level === 3) {
-        this.reset();
-        Object.assign(this.form, data);
-        this.form.parentId = data.id;
-        this.open = true;
-        this.title = "新增";
+      if (data.level == 3) {
+        const path = this.getParentNames(this.treeOptions, data.id)
+        data.major = path[1]
+        data.mainProcedure = path[2]
+        this.addChildOpen = true
+        this.addChildNode = data
       } else {
-        Object.assign(this.addFormParams, data);
-        this.addFormParams.typeName = "";
-        this.addTitle = "新增";
-        this.addTitleVisible = true;
+        this.addOpen = true
+        this.addParentNode = data
       }
     },
-    /* 树节点删除 */
-    removeTreeNode(data) {
-      // this.$message.success('删除--')
-      console.log(data, "删除时的数据源--");
-      this.$modal
-        .confirm("是否确认删除数据项？")
-        .then(function () {
-          return delMaType(data.id);
-        })
-        .then(() => {
-          this.$modal.msgSuccess("删除成功");
-          this.getTreeData();
-        })
-        .catch(() => {});
-    },
-    /* 树节点修改 */
-  async editTreeNode(data) {
-      await this.getTreeData()
-      if(data.level!=2){
-      this.visiableAttr = false;
-      this.maTypeProperties= []
-      Object.assign(this.addFormParams, data);
-      this.addTitle = "修改";
-      this.addFormParams.typeName = data.label;
-      this.addTitleVisible = true;
-      }else{
-      this.maTypeProperties= []
-      this.visiableAttr = true;
-      if(data.maTypeProperties!=null && data.maTypeProperties.length>0){
-        console.log('1111111',data.maTypeProperties)
-      this.maTypeProperties = data.maTypeProperties
-      }else{
-        this.maTypeProperties= [{'propertyName':'','mustHave':"0"}]
-      }
-      Object.assign(this.addFormParams, data);
-      this.addTitle = "修改";
-      this.addFormParams.typeName = data.label;
-      this.addTitleVisible = true;
-      }
-    },
-    /* 确定 */
-    onSubmit() {
-      const { id, typeName, parentId } = this.addFormParams;
-      const addParams = {
-        parentId: id,
-        typeName,
-      };
-      const editParams = {
-        typeId: id,
-        typeName,
-        parentId,
-        maTypeProperties:this.maTypeProperties,
-      };
 
-      this.$refs["addFormParamsRef"].validate( async(valid) => {
-        if (valid) {
-        if (this.$refs["maTypeRef"] && this.$refs["malypeRef"].length > 0){
-          await this.$refs["maTypeRef"].forEach((formRef)=>{
-            formRef.validate((validTemp)=>{
-              if(!validTemp){
-                  this.allPass = false;
-              }
-            })
-          })
-        }
-          if(this.allPass==true){
-           if (this.addTitle === "新增") {
-                const res = await addMaType(addParams);
-                if (res.code === 200) {
-                  this.$message.success("新增成功！");
-                  this.addTitleVisible = false;
-                  this.getTreeData();
-                }
-              } else {
-                const res = await updateMaType(editParams);
-                if (res.code === 200) {
-                  this.$message.success("修改成功！");
-                  this.addTitleVisible = false;
-                  this.getTreeData();
-                }
-                this.maTypeProperties = [];
-              }
-        }
-        }
-      });
+    editTreeNode(data) {
+      if (data.level == 4) {
+        const path = this.getParentNames(this.treeOptions, data.id || data.typeId)
+        data.major = path[1]
+        data.mainProcedure = path[2]
+        this.editChildOpen = true
+        this.editChildNode = data
+        console.log(data)
+      } else {
+        this.editOpen = true
+        this.editParentNode = data
+      }
     },
-    /* 取消 */
-    onCancel() {
-      this.addTitleVisible = false;
-      this.maTypeProperties = []
-    },
-    getParentName(list, id) {
-      try {
-        list.forEach((e) => {
-          if (e.id == id) {
-            this.form.label = e.label;
-            throw new Error();
-          } else {
-            if (e.children && e.children.length > 0) {
-              this.getParentName(e.children, id);
-            }
-          }
-        });
-      } catch (error) {}
+
+    removeTreeNode(data) {
+      this.$modal.confirm('是否确认删除数据项？')
+        .then(() => delMaType(data.id || data.typeId))
+        .then(() => {
+          this.$modal.msgSuccess('删除成功')
+          this.getTreeData()
+        })
+        .catch(() => {
+        })
     },
 
     onMousemove(data) {
-      this.isMousemoveId = data.id;
+      this.isMousemoveId = data.id
     },
     onMouseleave() {
-      this.isMousemoveId = null;
+      this.isMousemoveId = null
     },
+    refresh() {
+      this.getTreeData()
+      this.getList()
+    },
+    /**
+     * 根据节点ID查找完整父级路径名称
+     * @param {Array} treeData 树形数据
+     * @param {number} nodeId 要查找的节点ID
+     * @returns {Array} 从根节点到目标节点的名称路径数组
+     */
+    getParentNames(treeData, nodeId) {
+      const path = []
 
-    onBatchEditPrice() {
-      this.$message.closeAll();
-      if (this.ids.length < 1) {
-        this.$message.error("请勾选改价的设备");
-        return;
-      }
-      this.editPriceForm.leasePrice = "";
-      this.batchEdit = true;
-      this.editLeasePriceVisible = true;
-    },
-    onEditSubmit() {
-      this.$refs.editPriceFormRef.validate(async (valid) => {
-        if (valid) {
-          let typeIds = [];
-          if (this.batchEdit) {
-            typeIds = this.ids.map((e) => {
-              return e.typeId;
-            });
-          } else {
-            typeIds = this.editTypeIds;
+      function findNode(nodes, targetId) {
+        for (const node of nodes) {
+          // 如果找到目标节点
+          if (node.id === targetId) {
+            path.unshift(node.label) // 添加到路径开头
+            return true
           }
 
-          const params = {
-            typeIds,
-            leasePrice: this.editPriceForm.leasePrice * 1,
-          };
-          const res = await updateLeasePriceApi(params);
-          if (res.code === 200) {
-            this.$message.success("修改成功");
-            this.editLeasePriceVisible = false;
-            this.getList();
+          // 如果有子节点且在其中找到了目标
+          if (node.children && node.children.length > 0) {
+            if (findNode(node.children, targetId)) {
+              path.unshift(node.label) // 将当前节点添加到路径开头
+              return true
+            }
           }
         }
-      });
-    },
-    onEditCancel() {
-      this.editLeasePriceVisible = false;
-      this.$refs.editPriceFormRef.resetFields();
-    },
-    handleUpdateLeasePrice(row) {
-      this.editPriceForm.leasePrice = "";
-      this.batchEdit = false;
-      this.editTypeIds = [];
-      this.editTypeIds.push(row.typeId);
-      this.editLeasePriceVisible = true;
-    },
-
-    //新增属性
-    addPartItem() {
-      this.maTypeProperties.push({'propertyName':'','mustHave': "0"});
-    },
-    removePartItem(index) {
-      if (this.maTypeProperties.length > 1) {
-        this.maTypeProperties.splice(index, 1);
+        return false
       }
-    },
-  },
-};
+
+      findNode(treeData, nodeId)
+      console.log(path)
+      return path
+    }
+  }
+}
 </script>
+
 <style lang="scss" scoped>
 ::v-deep.el-table .fixed-width .el-button--mini {
   width: 60px !important;
@@ -1491,25 +395,29 @@ export default {
 }
 
 ::v-deep .btn-items .el-button + .el-button {
-  margin-left: 6px;
+  margin-left: 10px;
 }
+
 .btn-items {
   margin-left: 4px;
+
   .el-button--text {
     font-size: 16px;
   }
 }
+
+
 ::v-deep .el-tree .el-tree-node__expand-icon.expanded {
   -webkit-transform: rotate(0deg);
   transform: rotate(0deg);
 }
+
 ::v-deep .el-tree .el-icon-caret-right:before {
   content: "\e783";
   font-size: 16px;
 }
-::v-deep
-  .el-tree
-  .el-tree-node__expand-icon.expanded.el-icon-caret-right:before {
+
+::v-deep .el-tree .el-tree-node__expand-icon.expanded.el-icon-caret-right:before {
   content: "\e781";
   font-size: 16px;
   color: #1890ff;
@@ -1518,14 +426,24 @@ export default {
 ::v-deep .el-tree-node__content > .el-tree-node__expand-icon {
   color: #1890ff !important;
 }
+
 ::v-deep .el-tree-node__expand-icon.is-leaf {
   color: transparent !important;
 }
 
-::v-deep
-  .el-tree--highlight-current
-  .el-tree-node.is-current
-  > .el-tree-node__content {
+::v-deep .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
   background-color: #8decf1;
 }
+
+
+::v-deep .el-tree {
+  height: 300px;
+  overflow-y: scroll; /* 必须保留scroll而不是auto */
+  scrollbar-width: none; /* Firefox */
+  -ms-overflow-style: none; /* IE/Edge */
+}
+
+::v-deep .el-tree::-webkit-scrollbar {
+  display: none; /* Chrome/Safari/Opera */
+}
 </style>
diff --git a/src/views/lessor/equipment/equipType/index1.vue b/src/views/lessor/equipment/equipType/index1.vue
new file mode 100644
index 00000000..670de631
--- /dev/null
+++ b/src/views/lessor/equipment/equipType/index1.vue
@@ -0,0 +1,1228 @@
+<template>
+  <!-- 类型管理 -->
+  <div class="app-container" id="toolsType">
+    <el-row :gutter="20">
+      <!--树数据-->
+      <el-col :span="5" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="typeName"
+            placeholder="请输入类型名称"
+            clearable
+            maxlength="50"
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container" style>
+          <el-tree
+            style="height: 700px; overflow: scroll"
+            :data="treeOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            node-key="id"
+            default-expand-all
+            highlight-current
+            @node-click="handleNodeClick"
+          >
+            <span
+              class="custom-tree-node"
+              slot-scope="{ node, data }"
+              @mousemove="onMousemove(data)"
+              @mouseleave="onMouseleave()"
+            >
+              <span v-if="isMousemoveId === data.id && node.label.length > 5">{{
+                  node.label.slice(0, 3) + '...'
+                }}</span>
+              <span v-else>{{ node.label }}</span>
+
+              <span class="btn-items" v-if="isMousemoveId === data.id">
+                <el-button
+                  type="text"
+                  size="mini"
+                  icon="el-icon-plus"
+                  @click.stop="() => appendTreeNode(data)"
+                >
+                </el-button>
+                <el-button
+                  type="text"
+                  size="mini"
+                  icon="el-icon-edit-outline"
+                  style="color: #67c23a"
+                  v-if="data.id !== 0"
+                  @click.stop="() => editTreeNode(data)"
+                >
+                </el-button>
+                <el-button
+                  type="text"
+                  size="mini"
+                  icon="el-icon-delete"
+                  style="color: #f56c6c"
+                  v-if="data.id !== 0"
+                  @click.stop="() => removeTreeNode(data)"
+                >
+                </el-button>
+              </span>
+            </span>
+          </el-tree>
+        </div>
+      </el-col>
+      <!--用户数据-->
+      <el-col :span="19" :xs="24">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
+          <el-form-item label="关键字" prop="typeName">
+            <el-input
+              v-model="queryParams.typeName"
+              placeholder="请输入关键字"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+            >查询
+            </el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置
+            </el-button
+            >
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-edit"
+              size="mini"
+              @click="onBatchEditPrice"
+            >批量修改租赁价
+            </el-button
+            >
+          </el-col>
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+          ></right-toolbar>
+        </el-row>
+
+        <el-table
+          v-loading="loading"
+          :data="typeList"
+          border
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="50" align="center"/>
+          <el-table-column
+            label="名称"
+            align="center"
+            key="typeName"
+            prop="typeName"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="计量单位"
+            align="center"
+            key="unitName"
+            prop="unitName"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="内部租赁价"
+            align="center"
+            key="leasePrice"
+            prop="leasePrice"
+            show-overflow-tooltip
+            width="100"
+          />
+          <el-table-column
+            label="管理模式"
+            align="center"
+            key="manageType"
+            prop="manageType"
+          >
+            <template slot-scope="{ row }">
+              <el-tag size="mini" v-if="row.manageType == '0'">
+                编码管理
+              </el-tag>
+              <el-tag size="mini" type="success" v-if="row.manageType == '1'">
+                数量管理
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="厂家规格型号"
+            align="center"
+            key="facModel"
+            prop="facModel"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="备注信息"
+            align="center"
+            key="remark"
+            prop="remark"
+            show-overflow-tooltip
+          />
+
+          <el-table-column label="操作" align="center" width="180">
+            <template slot-scope="scope" v-if="scope.row.typeId !== 1">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleConfig(scope.row)"
+                v-hasPermi="['machinery:type:config']"
+              >
+                配置
+              </el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['machinery:type:edit']"
+              >
+                修改
+              </el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['machinery:type:del']"
+              >
+                删除
+              </el-button>
+
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdateLeasePrice(scope.row)"
+                v-hasPermi="['machinery:type:edit']"
+              >
+                租赁改价
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+
+    <!-- 添加或修改用户配置对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="850px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="所属上级" prop="parentId">
+              <el-input v-model="form.label" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="typeName">
+              <el-input
+                v-model="form.typeName"
+                placeholder="请输入名称"
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="内部租赁价" prop="leasePrice">
+              <el-input
+                v-model="form.leasePrice"
+                type="number"
+                placeholder="请输入租赁价格"
+                maxlength="10"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="管理模式" prop="manageType">
+              <el-select
+                v-model="form.manageType"
+                filterable
+                placeholder="请选择管理模式"
+                style="width: 100%"
+              >
+                <el-option value="0" label="编码管理">编码管理</el-option>
+                <el-option value="1" label="数量管理">数量管理</el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="计量单位" prop="unitName">
+              <el-input
+                v-model="form.unitName"
+                placeholder="请输入计量单位"
+                maxlength="20"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="厂家规格型号" prop="facModel">
+              <el-input
+                v-model="form.facModel"
+                placeholder="请输入厂家规格型号"
+                maxlength="100"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入备注内容"
+                maxlength="150"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="检测预警天数" prop="maintenanceAlarmDay">
+              <el-input
+                v-model="form.maintenanceAlarmDay"
+                placeholder="请输入检测预警天数"
+                maxlength="100"
+                type="number"
+                min="1"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible.sync="dialogVisible">
+      <img width="100%" height="650px" :src="dialogImageUrl" alt/>
+    </el-dialog>
+
+    <!--    配置弹窗  -->
+    <el-dialog
+      :title="title"
+      :visible.sync="configOpen"
+      width="650px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form ref="cform" :model="cform" :rules="crules" label-width="110px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="调整前价格">
+              <el-input
+                v-model="leasePrice"
+                placeholder="调整前价格"
+                disabled
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="调整后价格" prop="leasePrice">
+              <el-input-number
+                v-model="cform.leasePrice"
+                style="width: 100%"
+                controls-position="right"
+                :min="0"
+                maxlength="10"
+              ></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="开始使用日期" prop="effTime">
+              <el-date-picker
+                v-model="cform.effTime"
+                style="width: 100%"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                type="datetime"
+                placeholder="开始使用日期"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitConfig">确 定</el-button>
+        <el-button @click="cancelConfig">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 新增弹框 -->
+    <el-dialog
+      :title="addTitle"
+      :visible.sync="addTitleVisible"
+      v-if="addTitleVisible"
+      width="50%"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        label-width="80px"
+        :model="addFormParams"
+        :rules="addFormParamsRules"
+        ref="addFormParamsRef"
+      >
+        <el-row :gutter="24">
+          <el-col :span="12" v-if="addTitle === '新增'">
+            <el-form-item label="所属上级">
+              <el-input
+                style="width: 100%"
+                disabled
+                v-model="addFormParams.label"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="typeName">
+              <el-input style="width: 100%" v-model="addFormParams.typeName"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col
+            :span="24"
+            style="
+                    margin-bottom: 10px;
+                    display: flex;
+                    justify-content: left;
+                    align-items: center;
+                  "
+          >
+            <el-button
+              v-if="visiableAttr"
+              class="primary-lease"
+              type="primary"
+              @click="addPartItem"
+            >
+              新增属性
+            </el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-form
+        label-width="80px"
+        v-for="(item, index) in maTypeProperties"
+        :key="index"
+        :model="item"
+        :rules="maTypeRules"
+        ref="maTypeRef"
+        class="dynamic-item"
+      >
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="属性描述" prop="propertyName">
+              <el-input
+                v-model="item.propertyName"
+                placeholder="请输入"
+                maxlength="20"
+                style="width: 100%"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否必填" prop="mustHave">
+              <el-radio-group v-model="item.mustHave">
+                <el-radio label="1">是</el-radio>
+                <el-radio label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" v-if="index !== 0">
+            <el-button
+              size="small"
+              type="danger"
+              class="primary-lease"
+              @click="removePartItem(index)"
+            >
+              移除
+            </el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-row style="text-align: right">
+
+        <el-button size="small" type="primary" @click="onSubmit"
+        >确 定
+        </el-button
+        >
+        <el-button size="small" @click="onCancel">取 消</el-button>
+      </el-row>
+    </el-dialog>
+
+    <!-- 修改价格弹框 -->
+    <el-dialog
+      title="修改租赁价"
+      :visible.sync="editLeasePriceVisible"
+      v-if="editLeasePriceVisible"
+      width="30%"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        :inline="true"
+        :model="editPriceForm"
+        ref="editPriceFormRef"
+        :rules="editPriceFormRules"
+      >
+        <el-form-item label="修改后租赁价" prop="leasePrice">
+          <el-input v-model="editPriceForm.leasePrice"/>
+        </el-form-item>
+        <el-row style="text-align: right">
+          <el-form-item>
+            <el-button size="small" @click="onEditCancel">取 消</el-button>
+            <el-button size="small" type="primary" @click="onEditSubmit"
+            >确 定
+            </el-button
+            >
+          </el-form-item>
+        </el-row>
+      </el-form>
+    </el-dialog>
+    <addNode :visible.sync="addOpen" :parentNode="addParentNode"/>
+  </div>
+</template>
+
+<script>
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import {
+  getListByMaType,
+  getMaTypeList,
+  getMaType,
+  addMaType,
+  updateMaType,
+  delMaType,
+  updateLeasePriceApi
+} from '@/api/lessor/equipType'
+import AddNode from '@/views/lessor/equipment/equipType/child/addNode.vue'
+
+export default {
+  name: 'ToolsType',
+  components: { AddNode, Treeselect },
+  data() {
+    return {
+      editPriceForm: {
+        leasePrice: ''
+      },
+      editLeasePriceVisible: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 库管员用户数据
+      keeperList: null,
+      //维修员用户数据
+      repairUserList: null,
+      //资产类型数据
+      propList: null,
+      // 类型名称
+      typeName: undefined,
+      // 树选项
+      treeOptions: undefined,
+      //列表数据
+      typeList: undefined,
+      // 是否显示弹出层
+      open: false,
+      // 弹出层标题
+      title: '',
+      // 默认密码
+      initPassword: undefined,
+      // 日期范围
+      dateRange: [],
+      // 岗位选项
+      postOptions: [],
+      // 角色选项
+      roleOptions: [],
+      // 表单参数
+      form: {
+        companyId: ''
+      },
+      chosenTypeId: '',
+      leasePrice: '',
+      uploadHeader: process.env.VUE_APP_BASE_API,
+      imageUrl: '',
+      imageName: '',
+      fileList: [],
+      field101fileList: [],
+      //上传地址
+      // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
+      // uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
+      // uploadUrl:'http://192.168.5.12:9201',//本地测试
+      uploadUrl: process.env.VUE_APP_BASE_API + '/system', // 上传的图片服务器地址
+      defaultProps: {
+        children: 'children',
+        label: 'label'
+      },
+
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        typeName: undefined,
+        level: 0
+      },
+
+      editPriceFormRules: {
+        leasePrice: [
+          {
+            required: true,
+            message: '请输入修改后租赁价格',
+            trigger: 'blur'
+          },
+          {
+            pattern: /^(0(\.\d{0,2})?|([1-9]\d*)(\.\d{0,2})?)$/,
+            message: '请输入正确的费用金额，最多两位小数点',
+            trigger: 'blur'
+          }
+        ]
+      },
+
+      maTypeRules: {
+        propertyName: [
+          {
+            required: true,
+            message: '属性描述不能为空',
+            trigger: 'blur'
+          }
+        ],
+        mustHave: [
+          {
+            required: true,
+            message: '请选择是否为空',
+            trigger: 'blur'
+          }
+        ]
+      },
+
+      // 表单校验
+      rules: {
+        typeName: [
+          {
+            required: true,
+            message: '设备名称不能为空',
+            trigger: 'blur'
+          },
+          {
+            min: 2,
+            max: 20,
+            message: '设备名称长度必须介于 2 和 20 之间',
+            trigger: 'blur'
+          }
+        ],
+        parentId: [
+          {
+            required: true,
+            message: '所属上级不能为空',
+            trigger: 'blur'
+          }
+        ],
+        manageType: [
+          {
+            required: true,
+            message: '请选择管理模式',
+            trigger: 'change'
+          }
+        ],
+        leasePrice: [
+          {
+            required: true,
+            message: '内部租赁价格不能为空',
+            trigger: 'blur'
+          }
+        ],
+        unitName: [
+          {
+            required: true,
+            message: '计量单位不能为空',
+            trigger: 'blur'
+          }
+        ],
+        maintenanceAlarmDay: [
+          {
+            required: true,
+            message: '检测预警天数不能为空',
+            trigger: 'blur'
+          }
+        ]
+      },
+
+      addOpen: false,
+      addParentNode: {},
+      companyId: undefined,
+      dialogImageUrl: '',
+      dialogVisible: false,
+      configOpen: false,
+      cform: {
+        price: '',
+        afterPrice: '',
+        useDate: ''
+      },
+      crules: {
+        leasePrice: [
+          {
+            required: true,
+            message: '调整后价格不能为空',
+            trigger: 'blur'
+          }
+        ]
+      },
+
+      /* 新增弹框等数据源定义 */
+      addTitleVisible: false,
+      addTitle: '', // 新增弹框标题
+      addFormParams: {
+        label: '',
+        typeName: '',
+        companyId: 101
+      },
+
+      addFormParamsRules: {
+        typeName: [
+          {
+            required: true,
+            message: '名称不能为空',
+            trigger: 'blur'
+          }
+        ]
+      },
+      isMousemoveId: null,
+      editTypeIds: [],
+      batchEdit: true,
+
+      maTypeProperties: [{ 'propertyName': '', 'mustHave': '0' }],
+      visiableAttr: false,
+      allPass: true
+    }
+  },
+  watch: {
+    // 根据名称筛选部门树
+    typeName(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
+  created() {
+    this.getList()
+    this.getTreeData()
+  },
+  methods: {
+    /** 查询新增页面-上级类型下拉树结构 */
+    async getTreeData() {
+      getMaTypeList().then((response) => {
+        this.treeOptions = [
+          {
+            label: '机具类型',
+            id: 0,
+            children: response.data,
+            level: 0
+          }
+        ]
+      })
+    },
+    /** 查询列表 */
+    getList() {
+      this.loading = true
+      getListByMaType(this.queryParams).then((response) => {
+        this.typeList = response.data.rows
+        this.total = response.data.total
+        this.loading = false
+      })
+    },
+    // 筛选节点 - 左侧树
+    filterNode(value, data) {
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
+    },
+    // 节点单击事件 - 左侧树
+    handleNodeClick(data) {
+      this.queryParams.typeId = data.id
+      this.queryParams.level = data.level
+      this.handleQuery()
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        photoUrl: '',
+        photoName: '',
+        documentUrl: '',
+        documentName: '',
+        parentId: ''
+      }
+      this.imageUrl = ''
+      this.fileList = []
+      this.field101fileList = []
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = []
+      this.resetForm('queryForm')
+      this.queryParams.typeId = undefined
+      this.queryParams.pageNum = 1
+      this.queryParams.pageSize = 10
+      this.queryParams.level = 0
+      this.$refs.tree.setCurrentKey(null)
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '新增'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const typeId = row.typeId || this.ids
+      getMaType(typeId).then((response) => {
+        if (response.data.propId == 0) {
+          response.data.propId = null
+        }
+        if (response.data.repairUserId == 0) {
+          response.data.repairUserId = null
+        }
+        this.form = response.data
+        if (this.form.documentUrl) {
+          let file = {
+            name: this.form.documentName,
+            type: this.form.documentUrl
+          }
+          this.field101fileList.push(file)
+        } else {
+          this.field101fileList = []
+        }
+
+        this.imageUrl = this.form.photoUrl
+
+        console.log(row, '---')
+        this.getParentName(this.treeOptions, row.parentId)
+        // console.log(this.form, '表单数据--')
+
+        this.open = true
+        this.title = '修改'
+      })
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      console.log(this.form, '提交参数---')
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          if (this.form.typeId != undefined) {
+            updateMaType(this.form).then((response) => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+              this.getTreeData()
+            })
+          } else {
+            addMaType(this.form).then((response) => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+              this.getTreeData()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const typeIds = row.typeId
+      this.$modal
+        .confirm('是否确认删除数据项？')
+        .then(function() {
+          return delMaType(typeIds)
+        })
+        .then(() => {
+          this.$modal.msgSuccess('删除成功')
+          this.getList()
+          this.getTreeData()
+        })
+        .catch(() => {
+        })
+    },
+    //配置操作
+    handleConfig(row) {
+      this.resetForm('cform')
+      this.chosenTypeId = row.typeId
+      this.leasePrice = row.leasePrice
+      this.$set(this.cform, 'leasePrice', row.leasePrice)
+      this.configOpen = true
+      this.title = '租赁价格调整'
+    },
+    submitConfig() {
+      let param = {
+        typeId: this.chosenTypeId,
+        effTime: this.cform.effTime,
+        leasePrice: this.cform.leasePrice
+      }
+      console.log(param)
+      this.$refs['cform'].validate((valid) => {
+        if (valid) {
+          updateMaType(param).then((response) => {
+            this.$modal.msgSuccess('调整成功')
+            this.configOpen = false
+            this.getList()
+            this.getTreeData()
+          })
+        }
+      })
+    },
+    cancelConfig() {
+      this.configOpen = false
+    },
+    // 图片上传
+    imgUpLoad(param, name, index) {
+      console.log(param, 'image')
+      param.type = 'ma'
+    },
+    handleAvatarSuccess(res, file) {
+      console.log('success')
+    },
+    handleRemove(file, fileList) {
+      console.log(file, fileList)
+      this.imageUrl = ''
+      this.form.photoUrl = ''
+      this.form.photoName = ''
+    },
+    //图片点击查看
+    handlePictureCardPreview(file) {
+      console.log(file)
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    //图片查看
+    openImg(url) {
+      this.dialogImageUrl = this.uploadUrl + url
+      this.dialogVisible = true
+    },
+    //文件上传
+    fileUpLoad(param, name, index) {
+      console.log(param, 'fileUpLoad')
+      param.type = 'ma'
+    },
+    exceedFile(files, fileList) {
+      this.$message.warning(
+        `只能选择 1 个文件导入，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      )
+    },
+
+    /** 导出按钮操作 */
+    handleExport() {
+
+    },
+
+    /* 树节点操作 */
+    treeChange(val) {
+      console.log(val, '树节点')
+
+      this.form.companyId = val.companyId
+    },
+
+    /* 树节点增加 */
+    appendTreeNode(data) {
+      // this.visiableAttr = false
+      this.maTypeProperties = []
+      if (data.level === 4) {
+        this.reset()
+        Object.assign(this.form, data)
+        this.form.parentId = data.id
+        this.open = true
+        this.title = '新增'
+      } else {
+        this.addOpen = true
+        this.addParentNode = data
+      }
+    },
+    /* 树节点删除 */
+    removeTreeNode(data) {
+      this.$modal
+        .confirm('是否确认删除数据项？')
+        .then(function() {
+          return delMaType(data.id)
+        })
+        .then(() => {
+          this.$modal.msgSuccess('删除成功')
+          this.getTreeData()
+        })
+        .catch(() => {
+        })
+    },
+    /* 树节点修改 */
+    async editTreeNode(data) {
+      await this.getTreeData()
+      if (data.level != 2) {
+        this.visiableAttr = false
+        this.maTypeProperties = []
+        Object.assign(this.addFormParams, data)
+        this.addTitle = '修改'
+        this.addFormParams.typeName = data.label
+        this.addTitleVisible = true
+      } else {
+        this.maTypeProperties = []
+        this.visiableAttr = true
+        if (data.maTypeProperties != null && data.maTypeProperties.length > 0) {
+          this.maTypeProperties = data.maTypeProperties
+        } else {
+          this.maTypeProperties = [{ 'propertyName': '', 'mustHave': '0' }]
+        }
+        Object.assign(this.addFormParams, data)
+        this.addTitle = '修改'
+        this.addFormParams.typeName = data.label
+        this.addTitleVisible = true
+      }
+    },
+    /* 确定 */
+    onSubmit() {
+      const { id, typeName, parentId } = this.addFormParams
+      const addParams = {
+        parentId: id,
+        typeName
+      }
+      const editParams = {
+        typeId: id,
+        typeName,
+        parentId,
+        maTypeProperties: this.maTypeProperties
+      }
+
+      this.$refs['addFormParamsRef'].validate(async(valid) => {
+        if (valid) {
+          if (this.$refs['maTypeRef'] && this.$refs['malypeRef'].length > 0) {
+            await this.$refs['maTypeRef'].forEach((formRef) => {
+              formRef.validate((validTemp) => {
+                if (!validTemp) {
+                  this.allPass = false
+                }
+              })
+            })
+          }
+          if (this.allPass == true) {
+            if (this.addTitle === '新增') {
+              const res = await addMaType(addParams)
+              if (res.code === 200) {
+                this.$message.success('新增成功！')
+                this.addTitleVisible = false
+                this.getTreeData()
+              }
+            } else {
+              const res = await updateMaType(editParams)
+              if (res.code === 200) {
+                this.$message.success('修改成功！')
+                this.addTitleVisible = false
+                this.getTreeData()
+              }
+              this.maTypeProperties = []
+            }
+          }
+        }
+      })
+    },
+    /* 取消 */
+    onCancel() {
+      this.addTitleVisible = false
+      this.maTypeProperties = []
+    },
+    getParentName(list, id) {
+      try {
+        list.forEach((e) => {
+          if (e.id == id) {
+            this.form.label = e.label
+            throw new Error()
+          } else {
+            if (e.children && e.children.length > 0) {
+              this.getParentName(e.children, id)
+            }
+          }
+        })
+      } catch (error) {
+      }
+    },
+
+    onMousemove(data) {
+      this.isMousemoveId = data.id
+    },
+    onMouseleave() {
+      this.isMousemoveId = null
+    },
+
+    onBatchEditPrice() {
+      this.$message.closeAll()
+      if (this.ids.length < 1) {
+        this.$message.error('请勾选改价的设备')
+        return
+      }
+      this.editPriceForm.leasePrice = ''
+      this.batchEdit = true
+      this.editLeasePriceVisible = true
+    },
+    onEditSubmit() {
+      this.$refs.editPriceFormRef.validate(async(valid) => {
+        if (valid) {
+          let typeIds = []
+          if (this.batchEdit) {
+            typeIds = this.ids.map((e) => {
+              return e.typeId
+            })
+          } else {
+            typeIds = this.editTypeIds
+          }
+
+          const params = {
+            typeIds,
+            leasePrice: this.editPriceForm.leasePrice * 1
+          }
+          const res = await updateLeasePriceApi(params)
+          if (res.code === 200) {
+            this.$message.success('修改成功')
+            this.editLeasePriceVisible = false
+            this.getList()
+          }
+        }
+      })
+    },
+    onEditCancel() {
+      this.editLeasePriceVisible = false
+      this.$refs.editPriceFormRef.resetFields()
+    },
+    handleUpdateLeasePrice(row) {
+      this.editPriceForm.leasePrice = ''
+      this.batchEdit = false
+      this.editTypeIds = []
+      this.editTypeIds.push(row.typeId)
+      this.editLeasePriceVisible = true
+    },
+
+    //新增属性
+    addPartItem() {
+      this.maTypeProperties.push({ 'propertyName': '', 'mustHave': '0' })
+    },
+    removePartItem(index) {
+      if (this.maTypeProperties.length > 1) {
+        this.maTypeProperties.splice(index, 1)
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+
+::v-deep .btn-items .el-button + .el-button {
+  margin-left: 6px;
+}
+
+.btn-items {
+  margin-left: 4px;
+
+  .el-button--text {
+    font-size: 16px;
+  }
+}
+
+::v-deep .el-tree .el-tree-node__expand-icon.expanded {
+  -webkit-transform: rotate(0deg);
+  transform: rotate(0deg);
+}
+
+::v-deep .el-tree .el-icon-caret-right:before {
+  content: "\e783";
+  font-size: 16px;
+}
+
+::v-deep
+.el-tree
+.el-tree-node__expand-icon.expanded.el-icon-caret-right:before {
+  content: "\e781";
+  font-size: 16px;
+  color: #1890ff;
+}
+
+::v-deep .el-tree-node__content > .el-tree-node__expand-icon {
+  color: #1890ff !important;
+}
+
+::v-deep .el-tree-node__expand-icon.is-leaf {
+  color: transparent !important;
+}
+
+::v-deep
+.el-tree--highlight-current
+.el-tree-node.is-current
+> .el-tree-node__content {
+  background-color: #8decf1;
+}
+</style>