Merge remote-tracking branch 'origin/master'

王震

2023-09-14 b78307d92ab70853597a785085f8e1d44192ef5f

 src/components/view/processInspectionUpdate.vue

@@ -91,7 +91,7 @@
        <div class="inspectionProject">
            <el-row>
                <el-col :span="12" class="inspectionProject_span">检验项目</el-col>
                <el-col :span="12" class="inspectionProject_span">
                <el-col v-if="!isUpBtn" :span="12" class="inspectionProject_span">
                    <el-button size="mini" @click="clickDeleteInspectionColumn()">删除检验值列</el-button>
                    <el-button style="margin-right: 30px;" size="mini"
                        @click="clickAddInspectionColumn()">添加检验值列</el-button>
@@ -156,7 +156,10 @@
                    </template>
                </el-table-column>
                <el-table-column prop="operation" label="上报">
                    <el-button type="primary" @click="escalation" size="small">上报</el-button>
                    <template slot-scope="scope"> 
                        <el-button v-if="scope.row.conclusion === null || scope.row.conclusion === undefined" type="primary" @click="escalation" size="small">上报</el-button>
                        <el-button v-else type="success" size="small">已上报</el-button>
                    </template>
                </el-table-column>
            </el-table>
        </div>
@@ -187,6 +190,7 @@
    props: ['rowInfo'],
    data() {
        return {
            isUpBtn: false,
            showUp: false,
            isAddProject: false,
            detailId: 0,
@@ -275,6 +279,9 @@
        }
    },
    created() {
        if(this.rowInfo.result!=null&&this.rowInfo.result!=''){
            this.isUpBtn=true
        }
        this.processInspectVo.orderNumber = this.rowInfo.order_number
        this.processInspectVo.material = this.rowInfo.material
        this.processInspectVo.materialCode = this.rowInfo.material_code
@@ -322,12 +329,14 @@
                        message: '上报成功',
                        type: 'success'
                    });
                    this.$parent.combackMain(true)
                } else {
                    this.$message({
                        message: res.message,
                        type: 'warning'
                    });
                }

            })
        },
        handleClick() { },