Merge remote-tracking branch 'origin/master'

王震

2023-10-31 7a415908713af60d445412c17683886722ae8f44

Merge remote-tracking branch 'origin/master'

 src/api/quality/finishedProduct.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
import request from '@/router/axios'

export function page(query) {
  return request({
    url: '/mes/qualityFinishedInspect/page',
    method: 'get',
    params: query
  })
}

export function chooseMater(query) {
  return request({
    url: '/mes/qualityFinishedInspect/chooseMater',
    method: 'get',
    params: query
  })
}

 src/api/quality/rawMaterial.js

@@ -45,3 +45,19 @@
  })
}

export function updateRawInspectsById(data) {
  return request({
    url: '/mes/rawInspect/updateRawInspectsById/'+data.id,
    method: 'post',
    params: data
  })
}

export function updateDeviceById(data) {
  return request({
    url: '/mes/rawInsProduct/updateDevByRpId',
    method: 'post',
    params: data
  })
}


 src/const/crud/quality/rawMaterial.js

@@ -110,7 +110,9 @@
    span: 24,
  }, {
    label: '检验结论',
    prop: 'testState',
    prop: 'judgeState',
    type: 'text',
    slot: true,
    formSlot: true
  }]
}

 src/views/plan/customerorder/index.vue

@@ -1091,7 +1091,7 @@
          let flag = true
          const ids = []
          this.multipleSelection.forEach((item) => {
            if (item.salesPartNo != null && item.salesPartNo !== '') {
            if (item.partNo != null && item.partNo !== '') {
              ids.push(item.id)
            } else {
              flag = false

 src/views/quality/finishedProductInspection/finishedProductInspectionAdd.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,684 @@
<template>
<!-- æ–°å¢žé¡µé¢ -->
<div class="addInspection">
    <div class="page-header">
        <div class="header-left">
            <a @click="$router.go(-1)"><i class="icon-btn-back"></i></a>
            <h2>编辑-产品检验</h2>
        </div>
        <div class="btn-group header-right">
            <el-button @click="addTestProjevt">生成检验项目</el-button>
        </div>
    </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">
                <div class="formwrapper">
                    <el-row>
                        <el-col :span="6">
                            <el-form-item label="订单号：">
                                <el-input @blur="selectInfoByOrderId" v-model="processInspectVo.orderNumber" placeholder="请输入订单号" 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-form-item>
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="产品名称：">
                                <el-select style="width: 100%" @change="changeOptionsSamplename"
                                    v-model="processInspectVo.material" size="small" placeholder="请选择产品名称">
                                    <el-option v-for="item in optionsSamplename" :key="item.id" :label="item.name"
                                        :value="item.id + '-' + item.name">
                                    </el-option>
                                </el-select>
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="6">
                            <el-form-item label="质量追溯号：">
                                <el-input disabled v-model="processInspectVo.qualityTraceability"
                                    placeholder="请输入追溯号" autocomplete="off" />
                            </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>
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="规格型号：">
                                <el-input disabled v-model="processInspectVo.specificationsModel"
                                    placeholder="请输入产品编码" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <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="请输入数量"
                                    autocomplete="off" />
                            </el-form-item>
                        </el-col>
                    </el-row>
                </div>
            </el-form>
        </div>
        <div class="finishedProduct-detail">
            <el-row style="width:100%;z-index: 10;height:50px;">
                <el-col :span="12" class="inspectionProject_span">检验项目</el-col>
                <el-col :span="12" class="inspectionProject_span" style="text-align: right;">
                    <el-button size="mini" @click="clickAddInspectionColumn()">添加检验值列</el-button>
                    <el-button size="mini" @click="clickDeleteInspectionColumn()">删除检验值列</el-button>
                </el-col>
            </el-row>
            <el-row style="width:100%;">
                <el-col :span="24">
                    <el-table border :data="inspectionItems" max-height="400" :span-method="handleSpanMethod" height="calc(100vh - 550px)"
                        style="width: 100%">
                        <el-table-column type="index" label="序号" width="60"></el-table-column>
                        <el-table-column label="项目" prop="father"></el-table-column>
                        <el-table-column prop="name" label="指标"></el-table-column>
                        <el-table-column prop="unit" label="单位"></el-table-column>
                        <el-table-column prop="required" label="标准值"></el-table-column>
                        <el-table-column prop="internal" label="内测值"></el-table-column>
                        <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" label="检测值"
                            min-width="100" style="text-align: center;">
                            <template slot-scope="scope">
                                <el-tooltip :disabled="scope.row.dname != null" class="item" effect="dark" content="请先选择设备！"
                                    placement="top-start">
                                    <el-input :disabled="scope.row.dname === null" v-model="scope.row.empiricalValueAddss[index]"
                                        @blur="changeState(scope.row, index)" placeholder="请输入检测值"></el-input>
                                </el-tooltip>
                            </template>
                        </el-table-column>
                        <el-table-column prop="dname" label="试验设备" min-width="100">
                            <template slot-scope="scope">
                                <el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
                                    scope.row.dname == null ? "请选择" : scope.row.dname
                                }}</el-button>
                                <el-select  v-if="scope.row.isSelectDevice" style="width: 100%;" @change="clickNodeSure(scope.row)" v-model="filterText" placeholder="请选择">
                                    <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
                                    </el-option>
                                </el-select>
                            </template>
                        </el-table-column>
                        <el-table-column label="结论">
                            <template slot-scope="scope">
                                <span style="color: #34BD66;" v-if="scope.row.result === 1">合格</span>
                                <span style="color: #E84738;" v-else-if="scope.row.result === 0">不合格</span>
                                <span v-show="scope.row.result === null">暂未结论</span>
                            </template>
                        </el-table-column>
                    </el-table>
                </el-col>
            </el-row>
        </div>
        <div class="finishedProduct-detail">
            <el-row style="width:100%">
                <el-col :span="24">检测结果</el-col>
            </el-row>
            <el-row style="width:100%;margin-top:-180px">
                <el-col :span="24">
                    <el-table border max-height="400" :data="inspectionResultForm">
                        <el-table-column prop="id" label="物料编号"></el-table-column>
                        <el-table-column prop="name" label="物料名称"></el-table-column>
                        <el-table-column prop="inspecter" label="检验员"></el-table-column>
                        <el-table-column prop="conclusion" label="检验结论"></el-table-column>
                        <el-table-column prop="operation" label="上报"></el-table-column>
                    </el-table>
                </el-col>
            </el-row>
        </div>
    </div>
    <el-dialog title="请选择设备" :visible.sync="centerDialogVisible" width="20%">
        <div class="div_device_dialog">
            <el-select style="width: 100%;" @change="clickNodeSure()" v-model="filterText" placeholder="请选择">
                <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
                </el-option>
            </el-select>
        </div>
    </el-dialog>
</div>
</template>

<script>
export default {
    data() {
        return {
            showUp: false,
            isAddProject: false,
            showLook: false,
            detailId: 0,
            rowInfp: {},
            search: {
                countSize: 10,
                pageSize: 1,
                result: "", // æ£€æµ‹çŠ¶æ€
                name: "", // äº§å“åç§°
                techfather: "" // å·¥åº
            },
            optionsSamplename: [],
            inspectionTable: [],
            tableColumn: [],
            optionSoptionSprocesses: [],
            optionTechnology: [],
            inspectionTableTotal: 0,
            pageSize: 10,
            currentPage: 1,
            treeProject: [],
            // æ·»åŠ åˆ—
            empiricalValueAdd: 1,
            // ç¼–辑时存储最长的列数字，做删除判断
            empiricalValueAddMaxNumber: 0,
            showAddPage: false,
            processInspectVo: {
                id: null,
                material: null,
                mcode: null,
                prname: null,
                sname: null,
                orderNumber: "",
                qualityTraceability: null,
                quantity: null,
                specificationsModel: null,
                unit: null,
                technologyId: null
            },
            InspectioniD: null,
            addInspectionform: [
                {
                    number: "",
                    username: "",
                    projectname: "",
                    tracenumber: "",
                    code: "",
                    class: "",
                    specificationmodel: "",
                    unit: "",
                    quantity: "",
                    group: "",
                    worker: "",
                    machine: ""
                }]
            ,
            inspectionItems: [], // æ–°å¢žæ£€éªŒé¡¹ç›®è¡¨æ ¼
            inspectionResultForm: [
                {
                    id: "",
                    name: "",
                    inspecter: "",
                    conclusion: "",
                    operation: ""
                }
            ],
            options: [],
            value: "",
            rowList: [],
            spanArr: [],
            position: 0,
            // è®¾å¤‡é€‰æ‹©æ ‘显示
            centerDialogVisible: false,
            filterText: "",
            materialOptions: [],
            defaultProps: {
                // è®¾å¤‡æ ‘数据设置
                children: "children",
                label: "name"
            },
            nodeData: {
                id: 0,
                name: null
            }, // node点击保存当前点击数据
            clickSelectDevice: {
                index: null, // ç‚¹å‡»é€‰æ‹©å­˜å‚¨å½“前行索引
                rpId: null // ç‚¹å‡»é€‰æ‹©å­˜å‚¨å½“前行项目Id
            }
        };
    },
    watch: {
        // filterText(val) {
        //     this.$refs.tree.filter(val);
        // }
    },
    mounted() {
        this.getTableData()
        // this.getOptions();
    },
    methods: {
        changeOptionsSamplename() {
            let id = this.processInspectVo.material.split("-")[0]
            let sample = this.optionsSamplename.filter(o => {
                return o.id == id
            })[0]
            this.processInspectVo.qualityTraceability = sample.qualityTraceability
            this.processInspectVo.mcode = sample.mcode
            this.processInspectVo.specificationsModel = sample.specifications
            this.processInspectVo.unit = sample.unit
        },
        comBack() {
            this.$parent.comBackMain()
        },
        handleClick(row) {
            this.rowInfp = row
            this.showLook = true
        },
        updateInsInfo(row) {
            this.rowInfp = row
            this.showUp = true
        },
        combackMain() {
            this.showUp = false
            this.showLook = false
        },
        searchPro() {
            this.search.countSize = this.pageSize
            this.search.pageSize = this.currentPage
            this.defaultInitializationTable()
        },
        // ç‚¹å‡»è®¾å¤‡æ ‘保存点击记录
        nodeClick(data) {
            if (data.id != undefined) this.nodeData = data;
        },
        // è®¾å¤‡æ ‘过滤搜索
        filterNode(value, data) {
            if (!value) return true;
            return data.name.indexOf(value) !== -1;
        },
        // èŽ·å–设备树内容
        getOptions(row) {
            this.$axios.get(this.$api.url.inspectionItemChooseDev, {
                params: {
                    father: row.father,
                    name: row.name,
                    technologyId: this.processInspectVo.technologyId
                }
            }).then(res => {
                this.materialOptions = res.data;
                this.filterText = row.did
                if(this.materialOptions.length===1){
                    this.$message({
                    message: '该项目下只有一个试验设备，无需选择！',
                    type: 'warning'
                });
                    return
                }
                row.isSelectDevice = true
            });
        },
        // ç‚¹å‡»è¡¨æ ¼é€‰æ‹©è§¦å‘
        clickTableSelect(scope) {
            if(this.clickSelectDevice.index!=null){
                this.$set(this.inspectionItems[this.clickSelectDevice.index],'isSelectDevice',false)
            }
            this.clickSelectDevice.index = scope.$index;
            this.clickSelectDevice.rpId = scope.row.id;
            this.getOptions(scope.row);
        },
        // ç‚¹å‡»æ ‘里面的确定
        clickNodeSure(row) {
            let select = this.materialOptions.filter(item => {
                return item.id === this.filterText
            })[0]
            this.nodeData.id = select.id
            this.nodeData.name = select.device
            if (this.detailId == null) {
                this.inspectionItems[
                    this.clickSelectDevice.index
                ].did = this.nodeData.id;
                this.inspectionItems[
                    this.clickSelectDevice.index
                ].dname = this.nodeData.name;
                this.centerDialogVisible = false;
            } else {
                this.$axios
                    .post(this.$api.url.inspectionItemUpdateDevByInsId, {
                        id: this.clickSelectDevice.rpId,
                        type: 2,
                        devId: this.nodeData.id
                    })
                    .then(res => {
                        this.getTableData()
                        this.centerDialogVisible = false;
                        row.isSelectDevice=false
                    });
            }
        },
        changeState(row, index) {
            if (row.did != null && row.did != '') {
                // let val = row.empiricalValueAddss.filter(item => {
                //     return item != '' && item != null
                // })
                // let eq = val.filter(item => {
                //     return /^[^><=]/.test(item)
                // })
                // if (eq.length > 0) {
                //     this.$message({
                //         message: "检测值[" + eq + "]格式首位应包含>,<或者=",
                //         type: 'warning'
                //     });
                //     return
                // }
                let str = ""
                row.empiricalValueAddss.forEach(e => {
                    str += e + ","
                })
                if (str.slice(0, -1) === '' || str.slice(0, -1) === null || str.slice(0, -1) === undefined) {
                    return
                }
                this.$axios.post(this.$api.url.inspectionItemlose_focus_update, {
                    deviceId: row.did,
                    inspectionItemId: row.id,
                    inspectionValue: str.slice(0, -1)
                }, {
                    headers: { "Content-Type": "application/json" }
                }).then(res => {
                    row.result = res.data.result
                    row.username = res.data.username
                })
            } else {
                this.$message({
                    message: '请选择择设备！',
                    type: 'warning'
                });
            }
        },
        // æ¯é¡µæ¡æ•°æ”¹å˜æ—¶è§¦å‘ é€‰æ‹©ä¸€é¡µæ˜¾ç¤ºå¤šå°‘è¡Œ
        handleSizeChange(val) {
            this.search.countSize = val;
            this.defaultInitializationTable();
        },
        handleSpanMethod({ row, column, rowIndex, columnIndex }) {
            if (columnIndex === 0) {
                const _row = this.spanArr[rowIndex];
                const _col = _row > 0 ? 1 : 0;
                return {
                    rowspan: _row,
                    colspan: _col
                }
            }
            if (columnIndex === 1) {
                const _row = this.spanArr[rowIndex];
                const _col = _row > 0 ? 1 : 0;
                return {
                    rowspan: _row,
                    colspan: _col
                }
            }
        },
        // åˆå¹¶è¡¨æ ¼
        mergeTable() {
            this.rowList = []
            this.spanArr = []
            this.position = 0
            this.inspectionItems.forEach((item, index) => {
                if (index === 0) {
                    this.spanArr.push(1);
                    this.position = 0;
                } else {
                    if (this.inspectionItems[index].father === this.inspectionItems[index - 1].father) {
                        this.spanArr[this.position] += 1;
                        this.spanArr.push(0);
                    } else {
                        this.spanArr.push(1);
                        this.position = index;
                    }
                }
            })
        },
        changeOptionSoptionSprocesses() {
            this.optionTechnology = []
            let working = this.optionSoptionSprocesses.filter(item => {
                return item.name === this.processInspectVo.techfather
            })[0]
            this.optionTechnology = working.children
        },
        addTestProjevt() {
            // this.isAddProject = true
            let val = JSON.parse(JSON.stringify(this.processInspectVo))
            val.material = this.processInspectVo.material.split("-")[1]
            val.id = this.processInspectVo.material.split("-")[0]
            this.$axios.post(this.$api.url.finishedInspectAddFinish, val, {
                headers: { "Content-Type": "application/json" }
            }).then(res => {
                if (res.code == 201) {
                    this.$message({
                        message: res.message,
                        type: 'warning'
                    });
                    return
                }
                this.detailId = res.data
                this.inspectionResultForm[0].id = val.mcode
                this.inspectionResultForm[0].name = val.material
                this.getTableData()
            })
        },
        getTableData() {
            this.$axios.get(this.$api.url.finishedInspectSelectFinishInspectsListById, {
                params: {
                    id: this.detailId
                }
            }).then(res => {
                this.processInspectVo.technologyId = res.data[0].techId
            })
            this.$axios.get(this.$api.url.inspectionItemListUser, {
                params: {
                    id: this.detailId,
                    type: 2
                }
            }).then(res => {
                if (res.data.length < 1) {
                    return
                }
                this.inspectionItems = res.data
                let arr = []
                let val = JSON.parse(JSON.stringify(this.inspectionItems))
                const uName = []
                //转成一维数组
                val.forEach(l => {
                    let father = l.father
                    l.children.forEach(c => {
                        c.father = father
                        c.empiricalValueAddss = []
                        if (c.inspectionValue != '' && c.inspectionValue != null) {
                            c.empiricalValueAddss = c.inspectionValue.split(",");
                        } else {
                            c.empiricalValueAddss.push("")
                        }
                        uName.push(c['username'])
                        c.isSelectDevice = false
                        arr.push(c)
                    })
                })
                this.inspectionItems = arr
                let arrSort = JSON.parse(JSON.stringify(arr))
                //根据集合对象数组长度排序
                arrSort.sort((a, b) => {
                    if (a.empiricalValueAddss.length < b.empiricalValueAddss.length) {
                        return -1; // a排在b前面
                    } else if (a.empiricalValueAddss.length > b.empiricalValueAddss.length) {
                        return 1; // a排在b后面
                    } else {
                        return 0; // ä¿æŒç›¸å¯¹é¡ºåºä¸å˜
                    }
                });
                // console.log(arrSort);
                console.log(uName);
                let name = [...new Set(uName)].filter(item => item !== null);
                let rname = ''
                name.forEach(m => {
                    rname += m + ","
                })
                this.inspectionResultForm[0].inspecter = rname.slice(0, -1)
                this.empiricalValueAdd = arrSort[arrSort.length - 1].empiricalValueAddss.length
                this.mergeTable(arr)
            })
        },
        selectSample() {
            let sample = this.optionsSamplename.filter(item => {
                return item.name === this.processInspectVo.material
            })[0]
            this.processInspectVo.techfather = null
            this.processInspectVo.techname = null
            this.processInspectVo.materialCode = sample.code
            this.processInspectVo.specificationsModel = sample.specifications
            this.processInspectVo.unit = sample.unit
            this.optionSoptionSprocesses = []
            this.optionSoptionSprocesses = sample.children
        },
        selectInfoByOrderId() {
            this.$axios.get(this.$api.url.finishedInspectChooseMater, {
                params: {
                    orderNumber: this.processInspectVo.orderNumber
                }
            }).then(res => {
                if (res.data.length > 0) {
                    console.log(res.data);
                    this.processInspectVo.sname = res.data[0].sname
                    this.processInspectVo.prname = res.data[0].prname
                    this.optionsSamplename = res.data[0].children
                } else {
                    this.$message({
                        message: '没有该订单号！',
                        type: 'warning'
                    });
                }
            })
        },
        // å½“前页改变时触发 è·³è½¬å…¶ä»–页
        handleCurrentChange(val) {
            this.search.pageSize = val;
            this.defaultInitializationTable();
        },
        // æ˜¾ç¤ºæ–°å¢žé¡µé¢
        handleAddNew() {
            this.showAddPage = true;
            // this.getTableData()
        },
        // è¡¨æ ¼åˆå§‹åŒ–接口
        defaultInitializationTable() {
            this.$axios
                .post(this.$api.url.selectProcessInspectsList, this.search)
                .then(res => {
                    this.inspectionTableTotal = res.data.total;
                    this.inspectionTable = res.data.row;
                });
        },
        // æ·»åŠ è¡Œ
        clickAddLine() {
            let obj = {
                material: "",
                materialCode: "",
                orderNumber: "",
                quantity: 0,
                specificationsModel: "",
                techfather: "",
                techname: "",
                technologyId: 0,
                unit: ""
            };
            this.inspectionItems.push(obj);
        },
        // åˆ é™¤è¡Œ
        clickDeleteline(scope) {
            this.inspectionItems.splice(scope.$index, 1);
        },
        // åˆ é™¤æ£€éªŒå€¼åˆ—
        clickDeleteInspectionColumn() {
            if (this.empiricalValueAdd - 1 === 0) {
            } else {
                if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
                    this.empiricalValueAdd = this.empiricalValueAdd - 1;
                    this.inspectionItems.forEach(i => {
                        i.testValueList.splice(this.empiricalValueAdd, 1);
                    });
                }
            }
        },
        // æ·»åŠ æ£€éªŒå€¼åˆ—
        clickAddInspectionColumn() {
            this.empiricalValueAdd = this.empiricalValueAdd + 1;
        }
    },
    created() {
        this.defaultInitializationTable(); // åˆå§‹åŒ–表格数据
    }
}
</script>

<style scoped>
.finishedProduct-detail {
  width: 100%;
  height: 460px;
  padding: 10px 20px;
  display: flex;
  border: 1px solid #ddd;
  background-color: #fff;
  margin-top: 10px;
  box-sizing: border-box;
  flex-wrap: wrap;
}

.finishedProduct-basic {
  background-color: #fff;
  height: 150px;
  display: flex;
  flex-wrap: wrap;
  padding: 10px 20px;
  border: 1px solid #ddd;
  box-sizing: border-box;
}
/*自定义disabled状态下checkbox的样式*/
.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 {
  color: #006eff;
  border-color: #006eff;
}

.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 {
  color: #606266;
  cursor: pointer;
}

.completeproductstructure-checkout .el-checkbox__inner::after {
  border: 1px solid #fff !important;
  border-left: 0 !important;
  border-top: 0 !important;
  cursor: pointer !important;
}
</style>

 src/views/quality/finishedProductInspection/finishedProductInspectionLook.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,605 @@
<template>
    <div>
        <!-- æ–°å¢žé¡µé¢ -->
        <div class="addInspection">
            <el-row class="header">
                <el-col :span="12">新增产品检验单</el-col>
                <el-col :span="12" style="text-align: right;">
                    <!-- ç‚¹å‡»è¿”回，当前页面值为false -->
                    <!-- <el-button type="primary" size="mini" style="background: #004EA2; "
                        icon="el-icon-circle-plus-outline">新增</el-button> -->
                    <el-button @click="comBack" type="primary" size="mini" icon="el-icon-back"
                        style="background: #004EA2; ">返回</el-button>
                </el-col>
            </el-row>
            <el-form :model="processInspectVo" ref="addInspectionform" class="addInspectionform" label-position="right"
                label-width="120px" size="small">
                <div class="formwrapper">
                    <el-row>
                        <el-col :span="7">
                            <el-form-item label="订单号：">
                                <el-input disabled @blur="selectInfoByOrderId" style="width: 180px;"
                                    v-model="processInspectVo.orderNumber" placeholder="请输入订单号" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="客户名称：">
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.prname"
                                    placeholder="请输入客户名称" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="工程名称：">
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.sname"
                                    placeholder="请输入工程名称" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="7">
                            <el-form-item label="产品名称：">
                                <el-select disabled @change="changeOptionsSamplename" style="width: 180px;" v-model="processInspectVo.material" size="small"
                                    placeholder="请选择产品名称">
                                    <el-option v-for="item in optionsSamplename" :key="item.id" :label="item.name"
                                        :value="item.id + '-' + item.name">
                                    </el-option>
                                </el-select>
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="质量追溯号：">
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.qualityTraceability"
                                    placeholder="请输入追溯号" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="产品编码：">
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.mcode"
                                    placeholder="请输入产品编码" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="7">
                            <el-form-item label="规格型号：">
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.specificationsModel"
                                    placeholder="请输入产品编码" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="单位：">
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.unit" placeholder="请输入产品编码"
                                    autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="数量：">
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.quantity" placeholder="请输入数量"
                                    autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="3" style="display: flex;justify-content: end;">
                            <!-- <el-button type="primary" :disabled="isAddProject" @click="addTestProjevt">生成检验项目</el-button> -->
                        </el-col>
                    </el-row>
                </div>
            </el-form>
        </div>
        <div class="inspectionProject">
            <el-row>
                <el-col :span="12" class="inspectionProject_span">检验项目</el-col>
                <el-col :span="12" class="inspectionProject_span" style="display: flex;justify-content: end;">
                    <!-- <el-button size="mini" @click="clickDeleteInspectionColumn()">删除检验值列</el-button>
                    <el-button style="margin-right: 30px;" size="mini"
                        @click="clickAddInspectionColumn()">添加检验值列</el-button> -->
                    <!-- <el-button
              size="mini"
              style="margin-right: 30px;"
              @click="clickAddLine()"
              >添加检验行</el-button
            > -->
                </el-col>
            </el-row>
            <el-table :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)"
                style="width: 100%">
                <el-table-column type="index" label="序号" width="60"></el-table-column>
                <el-table-column label="项目" prop="father"></el-table-column>
                <el-table-column prop="name" label="指标"></el-table-column>
                <el-table-column prop="unit" label="单位"></el-table-column>
                <el-table-column prop="required" label="标准值"></el-table-column>
                <el-table-column prop="internal" label="内测值"></el-table-column>
                <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" label="检测值"
                    min-width="100" style="text-align: center;">
                    <template slot-scope="scope">
                            <el-input disabled v-model="scope.row.empiricalValueAddss[index]"
                                @blur="changeState(scope.row, index)" placeholder="请输入检测值"></el-input>
                    </template>
                </el-table-column>
                <el-table-column prop="dname" label="试验设备" min-width="100">
                    <template slot-scope="scope">
                        {{ scope.row.dname }}
                        <span v-if="scope.row.dname===null||scope.row.dname===''">/</span>
                    </template>
                </el-table-column>
                <el-table-column label="结论">
                    <template slot-scope="scope">
                        <span style="color: #34BD66;" v-if="scope.row.result === 1">合格</span>
                        <span style="color: #E84738;" v-else-if="scope.row.result === 0">不合格</span>
                        <span v-show="scope.row.result === null">暂未结论</span>
                    </template>
                </el-table-column>
                <!-- <el-table-column v-if="detailId == null" label="操作" width="100">
            <template slot-scope="scope">
              <el-button type="text" @click="clickDeleteline(scope)">删除</el-button>
            </template>
          </el-table-column> -->
            </el-table>
        </div>
        <div class="inspectionResult">
            <span>检测结果</span>
            <el-table :data="inspectionResultForm">
                <el-table-column prop="id" label="物料编号"></el-table-column>
                <el-table-column prop="name" label="物料名称"></el-table-column>
                <el-table-column prop="inspecter" label="检验员"></el-table-column>
                <el-table-column prop="conclusion" label="检验结论">
                    <template slot-scope="scope">
                        <span style="color: #34BD66;" v-if="scope.row.conclusion === 1">合格</span>
                        <span style="color: #E84738;" v-else-if="scope.row.conclusion === 0">不合格</span>
                        <span v-else-if="scope.row.conclusion === null || scope.row.conclusion === undefined">暂未结论</span>
                    </template>
                </el-table-column>
                <!-- <el-table-column prop="operation" label="上报"></el-table-column> -->
            </el-table>
        </div>
        <el-dialog title="请选择设备" :visible.sync="centerDialogVisible" width="20%">
            <div class="div_device_dialog">
                <el-input placeholder="输入关键字进行过滤" v-model="filterText" style="margin-bottom: 6px;">
                </el-input>
                <el-tree class="filter-tree" :data="materialOptions" :props="defaultProps" default-expand-all
                    highlight-current @node-click="nodeClick" :filter-node-method="filterNode" ref="tree">
                    <div class="custom-tree-node" slot-scope="{ data }">
                        <span><i :class="`node_i ${data.children ? 'el-icon-folder-opened' : 'el-icon-tickets'
                            }`
                            "></i>
                            {{ data.name }}</span>
                    </div>
                </el-tree>
            </div>
            <span slot="footer" class="dialog-footer">
                <el-button @click="centerDialogVisible = false">取 æ¶ˆ</el-button>
                <el-button type="primary" @click="clickNodeSure()">ç¡® å®š</el-button>
            </span>
        </el-dialog>
    </div>
</template>

<script>
export default {
    props: ['rowInfo'],
    data() {
        return {
            showUp: false,
            isAddProject: false,
            showLook: false,
            detailId: 0,
            rowInfp: {},
            search: {
                countSize: 10,
                pageSize: 1,
                result: "", // æ£€æµ‹çŠ¶æ€
                name: "", // äº§å“åç§°
                techfather: "" // å·¥åº
            },
            optionsSamplename: [],
            inspectionTable: [],
            tableColumn: [],
            optionSoptionSprocesses: [],
            optionTechnology: [],
            inspectionTableTotal: 0,
            pageSize: 10,
            currentPage: 1,
            treeProject: [],
            // æ·»åŠ åˆ—
            empiricalValueAdd: 1,
            // ç¼–辑时存储最长的列数字，做删除判断
            empiricalValueAddMaxNumber: 0,
            showAddPage: false,
            processInspectVo: {
                id: null,
                material: null,
                mcode: null,
                prname: null,
                sname: null,
                orderNumber: "D-001",
                qualityTraceability: null,
                quantity: null,
                specificationsModel: null,
                unit: null
            },
            InspectioniD: null,
            addInspectionform: [
                {
                    number: "",
                    username: "",
                    projectname: "",
                    tracenumber: "",
                    code: "",
                    class: "",
                    specificationmodel: "",
                    unit: "",
                    quantity: "",
                    group: "",
                    worker: "",
                    machine: ""
                }]
            ,
            inspectionItems: [], // æ–°å¢žæ£€éªŒé¡¹ç›®è¡¨æ ¼
            inspectionResultForm: [
                {
                    id: "",
                    name: "",
                    inspecter: "",
                    conclusion: "",
                    operation: ""
                }
            ],
            options: [],
            value: "",
            rowList: [],
            spanArr: [],
            position: 0,
            // è®¾å¤‡é€‰æ‹©æ ‘显示
            centerDialogVisible: false,
            filterText: "",
            materialOptions: [],
            defaultProps: {
                // è®¾å¤‡æ ‘数据设置
                children: "children",
                label: "name"
            },
            nodeData: "", // node点击保存当前点击数据
            clickSelectDevice: {
                index: "", // ç‚¹å‡»é€‰æ‹©å­˜å‚¨å½“前行索引
                rpId: "" // ç‚¹å‡»é€‰æ‹©å­˜å‚¨å½“前行项目Id
            }
        };
    },
    watch: {
        filterText(val) {
            this.$refs.tree.filter(val);
        }
    },
    mounted() {
        console.log(this.rowInfo);
        this.processInspectVo.material=this.rowInfo.material
        this.processInspectVo.mcode=this.rowInfo.material_code
        this.processInspectVo.orderNumber=this.rowInfo.order_number
        this.processInspectVo.qualityTraceability=this.rowInfo.quality_traceability
        this.processInspectVo.specificationsModel=this.rowInfo.specifications_model
        this.processInspectVo.unit=this.rowInfo.unit
        this.processInspectVo.quantity=this.rowInfo.quantity
        this.processInspectVo.prname=this.rowInfo.customer_name
        this.processInspectVo.sname=this.rowInfo.project_name
        this.inspectionResultForm[0].id=this.rowInfo.material_code
        this.inspectionResultForm[0].name=this.rowInfo.material
        this.inspectionResultForm[0].conclusion=this.rowInfo.result
        this.detailId=this.rowInfo.id
        this.getTableData()
        this.getOptions();
    },
    methods: {
        changeOptionsSamplename(){
            let id=this.processInspectVo.material.split("-")[0]
            let sample=this.optionsSamplename.filter(o=>{
                return o.id==id
            })[0]
            this.processInspectVo.qualityTraceability=sample.qualityTraceability
            this.processInspectVo.mcode=sample.mcode
            this.processInspectVo.specificationsModel=sample.specifications
            this.processInspectVo.unit=sample.unit
        },
        comBack(){
            this.$parent.comBackMain()
        },
        handleClick(row) {
            this.rowInfp = row
            this.showLook = true
        },
        updateInsInfo(row) {
            this.rowInfp = row
            this.showUp = true
        },
        combackMain() {
            this.showUp = false
            this.showLook = false
        },
        searchPro() {
            this.search.countSize = this.pageSize
            this.search.pageSize = this.currentPage
            this.defaultInitializationTable()
        },
        // ç‚¹å‡»è®¾å¤‡æ ‘保存点击记录
        nodeClick(data) {
            if (data.id != undefined) this.nodeData = data;
        },
        // è®¾å¤‡æ ‘过滤搜索
        filterNode(value, data) {
            if (!value) return true;
            return data.name.indexOf(value) !== -1;
        },
        // èŽ·å–设备树内容
        getOptions() {
            this.$axios.get(this.$api.url.rawSelectDevice).then(res => {
                this.materialOptions = res.data;
            });
        },
        // ç‚¹å‡»è¡¨æ ¼é€‰æ‹©è§¦å‘
        clickTableSelect(scope) {
            this.centerDialogVisible = true;
            this.clickSelectDevice.index = scope.$index;
            this.clickSelectDevice.rpId = scope.row.id;
        },
        // ç‚¹å‡»æ ‘里面的确定
        clickNodeSure() {
            if (this.detailId == null) {
                this.inspectionItems[
                    this.clickSelectDevice.index
                ].did = this.nodeData.id;
                this.inspectionItems[
                    this.clickSelectDevice.index
                ].dname = this.nodeData.name;
                this.centerDialogVisible = false;
            } else {
                this.$axios
                    .post(this.$api.url.inspectionItemUpdateDevByInsId, {
                        id: this.clickSelectDevice.rpId,
                        type: 2,
                        devId: this.nodeData.id
                    })
                    .then(res => {
                        this.getTableData()
                        this.centerDialogVisible = false;
                    });
            }
        },
        changeState(row, index) {
            console.log(row);
            if (row.did != null && row.did != '') {
                let str = ""
                row.empiricalValueAddss.forEach(e => {
                    str += e + ","
                })
                this.$axios.post(this.$api.url.inspectionItemlose_focus_update, {
                    deviceId: row.did,
                    inspectionItemId: row.id,
                    inspectionValue: str.slice(0, -1)
                }, {
                    headers: { "Content-Type": "application/json" }
                }).then(res => {
                    row.result = res.data.result
                    row.username = res.data.username
                })
            } else {
                this.$message({
                    message: '请选择择设备！',
                    type: 'warning'
                });
            }
        },
        // æ¯é¡µæ¡æ•°æ”¹å˜æ—¶è§¦å‘ é€‰æ‹©ä¸€é¡µæ˜¾ç¤ºå¤šå°‘è¡Œ
        handleSizeChange(val) {
            this.search.countSize = val;
            this.defaultInitializationTable();
        },
        handleSpanMethod({ row, column, rowIndex, columnIndex }) {
            if (columnIndex === 0) {
                const _row = this.spanArr[rowIndex];
                const _col = _row > 0 ? 1 : 0;
                return {
                    rowspan: _row,
                    colspan: _col
                }
            }
            if (columnIndex === 1) {
                const _row = this.spanArr[rowIndex];
                const _col = _row > 0 ? 1 : 0;
                return {
                    rowspan: _row,
                    colspan: _col
                }
            }
        },
        // åˆå¹¶è¡¨æ ¼
        mergeTable() {
            this.rowList = []
            this.spanArr = []
            this.position = 0
            this.inspectionItems.forEach((item, index) => {
                if (index === 0) {
                    this.spanArr.push(1);
                    this.position = 0;
                } else {
                    if (this.inspectionItems[index].father === this.inspectionItems[index - 1].father) {
                        this.spanArr[this.position] += 1;
                        this.spanArr.push(0);
                    } else {
                        this.spanArr.push(1);
                        this.position = index;
                    }
                }
            })
        },
        changeOptionSoptionSprocesses() {
            this.optionTechnology = []
            let working = this.optionSoptionSprocesses.filter(item => {
                return item.name === this.processInspectVo.techfather
            })[0]
            this.optionTechnology = working.children
        },
        addTestProjevt() {
            // this.isAddProject = true
            let val = JSON.parse(JSON.stringify(this.processInspectVo))
            val.material = this.processInspectVo.material.split("-")[1]
            val.id=this.processInspectVo.material.split("-")[0]
            this.$axios.post(this.$api.url.finishedInspectAddFinish, val, {
                headers: { "Content-Type": "application/json" }
            }).then(res => {
                if (res.code == 201) {
                    this.$message({
                        message: res.message,
                        type: 'warning'
                    });
                    return
                }
                this.detailId = res.data
                this.inspectionResultForm[0].id = val.mcode
                this.inspectionResultForm[0].name = val.material
                this.getTableData()
            })
        },
        getTableData() {
            this.$axios.get(this.$api.url.inspectionItemListUser, {
                params: {
                    id: this.detailId,
                    type: 2
                }
            }).then(res => {
                if (res.data.length < 1) {
                    return
                }
                this.inspectionItems = res.data
                let arr = []
                let val = JSON.parse(JSON.stringify(this.inspectionItems))
                const uName = []
                //转成一维数组
                val.forEach(l => {
                    let father = l.father
                    l.children.forEach(c => {
                        c.father = father
                        c.empiricalValueAddss = []
                        if (c.inspectionValue != '' && c.inspectionValue != null) {
                            c.empiricalValueAddss = c.inspectionValue.split(",");
                        } else {
                            c.empiricalValueAddss.push("")
                        }
                        uName.push(c['username'])
                        arr.push(c)
                    })
                })
                this.inspectionItems = arr
                let arrSort = JSON.parse(JSON.stringify(arr))
                //根据集合对象数组长度排序
                arrSort.sort((a, b) => {
                    if (a.empiricalValueAddss.length < b.empiricalValueAddss.length) {
                        return -1; // a排在b前面
                    } else if (a.empiricalValueAddss.length > b.empiricalValueAddss.length) {
                        return 1; // a排在b后面
                    } else {
                        return 0; // ä¿æŒç›¸å¯¹é¡ºåºä¸å˜
                    }
                });
                // console.log(arrSort);
                console.log(uName);
                let name = [...new Set(uName)].filter(item => item !== null);
                let rname = ''
                name.forEach(m => {
                    rname += m + ","
                })
                this.inspectionResultForm[0].inspecter = rname.slice(0, -1)
                this.empiricalValueAdd = arrSort[arrSort.length - 1].empiricalValueAddss.length
                this.mergeTable(arr)
            })
        },
        selectSample() {
            let sample = this.optionsSamplename.filter(item => {
                return item.name === this.processInspectVo.material
            })[0]
            this.processInspectVo.techfather = null
            this.processInspectVo.techname = null
            this.processInspectVo.materialCode = sample.code
            this.processInspectVo.specificationsModel = sample.specifications
            this.processInspectVo.unit = sample.unit
            this.optionSoptionSprocesses = []
            this.optionSoptionSprocesses = sample.children
        },
        selectInfoByOrderId() {
            this.$axios.get(this.$api.url.finishedInspectChooseMater, {
                params: {
                    orderNumber: this.processInspectVo.orderNumber
                }
            }).then(res => {
                if (res.data.length > 0) {
                    console.log(res.data);
                    this.processInspectVo.sname = res.data[0].sname
                    this.processInspectVo.prname = res.data[0].prname
                    this.optionsSamplename = res.data[0].children
                } else {
                    this.$message({
                        message: '没有该订单号！',
                        type: 'warning'
                    });
                }
            })
        },
        // å½“前页改变时触发 è·³è½¬å…¶ä»–页
        handleCurrentChange(val) {
            this.search.pageSize = val;
            this.defaultInitializationTable();
        },
        // æ˜¾ç¤ºæ–°å¢žé¡µé¢
        handleAddNew() {
            this.showAddPage = true;
            // this.getTableData()
        },
        // è¡¨æ ¼åˆå§‹åŒ–接口
        defaultInitializationTable() {
            this.$axios
                .post(this.$api.url.selectProcessInspectsList, this.search)
                .then(res => {
                    this.inspectionTableTotal = res.data.total;
                    this.inspectionTable = res.data.row;
                });
        },
        // æ·»åŠ è¡Œ
        clickAddLine() {
            let obj = {
                material: "",
                materialCode: "",
                orderNumber: "",
                quantity: 0,
                specificationsModel: "",
                techfather: "",
                techname: "",
                technologyId: 0,
                unit: ""
            };
            this.inspectionItems.push(obj);
        },
        // åˆ é™¤è¡Œ
        clickDeleteline(scope) {
            this.inspectionItems.splice(scope.$index, 1);
        },
        // åˆ é™¤æ£€éªŒå€¼åˆ—
        clickDeleteInspectionColumn() {
            if (this.empiricalValueAdd - 1 === 0) {
            } else {
                if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
                    this.empiricalValueAdd = this.empiricalValueAdd - 1;
                    this.inspectionItems.forEach(i => {
                        i.testValueList.splice(this.empiricalValueAdd, 1);
                    });
                }
            }
        },
        // æ·»åŠ æ£€éªŒå€¼åˆ—
        clickAddInspectionColumn() {
            this.empiricalValueAdd = this.empiricalValueAdd + 1;
        }
    },
    created() {
        this.defaultInitializationTable(); // åˆå§‹åŒ–表格数据
    }
}
</script>

<style></style>

 src/views/quality/finishedProductInspection/finishedProductInspectionUp.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,745 @@
<template>
    <div>
        <!-- æ–°å¢žé¡µé¢ -->
        <div class="addInspection">
            <el-row class="header">
                <el-col :span="12">新增产品检验单</el-col>
                <el-col :span="12" style="text-align: right;">
                    <!-- ç‚¹å‡»è¿”回，当前页面值为false -->
                    <!-- <el-button type="primary" size="mini" style="background: #004EA2; "
                        icon="el-icon-circle-plus-outline">新增</el-button> -->
                    <el-button @click="comBack" type="primary" size="mini" icon="el-icon-back"
                        style="background: #004EA2; ">返回</el-button>
                </el-col>
            </el-row>
            <el-form :model="processInspectVo" ref="addInspectionform" class="addInspectionform" label-position="right"
                label-width="120px" size="small">
                <div class="formwrapper">
                    <el-row>
                        <el-col :span="7">
                            <el-form-item label="订单号：">
                                <el-input disabled @blur="selectInfoByOrderId" style="width: 180px;"
                                    v-model="processInspectVo.orderNumber" placeholder="请输入订单号" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="客户名称：">
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.prname"
                                    placeholder="请输入客户名称" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="工程名称：">
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.sname"
                                    placeholder="请输入工程名称" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="7">
                            <el-form-item label="产品名称：">
                                <el-select disabled @change="changeOptionsSamplename" style="width: 180px;"
                                    v-model="processInspectVo.material" size="small" placeholder="请选择产品名称">
                                    <el-option v-for="item in optionsSamplename" :key="item.id" :label="item.name"
                                        :value="item.id + '-' + item.name">
                                    </el-option>
                                </el-select>
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="质量追溯号：">
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.qualityTraceability"
                                    placeholder="请输入追溯号" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="产品编码：">
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.mcode"
                                    placeholder="请输入产品编码" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row>
                        <el-col :span="7">
                            <el-form-item label="规格型号：">
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.specificationsModel"
                                    placeholder="请输入产品编码" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="单位：">
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.unit"
                                    placeholder="请输入产品编码" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="数量：">
                                <el-input disabled style="width: 180px;" v-model="processInspectVo.quantity"
                                    placeholder="请输入数量" autocomplete="off" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="3" style="display: flex;justify-content: end;">
                            <!-- <el-button type="primary" :disabled="isAddProject" @click="addTestProjevt">生成检验项目</el-button> -->
                        </el-col>
                    </el-row>
                </div>
            </el-form>
        </div>
        <div class="inspectionProject">
            <el-row>
                <el-col :span="12" class="inspectionProject_span">检验项目</el-col>
                <el-col v-if="!isUpBtn" :span="12" class="inspectionProject_span"
                    style="display: flex;justify-content: end;">
                    <el-button size="mini" @click="clickDeleteInspectionColumn()">删除检验值列</el-button>
                    <el-button style="margin-right: 30px;" size="mini"
                        @click="clickAddInspectionColumn()">添加检验值列</el-button>
                    <!-- <el-button
              size="mini"
              style="margin-right: 30px;"
              @click="clickAddLine()"
              >添加检验行</el-button
            > -->
                </el-col>
            </el-row>
            <el-table :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)"
                style="width: 100%">
                <el-table-column type="index" label="序号" width="60"></el-table-column>
                <el-table-column label="项目" prop="father"></el-table-column>
                <el-table-column prop="name" label="指标"></el-table-column>
                <el-table-column prop="unit" label="单位"></el-table-column>
                <el-table-column prop="required" label="标准值"></el-table-column>
                <el-table-column prop="internal" label="内测值"></el-table-column>
                <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" label="检测值"
                    min-width="100" style="text-align: center;">
                    <template slot-scope="scope">
                        <el-tooltip :disabled="scope.row.dname != null" class="item" effect="dark" content="请先选择设备！"
                            placement="top-start">
                            <el-input :disabled="scope.row.dname === null" v-model="scope.row.empiricalValueAddss[index]"
                                @blur="changeState(scope.row, index)" placeholder="请输入检测值"></el-input>
                        </el-tooltip>
                    </template>
                </el-table-column>
                <el-table-column prop="dname" label="试验设备" min-width="100">
                    <template slot-scope="scope">
                        <el-button type="text" @click="clickTableSelect(scope)">{{
                            scope.row.dname == null ? "请选择" : scope.row.dname
                        }}</el-button>
                    </template>
                </el-table-column>
                <el-table-column label="结论">
                    <template slot-scope="scope">
                        <span style="color: #34BD66;" v-if="scope.row.result === 1">合格</span>
                        <span style="color: #E84738;" v-else-if="scope.row.result === 0">不合格</span>
                        <span v-show="scope.row.result === null">暂未结论</span>
                    </template>
                </el-table-column>
                <!-- <el-table-column v-if="detailId == null" label="操作" width="100">
            <template slot-scope="scope">
              <el-button type="text" @click="clickDeleteline(scope)">删除</el-button>
            </template>
          </el-table-column> -->
            </el-table>
        </div>
        <div class="inspectionResult">
            <span>检测结果</span>
            <el-table :data="inspectionResultForm">
                <el-table-column prop="id" label="物料编号"></el-table-column>
                <el-table-column prop="name" label="物料名称"></el-table-column>
                <el-table-column prop="inspecter" label="检验员"></el-table-column>
                <el-table-column prop="conclusion" label="检验结论">
                    <template slot-scope="scope">
                        <span style="color: #34BD66;" v-if="scope.row.conclusion === 1">合格</span>
                        <span style="color: #E84738;" v-else-if="scope.row.conclusion === 0">不合格</span>
                        <span v-else-if="scope.row.conclusion === null || scope.row.conclusion === undefined">暂未结论</span>
                    </template>
                </el-table-column>
                <el-table-column prop="operation" label="上报">
                    <template slot-scope="scope">
                        <el-button v-if="scope.row.conclusion === null || scope.row.conclusion === undefined" type="primary"
                            @click="escalation" size="small">上报</el-button>
                        <el-button v-else type="success" size="small">已上报</el-button>
                    </template>
                </el-table-column>
            </el-table>
        </div>
        <el-dialog title="请选择设备" :visible.sync="centerDialogVisible" width="20%">
            <div class="div_device_dialog">
                <el-input placeholder="输入关键字进行过滤" v-model="filterText" style="margin-bottom: 6px;">
                </el-input>
                <el-tree class="filter-tree" :data="materialOptions" :props="defaultProps" default-expand-all
                    highlight-current @node-click="nodeClick" :filter-node-method="filterNode" ref="tree">
                    <div class="custom-tree-node" slot-scope="{ data }">
                        <span><i :class="`node_i ${data.children ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>{{
                            data.name }}</span>
                    </div>
                </el-tree>
            </div>
            <span slot="footer" class="dialog-footer">
                <el-button @click="centerDialogVisible = false">取 æ¶ˆ</el-button>
                <el-button type="primary" @click="clickNodeSure()">ç¡® å®š</el-button>
            </span>
        </el-dialog>
    </div>
</template>

<script>
export default {
    props: ['rowInfo'],
    data() {
        return {
            isUpBtn: false,
            showUp: false,
            isAddProject: false,
            showLook: false,
            detailId: 0,
            rowInfp: {},
            search: {
                countSize: 10,
                pageSize: 1,
                result: "", // æ£€æµ‹çŠ¶æ€
                name: "", // äº§å“åç§°
                techfather: "" // å·¥åº
            },
            optionsSamplename: [],
            inspectionTable: [],
            tableColumn: [],
            optionSoptionSprocesses: [],
            optionTechnology: [],
            inspectionTableTotal: 0,
            pageSize: 10,
            currentPage: 1,
            treeProject: [],
            // æ·»åŠ åˆ—
            empiricalValueAdd: 1,
            // ç¼–辑时存储最长的列数字，做删除判断
            empiricalValueAddMaxNumber: 0,
            showAddPage: false,
            processInspectVo: {
                id: null,
                material: null,
                mcode: null,
                prname: null,
                sname: null,
                orderNumber: "D-001",
                qualityTraceability: null,
                quantity: null,
                specificationsModel: null,
                unit: null,
                technologyId: null
            },
            InspectioniD: null,
            addInspectionform: [{
                number: "",
                username: "",
                projectname: "",
                tracenumber: "",
                code: "",
                class: "",
                specificationmodel: "",
                unit: "",
                quantity: "",
                group: "",
                worker: "",
                machine: ""
            }],
            inspectionItems: [], // æ–°å¢žæ£€éªŒé¡¹ç›®è¡¨æ ¼
            inspectionResultForm: [{
                id: "",
                name: "",
                inspecter: "",
                conclusion: "",
                operation: ""
            }],
            options: [],
            value: "",
            rowList: [],
            spanArr: [],
            position: 0,
            // è®¾å¤‡é€‰æ‹©æ ‘显示
            centerDialogVisible: false,
            filterText: "",
            materialOptions: [],
            defaultProps: {
                // è®¾å¤‡æ ‘数据设置
                children: "children",
                label: "name"
            },
            nodeData: {
                id: 0,
                name: null
            }, // node点击保存当前点击数据
            clickSelectDevice: {
                index: null, // ç‚¹å‡»é€‰æ‹©å­˜å‚¨å½“前行索引
                rpId: null // ç‚¹å‡»é€‰æ‹©å­˜å‚¨å½“前行项目Id
            }
        };
    },
    watch: {
        // filterText(val) {
        //     this.$refs.tree.filter(val);
        // }
    },
    mounted() {
        if (this.rowInfo.result != null && this.rowInfo.result != '') {
            this.isUpBtn = true
        }
        this.processInspectVo.material = this.rowInfo.material
        this.processInspectVo.mcode = this.rowInfo.material_code
        this.processInspectVo.orderNumber = this.rowInfo.order_number
        this.processInspectVo.qualityTraceability = this.rowInfo.quality_traceability
        this.processInspectVo.specificationsModel = this.rowInfo.specifications_model
        this.processInspectVo.unit = this.rowInfo.unit
        this.processInspectVo.quantity = this.rowInfo.quantity
        this.processInspectVo.prname = this.rowInfo.customer_name
        this.processInspectVo.sname = this.rowInfo.project_name
        this.inspectionResultForm[0].id = this.rowInfo.material_code
        this.inspectionResultForm[0].name = this.rowInfo.material
        this.inspectionResultForm[0].conclusion = this.rowInfo.result
        this.detailId = this.rowInfo.id
        this.getTableData()
        // this.getOptions();
    },
    methods: {
        // blurNode(row){
        //     console.log(11);
        //     row.isSelectDevice=false
        // },
        escalation() {
            let arr = this.inspectionItems
            let bl = false
            for (let index = 0; index < arr.length; index++) {
                const element = arr[index];
                if (element.dname != null && element.empiricalValueAddss[0] != '') {
                    bl = true
                    break
                } else {
                    bl = false
                }
            }
            if (bl != true) {
                this.$message({
                    message: '请先检测一项项目！',
                    type: 'warning'
                });
                return
            }
            let pro = this.inspectionItems.filter(item => {
                return item.result === 0;
            })
            if (pro.length > 0) {
                this.$prompt('请输入不合格数量', '不合格数量', {
                    confirmButtonText: '确定',
                    cancelButtonText: '取消',
                    inputPattern: /^\d+$/,
                    inputErrorMessage: '请输入正确数字格式'
                }).then(({ value }) => {
                    this.$axios.post(this.$api.url.finishedInspectUpdateFinishInspectsById, {
                        id: this.detailId,
                        number: value
                    }).then(res => {
                        if (res.code == 200) {
                            this.$message({
                                message: '上报成功',
                                type: 'success'
                            });
                            this.$parent.comBackMain(true)
                        } else {
                            this.$message({
                                message: res.message,
                                type: 'warning'
                            });
                        }

                    })
                }).catch(() => {
                    this.$message({
                        type: 'info',
                        message: '取消输入'
                    });
                });
            } else {
                this.$axios.post(this.$api.url.finishedInspectUpdateFinishInspectsById, {
                    id: this.detailId
                }).then(res => {
                    if (res.code == 200) {
                        if (res.message === '项目未检验完!') {
                            this.$message({
                                message: res.message,
                                type: 'warning'
                            });
                            return
                        }
                        // this.$message({
                        //     message: '上报成功',
                        //     type: 'success'
                        // });
                        this.$parent.comBackMain(true)
                    } else {
                        this.$message({
                            message: res.message,
                            type: 'warning'
                        });
                    }
                })
            }
        },
        changeOptionsSamplename() {
            let id = this.processInspectVo.material.split("-")[0]
            let sample = this.optionsSamplename.filter(o => {
                return o.id == id
            })[0]
            this.processInspectVo.qualityTraceability = sample.qualityTraceability
            this.processInspectVo.mcode = sample.mcode
            this.processInspectVo.specificationsModel = sample.specifications
            this.processInspectVo.unit = sample.unit
        },
        comBack() {
            this.$parent.comBackMain()
        },
        handleClick(row) {
            this.rowInfp = row
            this.showLook = true
        },
        updateInsInfo(row) {
            this.rowInfp = row
            this.showUp = true
        },
        combackMain() {
            this.showUp = false
            this.showLook = false
        },
        searchPro() {
            this.search.countSize = this.pageSize
            this.search.pageSize = this.currentPage
            this.defaultInitializationTable()
        },
        // ç‚¹å‡»è®¾å¤‡æ ‘保存点击记录
        nodeClick(data) {
            if (data.id != undefined) this.nodeData = data;
        },
        // è®¾å¤‡æ ‘过滤搜索
        filterNode(value, data) {
            if (!value) return true;
            return data.name.indexOf(value) !== -1;
        },
        // èŽ·å–设备树内容
        getOptions(row) {
            this.$axios.get(this.$api.url.inspectionItemChooseDev, {
                params: {
                    father: row.father,
                    name: row.name,
                    technologyId: this.processInspectVo.technologyId
                }
            }).then(res => {
                this.materialOptions = res.data;
                if (this.materialOptions.length === 1 && row.did != null) {
                    this.$message({
                        message: '该项目下只有一个试验设备，无需选择！',
                        type: 'warning'
                    });
                    return
                }
                row.isSelectDevice = true
            });
        },
        // ç‚¹å‡»è¡¨æ ¼é€‰æ‹©è§¦å‘
        clickTableSelect(scope) {
            this.centerDialogVisible = true;
            this.clickSelectDevice.index = scope.$index;
            this.clickSelectDevice.rpId = scope.row.id;
            this.getOptions(scope.row);
        },
        // ç‚¹å‡»æ ‘里面的确定
        clickNodeSure(row) {
            if (this.detailId == null) {
                this.projectTable[this.clickSelectDevice.index].deviceId = this.nodeData.id;
                this.projectTable[this.clickSelectDevice.index].deviceName = this.nodeData.name;
                this.centerDialogVisible = false;
            } else {
                this.$axios.post(this.$api.url.inspectionItemUpdateDevByInsId, {
                    id: this.clickSelectDevice.rpId,
                    devId: this.nodeData.id,
                    type: 2
                }).then(res => {
                    this.centerDialogVisible = false;
                    this.inspectionItems.forEach(a => {
                        if (a.id == this.clickSelectDevice.rpId) {
                            a.dname = this.nodeData.name
                        }
                    })
                });
            }
        },
        changeState(row, index) {
            if (row.did != null && row.did != '') {
                // let val = row.empiricalValueAddss.filter(item => {
                //     return item != '' && item != null
                // })
                // let eq = val.filter(item => {
                //     return /^[^><=]/.test(item)
                // })
                // if (eq.length > 0) {
                //     this.$message({
                //         message: "检测值[" + eq + "]格式首位应包含>,<或者=",
                //         type: 'warning'
                //     });
                //     return
                // }
                let str = ""
                row.empiricalValueAddss.forEach(e => {
                    str += e + ","
                })
                if (str.slice(0, -1) === '' || str.slice(0, -1) === null || str.slice(0, -1) === undefined) {
                    return
                }
                this.$axios.post(this.$api.url.inspectionItemlose_focus_update, {
                    deviceId: row.did,
                    inspectionItemId: row.id,
                    inspectionValue: str.slice(0, -1)
                }, {
                    headers: {
                        "Content-Type": "application/json"
                    }
                }).then(res => {
                    row.result = res.data.result
                    row.username = res.data.username
                })
            } else {
                this.$message({
                    message: '请选择择设备！',
                    type: 'warning'
                });
            }
        },
        // æ¯é¡µæ¡æ•°æ”¹å˜æ—¶è§¦å‘ é€‰æ‹©ä¸€é¡µæ˜¾ç¤ºå¤šå°‘è¡Œ
        handleSizeChange(val) {
            this.search.countSize = val;
            this.defaultInitializationTable();
        },
        handleSpanMethod({
            row,
            column,
            rowIndex,
            columnIndex
        }) {
            if (columnIndex === 0) {
                const _row = this.spanArr[rowIndex];
                const _col = _row > 0 ? 1 : 0;
                return {
                    rowspan: _row,
                    colspan: _col
                }
            }
            if (columnIndex === 1) {
                const _row = this.spanArr[rowIndex];
                const _col = _row > 0 ? 1 : 0;
                return {
                    rowspan: _row,
                    colspan: _col
                }
            }
        },
        // åˆå¹¶è¡¨æ ¼
        mergeTable() {
            this.rowList = []
            this.spanArr = []
            this.position = 0
            this.inspectionItems.forEach((item, index) => {
                if (index === 0) {
                    this.spanArr.push(1);
                    this.position = 0;
                } else {
                    if (this.inspectionItems[index].father === this.inspectionItems[index - 1].father) {
                        this.spanArr[this.position] += 1;
                        this.spanArr.push(0);
                    } else {
                        this.spanArr.push(1);
                        this.position = index;
                    }
                }
            })
        },
        changeOptionSoptionSprocesses() {
            this.optionTechnology = []
            let working = this.optionSoptionSprocesses.filter(item => {
                return item.name === this.processInspectVo.techfather
            })[0]
            this.optionTechnology = working.children
        },
        addTestProjevt() {
            // this.isAddProject = true
            let val = JSON.parse(JSON.stringify(this.processInspectVo))
            val.material = this.processInspectVo.material.split("-")[1]
            val.id = this.processInspectVo.material.split("-")[0]
            this.$axios.post(this.$api.url.finishedInspectAddFinish, val, {
                headers: {
                    "Content-Type": "application/json"
                }
            }).then(res => {
                if (res.code == 201) {
                    this.$message({
                        message: res.message,
                        type: 'warning'
                    });
                    return
                }
                this.detailId = res.data
                this.inspectionResultForm[0].id = val.mcode
                this.inspectionResultForm[0].name = val.material
                this.getTableData()
            })
        },
        getTableData() {
            console.log(this.rowInfo);
            this.$axios.get(this.$api.url.finishedInspectSelectFinishInspectsListById, {
                params: {
                    id: this.rowInfo.id
                }
            }).then(res => {
                this.processInspectVo.technologyId = res.data[0].techId
            })
            this.$axios.get(this.$api.url.inspectionItemListUser, {
                params: {
                    id: this.detailId,
                    type: 2
                }
            }).then(res => {
                if (res.data.length < 1) {
                    return
                }
                this.inspectionItems = res.data
                let arr = []
                let val = JSON.parse(JSON.stringify(this.inspectionItems))
                const uName = []
                //转成一维数组
                val.forEach(l => {
                    let father = l.father
                    l.children.forEach(c => {
                        c.father = father
                        c.empiricalValueAddss = []
                        if (c.inspectionValue != '' && c.inspectionValue != null) {
                            c.empiricalValueAddss = c.inspectionValue.split(",");
                        } else {
                            c.empiricalValueAddss.push("")
                        }
                        uName.push(c['username'])
                        c.isSelectDevice = false
                        arr.push(c)
                    })
                })
                this.inspectionItems = arr
                let arrSort = JSON.parse(JSON.stringify(arr))
                //根据集合对象数组长度排序
                arrSort.sort((a, b) => {
                    if (a.empiricalValueAddss.length < b.empiricalValueAddss.length) {
                        return -1; // a排在b前面
                    } else if (a.empiricalValueAddss.length > b.empiricalValueAddss.length) {
                        return 1; // a排在b后面
                    } else {
                        return 0; // ä¿æŒç›¸å¯¹é¡ºåºä¸å˜
                    }
                });
                // console.log(arrSort);
                console.log(uName);
                let name = [...new Set(uName)].filter(item => item !== null);
                let rname = ''
                name.forEach(m => {
                    rname += m + ","
                })
                this.inspectionResultForm[0].inspecter = rname.slice(0, -1)
                this.empiricalValueAdd = arrSort[arrSort.length - 1].empiricalValueAddss.length
                this.mergeTable(arr)
            })
        },
        selectSample() {
            let sample = this.optionsSamplename.filter(item => {
                return item.name === this.processInspectVo.material
            })[0]
            this.processInspectVo.techfather = null
            this.processInspectVo.techname = null
            this.processInspectVo.materialCode = sample.code
            this.processInspectVo.specificationsModel = sample.specifications
            this.processInspectVo.unit = sample.unit
            this.optionSoptionSprocesses = []
            this.optionSoptionSprocesses = sample.children
        },
        selectInfoByOrderId() {
            this.$axios.get(this.$api.url.finishedInspectChooseMater, {
                params: {
                    orderNumber: this.processInspectVo.orderNumber
                }
            }).then(res => {
                if (res.data.length > 0) {
                    console.log(res.data);
                    this.processInspectVo.sname = res.data[0].sname
                    this.processInspectVo.prname = res.data[0].prname
                    this.optionsSamplename = res.data[0].children
                } else {
                    this.$message({
                        message: '没有该订单号！',
                        type: 'warning'
                    });
                }
            })
        },
        // å½“前页改变时触发 è·³è½¬å…¶ä»–页
        handleCurrentChange(val) {
            this.search.pageSize = val;
            this.defaultInitializationTable();
        },
        // æ˜¾ç¤ºæ–°å¢žé¡µé¢
        handleAddNew() {
            this.showAddPage = true;
            // this.getTableData()
        },
        // è¡¨æ ¼åˆå§‹åŒ–接口
        defaultInitializationTable() {
            this.$axios
                .post(this.$api.url.selectProcessInspectsList, this.search)
                .then(res => {
                    this.inspectionTableTotal = res.data.total;
                    this.inspectionTable = res.data.row;
                });
        },
        // æ·»åŠ è¡Œ
        clickAddLine() {
            let obj = {
                material: "",
                materialCode: "",
                orderNumber: "",
                quantity: 0,
                specificationsModel: "",
                techfather: "",
                techname: "",
                technologyId: 0,
                unit: ""
            };
            this.inspectionItems.push(obj);
        },
        // åˆ é™¤è¡Œ
        clickDeleteline(scope) {
            this.inspectionItems.splice(scope.$index, 1);
        },
        // åˆ é™¤æ£€éªŒå€¼åˆ—
        clickDeleteInspectionColumn() {
            if (this.empiricalValueAdd - 1 === 0) { } else {
                if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
                    this.empiricalValueAdd = this.empiricalValueAdd - 1;
                    this.inspectionItems.forEach(i => {
                        i.testValueList.splice(this.empiricalValueAdd, 1);
                    });
                }
            }
        },
        // æ·»åŠ æ£€éªŒå€¼åˆ—
        clickAddInspectionColumn() {
            this.empiricalValueAdd = this.empiricalValueAdd + 1;
        }
    },
    created() {
        this.defaultInitializationTable(); // åˆå§‹åŒ–表格数据
    }
}
</script>

