Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

王震

2023-11-23 185c03ebd1dd8127df2aed18f575f39cd3e352ec

 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",
@@ -352,6 +358,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
@@ -400,16 +407,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)