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

zouyu

2023-09-15 5d681a5c48d6b09b7bc053795760fa8030f5f1cf

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

 src/components/view/finishedProductInspectionAdd.vue

@@ -120,9 +120,13 @@
                </el-table-column>
                <el-table-column prop="dname" label="试验设备" min-width="100">
                    <template slot-scope="scope">
                        <el-button type="text" @click="clickTableSelect(scope)">{{
                        <el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
                            scope.row.dname == null ? "请选择" : scope.row.dname
                        }}</el-button>
                        <el-select style="width: 100%;" @change="clickNodeSure(scope.row)" v-model="filterText" placeholder="请选择">
                            <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
                            </el-option>
                        </el-select>
                    </template>
                </el-table-column>
                <el-table-column label="结论">
@@ -200,7 +204,8 @@
                qualityTraceability: null,
                quantity: null,
                specificationsModel: null,
                unit: null
                unit: null,
                technologyId: null
            },
            InspectioniD: null,
            addInspectionform: [
@@ -312,17 +317,18 @@
                }
            }).then(res => {
                this.materialOptions = res.data;
                this.filterText = row.did
            });
        },
        // 点击表格选择触发
        clickTableSelect(scope) {
            this.centerDialogVisible = true;
            scope.row.isSelectDevice = true
            this.clickSelectDevice.index = scope.$index;
            this.clickSelectDevice.rpId = scope.row.id;
            this.getOptions(scope.row);
        },
        // 点击树里面的确定
        clickNodeSure() {
        clickNodeSure(row) {
            let select = this.materialOptions.filter(item => {
                return item.id === this.filterText
            })[0]
@@ -346,28 +352,32 @@
                    .then(res => {
                        this.getTableData()
                        this.centerDialogVisible = false;
                        row.isSelectDevice=false
                    });
            }
        },
        changeState(row, index) {
            if (row.did != null && row.did != '') {
                let val = row.empiricalValueAddss.filter(item => {
                    return item != '' && item != null
                })
                let eq = val.filter(item => {
                    return /^[^><=]/.test(item)
                })
                if (eq.length > 0) {
                    this.$message({
                        message: "检测值[" + eq + "]格式首位应包含>,<或者=",
                        type: 'warning'
                    });
                    return
                }
                // let val = row.empiricalValueAddss.filter(item => {
                //     return item != '' && item != null
                // })
                // let eq = val.filter(item => {
                //     return /^[^><=]/.test(item)
                // })
                // if (eq.length > 0) {
                //     this.$message({
                //         message: "检测值[" + eq + "]格式首位应包含>,<或者=",
                //         type: 'warning'
                //     });
                //     return
                // }
                let str = ""
                row.empiricalValueAddss.forEach(e => {
                    str += e + ","
                })
                if (str.slice(0, -1) === '' || str.slice(0, -1) === null || str.slice(0, -1) === undefined) {
                    return
                }
                this.$axios.post(this.$api.url.inspectionItemlose_focus_update, {
                    deviceId: row.did,
                    inspectionItemId: row.id,
@@ -489,6 +499,7 @@
                            c.empiricalValueAddss.push("")
                        }
                        uName.push(c['username'])
                        c.isSelectDevice = false
                        arr.push(c)
                    })
                })

 src/components/view/finishedProductInspectionUp.vue

@@ -121,9 +121,13 @@
                </el-table-column>
                <el-table-column prop="dname" label="试验设备" min-width="100">
                    <template slot-scope="scope">
                        <el-button type="text" @click="clickTableSelect(scope)">{{
                        <el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
                            scope.row.dname == null ? "请选择" : scope.row.dname
                        }}</el-button>
                        <el-select v-if="scope.row.isSelectDevice" style="width: 100%;" @change="clickNodeSure(scope.row)"  v-model="filterText" placeholder="请选择">
                            <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
                            </el-option>
                        </el-select>
                    </template>
                </el-table-column>
                <el-table-column label="结论">
