Merge remote-tracking branch 'origin/master'

zss

2023-11-10 ebb0c6d8aca09a9bf8b7890d895448e86d90c4f9

Merge remote-tracking branch 'origin/master'

 src/views/quality/rawMaterial/rawMaterial-form.vue

@@ -383,22 +383,39 @@
        this.showPart = true
      },


      updateDevice(row, index) {
            let rowId=JSON.stringify(row.rpId)
            updateDeviceById({ deviceId: row.deviceId, rpId: row.rpId }).then(res => {
                this.list.forEach(obj => {
                    obj.children.forEach(c=>{
                        if(c.rpId==rowId){
                        c.testValue = ''
                        c.testState = null
                        c.testValueList = []
                        c.note=''
                        }
                    })
                })
            }).catch(error => {
                console.log(error)
            })
        },
      
      updateDevice(row,index){
        if(this.dataForm.id != null){
          updateDeviceById({deviceId:row.deviceId,rpId:row.rpId}).then(res=>{
            this.inspectionItems.forEach(obj => {
            this.list[index-1].testValue = ''
            this.list[index-1].testState = null
            this.list[index-1].testValueList = []
    
          })
          }).catch(error=>{
            console.log(error)
          })
        }
      },
      // updateDevice(row,index){
      //   if(this.dataForm.id != null){
      //     updateDeviceById({deviceId:row.deviceId,rpId:row.rpId}).then(res=>{
      //       this.inspectionItems.forEach(obj => {
      //       this.list[index-1].testValue = ''
      //       this.list[index-1].testState = null
      //       this.list[index-1].testValueList = []
      //       this.list[index-1].note = ''

      //     })
      //     }).catch(error=>{
      //       console.log(error)
      //     })
      //   }
      // },
      checkTestState(){
          let resultVal = '1'
          this.list.forEach(item=>{
@@ -488,10 +505,10 @@
              name: null,
              unit: null,
              userName: null,
              testValue: null,
              testValue: '',
              testValueList: [],
              note: null,
              testState: null
              note: '',
              testState: ''
            })
          this.list.push(ele)
        }
@@ -508,15 +525,11 @@
        }
      },







      updateTestValue(row,index){
        console.log(row);
        if(row.rpId == null){
          
          
          return
        }
        let val = row.testValueList.join(",");
@@ -537,43 +550,7 @@
          this.$message.error(error)
        })
      },
      changeState(row, index) {
            console.log(row)
            if (row.rpId != null && row.rpId != '') {
              let val = ""
                row.testValueList.forEach(e => {
                  val += e + ","
                })
             
                // if (note === undefined || note === '' || note === null) {
                //     return
                // }
                console.log(val)
                val = val.slice(0, -1);
                if (val === undefined || val === '' || val === null) {
                    return
                }

                
                let obj = {
                  deviceId: row.deviceId,
          rpId: row.rpId,
          testValue: val,
          note: row.note

                }
                console.log(obj)
                updateRawInsProduct(obj).then(res => {
                    if (res.data.code == 0) {
                        this.$message.success("更新成功")
                    } else {
                        this.$message.error("更新失败")
                    }
                    this.init()
                })
            }
        },

    

      init(){
        if(this.dataForm.id){
@@ -642,7 +619,43 @@
          this.conclusionTable = []
        }
      },
    
      changeState(row, index) {
            console.log(row)
            if (row.rpId != null && row.rpId != '') {
              let val = ""
                row.testValueList.forEach(e => {
                  val += e + ","
                })
             
                // if (note === undefined || note === '' || note === null) {
                //     return
                // }
                console.log(val)
                val = val.slice(0, -1);
                if (val === undefined || val === '' || val === null) {
                    return
                }

                
                let obj = {
                  deviceId: row.deviceId,
                rpId: row.rpId,
                testValue: val,
                note: row.note

                }
                console.log(obj)
                updateRawInsProduct(obj).then(res => {
                    if (res.data.code == 0) {
                        this.$message.success("更新成功")
                    } else {
                        this.$message.error("更新失败")
                    }
                    this.init()
                })
            }
        },



      // 删除子项目