<style></style>

 src/views/quality/finishedProductInspection/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,480 @@
<template>
    <div class="content-main">
        <div v-if="!showAdd&&!showLook&&!showUp" class="rawPage">
            <!-- <div class="nav"> -->
                <!-- <div class="title">
                    <el-row>
                        <el-col :span="12">产品检验</el-col>
                        <el-col :span="12">
                            <el-button @click="handleAddNew" type="primary" size="mini" icon="el-icon-plus"
                                style="background: #004EA2; ">新增</el-button>
                            <el-button icon="el-icon-delete" size="mini">删除</el-button>
                            <el-button icon="el-icon-download" size="mini">导出</el-button>
                        </el-col>
                    </el-row>
                </div> -->
                <!-- <span>检测结果：</span>
                <el-select v-model="searchData.result" size="small" placeholder="请选择" style="width: 224px;margin-right: 52px;">
                    <el-option :value="''" label="全部"></el-option>
                    <el-option :value="1" label="合格"></el-option>
                    <el-option :value="0" label="不合格"></el-option>
                </el-select>
                <span>产品名称：</span>
                <el-input v-model="searchData.material" size="small" placeholder="请输入产品名称"
                    style="width: 224px;margin-right: 52px;"></el-input>
                <el-button size="mini" @click="()=>{searchData={};getInspectionTableData()}"><span>重 ç½®</span></el-button>
                <el-button size="mini" type="primary" @click="getInspectionTableData" style="background: #004EA2;"><span>查
                        è¯¢</span></el-button> -->
            <!-- </div> -->
            <basic-container>
                <ttable 
                :table="table"
                @handleSelectionChange="handleSelectionChange"
                :prelang="prelang"
                :options="options"
                :ajaxFun="ajaxFun"
                ref="finishedProduct">
                <template #toolbar></template>
                </ttable>
            </basic-container>
            <!-- <div class="content-body">
                <div class="inspectionTable">
                    <el-table ref="inspectionTable" height="620" :cell-style="{textAlign: 'center'}"
                        :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
                        :data="inspectionTable" style="width: 100%">
                        <el-table-column type="selection" width="50">
                        </el-table-column>
                        <el-table-column prop="order_number" label="订单号" min-width="100" />
                        <el-table-column prop="customer_name" label="客户名称" min-width="80" />
                        <el-table-column prop="project_name" label="工程名称" min-width="80" />
                        <el-table-column prop="quality_traceability" label="质量追溯号" min-width="108" />
                        <el-table-column prop="material_code" label="产品编码" min-width="100" />
                        <el-table-column prop="material" label="产品大类" min-width="72" />
                        <el-table-column prop="specifications_model" label="规格型号" min-width="110" />
                        <el-table-column prop="unit" label="单位" min-width="50" />
                        <el-table-column prop="quantity" label="数量" min-width="50" />
                        <el-table-column prop="detectionPeriod" label="检验日期" min-width="80" />
                        <el-table-column prop="result" label="检测结果" min-width="80">
                            <template slot-scope="scope">
                                <span style="color: #34BD66;" v-if="scope.row.result === 1">合格</span>
                                <span style="color: #E84738;" v-else-if="scope.row.result === 0">不合格</span>
                                <span v-else-if="scope.row.result === null || scope.row.result === undefined">暂未结论</span>
                            </template>
                        </el-table-column>
                        <el-table-column label="操作" min-width="80">
                            <template slot-scope="scope">
                                <el-button type="text" size="small" @click="goToDetail(scope.row)">查看</el-button>
                                <el-button type="text" size="small">打印</el-button>
                                <el-button v-if="scope.row.result == null" type="text" size="small"
                                    @click="goUp(scope.row)">编辑</el-button>
                            </template>
                        </el-table-column>
                    </el-table>
                </div> -->
                <!-- åˆ†é¡µå™¨ -->
                <!-- <div class="pagination">
                    <el-pagination :current-page="pageParams.pageSize" :page-sizes="[10, 50, 100, 200]"
                        :page-size="pageParams.countSize" layout="total, sizes, prev, pager, next, jumper" :total="pageParams.total"
                        @size-change="handleSizeChange" @current-change="handleCurrentChange" />
                </div> -->
            <!-- </div> -->
        </div>
        <div class="newPage" v-if="showAdd">
            <finishedProductInspectionAdd />
        </div>
        <div class="newPage" v-if="showLook">
            <finishedProductInspectionLook :rowInfo="rowInfo" />
        </div>
        <div class="newPage" v-if="showUp">
            <finishedProductInspectionUp :rowInfo="rowInfo" />
        </div>
    </div>
