Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

zouyu

2023-09-14 731900d12eed86805fa65321eca7a44096447949

Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

 src/assets/api/controller.js

@@ -75,6 +75,7 @@
    inspectionItemListUser: "/inspection-item/list_user",//查询所有检验项目
    finishedInspectChooseMater: "/finished-inspect/chooseMater",//根据订单号得到信息
    finishedInspectAddFinish: "/finished-inspect/addFinish", //新增成品检验
    finishedInspectUpdateFinishInspectsById: "/finished-inspect/updateFinishInspectsById",//上报
}
// 过程检验
const processInspection = {
@@ -137,7 +138,7 @@
    selectAllMbom:"/mbomModel/selectAllMbom",//物料维护--》右边
    addMbom:"/mbomModel/addMbom",//物料--->新增
    material:"/mbomModel/delMbomById",//物料清单删除
    delAllMbom:"/mbom/delAllMbom",//批量删除
    delAllMbom:"/mbomModel/delAllMbom",//批量删除

    selectAllTeque:"/techniqueModel/selectAllTeque",//生产工艺维护---。右边


 src/components/view/Technicalindex.vue

@@ -94,7 +94,10 @@
                <!-- 主体右 -->
                <div class="right">
                    <el-table :data="tableData" style="width: 100%;overflow-y: auto;min-height: 100%"
                        max-height="100%" row-key="name" border @selection-change="handleSelectionChange"
                        max-height="100%" row-key="name" border 
                        @select="selectTr"
                        ref="multipleTable"
                        @selection-change="handleSelectionChange"
                        default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
                        <el-table-column type="selection" width="55">
                        </el-table-column>
@@ -413,7 +416,8 @@
                        "Content-Type": "application/json"
                    }
                }).then(res => {
                    this.selectAllright()
                    /* this.selectAllright() */
                    this.$parent.removeAllTab()	
                })
            },
            submitUpData() { //确定
@@ -426,8 +430,9 @@
                this.$axios.post(this.$api.url.delTechBy, {
                    id: this.upData.id
                }).then(res => {
                    this.selectAllright()
                    /* this.selectAllright() */
                    this.$message.success('删除完成')
                    this.$parent.removeAllTab()	
                })
            },
            deleteRow(index, rows) {
@@ -441,7 +446,8 @@
                this.$axios.post(this.$api.url.delAllTechskill, {
                    ids: this.delete
                }).then(res => {
                    this.selectAllright()
                    /* this.selectAllright() */
                    this.$parent.removeAllTab()	
                })
            },
            dels() {
@@ -456,6 +462,7 @@
                let cc = this.selects.map(el => {
                    return el.id
                })
                cc.splice(0,1)
                this.delete = cc.join(',')
                console.log(this.delete);
                this.delAllTechskill()
@@ -596,12 +603,15 @@
            modify() {
                this.modifyevent = true
            },
            // deleteRow(index, rows) {
            // console.log();
            // rows.splice(index, 1);
            // },

            handleSelectionChange(val) {
                this.selects = val;
                this.deleteList = [];
                val.forEach((v) => {
                if (v.id !== undefined) {
                    this.deleteList.push(v.id);
                }
                });
            },
            //编辑


 src/components/view/equipmentmaintain.vue

@@ -263,7 +263,7 @@
                <el-table
                    :data="tableData"
                    style="width: 100%;margin-bottom: 20px;height: 600px;overflow: auto;"
                    row-key="name"
                    row-key="rowId"
                    border
                    @select="selectTr"
                    @selection-change="handleSelectionChange"
@@ -549,12 +549,21 @@
            }).then(res => {
                this.tableData = res.data;
                console.log(this.tableData);

                this.formatData(res.data)
            })
            },
            modify(){
                this.modifyevent = true
            },
            formatData(data){
                let arr = data;
                for(var i=0;i<arr.length;i++){
                        arr[i].rowId = Math.random();
                        if(arr[i].children != undefined){
                        this.formatData(arr[i].children);
                        }
                    }
                },
            //delQueById
            delQueById() {
                this.$axios.post(this.$api.url.delQueById,{
@@ -592,6 +601,11 @@
                let cc = this.selects.map(el => {
                    return el.id
                })
                // cc.forEach((el,idx) =>{
                //     delete  idx[0]
                // })
                cc.splice(0,1)
                console.log(cc);
                this.delete = cc.join(',')
                console.log(this.delete);
                this.delAllQue()
@@ -608,6 +622,7 @@

            // },
            handleSelectionChange(val) {
                this.selects = val
                this.deleteList = [];
                val.forEach((v) => {
                if (v.id !== undefined) {
@@ -630,6 +645,7 @@
                    this.isAllSelect = row.isChecked;
                    this.toggleSelect(row, row.isChecked, "tr");
                });

            },
             //递归子级
            toggleSelect(data, flag, type) {

 src/components/view/finishedProductInspection.vue

@@ -1,6 +1,6 @@
<template>
  <div class="content-main">
    <div v-if="!showAdd" class="rawPage">
    <div v-if="!showAdd&&!showLook&&!showUp" class="rawPage">
        <div class="title">
      <el-row>
        <el-col :span="12">成品检验</el-col>
@@ -12,7 +12,7 @@
      </el-row>
    </div>
    <div class="nav">
        <span>检验结果：</span>
        <span>检测结果：</span>
        <el-select v-model="searchData.result" size="small" placeholder="请选择" style="width: 224px;margin-right: 52px;">
            <el-option :value="''" label="全部"></el-option>
            <el-option :value="1" label="合格"></el-option>
@@ -93,8 +93,10 @@
                    min-width="80"
                >
                <template slot-scope="scope">
                    <span>{{scope.row.result===1?'合格':'不合格'}}</span>
                </template>
                        <span style="color: #34BD66;" v-if="scope.row.result === 1">合格</span>
                        <span style="color: #E84738;" v-else-if="scope.row.result === 0">不合格</span>
                        <span v-else-if="scope.row.result === null || scope.row.result === undefined">暂未结论</span>
                    </template>
                </el-table-column>
                    
                
@@ -105,7 +107,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>
                    <el-button v-if="scope.row.result == null" type="text" size="small" @click="goUp(scope.row)">编辑</el-button>
                    </template>
                </el-table-column>
            </el-table>
@@ -348,21 +350,31 @@
        },
        async getInspectionTableData() {
            const {data:{row,total}} = await this.$axios.get(this.$api.url.finishedInsListPage,{params:{...this.pageParams,...this.searchData}})
            console.log(row)
            this.inspectionTable = row
            this.pageParams.total = total
        },
        goToDetail(row) {
            // this.showAddPage = true
            // this.showDetail = true
            this.finishedInsInfo = row
            
            // this.addInspectionform = []
            this.rowInfo = row
            this.showLook=true
        },
        goUp(row){
            this.rowInfo = row
            this.showUp=true
        },
        async init() {
            // const {data} = await this.$axios.get(this.$api.url.finishedInspectUser)
            // this.usernameOptions = data

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


 src/components/view/finishedProductInspectionAdd.vue

@@ -6,9 +6,9 @@
                <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"
                    <!-- <el-button type="primary" size="mini" style="background: #004EA2; "
                        icon="el-icon-circle-plus-outline">新增</el-button> -->
                    <el-button @click="comBack" type="primary" size="mini" icon="el-icon-back"
                        style="background: #004EA2; ">返回</el-button>
                </el-col>
            </el-row>
@@ -178,7 +178,7 @@
            showUp: false,
            isAddProject: false,
            showLook: false,
            detailId: 28,
            detailId: 0,
            rowInfp: {},
            search: {
                countSize: 10,
@@ -267,7 +267,7 @@
        }
    },
    mounted() {
        // this.getTableData()
        this.getTableData()
        this.getOptions();
    },
    methods: {
@@ -280,6 +280,9 @@
            this.processInspectVo.mcode=sample.mcode
            this.processInspectVo.specificationsModel=sample.specifications
            this.processInspectVo.unit=sample.unit
        },
        comBack(){
            this.$parent.comBackMain()
        },
        handleClick(row) {
            this.rowInfp = row
@@ -333,7 +336,7 @@
                this.$axios
                    .post(this.$api.url.inspectionItemUpdateDevByInsId, {
                        id: this.clickSelectDevice.rpId,
                        type: 1,
                        type: 2,
                        devId: this.nodeData.id
                    })
                    .then(res => {
@@ -417,14 +420,14 @@
            this.optionTechnology = working.children
        },
        addTestProjevt() {
            this.isAddProject = true
            // 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) {
                if (res.code == 201) {
                    this.$message({
                        message: res.message,
                        type: 'warning'
@@ -432,19 +435,21 @@
                    return
                }
                this.detailId = res.data
                console.log(this.detailId);
                this.inspectionResultForm[0].id = val.materialCode
                this.inspectionResultForm[0].id = val.mcode
                this.inspectionResultForm[0].name = val.material
                // this.getTableData()
                this.getTableData()
            })
        },
        getTableData() {
            this.$axios.get(this.$api.url.inspectionItemListUser, {
                params: {
                    id: this.detailId,
                    type: 1
                    type: 2
                }
            }).then(res => {
                if (res.data.length < 1) {
                    return
                }
                this.inspectionItems = res.data
                let arr = []
                let val = JSON.parse(JSON.stringify(this.inspectionItems))

 src/components/view/finishedProductInspectionLook.vue

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

<script>
export default {

    props: ['rowInfo'],
    data() {
        return {
            showUp: false,
            isAddProject: false,
            showLook: false,
            detailId: 0,
            rowInfp: {},
            search: {
                countSize: 10,
                pageSize: 1,
                result: "", // 检测状态
                name: "", // 产品名称
                techfather: "" // 工序
            },
            optionsSamplename: [],
            inspectionTable: [],
            tableColumn: [],
            optionSoptionSprocesses: [],
            optionTechnology: [],
            inspectionTableTotal: 0,
            pageSize: 10,
            currentPage: 1,
            treeProject: [],
            // 添加列
            empiricalValueAdd: 1,
            // 编辑时存储最长的列数字，做删除判断
            empiricalValueAddMaxNumber: 0,
            showAddPage: false,
            processInspectVo: {
                id: null,
                material: null,
                mcode: null,
                prname: null,
                sname: null,
                orderNumber: "D-001",
                qualityTraceability: null,
                quantity: null,
                specificationsModel: null,
                unit: null
            },
            InspectioniD: null,
            addInspectionform: [
                {
                    number: "",
                    username: "",
                    projectname: "",
                    tracenumber: "",
                    code: "",
                    class: "",
                    specificationmodel: "",
                    unit: "",
                    quantity: "",
                    group: "",
                    worker: "",
                    machine: ""
                }]
            ,
            inspectionItems: [], // 新增检验项目表格
            inspectionResultForm: [
                {
                    id: "",
                    name: "",
                    inspecter: "",
                    conclusion: "",
                    operation: ""
                }
            ],
            options: [],
            value: "",
            rowList: [],
            spanArr: [],
            position: 0,
            // 设备选择树显示
            centerDialogVisible: false,
            filterText: "",
            materialOptions: [],
            defaultProps: {
                // 设备树数据设置
                children: "children",
                label: "name"
            },
            nodeData: "", // node点击保存当前点击数据
            clickSelectDevice: {
                index: "", // 点击选择存储当前行索引
                rpId: "" // 点击选择存储当前行项目Id
            }
        };
    },
    watch: {
        filterText(val) {
            this.$refs.tree.filter(val);
        }
    },
    mounted() {
        console.log(this.rowInfo);
        this.processInspectVo.material=this.rowInfo.material
        this.processInspectVo.mcode=this.rowInfo.material_code
        this.processInspectVo.orderNumber=this.rowInfo.order_number
        this.processInspectVo.qualityTraceability=this.rowInfo.quality_traceability
        this.processInspectVo.specificationsModel=this.rowInfo.specifications_model
        this.processInspectVo.unit=this.rowInfo.unit
        this.processInspectVo.quantity=this.rowInfo.quantity
        this.processInspectVo.prname=this.rowInfo.customer_name
        this.processInspectVo.sname=this.rowInfo.project_name
        this.inspectionResultForm[0].id=this.rowInfo.material_code
        this.inspectionResultForm[0].name=this.rowInfo.material
        this.inspectionResultForm[0].conclusion=this.rowInfo.result
        this.detailId=this.rowInfo.id
        this.getTableData()
        this.getOptions();
    },
    methods: {
        changeOptionsSamplename(){
            let id=this.processInspectVo.material.split("-")[0]
            let sample=this.optionsSamplename.filter(o=>{
                return o.id==id
            })[0]
            this.processInspectVo.qualityTraceability=sample.qualityTraceability
            this.processInspectVo.mcode=sample.mcode
            this.processInspectVo.specificationsModel=sample.specifications
            this.processInspectVo.unit=sample.unit
        },
        comBack(){
            this.$parent.comBackMain()
        },
        handleClick(row) {
            this.rowInfp = row
            this.showLook = true
        },
        updateInsInfo(row) {
            this.rowInfp = row
            this.showUp = true
        },
        combackMain() {
            this.showUp = false
            this.showLook = false
        },
        searchPro() {
            this.search.countSize = this.pageSize
            this.search.pageSize = this.currentPage
            this.defaultInitializationTable()
        },
        // 点击设备树保存点击记录
        nodeClick(data) {
            if (data.id != undefined) this.nodeData = data;
        },
        // 设备树过滤搜索
        filterNode(value, data) {
            if (!value) return true;
            return data.name.indexOf(value) !== -1;
        },
        // 获取设备树内容
        getOptions() {
            this.$axios.get(this.$api.url.rawSelectDevice).then(res => {
                this.materialOptions = res.data;
            });
        },
        // 点击表格选择触发
        clickTableSelect(scope) {
            this.centerDialogVisible = true;
            this.clickSelectDevice.index = scope.$index;
            this.clickSelectDevice.rpId = scope.row.id;
        },
        // 点击树里面的确定
        clickNodeSure() {
            if (this.detailId == null) {
                this.inspectionItems[
                    this.clickSelectDevice.index
                ].did = this.nodeData.id;
                this.inspectionItems[
                    this.clickSelectDevice.index
                ].dname = this.nodeData.name;
                this.centerDialogVisible = false;
            } else {
                this.$axios
                    .post(this.$api.url.inspectionItemUpdateDevByInsId, {
                        id: this.clickSelectDevice.rpId,
                        type: 2,
                        devId: this.nodeData.id
                    })
                    .then(res => {
                        this.getTableData()
                        this.centerDialogVisible = false;
                    });
            }
        },
        changeState(row, index) {
            console.log(row);
            if (row.did != null && row.did != '') {
                let str = ""
                row.empiricalValueAddss.forEach(e => {
                    str += e + ","
                })
                this.$axios.post(this.$api.url.inspectionItemlose_focus_update, {
                    deviceId: row.did,
                    inspectionItemId: row.id,
                    inspectionValue: str.slice(0, -1)
                }, {
                    headers: { "Content-Type": "application/json" }
                }).then(res => {
                    row.result = res.data.result
                    row.username = res.data.username
                })
            } else {
                this.$message({
                    message: '请选择择设备！',
                    type: 'warning'
                });
            }
        },
        // 每页条数改变时触发 选择一页显示多少行
        handleSizeChange(val) {
            this.search.countSize = val;
            this.defaultInitializationTable();
        },
        handleSpanMethod({ row, column, rowIndex, columnIndex }) {
            if (columnIndex === 0) {
                const _row = this.spanArr[rowIndex];
                const _col = _row > 0 ? 1 : 0;
                return {
                    rowspan: _row,
                    colspan: _col
                }
            }
            if (columnIndex === 1) {
                const _row = this.spanArr[rowIndex];
                const _col = _row > 0 ? 1 : 0;
                return {
                    rowspan: _row,
                    colspan: _col
                }
            }
        },
        // 合并表格
        mergeTable() {
            this.rowList = []
            this.spanArr = []
            this.position = 0
            this.inspectionItems.forEach((item, index) => {
                if (index === 0) {
                    this.spanArr.push(1);
                    this.position = 0;
                } else {
                    if (this.inspectionItems[index].father === this.inspectionItems[index - 1].father) {
                        this.spanArr[this.position] += 1;
                        this.spanArr.push(0);
                    } else {
                        this.spanArr.push(1);
                        this.position = index;
                    }
                }
            })
        },
        changeOptionSoptionSprocesses() {
            this.optionTechnology = []
            let working = this.optionSoptionSprocesses.filter(item => {
                return item.name === this.processInspectVo.techfather
            })[0]
            this.optionTechnology = working.children
        },
        addTestProjevt() {
            // this.isAddProject = true
            let val = JSON.parse(JSON.stringify(this.processInspectVo))
            val.material = this.processInspectVo.material.split("-")[1]
            val.id=this.processInspectVo.material.split("-")[0]
            this.$axios.post(this.$api.url.finishedInspectAddFinish, val, {
                headers: { "Content-Type": "application/json" }
            }).then(res => {
                if (res.code == 201) {
                    this.$message({
                        message: res.message,
                        type: 'warning'
                    });
                    return
                }
                this.detailId = res.data
                this.inspectionResultForm[0].id = val.mcode
                this.inspectionResultForm[0].name = val.material
                this.getTableData()
            })
        },
        getTableData() {
            this.$axios.get(this.$api.url.inspectionItemListUser, {
                params: {
                    id: this.detailId,
                    type: 2
                }
            }).then(res => {
                if (res.data.length < 1) {
                    return
                }
                this.inspectionItems = res.data
                let arr = []
                let val = JSON.parse(JSON.stringify(this.inspectionItems))
                const uName = []
                //转成一维数组
                val.forEach(l => {
                    let father = l.father
                    l.children.forEach(c => {
                        c.father = father
                        c.empiricalValueAddss = []
                        if (c.inspectionValue != '' && c.inspectionValue != null) {
                            c.empiricalValueAddss = c.inspectionValue.split(",");
                        } else {
                            c.empiricalValueAddss.push("")
                        }
                        uName.push(c['username'])
                        arr.push(c)
                    })
                })
                this.inspectionItems = arr
                let arrSort = JSON.parse(JSON.stringify(arr))
                //根据集合对象数组长度排序
                arrSort.sort((a, b) => {
                    if (a.empiricalValueAddss.length < b.empiricalValueAddss.length) {
                        return -1; // a排在b前面
                    } else if (a.empiricalValueAddss.length > b.empiricalValueAddss.length) {
                        return 1; // a排在b后面
                    } else {
                        return 0; // 保持相对顺序不变
                    }
                });
                // console.log(arrSort);
                console.log(uName);
                let name = [...new Set(uName)].filter(item => item !== null);
                let rname = ''
                name.forEach(m => {
                    rname += m + ","
                })
                this.inspectionResultForm[0].inspecter = rname.slice(0, -1)
                this.empiricalValueAdd = arrSort[arrSort.length - 1].empiricalValueAddss.length
                this.mergeTable(arr)
            })
        },
        selectSample() {
            let sample = this.optionsSamplename.filter(item => {
                return item.name === this.processInspectVo.material
            })[0]
            this.processInspectVo.techfather = null
            this.processInspectVo.techname = null
            this.processInspectVo.materialCode = sample.code
            this.processInspectVo.specificationsModel = sample.specifications
            this.processInspectVo.unit = sample.unit
            this.optionSoptionSprocesses = []
            this.optionSoptionSprocesses = sample.children
        },
        selectInfoByOrderId() {
            this.$axios.get(this.$api.url.finishedInspectChooseMater, {
                params: {
                    orderNumber: this.processInspectVo.orderNumber
                }
            }).then(res => {
                if (res.data.length > 0) {
                    console.log(res.data);
                    this.processInspectVo.sname = res.data[0].sname
                    this.processInspectVo.prname = res.data[0].prname
                    this.optionsSamplename = res.data[0].children
                } else {
                    this.$message({
                        message: '没有该订单号！',
                        type: 'warning'
                    });
                }
            })
        },
        // 当前页改变时触发 跳转其他页
        handleCurrentChange(val) {
            this.search.pageSize = val;
            this.defaultInitializationTable();
        },
        // 显示新增页面
        handleAddNew() {
            this.showAddPage = true;
            // this.getTableData()
        },
        // 表格初始化接口
        defaultInitializationTable() {
            this.$axios
                .post(this.$api.url.selectProcessInspectsList, this.search)
                .then(res => {
                    this.inspectionTableTotal = res.data.total;
                    this.inspectionTable = res.data.row;
                });
        },
        // 添加行
        clickAddLine() {
            let obj = {
                material: "",
                materialCode: "",
                orderNumber: "",
                quantity: 0,
                specificationsModel: "",
                techfather: "",
                techname: "",
                technologyId: 0,
                unit: ""
            };
            this.inspectionItems.push(obj);
        },
        // 删除行
        clickDeleteline(scope) {
            this.inspectionItems.splice(scope.$index, 1);
        },
        // 删除检验值列
        clickDeleteInspectionColumn() {
            if (this.empiricalValueAdd - 1 === 0) {
            } else {
                if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
                    this.empiricalValueAdd = this.empiricalValueAdd - 1;
                    this.inspectionItems.forEach(i => {
                        i.testValueList.splice(this.empiricalValueAdd, 1);
                    });
                }
            }
        },
        // 添加检验值列
        clickAddInspectionColumn() {
            this.empiricalValueAdd = this.empiricalValueAdd + 1;
        }
    },
    created() {
        this.defaultInitializationTable(); // 初始化表格数据
    }
}
</script>

<style>

</style>
<style></style>

 src/components/view/finishedProductInspectionUp.vue

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

<script>
export default {
    props: ['rowInfo'],
    data() {
        return {
            isUpBtn: false,
            showUp: false,
            isAddProject: false,
            showLook: false,
            detailId: 0,
            rowInfp: {},
            search: {
                countSize: 10,
                pageSize: 1,
                result: "", // 检测状态
                name: "", // 产品名称
                techfather: "" // 工序
            },
            optionsSamplename: [],
            inspectionTable: [],
            tableColumn: [],
            optionSoptionSprocesses: [],
            optionTechnology: [],
            inspectionTableTotal: 0,
            pageSize: 10,
            currentPage: 1,
            treeProject: [],
            // 添加列
            empiricalValueAdd: 1,
            // 编辑时存储最长的列数字，做删除判断
            empiricalValueAddMaxNumber: 0,
            showAddPage: false,
            processInspectVo: {
                id: null,
                material: null,
                mcode: null,
                prname: null,
                sname: null,
                orderNumber: "D-001",
                qualityTraceability: null,
                quantity: null,
                specificationsModel: null,
                unit: null
            },
            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() {
        if(this.rowInfo.result!=null&&this.rowInfo.result!=''){
            this.isUpBtn=true
        }
        this.processInspectVo.material=this.rowInfo.material
        this.processInspectVo.mcode=this.rowInfo.material_code
        this.processInspectVo.orderNumber=this.rowInfo.order_number
        this.processInspectVo.qualityTraceability=this.rowInfo.quality_traceability
        this.processInspectVo.specificationsModel=this.rowInfo.specifications_model
        this.processInspectVo.unit=this.rowInfo.unit
        this.processInspectVo.quantity=this.rowInfo.quantity
        this.processInspectVo.prname=this.rowInfo.customer_name
        this.processInspectVo.sname=this.rowInfo.project_name
        this.inspectionResultForm[0].id=this.rowInfo.material_code
        this.inspectionResultForm[0].name=this.rowInfo.material
        this.inspectionResultForm[0].conclusion=this.rowInfo.result
        this.detailId=this.rowInfo.id
        this.getTableData()
        this.getOptions();
    },
    methods: {
        escalation() {
            let arr = this.inspectionItems
            let bl = false
            for (let index = 0; index < arr.length; index++) {
                const element = arr[index];
                if (element.dname != null && element.empiricalValueAddss[0] != '') {
                    bl = true
                    break
                } else {
                    bl = false
                }
            }
            if (bl != true) {
                this.$message({
                    message: '请先检测一项项目！',
                    type: 'warning'
                });
                return
            }
            this.$axios.post(this.$api.url.finishedInspectUpdateFinishInspectsById, {
                id: this.detailId
            }).then(res => {
                if (res.code == 200) {
                    this.$message({
                        message: '上报成功',
                        type: 'success'
                    });
                    this.$refs.comBackMain(true)
                } else {
                    this.$message({
                        message: res.message,
                        type: 'warning'
                    });
                }
            })

        },
        changeOptionsSamplename(){
            let id=this.processInspectVo.material.split("-")[0]
            let sample=this.optionsSamplename.filter(o=>{
                return o.id==id
            })[0]
            this.processInspectVo.qualityTraceability=sample.qualityTraceability
            this.processInspectVo.mcode=sample.mcode
            this.processInspectVo.specificationsModel=sample.specifications
            this.processInspectVo.unit=sample.unit
        },
        comBack(){
            this.$parent.comBackMain()
        },
        handleClick(row) {
            this.rowInfp = row
            this.showLook = true
        },
        updateInsInfo(row) {
            this.rowInfp = row
            this.showUp = true
        },
        combackMain() {
            this.showUp = false
            this.showLook = false
        },
        searchPro() {
            this.search.countSize = this.pageSize
            this.search.pageSize = this.currentPage
            this.defaultInitializationTable()
        },
        // 点击设备树保存点击记录
        nodeClick(data) {
            if (data.id != undefined) this.nodeData = data;
        },
        // 设备树过滤搜索
        filterNode(value, data) {
            if (!value) return true;
            return data.name.indexOf(value) !== -1;
        },
        // 获取设备树内容
        getOptions() {
            this.$axios.get(this.$api.url.rawSelectDevice).then(res => {
                this.materialOptions = res.data;
            });
        },
        // 点击表格选择触发
        clickTableSelect(scope) {
            this.centerDialogVisible = true;
            this.clickSelectDevice.index = scope.$index;
            this.clickSelectDevice.rpId = scope.row.id;
        },
        // 点击树里面的确定
        clickNodeSure() {
            if (this.detailId == null) {
                this.inspectionItems[
                    this.clickSelectDevice.index
                ].did = this.nodeData.id;
                this.inspectionItems[
                    this.clickSelectDevice.index
                ].dname = this.nodeData.name;
                this.centerDialogVisible = false;
            } else {
                this.$axios
                    .post(this.$api.url.inspectionItemUpdateDevByInsId, {
                        id: this.clickSelectDevice.rpId,
                        type: 2,
                        devId: this.nodeData.id
                    })
                    .then(res => {
                        this.getTableData()
                        this.centerDialogVisible = false;
                    });
            }
        },
        changeState(row, index) {
            console.log(row);
            if (row.did != null && row.did != '') {
                let str = ""
                row.empiricalValueAddss.forEach(e => {
                    str += e + ","
                })
                this.$axios.post(this.$api.url.inspectionItemlose_focus_update, {
                    deviceId: row.did,
                    inspectionItemId: row.id,
                    inspectionValue: str.slice(0, -1)
                }, {
                    headers: { "Content-Type": "application/json" }
                }).then(res => {
                    row.result = res.data.result
                    row.username = res.data.username
                })
            } else {
                this.$message({
                    message: '请选择择设备！',
                    type: 'warning'
                });
            }
        },
        // 每页条数改变时触发 选择一页显示多少行
        handleSizeChange(val) {
            this.search.countSize = val;
            this.defaultInitializationTable();
        },
        handleSpanMethod({ row, column, rowIndex, columnIndex }) {
            if (columnIndex === 0) {
                const _row = this.spanArr[rowIndex];
                const _col = _row > 0 ? 1 : 0;
                return {
                    rowspan: _row,
                    colspan: _col
                }
            }
            if (columnIndex === 1) {
                const _row = this.spanArr[rowIndex];
                const _col = _row > 0 ? 1 : 0;
                return {
                    rowspan: _row,
                    colspan: _col
                }
            }
        },
        // 合并表格
        mergeTable() {
            this.rowList = []
            this.spanArr = []
            this.position = 0
            this.inspectionItems.forEach((item, index) => {
                if (index === 0) {
                    this.spanArr.push(1);
                    this.position = 0;
                } else {
                    if (this.inspectionItems[index].father === this.inspectionItems[index - 1].father) {
                        this.spanArr[this.position] += 1;
                        this.spanArr.push(0);
                    } else {
                        this.spanArr.push(1);
                        this.position = index;
                    }
                }
            })
        },
        changeOptionSoptionSprocesses() {
            this.optionTechnology = []
            let working = this.optionSoptionSprocesses.filter(item => {
                return item.name === this.processInspectVo.techfather
            })[0]
            this.optionTechnology = working.children
        },
        addTestProjevt() {
            // this.isAddProject = true
            let val = JSON.parse(JSON.stringify(this.processInspectVo))
            val.material = this.processInspectVo.material.split("-")[1]
            val.id=this.processInspectVo.material.split("-")[0]
            this.$axios.post(this.$api.url.finishedInspectAddFinish, val, {
                headers: { "Content-Type": "application/json" }
            }).then(res => {
                if (res.code == 201) {
                    this.$message({
                        message: res.message,
                        type: 'warning'
                    });
                    return
                }
                this.detailId = res.data
                this.inspectionResultForm[0].id = val.mcode
                this.inspectionResultForm[0].name = val.material
                this.getTableData()
            })
        },
        getTableData() {
            this.$axios.get(this.$api.url.inspectionItemListUser, {
                params: {
                    id: this.detailId,
                    type: 2
                }
            }).then(res => {
                if (res.data.length < 1) {
                    return
                }
                this.inspectionItems = res.data
                let arr = []
                let val = JSON.parse(JSON.stringify(this.inspectionItems))
                const uName = []
                //转成一维数组
                val.forEach(l => {
                    let father = l.father
                    l.children.forEach(c => {
                        c.father = father
                        c.empiricalValueAddss = []
                        if (c.inspectionValue != '' && c.inspectionValue != null) {
                            c.empiricalValueAddss = c.inspectionValue.split(",");
                        } else {
                            c.empiricalValueAddss.push("")
                        }
                        uName.push(c['username'])
                        arr.push(c)
                    })
                })
                this.inspectionItems = arr
                let arrSort = JSON.parse(JSON.stringify(arr))
                //根据集合对象数组长度排序
                arrSort.sort((a, b) => {
                    if (a.empiricalValueAddss.length < b.empiricalValueAddss.length) {
                        return -1; // a排在b前面
                    } else if (a.empiricalValueAddss.length > b.empiricalValueAddss.length) {
                        return 1; // a排在b后面
                    } else {
                        return 0; // 保持相对顺序不变
                    }
                });
                // console.log(arrSort);
                console.log(uName);
                let name = [...new Set(uName)].filter(item => item !== null);
                let rname = ''
                name.forEach(m => {
                    rname += m + ","
                })
                this.inspectionResultForm[0].inspecter = rname.slice(0, -1)
                this.empiricalValueAdd = arrSort[arrSort.length - 1].empiricalValueAddss.length
                this.mergeTable(arr)
            })
        },
        selectSample() {
            let sample = this.optionsSamplename.filter(item => {
                return item.name === this.processInspectVo.material
            })[0]
            this.processInspectVo.techfather = null
            this.processInspectVo.techname = null
            this.processInspectVo.materialCode = sample.code
            this.processInspectVo.specificationsModel = sample.specifications
            this.processInspectVo.unit = sample.unit
            this.optionSoptionSprocesses = []
            this.optionSoptionSprocesses = sample.children
        },
        selectInfoByOrderId() {
            this.$axios.get(this.$api.url.finishedInspectChooseMater, {
                params: {
                    orderNumber: this.processInspectVo.orderNumber
                }
            }).then(res => {
                if (res.data.length > 0) {
                    console.log(res.data);
                    this.processInspectVo.sname = res.data[0].sname
                    this.processInspectVo.prname = res.data[0].prname
                    this.optionsSamplename = res.data[0].children
                } else {
                    this.$message({
                        message: '没有该订单号！',
                        type: 'warning'
                    });
                }
            })
        },
        // 当前页改变时触发 跳转其他页
        handleCurrentChange(val) {
            this.search.pageSize = val;
            this.defaultInitializationTable();
        },
        // 显示新增页面
        handleAddNew() {
            this.showAddPage = true;
            // this.getTableData()
        },
        // 表格初始化接口
        defaultInitializationTable() {
            this.$axios
                .post(this.$api.url.selectProcessInspectsList, this.search)
                .then(res => {
                    this.inspectionTableTotal = res.data.total;
                    this.inspectionTable = res.data.row;
                });
        },
        // 添加行
        clickAddLine() {
            let obj = {
                material: "",
                materialCode: "",
                orderNumber: "",
                quantity: 0,
                specificationsModel: "",
                techfather: "",
                techname: "",
                technologyId: 0,
                unit: ""
            };
            this.inspectionItems.push(obj);
        },
        // 删除行
        clickDeleteline(scope) {
            this.inspectionItems.splice(scope.$index, 1);
        },
        // 删除检验值列
        clickDeleteInspectionColumn() {
            if (this.empiricalValueAdd - 1 === 0) {
            } else {
                if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
                    this.empiricalValueAdd = this.empiricalValueAdd - 1;
                    this.inspectionItems.forEach(i => {
                        i.testValueList.splice(this.empiricalValueAdd, 1);
                    });
                }
            }
        },
        // 添加检验值列
        clickAddInspectionColumn() {
            this.empiricalValueAdd = this.empiricalValueAdd + 1;
        }
    },
    created() {
        this.defaultInitializationTable(); // 初始化表格数据
    }
}
</script>

<style>

</style>
<style></style>

 src/components/view/laboratoryManagement.vue

@@ -588,6 +588,7 @@
        let one=this.towTree[0]
        console.log(one);
        let name =one.father
        this.checkTreeNode.father = name
              console.log(name);
        this.selectDeviceStart(name)
        });
@@ -696,7 +697,9 @@
    delDeviceById() {
      this.$axios.post(this.$api.url.delDeviceById,{
          id:this.delete.id
      })
      }).then(res=>{
        this.$parent.removeAllTab()
      });
    },
    handleClick(row) {
      console.log(row);

 src/components/view/mbom.vue

@@ -219,24 +219,17 @@
                    }
                })
            },
            addMbom(data) {
                this.$axios.post(this.$api.url.addMbom,data,{
                    // params:{
                    //     techTemId:this.craftapi.id,
                    //     mbomModelDto2List:[{
                    //         name:this.tableapi.name,
                    //         qualityTraceability:this.tableapi.qualityTraceability,
                    //         specifications:this.tableapi.specifications,
                    //         supplier:this.tableapi.supplier,
                    //         unit:this.tableapi.unit,
                    //     }]
                    // }
            addMbom(data,cc) {
                this.$axios.post(this.$api.url.addMbom,{
                        mbomModelDto2List:data,
                        techTemId:cc,

                }, {
                    headers: {
                        "Content-Type": "application/json"
                      }
                }).then(res =>{
                    console.log(res);
                    // console.log(res);
                    this.$message.success('添加完成')
                    this.selectAllMbom()
                    this.tableapi = [{}]
@@ -280,6 +273,7 @@
                console.log(one);
                let name=one.children[0].id
                console.log(name);
                this.checkTreeNode.id = name
                this.selectAllMbomStart(name)
                this.selectDataList();
            }, {
@@ -338,14 +332,14 @@
            if (this.tableapi == undefined) {
                this.tableapi = new Array();
            }
            let obj = [];
            let obj = {};
            this.tableapi.push(obj);
            },
            skipshow() {
                console.log('666');
                let data = this.tableapi.at(-1)
                data.techTemId = this.search.craft
                this.addMbom(data)
                // let data = this.tableapi.at(-1)
                // console.log(this.tableapi);
                let cc = this.search.craft
                this.addMbom(this.tableapi,cc)
                this.dialogVisible = false
            },
            //delAllMbom 批量删除

 src/components/view/measurementManagement.vue

@@ -744,9 +744,9 @@
      },
      key: 0,
      measurePlanPageData: [], // 计量计划表格数据
      measureLedgerTotal: "",
      measureLedgerTotal: 0,
      measureLedgerPageData: [], // 计量台账表格数据
      measureLedgerPageTotal: "",
      measureLedgerPageTotal: 0,
      recordData: [],
      measurePlanPage: {
        pageNo: 1,
@@ -755,7 +755,7 @@
        measureId: ""
      },
      measureTop: {},
      measurePlanPageTotal: "",
      measurePlanPageTotal: 0,
      okOrNo: "",
      deviceIdAndNameAndCode: [],
      addFormDevice: {

 src/components/view/processInspection.vue

@@ -359,9 +359,13 @@
      this.rowInfp=row
      this.showUp=true
    },
    combackMain(){
    combackMain(val){
      this.showUp=false
      this.showLook=false
      this.defaultInitializationTable(); // 初始化表格数据
      if(val){
            this.$parent.removeAllTab()
        }
    },
    searchPro(){
      this.search.countSize=this.pageSize

 src/components/view/processInspectionUpdate.vue

@@ -91,7 +91,7 @@
        <div class="inspectionProject">
            <el-row>
                <el-col :span="12" class="inspectionProject_span">检验项目</el-col>
                <el-col :span="12" class="inspectionProject_span">
                <el-col v-if="!isUpBtn" :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>
@@ -156,7 +156,10 @@
                    </template>
                </el-table-column>
                <el-table-column prop="operation" label="上报">
                    <el-button type="primary" @click="escalation" size="small">上报</el-button>
                    <template slot-scope="scope"> 
                        <el-button v-if="scope.row.conclusion === null || scope.row.conclusion === undefined" type="primary" @click="escalation" size="small">上报</el-button>
                        <el-button v-else type="success" size="small">已上报</el-button>
                    </template>
                </el-table-column>
            </el-table>
        </div>
@@ -187,6 +190,7 @@
    props: ['rowInfo'],
    data() {
        return {
            isUpBtn: false,
            showUp: false,
            isAddProject: false,
            detailId: 0,
@@ -275,6 +279,9 @@
        }
    },
    created() {
        if(this.rowInfo.result!=null&&this.rowInfo.result!=''){
            this.isUpBtn=true
        }
        this.processInspectVo.orderNumber = this.rowInfo.order_number
        this.processInspectVo.material = this.rowInfo.material
        this.processInspectVo.materialCode = this.rowInfo.material_code
@@ -322,12 +329,14 @@
                        message: '上报成功',
                        type: 'success'
                    });
                    this.$parent.combackMain(true)
                } else {
                    this.$message({
                        message: res.message,
                        type: 'warning'
                    });
                }

            })
        },
        handleClick() { },

 src/components/view/rawInsDetail.vue

@@ -484,9 +484,11 @@
    async submitSave() {
      const res = await this.$axios.post(
        this.$api.url.updateRawInspectsById + `${this.detailId}`
      );
      this.$message.success("提交成功");
      this.getDetailInfo();
      ).then(res=>{
        this.$parent.removeAllTab()
        this.$message.success("提交成功");
        this.getDetailInfo();
      });
    },
    // 获取设备树内容
    getOptions() {

 src/components/view/rawUnqualified/raw.vue

@@ -247,6 +247,7 @@
        .then(res => {
          this.unqualifiedTable = [];
          this.getDetailInfo();
          this.$parent.removeAllTab()
        });
    }
  }

 src/components/view/record-content.vue

@@ -1,113 +1,3 @@
<style scoped>
    .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;
    }

    .title {
        margin-bottom: 10px;
        padding: 0 20px;
    }

    .title * {
        font-size: 16px;
    }

    .choose {
        padding: 21px 24px;
        display: flex;
        align-items: center;
        background-color: #fff;
        border-bottom: 3px solid rgb(245, 247, 251);
    }

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

    .choose .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;
    }

    .thing {
        width: 100%;
        height: calc(100% - 120px);
        background-color: #fff;
        display: flex;
    }

    .thing .left {
        width: 295px;
        height: calc(100% - 20px);
        border-right: 3px solid rgb(245, 247, 251);
        padding: 16px;
        overflow-y: auto;
    }

    .thing .left .custom-tree-node span {
        font-size: 14px;
    }

    .thing .left .custom-tree-node {
        flex: 1;
        display: flex;
        align-items: center;
        justify-content: space-between;
        font-size: 14px;
        padding-right: 8px;
    }

    .node_i {
        color: orange;
    }

    .el-icon-delete {
        display: none;
        color: #004EA2;
    }

    .custom-tree-node:hover .el-icon-delete {
        display: inline;
    }

    .thing .right {
        width: calc(100% - 305px);
        height: calc(100% - 25px);
        overflow: hidden;
        padding: 10px;
    }

    .table_do {
        color: #004ea0;
        cursor: pointer;
    }
