modified: src/api/quality/processInspect.js modified: src/views/quali...

Fixiaobai

2023-11-06 de20b63f6864024237654b34cb945e1e508232f2

	modified:   src/api/quality/processInspect.js
	modified:   src/views/quality/processInspect/processInspect-form.vue

 src/api/quality/processInspect.js

@@ -78,3 +78,10 @@
        params: obj
    })
}

export function selectDevice() {
  return request({
    url: '/mes/qualityProcessInsProduct/selectDevice',
    method: 'get',
  })
}

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

@@ -13,8 +13,8 @@
        </div>
        <div class="page-main">
            <div class="finishedProduct-basic">
                <el-form :model="processInspectVo" ref="addInspectionform" class="l-mes" 
                label-position="right" label-width="120px" style="width: 100%" size="small">
                <el-form :model="processInspectVo" ref="addInspectionform" class="l-mes" label-position="right"
                    label-width="120px" style="width: 100%" size="small">
                    <div class="formwrapper">
                        <el-row>
                            <el-col :span="6">
@@ -25,24 +25,25 @@
                            </el-col>
                            <el-col :span="6">
                                <el-form-item label="产品名称：">
                                    <el-select style="width: 100%" @change="changeOptionsSamplename" :disabled="processInspectVo.id != null"
                                        v-model="processInspectVo.material" size="small" placeholder="请选择产品名称">
                                        <el-option v-for="(item,index) in optionsSamplename" :key="index" :label="item.material"
                                            :value="item.materialCode">
                                    <el-select style="width: 100%" @change="changeOptionsSamplename"
                                        :disabled="processInspectVo.id != null" v-model="processInspectVo.material"
                                        size="small" placeholder="请选择产品名称">
                                        <el-option v-for="(item, index) in optionsSamplename" :key="index"
                                            :label="item.material" :value="item.materialCode">
                                        </el-option>
                                    </el-select>
                                </el-form-item>
                            </el-col>
                            <el-col :span="6">
                                <el-form-item label="产品编码：">
                                    <el-input disabled v-model="processInspectVo.materialCode"
                                        placeholder="请输入产品编码" autocomplete="off" />
                                    <el-input disabled v-model="processInspectVo.materialCode" placeholder="请输入产品编码"
                                        autocomplete="off" />
                                </el-form-item>
                            </el-col>
                            <el-col :span="6">
                                <el-form-item label="规格型号：">
                                    <el-input disabled v-model="processInspectVo.specs"
                                        placeholder="请输入规格型号" autocomplete="off" />
                                    <el-input disabled v-model="processInspectVo.specs" placeholder="请输入规格型号"
                                        autocomplete="off" />
                                </el-form-item>
                            </el-col>
                        </el-row>
@@ -59,16 +60,16 @@
                            </el-col>
                            <el-col :span="6">
                                <el-form-item label="单位：">
                                    <el-input disabled v-model="processInspectVo.unit"
                                        placeholder="请输入单位" autocomplete="off" />
                                    <el-input disabled v-model="processInspectVo.unit" placeholder="请输入单位"
                                        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" :disabled="processInspectVo.id != null" />
                                    <el-input v-model="processInspectVo.quantity" placeholder="请输入数量" autocomplete="off"
                                        :disabled="processInspectVo.id != null" />
                                </el-form-item>
                            </el-col>
                        </el-row>
