Merge remote-tracking branch 'origin/master'

王震

2023-09-14 0c409fb4381a7be9dd96a3e8cb0161f77bc7ef8c

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/components/view/technology.vue

 src/assets/api/controller.js

@@ -24,7 +24,11 @@
    addTechniqueByStandard:"/technique/add",//右上角新增-->生产工艺
    chooseProByProduct:"/technique/choosePro",//右上角新增-->生产工艺-->选择项目(父子),单位
    chooseDevByProduct:"/technique/chooseDev",//右上角新增-->生产工艺-->选择设备

    addVersion:"/material/addVersion",//添加同一个型号工艺路线,技术指标,物料清单,生产工艺的版本
    delAllByTechnology:"/technology/delAllTech",//工艺路线-批量删除
    delAllByTarget:"/product/delAllPro",//技术指标-批量删除
    delAllByMBom:"/mbom/delAllMbom",//物料清单-批量删除
    delAllByProduct:"/technique/delAllTeq",//生产工艺-批量删除
    // æŠ€æœ¯ç®¡ç†-技术文件
    selectAllOrder: "/orders/selectAllOrder", //查询所有订单列表
    selectOrderById: "/orders/selectOrderById", //根据订单id查询订单详情
@@ -69,12 +73,16 @@
    projectListByfinishId: "/inspection-item/list_user", //根据id查询所有项目
    processInspectAddProcess: "/processInspect/addProcess",//新增检验
    inspectionItemListUser: "/inspection-item/list_user",//查询所有检验项目
    finishedInspectChooseMater: "/finished-inspect/chooseMater",//根据订单号得到信息
    finishedInspectAddFinish: "/finished-inspect/addFinish", //新增成品检验
}
// è¿‡ç¨‹æ£€éªŒ
const processInspection = {
    selectProcessInspectsList: "/processInspect/selectProcessInspectsList", // åˆ†é¡µæŸ¥è¯¢è¿‡ç¨‹æ£€éªŒå•åˆ—表
    chooseMaterProcessInspect: "/processInspect/chooseMater",//根据订单号选择产品和工艺

    inspectionItemUpdateDevByInsId: "/inspection-item/updateDevByInsId",//更改设备
    inspectionItemlose_focus_update: "/inspection-item/lose_focus_update",//检验值
    processInspectUpdateProcessInspectsById: "/processInspect/updateProcessInspectsById",//上报
}
// QMS实验室管理
const laboratory = {

 src/components/view/finishedProductInspection.vue

@@ -1,6 +1,6 @@
<template>
  <div class="content-main">
    <div v-if="!showAddPage" class="rawPage">
    <div v-if="!showAdd" class="rawPage">
        <div class="title">
      <el-row>
        <el-col :span="12">成品检验</el-col>
@@ -13,21 +13,13 @@
    </div>
    <div class="nav">
        <span>检验结果：</span>
        <el-select v-model="searchData.inspectResult" size="small" placeholder="请选择" style="width: 224px;margin-right: 52px;">
            <el-option value="1" label="合格"></el-option>
            <el-option value="2" label="不合格"></el-option>
        <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-date-picker
            v-model="searchData.inspectDate"
            type="date"
            placeholder="选择日期"
            style="margin-right: 52px">
           </el-date-picker>
          <span>检验人：</span>
          <el-select v-model="searchData.inspectUsername" size="small" placeholder="请选择" style="width: 224px;margin-right: 52px;">
            <el-option :value="item.id" :key="item.id" :label="item.name"  v-for="item in usernameOptions"></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>
@@ -66,7 +58,7 @@
                    min-width="108"
                />
                <el-table-column
                    prop="code"
                    prop="material_code"
                    label="产品编码"
                    min-width="100"
                />
@@ -113,6 +105,7 @@
                    <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 type="text" size="small">编辑</el-button>
                    </template>
                </el-table-column>
            </el-table>
@@ -120,9 +113,9 @@
        <!-- åˆ†é¡µå™¨ -->
        <div class="pagination">
            <el-pagination
            :current-page="pageParams.pageNo"
            :page-sizes="[100, 200, 300, 400]"
            :page-size="pageParams.pageSize"
            :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"
@@ -261,29 +254,45 @@
                </el-table>
            </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 finishedProductInspectionAdd from '@/components/view/finishedProductInspectionAdd'
import finishedProductInspectionUp from '@/components/view/finishedProductInspectionUp'
import finishedProductInspectionLook from '@/components/view/finishedProductInspectionLook'
export default {
    components: { finishedProductInspectionAdd,finishedProductInspectionUp, finishedProductInspectionLook},
    data(){
        return {
            searchData:{
                inspectionResult: '',
                inspectionDate: '',
                inspecter: '',
                result: '',
                material: '',
            },
            // ä¸»æœºå·¥ä¸‹æ‹‰æ¡†
            usernameOptions:[],
            inspectionTable:[
            ],
            rowInfo:{},
            pageParams:{
              pageNo: 1, // å½“前页码
              pageSize: 100, 
              countSize: 10, //每页数量
              pageSize: 1, // å½“前页码
              total:0
            },            
            showAddPage: false,
            showAdd: false,
            showLook: false,
            showUp: false, 
            showDetail:false,
            addInspectionform: [{
                number: '',
@@ -335,7 +344,7 @@
        this.currentPage = val
        },
        handleAddNew(){
            this.showAddPage=true
            this.showAdd=true
        },
        async getInspectionTableData() {
            const {data:{row,total}} = await this.$axios.get(this.$api.url.finishedInsListPage,{params:{...this.pageParams,...this.searchData}})
@@ -344,15 +353,15 @@
            this.pageParams.total = total
        },
        goToDetail(row) {
            this.showAddPage = true
            this.showDetail = true
            // this.showAddPage = true
            // this.showDetail = true
            this.finishedInsInfo = row
            console.log(this.showDetail)
            
            // this.addInspectionform = []
        },
        async init() {
            const {data} = await this.$axios.get(this.$api.url.finishedInspectUser)
            this.usernameOptions = data
            // const {data} = await this.$axios.get(this.$api.url.finishedInspectUser)
            // this.usernameOptions = data

        }
    }

 src/components/view/finishedProductInspectionAdd.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,583 @@
<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="showAddPage = false" 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 @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 @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 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-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="检验结论"></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 {
    data() {
        return {
            showUp: false,
            isAddProject: false,
            showLook: false,
            detailId: 28,
            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() {
        // 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
        },
        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: 1,
                        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
                console.log(this.detailId);
                this.inspectionResultForm[0].id = val.materialCode
                this.inspectionResultForm[0].name = val.material
                // this.getTableData()
            })
        },
        getTableData() {
            this.$axios.get(this.$api.url.inspectionItemListUser, {
                params: {
                    id: this.detailId,
                    type: 1
                }
            }).then(res => {
                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/components/view/finishedProductInspectionLook.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
<template>
  
</template>

<script>
export default {

}
</script>

<style>

</style>

 src/components/view/finishedProductInspectionUp.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
<template>
  
</template>

<script>
export default {

}
</script>

<style>

</style>

 src/components/view/laboratoryManagement.vue

@@ -1,8 +1,8 @@
<template>
  <div>
  <div class="laboratoryMangement">
    <el-row>
      <el-col :span="12" class="top_left_name">设备维护</el-col>
      <el-col :span="12" style="text-align: right;">
      <el-col :span="12" style="text-align: right;" class="title">
        <el-button
          @click="testItem()"
          type="primary"
@@ -995,3 +995,25 @@
  line-height: 14px;
}
</style>
<style>
    .laboratoryMangement .title *{
        font-size: 14px;
    }
	
    .laboratoryMangement .table_top_div *{
        font-size: 14px;
    }
	
    .laboratoryMangement .title .el-button {
      height: 32px;
      border: 1px solid rgba(190, 190, 190, 0.44);
      box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
      padding: 0 12px;
    }
    .laboratoryMangement .table_top_div .el-button {
      height: 32px;
      border: 1px solid rgba(190, 190, 190, 0.44);
      box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
      padding: 0 12px;
    }
</style>

 src/components/view/processInspection.vue

@@ -1,6 +1,6 @@
<template>
  <div class="content-main">
    <div v-if="!showAddPage" class="rawPage">
    <div v-if="!showAddPage&&!showUp&&!showLook" class="rawPage">
      <div class="title">
        <el-row>
          <el-col :span="12">过程检验</el-col>
@@ -15,8 +15,8 @@
        <span>检验状态：</span>
        <el-select size="small" v-model="search.result" placeholder="请选择检测状态" style="width: 224px;margin-right: 52px;">
          <el-option :value="''" label="全部"></el-option>
          <el-option :value="1" label="已检测"></el-option>
          <el-option :value="2" label="待检测"></el-option>
          <el-option :value="1" label="合格"></el-option>
          <el-option :value="0" label="不合格"></el-option>
        </el-select>
        <span>产品名称：</span>
        <el-input size="small" style="width: 224px;margin-right: 30px;" v-model="search.name"
@@ -25,7 +25,7 @@
        <el-input size="small" style="width: 224px;margin-right: 30px;" v-model="search.techfather"
          placeholder="请输入工序"></el-input>
        <el-button size="mini"><span>重 ç½®</span></el-button>
        <el-button size="mini" type="primary" style="background: #004EA2;"><span>查 è¯¢</span></el-button>
        <el-button size="mini" @click="searchPro" type="primary" style="background: #004EA2;"><span>查 è¯¢</span></el-button>
      </div>
      <div class="content-body">
        <div class="inspectionTable">
@@ -57,16 +57,16 @@
            </el-table-column>
            <el-table-column label="操作" min-width="80">
              <template slot-scope="scope">
                <el-button type="text" size="small" style="margin-left: 0;">详情</el-button>
                <el-button type="text" size="small" @click="handleClick(scope.row)">查看</el-button>
                <el-button type="text" size="small" style="margin-left: 0;">编辑</el-button>
                <el-button type="text" size="small" @click="handleClick(scope.row)" style="margin-left: 0;">详情</el-button>
                <el-button type="text" size="small" >查看</el-button>
                <el-button v-if="scope.row.result == null" type="text" size="small" style="margin-left: 0;"  @click="updateInsInfo(scope.row)">编辑</el-button>
              </template>
            </el-table-column>
          </el-table>
        </div>
        <!-- åˆ†é¡µå™¨ -->
        <div class="pagination">
          <el-pagination :current-page="1" :page-sizes="[10, 20, 30, 40]" :page-size="pageSize"
          <el-pagination :current-page="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="pageSize"
            layout="total, sizes, prev, pager, next, jumper" :total="inspectionTableTotal" @size-change="handleSizeChange"
            @current-change="handleCurrentChange" />
        </div>
@@ -151,7 +151,7 @@
                </el-form-item>
              </el-col>
              <el-col :span="10" style="display: flex;justify-content: end;">
                <el-button type="primary" @click="addTestProjevt">生成检验项目</el-button>
                <el-button type="primary" :disabled="isAddProject"  @click="addTestProjevt">生成检验项目</el-button>
              </el-col>
            </el-row>
          </div>
@@ -171,42 +171,43 @@
            > -->
          </el-col>
        </el-row>
        <el-table :row-key="inspectionItems.id" :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)" style="width: 100%">
        <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" label="检测值" min-width="100"  style="text-align: center;">
              <template slot-scope="scope">
                      <el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="请先选择设备！"
                    placement="top-start">
                    <el-input :disabled="scope.row.deviceId === null" :value="item" 
                      @blur="changeState(scope.row, index)" placeholder="请输入检测值"></el-input>
                  </el-tooltip>
              </template>
            </el-table-column>
          <el-table-column label="试验设备">
          <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">
              {{ scope.row.device }}
              <el-select v-model="scope.row.device" size="small" slot="append" style="width: 100px;">
                <el-option value="选项1"></el-option>
                <el-option value="选项2"></el-option>
              </el-select>
              <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">
          <!-- <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-column> -->
        </el-table>
      </div>
      <div class="inspectionResult">
@@ -219,15 +220,47 @@
          <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>
    <div class="newPage" v-if="showUp">
      <processInspectionUpdate :rowInfo="rowInfp"/>
    </div>
    <div class="newPage" v-if="showLook">
      <processInspectionLook :rowInfo="rowInfp"/>
    </div>
  </div>
</template>

<script>
import processInspectionUpdate from '../view/processInspectionUpdate.vue'
import processInspectionLook from '../view/processInspectionLook.vue'
export default {
  components: { processInspectionUpdate,processInspectionLook },
  data() {
    return {
      detailId: null,
      showUp: false,
      isAddProject:false,
      showLook: false,
      detailId: 28,
      rowInfp:{},
      search: {
        countSize: 10,
        pageSize: 1,
@@ -237,19 +270,22 @@
      },
      optionsSamplename: [],
      inspectionTable: [],
      tableColumn: [],
      optionSoptionSprocesses: [],
      optionTechnology: [],
      inspectionTableTotal: "",
      inspectionTableTotal: 0,
      pageSize: 10,
      currentPage: 1,
      treeProject: [],
      // æ·»åŠ åˆ—
      empiricalValueAdd: [],
      empiricalValueAdd: 1,
      // ç¼–辑时存储最长的列数字，做删除判断
      empiricalValueAddMaxNumber: 0,
      showAddPage: false,
      processInspectVo: {
        material: null,
        materialCode: null,
        orderNumber: "D-001",
        orderNumber: "",
        quantity: null,
        specificationsModel: null,
        techfather: null,
@@ -277,9 +313,9 @@
      inspectionItems: [], // æ–°å¢žæ£€éªŒé¡¹ç›®è¡¨æ ¼
      inspectionResultForm: [
        {
          id: "274024",
          name: "111",
          inspecter: "111",
          id: "",
          name: "",
          inspecter: "",
          conclusion: "",
          operation: ""
        }
@@ -288,59 +324,160 @@
      value: "",
      rowList: [],
      spanArr: [],
      position: 0
      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() {
    // this.getTableData()
    this.getOptions();
  },
  methods: {
    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: 1,
            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();
    },
    getInsArr(val){
      console.log(val);
      return val.split(",")
    },
    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
            }
        }
        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;
                }
            }
        })
      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 = []
@@ -350,6 +487,7 @@
      this.optionTechnology = working.children
    },
    addTestProjevt() {
      this.isAddProject=true
      let val = JSON.parse(JSON.stringify(this.processInspectVo))
      val.techname = this.processInspectVo.techname.split("-")[1]
      val.technologyId = this.processInspectVo.techname.split("-")[0]
@@ -373,31 +511,59 @@
          });
          return
        }
        this.InspectioniD = res.data
        this.detailId = res.data
        this.inspectionResultForm[0].id=val.materialCode
        this.inspectionResultForm[0].name=val.material
        this.getTableData()
      })
    },
    getTableData() {
      this.$axios.get(this.$api.url.inspectionItemListUser, {
        params: {
          id: 28,
          id: this.detailId,
          type: 1
        }
      }).then(res => {
        this.inspectionItems = res.data
        let arr = []
        let val=JSON.parse(JSON.stringify(this.inspectionItems))
        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.empiricalValueAdd=[]
            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
        console.log(this.inspectionItems);
        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)
      })
    },