</style>
<style>
    .record_content .title .el-button * {
        font-size: 14px;
    }

    .record_content .title .el-button--default {
        color: #004EA2;
    }

    .record_content .thing .left .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
        background: rgba(58, 124, 253, 0.2);
        color: #004EA2;
    }

    .record_content .el-tree-node__content {
        height: 30px;
        border-radius: 2px;
    }
</style>


<template>
    <div class="record_content">
        <div class="title">
@@ -494,6 +384,7 @@
            console.log(one);
            let name=one.children[0].id
            console.log(name);
            this.checkTreeNode.id = name
            this.selectjiluStart(name)
            this.selectDataList();
            });
@@ -509,6 +400,7 @@
            },
            //selectjilu  checkTreeNode
            selectjilu() {
                console.log(this.checkTreeNode.id);
            this.$axios.get(this.$api.url.selectjilu,{
                params:{id:this.checkTreeNode.id}
            }).then(res => {
@@ -654,3 +546,114 @@
        }
    }
</script>

<style scoped>
    .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;
    }

    .title {
        margin-bottom: 10px;
        padding: 0 20px;
    }

    .title * {
        font-size: 16px;
    }

    .choose {
        padding: 21px 24px;
        display: flex;
        align-items: center;
        background-color: #fff;
        border-bottom: 3px solid rgb(245, 247, 251);
    }

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

    .choose .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;
    }

    .thing {
        width: 100%;
        height: calc(100% - 120px);
        background-color: #fff;
        display: flex;
    }

    .thing .left {
        width: 295px;
        height: calc(100% - 20px);
        border-right: 3px solid rgb(245, 247, 251);
        padding: 16px;
        overflow-y: auto;
    }

    .thing .left .custom-tree-node span {
        font-size: 14px;
    }

    .thing .left .custom-tree-node {
        flex: 1;
        display: flex;
        align-items: center;
        justify-content: space-between;
        font-size: 14px;
        padding-right: 8px;
    }

    .node_i {
        color: orange;
    }

    .el-icon-delete {
        display: none;
        color: #004EA2;
    }

    .custom-tree-node:hover .el-icon-delete {
        display: inline;
    }

    .thing .right {
        width: calc(100% - 305px);
        height: calc(100% - 25px);
        overflow: hidden;
        padding: 10px;
    }

    .table_do {
        color: #004ea0;
        cursor: pointer;
    }
