质检模块修改

zouyu

2024-01-04 dce1a39a7c7c52d36007e2b134def3d2bfb85ce0

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

@@ -8,7 +8,7 @@
            <h2 v-else>编辑-产品检验单</h2>
        </div>
        <div class="btn-group header-right">
            <el-button @click="addTestProject" v-if="processInspectVo.id==null">生成检验项目</el-button>
            <el-button type="primary" @click="addTestProject" v-if="processInspectVo.id==null">生成检验项目</el-button>
        </div>
    </div>
    <div class="page-main">
@@ -24,55 +24,60 @@
                            </el-form-item>
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="报工单号：">
                            <el-form-item label="订单号：">
                                <el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
                                v-model="processInspectVo.orderNumber" placeholder="请输入订单号" autocomplete="off" />
                                v-model="processInspectVo.orderNumber" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="报工单号：">
                                <el-input disabled v-model="processInspectVo.productNo" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="客户名称：">
                                <el-input disabled v-model="processInspectVo.prname"
                                    placeholder="请输入客户名称" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="工程名称：">
                                <el-input disabled v-model="processInspectVo.sname"
                                    placeholder="请输入工程名称" autocomplete="off" />
                                <el-input disabled v-model="processInspectVo.prname" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="6">
                            <el-form-item label="工程名称：">
                                <el-input disabled v-model="processInspectVo.sname" autocomplete="off" />
                            </el-form-item>
                        </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">
                            <el-form-item label="产品编码：">
                                <el-input disabled v-model="processInspectVo.mcode"
                                    placeholder="请输入产品编码" autocomplete="off" />
                            <el-form-item label="产品编号：">
                                <el-input disabled v-model="processInspectVo.mcode" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="规格型号：">
                                <el-input disabled v-model="processInspectVo.specificationsModel"
                                    placeholder="请输入规格型号" autocomplete="off" />
                                <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>
                    <el-row>
                        <el-col :span="6">
                            <el-form-item label="单位：">
                                <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="请输入数量"
@@ -85,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>
@@ -113,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"
@@ -143,20 +144,26 @@
                                    </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:100%" 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>
                                    </el-select>
                                    <el-button
                                    size="small"
                                    slot="append"
                                    icon="el-icon-full-screen"
                                    v-if="scope.row.iname != null"
                                    @click="codeDevice(scope.row,scope.$index)"></el-button>
                                </div>
                            </template>
                        </el-table-column>
                        <el-table-column prop="inspectionValue">
                                label="检验描述" width="240" style="text-align: center;">
                        <el-table-column prop="inspectionValue"
                                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"
@@ -203,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">
@@ -223,6 +230,18 @@
            </el-row>
        </div>
    </div>
    <el-dialog
  title="设备扫描"
  :visible.sync="deviceCode"
  width="60%">
  <div style="height: 100vh;width: 100%;">
    <qr-code-app ref="codeDeviceCompont" @ok="getDeviceResultInfo" @cancelCodeDialog="cancelDeviceCodeDialog"></qr-code-app>
  </div>
  <span slot="footer" class="dialog-footer">
    <el-button @click="deviceCode = false">取 消</el-button>
    <el-button type="primary" @click="deviceCode = false">确 定</el-button>
  </span>
</el-dialog>
</div>
</template>

@@ -239,9 +258,16 @@
 } from '@/api/quality/finishedProduct'
 import { getIfsLocationByGroupCopyAll } from '@/api/warehouse/location'
 import { remote } from '@/api/admin/dict'
 import qrCodeApp from '@/views/common/qrCodeApp'