@@ -438,7 +604,7 @@
    // æ˜¾ç¤ºæ–°å¢žé¡µé¢
    handleAddNew() {
      this.showAddPage = true;
      this.getTableData()
      // this.getTableData()
    },
    // è¡¨æ ¼åˆå§‹åŒ–接口
    defaultInitializationTable() {
@@ -492,6 +658,13 @@
</script>

<style>
.node_i {
  color: orange;
}
.div_device_dialog {
  min-height: 400px;
  overflow: auto;
}
.nav {
  display: flex;
  padding: 20px 20px;

 src/components/view/processInspectionLook.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,627 @@
<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="combackFather" 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 :gutter="230">
                        <el-col :span="7">
                            <el-form-item label="订单号：">
                                <el-input @blur="selectInfoByOrderId" disabled style="width: 210px;" size="small"
                                    v-model="processInspectVo.orderNumber" placeholder="请输入订单号" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="产品名称：">
                                <el-select style="width: 210px;" size="small" disabled @change="selectSample"
                                    v-model="processInspectVo.material" placeholder="请选择产品">
                                    <el-option v-for="item in optionsSamplename" :key="item.value" :label="item.name"
                                        :value="item.name">
                                    </el-option>
                                </el-select>
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="产品编码：">
                                <el-input style="width: 210px;" size="small" disabled
                                    v-model="processInspectVo.materialCode" placeholder="请输入产品编码" />
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row :gutter="230">
                        <el-col :span="7">
                            <el-form-item label="规格型号：">
                                <el-input style="width: 210px;" size="small" disabled
                                    v-model="processInspectVo.specificationsModel" placeholder="请输入规格型号" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="工序名称：">
                                <el-select @change="changeOptionSoptionSprocesses" disabled
                                    v-model="processInspectVo.techfather" placeholder="请选择" style="width: 210px;"
                                    size="small">
                                    <el-option v-for="item in optionSoptionSprocesses" :key="item.name" :label="item.name"
                                        :value="item.name">
                                    </el-option>
                                </el-select>
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="工艺名称：">
                                <el-select v-model="processInspectVo.techname" disabled placeholder="请选择"
                                    style="width: 210px;" size="small">
                                    <el-option v-for="item in optionTechnology" :key="item.id" :label="item.name"
                                        :value="item.id + '-' + item.name">
                                    </el-option>
                                </el-select>
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row :gutter="230">
                        <el-col :span="7">
                            <el-form-item label="单位：">
                                <el-input style="width: 210px;" size="small" disabled v-model="processInspectVo.unit"
                                    placeholder="请输入单位" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="数量：">
                                <el-input style="width: 210px;" size="small" disabled v-model="processInspectVo.quantity"
                                    placeholder="请输入数量" />
                            </el-form-item>
                        </el-col>
                        <!-- <el-col :span="10" 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">
                    <!-- <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">
                       <span>{{ 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-show="scope.row.conclusion === null || scope.row.conclusion === undefined">暂未结论</span>
                    </template>
                </el-table-column>
                <!-- <el-table-column prop="operation" label="上报">
                    <el-button type="primary" @click="escalation" size="small">上报</el-button>
                </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,
            detailId: 0,
            row: {},
            search: {
                countSize: 10,
                pageSize: 1,
                result: "", // æ£€æµ‹çŠ¶æ€
                name: "", // äº§å“åç§°
                techfather: "" // å·¥åº
            },
            optionsSamplename: [],
            inspectionTable: [],
            tableColumn: [],
            optionSoptionSprocesses: [],
            optionTechnology: [],
            inspectionTableTotal: "",
            treeProject: [],
            // æ·»åŠ åˆ—
            empiricalValueAdd: 1,
            // ç¼–辑时存储最长的列数字，做删除判断
            empiricalValueAddMaxNumber: 0,
            showAddPage: false,
            processInspectVo: {
                material: null,
                materialCode: null,
                orderNumber: "",
                quantity: null,
                specificationsModel: null,
                techfather: null,
                techname: null,
                technologyId: 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);
        }
    },
    created() {
        this.processInspectVo.orderNumber = this.rowInfo.order_number
        this.processInspectVo.material = this.rowInfo.material
        this.processInspectVo.materialCode = this.rowInfo.material_code
        this.processInspectVo.specificationsModel = this.rowInfo.specifications_model
        this.processInspectVo.techfather = this.rowInfo.techfather
        this.processInspectVo.techname = this.rowInfo.techname
        this.processInspectVo.unit = this.rowInfo.unit
        this.processInspectVo.quantity = this.rowInfo.quantity
        this.detailId = this.rowInfo.id
        this.inspectionResultForm[0].id = this.rowInfo.material_code
        this.inspectionResultForm[0].name = this.rowInfo.material
        this.inspectionResultForm[0].conclusion = this.rowInfo.result
        // console.log(this.detailId);
    },
    mounted() {
        this.getOptions();
        this.getTableData()
    },
    methods: {
        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.processInspectUpdateProcessInspectsById, {
                id: this.detailId
            }).then(res => {
                console.log(res);
                if (res.code == 200) {
                    this.$message({
                        message: '上报成功',
                        type: 'success'
                    });
                } else {
                    this.$message({
                        message: res.message,
                        type: 'warning'
                    });
                }
            })
        },
        handleClick() { },
        updateInsInfo(row) {
            console.log(row);
            this.row = row
            this.showUp = true
        },
        // ç‚¹å‡»è®¾å¤‡æ ‘保存点击记录
        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;
            });
        },
        //返回
        combackFather() {
            this.$parent.combackMain()
        },
        // ç‚¹å‡»è¡¨æ ¼é€‰æ‹©è§¦å‘
        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: 1,
                        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.techname = this.processInspectVo.techname.split("-")[1]
            val.technologyId = this.processInspectVo.techname.split("-")[0]
            this.$axios.post(this.$api.url.processInspectAddProcess, {
                material: val.material,
                materialCode: val.materialCode,
                orderNumber: val.orderNumber,
                quantity: val.quantity,
                specificationsModel: val.specificationsModel,
                techfather: val.techfather,
                techname: val.techname,
                technologyId: val.technologyId,
                unit: val.unit
            }, {
                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 = res.data
                this.inspectionResultForm[0].name = val.material
                this.getTableData()
            })
        },
        getTableData() {
            this.$axios.get(this.$api.url.inspectionItemListUser, {
                params: {
                    id: this.detailId,
                    type: 1
                }
            }).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.chooseMaterProcessInspect, {
                params: {
                    orderNumber: this.processInspectVo.orderNumber
                }
            }).then(res => {
                if (res.data.length > 0) {
                    console.log(res.data);
                    this.optionsSamplename = res.data
                } 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;
        }
    }
}
</script>