</style>
<style>
    .record_content .title .el-button * {
        font-size: 14px;
    }

    .record_content .title .el-button--default {
        color: #004EA2;
    }

    .record_content .thing .left .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
        background: rgba(58, 124, 253, 0.2);
        color: #004EA2;
    }

    .record_content .el-tree-node__content {
        height: 30px;
        border-radius: 2px;
    }
</style>



 src/components/view/self-inspection.vue

@@ -448,8 +448,15 @@
            },
            //新增
            add() {
                this.dialogVisible = false
                if (this.form.standard[0] !== "<" && this.form.standard[0] !== "<=" && this.form.standard[0] !== ">"){
                this.$message({
                        message: '输入的第一个字符必须是 '<' 或 '<='！',
                        type: 'warning'
                    });
                    return;
                }
                this.addSelfcheck()
                this.dialogVisible = false
            },
            addSelfcheck() {
                this.$axios.post(this.$api.url.addSelfcheck,{
@@ -513,6 +520,7 @@
            })[0]
            console.log(one);
            let id =one.children[0].id
            this.checkTreeNode.id = id
            console.log(id);
            this.selectAllSelfStart(id)
            this.selectDataList();

 src/components/view/technical.vue

@@ -22,7 +22,7 @@
          </el-date-picker>
        </el-form-item>
        <el-form-item label="产品名称:">
          <el-input v-model="searchData.name" @input="query"></el-input>
          <el-input v-model="searchData.name" ></el-input>
        </el-form-item>
        <el-form-item label="编制状态:" >
          <el-select v-model="searchData.type" size="small" placeholder="全部" style="width: 250px;">
@@ -108,9 +108,9 @@
    <el-pagination
       @size-change="handleSizeChange"
      @current-change="handleCurrentChange"
      :current-page="pageParams.pageNo"
      :page-sizes="[100, 200, 300, 400]"
      :page-size="pageParams.pageSize"
      :current-page="pageParams.pageSize"
      :page-sizes="[10, 20, 50, 100]"
      :page-size="pageParams.countSize"
      layout="total, sizes, prev, pager, next, jumper"
      :total="pageParams.total">
    </el-pagination>
@@ -240,8 +240,8 @@
       showDetail: false,
       selectedRow: {},
       pageParams:{
        pageNo:1,
        pageSize:10,
        pageSize:1,
        countSize:10,
        total:0
       }
    }
