Merge remote-tracking branch 'origin/master'

王震

2023-11-15 a6a7b0bbf6f67fb1a2a1619296202c9e29915325

Merge remote-tracking branch 'origin/master'

 src/views/plan/manufacturingorder/productorder-form.vue

@@ -759,7 +759,7 @@
                    </el-table-column>
                  </el-table>
                </el-row>
                <el-row>
                <!-- <el-row>
                  <el-col :span="24"
                    ><div style="margin-top:5px;">
                      <span style="font-size:12px;">外协发料表</span>
@@ -851,7 +851,7 @@
                      </el-table-column>
                    </el-table>
                  </el-col>
                </el-row>
                </el-row> -->
              </el-tab-pane>
              <el-tab-pane label="客户订单" id="ta3" key="ta3" name="ta3">
                <CustomerOrder :orderId="dataForm.id" />

 src/views/quality/finishedProductInspection/finishedProduct-form.vue

@@ -111,9 +111,12 @@
                                        <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
                                            class="item" effect="dark" content="请先选择设备！" placement="top-start">
                                            <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"
                                                <!-- <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
                                                    :value="item.value">
                                                </el-option>
                                                </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>
@@ -224,12 +227,13 @@
export default {
    data() {
        return {
            // 1 是  0否
            dataVal: [{
                label: '是',
                value: '是'
                label: '1',
                value: '1'
            }, {
                label: '否',
                value: '否'
                label: '0',
                value: '0'
            }],
            resultVal: null,
            deviceList: [],
@@ -375,6 +379,7 @@
                        material: result.material,
                        userName: Array.from(new Set(userList)).join(","),
                        result: this.resultVal==null ? '' : this.resultVal,

                    }]
                }).catch(error=>{
                    console.log(error)

 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: [],

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

@@ -164,13 +164,20 @@
                          :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&resultVal!=null)"
                          v-model="scope.row.testValueList[index]"
                          placeholder="请输入或选择检测值" @change="updateTestValue(scope.row,scope.$index)">
                            <el-option label="是" value="是"/>
                            <el-option label="否" value="否"/>
                            <!-- <el-option label="是" value="是"/>
                            <el-option label="否" value="否"/> -->
                            <el-option v-for="item in dataVal" :key="item.value" :label="(item.value === '1' ? '是' : '否')" :value="item.value"></el-option>


                          </el-select>
                        </el-tooltip>
                      </div>
                    </template>
                  </el-table-column>




                  <el-table-column prop="deviceName" label="试验设备" min-width="260">
                    <template slot-scope="scope">
                      <div v-if="!scope.row.children">
@@ -276,6 +283,13 @@
    },
    data(){
        return{
          dataVal: [{
                label: '1',
                value: '1'
            }, {
                label: '0',
                value: '0'
            }],
            userdata:[],
            currentRow:[],
            userlist:[],