<style></style>

 src/components/view/processInspectionUpdate.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,632 @@
<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="combackFather" 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 :gutter="230">
                        <el-col :span="7">
                            <el-form-item label="订单号：">
                                <el-input @blur="selectInfoByOrderId" disabled style="width: 210px;" size="small"
                                    v-model="processInspectVo.orderNumber" placeholder="请输入订单号" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="产品名称：">
                                <el-select style="width: 210px;" size="small" disabled @change="selectSample"
                                    v-model="processInspectVo.material" placeholder="请选择产品">
                                    <el-option v-for="item in optionsSamplename" :key="item.value" :label="item.name"
                                        :value="item.name">
                                    </el-option>
                                </el-select>
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="产品编码：">
                                <el-input style="width: 210px;" size="small" disabled
                                    v-model="processInspectVo.materialCode" placeholder="请输入产品编码" />
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row :gutter="230">
                        <el-col :span="7">
                            <el-form-item label="规格型号：">
                                <el-input style="width: 210px;" size="small" disabled
                                    v-model="processInspectVo.specificationsModel" placeholder="请输入规格型号" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="工序名称：">
                                <el-select @change="changeOptionSoptionSprocesses" disabled
                                    v-model="processInspectVo.techfather" placeholder="请选择" style="width: 210px;"
                                    size="small">
                                    <el-option v-for="item in optionSoptionSprocesses" :key="item.name" :label="item.name"
                                        :value="item.name">
                                    </el-option>
                                </el-select>
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="工艺名称：">
                                <el-select v-model="processInspectVo.techname" disabled placeholder="请选择"
                                    style="width: 210px;" size="small">
                                    <el-option v-for="item in optionTechnology" :key="item.id" :label="item.name"
                                        :value="item.id + '-' + item.name">
                                    </el-option>
                                </el-select>
                            </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row :gutter="230">
                        <el-col :span="7">
                            <el-form-item label="单位：">
                                <el-input style="width: 210px;" size="small" disabled v-model="processInspectVo.unit"
                                    placeholder="请输入单位" />
                            </el-form-item>
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="数量：">
                                <el-input style="width: 210px;" size="small" disabled v-model="processInspectVo.quantity"
                                    placeholder="请输入数量" />
                            </el-form-item>
                        </el-col>
                        <!-- <el-col :span="10" 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">
                    <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-show="scope.row.conclusion === null || scope.row.conclusion === undefined">暂未结论</span>
                    </template>
                </el-table-column>
                <el-table-column prop="operation" label="上报">
                    <el-button type="primary" @click="escalation" size="small">上报</el-button>
                </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,
            detailId: 0,
            row: {},
            search: {
                countSize: 10,
                pageSize: 1,
                result: "", // æ£€æµ‹çŠ¶æ€
                name: "", // äº§å“åç§°
                techfather: "" // å·¥åº
            },
            optionsSamplename: [],
            inspectionTable: [],
            tableColumn: [],
            optionSoptionSprocesses: [],
            optionTechnology: [],
            inspectionTableTotal: "",
            treeProject: [],
            // æ·»åŠ åˆ—
            empiricalValueAdd: 1,
            // ç¼–辑时存储最长的列数字，做删除判断
            empiricalValueAddMaxNumber: 0,
            showAddPage: false,
            processInspectVo: {
                material: null,
                materialCode: null,
                orderNumber: "",
                quantity: null,
                specificationsModel: null,
                techfather: null,
                techname: null,
                technologyId: 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);
        }
    },
    created() {
        this.processInspectVo.orderNumber = this.rowInfo.order_number
        this.processInspectVo.material = this.rowInfo.material
        this.processInspectVo.materialCode = this.rowInfo.material_code
        this.processInspectVo.specificationsModel = this.rowInfo.specifications_model
        this.processInspectVo.techfather = this.rowInfo.techfather
        this.processInspectVo.techname = this.rowInfo.techname
        this.processInspectVo.unit = this.rowInfo.unit
        this.processInspectVo.quantity = this.rowInfo.quantity
        this.detailId = this.rowInfo.id
        this.inspectionResultForm[0].id = this.rowInfo.material_code
        this.inspectionResultForm[0].name = this.rowInfo.material
        this.inspectionResultForm[0].conclusion = this.rowInfo.result
        // console.log(this.detailId);
    },
    mounted() {
        this.getOptions();
        this.getTableData()
    },
    methods: {
        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.processInspectUpdateProcessInspectsById, {
                id: this.detailId
            }).then(res => {
                console.log(res);
                if (res.code == 200) {
                    this.$message({
                        message: '上报成功',
                        type: 'success'
                    });
                } else {
                    this.$message({
                        message: res.message,
                        type: 'warning'
                    });
                }
            })
        },
        handleClick() { },
        updateInsInfo(row) {
            console.log(row);
            this.row = row
            this.showUp = true
        },
        // ç‚¹å‡»è®¾å¤‡æ ‘保存点击记录
        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;
            });
        },
        //返回
        combackFather() {
            this.$parent.combackMain()
        },
        // ç‚¹å‡»è¡¨æ ¼é€‰æ‹©è§¦å‘
        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: 1,
                        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.techname = this.processInspectVo.techname.split("-")[1]
            val.technologyId = this.processInspectVo.techname.split("-")[0]
            this.$axios.post(this.$api.url.processInspectAddProcess, {
                material: val.material,
                materialCode: val.materialCode,
                orderNumber: val.orderNumber,
                quantity: val.quantity,
                specificationsModel: val.specificationsModel,
                techfather: val.techfather,
                techname: val.techname,
                technologyId: val.technologyId,
                unit: val.unit
            }, {
                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 = res.data
                this.inspectionResultForm[0].name = val.material
                this.getTableData()
            })
        },
        getTableData() {
            this.$axios.get(this.$api.url.inspectionItemListUser, {
                params: {
                    id: this.detailId,
                    type: 1
                }
            }).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.chooseMaterProcessInspect, {
                params: {
                    orderNumber: this.processInspectVo.orderNumber
                }
            }).then(res => {
                if (res.data.length > 0) {
                    console.log(res.data);
                    this.optionsSamplename = res.data
                } 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;
        }
    }
}
</script>