@@ -276,8 +276,8 @@
      async  getTechnicalTableData() {
        const res = await this.$axios.get(this.$api.url.selectAllOrder,{
          params:{
            pageSize:(this.pageParams.pageNo-1),
            countSize:this.pageParams.pageSize,...this.searchData,
            pageSize:(this.pageParams.pageSize),
            countSize:this.pageParams.countSize,...this.searchData,
            orderCode:this.searchData.id, 
            time:this.searchData.date,
            name:this.searchData.name,
@@ -299,11 +299,11 @@
        this.getTechnicalTableData()
      },
      handleSizeChange(value){
        this.pageParams.pageSize = value
        this.pageParams.countSize = value
        this.getTechnicalTableData()
      },
      handleCurrentChange(value){
        this.pageParams.pageNo = value
        this.pageParams.pageSize = value
        this.getTechnicalTableData()
      }
    },

 src/components/view/technology.vue

@@ -223,6 +223,9 @@
        </el-table>
      </div>
    </div>



    <el-dialog title="编辑记录内容" :visible.sync="upDia" width="500px">
      <div class="body">
        <el-row style="line-height: 46px">
@@ -273,7 +276,7 @@
          >
          <el-col :span="16" :offset="1">
            <el-select
              v-model="edit.children"
              v-model="cell"
              style="width: 310px"
              disabled
              multiple
@@ -283,7 +286,7 @@
                v-for="item in element"
                :key="item.id"
                :label="item.name"
                :value="item.name"
                :value="item.id"
              >
              </el-option>
            </el-select>
@@ -297,18 +300,35 @@
            <el-input v-model="edit.name" size="small" clearable></el-input>
          </el-col>
        </el-row>

        <el-row style="line-height: 46px">
          <el-col :span="4" style="font-size: 14px; text-align: right"
            >设备组:</el-col
          >
          <el-col :span="16" :offset="1">
            <el-input
            <!-- <el-input
              v-model="upData.device_group"
              size="small"
              clearable
            ></el-input>
            ></el-input> -->
            <template>
              <el-select
                v-model="upData.device_group"
                placeholder="请选择"
                style="width: 306px"
              >
                <el-option
                  v-for="item in equipment"
                  :key="item.index"
                  :label="item.father"
                  :value="item.father"
                >
                </el-option>
              </el-select>
            </template>
          </el-col>
        </el-row>

      </div>
      <span slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitUpData">确 定</el-button>
@@ -498,9 +518,9 @@
        elementId: "",
        deviceGroup: "",
      },
      search: {
        type: "",
      },
      // search: {
      //   type: "",
      // },
      delete: [],
      treetrunk: [],
      process: [],
@@ -519,6 +539,7 @@
      upDia: false,
      element: [],
      equipment: [0],
      cell:[],
      AAA: [
        {
          id: "",
@@ -602,9 +623,10 @@
          }
        )
        .then((res) => {
                    this.$parent.removeAllTab()
          this.selectAllTechNam();
          console.log(res);
          /* this.selectAllTechNam(); */
          this.form = {};
          this.$parent.removeAllTab()
        });
    },