</template>


<script>
    import ttable from '@/views/common/ztt-table.vue'
    import * as fecha from 'element-ui/lib/utils/date'
    import finishedProductInspectionAdd from './finishedProductInspectionAdd'
    import finishedProductInspectionUp from './finishedProductInspectionUp'
    import finishedProductInspectionLook from './finishedProductInspectionLook'
    import { page } from '@/api/quality/finishedProduct'
    export default {
        components: {
            finishedProductInspectionAdd,
            finishedProductInspectionUp,
            finishedProductInspectionLook,
            ttable
        },
        data() {
            return {
                result:[{label:'全部',value: ''},{label:'合格',value: '1'},{label:'不合格',value: '0'}],
                type: [1],
                prelang: 'finishedProduct',
                ajaxFun: page,
                options: {
                    height: 300, // é»˜è®¤é«˜åº¦-为了表头固定
                    stripe: true, // æ˜¯å¦ä¸ºæ–‘马纹 table
                    highlightCurrentRow: false, // æ˜¯å¦è¦é«˜äº®å½“前行
                    border: true, // æ˜¯å¦æœ‰çºµå‘边框
                    lazy: false, // æ˜¯å¦éœ€è¦æ‡’加载
                    fit: true, // åˆ—的宽度是否自撑开
                    multiSelect: true, //
                    seqNo: true,
                    isRefresh: true, // æ˜¯å¦æ˜¾ç¤ºåˆ·æ–°æŒ‰é’®
                    isShowHide: true, // æ˜¯å¦æ˜¾ç¤ºæ˜¾å½±æŒ‰é’®H
                    isSearch: true, // é«˜çº§æŸ¥è¯¢æŒ‰é’®
                    defaultOrderBy: { column: 'createTime', direction: 'desc' },
                },
                table: {
                    total: 0,
                    currentPage: 1,
                    pageSize: 20,
                    data: [],
                    // æ ‡é¢˜
                    column: [
                        {
                            minWidth: '120',
                            prop: 'orderNumber',
                            label: '订单号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text',
                            render: { fun: this.addOrUpdateHandle }
                        },
                        {
                            minWidth: '120',
                            prop: 'customerName',
                            label: '客户名称',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '130',
                            width: '150',
                            prop: 'projectName',
                            label: '工程名称',
                            sort: true,
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text',
                        },
                        {
                            minWidth: '120',
                            prop: 'materialCode',
                            label: '产品编码',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '120',
                            prop: 'material',
                            label: '产品大类',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '120',
                            prop: 'specs',
                            label: '规格型号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '120',
                            prop: 'unit',
                            label: '单位',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '120',
                            prop: 'quantity',
                            label: '数量',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '120',
                            prop: 'createTime',
                            label: '检验日期',
                            sort: true,
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'datetimerange',
                            formatter: this.formatDateTime,
                        },
                        {
                            minWidth: '120',
                            prop: 'result',
                            label: '检测结果',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'select',
                            formatter: this.formatResult,
                            optList: () => {
                                return this.result
                            }
                        },
                    ],
                    toolbar: [
                    {
                        text: '新增',
                        type: 'primary',
                        fun: ()=>this.showAdd=true
                    },
                    {
                        text: '删除',
                    },
                    {
                        text: '导出',
                    }
                    ],
                    operator: [{
                        text: '打印',
                        type: 'text',
                        size: 'small',
                    },{
                        text: '作废',
                        type: 'text',
                        size: 'small',
                        fun: this.deleteHandle
                    }],
                    operatorConfig: {
                    fixed: 'right',
                    label: '操作',
                    width: 100,
                    minWidth: 100
                    },
                },





                
                searchData: {
                    result: '',
                    material: '',
                },
                // ä¸»æœºå·¥ä¸‹æ‹‰æ¡†
                usernameOptions: [],
                inspectionTable: [],
                rowInfo: {},
                pageParams: {
                    countSize: 10, //每页数量
                    pageSize: 1, // å½“前页码
                    total: 0
                },
                showAddPage: false,
                showAdd: false,
                showLook: false,
                showUp: false,
                showDetail: false,
                addInspectionform: [{
                    number: '',
                    username: '',
                    projectname: '',
                    tracenumber: '',
                    code: '',
                    class: '',
                    specificationmodel: '',
                    unit: '',
                    quantity: '',
                    group: '',
                    worker: '',
                    machine: ''
                }],
                inspectionItems: [{
                    project: '布隆迪',
                    unit: '吨',
                    standardVal: '8219384314',
                    controlVal: '9823401',
                    detectionVal: '11111',
                    device: '',
                    conclusion: '合格'
                }],
                inspectionResultForm: [{
                    id: '274024',
                    name: '111',
                    inspecter: '111',
                    conclusion: '',
                    operation: ''
                }],
                finishedInsInfo: {}
            }
        },
        created() {
            this.init()
            // this.getInspectionTableData()
        },
        methods: {
            formatResult(row, column, cellValue){
                if(cellValue != undefined || cellValue != null){
                    if(cellValue == 0){
                        return "<span style='color:#E84738;'>不合格</span>"
                    }else if(cellValue == 1){
                        return "<span style='color:#34BD66;'>合格</span>"
                    }
                }
            },
            formatDateTime(row, column, cellValue) {
                return cellValue ? fecha.format(new Date(cellValue), 'yyyy-MM-dd') : ''
            },
            addOrUpdateHandle(row) {
                this.$router.push({
                    name: 'rawMaterialForm',
                    query: { id: row == null ? null : row.id }
                })
            },
            handleSelectionChange(){

            },
            // æ¯é¡µæ¡æ•°æ”¹å˜æ—¶è§¦å‘ é€‰æ‹©ä¸€é¡µæ˜¾ç¤ºå¤šå°‘è¡Œ
            handleSizeChange(val) {
                console.log(`每页 ${val} æ¡`)
                this.currentPage = 1
                this.pageSize = val
            },
            // å½“前页改变时触发 è·³è½¬å…¶ä»–页
            handleCurrentChange(val) {
                console.log(`当前页: ${val}`)
                this.currentPage = val
            },
            handleAddNew() {
                this.showAdd = true
            },
            // async getInspectionTableData() {
            //     const {
            //         data: {
            //             row,
            //             total
            //         }
            //     } = await this.$axios.get(this.$api.url.finishedInsListPage, {
            //         params: {
            //             ...this.pageParams,
            //             ...this.searchData
            //         }
            //     })
            //     this.inspectionTable = row
            //     this.pageParams.total = total
            // },
            goToDetail(row) {
                this.rowInfo = row
                this.showLook = true
            },
            goUp(row) {
                this.rowInfo = row
                this.showUp = true
            },
            async init() {
                // const {data} = await this.$axios.get(this.$api.url.finishedInspectUser)
                // this.usernameOptions = data

            },
            comBackMain(val) {
                this.showAdd = false
                this.showLook = false
                this.showUp = false
                this.init()
                // this.getInspectionTableData()
                if (val) {
                    this.$parent.removeAllTab()
                }
            }
        }

    }
