Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-09 c4355a18506cf0e8f63469a8a38f2e8d5e67d6f9

 src/components/view/laboratoryManagement.vue

@@ -1,7 +1,7 @@
<template>
  <div>
    <el-row>
      <el-col :span="12" class="top_left_name">实验室管理</el-col>
      <el-col :span="12" class="top_left_name">设备维护</el-col>
      <el-col :span="12" style="text-align: right;">
        <el-button
          @click="testItem()"
@@ -224,9 +224,9 @@
              ></i>
              {{ data.father }}</span
            >
            <el-button type="text" size="mini" @click.stop="remove(node, data)">
           <!--  <el-button type="text" size="mini" @click.stop="remove(node, data)">
              <i class="el-icon-delete"></i>
            </el-button>
            </el-button> -->
          </div>
        </el-tree>
      </div>
@@ -427,7 +427,7 @@
        equr:1,
      },
      delete:{},
      equip:[],
      equip:1,
      rules: {
        name: [
          { required: true, message: "请输入仪器设备编号", trigger: "blur" },
@@ -465,12 +465,20 @@
      }
    };
  },
  mounted() {
    // 初始化调用二级树
    this.twoTreeApi();
    // 初始化调用表格数据
    // this.tableDataApi();
    this.selectDevice()//右边
  },
  methods: {
    selectDevice() {//右边数据
      console.log(this.$api.url.selectDevice);
      console.log(this.ruleForm.treedata.father);
      console.log(this.equip);
      this.$axios.get(this.$api.url.selectDevice,{
        params:{
          father:this.treedata.father,
          father:this.ruleForm.treedata.father,
          type:this.equip,
        }
      }).then(res =>{
@@ -582,7 +590,7 @@
    },
    handleNodeClick(data) {
      console.log(data);
        this.treedata = data
        // this.treedata = data
        this.selectDevice()
    },
    handlerDeptList() {
@@ -720,13 +728,7 @@
        });
    }
  },
  mounted() {
    // 初始化调用二级树
    this.twoTreeApi();
    // 初始化调用表格数据
    this.tableDataApi();
    this.selectDevice()//右边
  },
 
  watch: {
    "ruleForm.rawInsProductId": {
      //监听ruleForm.rawInsProductId