Merge remote-tracking branch 'origin/master'

王震

2023-11-02 fabecc63d5a9bd53489505ce383d48fb56776f61

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

@@ -111,7 +111,7 @@
                                <span v-if="resultVal!=null && processInspectVo.id!=null" v-text="scope.row.ename"></span>
                                <div v-else>
                                    <el-select style="width:100%" v-model="scope.row.eId" 
                                    v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row)">
                                    v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row,scope.$index)">
                                        <el-option v-for="(item,index) in deviceList" 
                                        :key="index" :value="item.id" :label="item.number +'-'+ item.name"></el-option>
                                    </el-select>
@@ -214,7 +214,7 @@
        this.processInspectVo.id = this.$route.query.id
        this.resultVal = this.$route.query.resultVal
        if(this.resultVal == null){
            let val = sessionStorage.getItem("finished-resultVal");
            let val = sessionStorage.getItem("finished-resultVal-"+this.processInspectVo.id);
            val == undefined ? this.resultVal=null : this.resultVal = val
        }
        this.init()
@@ -227,7 +227,6 @@
                    let arr = item.children.filter(obj=>{
                            return obj.iresult == 0;
                    })
                    console.log("aaa--",arr,arr.length)
                    pro+=arr.length
                }
            })
@@ -276,7 +275,7 @@
            })
            this.resultVal = resultVal
            this.inspectionResultForm[0].result = resultVal
            sessionStorage.setItem("finished-resultVal",resultVal)
            sessionStorage.setItem("finished-resultVal-"+this.processInspectVo.id,resultVal)
        },
        init(){
            let id = this.processInspectVo.id
@@ -327,8 +326,15 @@
                this.deviceList = res.data.data
            })
        },
        updateDevice(row){
        updateDevice(row,index){
            updateDeviceById({equiomentId:row.eId,fpid:row.iId}).then(res=>{
                this.inspectionItems.forEach(obj=>{
                    if(obj.children){
                        obj.children[index-1].inspectionValue = ''
                        obj.children[index-1].iresult = null
                        obj.children[index-1].empiricalValueAddss = []
                    }
                })
            }).catch(error=>{
                console.log(error)
            })