Merge remote-tracking branch 'origin/master'

王震

2023-12-13 67da82f0b0c24df5f19bbfcfec63801d9ae902d8

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

@@ -289,7 +289,6 @@
    methods: {
        submitSave() {
            let pro = 0
        console.log(this.inspectionItems);
            this.inspectionItems.forEach(item => {
                if (item.children) {
                    let arr = item.children.filter(obj => {
@@ -389,7 +388,6 @@
                        }
                    })
                    this.inspectionItems = result.children
                    console.log(this.inspectionItems);
                    this.inspectionResultForm = [{
                        materialCode: result.materialCode,
                        material: result.material,
@@ -435,23 +433,16 @@
            this.technologyList = sample.children
        },
        changeState(row, index) {
            console.log(row)
            if (row.iid != null && row.iid != '') {
                let str = ""
                row.empiricalValueAddss.forEach(e => {
                    str += e + ","
                })
             
                // if (note === undefined || note === '' || note === null) {
                //     return
                // }
                console.log(str)
                str = str.slice(0, -1);
                if (str === undefined || str === '' || str === null) {
                    return
                }

                
                let obj = {
                    devideId: row.eId,
                    ppid: row.iid,
@@ -459,7 +450,6 @@
                    note : row.inote

                }
                console.log(obj)
                updateProcessInsProduct(obj).then(res => {
                    if (res.data.code == 0) {
                        this.$message.success("更新成功")
@@ -476,7 +466,6 @@
                let id = res.data.data
                if (id != null) {
                    queryById(id).then(response => {
                        console.log(response.data.data.children)
                        let proList = response.data.data.children
                        proList.forEach(item => {
                            item.iid = Math.random();