</script>

<style scope="scope">
    .title {
        padding: 12px;

    }

    .nav {
        display: flex;
        padding: 20px 20px;
        align-items: center;
        background-color: #fff;
    }

    .nav * {
        font-size: 14px;
    }

    .content-body {
        background-color: #fff;
        overflow: hidden;
        margin-top: 12px;
    }

    .inspectionTable {
        padding: 20px 20px;
    }

    .pagination {
        float: right;
        margin-right: 20px;
    }

    .newPage {
        overflow: hidden;
    }

    .header {
        padding: 12px;
    }

    .addInspectionform {
        background-color: #fff;
    }

    .addInspectionform .formwrapper {
        padding: 20px 0px;
        margin-left: 100px;
    }

    .inspectionProject span {
        display: block;
        padding: 5px 0px;
    }

    .inspectionProject .el-table {
        background-color: #fff;
        padding: 10px 12px;
    }

    .inspectionResult span {
        display: block;
        padding: 5px 0px;
    }

    .inspectionResult .el-table {
        background-color: #fff;
        padding: 10px 12px;
    }

    .rawPage {
        height: 100%;
        display: flex;
        flex-direction: column;
        overflow-y: scroll;
    }

    .rawPage .content-body {
        flex: 1;
    }

    /* .inspectionTable{
    flex: 1;
    overflow-y: scroll;
} */
</style>

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

