Merge remote-tracking branch 'origin/master'

王震

2023-11-16 1f9c32908a68eef81f549b6986a9bc1f05056108

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

@@ -86,14 +86,14 @@
                </el-row>
                <el-row style="width:100%;">
                    <el-col :span="24">
                        <el-table border
                            :data="inspectionItems"
                        <el-table border 
                            :data="inspectionItems" 
                            height="400"
                            :header-cell-style="{ textAlign: 'center', color: 'black', backgroundColor: '#fafafa' }"
                            :cell-style="{ textAlign: 'center' }"
                            row-key="iid"
                            :cell-style="{ textAlign: 'center' }" 
                            row-key="iid" 
                            default-expand-all style="width: 100%"
                            ref="table"
                            ref="table" 
                            :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
                            <el-table-column type="index" label="序号" width="60"></el-table-column>
                            <el-table-column label="项目" prop="father" width="240"></el-table-column>
@@ -120,9 +120,9 @@
                                                v-model="scope.row.empiricalValueAddss[index]"
                                                @blur="changeState(scope.row, index)" placeholder="请输入检测值"></el-input> -->
                                            <el-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" placeholder="请选择">
                                                <el-option v-for="item in dataVal" :key="item.value" :label="(item.value === '1' ? '是' : '否')" :value="item.value"></el-option>


                                                <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
                                                    :value="item.value">
                                                </el-option>
                                            </el-select>
                                            <span v-if="resultVal != null && processInspectVo.id != null"
                                                v-text="scope.row.empiricalValueAddss[index]"></span>
@@ -143,7 +143,7 @@
                                    </div>
                                </template>
                            </el-table-column>
                            <el-table-column
                            <el-table-column 
                                label="检验描述" width="240" style="text-align: center;">
                                <template slot-scope="scope">
                                    <el-col v-if="scope.row.itype === '1'">
@@ -170,7 +170,7 @@
                                         <span v-if="resultVal != null && processInspectVo.id != null"
                                                v-text="scope.row.inote"></span>
                                        </el-tooltip>
                                    </el-col>
                                    </el-col> 
                                </template>
                            </el-table-column>
                            <el-table-column label="结论" fixed="right" min-width="100">
@@ -217,7 +217,7 @@
        </div>
    </div>
</template>

    
<script>
import {
    chooseMater,
@@ -232,11 +232,11 @@
    data() {
        return {
            dataVal: [{
                label: '1',
                value: '1'
                label: '是',
                value: '是'
            }, {
                label: '0',
                value: '0'
                label: '否',
                value: '否'
            }],
            resultVal: null,
            technologyList: [],
@@ -434,7 +434,7 @@
                row.empiricalValueAddss.forEach(e => {
                    str += e + ","
                })

             
                // if (note === undefined || note === '' || note === null) {
                //     return
                // }
@@ -444,7 +444,7 @@
                    return
                }


                
                let obj = {
                    devideId: row.eId,
                    ppid: row.iid,
@@ -526,7 +526,7 @@
    },
}
</script>

    
<style scoped>
.finishedProduct-detail {
    width: 100%;
@@ -590,4 +590,4 @@
    border-top: 0 !important;
    cursor: pointer !important;
}
</style>
</style>