Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

zouyu

2023-09-14 14b0c0560fede0fedac2282bf8ca6dd463a6b52f

Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

 src/components/view/laboratoryManagement.vue

@@ -51,8 +51,11 @@
            <el-row>
              <el-col :span="12">
                <el-form-item label="设备组" prop="name">
                  <el-select
                  <!-- <el-select
                    v-model="ruleForm.equr"
                    allow-create
                    filterable
                    @blur="selectInput"
                    placeholder="请选择设备组"
                  >
                    <el-option
@@ -62,7 +65,13 @@
                      :value="list"
                    >
                    </el-option>
                  </el-select>
                  </el-select> -->
                <el-autocomplete 
                class="inline-input"
                v-model="ruleForm.equr"
                :fetch-suggestions="querySearch"
                 placeholder="请输入内容"
    ></el-autocomplete>
                </el-form-item>
              </el-col>
              <el-col :span="12">
@@ -414,7 +423,7 @@
      // BOM树数据结构
      towTree: [],
      equipment: '1',
      equaip:'',
      equaip:[],
      ruleForm: {
        // 新增仪器表单
        code: "",
@@ -484,7 +493,21 @@
      console.log(this.checkTreeNode);
        this.selectDevice()
    },
    selectInput(){
   
    },
    querySearch(queryString, cb) {
      console.log(this.equaip);
        var restaurants = this.equaip;
        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
        // 调用 callback 返回建议列表的数据
        cb(results);
      },
      createFilter(queryString) {
        return (restaurant) => {
          return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
        };
      },
    staueValueChange() {
      this.selectDevice()
      // this.tableData = [];
@@ -557,8 +580,14 @@
              type:this.equip
            }
        }).then(res =>{
            this.equaip = res.data
            console.log(this.equip);
          res.data.forEach(item=>{
            let obj={
              id: item,
              value: item
            }
            this.equaip.push(obj)
            console.log("设备组",this.equip);
          })
        })
    },
    RadioChange(val){

 src/components/view/sale.vue

@@ -562,6 +562,7 @@
                        type: 1
                    }).then(res => {
                        this.selectRawInspectsList()
                        this.$parent.removeAllTab()
                    })
                }).catch(e => {
                    if (e == 'cancel') {

 src/components/view/technical.vue

@@ -39,6 +39,7 @@
    <div class="technical-table">
      <div class="table-box">
        <el-table
        height="490"
          border style="width: 100%"
          :data="technicalTable"
          >
@@ -379,7 +380,7 @@
/* 技术文件表格样式 */
.technical-table{
  margin-top: 11px;
  height: calc(100% - 140px);
  /* height: calc(100% - 140px); */
  background: #fff;
  padding: 23px 21px ;
  font-size: 14px;

 src/components/view/technology.vue

@@ -361,6 +361,7 @@
                v-model="form.father"
                allow-create
                filterable
                @create=""
                placeholder="请选择"
                style="width: 480px"
              >