@@ -295,6 +299,10 @@
        // this.getOptions();
    },
    methods: {
        // blurNode(row){
        //     console.log(11);
        //     row.isSelectDevice=false
        // },
        escalation() {
            let arr = this.inspectionItems
            let bl = false
@@ -388,17 +396,19 @@
                }
            }).then(res => {
                this.materialOptions = res.data;
                this.filterText = row.did
            });
        },
        // 点击表格选择触发
        clickTableSelect(scope) {
            this.centerDialogVisible = true;
            scope.row.isSelectDevice = true
            // this.centerDialogVisible = true;
            this.clickSelectDevice.index = scope.$index;
            this.clickSelectDevice.rpId = scope.row.id;
            this.getOptions(scope.row);
        },
        // 点击树里面的确定
        clickNodeSure() {
        clickNodeSure(row) {
            let select = this.materialOptions.filter(item => {
                return item.id === this.filterText
            })[0]
@@ -422,28 +432,32 @@
                    .then(res => {
                        this.getTableData()
                        this.centerDialogVisible = false;
                        row.isSelectDevice=false
                    });
            }
        },
        changeState(row, index) {
            if (row.did != null && row.did != '') {
                let val = row.empiricalValueAddss.filter(item => {
                    return item != '' && item != null
                })
                let eq = val.filter(item => {
                    return /^[^><=]/.test(item)
                })
                if (eq.length > 0) {
                    this.$message({
                        message: "检测值[" + eq + "]格式首位应包含>,<或者=",
                        type: 'warning'
                    });
                    return
                }
                // let val = row.empiricalValueAddss.filter(item => {
                //     return item != '' && item != null
                // })
                // let eq = val.filter(item => {
                //     return /^[^><=]/.test(item)
                // })
                // if (eq.length > 0) {
                //     this.$message({
                //         message: "检测值[" + eq + "]格式首位应包含>,<或者=",
                //         type: 'warning'
                //     });
                //     return
                // }
                let str = ""
                row.empiricalValueAddss.forEach(e => {
                    str += e + ","
                })
                if (str.slice(0, -1) === '' || str.slice(0, -1) === null || str.slice(0, -1) === undefined) {
                    return
                }
                this.$axios.post(this.$api.url.inspectionItemlose_focus_update, {
                    deviceId: row.did,
                    inspectionItemId: row.id,
@@ -566,6 +580,7 @@
                            c.empiricalValueAddss.push("")
                        }
                        uName.push(c['username'])
                        c.isSelectDevice = false
                        arr.push(c)
                    })
                })

 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/processInspection.vue

@@ -80,8 +80,8 @@
          <el-col :span="12">新增过程检验单</el-col>
          <el-col :span="12" style="text-align: right;">
            <!-- 点击返回，当前页面值为false -->
            <el-button type="primary" size="mini" style="background: #004EA2; "
              icon="el-icon-circle-plus-outline">新增</el-button>
            <!-- <el-button type="primary" size="mini" style="background: #004EA2; "
              icon="el-icon-circle-plus-outline">新增</el-button> -->
            <el-button @click="combackIndex" type="primary" size="mini" icon="el-icon-back"
              style="background: #004EA2; ">返回</el-button>
          </el-col>
@@ -192,9 +192,14 @@
          </el-table-column>
          <el-table-column prop="dname" label="试验设备" min-width="100">
            <template slot-scope="scope">
              <el-button type="text" @click="clickTableSelect(scope)">{{
              <el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
                scope.row.dname == null ? "请选择" : scope.row.dname
              }}</el-button>
              <el-select v-if="scope.row.isSelectDevice" style="width: 100%;" @change="clickNodeSure(scope.row)"
                v-model="filterText" placeholder="请选择">
                <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
                </el-option>
              </el-select>
            </template>
          </el-table-column>
          <el-table-column label="结论">
