质检模块修改

zouyu

2024-01-04 dce1a39a7c7c52d36007e2b134def3d2bfb85ce0

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

@@ -48,12 +48,14 @@
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="产品名称：">
                                <el-tooltip class="item" effect="dark" :content="processInspectVo.material">
                                <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-tooltip>
                            </el-form-item>
                        </el-col>
                        <el-col :span="6">
@@ -63,7 +65,9 @@
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="规格型号：">
                                <el-tooltip class="item" effect="dark" :content="processInspectVo.specificationsModel">
                                <el-input disabled v-model="processInspectVo.specificationsModel" autocomplete="off" />
                                </el-tooltip>
                            </el-form-item>
                        </el-col>
                    </el-row>
@@ -86,13 +90,9 @@
                            </el-form-item>
                        </el-col>
                        <el-col :span="6" v-if="processInspectVo.id != null">
                            <el-form-item label="产品合格库位：" prop="locationId">
                                <el-select @change="changeLocation" clearable style="width:100%" 
                                v-model="processInspectVo.locationId" placeholder="请选择合格库位"
                                :disabled="resultVal!=null && processInspectVo.id!=null" autocomplete="off">
                                    <el-option v-for="(item,i) in locationList" :key="i" 
                                    :label="item.locName+'-'+item.locNo" :value="item.id"></el-option>
                                </el-select>
                            <el-form-item label="产品合格库位：" prop="locName">
                                <el-input v-model="processInspectVo.locName" clearable style="width:100%" placeholder="请选择合格库位" disabled autocomplete="off">
                                </el-input>
                            </el-form-item>
                        </el-col>
                    </el-row>
@@ -114,12 +114,12 @@
                        :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 label="项目" prop="father" show-overflow-tooltip width="140" ></el-table-column>
                        <el-table-column prop="iname" label="指标" show-overflow-tooltip width="140" ></el-table-column>
                        <el-table-column prop="iunit" label="单位" show-overflow-tooltip width="140" ></el-table-column>
                        <el-table-column prop="required" label="标准值" width="140" show-overflow-tooltip ></el-table-column>
                        <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" label="检测值"
                            width="240" style="text-align: center;">
                            width="140" 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"
@@ -144,11 +144,11 @@
                                    </el-col>
                            </template>
                        </el-table-column>
                        <el-table-column prop="deviceName" label="试验设备" min-width="250">
                        <el-table-column prop="deviceName" label="试验设备" min-width="200">
                            <template slot-scope="scope">
                                <span v-if="resultVal!=null && processInspectVo.id!=null" v-text="scope.row.ename"></span>
                                <div v-else>
                                    <el-select style="width:80%" v-model="scope.row.eId"
                                    <el-select style="width:60%" v-model="scope.row.eId"
                                    v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row)">
                                        <el-option v-for="(item,index) in deviceList"
                                        :key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option>
@@ -163,7 +163,7 @@
                            </template>
                        </el-table-column>
                        <el-table-column prop="inspectionValue"
                                label="检验描述" width="240" style="text-align: center;">
                                label="检验描述" width="140" 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"
@@ -210,9 +210,9 @@
                <el-col :span="24">
                    <el-table border height="90" :data="inspectionResultForm"
                    :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
                    :cell-style="{textAlign:'center'}">
                        <el-table-column prop="materialCode" label="物料编号"></el-table-column>
                        <el-table-column prop="material" label="物料名称"></el-table-column>
                   :cell-style="{textAlign: 'center'}">
                        <el-table-column prop="materialCode" width="200" label="物料编号" show-overflow-tooltip></el-table-column>
                        <el-table-column prop="material" width="200" label="物料名称" show-overflow-tooltip></el-table-column>
                        <el-table-column prop="userName" label="检验员"></el-table-column>
                        <el-table-column prop="result" label="检验结论">
                            <template slot-scope="scope">