@@ -6,7 +6,7 @@
        <h2>编辑-原材料检验</h2>
      </div>
      <div class="btn-group header-right">
        <el-button @click="save()">保存</el-button>
        <el-button @click="save()" v-if="this.dataForm.id==null">保存</el-button>
      </div>
    </div>
    <div class="page-main">
@@ -100,33 +100,59 @@
                </div>
            </el-col>
        </el-row>
        <el-row style="width:100%;margin-top:-30px">
        <el-row style="width:100%;">
            <el-col :span="24">
                <avue-crud
                ref="crud"
                :option="tableOption"
                @current-row-change="changeEquipment"
                :data="list"
                v-model="form">
                  <template slot="testValue" slot-scope="scope">
                <el-table :data="list" border style="width: 100%;" height="320">
                  <el-table-column type="index" label="序号" width="60">
                  </el-table-column>
                  <el-table-column prop="name" label="项目" width="260">
                    <template slot-scope="scope">
                      <el-input :disabled="dataForm.id != null" class="inline-input" v-model="scope.row.name"
                        placeholder="请输入项目名称"></el-input>
                    </template>
                  </el-table-column>
                  <el-table-column prop="unit" label="单位" width="260">
                    <template slot-scope="scope">
                      <el-input :disabled="dataForm.id != null" v-model="scope.row.unit" placeholder="请输入单位"></el-input>
                    </template>
                  </el-table-column>
                  <el-table-column prop="required" label="标准值" width="260">
                    <template slot-scope="scope">
                      <el-input :disabled="dataForm.id != null" v-model="scope.row.required"
                        placeholder="请输入标准值"></el-input>
                    </template>
                  </el-table-column>
                  <el-table-column prop="testValue" label="检测值" min-width="260" v-for="(item, index) in empiricalValueAdd"
                    :key="index">
                    <template slot-scope="scope">
                    <el-tooltip :disabled="scope.row.equipmentId != null" class="item" effect="dark" content="请先选择设备！"
                      placement="top-start">
                      <el-input :disabled="scope.row.equipmentId == null" v-model="scope.row.testValue"
                        <el-input :disabled="scope.row.equipmentId == null" v-model="scope.row.testValueList[index]"
                         @blur="updateTestValue(scope.row)" placeholder="请输入检测值"></el-input>
                    </el-tooltip>
                  </template>
                  <template slot="deviceName" slot-scope="scope">
                    <el-select v-model="scope.row.equipmentId" filterable>
                  </el-table-column>
                  <el-table-column prop="deviceName" label="试验设备" min-width="260">
                    <template slot-scope="scope">
                      <el-select style="width:100%" v-model="scope.row.equipmentId" filterable @change="updateDevice(scope.row)">
                        <el-option v-for="(item,index) in deviceList" 
                        :key="index" :value="item.id" :label="item.number +'-'+ item.name"></el-option>
                    </el-select>
                  </template>
                  <template slot="testState" slot-scope="scope">
                  </el-table-column>
                  <el-table-column fixed="right" v-if="dataForm.id != null" prop="testState" label="结论" min-width="150">
                    <template slot-scope="scope">
                    <span v-if="scope.row.testState == 0" style="color:#F56C6C">不合格</span>
                    <span v-else-if="scope.row.testState == 1" style="color:#67C23A">合格</span>
                    <span v-else>暂无结论</span>
                  </template>
                </avue-crud>
                  </el-table-column>
                  <el-table-column fixed="right" style="background-color: white;" v-if="dataForm.id == null" label="操作" width="150">
                    <template slot-scope="scope">
                      <el-button type="text" @click="clickDeleteline(scope)">取消</el-button>
                    </template>
                  </el-table-column>
                </el-table>
            </el-col>
        </el-row>
      </div>