@@ -335,9 +340,9 @@
    };
  },
  watch: {
    filterText(val) {
      this.$refs.tree.filter(val);
    }
    // filterText(val) {
    //   this.$refs.tree.filter(val);
    // }
  },
  mounted() {
    // this.getTableData()
@@ -388,14 +393,16 @@
        }
      }).then(res => {
        this.materialOptions = res.data;
        this.filterText = row.did
      });
    },
    // 点击表格选择触发
    clickTableSelect(scope) {
      this.centerDialogVisible = true;
      // this.centerDialogVisible = true;
      scope.row.isSelectDevice = true
      this.clickSelectDevice.index = scope.$index;
      this.clickSelectDevice.rpId = scope.row.id;
      this.options(scope.row)
      this.getOptions(scope.row)
    },
    // 点击树里面的确定
    clickNodeSure() {
@@ -427,23 +434,26 @@
    },
    changeState(row, index) {
      if (row.did != null && row.did != '') {
        let val = row.empiricalValueAddss.filter(item => {
          return item != '' && item != null
        })
        let eq = val.filter(item => {
          return /^[^><=]/.test(item)
        })
        if (eq.length > 0) {
          this.$message({
            message: "检测值[" + eq + "]格式首位应包含>,<或者=",
            type: 'warning'
          });
          return
        }
        // let val = row.empiricalValueAddss.filter(item => {
        //   return item != '' && item != null
        // })
        // let eq = val.filter(item => {
        //   return /^[^><=]/.test(item)
        // })
        // if (eq.length > 0) {
        //   this.$message({
        //     message: "检测值[" + eq + "]格式首位应包含>,<或者=",
        //     type: 'warning'
        //   });
        //   return
        // }
        let str = ""
        row.empiricalValueAddss.forEach(e => {
          str += e + ","
        })
        if (str.slice(0, -1) === '' || str.slice(0, -1) === null || str.slice(0, -1) === undefined) {
          return
        }
        this.$axios.post(this.$api.url.inspectionItemlose_focus_update, {
          deviceId: row.did,
          inspectionItemId: row.id,
@@ -519,10 +529,10 @@
      this.optionTechnology = working.children
    },
    addTestProjevt() {
      this.isAddProject = true
      let val = JSON.parse(JSON.stringify(this.processInspectVo))
      val.techname = this.processInspectVo.techname.split("-")[1]
      val.technologyId = this.processInspectVo.techname.split("-")[0]
      this.processInspectVo.technologyId=val.technologyId
      this.$axios.post(this.$api.url.processInspectAddProcess, {
        material: val.material,
        materialCode: val.materialCode,
@@ -543,6 +553,7 @@
          });
          return
        }
        this.isAddProject = true
        this.detailId = res.data
        this.inspectionResultForm[0].id = val.materialCode
        this.inspectionResultForm[0].name = val.material
@@ -572,6 +583,7 @@
              c.empiricalValueAddss.push("")
            }
            uName.push(c['username'])
            c.isSelectDevice=false
            arr.push(c)
          })
        })
@@ -768,4 +780,5 @@
.inspectionProject_span .el-button {
  float: right;
  font-size: 13px !important;
}</style>
}
</style>

 src/components/view/processInspectionUpdate.vue

@@ -123,9 +123,14 @@
                </el-table-column>
                <el-table-column prop="dname" label="试验设备" min-width="100">
                    <template slot-scope="scope">
                        <el-button type="text" @click="clickTableSelect(scope)">{{
                        <el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
                            scope.row.dname == null ? "请选择" : scope.row.dname
                        }}</el-button>
                        <el-select v-if="scope.row.isSelectDevice" style="width: 100%;" @change="clickNodeSure(scope.row)"
                             v-model="filterText" placeholder="请选择">
                            <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
                            </el-option>
                        </el-select>
                    </template>
                </el-table-column>
                <el-table-column label="结论">
@@ -297,6 +302,10 @@
        this.getTableData()
    },
    methods: {
        // blurNode(row){
        //     console.log(1111);
        //     row.isSelectDevice=false
        // },
        escalation() {
            let arr = this.inspectionItems
            let bl = false
@@ -366,6 +375,7 @@
                }
            }).then(res => {
                this.materialOptions = res.data;
                this.filterText = row.did
            });
        },
        //返回
@@ -374,13 +384,14 @@
        },
        // 点击表格选择触发
        clickTableSelect(scope) {
            this.centerDialogVisible = true;
            // this.centerDialogVisible = true;
            scope.row.isSelectDevice = true
            this.clickSelectDevice.index = scope.$index;
            this.clickSelectDevice.rpId = scope.row.id;
            this.getOptions(scope.row);
        },
        // 点击树里面的确定
        clickNodeSure() {
        clickNodeSure(row) {
            let select = this.materialOptions.filter(item => {
                return item.id === this.filterText
            })[0]
@@ -402,6 +413,8 @@
                        devId: this.nodeData.id
                    })
                    .then(res => {
                        row.isSelectDevice = false
                        this.filterText=0
                        this.getTableData()
                        this.centerDialogVisible = false;
                    });