<style></style>

 src/components/view/standard-table/material.vue

@@ -56,7 +56,9 @@
      data() {
        return {
          hasChildren:true,
          selects: []
          selects: [],
          isAllSelect:false,
          deleteList:[],
        }
      },
      props:['tableData','tableType'],
@@ -109,14 +111,33 @@
            }
          }
        },
        handleSelectionChange(val) {
          this.deleteList = [];
          val.forEach((v) => {
            if (v.id !== undefined) {
              this.deleteList.push(v.id);
        //改变选中
        toggleSelection(row, flag) {
          this.$set(row, "isChecked", flag);
          this.$nextTick(() => {
            if (flag) {
              this.$refs.multipleTable.toggleRowSelection(row, flag);
            } else {
              this.$refs.multipleTable.clearSelection();
            }
          });
        },
        handleSelectionChange(val) {
        this.deleteList = [];
        val.forEach((v) => {
          this.searchIdFun(v);
        });
        this.$emit("childData",this.deleteList);
      },
      //递归查找选中数据id
      searchIdFun(data){
        let obj = data;
        if(obj.children != undefined){
          this.searchIdFun(obj.children);
        }else{
          this.deleteList.push(obj.id);
        }
      },
        // è¡¨æ ¼æ ‘全部选中配置  ç»“束
      }
    }

 src/components/view/standard-table/product.vue

@@ -73,14 +73,8 @@
                <span>{{scope.row.productFather}}</span>
            </template>
        </el-table-column>
        <el-table-column prop="productFather" hidden></el-table-column>
        <el-table-column prop="unit" label="单位"></el-table-column>
        <el-table-column prop="product" label="指标"></el-table-column>
        <el-table-column label="操作">
          <template slot-scope="scope">
            <el-button type="text" @click="updateProduct(scope.row)">编辑</el-button>
          </template>
        </el-table-column>
        </el-table>
    </div>
</template>
@@ -91,14 +85,12 @@
        deviceGroupDialog:false,
        selects: [],
        isAllSelect:false,
        deleteList:[],
      }
    },
    props:['tableData','tableType'],
    methods:{
      updateProduct(row){
        console.log(row);
      },
        // è¡¨æ ¼æ ‘全部选中配置
      // è¡¨æ ¼æ ‘全部选中配置
      // å…¨é€‰/取消选操作
      selectAll(val) {
        this.isAllSelect = !this.isAllSelect;
@@ -134,13 +126,32 @@
          }
        }
      },
      //改变选中
      toggleSelection(row, flag) {
        this.$set(row, "isChecked", flag);
        this.$nextTick(() => {
          if (flag) {
            this.$refs.multipleTable.toggleRowSelection(row, flag);
          } else {
            this.$refs.multipleTable.clearSelection();
          }
        });
      },
      handleSelectionChange(val) {
        this.deleteList = [];
        val.forEach((v) => {
          if (v.id !== undefined) {
            this.deleteList.push(v.id);
          }
          this.searchIdFun(v);
        });
        this.$emit("childData",this.deleteList);
      },
      //递归查找选中数据id
      searchIdFun(data){
        let obj = data;
        if(obj.children != undefined){
          this.searchIdFun(obj.children);
        }else{
          this.deleteList.push(obj.tqid);
        }
      },
      // è¡¨æ ¼æ ‘全部选中配置  ç»“束
    }

 src/components/view/standard-table/target.vue

