value
2023-09-21 7b2fffec6f45d2b5d4c827efbeee4a2e21c0adc0
9.21
已修改5个文件
1409 ■■■■ 文件已修改
src/components/view/finishedProductInspectionUp.vue 1380 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/rawInsBox.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/rawInsDetail.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/standard.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/view/index.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/finishedProductInspectionUp.vue
@@ -1,712 +1,708 @@
<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; "
    <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
                    <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 v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
                </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>
                        <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-column v-if="detailId == null" label="操作" width="100">
                    </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-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>
            </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
            }
            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'
                    });
                }
            })
    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
                }
                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
                this.filterText = row.did
            });
        },
        // 点击表格选择触发
        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() {
            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(); // 初始化表格数据
    }
}
            },
            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/components/view/rawInsBox.vue
@@ -28,10 +28,8 @@
            goDetail(id) {
                this.showDetail = true
                this.id = id
                console.log(this.id)
            },
            goBack() {
                this.$parent.removeAllTab()
                this.showDetail = false
            }
        }
src/components/view/rawInsDetail.vue
@@ -168,7 +168,7 @@
                        <span v-show="scope.row.testState != null" :style="{
                color: scope.row.testState === 1 ? '#67C23A' : '#F56C6C'
              }">{{ scope.row.testState === 1 ? "合格" : "不合格" }}</span>
                        <span v-show="scope.row.testState == null">暂未结论</span>
                        <span v-show="scope.row.testState != null">{{null}}</span>
                    </template>
                </el-table-column>
                <el-table-column v-if="detailId !== null" label="操作" width="120">
@@ -231,19 +231,6 @@
                conclusion.uName = [
                    ...new Set(this.projectTable.map(item => item.uName))
                ];
                if (
                    this.projectTable.filter(item => item.testState === undefined).length ===
                    this.projectTable.length
                ) {
                    conclusion.testState = null;
                    return [conclusion];
                }
                if (this.projectTable.filter(item => item.testState === 0).length > 0) {
                    conclusion.testState = 0;
                } else {
                    conclusion.testState = 1;
                }
                console.log([conclusion]);
                return [conclusion];
            }
        },
src/components/view/standard.vue
@@ -48,7 +48,7 @@
            <el-option :value="0" label="工艺路线"></el-option>
            <el-option :value="1" label="技术指标"></el-option>
            <el-option :value="2" label="物料清单"></el-option>
            <el-option :value="3" label="生产工艺"></el-option>
            <!-- <el-option :value="3" label="生产工艺"></el-option> -->
          </el-select>
          <span>版本:</span>
          <el-select v-model="versionVal" @change="verevent" size="small" style="width: 13vw;margin-right: 15px;" placeholder="请选择">
src/view/index.vue
@@ -352,12 +352,6 @@
                        v: "WMS管理",
                        i: "font icon-a-Inventorydumprequest",
                        c: [{
                                k: 15,
                                v: "原材料库存",
                                i: "font icon-shouye",
                                u: ""
                            },
                            {
                                k: 17,
                                v: "半成品库存",
                                i: "font icon-shouye",
@@ -541,7 +535,7 @@
                    u: "index-index"
                }]
            },
            upTabActive(num) {
                this.tabActive = num;
                this.activeP = num;
@@ -559,7 +553,7 @@
                localStorage.removeItem("autoenter");
                this.$router.push("/enter");
            },
            removeAllTab(){
            removeAllTab() {
                this.upIndex++
                this.$message.warning('数据变动较大,页面自动更新!')
            }