@@ -409,23 +422,26 @@
        },
        changeState(row, index) {
            if (row.did != null && row.did != '') {
                let val = row.empiricalValueAddss.filter(item => {
                    return item != '' && item != null
                })
                let eq = val.filter(item => {
                    return /^[^><=]/.test(item)
                })
                if (eq.length > 0) {
                    this.$message({
                        message: "检测值[" + eq + "]格式首位应包含>,<或者=",
                        type: 'warning'
                    });
                    return
                }
                // let val = row.empiricalValueAddss.filter(item => {
                //     return item != '' && item != null
                // })
                // let eq = val.filter(item => {
                //     return /^[^><=]/.test(item)
                // })
                // if (eq.length > 0) {
                //     this.$message({
                //         message: "检测值[" + eq + "]格式首位应包含>,<或者=",
                //         type: 'warning'
                //     });
                //     return
                // }
                let str = ""
                row.empiricalValueAddss.forEach(e => {
                    str += e + ","
                })
                if (str.slice(0, -1) === '' || str.slice(0, -1) === null || str.slice(0, -1) === undefined) {
                    return
                }
                this.$axios.post(this.$api.url.inspectionItemlose_focus_update, {
                    deviceId: row.did,
                    inspectionItemId: row.id,
@@ -559,6 +575,8 @@
                            c.empiricalValueAddss.push("")
                        }
                        uName.push(c['username'])
                        c.isSelectDevice = false
                        this.filterText=0
                        arr.push(c)
                    })
                })

 src/components/view/rawInsDetail.vue

@@ -194,6 +194,7 @@
          <template slot-scope="scope">
            <el-input
              :disabled="detailId != null"
              @blur="assertTest(scope.row)"
              v-model="scope.row.required"
              placeholder="请输入标准值"
            ></el-input>
@@ -202,6 +203,7 @@
        <el-table-column prop="internal" label="内控值" min-width="150">
          <template slot-scope="scope">
            <el-input
              @blur="assertTest(scope.row)"
              :disabled="detailId != null"
              v-model="scope.row.internal"
              placeholder="请输入内控值"
@@ -424,6 +426,23 @@
    }
  },
  methods: {
    assertTest(row){
      let fuArr=['>', '<', '=']
      if(!fuArr.includes(row.required[0])){
        this.$message({
                    message: "标准值["+row.required+"]格式首位应包含>,<或者=",
                    type: 'warning'
                });
                return
      }
      if(!fuArr.includes(row.internal[0])){
        this.$message({
                    message: "内控值["+row.internal+"]格式首位应包含>,<或者=",
                    type: 'warning'
                });
                return
      }
    },
    // 设备树过滤搜索
    filterNode(value, data) {
      if (!value) return true;
@@ -456,6 +475,20 @@
    },
    // 新增检验单
    async addNewRawInspect() {
      //TODO:
      console.log(this.projectTable);
      if(this.projectTable.length>0){
        let filterTable= this.projectTable.filter(item=>{
        return item.required===''||item.internal===''||item.required===null||item.internal===null
        })
        if(filterTable.length>0) {
          this.$message({
                    message: "标准值和内控值不能为空！",
                    type: 'warning'
                });
          return
        }
      }
      this.projectTable.forEach(i => {
        // 将列表转换为字符串
        i.testValue = i.testValueList.join(",");
@@ -474,19 +507,6 @@

    // 修改项目的检测值改变结论
    async changeState(row, index) {
      let val=row.testValueList.filter(item=>{
        return item!=''&&item!=null
      })
      let eq=val.filter(item=>{
        return /^[^><=]/.test(item)
      })
      if(eq.length>0){
        this.$message({
                    message: "输入值["+eq+"]格式首位应包含>,<或者=",
                    type: 'warning'
                });
      return
      }
      if (this.detailId !== null) {
        const res = await this.$axios.post(this.$api.url.updaterawInsProduct, {
          DevId: row.deviceId,

 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,{