@@ -57,6 +57,8 @@
      data() {
        return {
          selects: [],
          deleteList:[],
          isAllSelect:false,
        }
      },
      props:['tableData','tableType'],
@@ -99,13 +101,32 @@
          }
        }
      },
      //改变选中
      toggleSelection(row, flag) {
        this.$set(row, "isChecked", flag);
        this.$nextTick(() => {
          if (flag) {
            this.$refs.multipleTable.toggleRowSelection(row, flag);
          } else {
            this.$refs.multipleTable.clearSelection();
          }
        });
      },
      handleSelectionChange(val) {
        this.deleteList = [];
        val.forEach((v) => {
          if (v.id !== undefined) {
            this.deleteList.push(v.id);
          }
          this.searchIdFun(v);
        });
        this.$emit("childData",this.deleteList);
      },
      //递归查找选中数据id
      searchIdFun(data){
        let obj = data;
        if(obj.children != undefined){
          this.searchIdFun(obj.children);
        }else{
          this.deleteList.push(obj.pid);
        }
      },
      // è¡¨æ ¼æ ‘全部选中配置  ç»“束
        updateVal(row){
@@ -118,9 +139,6 @@
          }).catch(error=>{
            this.$message.error(error.message);
          })
        },
        handleSelectionChange(val) {
          this.selects = val;
        },
      }
    }

 src/components/view/standard-table/technology.vue

