Merge remote-tracking branch 'origin/master'

王震

2023-12-13 67da82f0b0c24df5f19bbfcfec63801d9ae902d8

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

@@ -18,6 +18,12 @@
                    <div class="formwrapper">
                        <el-row>
                            <el-col :span="6">
                                <el-form-item label="过程检验编号：">
                                    <el-input @blur="selectInfoByOrderId" disabled
                                    v-model="processInspectVo.proInsNo"  autocomplete="off" />
                                </el-form-item>
                            </el-col>
                            <el-col :span="6">
                                <el-form-item label="订单号：">
                                    <el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
                                        v-model="processInspectVo.orderNumber" placeholder="请输入订单号" autocomplete="off" />
@@ -40,14 +46,15 @@
                                        autocomplete="off" />
                                </el-form-item>
                            </el-col>
                        </el-row>
                        <el-row>
                            <el-col :span="6">
                                <el-form-item label="规格型号：">
                                    <el-input disabled v-model="processInspectVo.specs" placeholder="请输入规格型号"
                                        autocomplete="off" />
                                </el-form-item>
                            </el-col>
                        </el-row>
                        <el-row>
                        
                            <el-col :span="6">
                                <el-form-item label="工序名称">
                                    <el-select style="width: 100%" :disabled="processInspectVo.id != null"
@@ -64,8 +71,6 @@
                                        autocomplete="off" />
                                </el-form-item>
                            </el-col>
                        </el-row>
                        <el-row>
                            <el-col :span="6">
                                <el-form-item label="数量：">
                                    <el-input v-model="processInspectVo.quantity" placeholder="请输入数量" autocomplete="off"
@@ -249,6 +254,7 @@
            empiricalValueAddMaxNumber: 0,
            processInspectVo: {
                id: null,
                proInsNo: null,
                material: null,
                materialCode: null,
                orderNumber: "ZTTIC20230001",
@@ -283,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 => {
@@ -352,6 +357,7 @@
            if (id != null) {
                queryById(id).then(res => {
                    let result = res.data.data
                    this.processInspectVo.proInsNo = result.proInsNo
                    this.processInspectVo.orderNumber = result.orderNumber
                    this.processInspectVo.materialCode = result.materialCode
                    this.processInspectVo.material = result.material
@@ -382,7 +388,6 @@
                        }
                    })
                    this.inspectionItems = result.children
                    console.log(this.inspectionItems);
                    this.inspectionResultForm = [{
                        materialCode: result.materialCode,
                        material: result.material,
@@ -400,16 +405,17 @@
            })
        },
        updateDevice(row, index) {
            let father=row.father
            let rowId=JSON.stringify(row.iid)
            updateDeviceBypppId({ deviceId: row.eId, ppid: row.iid }).then(res => {
                this.inspectionItems.forEach(obj => {
                    console.log(obj);
                    if (obj.children&&obj.father==father) {
                        obj.children[index - 1].inspectionValue = null
                        obj.children[index - 1].iresult = null
                        obj.children[index - 1].empiricalValueAddss = []
                        obj.children[index-1].inote=''
                    }
                    obj.children.forEach(c=>{
                        if(c.iid==rowId){
                        c.inspectionValue = null
                        c.iresult = null
                        c.empiricalValueAddss = []
                        c.inote=''
                        }
                    })
                })
            }).catch(error => {
                console.log(error)
@@ -427,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,
@@ -451,7 +450,6 @@
                    note : row.inote

                }
                console.log(obj)
                updateProcessInsProduct(obj).then(res => {
                    if (res.data.code == 0) {
                        this.$message.success("更新成功")
@@ -468,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();