@@ -285,7 +285,7 @@
            // 编辑时存储最长的列数字，做删除判断
            empiricalValueAddMaxNumber: 0,
            processInspectRules: {
                locationId: [{required: true,message:'请选择库位号',trigger:'blur'}]
                locName: [{required: true,message:'请选择库位号',trigger:'blur'}]
            },
            processInspectVo: {
                id: null,
@@ -294,7 +294,7 @@
                mcode: null,
                prname: null,
                sname: null,
                orderNumber: "ZTTIC20230001",
                orderNumber: null,
                qualityTraceability: null,
                quantity: null,
                specificationsModel: null,
@@ -302,7 +302,8 @@
                technologyId: null,
                documentId: null,
                outBatchNo: null,
                locationId: null,
                locName: null,
                productNo: null,
            },
            inspectionItems: [], // 新增检验项目表格
            inspectionResultForm: [],
@@ -333,7 +334,6 @@
        this.deviceCode = false
      },
      getDeviceResultInfo(val){
        console.log("扫描后数据",val);
        let id=val.split("id@")[1]
        if(id!=undefined&&id!=''&&id!=null){
            let filterData=this.deviceList.filter(item=>{
@@ -344,31 +344,18 @@
        this.updateDevice(this.row)
        }else{
        this.$message({
          message: '未识别出二位码计量器具信息！',
          message: '未识别出计量器具信息！',
          type: 'warning'
        });
        }
      },
      codeDevice(row,index){
        this.row=row 
        this.row=row
        console.log("row",row);
        this.deviceCode =true
        this.$refs.codeDeviceCompont.openCamera()
        this.proIndex=index
      },
        changeLocation(val){
            if(val){
                let obj = {
                    id: this.processInspectVo.id,
                    locationId: val
                }
                updateLocationIdById(obj).then(res=>{
                    if(res.status===200){
                        this.$message.success("更新合格库位成功")
                    }
                })
            }
        },
        getIfsLocation(){
            getIfsLocationByGroupCopyAll({locationGroup: '1'}).then(res=>{
                if(res.status===200){
@@ -379,11 +366,6 @@
            })
        },
        submitSave(){
            let locationId = this.processInspectVo.locationId
            if(locationId==null){
                this.$message.error("请选择产品合格库位")
                return
            }
            let pro = 0
            this.inspectionItems.forEach(item => {
                if(item.children){
@@ -458,7 +440,8 @@
                    this.processInspectVo.quantity = result.quantity
                    this.processInspectVo.documentId = result.documentId
                    this.processInspectVo.outBatchNo = result.outBatchNo
                    this.processInspectVo.locationId = result.locationId
                    this.processInspectVo.locName = result.locName
                    this.processInspectVo.productNo = result.productNo
                    let userList = []
                    result.children.forEach(item=>{
                        item.iid = Math.random()
@@ -482,14 +465,30 @@
                        }
                    })
                    this.inspectionItems = result.children
                    let rVal = ''
                    let passNum = 0
                    let unPassNum = 0
                    this.inspectionItems.forEach(item => {
                        if (item.children) {
                            item.children.forEach(obj => {
                                if(obj.iresult == 0){
                                    unPassNum += 1
                                }
                                if(obj.iresult == 1){
                                    passNum+=1
                                }
                            })
                        }
                    })
                    rVal = (passNum+unPassNum)>0 ? unPassNum>0 ? '0' :'1' : ''
                    this.inspectionResultForm = [{
                        materialCode: result.materialCode,
                        material: result.material,
                        userName: Array.from(new Set(userList)).join(","),
                        result: this.resultVal==null ? '' : this.resultVal,
                        result: this.resultVal==null ? rVal : this.resultVal,
                    }]
                }).catch(error=>{
                    console.log(error)
                    console.error(error)
                })
            }
        },
@@ -629,7 +628,7 @@
                                updateFinishedInsProduct(obj).then(res => {
                                    if (res.data.code == 0) {
                                        this.init()
                                    } 
                                    }
                                })
                            }
                        })