@@ -71,11 +71,6 @@
    methods: {
      // è¡¨æ ¼æ ‘全部选中配置
      // å…¨é€‰/取消选操作
      selectAll(val) {
        this.isAllSelect = !this.isAllSelect;
        let data = this.tableData;
        this.toggleSelect(data, this.isAllSelect, "all");
      },
      //选择某行
          selectTr(selection, row) {
        this.$set(row, "isChecked", !row.isChecked);
@@ -105,13 +100,37 @@
          }
        }
      },
      //改变选中
      toggleSelection(row, flag) {
        this.$set(row, "isChecked", flag);
        this.$nextTick(() => {
          if (flag) {
            this.$refs.multipleTable.toggleRowSelection(row, flag);
          } else {
            this.$refs.multipleTable.clearSelection();
          }
        });
      },
      selectAll(val) {
        this.isAllSelect = !this.isAllSelect;
        let data = this.tableData;
        this.toggleSelect(data, this.isAllSelect, "all");
      },
      handleSelectionChange(val) {
        this.deleteList = [];
        val.forEach((v) => {
          if (v.id !== undefined) {
            this.deleteList.push(v.id);
          }
          this.searchIdFun(v);
        });
        this.$emit("childData",this.deleteList);
      },
      //递归查找选中数据id
      searchIdFun(data){
        let obj = data;
        if(obj.children != undefined){
          this.searchIdFun(obj.children);
        }else{
          this.deleteList.push(obj.id);
        }
      },
      // è¡¨æ ¼æ ‘全部选中配置  ç»“束
      showDialog(){

 src/components/view/standard.vue

@@ -5,9 +5,9 @@
        <el-col :span="12" style="line-height: 32px;">标准BOM</el-col>
        <el-col :span="12" style="text-align: right;">
          <el-button type="primary" icon="el-icon-plus" style="background: #004EA2;"
            @click="bomAddModelVisible = true">新增</el-button>
          <el-button icon="el-icon-plus">新增版本</el-button>
          <el-button @click="bomRightDl=true" icon="el-icon-delete">删除</el-button>
            @click="showBomAddModel">新增</el-button>
          <el-button icon="el-icon-plus" @click="addVersionBtn">新增版本</el-button>
          <el-button @click="deleteDataBtn" icon="el-icon-delete">删除</el-button>
        </el-col>
      </el-row>
    </div>
@@ -56,16 +56,17 @@
        </div>

        <div class="contentTable" v-if="this.typeselect == 0">
          <technology  :tableType="tableType" :tableData="tableData"></technology>
          <technology @childData="getChildData"  :tableType="tableType" :tableData="tableData"></technology>
        </div>
        <div v-if="this.typeselect == 1">
          <target :tableType="tableType" :tableData="tableData"></target>
          <target @childData="getChildData" :tableType="tableType" :tableData="tableData"></target>
        </div>
        <div v-if="this.typeselect == 2">
          <bom  :tableType="tableType" :tableData="tableData"></bom>
          <material @childData="getChildData" :tableType="tableType" :tableData="tableData"></material>
        </div>
        <div v-if="this.typeselect == 3">生产工艺</div>
        
        <div v-if="this.typeselect == 3">
          <product @childData="getChildData" :tableType="tableType" :tableData="tableData"></product>
        </div>
      </div>
    </div>

@@ -332,10 +333,11 @@
<script>
import technology from "./standard-table/technology.vue"
import material from "./standard-table/material.vue"
// import bom from "./standard-table/bom.vue"
import target from "./standard-table/target.vue"
import product from "./standard-table/product.vue"
import bomClickAdd from '@/components/view/standard-box/bomClickAdd'
export default {
  components: { technology,material,bomClickAdd },
  components: { technology,material,target,product,bomClickAdd },

  data() {
    var checkPq = (rule,value,callback)=>{
@@ -352,6 +354,8 @@
      callback();
    };
    return {
      //子组件传的id列表
      childIds:[],
      //工序列表
      technologyIdList:[],
      fatherList:[],
@@ -429,7 +433,7 @@
      // BOM树数据结构
      list: [],
      search: null,
      tableType: 1, // è¡¨æ ¼ç±»åž‹ 1：技术指标，0：工艺路线
      tableType: 0, // è¡¨æ ¼ç±»åž‹ 1：技术指标，0：工艺路线
      searchName: "",// æŸ¥è¯¢æ¡ä»¶-名称
      checkTreeNode: {},// ç‚¹å‡»é€‰ä¸­æ ‘节点
      tableData: [],
@@ -439,9 +443,7 @@
      bomRightDl: false,
      formTypeOptions: null,
      typeselect: 0,
      returntree: {
        id:28,
      },
      returntree: {id:28},
      version: {},
      leftAdd:{
        type: [],
@@ -574,6 +576,68 @@
    leftAddBom(){
      
    },
    //获取子组件数据
    getChildData(data){
      this.childIds = data;
    },
    //删除按钮
    deleteDataBtn(){
      let ids;
      let url;
      ids = this.childIds.filter(item=>{
        return item != undefined;
      });
      if(ids.length < 1){
        this.$message.error("请先选择数据！");
        return;
      }
      switch(this.typeselect){
        case 0:
          url = this.$api.url.delAllByTechnology;
          break;
        case 1:
          url = this.$api.url.delAllByTarget;
          break;
        case 2:
          url = this.$api.url.delAllByMBom;
          break;
        case 3:
          url = this.$api.url.delAllByProduct;
          break;
      }
      this.$confirm('确认删除已选中的数据吗', '删除', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
          type: 'warning'
        }).then(() => {
          this.$axios.post(url,{
            ids : ids.join(",")
          }).then(res=>{
            this.selectAll();
            this.$message.success(res.message);
          }).catch(error=>{
            this.$message.error(error.message);
          })
        }).catch(() => {});
    },
    //新增版本
    addVersionBtn(){
        this.$confirm('确认新增版本吗', '新增版本', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
          type: 'info'
        }).then(() => {
          this.$axios.post(this.$api.url.addVersion,{
            specificationsId : this.returntree.id,
            version : this.version2.substring(1,2),
          }).then(res=>{
            this.selectVersion();
            this.$message.success(res.message);
          }).catch(error=>{
            this.$message.error(error.message);
          })
        }).catch(() => {});
    },
    //右侧bom,确认新增
    confirmAdd(formName){
      this.$refs[formName].validate(valid=>{

 src/components/view/technical.vue

@@ -4,7 +4,7 @@
      <el-row>
        <el-col :span="12">技术文件</el-col>
        <el-col :span="12" style="text-align: right;">
          <el-button  icon="el-icon-plus">生成项目书</el-button>
          <el-button icon="el-icon-plus">生成项目书</el-button>
        </el-col>
      </el-row>
    </div>
@@ -25,14 +25,14 @@
          <el-input v-model="searchData.name" @input="query"></el-input>
        </el-form-item>
        <el-form-item label="编制状态:" >
          <el-select v-model="searchData.type" placeholder="全部" style="width: 310px;">
          <el-select v-model="searchData.type" size="small" placeholder="全部" style="width: 250px;">
              <el-option label="待编制" :value="0"></el-option>
                            <el-option label="已编制" :value="1"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item >
                <el-button  plain @click="resetBtn">重 ç½®</el-button>
                <el-button  @click="searchTechnical">查 è¯¢</el-button>
        <el-form-item>
              <el-button plain @click="resetBtn" style="margin-left: 12px;">重 ç½®</el-button>
              <el-button @click="searchTechnical">查 è¯¢</el-button>
        </el-form-item>
      </el-form>
    </div>
@@ -335,6 +335,7 @@
  background: #fff;
  padding: 24px 32px;
}

.search-header .el-form-item__label{
  padding: 0 30px 0 0;
}
@@ -416,3 +417,12 @@
}
</style>

<style>
    .technical .title *{
        font-size: 14px;
    }
	
    .technical .search-header *{
        font-size: 14px;
    }
</style>

 src/components/view/technology.vue

@@ -706,7 +706,7 @@
    query(val) {
      this.selectAllTechTem();
    },
     selectAllTechTem() { 
     selectAllTechTem() {
       this.$axios
        .get(this.$api.url.selectAllTechTem, {
          params: { type: this.typeselect, message: this.search.technology },
@@ -861,4 +861,4 @@
    },
  },
};
</script>
</script>

 src/view/index.vue

@@ -91,7 +91,7 @@
    }

    .left .box i {
        font-size: 32px;
        font-size: 24px;
        margin-bottom: 8px;
    }

@@ -209,7 +209,6 @@
        height: 100%;
    }
</style>
<style></style>
<template>
    <div class="all">
        <div class="title">
@@ -260,7 +259,7 @@
            </div>
            <div class="component_view">
                <component class="com_index" v-for="(com, index) in tabs" :is="com.u" :key="upIndex + '|' + index"
                    v-show="com.k == tabActive">
                    v-show="com.k == tabActive" @removeAllTab="removeAllTab">
                </component>
            </div>
        </div>
@@ -560,6 +559,7 @@
                    u: "index-index"
                }]
            },
			
            upTabActive(num) {
                this.tabActive = num;
                this.activeP = num;
@@ -576,6 +576,9 @@
                sessionStorage.clear();
                localStorage.removeItem("autoenter");
                this.$router.push("/enter");
            },
            removeAllTab(){
                this.upIndex++
            }
        }
    };