王震
2023-09-15 3f783b4c4a8b23045e67d664cf78c022410e62fc
改bug
已修改3个文件
104 ■■■■ 文件已修改
src/components/view/laboratoryManagement.vue 56 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/record-content.vue 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/technology.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/laboratoryManagement.vue
@@ -51,11 +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"
                    @create=""
                    placeholder="请选择设备组"
                  >
                    <el-option
@@ -65,13 +65,13 @@
                      :value="list"
                    >
                    </el-option>
                  </el-select> -->
                <el-autocomplete
                  </el-select>
                <!-- <el-autocomplete
                class="inline-input"
                v-model="ruleForm.equr"
                :fetch-suggestions="querySearch"
                 placeholder="请输入内容"
    ></el-autocomplete>
    ></el-autocomplete> -->
                </el-form-item>
              </el-col>
              <el-col :span="12">
@@ -496,18 +496,18 @@
    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);
        };
      },
    // 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 = [];
@@ -579,15 +579,17 @@
            params:{
              type:this.equip
            }
        }).then(res =>{
          res.data.forEach(item=>{
            let obj={
              id: item,
              value: item
            }
            this.equaip.push(obj)
            console.log("设备组",this.equip);
          })
        })
        .then(res =>{
          this.equaip = res.data
          // res.data.forEach(item=>{
          //   let obj={
          //     id: item,
          //     value: item
          //   }
          //   this.equaip.push(obj)
            console.log(this.equaip);
          // })
        })
    },
    RadioChange(val){
@@ -669,9 +671,9 @@
        type:this.ruleForm.type,
      }, {headers: {"Content-Type": "application/json"}
    }).then(res =>{
      this.selectDevice()
      this.$message.success('新增成功')
      this.ruleForm = {}
      this.selectDevice()
    })
    },
    // tableDataApi() {
src/components/view/record-content.vue
@@ -144,7 +144,7 @@
        ref="ruleForm" width="35%">
            <div>
                <el-form ref="form" :model="form" label-width="80px">
                <el-form-item label="类型">
                <el-form-item label="类型" prop="type">
                    <template>
                        <el-select v-model="form.type"  
                        @change="edittype" placeholder="请选择" style="width: 480px;">
@@ -155,7 +155,7 @@
                        </el-select>
                        </template>
                </el-form-item>
                <el-form-item label="工序">
                <el-form-item label="工序" prop="work">
                    <template>
                        <el-select v-model="form.work"
                        @change="workevent"
@@ -169,7 +169,7 @@
                        </el-select>
                        </template>
                </el-form-item>
                <el-form-item label="工艺名称">
                <el-form-item label="工艺名称" prop="name">
                    <template>
                        <el-select v-model="form.craft" placeholder="请选择" style="width: 480px;">
                            <el-option
@@ -181,13 +181,13 @@
                        </el-select>
                        </template>
                </el-form-item>
                <el-form-item label="记录">
                <el-form-item label="记录" prop="record">
                    <el-input v-model="form.record"></el-input>
                </el-form-item>
                <el-form-item label="备注">
                    <el-input v-model="form.remarks"></el-input>
                </el-form-item>
                <el-form-item label="单位">
                <el-form-item label="单位" prop="unit">
                    <el-input v-model="form.unit"></el-input>
                </el-form-item>
                </el-form>
@@ -260,7 +260,14 @@
<script>
    export default {
        data() {
            return {
            var checktype = (rule, value, callback) => {
                    if (!value) {
                  return callback(new Error('类型不能为空'));
                }else{
                    return callback
                }
            };
            return {
                search: {
                    type: 0,
                    technology: null
@@ -278,7 +285,7 @@
                    unit:'',
                },
                Rules:{
                    type:{required:true,message:'类型不能为空',trigger:'change'},
                    type:{validator:checktype,required:true,message:'类型不能为空',trigger:'change'},
                    work:{required:true,message:'工序不能为空',trigger:'change'},
                    name:{required:true,message:'工艺不能为空',trigger:'change'},
                    record:{required:true,message:'记录不能为空',trigger:'blur'},
@@ -367,22 +374,19 @@
                    this.selectjilu()
                })
            },
            add() {
                this.$refs[formName].validate((valid) => {
                if (valid) {
                    alert('submit!');
                } else {
                    console.log('error submit!!');
                    return false;
                }
                });
            add(formName) {
                this.dialogVisible = false
                this.addRecord()
                // this.$refs[formName].validate((valid) => {
                // if (valid) {
                //     alert('submit!');
                // } else {
                //     console.log('error submit!!');
                //     return false;
                // }
                // });
                this.form = {};
            },
            resetForm(formName) {
                this.$refs[formName].resetFields();
              },
            query() {
                this.selectAllleft()
            },
src/components/view/technology.vue
@@ -371,6 +371,7 @@
                allow-create
                filterable
                @create=""
                placeholder="请选择"
                style="width: 480px"
              >
@@ -620,7 +621,6 @@
      this.$axios
        .post(
          this.$api.url.addTechTemp,
          {
            deviceGroup: this.form.deviceGroup,
            // elementId: JSON.stringify(this.form.elementId).replace("[","").replace("]",""),
@@ -658,7 +658,9 @@
        // console.log(this.equipment);
      });
    },
    // onTypeBlur(e) {
    // if (e.target.value) {
    // this.type = e.target.value;}},
    //工序
    chooseTech() {
      this.$axios.get(this.$api.url.chooseTech,{