export default {
    components:{
        qrCodeApp
    },
    data() {
        return {
            row: null,
            proIndex: 0,
            deviceCode: false,
            locationList: [],
            dataVal: [{
                label: '是',
@@ -259,7 +285,7 @@
            // 编辑时存储最长的列数字，做删除判断
            empiricalValueAddMaxNumber: 0,
            processInspectRules: {
                locationId: [{required: true,message:'请选择库位号',trigger:'blur'}]
                locName: [{required: true,message:'请选择库位号',trigger:'blur'}]
            },
            processInspectVo: {
                id: null,
@@ -268,7 +294,7 @@
                mcode: null,
                prname: null,
                sname: null,
                orderNumber: "ZTTIC20230001",
                orderNumber: null,
                qualityTraceability: null,
                quantity: null,
                specificationsModel: null,
@@ -276,7 +302,8 @@
                technologyId: null,
                documentId: null,
                outBatchNo: null,
                locationId: null,
                locName: null,
                productNo: null,
            },
            inspectionItems: [], // 新增检验项目表格
            inspectionResultForm: [],
@@ -303,19 +330,32 @@
        this.init()
    },
    methods: {
        changeLocation(val){
            if(val){
                let obj = {
                    id: this.processInspectVo.id,
                    locationId: val
                }
                updateLocationIdById(obj).then(res=>{
                    if(res.status===200){
                        this.$message.success("更新合格库位成功")
                    }
                })
            }
        },
        cancelDeviceCodeDialog(){
        this.deviceCode = false
      },
      getDeviceResultInfo(val){
        let id=val.split("id@")[1]
        if(id!=undefined&&id!=''&&id!=null){
            let filterData=this.deviceList.filter(item=>{
          return item.id==id
        })[0]
        console.log(filterData);
        this.row.eId=Number(id)
        this.updateDevice(this.row)
        }else{
        this.$message({
          message: '未识别出计量器具信息！',
          type: 'warning'
        });
        }
      },
      codeDevice(row,index){
        this.row=row
        console.log("row",row);
        this.deviceCode =true
        this.$refs.codeDeviceCompont.openCamera()
        this.proIndex=index
      },
        getIfsLocation(){
            getIfsLocationByGroupCopyAll({locationGroup: '1'}).then(res=>{
                if(res.status===200){
@@ -326,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){
@@ -340,6 +375,11 @@
                    pro+=arr.length
                }
            })
            let obj = {
                id: this.processInspectVo.id,
                number: 0,
                result: this.inspectionResultForm[0].result
            }
            if (pro > 0) {
                this.$prompt('请输入不合格数量', '不合格数量', {
                    confirmButtonText: '确定',
@@ -347,11 +387,8 @@
                    inputPattern: /^\d+$/,
                    inputErrorMessage: '请输入正确数字格式'
                }).then(({ value }) => {
                    let data = {
                    id: this.processInspectVo.id,
                    number: value
                    }
                    updateFinishedInspectById(data).then(res => {
                    obj.number = value
                    updateFinishedInspectById(obj).then(res => {
                        if(res.data.data.indexOf("成功") > 0){
                            this.$message.success("上报成功");
                            this.checkTestState()
@@ -361,7 +398,7 @@
                    });
                }).catch(() => {});
            }else{
                updateFinishedInspectById({id:this.processInspectVo.id,number:0}).then(res => {
                updateFinishedInspectById(obj).then(res => {
                    if(res.data.data.indexOf("成功") > 0){
                            this.$message.success("上报成功");
                            this.checkTestState()
@@ -403,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()
@@ -427,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)
                })
            }
        },
@@ -515,7 +569,6 @@
                let id = res.data.data
                if(id != null){
                    queryById(id).then(response=>{
                        console.log(response.data.data.children)
                        let proList = response.data.data.children
                        proList.forEach(item=>{
                            item.iid = Math.random();
@@ -558,12 +611,38 @@
                }
            })
        },
        changeRowResult(){
            if(this.inspectionItems){
                this.inspectionItems.forEach(e=>{
                    if(e.children){
                        e.children.forEach(i=>{
                            if(i.empiricalValueAddss.length>1){
                                let arr = i.inspectionValue.split(",")
                                arr.splice((arr.length-1),1)
                                let obj = {
                                    devideId: i.eId,
                                    fpid: row.iid,
                                    inspectionValue: arr.join(","),
                                    note : i.inote
                                }
                                updateFinishedInsProduct(obj).then(res => {
                                    if (res.data.code == 0) {
                                        this.init()
                                    }
                                })
                            }
                        })
                    }
                })
            }
        },
        // 删除检验值列
        clickDeleteInspectionColumn() {
            if (this.empiricalValueAdd - 1 === 0) {
            } else {
                if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
                    this.empiricalValueAdd = this.empiricalValueAdd - 1;
                    this.changeRowResult()
                    this.inspectionItems.forEach(i => {
                        i.empiricalValueAddss.splice(this.empiricalValueAdd, 1);
                    });