@@ -141,36 +167,57 @@
              :option="option"
              :data="conclusionTable"
              v-model="conclusion">
                <template slot="judgeState" slot-scope="scope">
                  <el-tag type="success" v-if="scope.row.judgeState == 1">合格</el-tag>
                  <el-tag type="danger" v-else-if="scope.row.judgeState == 0">不合格</el-tag>
                </template>
                <template #menu>
                  <el-button type="text" size="small">上报</el-button>
                  <el-button type="text" @click="submitSave()" size="small">上报</el-button>
                </template>
              </avue-crud>
          </el-col>
        </el-row>
      </div>
      
    </div>
  </div>
</template>

<script>
import { object,conclusion } from '@/const/crud/quality/rawMaterial'
import { selectDevice,addRawInspects,getObj,updateRawInsProduct } from '@/api/quality/rawMaterial'
import { 
  selectDevice,
  addRawInspects,
  getObj,
  updateRawInsProduct,
  updateRawInspectsById,
  updateDeviceById, } from '@/api/quality/rawMaterial'
export default {
    data(){
        return{
            columnIndex: 2,
            // æ·»åŠ åˆ—
            empiricalValueAdd: 1,
            // ç¼–辑时存储最长的列数字，做删除判断
            empiricalValueAddMaxNumber: 0,
            columnList: [],
            dataForm:{
                id: null,
                judgeState: null,
                formTime: '2023-10-28 00:00:00',
                message: '-2050314,1,1,*,1002',
                name: 'name',
                code: 'code4',
                specs: 'specs',
                unit: 'mm',
                number: '111',
                supplier: 'supplier',
                rawInsProducts: null,
                rawInsProducts: [{
                  equipmentId: 0,
                  name: '',
                  required: '',
                  testValue: '',
                  unit: '',
                  testValueList: []
                }]
            },
            form: null,
            list:[],
@@ -197,83 +244,59 @@
      this.getDeviceList()
    },
    watch:{
      'columnList.length':function(newVal){
        const column = [{
              label: '项目',
              width: 260,
              prop: 'name',
              span: 24,
              type: 'text',
              cell: true,
            }, {
              width: 260,
              label: '单位',
              prop: 'unit',
              span: 24,
              type: 'text',
              cell: true,
            }, {
              width: 260,
              label: '标准值',
              prop: 'required',
              type: 'text',
              span: 24,
              cell: true,
            }, {
              label: '检测值',
              prop: 'testValue',
              type: 'text',
              width: 260,
              slot: true,
              formSlot: true,
              cell: true,
            }, {
              label: '试验设备',
              prop: 'deviceName',
              type: 'select',
              cell: true,
              slot: true,
              formSlot: true,
              width: 260
            },{
              label: '结论',
              prop: 'testState',
              type: 'text',
              slot: true,
              formSlot: true,
              hide: true,
              fixed: 'right'
        }]
        if(newVal > 0){
          if(this.columnList.length > 0){
            this.tableOption.column = column
            this.columnList.forEach(item=>{
              this.tableOption.column.splice(4,0,item)
            })
          }
        }else{
          this.tableOption.column = column
        }
      },

    },
    methods:{
      changeEquipment(current,old){
        console.log(current,old)
      updateDevice(row){
        if(this.dataForm.id != null){
          updateDeviceById({equiomentId:row.equipmentId,rpId:row.rpId}).then(res=>{
          }).catch(error=>{
            console.log(error)
          })
        }
      },
      submitSave(){
        let pro = this.list.filter(item => {
          return item.testState == 0;
        })
        if (pro.length > 0) {
          this.$prompt('请输入不合格数量', '不合格数量', {
            confirmButtonText: '确定',
            cancelButtonText: '取消',
            inputPattern: /^\d+$/,
            inputErrorMessage: '请输入正确数字格式'
          }).then(({ value }) => {
            let data = {
              id: this.dataForm.id,
              number: value
            }
            updateRawInspectsById(data).then(res => {
              this.$message.success("上报成功");
            });
          }).catch(() => {});
        }else{
          updateRawInspectsById({id:this.dataForm.id,number:0}).then(res => {
          this.$message.success("上报成功");
        });
        }
        this.init()
      },
      addTeatValueColumn(){
        let propName = 'testValue' + this.columnIndex
        this.columnList.push({
          label: '检测值',
          prop: propName,
          type: 'text',
          width: 260,
          $cellEdit: true,
          disabled: this.list[0].equiomentId == null
        })
        this.columnIndex+=1
        this.empiricalValueAdd = this.empiricalValueAdd + 1;
      },
      // åˆ é™¤è¡Œ
      clickDeleteline(scope) {
        this.list.splice(scope.$index, 1);
      },
      delTeatValueColumn(){
        this.columnList.pop()
        if (this.empiricalValueAdd - 1 === 0) { } else {
          if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
            this.empiricalValueAdd = this.empiricalValueAdd - 1;
            this.list.forEach(i => {
              i.testValueList.splice(this.empiricalValueAdd, 1);
            });
          }
        }
      },
      updateTestValue(row){
        if(row.rpId == null){
@@ -282,7 +305,7 @@
        let obj = {
          equiomentId: row.equipmentId,
          rpId: row.rpId,
          testValue: row.testValue
          testValue: row.testValueList.join(",")
        }
        updateRawInsProduct(obj).then(res=>{
          if(res.data.code === 0){
@@ -308,10 +331,18 @@
            this.dataForm.number = data.number
            this.dataForm.createTime = data.creatTime
            this.dataForm.createUser = data.createUser
            // this.dataForm.judgeState = data.judgeState
            let userNameList = []
            this.list = []
            data.children.forEach(item=>{
              userNameList.push(item.userName)
              let arr = []
              if(item.testValue != undefined ){
                arr = item.testValue.split(",")
                this.empiricalValueAdd = arr.length
              }else{
                this.empiricalValueAdd = 1
              }
              this.list.push({
                equipmentId: item.equiomentId,
                name: item.rpName,
@@ -319,14 +350,15 @@
                testValue: item.testValue,
                unit: item.rpUnit,
                testState: item.testState,
                rpId: item.rpId
                rpId: item.rpId,
                testValueList: arr
              })
            })
            this.conclusionTable = [{
              code: data.code,
              name: data.name,
              userName: Array.from(new Set(userNameList)).join(','),
              testState: ''
              judgeState: data.judgeState
            }]
          }).catch(error=>{
            this.$message.error("获取失败",error)
@@ -339,8 +371,10 @@
      save(){
        let data = this.dataForm
        data.rawInsProducts = this.list
        console.log(this.list)
        return
        data.rawInsProducts.forEach(item=>{
          let val = item.testValueList.join(",")
          item.testValue = val
        })
        addRawInspects(data).then(res=>{
            this.$message.success("保存成功")
        }).catch(error=>{
@@ -350,12 +384,13 @@
      // æ·»åŠ è¡Œ
      clickAddLine() {
        let obj = {
          $cellEdit: true,
          equipmentId: null,
          name: "",
          required: "",
          testValue: "",
          unit: ""
          unit: "",
          testState: null,
          testValueList: [],
        };
        this.list.push(obj);
      },

 src/views/technology/document/document-form.vue

@@ -974,7 +974,6 @@
            bomId: this.dataForm.bomId,
          })
        ).then((response) => {
          console.log(response)
          this.routingList = response.data.data
        })
      } else {
@@ -1850,7 +1849,6 @@
        allKeyValues = allKeyValues.concat(keyValues)
        i = i + keyValues.length
      }
      console.log("aaa--",allKeyValues)
      this.materialCostList = allKeyValues
    },
    objectSpanMethod({ row, column, rowIndex, columnIndex }) {