Merge remote-tracking branch 'origin/master'

王震

2023-11-15 a6a7b0bbf6f67fb1a2a1619296202c9e29915325

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

@@ -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.label"
                                                    :value="item.value">
                                                </el-option>
                                                <el-option v-for="item in dataVal" :key="item.value" :label="(item.value === '1' ? '是' : '否')" :value="item.value"></el-option>


                                            </el-select>
                                            <span v-if="resultVal != null && processInspectVo.id != null"
                                                v-text="scope.row.empiricalValueAddss[index]"></span>
@@ -232,11 +232,11 @@
    data() {
        return {
            dataVal: [{
                label: '是',
                value: '是'
                label: '1',
                value: '1'
            }, {
                label: '否',
                value: '否'
                label: '0',
                value: '0'
            }],
            resultVal: null,
            technologyList: [],