@@ -640,35 +662,40 @@
            },
    //批量删除
    delAllTech() {
      console.log(this.delete);
      this.$axios.post(this.$api.url.delAllTech, {
        ids: this.delete
        ids: this.delete,
      }).then(res=>{
        this.$parent.removeAllTab()
      });
            this.$parent.removeAllTab()
    },
    //删除
    delTechById() {
      console.log(this.$api.url.delTechById, this.upData.id);
      this.$axios.post(this.$api.url.delTechById, {
        id: this.upData.id
        id: this.upData.id,
      }).then(res=>{
        this.$parent.removeAllTab()
      });
            this.$parent.removeAllTab()
    },
    //编辑
    writeTechById() {
      // console.log(JSON.stringify(this.edit.children));
      // console.log(JSON.stringify(this.edit.children));
      // var str = ''
      // this.edit.children.forEach((a,ai)=>{
      //   str += a.id
      //   if(ai!=this.edit.children.length-1) str+=','
      // })
      this.$axios
        .post(
          this.$api.url.writeTechById,
          {
            params: {
              id: this.upData.id,
              technologyTemplateDto: {
          this.$api.url.writeTechById + `?id=${this.upData.id}`,
            {
                deviceGroup: this.upData.device_group,
                elementId: this.edit.elementId,
                elementId:this.cell.join(','),
                father: this.edit.father,
                name: this.edit.name,
                type: this.edit.type,
              },
              // id:this.upData.id,
            },
                type: this.edit.type
          },
          {
            headers: {
@@ -677,14 +704,15 @@
          }
        )
        .then((res) => {
                    this.$parent.removeAllTab()
          /* this.selectAllTechNam(), */
          this.$parent.removeAllTab()
        });
    },

    query(val) {
      this.selectAllTechTem();
    },
     selectAllTechTem() { 
     selectAllTechTem() {
       this.$axios
        .get(this.$api.url.selectAllTechTem, {
          params: { type: this.typeselect, message: this.search.technology },
@@ -698,7 +726,8 @@
          let one=this.towTree.filter(item=>{
            return item.children.length>0
          })[0]
          let name=one.children[0].name
          let name=one.children[0].name 
      this.checkTreeNode.name=name
          this.selectAllTechNamStart(name)
          this.selectDataList();
        });
@@ -789,6 +818,7 @@
        return el.id;
      });
      this.delete = cc.join(",");
      console.log(this.delete);
      this.delAllTech();
      this.$message.success("删除完成");
    },
@@ -806,7 +836,14 @@
        })
        .then((res) => {
          this.edit = res.data[0];
          console.log(this.edit);
          console.log(this.edit.children);
          this.cell = this.edit.children.map(el => {
                    return el.id
                })
          // this.cell = this.cell.join(',')
          // this.cell = nn
          // console.log(this.cell);

        });
    },
    //编辑内容
@@ -831,4 +868,4 @@
    },
  },
};
</script>
</script>

 src/components/view/unqualifiedManagement.vue

@@ -243,6 +243,7 @@
        .then(res => {
          this.unqualifiedTable = [];
          this.getDetailInfo();
          this.$parent.removeAllTab()
        });
    }
  }

 src/main.js

@@ -26,7 +26,7 @@
const javaApi = 'http://192.168.0.23:8001'
// localhost 127.0.0.1

// const javaApi = 'http://127.0.0.1'
// const javaApi = 'http://127.0.0.1:8001/'




 src/view/index.vue

@@ -579,6 +579,7 @@
            },
            removeAllTab(){
                this.upIndex++
                this.$message.warning('数据变动较大,页面自动更新!')
            }
        }
    };