@@ -87,33 +88,52 @@
                    <el-col :span="24">
                        <el-table border :data="inspectionItems" height="400"
                            :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}" 
                            :cell-style="{textAlign:'center'}" row-key="iid" default-expand-all
                            style="width: 100%" ref="table" :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
                            :cell-style="{ textAlign: 'center' }" row-key="iid" default-expand-all style="width: 100%"
                            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>
                            <el-table-column prop="iname" label="指标" width="240" ></el-table-column>
                            <el-table-column prop="iunit" label="单位" width="240" ></el-table-column>
                            <el-table-column prop="required" label="标准值" width="240" ></el-table-column>
                            <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" label="检测值"
                                width="240" style="text-align: center;">
                            <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index"
                                label="检测值" width="240" style="text-align: center;">
                                <template slot-scope="scope">
                                    <el-col v-if="scope.row.itype === '1'">
                                        <el-tooltip v-if="scope.row.iname!=null" :disabled="scope.row.eId != null" 
                                        class="item" effect="dark" content="请先选择设备！"
                                            placement="top-start">
                                            <el-input :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]"
                                            class="item" effect="dark" content="请先选择设备！" placement="top-start">
                                            <el-input :disabled="scope.row.eId == null"
                                                v-model="scope.row.empiricalValueAddss[index]"
                                                @blur="changeState(scope.row, index)" placeholder="请输入检测值"></el-input>
                                            <span v-if="resultVal != null && processInspectVo.id!=null" v-text="scope.row.empiricalValueAddss[index]"></span>
                                            <span v-if="resultVal != null && processInspectVo.id != null"
                                                v-text="scope.row.empiricalValueAddss[index]"></span>
                                        </el-tooltip>
                                    </el-col>
                                    <el-col v-else>
                                        <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
                                            class="item" effect="dark" content="请先选择设备！" placement="top-start">
                                            <!-- <el-input :disabled="scope.row.eId == null"
                                                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-select>
                                            <span v-if="resultVal != null && processInspectVo.id != null"
                                                v-text="scope.row.empiricalValueAddss[index]"></span>
                                        </el-tooltip>
                                    </el-col>
                                </template>
                            </el-table-column>
                            <el-table-column prop="deviceName" label="试验设备" min-width="250">
                                <template slot-scope="scope">
                                    <span v-if="resultVal != null && scope.row.iname != null" v-text="scope.row.ename"></span>
                                    <span v-if="resultVal != null && scope.row.iname != null"
                                        v-text="scope.row.ename"></span>
                                    <div v-else>
                                        <el-select style="width:100%" v-model="scope.row.eId" 
                                        v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row,scope.$index)">
                                            <el-option v-for="(item,index) in deviceList" 
                                            :key="index" :value="item.id" :label="item.number +'-'+ item.name"></el-option>
                                        <el-select style="width:100%" v-model="scope.row.eId" v-if="scope.row.iname != null"
                                            filterable @change="updateDevice(scope.row, scope.$index)">
                                            <el-option v-for="(item, index) in deviceList" :key="index" :value="item.id"
                                                :label="item.code + '-' + item.name"></el-option>
                                        </el-select>
                                    </div>
                                </template>
@@ -151,7 +171,8 @@
                            </el-table-column>
                            <el-table-column  label="操作">
                                <template>
                                    <el-button type="text" :disabled="resultVal != null && processInspectVo.id!=null"  @click="submitSave()" size="small">上报</el-button>
                                    <el-button type="text" :disabled="resultVal != null && processInspectVo.id != null"
                                        @click="submitSave()" size="small">上报</el-button>
                                </template>
                            </el-table-column>
                        </el-table>
@@ -171,10 +192,17 @@
        updateProcessInsProduct,
        updateProcessInspectsById,
     } from '@/api/quality/processInspect'
    import { selectDevice } from '@/api/quality/rawMaterial'
import { selectDevice } from '@/api/quality/processInspect'
    export default {
        data() {
            return {
            dataVal: [{
                label: '是',
                value: '是'
            }, {
                label: '否',
                value: '否'
            }],
                resultVal: null,
                technologyList: [],
                deviceList: [],
@@ -333,10 +361,11 @@
                })
            },
            updateDevice(row,index){
                updateDeviceBypppId({equiomentId:row.eId,ppid:row.iId}).then(res=>{
            updateDeviceBypppId({ deviceId: row.eId, ppid: row.iid }).then(res => {
                    this.inspectionItems.forEach(obj=>{
                    console.log(obj);
                        if(obj.children){
                            obj.children[index-1].inspectionValue = ''
                        obj.children[index - 1].inspectionValue = null
                            obj.children[index-1].iresult = null
                            obj.children[index-1].empiricalValueAddss = []
                        }
@@ -367,7 +396,7 @@
                        return
                    }
                    let obj = {
                        equiomentId: row.eId,
                    devideId: row.eId,
                        ppid: row.iid,
                        inspectionValue: str
                    }
@@ -479,31 +508,24 @@
      border: 1px solid #ddd;
      box-sizing: border-box;
    }

    /*自定义disabled状态下checkbox的样式*/
    .completeproductstructure-checkout
      .el-checkbox__input.is-disabled.is-checked
      .el-checkbox__inner {
.completeproductstructure-checkout .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
      background-color: #006eff;
      border-color: #006eff;
    }
    
    .completeproductstructure-checkout
      .el-checkbox__input.is-disabled.is-checked
      + span.el-checkbox__label {
.completeproductstructure-checkout .el-checkbox__input.is-disabled.is-checked+span.el-checkbox__label {
      color: #006eff;
      border-color: #006eff;
    }
    
    .completeproductstructure-checkout
      .el-checkbox__input.is-disabled
      .el-checkbox__inner {
.completeproductstructure-checkout .el-checkbox__input.is-disabled .el-checkbox__inner {
      background-color: #ffffff;
      cursor: pointer;
    }
    
    .completeproductstructure-checkout
      .el-checkbox__input.is-disabled
      + span.el-checkbox__label {
.completeproductstructure-checkout .el-checkbox__input.is-disabled+span.el-checkbox__label {
      color: #606266;
      cursor: pointer;
    }