质检代码调整

zouyu

2023-12-29 617d2ad422a2ae5badc0572b06f33c2791cb95ad

质检代码调整

 src/views/quality/finishedProductInspection/finishedProduct-form.vue

@@ -298,7 +298,7 @@
                mcode: null,
                prname: null,
                sname: null,
                orderNumber: "ZTTIC20230001",
                orderNumber: null,
                qualityTraceability: null,
                quantity: null,
                specificationsModel: null,
@@ -337,7 +337,6 @@
        this.deviceCode = false
      },
      getDeviceResultInfo(val){
        console.log("扫描后数据",val);
        let id=val.split("id@")[1]
        if(id!=undefined&&id!=''&&id!=null){
            let filterData=this.deviceList.filter(item=>{
@@ -348,7 +347,7 @@
        this.updateDevice(this.row)
        }else{
        this.$message({
          message: '未识别出二位码计量器具信息！',
          message: '未识别出计量器具信息！',
          type: 'warning'
        });
        }
@@ -486,14 +485,30 @@
                        }
                    })
                    this.inspectionItems = result.children
                    let rVal = ''
                    let passNum = 0
                    let unPassNum = 0
                    this.inspectionItems.forEach(item => {
                        if (item.children) {
                            item.children.forEach(obj => {
                                if(obj.iresult == 0){
                                    unPassNum += 1
                                }
                                if(obj.iresult == 1){
                                    passNum+=1
                                }
                            })
                        }
                    })
                    rVal = (passNum+unPassNum)>0 ? unPassNum>0 ? '0' :'1' : ''
                    this.inspectionResultForm = [{
                        materialCode: result.materialCode,
                        material: result.material,
                        userName: Array.from(new Set(userList)).join(","),
                        result: this.resultVal==null ? '' : this.resultVal,
                        result: this.resultVal==null ? rVal : this.resultVal,
                    }]
                }).catch(error=>{
                    console.log(error)
                    console.error(error)
                })
            }
        },

 src/views/quality/packageinspect/packageInspect-form.vue

@@ -253,18 +253,23 @@
      changeResult(){
        let result = ''
        let data = this.list
        let passNum = 0
        let unPassNum = 0
        if(data){
          result='合格'
          data.forEach(item=>{
            if(item.children){
              item.children.forEach(ele=>{
                if(ele.result=='不合格'){
                  result='不合格'
                  unPassNum+=1
                }
                if(ele.result=='合格'){
                  passNum+=1
                }
              })
            }
          })
        }
        result = (passNum+unPassNum)>0 ? unPassNum>0 ? '不合格' :'合格' : ''
        this.conclusionTable[0].result = result
      },
      //上报

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

@@ -486,16 +486,22 @@
                        }
                    })
                    this.inspectionItems = result.children
                    let rVal = '1'
                    let rVal = ''
                    let passNum = 0
                    let unPassNum = 0
                    this.inspectionItems.forEach(item => {
                        if (item.children) {
                            item.children.forEach(obj => {
                                if (obj.iresult == 0) {
                                    rVal = '0'
                                    unPassNum += 1
                                }
                                if(obj.iresult == 1){
                                    passNum+=1
                                }
                            })
                        }
                    })
                    rVal = (passNum+unPassNum)>0 ? unPassNum>0 ? '0' :'1' : ''
                    this.inspectionResultForm = [{
                        materialCode: result.materialCode,
                        material: result.material,

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

@@ -114,7 +114,7 @@
      <div>
        <el-tabs class="rawMaterial-detail" @tab-click="tabsClick">
          <el-tab-pane label="检验项目">
            <el-row style="width:100%;z-index: 10;height:50px;">
            <el-row style="width:100%;z-index: 10;height:50px;" v-if="resultVal==null">
                <el-col :sm="15" :lg="18"></el-col>
                <el-col :sm="3" :lg="2" style="text-align: right;">
                  <el-button v-if="dataForm.id==null" size="small" @click="clickAddLine()">添加检验项目</el-button>
@@ -241,7 +241,7 @@
              element-loading-text="请稍等，文件上传中"
            >
              <el-upload
                :disabled="dataForm.rawInsNo==null"
                :disabled="dataForm.rawInsNo==null || resultVal!=null"
                drag
                ref="upload"
                action="/mes/rawInsProduct/upload"
@@ -828,16 +828,22 @@
                    this.list.push(ele)
                }}
            })
            let rVal = '1'
            let rVal = ''
            let passNum = 0
            let unPassNum = 0
            this.list.forEach(item=>{
                if(item.children){
                  item.children.forEach(ele=>{
                    if(ele.testState == 0){
                      rVal = '0'
                      unPassNum += 1
                    }
                    if(ele.testState == 1){
                      passNum+=1
                    }
                  })
                }
            })
            rVal = (passNum+unPassNum)>0 ? unPassNum>0 ? '0' :'1' : ''
            this.conclusionTable = [{
              code: data.code,
              name: data.name,
@@ -974,7 +980,7 @@

.rawMaterial-basic {
  background-color: #fff;
  height: 155px;
  height: 170px;
  display: flex;
  flex-wrap: wrap;
  padding: 10px 20px;