mom-before.git - Gitblit

value

2023-09-21 4f5549cd814eeaecd0ff04de62452d8d5fb4cbc5

9.21

已修改17个文件

	index.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	package-lock.json	16106 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/assets/api/controller.js	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/view/Technicalindex.vue	77 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/view/finishedProductInspection.vue	213 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/view/laboratoryManagement.vue	625 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/view/mbom.vue	66 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/view/processInspection.vue	88 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/view/processInspectionUpdate.vue	143 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/view/raw-ins.vue	110 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/view/rawInsBox.vue	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/view/rawInsDetail.vue	299 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/view/record-content.vue	244 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/view/sale.vue	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/view/technology.vue	491 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/view/index.vue	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 index.html

@@ -6,7 +6,7 @@
    <meta http-equiv="Expires" CONTENT="0">
    <meta http-equiv="Cache-Control" CONTENT="no-cache">
    <meta http-equiv="Pragma" CONTENT="no-cache">
    <title>ä¸å¤©æµ·æ´MOM</title>
    <title>ä¸å¤©æµ·æ´MES</title>
    <link rel="icon" type="image/x-icon" href="./static/img/logo.png">
  </head>
  <body>

 package-lock.json

ÎÄ¼þÌ«´ó

 src/assets/api/controller.js

@@ -188,7 +188,8 @@
    synchronization: "sale/synchronization",//åæ¥
    updateSaleById: "sale/updateSaleById", //æ ¹æ®éå®åidä¿®æ¹è¯¦æä¿¡æ¯
    delSale: "sale/delSale", //æ ¹æ®éå®åidå é¤
    delAllSale: "sale/delAllSale", //æ¹éå é¤éå®å
    delAllSale: "sale/delAllSale", //æ¹éå é¤éå®åï¼
    chooseType: "technologyTemplate/chooseType", //æ¥è¯¢ç±»å
}



 src/components/view/Technicalindex.vue

@@ -35,7 +35,6 @@
                                </el-form-item>
                            </el-col>
                        </el-row>

                        <el-row>
                            <el-col :span="11">
                                <el-form-item label="é¡¹ç®ç»">
@@ -48,7 +47,6 @@
                                </el-form-item>
                            </el-col>
                        </el-row>

                        <el-form-item label="åä½">
                            <el-input v-model="form.name" placeholder="è¯·è¾å¥åä½" style="width: 220px;"></el-input>
                        </el-form-item>
@@ -63,17 +61,8 @@
                <span>ç±»åï¼</span>
                <el-select v-model="search.type" size="small" placeholder="è¯·éæ©" @change="TYpe"
                    style="width: 224px;margin-right: 30px;">
                    <el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
                    <el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
                    <el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
                    <el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
                    <el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
                </el-select>
                <!-- <span>å·¥åºï¼</span>
            <el-select v-model="search.name" size="small" placeholder="è¯·éæ©" style="width: 224px;margin-right: 30px;">
                <el-option v-for="(a, ai) in process" key="ai" :label="a.name" :value="a.id"></el-option>
            </el-select>
            <el-button size="mini"><span>é ç½®</span></el-button>
            <el-button size="mini" type="primary" style="background: #004EA2;"><span>æ¥è¯¢</span></el-button> -->
            </div>
            <div class="thing">
                <!-- ä¸»ä½å·¦ -->
@@ -85,21 +74,15 @@
                        <div class="custom-tree-node" slot-scope="{ node, data }">
                            <span><i :class="`node_i ${data.code != '[2]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
                                {{data.code}} {{ data.name }}</span>
                            <!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
                            <i class="el-icon-delete"></i>
                        </el-button> -->
                        </div>
                    </el-tree>
                </div>
                <!-- ä¸»ä½å³ -->
                <div class="right">
                    <el-table :data="tableData" style="width: 100%;overflow-y: auto;min-height: 100%"
                        max-height="100%" row-key="name" border 
                        @select-all="selectAll"
                        @select="selectTr"
                        ref="multipleTable"
                        @selection-change="handleSelectionChange"
                        default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
                    <el-table :data="tableData" style="width: 100%;overflow-y: auto;min-height: 100%" max-height="100%"
                        row-key="name" border @select-all="selectAll" @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>
                        <el-table-column type="index" width="50">
@@ -129,17 +112,13 @@
                <div>
                    <el-dialog title="ç¼è¾ææ¯åå®¹" :visible.sync="upDia" width="500px">
                        <div class="body">

                            <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">
                                    <template>
                                        <el-select v-model="edit.type" disabled placeholder="è¯·éæ©" @change="TYpe"
                                            style="width: 306px;margin-right: 30px;">
                                            <el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
                                            <el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
                                            <el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
                                            <el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
                                            <el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
                                        </el-select>
                                    </template>
                                </el-col>
@@ -201,10 +180,7 @@
                                <template>
                                    <el-select v-model="form.type" size="small" placeholder="è¯·éæ©" @change="edittype"
                                        style="width: 98%;margin-right: 30px;">
                                        <el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
                                        <el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
                                        <el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
                                        <el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
                                        <el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
                                    </el-select>
                                </template>
                            </el-form-item>
@@ -212,7 +188,7 @@
                                <el-col :span="11">
                                    <el-form-item label="å·¥åº">
                                        <template>
                                            <el-select v-model="form.work" placeholder="è¯·éæ©" allow-create filterable @change="workevent">
                                            <el-select v-model="form.work" placeholder="è¯·éæ©" @change="workevent">
                                                <el-option v-for="(item,index) in process" :key="item.name" :label="item.name"
                                                    :value="item.name">
                                                </el-option>
@@ -223,7 +199,7 @@
                                <el-col :span="11" :offset="2">
                                    <el-form-item label="å·¥èº">
                                        <template>
                                            <el-select v-model="form.name" style="width: 95%;" placeholder="è¯·éæ©" @change="craftrow" allow-create filterable>
                                            <el-select v-model="form.name" style="width: 95%;" placeholder="è¯·éæ©" @change="craftrow">
                                                <el-option v-for="item in craftapi" :key="item.id" :label="item.name" :value="item.id">
                                                </el-option>
                                            </el-select>
@@ -231,7 +207,6 @@
                                    </el-form-item>
                                </el-col>
                            </el-row>

                            <el-row>
                                <el-col :span="11">
                                    <el-form-item label="é¡¹ç®ç»">
@@ -240,23 +215,6 @@
                                                <el-option v-for="item in higherlevel" :key="item" :label="item" :value="item">
                                                </el-option>
                                            </el-select>
                                            <!-- <el-autocomplete
                                popper-class="my-autocomplete"
                                v-model="form.father"
                                :fetch-suggestions="higherlevel"
                                placeholder="è¯·è¾å¥åå®¹"
                                @select="electadd">
                                <i
                                    class="el-icon-edit el-input__icon"
                                    slot="suffix"
                                    @click="handleIconClick">
                                </i>
                                <template slot-scope="{ item }">
                                    <div class="name">{{ item }}</div>
                                    <span class="addr">{{ item}}</span>
                                </template>
                                </el-autocomplete> -->

                                        </template>
                                    </el-form-item>
                                </el-col>
@@ -266,7 +224,6 @@
                                    </el-form-item>
                                </el-col>
                            </el-row>

                            <el-form-item label="åä½">
                                <el-input v-model="form.unit" placeholder="è¯·è¾å¥åä½" style="width: 35.95%;"></el-input>
                            </el-form-item>
@@ -289,7 +246,6 @@
                type:0,
                technology:null,
              },
            //   handleClose:[],
                checkTreeNode :{
                    id:'',
                },
@@ -322,17 +278,24 @@
                    name:'',
                    unit:'',
                    id:'',

                },
                isAllSelect:false,
                bigType: []
            }

        },
        mounted() {
            this.selectAllleft()
            this.selectAllright()
            this.chooseType()
        },
        methods:{
            chooseType() {
                this.$axios.get(this.$api.url.chooseType).then(res => {
                    this.bigType = res.data
                    this.typeselect = res.data[0]
                    this.search.type = res.data[0]
                    this.selectAllleft()
                    this.selectAllright()
                })
            },
            handleSelectionChange(val) {
                this.selects = val;
                this.deleteList = [];

 src/components/view/finishedProductInspection.vue

@@ -3,9 +3,10 @@
    <div v-if="!showAdd&&!showLook&&!showUp" class="rawPage">
        <div class="title">
      <el-row>
        <el-col :span="12">æåæ£éª</el-col>
                    <el-col :span="12">äº§åæ£éª</el-col>
        <el-col :span="12" style="text-align: right;">
          <el-button @click="handleAddNew" type="primary" size="mini" icon="el-icon-plus" style="background: #004EA2; ">æ°å¢</el-button>
                        <el-button @click="handleAddNew" type="primary" size="mini" icon="el-icon-plus"
                            style="background: #004EA2; ">æ°å¢</el-button>
          <el-button icon="el-icon-delete" size="mini">å é¤</el-button>
          <el-button icon="el-icon-download" size="mini">å¯¼åº</el-button>
        </el-col>
@@ -19,110 +20,51 @@
            <el-option :value="0" label="ä¸åæ ¼"></el-option>
          </el-select>
          <span>äº§ååç§°ï¼</span>
        <el-input v-model="searchData.material" size="small" placeholder="è¯·è¾å¥äº§ååç§°" style="width: 224px;margin-right: 52px;"></el-input>
                <el-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>
                <el-button size="mini" type="primary" @click="getInspectionTableData" style="background: #004EA2;"><span>æ¥
                        è¯¢</span></el-button>
    </div>
    <div class="content-body">
        <div class="inspectionTable">
            <el-table
                ref="inspectionTable"
                height="620"
                :cell-style="{textAlign: 'center'}"
                    <el-table ref="inspectionTable" height="620" :cell-style="{textAlign: 'center'}"
                :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
                :data="inspectionTable"
                style="width: 100%"
                >
                <el-table-column
                    type="selection"
                    width="50">
                        :data="inspectionTable" style="width: 100%">
                        <el-table-column type="selection" width="50">
                </el-table-column>
                <el-table-column
                    prop="order_number"
                    label="è®¢åå·"
                    min-width="100"
                />
                <el-table-column
                    prop="customer_name"
                    label="å®¢æ·åç§°"
                    min-width="80"
                />
                <el-table-column
                    prop="project_name"
                    label="å·¥ç¨åç§°"
                    min-width="80"
                />
                <el-table-column
                    prop="quality_traceability"
                    label="è´¨éè¿½æº¯å·"
                    min-width="108"
                />
                <el-table-column
                    prop="material_code"
                    label="äº§åç¼ç "
                    min-width="100"
                />
                <el-table-column
                    prop="material"
                    label="äº§åå¤§ç±»"
                    min-width="72"
                />
                <el-table-column
                    prop="specifications_model"
                    label="è§æ ¼åå·"
                    min-width="110"
                />
                <el-table-column
                    prop="unit"
                    label="åä½"
                    min-width="50"
                />
                <el-table-column
                    prop="quantity"
                    label="æ°é"
                    min-width="50"
                />
                <el-table-column
                    prop="detectionPeriod"
                    label="æ£éªæ¥æ"
                    min-width="80"
                />
                <el-table-column
                    prop="result"
                    label="æ£æµç»æ"
                    min-width="80"
                >
                        <el-table-column prop="order_number" label="è®¢åå·" min-width="100" />
                        <el-table-column prop="customer_name" label="å®¢æ·åç§°" min-width="80" />
                        <el-table-column prop="project_name" label="å·¥ç¨åç§°" min-width="80" />
                        <el-table-column prop="quality_traceability" label="è´¨éè¿½æº¯å·" min-width="108" />
                        <el-table-column prop="material_code" label="äº§åç¼ç " min-width="100" />
                        <el-table-column prop="material" label="äº§åå¤§ç±»" min-width="72" />
                        <el-table-column prop="specifications_model" label="è§æ ¼åå·" min-width="110" />
                        <el-table-column prop="unit" label="åä½" min-width="50" />
                        <el-table-column prop="quantity" label="æ°é" min-width="50" />
                        <el-table-column prop="detectionPeriod" label="æ£éªæ¥æ" min-width="80" />
                        <el-table-column prop="result" label="æ£æµç»æ" min-width="80">
                <template slot-scope="scope">
                        <span style="color: #34BD66;" v-if="scope.row.result === 1">åæ ¼</span>
                        <span style="color: #E84738;" v-else-if="scope.row.result === 0">ä¸åæ ¼</span>
                        <span v-else-if="scope.row.result === null || scope.row.result === undefined">ææªç»è®º</span>
                    </template>
                </el-table-column>
                    
                
                <el-table-column
                    label="æä½"
                    min-width="80"
                >
                        <el-table-column label="æä½" min-width="80">
                    <template slot-scope="scope">
                    <el-button type="text" size="small" @click="goToDetail(scope.row)">æ¥ç</el-button>
                    <el-button type="text" size="small">æå°</el-button>
                    <el-button v-if="scope.row.result == null" type="text" size="small" @click="goUp(scope.row)">ç¼è¾</el-button>
                                <el-button v-if="scope.row.result == null" type="text" size="small"
                                    @click="goUp(scope.row)">ç¼è¾</el-button>
                    </template>
                </el-table-column>
            </el-table>
        </div>
        <!-- åé¡µå¨ -->
        <div class="pagination">
            <el-pagination
            :current-page="pageParams.pageSize"
            :page-sizes="[10, 50, 100, 200]"
            :page-size="pageParams.countSize"
            layout="total, sizes, prev, pager, next, jumper"
            :total="pageParams.total"
            @size-change="handleSizeChange"
            @current-change="handleCurrentChange"
          />
                    <el-pagination :current-page="pageParams.pageSize" :page-sizes="[10, 50, 100, 200]"
                        :page-size="pageParams.countSize" layout="total, sizes, prev, pager, next, jumper" :total="pageParams.total"
                        @size-change="handleSizeChange" @current-change="handleCurrentChange" />
        </div>
    </div>
    </div>
@@ -133,51 +75,65 @@
                    <el-col :span="12">æ°å¢æåæ£éªå</el-col>
                    <el-col :span="12" style="text-align: right;">
                        <!-- ç¹å»è¿åï¼å½åé¡µé¢å¼ä¸ºfalse -->
                    <el-button @click="()=>{showAddPage = false;showDetail = false}" type="primary" size="mini" icon="el-icon-back" style="background: #004EA2; ">è¿å</el-button>
                        <el-button @click="()=>{showAddPage = false;showDetail = false}" type="primary" size="mini"
                            icon="el-icon-back" style="background: #004EA2; ">è¿å</el-button>
                    </el-col>
                </el-row>
                <el-form :model="addInspectionform" ref="addInspectionform" class="addInspectionform" label-position="right" label-width="100px" size="mini" >
                <el-form :model="addInspectionform" ref="addInspectionform" class="addInspectionform" label-position="right"
                    label-width="100px" size="mini">
                    <div class="formwrapper">
                        <el-row>
                        <el-col  :span="7">
                        <el-form-item label="è®¢åå·ï¼">
                            <el-input v-show="showDetail == false"  style="width: 180px;" v-model="addInspectionform.number" placeholder="è¯·è¾å¥è®¢åå·" autocomplete="off" />  
                            <el-input v-show="showDetail !== false"  style="width: 180px;" v-model="finishedInsInfo.order_number" placeholder="è¯·è¾å¥è®¢åå·1" autocomplete="off" />  
                                    <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.number"
                                        placeholder="è¯·è¾å¥è®¢åå·" autocomplete="off" />
                                    <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.order_number"
                                        placeholder="è¯·è¾å¥è®¢åå·1" autocomplete="off" />
                        </el-form-item>
                        </el-col>
                        <el-col  :span="7">
                        <el-form-item label="å®¢æ·åç§°ï¼">
                            <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.username" placeholder="è¯·è¾å¥å®¢æ·åç§°" autocomplete="off" />
                            <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.customer_name" placeholder="è¯·è¾å¥å®¢æ·åç§°" autocomplete="off" />
                                    <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.username"
                                        placeholder="è¯·è¾å¥å®¢æ·åç§°" autocomplete="off" />
                                    <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.customer_name"
                                        placeholder="è¯·è¾å¥å®¢æ·åç§°" autocomplete="off" />
                        </el-form-item>
                        </el-col>
                        <el-col  :span="7">
                        <el-form-item label="å·¥ç¨åç§°ï¼">
                            <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.projectname" placeholder="è¯·è¾å¥å·¥ç¨åç§°" autocomplete="off" />
                            <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.project_name" placeholder="è¯·è¾å¥å·¥ç¨åç§°" autocomplete="off" />
                                    <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.projectname"
                                        placeholder="è¯·è¾å¥å·¥ç¨åç§°" autocomplete="off" />
                                    <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.project_name"
                                        placeholder="è¯·è¾å¥å·¥ç¨åç§°" autocomplete="off" />
                        </el-form-item>
                        </el-col>
                    </el-row>
                    <el-row >
                        <el-col  :span="7">
                        <el-form-item label="è´¨éè¿½æº¯å·ï¼" >
                            <el-input  v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.tracenumber" placeholder="è¯·è¾å¥è¿½æº¯å·" autocomplete="off" />
                            <el-input  v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.quality_traceability" placeholder="è¯·è¾å¥è¿½æº¯å·" autocomplete="off" />
                                    <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.tracenumber"
                                        placeholder="è¯·è¾å¥è¿½æº¯å·" autocomplete="off" />
                                    <el-input v-show="showDetail !== false" style="width: 180px;"
                                        v-model="finishedInsInfo.quality_traceability" placeholder="è¯·è¾å¥è¿½æº¯å·" autocomplete="off" />
                        </el-form-item>
                        </el-col>
                        <el-col  :span="7">
                        <el-form-item label="äº§åç¼ç ï¼">
                            <el-input  v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.material_code" placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />                       
                            <el-input  v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.material_code" placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />                        
                                    <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.material_code"
                                        placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />
                                    <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.material_code"
                                        placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />
                        </el-form-item>
                        </el-col>
                        <el-col  :span="7">
                        <el-form-item label="äº§ååç§°ï¼">
                            <el-select v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.class" size="small" placeholder="è¯·éæ©äº§ååç§°">
                                    <el-select v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.class"
                                        size="small" placeholder="è¯·éæ©äº§ååç§°">
                                <el-option value="éé¡¹1"></el-option>
                                <el-option value="éé¡¹2"></el-option>
                            </el-select>
                            <el-input  v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.material" placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />                       
                                    <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.material"
                                        placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />

                        </el-form-item>
                        </el-col>
@@ -185,26 +141,32 @@
                    <el-row >
                        <el-col  :span="7">
                        <el-form-item label="è§æ ¼åå·ï¼" >
                            <el-select v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.specificationmodel" size="small" placeholder="è¯·éæ©è§æ ¼åå·">
                                    <el-select v-show="showDetail == false" style="width: 180px;"
                                        v-model="addInspectionform.specificationmodel" size="small" placeholder="è¯·éæ©è§æ ¼åå·">
                                <el-option value="éé¡¹1"></el-option>
                                <el-option value="éé¡¹2"></el-option>
                            </el-select>
                            <el-input  v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.specifications_model" placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />                       
                                    <el-input v-show="showDetail !== false" style="width: 180px;"
                                        v-model="finishedInsInfo.specifications_model" placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />
                        </el-form-item>
                        </el-col>
                        <el-col  :span="7">
                        <el-form-item label="åä½ï¼" >
                            <el-select v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.unit" size="small" placeholder="è¯·éæ©åä½">
                                    <el-select v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.unit"
                                        size="small" placeholder="è¯·éæ©åä½">
                                <el-option value="éé¡¹1"></el-option>
                                <el-option value="éé¡¹2"></el-option>
                            </el-select>
                            <el-input  v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.specifications_model" placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />                       
                                    <el-input v-show="showDetail !== false" style="width: 180px;"
                                        v-model="finishedInsInfo.specifications_model" placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />
                        </el-form-item>
                        </el-col>
                        <el-col  :span="7">
                        <el-form-item label="æ°éï¼">
                            <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.quantity" placeholder="è¯·è¾å¥æ°é" autocomplete="off" />
                            <el-input  v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.quantity" placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />                       
                                    <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.quantity"
                                        placeholder="è¯·è¾å¥æ°é" autocomplete="off" />
                                    <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.quantity"
                                        placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />

                        </el-form-item>
                        </el-col>
@@ -212,7 +174,8 @@
                    <el-row >
                        <el-col  v-show="showDetail !== false" :span="7">
                            <el-form-item  label="ä¸»æºå·¥ï¼" >
                               <el-input  style="width: 180px;" v-model="finishedInsInfo.name" placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />                       
                                    <el-input style="width: 180px;" v-model="finishedInsInfo.name" placeholder="è¯·è¾å¥äº§åç¼ç "
                                        autocomplete="off" />
                            </el-form-item>
                        </el-col>
                    </el-row>
@@ -274,7 +237,11 @@
import finishedProductInspectionUp from '@/components/view/finishedProductInspectionUp'
import finishedProductInspectionLook from '@/components/view/finishedProductInspectionLook'
export default {
    components: { finishedProductInspectionAdd,finishedProductInspectionUp, finishedProductInspectionLook},
        components: {
            finishedProductInspectionAdd,
            finishedProductInspectionUp,
            finishedProductInspectionLook
        },
    data(){
        return {
            searchData:{
@@ -283,8 +250,7 @@
            },
            // ä¸»æºå·¥ä¸ææ¡
            usernameOptions:[],
            inspectionTable:[
            ],
                inspectionTable: [],
            rowInfo:{},
            pageParams:{
              countSize: 10, //æ¯é¡µæ°é
@@ -349,7 +315,17 @@
            this.showAdd=true
        },
        async getInspectionTableData() {
            const {data:{row,total}} = await this.$axios.get(this.$api.url.finishedInsListPage,{params:{...this.pageParams,...this.searchData}})
                const {
                    data: {
                        row,
                        total
                    }
                } = await this.$axios.get(this.$api.url.finishedInsListPage, {
                    params: {
                        ...this.pageParams,
                        ...this.searchData
                    }
                })
            this.inspectionTable = row
            this.pageParams.total = total
        },
@@ -386,68 +362,83 @@
    padding: 12px;

}

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

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

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

.inspectionTable{
    padding: 20px 20px;
}

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

.newPage{
    overflow: hidden;
}

.header{
    padding: 12px;
}

.addInspectionform{
    background-color: #fff;
}

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

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

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

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

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

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

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

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

</style>

 src/components/view/laboratoryManagement.vue

@@ -3,45 +3,19 @@
    <el-row>
      <el-col :span="12" class="top_left_name">è®¾å¤ç»´æ¤</el-col>
      <el-col :span="12" style="text-align: right;" class="title">
        <el-button
          @click="testItem()"
          type="primary"
          size="mini"
          icon="el-icon-plus"
          style="background: #004EA2; "
          >æ°å¢ä»ªå¨è®¾å¤</el-button
        >
        <el-dialog
          title="æ°å¢ä»ªå¨è®¾å¤"
          :visible.sync="dialogVisible"
          width="750px"
          :before-close="handleClose"
        >
          <el-form
            :model="ruleForm"
            :rules="rules"
            ref="ruleForm"
            label-width="130px"
            class="demo-ruleForm"
          >
                <el-button @click="testItem()" type="primary" size="mini" icon="el-icon-plus"
                    style="background: #004EA2; ">æ°å¢ä»ªå¨è®¾å¤</el-button>
                <el-dialog title="æ°å¢ä»ªå¨è®¾å¤" :visible.sync="dialogVisible" width="750px" :before-close="handleClose">
                    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px" class="demo-ruleForm">
            <el-row>
              <el-col :span="12">
                <el-form-item label="è®¾å¤åç§°" prop="name">
                  <el-input
                    placeholder="è¯·è¾å¥ä»ªå¨è®¾å¤ç¼å·"
                    style="width: 206px"
                    clearable
                    v-model="ruleForm.name"
                  ></el-input>
                                    <el-input placeholder="è¯·è¾å¥ä»ªå¨è®¾å¤ç¼å·" style="width: 206px" clearable v-model="ruleForm.name"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="è®¾å¤ç¨é" prop="type">
                  <el-select
                    v-model="ruleForm.type"
                    @change="selectinstall"
                    placeholder="è¯·éæ©è®¾å¤ç¨é"
                  >
                                    <el-select v-model="ruleForm.type" @change="selectinstall" placeholder="è¯·éæ©è®¾å¤ç¨é">
                    <el-option label="çäº§è®¾å¤" value="1"></el-option>
                    <el-option label="æ£æµè®¾å¤" value="2"></el-option>
                  </el-select>
@@ -51,129 +25,52 @@
            <el-row>
              <el-col :span="12">
                <el-form-item label="è®¾å¤ç»" prop="name">
                  <el-select
                    v-model="ruleForm.equr"
                    allow-create
                    filterable
                    @create=""
                    placeholder="è¯·éæ©è®¾å¤ç»"
                  >
                    <el-option
                      v-for="list in equaip"
                      :key="list"
                      :label="list"
                      :value="list"
                    >
                                    <el-select v-model="ruleForm.equr" allow-create filterable @create="" placeholder="è¯·éæ©è®¾å¤ç»">
                                        <el-option v-for="list in equaip" :key="list" :label="list" :value="list">
                    </el-option>
                  </el-select>
                <!-- <el-autocomplete 
                class="inline-input"
                v-model="ruleForm.equr"
                :fetch-suggestions="querySearch"
                 placeholder="è¯·è¾å¥åå®¹"
    ></el-autocomplete> -->
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="ä»ªå¨è®¾å¤ç¼å·" prop="name">
                  <el-input
                    placeholder="è¯·è¾å¥ä»ªå¨è®¾å¤ç¼å·"
                    style="width: 206px"
                    clearable
                    v-model="ruleForm.code"
                  ></el-input>
                                    <el-input placeholder="è¯·è¾å¥ä»ªå¨è®¾å¤ç¼å·" style="width: 206px" clearable v-model="ruleForm.code"></el-input>
                </el-form-item>
              </el-col>
            </el-row>
            <el-row>
              <el-col :span="12">
                <el-form-item label="ä¿ç®¡äºº" prop="keeper">
                  <el-select
                    v-model="ruleForm.keeper"
                    placeholder="è¯·éæ©ä¿ç®¡äºº"
                  >
                    <el-option
                      v-for="list in keeperList"
                      :key="list.index"
                      :label="list.name"
                      :value="list.id"
                    >
                                    <el-select v-model="ruleForm.keeper" placeholder="è¯·éæ©ä¿ç®¡äºº">
                                        <el-option v-for="list in keeperList" :key="list.index" :label="list.name" :value="list.id">
                    </el-option>
                  </el-select>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="è®¡éæªè³æææ" prop="endMeasure">
                  <el-date-picker
                    style="width: 206px"
                    type="date"
                    placeholder="è¯·éæ©è®¡éæªè³æææ"
                    v-model="ruleForm.endMeasure"
                    :picker-options="pickerOptions"
                  ></el-date-picker>
                                    <el-date-picker style="width: 206px" type="date" placeholder="è¯·éæ©è®¡éæªè³æææ"
                                        v-model="ruleForm.endMeasure" :picker-options="pickerOptions"></el-date-picker>
                </el-form-item>
              </el-col>
            </el-row>
            <el-row>
              <el-col :span="12">
                <el-form-item label="è®¾å¤ç¶æ" prop="deviceStatus" required>
                  <el-select
                    v-model="ruleForm.deviceStatus"
                    placeholder="è¯·éæ©è®¾å¤ç¶æ"
                  >
                    <el-option
                      label="è¿è¡"
                      style="color: #66c03b"
                      value="1"
                    ></el-option>
                    <el-option
                      label="æ¥åº"
                      style="color: #ac9299"
                      value="2"
                    ></el-option>
                    <el-option
                      label="æ£ä¿®"
                      style="color: #52d6c0"
                      value="3"
                    ></el-option>
                    <el-option
                      label="æé"
                      style="color: #f36b6c"
                      value="4"
                    ></el-option>
                    <el-option
                      label="ç©ºé²"
                      style="color: #fcb642"
                      value="5"
                    ></el-option>
                                    <el-select v-model="ruleForm.deviceStatus" placeholder="è¯·éæ©è®¾å¤ç¶æ">
                                        <el-option label="è¿è¡" style="color: #66c03b" value="1"></el-option>
                                        <el-option label="æ¥åº" style="color: #ac9299" value="2"></el-option>
                                        <el-option label="æ£ä¿®" style="color: #52d6c0" value="3"></el-option>
                                        <el-option label="æé" style="color: #f36b6c" value="4"></el-option>
                                        <el-option label="ç©ºé²" style="color: #fcb642" value="5"></el-option>
                  </el-select>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="åå®¶" prop="factory" required>
                  <el-input
                    style="width: 206px"
                    placeholder="è¯·è¾å¥åå®¶"
                    clearable
                    v-model="ruleForm.factory"
                  ></el-input>
                                    <el-input style="width: 206px" placeholder="è¯·è¾å¥åå®¶" clearable v-model="ruleForm.factory"></el-input>
                </el-form-item>
              </el-col>
            </el-row>
            <!-- <el-row>
              <el-col :span="12">
                <el-form-item label="è§æ ¼åå·">
                  <el-input
                    placeholder="è§æ ¼åå·"
                    :disabled="true"
                    style="width: 206px"
                    v-model="showCodeNameModel.specifications"
                  >
                  </el-input>
                </el-form-item>
              </el-col>

            </el-row> -->
          </el-form>
          <span slot="footer" class="dialog-footer">
            <el-button @click="dialogVisible = false">å æ¶</el-button>
@@ -183,144 +80,59 @@
      </el-col>
    </el-row>
    <el-row class="left_row">
      <div
        :style="
            <div :style="
          `width: ${isCollapse ? 300 : 0}px;transition: 1s;opacity: ${
            isCollapse ? 1 : 0
          };`
        "
        class="class_sidebar"
      >
        <el-radio-group
          class="ai-tab-change"
          style="width: 270px; margin-top: 5px"
          v-model="equipment"
          @input="RadioChange"
        >
        " class="class_sidebar">
                <el-radio-group class="ai-tab-change" style="width: 270px; margin-top: 5px" v-model="equipment"
                    @input="RadioChange">
        <el-radio-button  label="1">çäº§è®¾å¤</el-radio-button>
        <el-radio-button  label="2">æ£éªè®¾å¤</el-radio-button>
        </el-radio-group>
        <!-- <el-input
          class="frame_input"
          v-model="search_class"
          placeholder="è¯·è¾å¥åç±»åç§°"
          size="small"
        >
          <i
            slot="suffix"
            class="el-icon-search"
            style="font-size: 23px; padding: 5px 0;cursor:pointer;"
            @click="handlerDeptList"
          ></i>
        </el-input> -->
        <el-tree
          :data="towTree"
          ref="tree"
          :props="{ children: 'children', label: 'father' }"
          node-key="father"
          default-expand-all
          highlight-current
          style="margin-top: 20px;"
          @node-click="handleNodeClick"
        >
                <el-tree :data="towTree" ref="tree" :props="{ children: 'children', label: 'father' }" node-key="father"
                    default-expand-all highlight-current style="margin-top: 20px;" @node-click="handleNodeClick">
          <div class="custom-tree-node" slot-scope="{ node, data }">
            <span
              ><i
                :class="
                        <span><i :class="
                  `node_i ${
                    data.code != '[4]'
                      ? 'el-icon-folder-opened'
                      : 'el-icon-tickets'
                  }`
                "
              ></i>
              {{ data.father }}</span
            >
           <!--  <el-button type="text" size="mini" @click.stop="remove(node, data)">
              <i class="el-icon-delete"></i>
            </el-button> -->
                "></i>
                            {{ data.father }}</span>
          </div>
        </el-tree>
      </div>
      <div
        class="table_div"
        :style="`width: calc(100vw - ${isCollapse ? '475' : '170'}px);`"
      >
        <div
          :title="isCollapse ? 'ç¹å»å±å¼' : 'ç¹å»æ¶èµ·'"
          class="box_bgd"
          @click="isC"
        >
            <div class="table_div" :style="`width: calc(100vw - ${isCollapse ? '475' : '170'}px);`">
                <div :title="isCollapse ? 'ç¹å»å±å¼' : 'ç¹å»æ¶èµ·'" class="box_bgd" @click="isC">
          <div class="upper_triangle"></div>
          <div class="corner">
            <!-- ç¹å»å±å¼æ¶èµ·å¯¼èªååæ¢å¯¹åºå¾æ  -->
            <i
              :class="
                        <i :class="
                !isCollapse ? 'el-icon-arrow-left' : 'el-icon-arrow-right'
              "
            ></i>
              "></i>
          </div>
          <div class="under_triangle"></div>
        </div>
        <div class="main_table_div">
          <div class="table_top_div">
            <el-input
              class="table_top_input"
              size="small"
              v-model="codeNameModel"
              prefix-icon="el-icon-search"
              placeholder="è¯·è¾å¥ç¼å·/è®¾å¤åç§°/åå·è§æ ¼"
              clearable
            >
                        <el-input class="table_top_input" size="small" v-model="codeNameModel" prefix-icon="el-icon-search"
                            placeholder="è¯·è¾å¥ç¼å·/è®¾å¤åç§°/åå·è§æ ¼" clearable>
            </el-input>
            <el-button size="mini" @click="reset"><span>é ç½®</span></el-button>
            <el-button
              size="mini"
              type="primary"
              @click="selectSearch"
              style="background: #004EA2;"
              ><span>æ¥ è¯¢</span></el-button
            >
            <el-select
              @change="staueValueChange"
              v-model="staue_value"
              size="small"
              placeholder="è¯·éæ©è®¾å¤ç¶æ"
              class="table_top"
            >
              <el-option
                label="è¿è¡"
                style="color: #66c03b"
                value="1"
              ></el-option>
              <el-option
                label="æ¥åº"
                style="color: #ac9299"
                value="2"
              ></el-option>
              <el-option
                label="æ£ä¿®"
                style="color: #52d6c0"
                value="3"
              ></el-option>
              <el-option
                label="æé"
                style="color: #f36b6c"
                value="4"
              ></el-option>
              <el-option
                label="ç©ºé²"
                style="color: #fcb642"
                value="5"
              ></el-option>
                        <el-button size="mini" type="primary" @click="selectSearch" style="background: #004EA2;"><span>æ¥
                                è¯¢</span></el-button>
                        <el-select @change="staueValueChange" v-model="staue_value" size="small" placeholder="è¯·éæ©è®¾å¤ç¶æ"
                            class="table_top">
                            <el-option label="è¿è¡" style="color: #66c03b" value="1"></el-option>
                            <el-option label="æ¥åº" style="color: #ac9299" value="2"></el-option>
                            <el-option label="æ£ä¿®" style="color: #52d6c0" value="3"></el-option>
                            <el-option label="æé" style="color: #f36b6c" value="4"></el-option>
                            <el-option label="ç©ºé²" style="color: #fcb642" value="5"></el-option>
            </el-select>
          </div>
          <el-table
            :data="tableData"
            border
            height="calc(100vh - 220px)"
            style="padding: 10px;"
          >
                    <el-table :data="tableData" border height="calc(100vh - 220px)" style="padding: 10px;">
            <el-table-column prop="date" label="åºå·" width="60">
              <template v-slot="scope">
                {{ scope.$index + 1 }}
@@ -331,67 +143,24 @@
            <el-table-column prop="name" label="ä»ªå¨è®¾å¤åç§°" width="125">
            </el-table-column>
            <el-table-column prop="userName" label="ä¿ç®¡äºº"> </el-table-column>
            <el-table-column
              prop="DATE_FORMAT(end_measure, '%Y-%m-%d')"
              label="è®¡éæªè³æææ"
              width="147"
            >
                        <el-table-column prop="DATE_FORMAT(end_measure, '%Y-%m-%d')" label="è®¡éæªè³æææ" width="147">
            </el-table-column>
            <el-table-column prop="device_status" label="ä½¿ç¨ç¶æ">
              <template slot-scope="scope">
                <el-tag
                  v-if="scope.row.device_status == 1"
                  disable-transitions
                  type="success"
                  >è¿è¡</el-tag
                >
                <el-tag
                  v-else-if="scope.row.device_status == 2"
                  disable-transitions
                  type="info"
                  >æ¥åº</el-tag
                >
                <el-tag
                  v-else-if="scope.row.device_status == 3"
                  style="color: #52d6c0"
                  disable-transitions
                  type="info"
                  >æ£ä¿®</el-tag
                >
                <el-tag
                  v-else-if="scope.row.device_status == 4"
                  disable-transitions
                  type="danger"
                  >æé</el-tag
                >
                <el-tag
                  v-else-if="scope.row.device_status == 5"
                  style="color: #fcb642"
                  disable-transitions
                  type="info"
                  >ç©ºé²</el-tag
                >
                                <el-tag v-if="scope.row.device_status == 1" disable-transitions type="success">è¿è¡</el-tag>
                                <el-tag v-else-if="scope.row.device_status == 2" disable-transitions type="info">æ¥åº</el-tag>
                                <el-tag v-else-if="scope.row.device_status == 3" style="color: #52d6c0" disable-transitions
                                    type="info">æ£ä¿®</el-tag>
                                <el-tag v-else-if="scope.row.device_status == 4" disable-transitions type="danger">æé</el-tag>
                                <el-tag v-else-if="scope.row.device_status == 5" style="color: #fcb642" disable-transitions
                                    type="info">ç©ºé²</el-tag>
              </template>
            </el-table-column>
            <el-table-column
              prop="factory"
              label="åå®¶"
              :show-overflow-tooltip="true"
            >
                        <el-table-column prop="factory" label="åå®¶" :show-overflow-tooltip="true">
            </el-table-column>
            <!-- <el-table-column prop="inspectProject" label="æ£æµé¡¹ç®">
            </el-table-column>
            <el-table-column prop="testSample" label="æ£éªæ ·å">
            </el-table-column>
            <el-table-column prop="user_name" label="æ£æµäºº"> </el-table-column> -->
            <el-table-column prop="name" label="æä½">
              <template v-slot="scope">
                <el-button
                  @click="handleClick(scope.row)"
                  type="text"
                  size="small"
                  >å é¤</el-button
                >
                                <el-button @click="handleClick(scope.row)" type="text" size="small">å é¤</el-button>
              </template>
            </el-table-column>
          </el-table>
@@ -406,7 +175,6 @@
  name: "LaboratoryManagement",
  data() {
    return {

      value: "",
      dialogVisible: false,
      checkTreeNode:{},
@@ -435,41 +203,61 @@
        name: "",
        rawInsProductId: "",
        type: "",
        // treedata:{
        //     father:'è®¾å¤ç»1',
        // },
        equr:'',
       
      },
      delete:{},
      equip:1,
      rules: {
        name: [
          { required: true, message: "è¯·è¾å¥ä»ªå¨è®¾å¤ç¼å·", trigger: "blur" },
          { min: 2, max: 25, message: "é¿åº¦å¨ 2 å° 25 ä¸ªåç¬¦", trigger: "blur" }
        ],
        keeper: [
          { required: true, message: "è¯·éæ©ä¿ç®¡äºº", trigger: "change" }
        ],
        endMeasure: [
                    name: [{
                            required: true,
                            message: "è¯·è¾å¥ä»ªå¨è®¾å¤ç¼å·",
                            trigger: "blur"
                        },
          {
                            min: 2,
                            max: 25,
                            message: "é¿åº¦å¨ 2 å° 25 ä¸ªåç¬¦",
                            trigger: "blur"
                        }
                    ],
                    keeper: [{
                        required: true,
                        message: "è¯·éæ©ä¿ç®¡äºº",
                        trigger: "change"
                    }],
                    endMeasure: [{
            type: "date",
            required: true,
            message: "è¯·éæ©è®¡éæªè³æææ",
            trigger: "change"
                    }],
                    deviceStatus: [{
                        required: true,
                        message: "è¯·éæ©è®¾å¤ç¶æ",
                        trigger: "change"
                    }],
                    factory: [{
                            required: true,
                            message: "è¯·è¾å¥åå®¶",
                            trigger: "blur"
                        },
                        {
                            min: 2,
                            max: 25,
                            message: "é¿åº¦å¨ 2 å° 50 ä¸ªåç¬¦",
                            trigger: "blur"
          }
        ],
        deviceStatus: [
          { required: true, message: "è¯·éæ©è®¾å¤ç¶æ", trigger: "change" }
        ],
        factory: [
          { required: true, message: "è¯·è¾å¥åå®¶", trigger: "blur" },
          { min: 2, max: 25, message: "é¿åº¦å¨ 2 å° 50 ä¸ªåç¬¦", trigger: "blur" }
        ],
        rawInsProductId: [
          { required: true, message: "è¯·éæ©æ£æµé¡¹ç®", trigger: "change" }
        ],
        type: [{ required: true, message: "è¯·éæ©è®¾å¤ç¨é", trigger: "change" }]
                    rawInsProductId: [{
                        required: true,
                        message: "è¯·éæ©æ£æµé¡¹ç®",
                        trigger: "change"
                    }],
                    type: [{
                        required: true,
                        message: "è¯·éæ©è®¾å¤ç¨é",
                        trigger: "change"
                    }]
      },
      pickerOptions: {
        //ç¦ç¨å½åæ¥æä¹åçæ¥æ
@@ -477,51 +265,19 @@
          //Date.now()æ¯javascriptä¸çåç½®å½æ°ï¼å®è¿åèª1970å¹´1æ1æ¥00:00:00 UTCä»¥æ¥ç»è¿çæ¯«ç§æ°ã
          return time.getTime() < Date.now() - 8.64e7;
        }
      }
                },
    };
  },
  mounted() {
    // åå§åè°ç¨äºçº§æ 
    this.twoTreeApi();
    // åå§åè°ç¨è¡¨æ ¼æ°æ®
    // this.tableDataApi();
    // this.selectDevice()
  },
  methods: {
    handleNodeClick(val) {
      this.checkTreeNode = val
      console.log(this.checkTreeNode);
        this.selectDevice()
    },
    selectInput(){

    },
    // querySearch(queryString, cb) {
    //   console.log(this.equaip);
    //     var restaurants = this.equaip;
    //     var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
    //     // è°ç¨ callback è¿åå»ºè®®åè¡¨çæ°æ®
    //     cb(results);
    //   },
    //   createFilter(queryString) {
    //     return (restaurant) => {
    //       return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
    //     };
    //   },
    staueValueChange() {
      this.selectDevice()
      // this.tableData = [];
      // let val = 1;
      // if (this.radio1 === "false") {
      //   val = 2;
      // }
      // this.$axios
      //   .get(this.$api.url.tableDeviceList, {
      //     params: { type: val, deviceStatue: this.staue_value }
      //   })
      //   .then(res => {
      //     this.tableData = res.data;
      //   });
    },
    // å¨ææ§å¶å±å¼ä¸æ¶èµ·ååæ¢å¯¹åºå¾æ 
    isC() {
@@ -535,25 +291,6 @@
      }
    },
    submitForm() {
      // this.$refs.ruleForm.validate(valid => {
      //   if (valid) {
      //     this.ruleForm.father = this.value;
      //     this.$axios
      //       .post(this.$api.url.addDeviceInstrument, this.ruleForm, {
      //         headers: {
      //           "Content-Type": "application/json"
      //         }
      //       })
      //       .then(res => {
      //         this.keeperList = res.data;
      //         // æåå³éæ°å¢å¼¹åºæ¡
      //         this.dialogVisible = false;
      //       });
      //   } else {
      //     console.log("error submit!!");
      //     return false;
      //   }
      // });
      this.addApi()
      this.dialogVisible = false;
    },
@@ -582,18 +319,9 @@
        })
        .then(res =>{
          this.equaip = res.data
          // res.data.forEach(item=>{
          //   let obj={
          //     id: item,
          //     value: item
          //   }
          //   this.equaip.push(obj)
            console.log(this.equaip);
          // })
        })
    },
    RadioChange(val){
      console.log(val);
        this.equip = val
        this.twoTreeApi()
    },
@@ -603,24 +331,13 @@
            type:this.equip,
        }
      }).then(res => {
        // let list = res.data;
        // list.forEach(i => {
        //   if (i.name === undefined) {
        //     i.name = i.children[0].name;
        //     i.id = i.children[0].id;
        //     i.children = undefined;
        //   }
        // });
        this.towTree = res.data;
        this.$nextTick(() => {
                this.$refs.tree.setCurrentKey(this.towTree[0].father) // é»è®¤éä¸èç¹ç¬¬ä¸ä¸ª
            })
      console.log(this.towTree);
        let one=this.towTree[0]
        console.log(one);
        let name =one.father
        this.checkTreeNode.father = name
              console.log(name);
        this.selectDeviceStart(name)
        });
    },
@@ -633,7 +350,6 @@
          message:this.codeNameModel,
        }
      }).then(res =>{
        console.log(res);
        this.tableData = res.data
      }, {
                headers: {
@@ -641,7 +357,6 @@
                      }
      })
    },

    selectDevice() {//å³è¾¹æ°æ®
      this.$axios.get(this.$api.url.selectDevice,{
        params:{
@@ -651,7 +366,6 @@
          message:this.codeNameModel,
        }
      }).then(res =>{
        console.log(res);
        this.tableData = res.data
      }, {
                headers: {
@@ -669,23 +383,17 @@
        keeper:this.ruleForm.keeper,
        name:this.ruleForm.name,
        type:this.ruleForm.type,
      }, {headers: {"Content-Type": "application/json"}
                }, {
                    headers: {
                        "Content-Type": "application/json"
                    }
    }).then(res =>{
      this.selectDevice()
                    this.twoTreeApi();
      this.$message.success('æ°å¢æå')
      this.ruleForm = {}
                    this.$refs.ruleForm.resetFields()
    })
    },
    // tableDataApi() {
    //   this.$axios.get(this.$api.url.tableDeviceList).then(res => {
    //     this.tableData = res.data;
    //   });
    // },
    reset() {
      // this.tableDataApi();
      // this.radio1 = "true";
      // this.codeNameModel = "";
      // this.staue_value = "";
      this.staue_value = ""
      this.codeNameModel = ""
      this.selectDevice()
@@ -698,7 +406,10 @@
      }
      this.$axios
        .get(this.$api.url.towTree, {
          params: { type: val, search_class: this.search_class }
                        params: {
                            type: val,
                            search_class: this.search_class
                        }
        })
        .then(res => {
          this.towTree = res.data;
@@ -706,24 +417,6 @@
    },
    selectSearch() {
      this.selectDevice()
      // this.tableData = [];
      // if (this.radio1 === "false") {
      //   this.$axios
      //     .get(this.$api.url.tableDeviceList, {
      //       params: { type: 1, codeNameModel: this.codeNameModel }
      //     })
      //     .then(res => {
      //       this.tableData = res.data;
      //     });
      // } else if (this.radio1 === "true") {
      //   this.$axios
      //     .get(this.$api.url.tableDeviceList, {
      //       params: { type: 2, codeNameModel: this.codeNameModel }
      //     })
      //     .then(res => {
      //       this.tableData = res.data;
      //     });
      // }
    },
    delDeviceById() {
      this.$axios.post(this.$api.url.delDeviceById,{
@@ -733,31 +426,9 @@
      });
    },
    handleClick(row) {
      console.log(row);
        this.delete = row
        this.delDeviceById()
        this.selectDevice()
      // this.$confirm("æ¤æä½å°æ°¸ä¹å é¤è¯¥è®¾å¤, æ¯å¦ç»§ç»?", "æç¤º", {
      //   confirmButtonText: "ç¡®å®",
      //   cancelButtonText: "åæ¶",
      //   type: "warning"
      // }).then(() => {
      //   this.$axios
      //     .delete(this.$api.url.deleteDevice, { params: { deviceId: row.id } })
      //     .then(res => {
      //       this.$message({
      //         message: res.message,
      //         type: "success"
      //       });
      //       datas.splice(index, 1);
      //     })
      //     .catch(err => {
      //       this.$message({
      //         message: err.message,
      //         type: "warning"
      //       });
      //     });
      // });
    },
    remove(node, data) {
      this.$confirm("æ¤æä½å°æ°¸ä¹å é¤è¯¥è®¾å¤, æ¯å¦ç»§ç»?", "æç¤º", {
@@ -765,16 +436,17 @@
        cancelButtonText: "åæ¶",
        type: "warning"
      }).then(() => {
        console.log(`output->data`, data);
        let val = 1;
        if (this.radio1 === "false") {
          val = 2;
        }
        if (data.id === undefined) {
          console.log(`output->æ§è¡å`, "+++++++++++++++");
          this.$axios
            .delete(this.$api.url.deleteIdorFather, {
              params: { deviceFather: data.name, type: val }
                                params: {
                                    deviceFather: data.name,
                                    type: val
                                }
            })
            .then(res => {
              if (res.code === 200) {
@@ -792,9 +464,12 @@
              }
            });
        } else if (data.id !== undefined) {
          console.log(`output->æ§è¡å`, "----------------");
          this.$axios
            .delete(this.$api.url.deleteIdorFather, { params: { id: data.id } })
                            .delete(this.$api.url.deleteIdorFather, {
                                params: {
                                    id: data.id
                                }
                            })
            .then(res => {
              if (res.code === 200) {
                this.$message({
@@ -813,9 +488,7 @@
        }
      });
    },
  
  },
 
  watch: {
    "ruleForm.rawInsProductId": {
      //çå¬ruleForm.rawInsProductId
@@ -823,7 +496,9 @@
        if (newVal != null && newVal !== "") {
          this.$axios
            .get(this.$api.url.selectDeviceInspectMessage, {
              params: { inspectId: newVal }
                                params: {
                                    inspectId: newVal
                                }
            })
            .then(res => {
              this.showCodeNameModel = res.data;
@@ -831,17 +506,6 @@
        }
      }
    },
    // dialogVisible: {
    //   handler: function(newVal, oldVal) {
    //     if (newVal) {
    //       // æåæ¸ç©ºè¾å¥åå®¹
    //       this.ruleForm = {};
    //       this.value = "";
    //       this.showCodeNameModel = {};
    //       this.$refs.ruleForm.resetFields();
    //     }
    //   }
    // },
    radio1: {
      handler: function(newVal, oldVal) {
        this.towTree = [];
@@ -851,7 +515,11 @@
          this.tableDataApi();
        } else if (newVal === "false") {
          this.$axios
            .get(this.$api.url.towTree, { params: { type: 2 } })
                            .get(this.$api.url.towTree, {
                                params: {
                                    type: 2
                                }
                            })
            .then(res => {
              let list = res.data;
              list.forEach(i => {
@@ -864,7 +532,11 @@
              this.towTree = res.data;
            });
          this.$axios
            .get(this.$api.url.tableDeviceList, { params: { type: 2 } })
                            .get(this.$api.url.tableDeviceList, {
                                params: {
                                    type: 2
                                }
                            })
            .then(res => {
              this.tableData = res.data;
            });
@@ -880,10 +552,12 @@
  border-color: transparent;
  background-color: transparent;
}

.el-tag.el-tag:hover {
  border-color: transparent;
  background-color: transparent;
}

.el-form-item >>> .el-form-item__error {
  color: #f56c6c;
  font-size: 12px;
@@ -893,63 +567,76 @@
  top: 100%;
  left: 18px;
}

/deep/ .el-icon-arrow-left {
  display: flex;
  line-height: 60px !important;
  justify-content: center;
}

/deep/ .el-icon-arrow-right {
  display: flex;
  line-height: 60px !important;
  justify-content: center;
}

.top_left_name {
  padding-left: 20px;
  line-height: 32px;
}

.left_row {
  height: calc(100vh - 165px);
  margin-top: 9px;
}

.frame_input {
  width: 90%;
  margin: 10px 0;
  transition: 1.5s;
}

.table_top_div {
  margin-left: 20px;
  padding-top: 15px;
  padding-bottom: 15px;
}

.el-dialog__footer {
  padding: 0px 20px 20px;
  text-align: right;
  -webkit-box-sizing: border-box;
  box-sizing: border-box;
}

.table_top {
  float: right;
  width: 224px;
  margin-right: 52px;
}

.main_table_div {
  background-color: #fbfbfd;
  height: 100%;
}

.dialog-footer {
  display: block;
  text-align: center;
}

.table_div {
  padding-left: 5px;
  transition: 1s;
  float: left;
  position: relative;
}

.table_top_input {
  width: 20%;
  margin-right: 24px;
}

.custom-tree-node {
  flex: 1;
  display: flex;
@@ -959,23 +646,29 @@
  padding-right: 8px;
  width: 250px;
}

.el-tree {
  width: 280px;
  margin: 0 10px;
}

.custom-tree-node span {
  font-size: 14px !important;
}

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

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

.node_i {
  color: orange;
}

::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner {
  background: #f2f2f2;
  border: 0 !important;
@@ -984,6 +677,7 @@
  outline: none;
  box-shadow: none;
}

.class_sidebar {
  overflow: hidden;
  height: calc(100vh - 175px);
@@ -992,6 +686,7 @@
  float: left;
  background-color: #fdfdfe;
}

.box_bgd {
  width: 12px;
  height: 60px;
@@ -1000,28 +695,35 @@
  top: 40%;
  left: -10px;
}

.corner {
  height: 60px;
  background: #ebebec;
}

.upper_triangle {
  width: 0px; /*  å®½é«è®¾ç½®ä¸º0ï¼å¾éè¦ï¼å¦åè¾¾ä¸å°ææ */
        width: 0px;
        /*  å®½é«è®¾ç½®ä¸º0ï¼å¾éè¦ï¼å¦åè¾¾ä¸å°ææ */
  height: 0px;
  border: 6px solid #ebebec;
  border-left-color: transparent;
  border-top-color: transparent;
}

.under_triangle {
  width: 0px; /*  å®½é«è®¾ç½®ä¸º0ï¼å¾éè¦ï¼å¦åè¾¾ä¸å°ææ */
        width: 0px;
        /*  å®½é«è®¾ç½®ä¸º0ï¼å¾éè¦ï¼å¦åè¾¾ä¸å°ææ */
  height: 0px;
  border: 6px solid #ebebec;
  border-left-color: transparent;
  border-bottom-color: transparent;
}

.el-radio-button__inner {
  border: 1px solid #ececed;
  line-height: 14px;
}

.el-radio-button__orig-radio:checked + .el-radio-button__inner {
  background: #fdfdfe;
  border: 1px solid #004da2;
@@ -1044,6 +746,7 @@
      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);

 src/components/view/mbom.vue

@@ -18,10 +18,7 @@
                                <el-form-item label="ç±»å:">
                                    <el-select v-model="search.type" size="small" placeholder="è¯·éæ©"
                                        style="width: 224px;margin-right: 30px;">
                                        <el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
                                        <el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
                                        <el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
                                        <el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
                                        <el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
                                    </el-select>
                                </el-form-item>
                            </el-col>
@@ -53,11 +50,6 @@
                        <el-table border :data="tableapi" height="calc(80vh - 250px)" style="width: 100%">
                            <el-table-column type="index" label="åºå·" width="70">
                            </el-table-column>
                            <!-- <el-table-column prop="date" label="ä¾åºååç§°" width="180">
                                <template slot-scope="scope">
                                    <el-input v-model="scope.row.supplier" placeholder=""></el-input>
                                </template>
                            </el-table-column> -->
                            <el-table-column prop="" label="è´¨éè¿½æº¯å·" width="180">
                                <template slot-scope="scope">
                                    <el-input v-model="scope.row.qualityTraceability" placeholder=""></el-input>
@@ -91,31 +83,19 @@
            <span>ç±»åï¼</span>
            <el-select v-model="search.type" size="small" @change="TYpe" placeholder="è¯·éæ©"
                style="width: 224px;margin-right: 30px;">
                <el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
                <el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
                <el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
                <el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
                <el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
            </el-select>
            <!-- <span>åææåç§°ï¼</span>
            <el-select v-model="search.name" size="small" placeholder="è¯·éæ©" style="width: 224px;margin-right: 30px;">
                <el-option v-for="(a, ai) in process" key="ai" :label="a.name" :value="a.id"></el-option>
            </el-select>
            <el-button size="mini"><span>é ç½®</span></el-button>
            <el-button size="mini" type="primary" style="background: #004EA2;"><span>æ¥è¯¢</span></el-button> -->
        </div>
        <div class="thing">
            <div class="left">
                <el-input v-model="search.technology" @input="query" suffix-icon="el-icon-search" placeholder="è¯·è¾å¥æç´¢åå®¹"
                    size="small" clearable></el-input>
                <el-tree :data="list" ref="tree" style="overflow-y: auto;" highlight-current
                <el-tree :data="list" ref="tree" style="overflow-y: auto;padding-top: 8px;" highlight-current
                    :props="{children: 'children',label: 'name'}" node-key="name" default-expand-all
                    @node-click="handleNodeClick">
                    <div class="custom-tree-node" slot-scope="{ node, data }">
                        <span><i :class="`node_i ${data.code != '[2]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
                            {{data.code}} {{ data.name }}</span>
                        <!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
                            <i class="el-icon-delete"></i>
                        </el-button> -->
                    </div>
                </el-tree>
            </div>
@@ -132,19 +112,12 @@
                    </el-table-column>
                    <el-table-column label="æä½" width="130">
                        <template slot-scope="scope">
                            <!-- <span class="table_do" @click="upContent(scope.row)">ç¼è¾&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> -->
                            <span class="table_do" @click="deleteRow(scope.$index, scope.row)">å é¤</span>
                        </template>
                    </el-table-column>
                </el-table>
            </div>
        </div>
        <!-- <el-dialog title="ç¼è¾è®°å½åå®¹" :visible.sync="upDia" width="500px">
            <div class="body">

            </div>

        </el-dialog> -->
    </div>
</template>
<script>
@@ -173,16 +146,25 @@
                upData: {},
                form: {},
                dialogVisible: false,
                typeselect: 0,
                typeselect: '',
                input: '',
                craftapi: [],
                bigType: []
            }
        },
        mounted() {
            this.selectAllleft()
            this.selectAllMbom()
            this.chooseType()
        },
        methods: {
            chooseType() {
                this.$axios.get(this.$api.url.chooseType).then(res => {
                    this.bigType = res.data
                    this.typeselect = res.data[0]
                    this.search.type = res.data[0]
                    this.selectAllleft()
                    this.selectAllMbom()
                })
            },
            selectDataList() {
                this.list.forEach(a => {
                    a.code = '[1]'
@@ -257,12 +239,12 @@
            //å·¦è¾¹
            selectAllleft() {
            this.$axios.get(this.$api.url.selectAllleft,{
                params:{type:this.typeselect,
                    params: {
                        type: this.typeselect,
                        message:this.search.technology
                }
            }).then(res => {
                this.list = res.data;
                console.log(this.list);
                this.selectDataList()
                this.$nextTick(() => {
                this.$refs.tree.setCurrentKey(this.list[0].children[0].name) // é»è®¤éä¸èç¹ç¬¬ä¸ä¸ª
@@ -270,9 +252,7 @@
                let one=this.list.filter(item=>{
                return item.children.length>0
                })[0]
                console.log(one);
                let name=one.children[0].id
                console.log(name);
                this.checkTreeNode.id = name
                this.selectAllMbomStart(name)
                this.selectDataList();
@@ -284,10 +264,11 @@
            },
            selectAllMbomStart(name) {
            this.$axios.get(this.$api.url.selectAllMbom,{
                params:{id:name}
                    params: {
                        id: name
                    }
            }).then(res => {
                this.tableData = res.data;
                console.log(this.tableData);
            }, {
                headers: {
                        "Content-Type": "application/json"
@@ -302,7 +283,6 @@
                    }
                }).then(res => {
                    this.tableData = res.data;
                    console.log(this.tableData);
                }, {
                    headers: {
                        "Content-Type": "application/json"
@@ -311,8 +291,6 @@
            },
            handleNodeClick(data){
                this.checkTreeNode = data
                console.log(data);
                console.log(this.checkTreeNode.id);
                this.selectAllMbom()
            },
            handleClose(done) {
@@ -363,7 +341,6 @@
                    return el.id
                })
                this.delete = cc.join(',')
                console.log(this.delete);
                this.delAllMbom()
                this.$message.success('å é¤å®æ')
            },
@@ -371,10 +348,7 @@
                this.selects = val;
            },
            deleteRow(index, rows) {
                console.log(rows);
                // this.tableData.splice(index,1)
                this.upData.id = rows.id
                console.log(this.upData);
                this.material(index)
            },


 src/components/view/processInspection.vue

@@ -25,17 +25,16 @@
        <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" @click="searchPro" 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">
          <el-table ref="inspectionTable" height="calc(100vh - 320px)" :cell-style="{ textAlign: 'center' }"
            :header-cell-style="{
                    <el-table ref="inspectionTable" height="calc(100vh - 320px)" :header-cell-style="{
              border: '0px',
              background: '#f5f7fa',
              color: '#606266',
              boxShadow: 'inset 0 1px 0 #ebeef5',
              textAlign: 'center'
            }" border :data="inspectionTable" style="width: 100%">
            <el-table-column type="selection" width="50"> </el-table-column>
            <el-table-column label="åºå·" type="index" width="60"></el-table-column>
@@ -46,21 +45,23 @@
            <el-table-column prop="techname" label="å·¥èºåç§°" min-width="70" />
            <el-table-column prop="unit" label="åä½" min-width="50" />
            <el-table-column prop="quantity" label="æ°é" min-width="50" />
            <el-table-column prop="createTime" label="æ¥æ£æ¥æ" min-width="60" />
                        <el-table-column prop="createTime" label="æ¥æ£æ¥æ" min-width="70" />
            <el-table-column prop="name" label="æ¥æ£äºº" min-width="50" />
            <el-table-column prop="updateTime" label="æ£æµæ¥æ" min-width="60" />
            <el-table-column prop="result" label="åæ ¼ç¶æ" min-width="80">
                        <el-table-column prop="updateTime" label="æ£æµæ¥æ" min-width="70" />
                        <el-table-column prop="result" label="åæ ¼ç¶æ" min-width="60">
              <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>
              </template>
            </el-table-column>
            <el-table-column label="æä½" min-width="80">
                        <el-table-column label="æä½" min-width="75">
              <template slot-scope="scope">
                <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 type="text" size="small" @click="handleClick(scope.row)" style="margin-left: 0;"><span
                                        style="font-size: 8px;">è¯¦æ</span></el-button>
                                <el-button type="text" size="small" style="margin-left: 0;"><span
                                        style="font-size: 8px;">æ¥ç</span></el-button>
                <el-button v-if="scope.row.result == null" type="text" size="small" style="margin-left: 0;"
                  @click="updateInsInfo(scope.row)">ç¼è¾</el-button>
                                    @click="updateInsInfo(scope.row)"><span style="font-size: 8px;">ç¼è¾</span></el-button>
              </template>
            </el-table-column>
          </el-table>
@@ -68,8 +69,8 @@
        <!-- åé¡µå¨ -->
        <div class="pagination">
          <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" />
                        layout="total, sizes, prev, pager, next, jumper" :total="inspectionTableTotal"
                        @size-change="handleSizeChange" @current-change="handleCurrentChange" />
        </div>
      </div>
    </div>
@@ -98,9 +99,10 @@
              </el-col>
              <el-col :span="7">
                <el-form-item label="äº§ååç§°ï¼">
                  <el-select style="width: 210px;" size="small" @change="selectSample" v-model="processInspectVo.material"
                    placeholder="è¯·éæ©äº§å">
                    <el-option v-for="item in optionsSamplename" :key="item.value" :label="item.name" :value="item.name">
                                    <el-select style="width: 210px;" size="small" @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>
@@ -148,7 +150,8 @@
              </el-col>
              <el-col :span="7">
                <el-form-item label="æ°éï¼">
                  <el-input style="width: 210px;" size="small" v-model="processInspectVo.quantity" placeholder="è¯·è¾å¥æ°é" />
                                    <el-input style="width: 210px;" size="small" v-model="processInspectVo.quantity"
                                        placeholder="è¯·è¾å¥æ°é" />
                </el-form-item>
              </el-col>
              <el-col :span="10" style="display: flex;justify-content: end;">
@@ -192,21 +195,16 @@
          </el-table-column>
          <el-table-column prop="dname" label="è¯éªè®¾å¤" min-width="100">
            <template slot-scope="scope">
              <el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
                scope.row.dname == null ? "è¯·éæ©" : scope.row.dname
                            <el-button type="text" @click="clickTableSelect(scope)">{{
                              scope.row.deviceId == null ? "è¯·éæ©" : scope.row.deviceName
              }}</el-button>
              <el-select v-if="scope.row.isSelectDevice" style="width: 100%;" @change="clickNodeSure(scope.row)"
                v-model="filterText" placeholder="è¯·éæ©">
                <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
                </el-option>
              </el-select>
            </template>
          </el-table-column>
          <el-table-column label="ç»è®º">
            <template slot-scope="scope">
              <span style="color: #34BD66;" v-if="scope.row.result === 1">åæ ¼</span>
              <span style="color: #E84738;" v-else-if="scope.row.result === 0">ä¸åæ ¼</span>
              <span v-show="scope.row.result === null">ææªç»è®º</span>
                            <span v-show="scope.row.result === null">{{null}}</span>
            </template>
          </el-table-column>
          <!-- <el-table-column v-if="detailId == null" label="æä½" width="100">
@@ -248,7 +246,10 @@
import processInspectionUpdate from '../view/processInspectionUpdate.vue'
import processInspectionLook from '../view/processInspectionLook.vue'
export default {
  components: { processInspectionUpdate, processInspectionLook },
        components: {
            processInspectionUpdate,
            processInspectionLook
        },
  data() {
    return {
      showUp: false,
@@ -289,8 +290,7 @@
        unit: null
      },
      InspectioniD: null,
      addInspectionform: [
        {
                addInspectionform: [{
          number: "",
          username: "",
          projectname: "",
@@ -303,18 +303,15 @@
          group: "",
          worker: "",
          machine: ""
        }]
      ,
                }],
      inspectionItems: [], // æ°å¢æ£éªé¡¹ç®è¡¨æ ¼
      inspectionResultForm: [
        {
                inspectionResultForm: [{
          id: "",
          name: "",
          inspecter: "",
          conclusion: "",
          operation: ""
        }
      ],
                }],
      options: [],
      value: "",
      rowList: [],
@@ -406,10 +403,7 @@
    },
    // ç¹å»è¡¨æ ¼éæ©è§¦å
    clickTableSelect(scope) {
      // this.centerDialogVisible = true;
      if (this.clickSelectDevice.index != null) {
        this.$set(this.inspectionItems[this.clickSelectDevice.index], 'isSelectDevice', false)
      }
                this.centerDialogVisible = true;
      this.clickSelectDevice.index = scope.$index;
      this.clickSelectDevice.rpId = scope.row.id;
      this.getOptions(scope.row)
@@ -469,7 +463,9 @@
          inspectionItemId: row.id,
          inspectionValue: str.slice(0, -1)
        }, {
          headers: { "Content-Type": "application/json" }
                        headers: {
                            "Content-Type": "application/json"
                        }
        }).then(res => {
          if (res.message === 'åæ§å¼è¾å¥æ ¼å¼æé®é¢!') {
            this.$message({
@@ -493,7 +489,12 @@
      this.search.countSize = val;
      this.defaultInitializationTable();
    },
    handleSpanMethod({ row, column, rowIndex, columnIndex }) {
            handleSpanMethod({
                row,
                column,
                rowIndex,
                columnIndex
            }) {
      if (columnIndex === 0) {
        const _row = this.spanArr[rowIndex];
        const _col = _row > 0 ? 1 : 0;
@@ -554,7 +555,9 @@
        techId: Number(val.technologyId),
        unit: val.unit
      }, {
        headers: { "Content-Type": "application/json" }
                    headers: {
                        "Content-Type": "application/json"
                    }
      }).then(res => {
        if (res.code === 201) {
          this.$message({
@@ -690,8 +693,7 @@
    },
    // å é¤æ£éªå¼å
    clickDeleteInspectionColumn() {
      if (this.empiricalValueAdd - 1 === 0) {
      } else {
                if (this.empiricalValueAdd - 1 === 0) {} else {
        if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
          this.empiricalValueAdd = this.empiricalValueAdd - 1;
          this.inspectionItems.forEach(i => {

 src/components/view/processInspectionUpdate.vue

@@ -6,8 +6,6 @@
                <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>
@@ -26,31 +24,29 @@
                            <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 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-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-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-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>
@@ -59,8 +55,8 @@
                        </el-col>
                        <el-col :span="7">
                            <el-form-item label="å·¥èºåç§°ï¼">
                                <el-select v-model="processInspectVo.techname" disabled placeholder="è¯·éæ©"
                                    style="width: 210px;" size="small">
                                <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>
@@ -93,8 +89,7 @@
                <el-col :span="12" class="inspectionProject_span">æ£éªé¡¹ç®</el-col>
                <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>
                    <el-button style="margin-right: 30px;" size="mini" @click="clickAddInspectionColumn()">æ·»å æ£éªå¼å</el-button>
                    <!-- <el-button
              size="mini"
              style="margin-right: 30px;"
@@ -124,15 +119,9 @@
                <el-table-column prop="dname" label="è¯éªè®¾å¤" min-width="100">
                    <template slot-scope="scope">
                        <el-col>
                            <el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
                                scope.row.dname == null ? "è¯·éæ©" : scope.row.dname
                            }}</el-button>
                            <el-select @blur="blurNode(scope)" v-else-if="scope.row.isSelectDevice" style="width: 100%;"
                                @change="clickNodeSure(scope.row)" v-model="filterText" placeholder="è¯·éæ©">
                                <el-option v-for="item in materialOptions" :key="item.id" :label="item.device"
                                    :value="item.id">
                                </el-option>
                            </el-select>
                            <el-button type="text" @click="clickTableSelect(scope)">
                                {{scope.row.dname == null ? "è¯·éæ©" : scope.row.dname}}
                            </el-button>
                        </el-col>
                    </template>
                </el-table-column>
@@ -140,7 +129,7 @@
                    <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>
                        <span v-show="scope.row.result === null">{{null}}</span>
                    </template>
                </el-table-column>
                <!-- <el-table-column v-if="detailId == null" label="æä½" width="100">
@@ -174,15 +163,19 @@
        </div>
        <el-dialog title="è¯·éæ©è®¾å¤" :visible.sync="centerDialogVisible" width="20%">
            <div class="div_device_dialog">
                <!-- <el-select style="width: 100%;" @change="clickNodeSure()" v-model="filterText" placeholder="è¯·éæ©">
                    <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
                    </el-option>
                </el-select> -->
                <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>
            <!-- <span slot="footer" class="dialog-footer">
                </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> -->
            </span>
        </el-dialog>
    </div>
</template>
@@ -228,8 +221,7 @@
                unit: null
            },
            InspectioniD: null,
            addInspectionform: [
                {
                addInspectionform: [{
                    number: "",
                    username: "",
                    projectname: "",
@@ -242,18 +234,15 @@
                    group: "",
                    worker: "",
                    machine: ""
                }]
            ,
                }],
            inspectionItems: [], // æ°å¢æ£éªé¡¹ç®è¡¨æ ¼
            inspectionResultForm: [
                {
                inspectionResultForm: [{
                    id: "",
                    name: "",
                    inspecter: "",
                    conclusion: "",
                    operation: ""
                }
            ],
                }],
            options: [],
            value: "",
            rowList: [],
@@ -355,7 +344,6 @@
        },
        handleClick() { },
        updateInsInfo(row) {
            console.log(row);
            this.row = row
            this.showUp = true
        },
@@ -370,7 +358,6 @@
        },
        // è·åè®¾å¤æ åå®¹
        getOptions(row) {
            this.filterText = 0
            this.$axios.get(this.$api.url.inspectionItemChooseDev, {
                params: {
                    father: row.father,
@@ -387,7 +374,6 @@
                    return
                }
                row.isSelectDevice = true
                this.filterText = row.did
            });
        },
        //è¿å
@@ -396,52 +382,34 @@
        },
        // ç¹å»è¡¨æ ¼éæ©è§¦å
        clickTableSelect(scope) {
            // return scope;
            // this.centerDialogVisible = true;
            if (this.clickSelectDevice.index != null) {
                this.$set(this.inspectionItems[this.clickSelectDevice.index], 'isSelectDevice', false)
            }
                this.centerDialogVisible = true;
            this.clickSelectDevice.index = scope.$index;
            this.clickSelectDevice.rpId = scope.row.id;
            this.getOptions(scope.row);
        },
        // ç¹å»æ éé¢çç¡®å®
        clickNodeSure(row) {
            console.log(row);
            let select = this.materialOptions.filter(item => {
                return item.id === this.filterText
            })[0]
            this.nodeData.id = select.id
            this.nodeData.name = select.device
            this.$axios
                .post(this.$api.url.inspectionItemUpdateDevByInsId, {
                    id: this.clickSelectDevice.rpId,
                    type: 1,
                    devId: this.nodeData.id
                })
                .then(res => {
                    row.isSelectDevice = false
                    console.log("row", row);
                    this.filterText = 0
                    this.getTableData()
            clickNodeSure() {
                if (this.detailId == null) {
                    this.projectTable[this.clickSelectDevice.index].deviceId = this.nodeData.id;
                    this.projectTable[this.clickSelectDevice.index].deviceName = this.nodeData.name;
                    this.centerDialogVisible = false;
                } else {
                    this.$axios.post(this.$api.url.inspectionItemUpdateDevByInsId, {
                        id: this.clickSelectDevice.rpId,
                        devId: this.nodeData.id,
                        type: 1
                    }).then(res => {
                        this.centerDialogVisible = false;
                        this.inspectionItems.forEach(a=>{
                            if(a.id == this.clickSelectDevice.rpId){
                                a.dname = this.nodeData.name
                            }
                        })
                });
                }
        },
        changeState(row, index) {
            if (row.did != null && row.did != '') {
                // let val = row.empiricalValueAddss.filter(item => {
                //     return item != '' && item != null
                // })
                // let eq = val.filter(item => {
                //     return /^[^><=]/.test(item)
                // })
                // if (eq.length > 0) {
                //     this.$message({
                //         message: "æ£æµå¼[" + eq + "]æ ¼å¼é¦ä½åºåå«>,<æè=",
                //         type: 'warning'
                //     });
                //     return
                // }
                let str = ""
                row.empiricalValueAddss.forEach(e => {
                    str += e + ","
@@ -454,7 +422,9 @@
                    inspectionItemId: row.id,
                    inspectionValue: str.slice(0, -1)
                }, {
                    headers: { "Content-Type": "application/json" }
                        headers: {
                            "Content-Type": "application/json"
                        }
                }).then(res => {
                    row.result = res.data.result
                    row.username = res.data.username
@@ -471,7 +441,12 @@
            this.search.countSize = val;
            this.defaultInitializationTable();
        },
        handleSpanMethod({ row, column, rowIndex, columnIndex }) {
            handleSpanMethod({
                row,
                column,
                rowIndex,
                columnIndex
            }) {
            if (columnIndex === 0) {
                const _row = this.spanArr[rowIndex];
                const _col = _row > 0 ? 1 : 0;
@@ -532,7 +507,9 @@
                technologyId: val.technologyId,
                unit: val.unit
            }, {
                headers: { "Content-Type": "application/json" }
                    headers: {
                        "Content-Type": "application/json"
                    }
            }).then(res => {
                if (res.code === 201) {
                    this.$message({
@@ -583,7 +560,6 @@
                        }
                        uName.push(c['username'])
                        c.isSelectDevice = false
                        this.filterText = 0
                        arr.push(c)
                    })
                })
@@ -680,8 +656,7 @@
        },
        // å é¤æ£éªå¼å
        clickDeleteInspectionColumn() {
            if (this.empiricalValueAdd - 1 === 0) {
            } else {
                if (this.empiricalValueAdd - 1 === 0) {} else {
                if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
                    this.empiricalValueAdd = this.empiricalValueAdd - 1;
                    this.inspectionItems.forEach(i => {

 src/components/view/raw-ins.vue

@@ -82,74 +82,36 @@
      <el-row>
        <el-col :span="12" style="line-height: 32px;">åæææ£éª</el-col>
        <el-col :span="12" style="text-align: right;">
          <el-button
            type="primary"
            icon="el-icon-plus"
            style="background: #004EA2;"
            @click="goDetail(null)"
            >æ°å¢</el-button
          >
                    <el-button type="primary" icon="el-icon-plus" style="background: #004EA2;"
                        @click="goDetail(null)">æ°å¢</el-button>
          <el-button icon="el-icon-download">å¯¼åº</el-button>
        </el-col>
      </el-row>
    </div>
    <div class="choose">
      <span>æ¥ææ¥æï¼</span>
      <el-date-picker
        v-model="search.formTime"
        size="small"
        placeholder="è¯·è¾å¥"
        style="width: 13vw;margin-right: 5px;"
        clearable
        value-format="yyyy-MM-dd"
      ></el-date-picker>
            <el-date-picker v-model="search.formTime" size="small" placeholder="è¯·è¾å¥" style="width: 13vw;margin-right: 5px;"
                clearable value-format="yyyy-MM-dd"></el-date-picker>
      <span>åææç¼ç ï¼</span>
      <el-input
        v-model="search.code"
        placeholder="è¯·è¾å¥"
        size="small"
        style="width: 13vw;margin-right: 5px;"
        clearable
      ></el-input>
            <el-input v-model="search.code" placeholder="è¯·è¾å¥" size="small" style="width: 13vw;margin-right: 5px;"
                clearable></el-input>
      <span>æ£æµç¶æï¼</span>
      <el-select
        v-model="search.insState"
        size="small"
        placeholder="è¯·éæ©"
        style="width: 13vw;margin-right: 5px;"
      >
            <el-select v-model="search.insState" size="small" placeholder="è¯·éæ©" style="width: 13vw;margin-right: 5px;">
        <el-option label="å¨é¨" :value="2"></el-option>
        <el-option label="æªæ£æµ" :value="0"></el-option>
        <el-option label="å·²æ£æµ" :value="1"></el-option>
      </el-select>
      <span>åææåç§°ï¼</span>
      <el-input
        v-model="search.name"
        size="small"
        placeholder="è¯·è¾å¥"
        style="width: 13vw;margin-right: 5px;"
        clearable
      ></el-input>
            <el-input v-model="search.name" size="small" placeholder="è¯·è¾å¥" style="width: 13vw;margin-right: 5px;"
                clearable></el-input>
      <el-button size="mini" @click="clean()"><span>é ç½®</span></el-button>
      <el-button
        size="mini"
        type="primary"
        style="background: #004EA2;"
        @click="selectRawInspectsList()"
        ><span>æ¥ è¯¢</span></el-button
      >
            <el-button size="mini" type="primary" style="background: #004EA2;" @click="selectRawInspectsList()"><span>æ¥
                    è¯¢</span></el-button>
    </div>
    <div class="thing">
      <el-table
        :data="tableData"
        border
        style="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)"
        max-height="calc(100% - 50px)"
        @selection-change="handleSelectionChange"
        default-expand-all
        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
        row-key="id"
      >
            <el-table :data="tableData" border style="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)"
                max-height="calc(100% - 50px)" @selection-change="handleSelectionChange" default-expand-all
                :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" row-key="id">
        <el-table-column type="selection" width="50"> </el-table-column>
        <el-table-column type="index" label="åºå·" width="70">
        </el-table-column>
@@ -165,45 +127,27 @@
        <el-table-column prop="createTime" label="æ£éªæ¥æ"> </el-table-column>
        <el-table-column prop="createTime" label="æ£æµç¶æ" width="100">
          <template slot-scope="scope">
            <span style="color: #34BD66;" v-if="scope.row.ins_state == 1"
              >å·²æ£æµ</span
            >
            <span style="color: #E84738;" v-else-if="scope.row.ins_state == 0"
              >æªæ£æµ</span
            >
                        <span style="color: #34BD66;" v-if="scope.row.ins_state == 1">å·²æ£æµ</span>
                        <span style="color: #E84738;" v-else-if="scope.row.ins_state == 0">æªæ£æµ</span>
          </template>
        </el-table-column>
        <el-table-column prop="judge_state" label="åæ ¼ç¶æ" width="100">
          <template slot-scope="scope">
            <span style="color: #34BD66;" v-if="scope.row.judge_state == 1"
              >åæ ¼</span
            >
            <span style="color: #E84738;" v-else-if="scope.row.judge_state == 0"
              >ä¸åæ ¼</span
            >
                        <span style="color: #34BD66;" v-if="scope.row.judge_state == 1">åæ ¼</span>
                        <span style="color: #E84738;" v-else-if="scope.row.judge_state == 0">ä¸åæ ¼</span>
          </template>
        </el-table-column>
        <el-table-column label="æä½" width="100">
          <template slot-scope="scope">
            <span class="table_do" @click="changeShowDetail(scope.row)"
              >æ¥ç</span
            >
                        <span class="table_do" @click="changeShowDetail(scope.row)">æ¥ç</span>
            <span class="table_do">æå°</span>
          </template>
        </el-table-column>
      </el-table>
      <el-col
        style="height: 50px;display: flex;align-items: center;justify-content: right;"
      >
        <el-pagination
          @size-change="handleSizeChange"
          @current-change="handleCurrentChange"
          :current-page="1"
          :page-sizes="[10, 15, 20, 30, 50]"
          :page-size="search.co"
          layout="total, sizes, prev, pager, next, jumper"
          :total="total"
        >
            <el-col style="height: 50px;display: flex;align-items: center;justify-content: right;">
                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="1"
                    :page-sizes="[10, 15, 20, 30, 50]" :page-size="search.co" layout="total, sizes, prev, pager, next, jumper"
                    :total="total">
        </el-pagination>
      </el-col>
    </div>
@@ -245,7 +189,9 @@
    },
    selectRawInspectsList() {
      this.$axios
        .get(this.$api.url.selectRawInspectsList, { params: this.search })
                    .get(this.$api.url.selectRawInspectsList, {
                        params: this.search
                    })
        .then(res => {
          this.tableData = res.data.row;
          this.total = res.data.total;
@@ -262,7 +208,9 @@
      };
      this.selectRawInspectsList();
    },
    changeShowDetail({ id }) {
            changeShowDetail({
                id
            }) {
      this.goDetail(id);
      // console.log(id)
      // const res = await this.$axios.post(this.$api.url.selectRawInspectsListById,{params:{id}})

 src/components/view/rawInsBox.vue

@@ -1,4 +1,3 @@

<style scoped>

</style>
@@ -14,15 +13,17 @@
import RawIns from './raw-ins.vue'
import RawInsDetail from './rawInsDetail.vue'
export default {
    components:{RawIns,RawInsDetail},
        components: {
            RawIns,
            RawInsDetail
        },
    data() {
        return {
            showDetail: false,
            id:0
        }
    },
    mounted(){
    },
        mounted() {},
    methods:{
        goDetail(id) {
            this.showDetail = true

 src/components/view/rawInsDetail.vue

@@ -4,140 +4,74 @@
      <el-row>
        <el-col :span="12" style="line-height: 32px;">åæææ£éª</el-col>
        <el-col :span="12" style="text-align: right;">
          <el-button
            icon="el-icon-circle-plus-outline"
            v-show="detailId === null"
            @click="addNewRawInspect"
            style="background-color: #004ea2; color: #ffffff;"
            >æ äº¤</el-button
          >
          <el-button
            icon="el-icon-back"
            @click="
                    <el-button icon="el-icon-circle-plus-outline" v-show="detailId === null" @click="addNewRawInspect"
                        style="background-color: #004ea2; color: #ffffff;">æ äº¤</el-button>
                    <el-button icon="el-icon-back" @click="
              () => {
                goBack();
              }
            "
            >è¿ å</el-button
          >
            ">è¿ å</el-button>
        </el-col>
      </el-row>
    </div>
    <div
      class="raw-detail-info"
      :class="detailId === null ? 'raw-detail-info-edit' : ''"
    >
        <div class="raw-detail-info" :class="detailId === null ? 'raw-detail-info-edit' : ''">
      <el-form v-model="detailInfo" label-position="right" label-width="120px">
        <el-row>
          <el-col :span="7">
            <el-form-item label="æ¥ææ¥æ:">
              <el-input
                v-if="detailId !== null"
                :disabled="detailId !== null"
                v-model="detailInfo.formTime"
              ></el-input>
              <el-date-picker
                v-else
                type="date"
                value-format="yyyy-MM-dd"
                v-model="detailInfo.formTime"
                placeholder="éæ©æ¥æ"
              >
                            <el-input v-if="detailId !== null" :disabled="detailId !== null" v-model="detailInfo.formTime"></el-input>
                            <el-date-picker v-else type="date" value-format="yyyy-MM-dd" v-model="detailInfo.formTime"
                                placeholder="éæ©æ¥æ">
              </el-date-picker>
            </el-form-item>
          </el-col>
          <el-col :span="7">
            <el-form-item label="åææåç§°:">
              <el-input
                v-if="detailId !== null"
                :disabled="detailId !== null"
                v-model="detailInfo.name"
              ></el-input>
              <el-input
                v-else
                v-model="detailInfo.name"
                placeholder="è¯·è¾å¥åææåç§°"
              ></el-input> </el-form-item
          ></el-col>
                            <el-input v-if="detailId !== null" :disabled="detailId !== null" v-model="detailInfo.name"></el-input>
                            <el-input v-else v-model="detailInfo.name" placeholder="è¯·è¾å¥åææåç§°"></el-input> </el-form-item></el-col>
          <el-col :span="7">
            <el-form-item label="åææç¼ç :">
              <el-input
                v-if="detailId !== null"
                :disabled="detailId !== null"
                v-model="detailInfo.code"
              ></el-input>
              <el-input
                v-else
                v-model="detailInfo.code"
                placeholder="è¯·è¾å¥åææç¼ç "
              ></el-input>
                            <el-input v-if="detailId !== null" :disabled="detailId !== null" v-model="detailInfo.code"></el-input>
                            <el-input v-else v-model="detailInfo.code" placeholder="è¯·è¾å¥åææç¼ç "></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="7">
            <el-form-item label="è§æ ¼åå·:">
              <el-input
                v-if="detailId !== null"
                :disabled="detailId !== null"
                v-model="detailInfo.specifications"
              ></el-input>
              <el-input
                v-else
                v-model="detailInfo.specifications"
                placeholder="è¯·è¾å¥è§æ ¼åå·"
              ></el-input>
                            <el-input v-if="detailId !== null" :disabled="detailId !== null"
                                v-model="detailInfo.specifications"></el-input>
                            <el-input v-else v-model="detailInfo.specifications" placeholder="è¯·è¾å¥è§æ ¼åå·"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="7">
            <el-form-item label="åä½:">
              <el-input
                v-if="detailId !== null"
                :disabled="detailId !== null"
                v-model="detailInfo.runit"
              ></el-input>
              <el-input
                v-else
                placeholder="è¯·è¾å¥æ£éªåä½"
                :disabled="detailId !== null"
                v-model="detailInfo.unit"
              ></el-input>
                            <el-input v-if="detailId !== null" :disabled="detailId !== null" v-model="detailInfo.runit"></el-input>
                            <el-input v-else placeholder="è¯·è¾å¥æ£éªåä½" :disabled="detailId !== null" v-model="detailInfo.unit"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="7">
            <el-form-item label="æ°é:">
              <el-input
                :placeholder="detailId !== null ? '' : 'è¯·è¾å¥æ£éªæ°é'"
                :disabled="detailId !== null"
                v-model="detailInfo.number"
              ></el-input>
                            <el-input :placeholder="detailId !== null ? '' : 'è¯·è¾å¥æ£éªæ°é'" :disabled="detailId !== null"
                                v-model="detailInfo.number"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="7">
            <el-form-item label="ä¾åºååç§°:">
              <el-input
                :placeholder="detailId !== null ? '' : 'è¯·è¾å¥ä¾åºååç§°'"
                :disabled="detailId !== null"
                v-model="detailInfo.supplier"
              ></el-input>
                            <el-input :placeholder="detailId !== null ? '' : 'è¯·è¾å¥ä¾åºååç§°'" :disabled="detailId !== null"
                                v-model="detailInfo.supplier"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="7">
            <el-form-item v-show="detailId !== null" label="æ¥æ£æ¥æ:">
              <el-input
                :disabled="detailId !== null"
                v-model="detailInfo.creatTime"
              ></el-input>
                            <el-input :disabled="detailId !== null" v-model="detailInfo.creatTime"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="7">
            <el-form-item v-show="detailId !== null" label="æ¥æ£äºº:">
              <el-input
                :disabled="detailId !== null"
                v-model="detailInfo.userName"
              ></el-input>
                            <el-input :disabled="detailId !== null" v-model="detailInfo.userName"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
@@ -147,22 +81,10 @@
      <el-row>
        <el-col :span="12" style="line-height: 32px;">æ£éªé¡¹ç®</el-col>
        <el-col :span="12" style="line-height: 32px; padding-top: 6px;">
          <el-button
            style="float: right;"
            @click="clickDeleteInspectionColumn()"
            >å é¤æ£éªå¼å</el-button
          >
          <el-button
            style="float: right;margin-right: 30px;"
            @click="clickAddInspectionColumn()"
            >æ·»å æ£éªå¼å</el-button
          >
          <el-button
            v-if="detailId == null"
            style="float: right;margin-right: 30px;"
            @click="clickAddLine()"
            >æ·»å æ£éªè¡</el-button
          >
                    <el-button style="float: right;" @click="clickDeleteInspectionColumn()">å é¤æ£éªå¼å</el-button>
                    <el-button style="float: right;margin-right: 30px;" @click="clickAddInspectionColumn()">æ·»å æ£éªå¼å</el-button>
                    <el-button v-if="detailId == null" style="float: right;margin-right: 30px;"
                        @click="clickAddLine()">æ·»å æ£éªè¡</el-button>
        </el-col>
      </el-row>
    </div>
@@ -172,65 +94,35 @@
        </el-table-column>
        <el-table-column prop="rpName" label="é¡¹ç®" width="212">
          <template slot-scope="scope">
            <el-input
              v-if="detailId == null"
              v-model="scope.row.name"
              placeholder="è¯·è¾å¥é¡¹ç®åç§°"
            ></el-input>
                        <el-input v-if="detailId == null" v-model="scope.row.name" placeholder="è¯·è¾å¥é¡¹ç®åç§°"></el-input>
            <el-input v-else v-model="scope.row.rpName" disabled></el-input>
          </template>
        </el-table-column>
        <el-table-column prop="unit" label="åä½" width="148">
          <template slot-scope="scope">
            <el-input
              v-if="detailId == null"
              v-model="scope.row.unit"
              placeholder="è¯·è¾å¥åä½"
            ></el-input>
                        <el-input v-if="detailId == null" v-model="scope.row.unit" placeholder="è¯·è¾å¥åä½"></el-input>
            <el-input v-else v-model="scope.row.rpUnit" disabled></el-input>
          </template>
        </el-table-column>
        <el-table-column prop="required" label="æ åå¼" min-width="150">
          <template slot-scope="scope">
            <el-input
              :disabled="detailId != null"
              @blur="assertTest(scope.row)"
              v-model="scope.row.required"
              placeholder="è¯·è¾å¥æ åå¼"
            ></el-input>
                        <el-input :disabled="detailId != null" @blur="assertTest(scope.row)" v-model="scope.row.required"
                            placeholder="è¯·è¾å¥æ åå¼"></el-input>
          </template>
        </el-table-column>
        <el-table-column prop="internal" label="åæ§å¼" min-width="150">
          <template slot-scope="scope">
            <el-input
              @blur="assertTest(scope.row)"
              :disabled="detailId != null"
              v-model="scope.row.internal"
              placeholder="è¯·è¾å¥åæ§å¼"
            ></el-input>
                        <el-input @blur="assertTest(scope.row)" :disabled="detailId != null" v-model="scope.row.internal"
                            placeholder="è¯·è¾å¥åæ§å¼"></el-input>
          </template>
        </el-table-column>
        <el-table-column
          prop="testValue"
          label="æ£æµå¼"
          min-width="150"
          v-for="(item, index) in empiricalValueAdd"
          :key="index"
        >
                <el-table-column prop="testValue" label="æ£æµå¼" min-width="150" v-for="(item, index) in empiricalValueAdd"
                    :key="index">
          <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"
                v-model="scope.row.testValueList[index]"
                @blur="changeState(scope.row, index)"
                placeholder="è¯·è¾å¥æ£æµå¼"
              ></el-input>
                        <el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="è¯·åéæ©è®¾å¤ï¼"
                            placement="top-start">
                            <el-input :disabled="scope.row.deviceId == null" v-model="scope.row.testValueList[index]"
                                @blur="changeState(scope.row, index)" placeholder="è¯·è¾å¥æ£æµå¼"></el-input>
            </el-tooltip>
          </template>
        </el-table-column>
@@ -241,28 +133,17 @@
            }}</el-button>
          </template>
        </el-table-column>
        <el-table-column
          v-if="detailId !== null"
          prop="testState"
          label="ç»è®º"
          min-width="100"
        >
                <el-table-column v-if="detailId !== null" prop="testState" label="ç»è®º" min-width="100">
          <template slot-scope="scope">
            <span
              v-show="scope.row.testState != null"
              :style="{
                        <span v-show="scope.row.testState != null" :style="{
                color: scope.row.testState === 1 ? '#67C23A' : '#F56C6C'
              }"
              >{{ scope.row.testState === 1 ? "åæ ¼" : "ä¸åæ ¼" }}</span
            >
              }">{{ scope.row.testState === 1 ? "åæ ¼" : "ä¸åæ ¼" }}</span>
            <span v-show="scope.row.testState == 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
            >
                        <el-button type="text" @click="clickDeleteline(scope)">å é¤</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -278,68 +159,38 @@
        <el-table-column prop="name" label="ç©æåç§°"> </el-table-column>
        <el-table-column v-if="detailId != null" prop="uName" label="æ£éªå">
          <template slot-scope="scope">
            <span
              v-for="item in scope.row.uName"
              :key="item && item.uName"
              :style="{ marginRight: '8px' }"
              >{{ item }}</span
            >
                        <span v-for="item in scope.row.uName" :key="item && item.uName"
                            :style="{ marginRight: '8px' }">{{ item }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="testState" label="æ£éªç»è®º">
          <template slot-scope="scope">
            <span
              v-show="scope.row.testState != null"
              :style="{
                        <span v-show="scope.row.testState != null" :style="{
                color: scope.row.testState === 1 ? '#67C23A' : '#F56C6C'
              }"
              >{{ scope.row.testState === 1 ? "åæ ¼" : "ä¸åæ ¼" }}</span
            >
              }">{{ scope.row.testState === 1 ? "åæ ¼" : "ä¸åæ ¼" }}</span>
            <span v-show="scope.row.testState == null">ææªç»è®º</span>
          </template>
        </el-table-column>
        <el-table-column v-if="detailId !== null" label="æä½" width="120">
          <template>
            <el-button type="text" size="small" @click.once="submitSave"
              >ä¸æ¥</el-button
            >
                        <el-button type="text" size="small" @click.once="submitSave">ä¸æ¥</el-button>
          </template>
        </el-table-column>
      </el-table>
    </div>
    <el-dialog
      title="è¯·éæ©è®¾å¤"
      :visible.sync="centerDialogVisible"
      width="20%"
    >
        <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 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"
        >
                <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="
                        <span><i :class="
                  `node_i ${
                    data.children ? 'el-icon-folder-opened' : 'el-icon-tickets'
                  }`
                "
              ></i>
              {{ data.name }}</span
            >
                "></i>
                            {{ data.name }}</span>
          </div>
        </el-tree>
      </div>
@@ -352,10 +203,14 @@
</template>

<script>
import { triggerRef } from "vue";
    import {
        triggerRef
    } from "vue";
import RawIns from "./raw-ins.vue";
export default {
  components: { RawIns },
        components: {
            RawIns
        },
  props: ["goBack", "detailId"],
  created() {
    // æ¸ç©º
@@ -455,7 +310,9 @@
    async getDetailInfo() {
      await this.$axios
        .get(this.$api.url.selectRawInspectsListById + `${this.detailId}`, {
          params: { id: this.detailId }
                        params: {
                            id: this.detailId
                        }
        })
        .then(res => {
          console.log(res);
@@ -499,9 +356,13 @@
      });
      this.detailInfo.rawInsProducts = this.projectTable;
      this.$axios.post(
        this.$api.url.addRawInspects,
        { ...this.detailInfo },
        { headers: { "Content-Type": "application/json" } }
                    this.$api.url.addRawInspects, {
                        ...this.detailInfo
                    }, {
                        headers: {
                            "Content-Type": "application/json"
                        }
                    }
      ).then(res=>{
        console.log(res);
        if(res.code=="201"){
@@ -538,7 +399,7 @@
        this.$message.success("æäº¤æå");
        this.getDetailInfo();
        this.goBack()
Â  Â  Â  });
                });
    },
    // è·åè®¾å¤æ åå®¹
    getOptions() {
@@ -599,8 +460,7 @@
    },
    // å é¤æ£éªå¼å
    clickDeleteInspectionColumn() {
      if (this.empiricalValueAdd - 1 === 0) {
      } else {
                if (this.empiricalValueAdd - 1 === 0) {} else {
        if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
          this.empiricalValueAdd = this.empiricalValueAdd - 1;
          this.projectTable.forEach(i => {
@@ -621,10 +481,12 @@
.node_i {
  color: orange;
}

.div_device_dialog {
  min-height: 400px;
  overflow: auto;
}

.rawInsBox {
  height: 100%;
  width: 100%;
@@ -632,24 +494,29 @@
  display: flex;
  flex-direction: column;
}

.el-table__fixed-body-wrapper {
  top: 48px;
}

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

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

/* æ£éªè¯¦æ */
.raw-detail-info {
  background: #fff;
  padding: 26px 0px 11px 80px;
}

.raw-detail-info >>> .el-form-item__label {
  color: rgb(51, 51, 51);
  font-family: å¾®è½¯éé»;
@@ -657,12 +524,15 @@
  font-weight: 400;
  letter-spacing: 0px;
}

.raw-detail-info .el-input {
  width: auto;
}

.raw-detail-info.raw-detail-info-edit >>> .el-input__inner {
  background: #fff;
}

.raw-detail-info >>> .el-input__inner {
  width: 224px;
  height: 32px;
@@ -671,9 +541,11 @@
  border: 1px solid rgb(221, 221, 221);
  border-radius: 4px;
}

.raw-detail-info .el-form-item {
  margin-bottom: 24px;
}

.raw-detail-info .el-form-item .el-button {
  height: 32px;
  border: 1px solid rgba(190, 190, 190, 0.44);
@@ -689,6 +561,7 @@
  /* max-height: 360px; */
  /* overflow-y: hidden; */
}

/* æ£éªç»è®º */
.raw-conclusion-table {
  padding: 9px 14px;

 src/components/view/record-content.vue

@@ -5,42 +5,26 @@
                <el-col :span="12" style="line-height: 32px;">çäº§è®°å½ç»´æ¤</el-col>
                <el-col :span="12" style="text-align: right;">
                    <el-button type="primary" icon="el-icon-plus" style="background: #004EA2;" @click="addend">æ°å¢</el-button>
                    <!-- <el-button icon="el-icon-edit-outline" @click="modify">ä¿®æ¹</el-button> -->
                    <el-button icon="el-icon-delete" @click="dels">å é¤</el-button>
                </el-col>
            </el-row>
        </div>
        <div class="choose">
            <span>ç±»åï¼</span>
            <el-select v-model="search.type" size="small" @change="TYpe" placeholder="è¯·éæ©" style="width: 224px;margin-right: 30px;">
                <el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
                <el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
                <el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
                <el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
            <el-select v-model="search.type" size="small" @change="TYpe" placeholder="è¯·éæ©"
                style="width: 224px;margin-right: 30px;">
                <el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
            </el-select>
            <!-- <span>å·¥åºï¼</span>
            <el-select v-model="search.name" size="small" placeholder="è¯·éæ©" style="width: 224px;margin-right: 30px;">
                <el-option v-for="(a, ai) in process" key="ai" :label="a.name" :value="a.id"></el-option>
            </el-select>
            <el-button size="mini" @click="clean()"><span>é ç½®</span></el-button>
            <el-button size="mini" type="primary" style="background: #004EA2;"><span>æ¥
                    è¯¢</span></el-button> -->
                <!-- :style="{height: scrollerHeight,overflow:'auto',display: 'flex'}" -->

        </div>
        <div class="thing">
            <div class="left">
                <el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="è¯·è¾å¥æç´¢åå®¹" size="small" clearable @input="query"></el-input>
                <el-tree :data="list" ref="tree"
                :props="{children: 'children',label: 'name'}" node-key="name" default-expand-all
                    @node-click="handleNodeClick" highlight-current
                    :key="upIndex">
                <el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="è¯·è¾å¥æç´¢åå®¹" size="small" clearable
                    @input="query"></el-input>
                <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'name'}" node-key="name"
                    default-expand-all @node-click="handleNodeClick" highlight-current :key="upIndex" style="padding-top: 8px;">
                    <div class="custom-tree-node" slot-scope="{ node, data }">
                        <span><i :class="`node_i ${data.code != '[2]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
                            {{ data.code }}{{ data.name }}</span>
                        <!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
                            <i class="el-icon-delete"></i>
                        </el-button> -->
                    </div>
                </el-tree>
            </div>
@@ -73,10 +57,7 @@
                    <el-col :span="16" :offset="1">
                        <template>
                        <el-select v-model="edit.type" disabled placeholder="è¯·éæ©" style="width: 310px;">
                            <el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
                            <el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
                            <el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
                            <el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
                                <el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
                        </el-select>
                        </template>
                    </el-col>
@@ -85,16 +66,8 @@
                    <el-col :span="4"  style="font-size: 14px;text-align: right;">å·¥åº:</el-col>
                    <el-col :span="16" :offset="1">
                        <template>
                        <el-select v-model="edit.techFather"
                        placeholder="è¯·éæ©"
                        disabled
                        @change="workevent"
                        style="width: 310px;">
                            <el-option
                            v-for="item in process"
                            :key="item.name"
                            :label="item.name"
                            :value="item.name">
                            <el-select v-model="edit.techFather" placeholder="è¯·éæ©" disabled @change="workevent" style="width: 310px;">
                                <el-option v-for="item in process" :key="item.name" :label="item.name" :value="item.name">
                            </el-option>
                        </el-select>
                        </template>
@@ -105,11 +78,7 @@
                    <el-col :span="16" :offset="1">
                        <template>
                        <el-select v-model="edit.techName"  disabled placeholder="è¯·éæ©" style="width: 310px;">
                            <el-option
                            v-for="item in craftapi"
                            :key="item.id"
                            :label="item.name"
                            :value="item.id">
                                <el-option v-for="item in craftapi" :key="item.id" :label="item.name" :value="item.id">
                            </el-option>
                         </el-select>
                        </template>
@@ -140,31 +109,20 @@
            </span>
        </el-dialog>
        <!-- æ°å¢å¼¹çª -->
        <el-dialog title="çäº§è®°å½æ°å¢" :visible.sync="dialogVisible" :rules="Rules"
        ref="ruleForm" width="35%">
        <el-dialog title="çäº§è®°å½æ°å¢" :visible.sync="dialogVisible" :rules="Rules" ref="ruleForm" width="35%">
            <div>
                <el-form ref="form" :model="form" label-width="80px">
                <el-form-item label="ç±»å" prop="type">
                    <template>
                        <el-select v-model="form.type"  
                        @change="edittype" placeholder="è¯·éæ©" style="width: 100%;">
                            <el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
                            <el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
                            <el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
                            <el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
                            <el-select v-model="form.type" @change="edittype" placeholder="è¯·éæ©" style="width: 100%;">
                                <el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
                        </el-select>
                        </template>
                </el-form-item>
                <el-form-item label="å·¥åº" prop="work">
                    <template>
                        <el-select v-model="form.work"
                        @change="workevent"
                        placeholder="è¯·éæ©" style="width: 100%;">
                            <el-option
                            v-for="item in process"
                            :key="item.name"
                            :label="item.name"
                            :value="item.name">
                            <el-select v-model="form.work" @change="workevent" placeholder="è¯·éæ©" style="width: 100%;">
                                <el-option v-for="item in process" :key="item.name" :label="item.name" :value="item.name">
                            </el-option>
                        </el-select>
                        </template>
@@ -172,11 +130,7 @@
                <el-form-item label="å·¥èºåç§°" prop="name">
                    <template>
                        <el-select v-model="form.craft" placeholder="è¯·éæ©" style="width: 100%;">
                            <el-option
                            v-for="item in craftapi"
                            :key="item.id"
                            :label="item.name"
                            :value="item.id">
                                <el-option v-for="item in craftapi" :key="item.id" :label="item.name" :value="item.id">
                            </el-option>
                        </el-select>
                        </template>
@@ -195,63 +149,6 @@
            <span slot="footer" class="dialog-footer">
                <el-button type="primary" @click="add(form)">ç¡® å®</el-button>
                <el-button @click="dialogVisible = false">å æ¶</el-button>
            </span>
        </el-dialog>

        <!-- ä¿®æ¹å¼¹çª -->
        <el-dialog title="å·¥åºç¼è¾" :visible.sync="modifyVisible" width="35%">
            <div>
                <el-form ref="form" :model="form" label-width="80px">
                <el-form-item label="ç±»å">
                    <template>
                        <el-select v-model="value" placeholder="è¯·éæ©" style="width: 480px;">
                            <el-option
                            v-for="item in options"
                            :key="item.value"
                            :label="item.label"
                            :value="item.value">
                            </el-option>
                        </el-select>
                        </template>
                </el-form-item>
                <el-form-item label="å·¥åº">
                    <template>
                        <el-select v-model="value" placeholder="è¯·éæ©" style="width: 480px;">
                            <el-option
                            v-for="item in options"
                            :key="item.value"
                            :label="item.label"
                            :value="item.value">
                            </el-option>
                        </el-select>
                        </template>
                </el-form-item>
                <el-form-item label="å·¥èºåç§°">
                    <template>
                        <el-select v-model="value" placeholder="è¯·éæ©" style="width: 480px;">
                            <el-option
                            v-for="item in options"
                            :key="item.value"
                            :label="item.label"
                            :value="item.value">
                            </el-option>
                        </el-select>
                        </template>
                </el-form-item>
                <el-form-item label="è®°å½">
                    <el-input v-model="form.record"></el-input>
                </el-form-item>
                <el-form-item label="å¤æ³¨">
                    <el-input v-model="form.remarks"></el-input>
                </el-form-item>
                <el-form-item label="åä½">
                    <el-input v-model="form.unit"></el-input>
                </el-form-item>
                </el-form>
            </div>
            <span slot="footer" class="dialog-footer">
                <el-button type="primary" @click="modifyVisible = false">ç¡® å®</el-button>
                <el-button @click="modifyVisible = false">å æ¶</el-button>
            </span>
        </el-dialog>
    </div>
@@ -285,11 +182,32 @@
                    unit:'',
                },
                Rules:{
                    type:{validator:checktype,required:true,message:'ç±»åä¸è½ä¸ºç©º',trigger:'change'},
                    work:{required:true,message:'å·¥åºä¸è½ä¸ºç©º',trigger:'change'},
                    name:{required:true,message:'å·¥èºä¸è½ä¸ºç©º',trigger:'change'},
                    record:{required:true,message:'è®°å½ä¸è½ä¸ºç©º',trigger:'blur'},
                    unit:{required:true,message:'åä½ä¸è½ä¸ºç©º',trigger:'blur'},
                    type: {
                        validator: checktype,
                        required: true,
                        message: 'ç±»åä¸è½ä¸ºç©º',
                        trigger: 'change'
                    },
                    work: {
                        required: true,
                        message: 'å·¥åºä¸è½ä¸ºç©º',
                        trigger: 'change'
                    },
                    name: {
                        required: true,
                        message: 'å·¥èºä¸è½ä¸ºç©º',
                        trigger: 'change'
                    },
                    record: {
                        required: true,
                        message: 'è®°å½ä¸è½ä¸ºç©º',
                        trigger: 'blur'
                    },
                    unit: {
                        required: true,
                        message: 'åä½ä¸è½ä¸ºç©º',
                        trigger: 'blur'
                    },
                },
                modifyVisible:false,
                dialogVisible:false,
@@ -317,20 +235,28 @@
                    type:'',
                    unit:'',
                },
                bigType: []
            }
        },
        mounted() {
            this.selectAllleft()
            this.selectjilu()
            this.chooseType()
        },
        methods: {
            chooseType() {
                this.$axios.get(this.$api.url.chooseType).then(res => {
                    this.bigType = res.data
                    this.typeselect = res.data[0]
                    this.search.type = res.data[0]
                    this.selectAllleft()
                    this.selectjilu()
                })
            },
            delQueById() {
                this.$axios.get(this.$api.url.delQueById,)
            },
            childrenClick() {},
            TYpe(val) {
                this.typeselect = val
                console.log(this.typeselect);
                this.selectAllleft()
            },
            edittype(val) {
@@ -339,17 +265,16 @@
            },
            //æ°å¢
            workevent(val){
                console.log(val);
                let idx = this.process.findIndex(el => el.name === val)
                this.craftapi = this.process[idx].children
                console.log( this.craftapi);
            },
            chooseTechFath() {
            this.$axios.get(this.$api.url.chooseTechFath,{
                params:{type:this.typeselect}
                    params: {
                        type: this.typeselect
                    }
            }).then(res => {
                this.process = res.data;
                console.log(this.process);
            }, {
                headers: {
                        "Content-Type": "application/json"
@@ -364,27 +289,18 @@
                    note:this.form.remarks,
                    techTemId:this.form.craft,
                    unit:this.form.unit,
                }
                , {
                }, {
                    headers: {
                        "Content-Type": "application/json"
                      }
                }
                ).then(res =>{
                }).then(res => {
                    this.$message.success('æ·»å æå')
                    this.selectjilu()
                })
            },
            add(formName) {
                this.dialogVisible = false
                this.addRecord()
                // this.$refs[formName].validate((valid) => {
                // if (valid) {
                //     alert('submit!');
                // } else {
                //     console.log('error submit!!');
                //     return false;
                // }
                // });
                this.form = {};
            },
            query() {
@@ -393,21 +309,20 @@
            //ä¸»ä½å·¦
            selectAllleft() {
            this.$axios.get(this.$api.url.selectAllleft,{
                params:{type:this.typeselect,message:this.search.technology}
                    params: {
                        type: this.typeselect,
                        message: this.search.technology
                    }
            }).then(res => {
                this.list = res.data;
                this.selectDataList()
                this.$nextTick(() => {
                this.$refs.tree.setCurrentKey(this.list[0].children[0].name) // é»è®¤éä¸èç¹ç¬¬ä¸ä¸ª
            })
            console.log("=======");
            console.log(this.list);
            let one=this.list.filter(item=>{
            return item.children.length>0
            })[0]
            console.log(one);
            let name=one.children[0].id
            console.log(name);
            this.checkTreeNode.id = name
            this.selectjiluStart(name)
            this.selectDataList();
@@ -416,20 +331,21 @@
            //é»è®¤
            selectjiluStart(name) {
            this.$axios.get(this.$api.url.selectjilu,{
                params:{id:name}
                    params: {
                        id: name
                    }
            }).then(res => {
                this.tableData = res.data;
                console.log(this.tableData);
            })
            },
            //selectjilu  checkTreeNode
            selectjilu() {
                console.log(this.checkTreeNode.id);
            this.$axios.get(this.$api.url.selectjilu,{
                params:{id:this.checkTreeNode.id}
                    params: {
                        id: this.checkTreeNode.id
                    }
            }).then(res => {
                this.tableData = res.data;
                console.log(this.tableData);
            })
            },
            modify(){
@@ -470,11 +386,9 @@
                this.upIndex++
            },
            handleNodeClick(data) {
                if(data.code != '[2]') return
                this.checkTreeNode = data
                this.selectjilu()
                if(data.code=='[3]'){
                    console.log(data);
                }
            },
            nodeOpen(data, node, el) {
                $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder-opened')
@@ -498,7 +412,6 @@
                    return el.id
                })
                this.delete = cc.join(',')
                console.log(this.delete);
                this.delAllRecord()
                this.$message.success('å é¤å®æ')
            },
@@ -519,14 +432,11 @@
                this.tableData.splice(index,1)
                this.upData.id = rows.id
                this.delQueByIdapi()
                // this.selectjilu()
            },
            //ç¼è¾
            upContent(ob) {
                this.upData = ob
                // console.log(this.upData);
                this.selecRecord()
                // this.chooseTechFath()
                this.upDia = true
            },
            selecRecord() {
@@ -539,7 +449,6 @@
                })
            },
            writeRecordById() {
                // console.log(this.upData.id);
                this.$axios.post(this.$api.url.writeRecordById + '?id=' + this.upData.id,{
                    name:this.upData.name,
                    note:this.upData.note,
@@ -556,16 +465,7 @@
            submitUpData() {
                this.writeRecordById()
                this.$message.success('ä¿®æ¹æå')

                this.upDia = false
                    // this.tableData.forEach(a => {
                //     if (a.id == this.upData.id) {
                //         a.name = this.upData.name
                //         a.unit = this.upData.unit
                //         a.thing = this.upData.thing
                //     }
                // })
                // console.log(this.upData);
            }
        }
    }
@@ -679,5 +579,3 @@
        border-radius: 2px;
    }
</style>



 src/components/view/sale.vue

@@ -118,7 +118,6 @@
                    <el-button type="success" @click="syncOrder"
                        :icon="isSync ? 'el-icon-loading' : 'el-icon-refresh'">åæ¥</el-button>
                    <el-button type="primary" icon="el-icon-plus" @click="openAddDia">æ°å¢</el-button>
                    <!-- <el-button icon="el-icon-edit-outline">ä¿®æ¹</el-button> -->
                    <el-button icon="el-icon-delete" @click="delSales">å é¤</el-button>
                    <el-button icon="el-icon-download">å¯¼åº</el-button>
                </el-col>
@@ -164,7 +163,7 @@
                </el-table-column>
                <el-table-column prop="äº¤è´§æ¥æ" label="äº¤è´§æ¥æ" width="150">
                </el-table-column>
                <el-table-column prop="note" label="å¤æ³¨" width="150">
                <el-table-column prop="note" label="å¤æ³¨" width="150" show-overflow-tooltip>
                </el-table-column>
                <el-table-column prop="type" label="ç¶æ" width="100">
                    <template slot-scope="scope">

 src/components/view/technology.vue

@@ -96,12 +96,7 @@
  color: #004ea2;
}

.record_content
  .thing
  .left
  .el-tree--highlight-current
  .el-tree-node.is-current
  > .el-tree-node__content {
    .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;
}
@@ -118,313 +113,128 @@
      <el-row>
        <el-col :span="12" style="line-height: 32px">å·¥èºè·¯çº¿ç»´æ¤</el-col>
        <el-col :span="12" style="text-align: right">
          <el-button
            type="primary"
            icon="el-icon-plus"
            style="background: #004ea2"
            @click="addend"
            >æ°å¢</el-button
          >
          <!-- <el-button icon="el-icon-edit-outline" @click="modify">ä¿®æ¹</el-button> -->
                    <el-button type="primary" icon="el-icon-plus" style="background: #004ea2" @click="addend">æ°å¢</el-button>
          <el-button icon="el-icon-delete" @click="dels">å é¤</el-button>
        </el-col>
      </el-row>
    </div>
    <div class="choose">
      <span>ç±»åï¼</span>
      <el-select
        v-model="search.type"
        size="small"
        placeholder="è¯·éæ©"
        @change="type"
        style="width: 224px; margin-right: 30px"
      >
        <el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
        <el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
        <el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
        <el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
            <el-select v-model="search.type" size="small" placeholder="è¯·éæ©" @change="type"
                style="width: 224px; margin-right: 30px">
                <el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
      </el-select>
      <!-- <span>å·¥åºï¼</span>
            <el-select v-model="search.name" size="small" placeholder="è¯·éæ©" style="width: 224px;margin-right: 30px;">
                <el-option v-for="(a, ai) in process" key="ai" :label="a.name" :value="a.id"></el-option>
            </el-select>
            <span>è®¾å¤ç»ï¼</span>
            <el-select v-model="search.name" size="small" placeholder="è¯·éæ©" style="width: 224px;margin-right: 30px;">
                <el-option v-for="(a, ai) in product" key="ai" :label="a.name" :value="a.id"></el-option>
            </el-select> -->
      <!-- <el-button size="mini" @click="clean()"><span>é ç½®</span></el-button>
            <el-button size="mini" type="primary" style="background: #004EA2;"><span>æ¥
                    è¯¢</span></el-button> -->
    </div>
    <div class="thing">
      <div class="left">
        <el-input
          v-model="search.technology"
          suffix-icon="el-icon-search"
          placeholder="è¯·è¾å¥æç´¢åå®¹"
          size="small"
          clearable
          @input="query"
        >
          <!-- clearable @input="(val)=>$refs.tree.filter(val)"> -->
                <el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="è¯·è¾å¥æç´¢åå®¹" size="small" clearable
                    @input="query">
        </el-input>
        <el-tree
          :data="towTree"
          ref="tree"
          :props="{ children: 'children', label: 'father' }"
          node-key="father"
          default-expand-all
          @node-click="handleNodeClick"
          :key="upIndex"
          highlight-current
        >
                <el-tree :data="towTree" ref="tree" :props="{ children: 'children', label: 'father' }" node-key="father"
                    default-expand-all @node-click="handleNodeClick" :key="upIndex" highlight-current style="padding-top: 8px;">
          <div class="custom-tree-node" slot-scope="{ node, data }">
            <span
              ><i
                :class="`node_i ${
                        <span><i :class="`node_i ${
                  data.code != '[2]'
                    ? 'el-icon-folder-opened'
                    : 'el-icon-tickets'
                }`"
              ></i>
              {{ data.father }}</span
            >
            <!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
                            <i class="el-icon-delete"></i>
                        </el-button> -->
                }`"></i>
                            {{ data.father }}</span>
          </div>
        </el-tree>
      </div>
      <div class="right">
        <el-table
          :data="tableData"
          border
          style="width: 100%; overflow-y: auto; min-height: 100%"
          max-height="100%"
          @selection-change="handleSelectionChange"
          default-expand-all
        >
                <el-table :data="tableData" border style="width: 100%; overflow-y: auto; min-height: 100%" max-height="100%"
                    @selection-change="handleSelectionChange" default-expand-all>
          <el-table-column type="selection" width="50"> </el-table-column>
          <el-table-column type="index" label="åºå·" width="70">
          </el-table-column>
          <el-table-column prop="name" label="å·¥èºåç§°"> </el-table-column>
          <el-table-column prop="device_group" label="è®¾å¤ç»">
          </el-table-column>
          <el-table-column label="åä»¶">
            <template slot-scope="scope">
              <el-tag type="info" style="margin-right: 10px;" v-for="(a, index) in JSON.parse(scope.row.element)" :key="index">{{ a }}</el-tag>
            </template>
          </el-table-column>
          <el-table-column label="æä½" width="130">
            <template slot-scope="scope">
              <span class="table_do" @click="upContent(scope.row)"
                >ç¼è¾&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span
              >
              <span class="table_do" @click="deleteRow(scope.$index, scope.row)"
                >å é¤</span
              >
                            <span class="table_do" @click="upContent(scope.row)">ç¼è¾&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                            <span class="table_do" @click="deleteRow(scope.$index, scope.row)">å é¤</span>
            </template>
          </el-table-column>
        </el-table>
      </div>
    </div>



    <el-dialog title="ç¼è¾è®°å½åå®¹" :visible.sync="upDia" width="500px">
        <el-dialog title="ç¼è¾å·¥èºä¿¡æ¯" :visible.sync="upDia" width="500px">
      <div class="body">
        <el-row style="line-height: 46px">
          <el-col :span="4" style="font-size: 14px; text-align: right"
            >ç±»å:</el-col
          >
                    <el-col :span="4" style="font-size: 14px; text-align: right">ç±»å:</el-col>
          <el-col :span="16" :offset="1">
            <template>
              <el-select
                v-model="edit.type"
                placeholder="è¯·éæ©"
                disabled
                style="width: 310px"
              >
                <el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
                <el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
                <el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
                <el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
                            <el-select v-model="edit.type" placeholder="è¯·éæ©" disabled style="width: 310px">
                                <el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
              </el-select>
            </template>
          </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="4" style="font-size: 14px; text-align: right">å·¥åº:</el-col>
          <el-col :span="16" :offset="1">
            <el-select
              v-model="edit.father"
              style="width: 310px"
              disabled
              placeholder="è¯·éæ©"
            >
              <el-option
                v-for="item in procedure"
                :key="item"
                :label="item"
                disabled
                :value="item"
              >
                        <el-select v-model="edit.father" style="width: 310px" disabled placeholder="è¯·éæ©">
                            <el-option v-for="item in procedure" :key="item" :label="item" disabled :value="item">
              </el-option>
            </el-select>
          </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 v-model="cell"
             placeholder="è¯·è¾å¥åä»¶åç§°"
             style="width: 200px">
            </el-input>
            <!-- <el-select
              v-model="cell"
              style="width: 310px"
              disabled
              multiple
              placeholder="è¯·éæ©"
            >
              <el-option
                v-for="item in element"
                :key="item.id"
                :label="item.name"
                :value="item.id"
              >
              </el-option>
            </el-select> -->
          </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="4" style="font-size: 14px; text-align: right">å·¥èºåç§°:</el-col>
          <el-col :span="16" :offset="1">
            <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="4" style="font-size: 14px; text-align: right">è®¾å¤ç»:</el-col>
          <el-col :span="16" :offset="1">
            <!-- <el-input
              v-model="upData.device_group"
              size="small"
              clearable
            ></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-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>
        <el-button @click="upDia = false">å æ¶</el-button>
      </span>
    </el-dialog>

    <!-- å·¥èºè·¯çº¿æ°å¢ -->
    <el-dialog title="å·¥èºè·¯çº¿æ°å¢" :visible.sync="dialogVisible" width="35%">
      <div>
        <el-form ref="form" :model="form" label-width="80px">
          <el-form-item label="ç±»å">
            <template>
              <el-select
                v-model="form.type"
                placeholder="è¯·éæ©"
                style="width: 100%"
                @change="edittype"
              >
                <el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
                <el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
                <el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
                <el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
                            <el-select v-model="form.type" allow-create filterable placeholder="è¯·éæ©" style="width: 100%"
                                @change="edittype">
                                <el-option v-for="(a,ai) in bigType" :key="ai" :value="a">
                                </el-option>
              </el-select>
            </template>
          </el-form-item>
          <el-form-item label="å·¥åº">
            <template>
              <el-select
                v-model="form.father"
                allow-create
                filterable
                @create=""
               
                placeholder="è¯·éæ©"
                style="width: 100%"
              >
                <el-option
                  v-for="item in procedure"
                  :key="item"
                  :label="item"
                  :value="item"
                >
                            <el-select v-model="form.father" allow-create filterable @create="" placeholder="è¯·éæ©" style="width: 100%">
                                <el-option v-for="item in procedure" :key="item" :label="item" :value="item">
                </el-option>
              </el-select>
            </template>
          </el-form-item>
          <el-form-item label="è®¾å¤ç»">
            <template>
              <el-select
                v-model="form.deviceGroup"
                placeholder="è¯·éæ©"
                style="width: 100%"
              >
                <el-option
                  v-for="item in equipment"
                  :key="item.index"
                  :label="item.father"
                  :value="item.father"
                >
                            <el-select v-model="form.deviceGroup" placeholder="è¯·éæ©" style="width: 100%">
                                <el-option v-for="item in equipment" :key="item.index" :label="item.father" :value="item.father">
                </el-option>
              </el-select>
            </template>
          </el-form-item>
          <el-row>
            <el-col :span="12">
              <el-form-item label="åä»¶">
                <template>
                  <el-input v-model="form.elementId" placeholder="è¯·è¾å¥åä»¶åç§°" style="width: 100%"></el-input>
                  <!-- <el-select
                    v-model="form.elementId"
                    multiple
                    placeholder="è¯·éæ©"
                    style="width: 200px"
                  >
                    <el-option
                      v-for="item in element"
                      :key="item.id"
                      :label="item.name"
                      :value="item.id"
                    >
                    </el-option>
                  </el-select> -->
                </template>
              </el-form-item>
            </el-col>
            <el-col :span="12">
                        <el-col :span="24">
              <el-form-item label="å·¥èºåç§°">
                <el-input placeholder="è¯·è¾å¥å·¥èºåç§°" v-model="form.name" style="width: 100%"></el-input>
              </el-form-item>
@@ -437,80 +247,6 @@
        <el-button @click="Deleteapi">å æ¶</el-button>
      </span>
    </el-dialog>
    <!-- å·¥èºè·¯çº¿ä¿®æ¹ -->
    <el-dialog title="å·¥èºè·¯çº¿æ°å¢" :visible.sync="modifyevent" width="35%">
      <div>
        <el-form ref="form" :model="form" label-width="80px">
          <el-form-item label="ç±»å">
            <template>
              <el-select
                v-model="value"
                placeholder="è¯·éæ©"
                style="width: 480px"
              >
                <!-- <el-option
                            v-for="item in options"
                            :key="item.value"
                            :label="item."
                            :value="item.value">
                            </el-option> -->
                <el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
                <el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
                <el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
                <el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
              </el-select>
            </template>
          </el-form-item>
          <el-form-item label="å·¥åº">
            <template>
              <el-select
                v-model="value"
                placeholder="è¯·éæ©"
                style="width: 480px"
              >
                <el-option
                  v-for="item in procedure"
                  :key="item.value"
                  :label="item.j"
                  :value="item.value"
                >
                </el-option>
              </el-select>
            </template>
          </el-form-item>
          <el-row>
            <el-col :span="10">
              <el-form-item label="å·¥èºåç§°">
                <template>
                  <el-select
                    v-model="value"
                    placeholder="è¯·éæ©"
                    style="width: 200px"
                  >
                    <el-option
                      v-for="item in options"
                      :key="item.value"
                      :label="item.label"
                      :value="item.value"
                    >
                    </el-option>
                  </el-select>
                </template>
              </el-form-item>
            </el-col>
            <el-col :span="10" :offset="2">
              <el-form-item label="åä»¶">
                <el-input v-model="form.name" style="width: 200px"></el-input>
              </el-form-item>
            </el-col>
          </el-row>
        </el-form>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button type="primary" @click="modifyevent = false">ç¡® å®</el-button>
        <el-button @click="modifyevent = false">å æ¶</el-button>
      </span>
    </el-dialog>
  </div>
</template>

@@ -519,7 +255,7 @@
  data() {
    return {
      search: {
        type: 0,
                    type: '',
        technology: null,
      },
      options: {},
@@ -530,9 +266,6 @@
        elementId: "",
        deviceGroup: "",
      },
      // search: {
      //   type: "",
      // },
      delete: [],
      treetrunk: [],
      process: [],
@@ -552,11 +285,9 @@
      element: [],
      equipment: [0],
      cell:[],
      AAA: [
        {
                AAA: [{
          id: "",
        },
      ],
                }, ],
      edit: {
        deviceGroup: "",
        father: "",
@@ -571,23 +302,29 @@
        father: "",
        type: "",
      },
      typeselect: 0,
                typeselect: '',
      newdata: {
        type: "",
      },
      upIndex: 0,
      treeList:[],
    elerow:{},
                bigType: []
    };
  },
  mounted() {
    this.selectAllTechTem();
    
    this.selectAllTechNam();
    console.log(this.treeList);
  
            this.chooseType()
  },
  methods: {
            chooseType() {
                this.$axios.get(this.$api.url.chooseType).then(res => {
                    this.bigType = res.data
                    this.typeselect = res.data[0]
                    this.search.type = res.data[0]
                    this.selectAllTechTem();
                    this.selectAllTechNam();
                })
            },
    selectDataList() {
      this.towTree.forEach((a) => {
        a.code = "[1]";
@@ -616,21 +353,14 @@
      this.form = {};
    },
    addTechTemp() {
      console.log(this.form.elementId.split(','));
 
      this.$axios
        .post(
          this.$api.url.addTechTemp,
          {
                        this.$api.url.addTechTemp, {
            deviceGroup: this.form.deviceGroup,
            // elementId: JSON.stringify(this.form.elementId).replace("[","").replace("]",""),
            // element:this.form.elementId.split(','),
            element:JSON.stringify(this.form.elementId.split(',')),
            father: this.form.father,
            name: this.form.name,
            type: this.form.type,
          },
          {
                        }, {
            headers: {
              "Content-Type": "application/json",
            },
@@ -638,29 +368,16 @@
        )
        .then((res) => {
          console.log(res);
          /* this.selectAllTechNam(); */
          this.form = {};
          this.$parent.removeAllTab()
        });
    },

    //åä»¶
    // chooseElement() {
    //   this.$axios.get(this.$api.url.chooseElement).then((res) => {
    //     this.element = res.data;
    //     console.log(this.element);
    //   });
    // },
    //è®¾å¤
    chooseDevGroup() {
      this.$axios.get(this.$api.url.chooseDevGroup).then((res) => {
        this.equipment = res.data;
        // console.log(this.equipment);
      });
    },
    // onTypeBlur(e) {
    // if (e.target.value) {
    // this.type = e.target.value;}},
    //å·¥åº
    chooseTech() {
      this.$axios.get(this.$api.url.chooseTech,{
@@ -668,7 +385,6 @@
            type:this.typeselect
          }
      }).then(res =>{
        console.log(res);
        this.procedure = res.data
      })
    },
@@ -678,7 +394,6 @@
            },
    //æ¹éå é¤
    delAllTech() {
      console.log(this.delete);
      this.$axios.post(this.$api.url.delAllTech, {
        ids: this.delete,
      }).then(res=>{
@@ -687,7 +402,6 @@
    },
    //å é¤
    delTechById() {
      console.log(this.$api.url.delTechById, this.upData.id);
      this.$axios.post(this.$api.url.delTechById, {
        id: this.upData.id,
      }).then(res=>{
@@ -696,95 +410,71 @@
    },
    //ç¼è¾
    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 + `?id=${this.upData.id}`,
            {
                        this.$api.url.writeTechById + `?id=${this.upData.id}`, {
                deviceGroup: this.upData.device_group,
                element:JSON.stringify(this.cell.split(',')),
                // element:JSON.stringify(this.form.elementId.split(','))
                father: this.edit.father,
                name: this.edit.name,
                type: this.edit.type
          },
          {
                        }, {
            headers: {
              "Content-Type": "application/json",
            },
          }
        )
        .then((res) => {
          /* this.selectAllTechNam(), */
                        this.$message.success("ä¿®æ¹æå");
          this.$parent.removeAllTab()
        });
    },

    query(val) {
      this.selectAllTechTem();
    },
     selectAllTechTem() {
       this.$axios
        .get(this.$api.url.selectAllTechTem, {
          params: { type: this.typeselect, message: this.search.technology },
                        params: {
                            type: this.typeselect,
                            message: this.search.technology
                        },
        })
        .then((res) => {
          this.towTree = res.data;
          console.log(this.towTree);
          this.$nextTick(() => {
                this.$refs.tree.setCurrentKey(this.towTree[0].father) // é»è®¤éä¸èç¹ç¬¬ä¸ä¸ª
            })
          // let one=this.towTree.filter(item=>{
            // return item.children.length>0
          // })[0]
          // let name=one.children[0].name 
      // this.checkTreeNode.name=name
          // this.selectAllTechNamStart(name)
      //     this.selectDataList();
      let one=this.towTree[0]
        let name =one.father
        this.checkTreeNode.father = name
              console.log(name);
        this.selectAllTechNamStart(name)
        });
    },
    handleNodeClick(data, node) {
        console.log(data);
      this.checkTreeNode = data;
      // this.treetrunk = node;
      // console.log(this.treetrunk);
      // console.log(this.checkTreeNode);
      this.selectAllTechNam();

    },
    selectAllTechNam() {
      this.$axios
        .get(this.$api.url.selectAllTechNam, {
          params: { father: this.checkTreeNode.father },
                        params: {
                            father: this.checkTreeNode.father
                        },
        })
        .then((res) => {
          this.tableData = res.data;

          let kk =this.tableData.map(el =>{
            console.log(el);
            return el.element
                })[0]
            // console.log(kk.replace('[','').replace(']','') ); 
            // console.log(kk.split(','));
            this.elerow = kk

        });
    },
    selectAllTechNamStart(name) {
      this.$axios
        .get(this.$api.url.selectAllTechNam, {
          params: { father: name },
                        params: {
                            father: name
                        },
        })
        .then((res) => {
          this.tableData = res.data;
@@ -792,12 +482,7 @@
    },
    addend() {
      this.dialogVisible = true;
      this.chooseTech();
      this.chooseDevGroup();
      // this.chooseElement();
    },
    modify() {
      this.modifyevent = true;
    },
    filterNode(value, data) {
      if (!value) return true;
@@ -815,18 +500,6 @@
        })
        .catch((e) => {});
    },
    // selectDataList() {
    //     this.list.forEach(a => {
    //         a.code = '[1]'
    //         if (a.children != undefined) {
    //             a.children.forEach(b => {
    //                 b.code = '[2]'
    //             })
    //         }
    //     })
    //     this.upIndex++
    // },

    nodeOpen(data, node, el) {
      $($(el.$el).find(".node_i")[0]).attr(
        "class",
@@ -870,28 +543,6 @@
        })
        .then((res) => {
          this.edit = res.data[0];
          this.cell = this.edit.element
          console.log(this.cell);
          let cc = JSON.parse(this.cell).join(",")
          console.log(cc);
          this.cell = cc
          console.log(this.cell);
        //   this.cell = this.edit.children.map(el => {
                //     return el.id
                // })
        //   this.cell = this.cell.join(',')
        //   this.cell = nn
        //   console.log(this.cell);



          //  let cc = this.edit.element.join(", ")
          //  let str = cc.join(", ");
            // let cc = JSON.parse(this.edit.element)
            // console.log(cc);
            // console.log(gg);
            // console.log(json.parse(gg));

        });
    },
    //ç¼è¾åå®¹
@@ -901,19 +552,11 @@
      this.selecTechById()
      this.upDia = true;
    },

    submitUpData() {
      // this.tableData.forEach(a => {
      //     if (a.id == this.upData.id) {
      //         a.name = this.upData.name
      //         a.ask = this.upData.device_group
      //     }
      // })
      this.writeTechById();
      this.$message.success("ä¿®æ¹æå");
      this.upIndex++;
      this.upDia = false;
    },
            }
  },
};
</script>

 src/main.js

@@ -23,7 +23,7 @@
Vue.use(qs);
Vue.use(api);

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

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

 src/view/index.vue

@@ -358,12 +358,6 @@
                                u: ""
                            },
                            {
                                k: 16,
                                v: "ååç®¡ç",
                                i: "font icon-shouye",
                                u: ""
                            },
                            {
                                k: 17,
                                v: "åæååºå",
                                i: "font icon-shouye",
@@ -413,7 +407,7 @@
                            },
                            {
                                k: 6,
                                v: "æåæ£éª",
                                v: "äº§åæ£éª",
                                i: "font icon-shouye",
                                u: "finishedProductInspection"
                            },
@@ -472,12 +466,6 @@
                                u: "record-content"
                            },
                            {
                                k: 24,
                                v: "èªæ£é¡¹ç®ç»´æ¤",
                                i: "font icon-shouye",
                                u: "self-inspection"
                            },
                            {
                                k: 25,
                                v: "ææ¯ææ ç»´æ¤",
                                i: "font icon-shouye",
@@ -500,12 +488,6 @@
                                v: "ç©ææ¸åç»´æ¤",
                                i: "font icon-shouye",
                                u: "mbom"
                            },
                            {
                                k: 30,
                                v: "çäº§å·¥èºç»´æ¤",
                                i: "font icon-shouye",
                                u: "equipmentmaintain"
                            }
                        ]
                    }

			@@ -6,7 +6,7 @@
			<meta http-equiv="Expires" CONTENT="0">
			<meta http-equiv="Cache-Control" CONTENT="no-cache">
			<meta http-equiv="Pragma" CONTENT="no-cache">
			<title>ä¸å¤©æµ·æ´MOM</title>
			<title>ä¸å¤©æµ·æ´MES</title>
			<link rel="icon" type="image/x-icon" href="./static/img/logo.png">
			</head>
			<body>

			@@ -188,7 +188,8 @@
			synchronization: "sale/synchronization",//åæ¥
			updateSaleById: "sale/updateSaleById", //æ ¹æ®éå®åidä¿®æ¹è¯¦æä¿¡æ¯
			delSale: "sale/delSale", //æ ¹æ®éå®åidå é¤
			delAllSale: "sale/delAllSale", //æ¹éå é¤éå®å
			delAllSale: "sale/delAllSale", //æ¹éå é¤éå®åï¼
			chooseType: "technologyTemplate/chooseType", //æ¥è¯¢ç±»å
			}

			@@ -35,7 +35,6 @@
			</el-form-item>
			</el-col>
			</el-row>

			<el-row>
			<el-col :span="11">
			<el-form-item label="é¡¹ç®ç»">
			@@ -48,7 +47,6 @@
			</el-form-item>
			</el-col>
			</el-row>

			<el-form-item label="åä½">
			<el-input v-model="form.name" placeholder="è¯·è¾å¥åä½" style="width: 220px;"></el-input>
			</el-form-item>
			@@ -63,17 +61,8 @@
			<span>ç±»åï¼</span>
			<el-select v-model="search.type" size="small" placeholder="è¯·éæ©" @change="TYpe"
			style="width: 224px;margin-right: 30px;">
			<el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
			<el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
			<el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
			<el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
			<el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
			</el-select>
			<!-- <span>å·¥åºï¼</span>
			<el-select v-model="search.name" size="small" placeholder="è¯·éæ©" style="width: 224px;margin-right: 30px;">
			<el-option v-for="(a, ai) in process" key="ai" :label="a.name" :value="a.id"></el-option>
			</el-select>
			<el-button size="mini"><span>é ç½®</span></el-button>
			<el-button size="mini" type="primary" style="background: #004EA2;"><span>æ¥è¯¢</span></el-button> -->
			</div>
			<div class="thing">
			<!-- ä¸»ä½å·¦ -->
			@@ -85,21 +74,15 @@
			<div class="custom-tree-node" slot-scope="{ node, data }">
			<span><i :class="`node_i ${data.code != '[2]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
			{{data.code}} {{ data.name }}</span>
			<!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
			<i class="el-icon-delete"></i>
			</el-button> -->
			</div>
			</el-tree>
			</div>
			<!-- ä¸»ä½å³ -->
			<div class="right">
			<el-table :data="tableData" style="width: 100%;overflow-y: auto;min-height: 100%"
			max-height="100%" row-key="name" border
			@select-all="selectAll"
			@select="selectTr"
			ref="multipleTable"
			@selection-change="handleSelectionChange"
			default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
			<el-table :data="tableData" style="width: 100%;overflow-y: auto;min-height: 100%" max-height="100%"
			row-key="name" border @select-all="selectAll" @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>
			<el-table-column type="index" width="50">
			@@ -129,17 +112,13 @@
			<div>
			<el-dialog title="ç¼è¾ææ¯åå®¹" :visible.sync="upDia" width="500px">
			<div class="body">

			<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">
			<template>
			<el-select v-model="edit.type" disabled placeholder="è¯·éæ©" @change="TYpe"
			style="width: 306px;margin-right: 30px;">
			<el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
			<el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
			<el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
			<el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
			<el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
			</el-select>
			</template>
			</el-col>
			@@ -201,10 +180,7 @@
			<template>
			<el-select v-model="form.type" size="small" placeholder="è¯·éæ©" @change="edittype"
			style="width: 98%;margin-right: 30px;">
			<el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
			<el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
			<el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
			<el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
			<el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
			</el-select>
			</template>
			</el-form-item>
			@@ -212,7 +188,7 @@
			<el-col :span="11">
			<el-form-item label="å·¥åº">
			<template>
			<el-select v-model="form.work" placeholder="è¯·éæ©" allow-create filterable @change="workevent">
			<el-select v-model="form.work" placeholder="è¯·éæ©" @change="workevent">
			<el-option v-for="(item,index) in process" :key="item.name" :label="item.name"
			:value="item.name">
			</el-option>
			@@ -223,7 +199,7 @@
			<el-col :span="11" :offset="2">
			<el-form-item label="å·¥èº">
			<template>
			<el-select v-model="form.name" style="width: 95%;" placeholder="è¯·éæ©" @change="craftrow" allow-create filterable>
			<el-select v-model="form.name" style="width: 95%;" placeholder="è¯·éæ©" @change="craftrow">
			<el-option v-for="item in craftapi" :key="item.id" :label="item.name" :value="item.id">
			</el-option>
			</el-select>
			@@ -231,7 +207,6 @@
			</el-form-item>
			</el-col>
			</el-row>

			<el-row>
			<el-col :span="11">
			<el-form-item label="é¡¹ç®ç»">
			@@ -240,23 +215,6 @@
			<el-option v-for="item in higherlevel" :key="item" :label="item" :value="item">
			</el-option>
			</el-select>
			<!-- <el-autocomplete
			popper-class="my-autocomplete"
			v-model="form.father"
			:fetch-suggestions="higherlevel"
			placeholder="è¯·è¾å¥åå®¹"
			@select="electadd">
			<i
			class="el-icon-edit el-input__icon"
			slot="suffix"
			@click="handleIconClick">
			</i>
			<template slot-scope="{ item }">
			<div class="name">{{ item }}</div>
			<span class="addr">{{ item}}</span>
			</template>
			</el-autocomplete> -->

			</template>
			</el-form-item>
			</el-col>
			@@ -266,7 +224,6 @@
			</el-form-item>
			</el-col>
			</el-row>

			<el-form-item label="åä½">
			<el-input v-model="form.unit" placeholder="è¯·è¾å¥åä½" style="width: 35.95%;"></el-input>
			</el-form-item>
			@@ -289,7 +246,6 @@
			type:0,
			technology:null,
			},
			// handleClose:[],
			checkTreeNode :{
			id:'',
			},
			@@ -322,17 +278,24 @@
			name:'',
			unit:'',
			id:'',

			},
			isAllSelect:false,
			bigType: []
			}

			},
			mounted() {
			this.selectAllleft()
			this.selectAllright()
			this.chooseType()
			},
			methods:{
			chooseType() {
			this.$axios.get(this.$api.url.chooseType).then(res => {
			this.bigType = res.data
			this.typeselect = res.data[0]
			this.search.type = res.data[0]
			this.selectAllleft()
			this.selectAllright()
			})
			},
			handleSelectionChange(val) {
			this.selects = val;
			this.deleteList = [];

			@@ -3,9 +3,10 @@
			<div v-if="!showAdd&&!showLook&&!showUp" class="rawPage">
			<div class="title">
			<el-row>
			<el-col :span="12">æåæ£éª</el-col>
			<el-col :span="12">äº§åæ£éª</el-col>
			<el-col :span="12" style="text-align: right;">
			<el-button @click="handleAddNew" type="primary" size="mini" icon="el-icon-plus" style="background: #004EA2; ">æ°å¢</el-button>
			<el-button @click="handleAddNew" type="primary" size="mini" icon="el-icon-plus"
			style="background: #004EA2; ">æ°å¢</el-button>
			<el-button icon="el-icon-delete" size="mini">å é¤</el-button>
			<el-button icon="el-icon-download" size="mini">å¯¼åº</el-button>
			</el-col>
			@@ -19,110 +20,51 @@
			<el-option :value="0" label="ä¸åæ ¼"></el-option>
			</el-select>
			<span>äº§ååç§°ï¼</span>
			<el-input v-model="searchData.material" size="small" placeholder="è¯·è¾å¥äº§ååç§°" style="width: 224px;margin-right: 52px;"></el-input>
			<el-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>
			<el-button size="mini" type="primary" @click="getInspectionTableData" style="background: #004EA2;"><span>æ¥
			è¯¢</span></el-button>
			</div>
			<div class="content-body">
			<div class="inspectionTable">
			<el-table
			ref="inspectionTable"
			height="620"
			:cell-style="{textAlign: 'center'}"
			<el-table ref="inspectionTable" height="620" :cell-style="{textAlign: 'center'}"
			:header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
			:data="inspectionTable"
			style="width: 100%"
			>
			<el-table-column
			type="selection"
			width="50">
			:data="inspectionTable" style="width: 100%">
			<el-table-column type="selection" width="50">
			</el-table-column>
			<el-table-column
			prop="order_number"
			label="è®¢åå·"
			min-width="100"
			/>
			<el-table-column
			prop="customer_name"
			label="å®¢æ·åç§°"
			min-width="80"
			/>
			<el-table-column
			prop="project_name"
			label="å·¥ç¨åç§°"
			min-width="80"
			/>
			<el-table-column
			prop="quality_traceability"
			label="è´¨éè¿½æº¯å·"
			min-width="108"
			/>
			<el-table-column
			prop="material_code"
			label="äº§åç¼ç "
			min-width="100"
			/>
			<el-table-column
			prop="material"
			label="äº§åå¤§ç±»"
			min-width="72"
			/>
			<el-table-column
			prop="specifications_model"
			label="è§æ ¼åå·"
			min-width="110"
			/>
			<el-table-column
			prop="unit"
			label="åä½"
			min-width="50"
			/>
			<el-table-column
			prop="quantity"
			label="æ°é"
			min-width="50"
			/>
			<el-table-column
			prop="detectionPeriod"
			label="æ£éªæ¥æ"
			min-width="80"
			/>
			<el-table-column
			prop="result"
			label="æ£æµç»æ"
			min-width="80"
			>
			<el-table-column prop="order_number" label="è®¢åå·" min-width="100" />
			<el-table-column prop="customer_name" label="å®¢æ·åç§°" min-width="80" />
			<el-table-column prop="project_name" label="å·¥ç¨åç§°" min-width="80" />
			<el-table-column prop="quality_traceability" label="è´¨éè¿½æº¯å·" min-width="108" />
			<el-table-column prop="material_code" label="äº§åç¼ç " min-width="100" />
			<el-table-column prop="material" label="äº§åå¤§ç±»" min-width="72" />
			<el-table-column prop="specifications_model" label="è§æ ¼åå·" min-width="110" />
			<el-table-column prop="unit" label="åä½" min-width="50" />
			<el-table-column prop="quantity" label="æ°é" min-width="50" />
			<el-table-column prop="detectionPeriod" label="æ£éªæ¥æ" min-width="80" />
			<el-table-column prop="result" label="æ£æµç»æ" min-width="80">
			<template slot-scope="scope">
			<span style="color: #34BD66;" v-if="scope.row.result === 1">åæ ¼</span>
			<span style="color: #E84738;" v-else-if="scope.row.result === 0">ä¸åæ ¼</span>
			<span v-else-if="scope.row.result === null \|\| scope.row.result === undefined">ææªç»è®º</span>
			</template>
			</el-table-column>


			<el-table-column
			label="æä½"
			min-width="80"
			>
			<el-table-column label="æä½" min-width="80">
			<template slot-scope="scope">
			<el-button type="text" size="small" @click="goToDetail(scope.row)">æ¥ç</el-button>
			<el-button type="text" size="small">æå°</el-button>
			<el-button v-if="scope.row.result == null" type="text" size="small" @click="goUp(scope.row)">ç¼è¾</el-button>
			<el-button v-if="scope.row.result == null" type="text" size="small"
			@click="goUp(scope.row)">ç¼è¾</el-button>
			</template>
			</el-table-column>
			</el-table>
			</div>
			<!-- åé¡µå¨ -->
			<div class="pagination">
			<el-pagination
			:current-page="pageParams.pageSize"
			:page-sizes="[10, 50, 100, 200]"
			:page-size="pageParams.countSize"
			layout="total, sizes, prev, pager, next, jumper"
			:total="pageParams.total"
			@size-change="handleSizeChange"
			@current-change="handleCurrentChange"
			/>
			<el-pagination :current-page="pageParams.pageSize" :page-sizes="[10, 50, 100, 200]"
			:page-size="pageParams.countSize" layout="total, sizes, prev, pager, next, jumper" :total="pageParams.total"
			@size-change="handleSizeChange" @current-change="handleCurrentChange" />
			</div>
			</div>
			</div>
			@@ -133,51 +75,65 @@
			<el-col :span="12">æ°å¢æåæ£éªå</el-col>
			<el-col :span="12" style="text-align: right;">
			<!-- ç¹å»è¿åï¼å½åé¡µé¢å¼ä¸ºfalse -->
			<el-button @click="()=>{showAddPage = false;showDetail = false}" type="primary" size="mini" icon="el-icon-back" style="background: #004EA2; ">è¿å</el-button>
			<el-button @click="()=>{showAddPage = false;showDetail = false}" type="primary" size="mini"
			icon="el-icon-back" style="background: #004EA2; ">è¿å</el-button>
			</el-col>
			</el-row>
			<el-form :model="addInspectionform" ref="addInspectionform" class="addInspectionform" label-position="right" label-width="100px" size="mini" >
			<el-form :model="addInspectionform" ref="addInspectionform" class="addInspectionform" label-position="right"
			label-width="100px" size="mini">
			<div class="formwrapper">
			<el-row>
			<el-col :span="7">
			<el-form-item label="è®¢åå·ï¼">
			<el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.number" placeholder="è¯·è¾å¥è®¢åå·" autocomplete="off" />
			<el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.order_number" placeholder="è¯·è¾å¥è®¢åå·1" autocomplete="off" />
			<el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.number"
			placeholder="è¯·è¾å¥è®¢åå·" autocomplete="off" />
			<el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.order_number"
			placeholder="è¯·è¾å¥è®¢åå·1" autocomplete="off" />
			</el-form-item>
			</el-col>
			<el-col :span="7">
			<el-form-item label="å®¢æ·åç§°ï¼">
			<el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.username" placeholder="è¯·è¾å¥å®¢æ·åç§°" autocomplete="off" />
			<el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.customer_name" placeholder="è¯·è¾å¥å®¢æ·åç§°" autocomplete="off" />
			<el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.username"
			placeholder="è¯·è¾å¥å®¢æ·åç§°" autocomplete="off" />
			<el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.customer_name"
			placeholder="è¯·è¾å¥å®¢æ·åç§°" autocomplete="off" />
			</el-form-item>
			</el-col>
			<el-col :span="7">
			<el-form-item label="å·¥ç¨åç§°ï¼">
			<el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.projectname" placeholder="è¯·è¾å¥å·¥ç¨åç§°" autocomplete="off" />
			<el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.project_name" placeholder="è¯·è¾å¥å·¥ç¨åç§°" autocomplete="off" />
			<el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.projectname"
			placeholder="è¯·è¾å¥å·¥ç¨åç§°" autocomplete="off" />
			<el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.project_name"
			placeholder="è¯·è¾å¥å·¥ç¨åç§°" autocomplete="off" />
			</el-form-item>
			</el-col>
			</el-row>
			<el-row >
			<el-col :span="7">
			<el-form-item label="è´¨éè¿½æº¯å·ï¼" >
			<el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.tracenumber" placeholder="è¯·è¾å¥è¿½æº¯å·" autocomplete="off" />
			<el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.quality_traceability" placeholder="è¯·è¾å¥è¿½æº¯å·" autocomplete="off" />
			<el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.tracenumber"
			placeholder="è¯·è¾å¥è¿½æº¯å·" autocomplete="off" />
			<el-input v-show="showDetail !== false" style="width: 180px;"
			v-model="finishedInsInfo.quality_traceability" placeholder="è¯·è¾å¥è¿½æº¯å·" autocomplete="off" />
			</el-form-item>
			</el-col>
			<el-col :span="7">
			<el-form-item label="äº§åç¼ç ï¼">
			<el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.material_code" placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />
			<el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.material_code" placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />
			<el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.material_code"
			placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />
			<el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.material_code"
			placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />
			</el-form-item>
			</el-col>
			<el-col :span="7">
			<el-form-item label="äº§ååç§°ï¼">
			<el-select v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.class" size="small" placeholder="è¯·éæ©äº§ååç§°">
			<el-select v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.class"
			size="small" placeholder="è¯·éæ©äº§ååç§°">
			<el-option value="éé¡¹1"></el-option>
			<el-option value="éé¡¹2"></el-option>
			</el-select>
			<el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.material" placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />
			<el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.material"
			placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />

			</el-form-item>
			</el-col>
			@@ -185,26 +141,32 @@
			<el-row >
			<el-col :span="7">
			<el-form-item label="è§æ ¼åå·ï¼" >
			<el-select v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.specificationmodel" size="small" placeholder="è¯·éæ©è§æ ¼åå·">
			<el-select v-show="showDetail == false" style="width: 180px;"
			v-model="addInspectionform.specificationmodel" size="small" placeholder="è¯·éæ©è§æ ¼åå·">
			<el-option value="éé¡¹1"></el-option>
			<el-option value="éé¡¹2"></el-option>
			</el-select>
			<el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.specifications_model" placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />
			<el-input v-show="showDetail !== false" style="width: 180px;"
			v-model="finishedInsInfo.specifications_model" placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />
			</el-form-item>
			</el-col>
			<el-col :span="7">
			<el-form-item label="åä½ï¼" >
			<el-select v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.unit" size="small" placeholder="è¯·éæ©åä½">
			<el-select v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.unit"
			size="small" placeholder="è¯·éæ©åä½">
			<el-option value="éé¡¹1"></el-option>
			<el-option value="éé¡¹2"></el-option>
			</el-select>
			<el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.specifications_model" placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />
			<el-input v-show="showDetail !== false" style="width: 180px;"
			v-model="finishedInsInfo.specifications_model" placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />
			</el-form-item>
			</el-col>
			<el-col :span="7">
			<el-form-item label="æ°éï¼">
			<el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.quantity" placeholder="è¯·è¾å¥æ°é" autocomplete="off" />
			<el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.quantity" placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />
			<el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.quantity"
			placeholder="è¯·è¾å¥æ°é" autocomplete="off" />
			<el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.quantity"
			placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />

			</el-form-item>
			</el-col>
			@@ -212,7 +174,8 @@
			<el-row >
			<el-col v-show="showDetail !== false" :span="7">
			<el-form-item label="ä¸»æºå·¥ï¼" >
			<el-input style="width: 180px;" v-model="finishedInsInfo.name" placeholder="è¯·è¾å¥äº§åç¼ç " autocomplete="off" />
			<el-input style="width: 180px;" v-model="finishedInsInfo.name" placeholder="è¯·è¾å¥äº§åç¼ç "
			autocomplete="off" />
			</el-form-item>
			</el-col>
			</el-row>
			@@ -274,7 +237,11 @@
			import finishedProductInspectionUp from '@/components/view/finishedProductInspectionUp'
			import finishedProductInspectionLook from '@/components/view/finishedProductInspectionLook'
			export default {
			components: { finishedProductInspectionAdd,finishedProductInspectionUp, finishedProductInspectionLook},
			components: {
			finishedProductInspectionAdd,
			finishedProductInspectionUp,
			finishedProductInspectionLook
			},
			data(){
			return {
			searchData:{
			@@ -283,8 +250,7 @@
			},
			// ä¸»æºå·¥ä¸ææ¡
			usernameOptions:[],
			inspectionTable:[
			],
			inspectionTable: [],
			rowInfo:{},
			pageParams:{
			countSize: 10, //æ¯é¡µæ°é
			@@ -349,7 +315,17 @@
			this.showAdd=true
			},
			async getInspectionTableData() {
			const {data:{row,total}} = await this.$axios.get(this.$api.url.finishedInsListPage,{params:{...this.pageParams,...this.searchData}})
			const {
			data: {
			row,
			total
			}
			} = await this.$axios.get(this.$api.url.finishedInsListPage, {
			params: {
			...this.pageParams,
			...this.searchData
			}
			})
			this.inspectionTable = row
			this.pageParams.total = total
			},
			@@ -386,68 +362,83 @@
			padding: 12px;

			}

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

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

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

			.inspectionTable{
			padding: 20px 20px;
			}

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

			.newPage{
			overflow: hidden;
			}

			.header{
			padding: 12px;
			}

			.addInspectionform{
			background-color: #fff;
			}

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

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

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

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

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

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

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

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

			</style>

			@@ -18,10 +18,7 @@
			<el-form-item label="ç±»å:">
			<el-select v-model="search.type" size="small" placeholder="è¯·éæ©"
			style="width: 224px;margin-right: 30px;">
			<el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
			<el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
			<el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
			<el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
			<el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
			</el-select>
			</el-form-item>
			</el-col>
			@@ -53,11 +50,6 @@
			<el-table border :data="tableapi" height="calc(80vh - 250px)" style="width: 100%">
			<el-table-column type="index" label="åºå·" width="70">
			</el-table-column>
			<!-- <el-table-column prop="date" label="ä¾åºååç§°" width="180">
			<template slot-scope="scope">
			<el-input v-model="scope.row.supplier" placeholder=""></el-input>
			</template>
			</el-table-column> -->
			<el-table-column prop="" label="è´¨éè¿½æº¯å·" width="180">
			<template slot-scope="scope">
			<el-input v-model="scope.row.qualityTraceability" placeholder=""></el-input>
			@@ -91,31 +83,19 @@
			<span>ç±»åï¼</span>
			<el-select v-model="search.type" size="small" @change="TYpe" placeholder="è¯·éæ©"
			style="width: 224px;margin-right: 30px;">
			<el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
			<el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
			<el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
			<el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
			<el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
			</el-select>
			<!-- <span>åææåç§°ï¼</span>
			<el-select v-model="search.name" size="small" placeholder="è¯·éæ©" style="width: 224px;margin-right: 30px;">
			<el-option v-for="(a, ai) in process" key="ai" :label="a.name" :value="a.id"></el-option>
			</el-select>
			<el-button size="mini"><span>é ç½®</span></el-button>
			<el-button size="mini" type="primary" style="background: #004EA2;"><span>æ¥è¯¢</span></el-button> -->
			</div>
			<div class="thing">
			<div class="left">
			<el-input v-model="search.technology" @input="query" suffix-icon="el-icon-search" placeholder="è¯·è¾å¥æç´¢åå®¹"
			size="small" clearable></el-input>
			<el-tree :data="list" ref="tree" style="overflow-y: auto;" highlight-current
			<el-tree :data="list" ref="tree" style="overflow-y: auto;padding-top: 8px;" highlight-current
			:props="{children: 'children',label: 'name'}" node-key="name" default-expand-all
			@node-click="handleNodeClick">
			<div class="custom-tree-node" slot-scope="{ node, data }">
			<span><i :class="`node_i ${data.code != '[2]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
			{{data.code}} {{ data.name }}</span>
			<!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
			<i class="el-icon-delete"></i>
			</el-button> -->
			</div>
			</el-tree>
			</div>
			@@ -132,19 +112,12 @@
			</el-table-column>
			<el-table-column label="æä½" width="130">
			<template slot-scope="scope">
			<!-- <span class="table_do" @click="upContent(scope.row)">ç¼è¾      </span> -->
			<span class="table_do" @click="deleteRow(scope.$index, scope.row)">å é¤</span>
			</template>
			</el-table-column>
			</el-table>
			</div>
			</div>
			<!-- <el-dialog title="ç¼è¾è®°å½åå®¹" :visible.sync="upDia" width="500px">
			<div class="body">

			</div>

			</el-dialog> -->
			</div>
			</template>
			<script>
			@@ -173,16 +146,25 @@
			upData: {},
			form: {},
			dialogVisible: false,
			typeselect: 0,
			typeselect: '',
			input: '',
			craftapi: [],
			bigType: []
			}
			},
			mounted() {
			this.selectAllleft()
			this.selectAllMbom()
			this.chooseType()
			},
			methods: {
			chooseType() {
			this.$axios.get(this.$api.url.chooseType).then(res => {
			this.bigType = res.data
			this.typeselect = res.data[0]
			this.search.type = res.data[0]
			this.selectAllleft()
			this.selectAllMbom()
			})
			},
			selectDataList() {
			this.list.forEach(a => {
			a.code = '[1]'
			@@ -257,12 +239,12 @@
			//å·¦è¾¹
			selectAllleft() {
			this.$axios.get(this.$api.url.selectAllleft,{
			params:{type:this.typeselect,
			params: {
			type: this.typeselect,
			message:this.search.technology
			}
			}).then(res => {
			this.list = res.data;
			console.log(this.list);
			this.selectDataList()
			this.$nextTick(() => {
			this.$refs.tree.setCurrentKey(this.list[0].children[0].name) // é»è®¤éä¸èç¹ç¬¬ä¸ä¸ª
			@@ -270,9 +252,7 @@
			let one=this.list.filter(item=>{
			return item.children.length>0
			})[0]
			console.log(one);
			let name=one.children[0].id
			console.log(name);
			this.checkTreeNode.id = name
			this.selectAllMbomStart(name)
			this.selectDataList();
			@@ -284,10 +264,11 @@
			},
			selectAllMbomStart(name) {
			this.$axios.get(this.$api.url.selectAllMbom,{
			params:{id:name}
			params: {
			id: name
			}
			}).then(res => {
			this.tableData = res.data;
			console.log(this.tableData);
			}, {
			headers: {
			"Content-Type": "application/json"
			@@ -302,7 +283,6 @@
			}
			}).then(res => {
			this.tableData = res.data;
			console.log(this.tableData);
			}, {
			headers: {
			"Content-Type": "application/json"
			@@ -311,8 +291,6 @@
			},
			handleNodeClick(data){
			this.checkTreeNode = data
			console.log(data);
			console.log(this.checkTreeNode.id);
			this.selectAllMbom()
			},
			handleClose(done) {
			@@ -363,7 +341,6 @@
			return el.id
			})
			this.delete = cc.join(',')
			console.log(this.delete);
			this.delAllMbom()
			this.$message.success('å é¤å®æ')
			},
			@@ -371,10 +348,7 @@
			this.selects = val;
			},
			deleteRow(index, rows) {
			console.log(rows);
			// this.tableData.splice(index,1)
			this.upData.id = rows.id
			console.log(this.upData);
			this.material(index)
			},

			@@ -25,17 +25,16 @@
			<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" @click="searchPro" 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">
			<el-table ref="inspectionTable" height="calc(100vh - 320px)" :cell-style="{ textAlign: 'center' }"
			:header-cell-style="{
			<el-table ref="inspectionTable" height="calc(100vh - 320px)" :header-cell-style="{
			border: '0px',
			background: '#f5f7fa',
			color: '#606266',
			boxShadow: 'inset 0 1px 0 #ebeef5',
			textAlign: 'center'
			}" border :data="inspectionTable" style="width: 100%">
			<el-table-column type="selection" width="50"> </el-table-column>
			<el-table-column label="åºå·" type="index" width="60"></el-table-column>
			@@ -46,21 +45,23 @@
			<el-table-column prop="techname" label="å·¥èºåç§°" min-width="70" />
			<el-table-column prop="unit" label="åä½" min-width="50" />
			<el-table-column prop="quantity" label="æ°é" min-width="50" />
			<el-table-column prop="createTime" label="æ¥æ£æ¥æ" min-width="60" />
			<el-table-column prop="createTime" label="æ¥æ£æ¥æ" min-width="70" />
			<el-table-column prop="name" label="æ¥æ£äºº" min-width="50" />
			<el-table-column prop="updateTime" label="æ£æµæ¥æ" min-width="60" />
			<el-table-column prop="result" label="åæ ¼ç¶æ" min-width="80">
			<el-table-column prop="updateTime" label="æ£æµæ¥æ" min-width="70" />
			<el-table-column prop="result" label="åæ ¼ç¶æ" min-width="60">
			<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>
			</template>
			</el-table-column>
			<el-table-column label="æä½" min-width="80">
			<el-table-column label="æä½" min-width="75">
			<template slot-scope="scope">
			<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 type="text" size="small" @click="handleClick(scope.row)" style="margin-left: 0;"><span
			style="font-size: 8px;">è¯¦æ</span></el-button>
			<el-button type="text" size="small" style="margin-left: 0;"><span
			style="font-size: 8px;">æ¥ç</span></el-button>
			<el-button v-if="scope.row.result == null" type="text" size="small" style="margin-left: 0;"
			@click="updateInsInfo(scope.row)">ç¼è¾</el-button>
			@click="updateInsInfo(scope.row)"><span style="font-size: 8px;">ç¼è¾</span></el-button>
			</template>
			</el-table-column>
			</el-table>
			@@ -68,8 +69,8 @@
			<!-- åé¡µå¨ -->
			<div class="pagination">
			<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" />
			layout="total, sizes, prev, pager, next, jumper" :total="inspectionTableTotal"
			@size-change="handleSizeChange" @current-change="handleCurrentChange" />
			</div>
			</div>
			</div>
			@@ -98,9 +99,10 @@
			</el-col>
			<el-col :span="7">
			<el-form-item label="äº§ååç§°ï¼">
			<el-select style="width: 210px;" size="small" @change="selectSample" v-model="processInspectVo.material"
			placeholder="è¯·éæ©äº§å">
			<el-option v-for="item in optionsSamplename" :key="item.value" :label="item.name" :value="item.name">
			<el-select style="width: 210px;" size="small" @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>
			@@ -148,7 +150,8 @@
			</el-col>
			<el-col :span="7">
			<el-form-item label="æ°éï¼">
			<el-input style="width: 210px;" size="small" v-model="processInspectVo.quantity" placeholder="è¯·è¾å¥æ°é" />
			<el-input style="width: 210px;" size="small" v-model="processInspectVo.quantity"
			placeholder="è¯·è¾å¥æ°é" />
			</el-form-item>
			</el-col>
			<el-col :span="10" style="display: flex;justify-content: end;">
			@@ -192,21 +195,16 @@
			</el-table-column>
			<el-table-column prop="dname" label="è¯éªè®¾å¤" min-width="100">
			<template slot-scope="scope">
			<el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
			scope.row.dname == null ? "è¯·éæ©" : scope.row.dname
			<el-button type="text" @click="clickTableSelect(scope)">{{
			scope.row.deviceId == null ? "è¯·éæ©" : scope.row.deviceName
			}}</el-button>
			<el-select v-if="scope.row.isSelectDevice" style="width: 100%;" @change="clickNodeSure(scope.row)"
			v-model="filterText" placeholder="è¯·éæ©">
			<el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
			</el-option>
			</el-select>
			</template>
			</el-table-column>
			<el-table-column label="ç»è®º">
			<template slot-scope="scope">
			<span style="color: #34BD66;" v-if="scope.row.result === 1">åæ ¼</span>
			<span style="color: #E84738;" v-else-if="scope.row.result === 0">ä¸åæ ¼</span>
			<span v-show="scope.row.result === null">ææªç»è®º</span>
			<span v-show="scope.row.result === null">{{null}}</span>
			</template>
			</el-table-column>
			<!-- <el-table-column v-if="detailId == null" label="æä½" width="100">
			@@ -248,7 +246,10 @@
			import processInspectionUpdate from '../view/processInspectionUpdate.vue'
			import processInspectionLook from '../view/processInspectionLook.vue'
			export default {
			components: { processInspectionUpdate, processInspectionLook },
			components: {
			processInspectionUpdate,
			processInspectionLook
			},
			data() {
			return {
			showUp: false,
			@@ -289,8 +290,7 @@
			unit: null
			},
			InspectioniD: null,
			addInspectionform: [
			{
			addInspectionform: [{
			number: "",
			username: "",
			projectname: "",
			@@ -303,18 +303,15 @@
			group: "",
			worker: "",
			machine: ""
			}]
			,
			}],
			inspectionItems: [], // æ°å¢æ£éªé¡¹ç®è¡¨æ ¼
			inspectionResultForm: [
			{
			inspectionResultForm: [{
			id: "",
			name: "",
			inspecter: "",
			conclusion: "",
			operation: ""
			}
			],
			}],
			options: [],
			value: "",
			rowList: [],
			@@ -406,10 +403,7 @@
			},
			// ç¹å»è¡¨æ ¼éæ©è§¦å
			clickTableSelect(scope) {
			// this.centerDialogVisible = true;
			if (this.clickSelectDevice.index != null) {
			this.$set(this.inspectionItems[this.clickSelectDevice.index], 'isSelectDevice', false)
			}
			this.centerDialogVisible = true;
			this.clickSelectDevice.index = scope.$index;
			this.clickSelectDevice.rpId = scope.row.id;
			this.getOptions(scope.row)
			@@ -469,7 +463,9 @@
			inspectionItemId: row.id,
			inspectionValue: str.slice(0, -1)
			}, {
			headers: { "Content-Type": "application/json" }
			headers: {
			"Content-Type": "application/json"
			}
			}).then(res => {
			if (res.message === 'åæ§å¼è¾å¥æ ¼å¼æé®é¢!') {
			this.$message({
			@@ -493,7 +489,12 @@
			this.search.countSize = val;
			this.defaultInitializationTable();
			},
			handleSpanMethod({ row, column, rowIndex, columnIndex }) {
			handleSpanMethod({
			row,
			column,
			rowIndex,
			columnIndex
			}) {
			if (columnIndex === 0) {
			const _row = this.spanArr[rowIndex];
			const _col = _row > 0 ? 1 : 0;
			@@ -554,7 +555,9 @@
			techId: Number(val.technologyId),
			unit: val.unit
			}, {
			headers: { "Content-Type": "application/json" }
			headers: {
			"Content-Type": "application/json"
			}
			}).then(res => {
			if (res.code === 201) {
			this.$message({
			@@ -690,8 +693,7 @@
			},
			// å é¤æ£éªå¼å
			clickDeleteInspectionColumn() {
			if (this.empiricalValueAdd - 1 === 0) {
			} else {
			if (this.empiricalValueAdd - 1 === 0) {} else {
			if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
			this.empiricalValueAdd = this.empiricalValueAdd - 1;
			this.inspectionItems.forEach(i => {

			@@ -6,8 +6,6 @@
			<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>
			@@ -26,31 +24,29 @@
			<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 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-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-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-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>
			@@ -59,8 +55,8 @@
			</el-col>
			<el-col :span="7">
			<el-form-item label="å·¥èºåç§°ï¼">
			<el-select v-model="processInspectVo.techname" disabled placeholder="è¯·éæ©"
			style="width: 210px;" size="small">
			<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>
			@@ -93,8 +89,7 @@
			<el-col :span="12" class="inspectionProject_span">æ£éªé¡¹ç®</el-col>
			<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>
			<el-button style="margin-right: 30px;" size="mini" @click="clickAddInspectionColumn()">æ·»å æ£éªå¼å</el-button>
			<!-- <el-button
			size="mini"
			style="margin-right: 30px;"
			@@ -124,15 +119,9 @@
			<el-table-column prop="dname" label="è¯éªè®¾å¤" min-width="100">
			<template slot-scope="scope">
			<el-col>
			<el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
			scope.row.dname == null ? "è¯·éæ©" : scope.row.dname
			}}</el-button>
			<el-select @blur="blurNode(scope)" v-else-if="scope.row.isSelectDevice" style="width: 100%;"
			@change="clickNodeSure(scope.row)" v-model="filterText" placeholder="è¯·éæ©">
			<el-option v-for="item in materialOptions" :key="item.id" :label="item.device"
			:value="item.id">
			</el-option>
			</el-select>
			<el-button type="text" @click="clickTableSelect(scope)">
			{{scope.row.dname == null ? "è¯·éæ©" : scope.row.dname}}
			</el-button>
			</el-col>
			</template>
			</el-table-column>
			@@ -140,7 +129,7 @@
			<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>
			<span v-show="scope.row.result === null">{{null}}</span>
			</template>
			</el-table-column>
			<!-- <el-table-column v-if="detailId == null" label="æä½" width="100">
			@@ -174,15 +163,19 @@
			</div>
			<el-dialog title="è¯·éæ©è®¾å¤" :visible.sync="centerDialogVisible" width="20%">
			<div class="div_device_dialog">
			<!-- <el-select style="width: 100%;" @change="clickNodeSure()" v-model="filterText" placeholder="è¯·éæ©">
			<el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
			</el-option>
			</el-select> -->
			<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>
			<!-- <span slot="footer" class="dialog-footer">
			</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> -->
			</span>
			</el-dialog>
			</div>
			</template>
			@@ -228,8 +221,7 @@
			unit: null
			},
			InspectioniD: null,
			addInspectionform: [
			{
			addInspectionform: [{
			number: "",
			username: "",
			projectname: "",
			@@ -242,18 +234,15 @@
			group: "",
			worker: "",
			machine: ""
			}]
			,
			}],
			inspectionItems: [], // æ°å¢æ£éªé¡¹ç®è¡¨æ ¼
			inspectionResultForm: [
			{
			inspectionResultForm: [{
			id: "",
			name: "",
			inspecter: "",
			conclusion: "",
			operation: ""
			}
			],
			}],
			options: [],
			value: "",
			rowList: [],
			@@ -355,7 +344,6 @@
			},
			handleClick() { },
			updateInsInfo(row) {
			console.log(row);
			this.row = row
			this.showUp = true
			},
			@@ -370,7 +358,6 @@
			},
			// è·åè®¾å¤æ åå®¹
			getOptions(row) {
			this.filterText = 0
			this.$axios.get(this.$api.url.inspectionItemChooseDev, {
			params: {
			father: row.father,
			@@ -387,7 +374,6 @@
			return
			}
			row.isSelectDevice = true
			this.filterText = row.did
			});
			},
			//è¿å
			@@ -396,52 +382,34 @@
			},
			// ç¹å»è¡¨æ ¼éæ©è§¦å
			clickTableSelect(scope) {
			// return scope;
			// this.centerDialogVisible = true;
			if (this.clickSelectDevice.index != null) {
			this.$set(this.inspectionItems[this.clickSelectDevice.index], 'isSelectDevice', false)
			}
			this.centerDialogVisible = true;
			this.clickSelectDevice.index = scope.$index;
			this.clickSelectDevice.rpId = scope.row.id;
			this.getOptions(scope.row);
			},
			// ç¹å»æ éé¢çç¡®å®
			clickNodeSure(row) {
			console.log(row);
			let select = this.materialOptions.filter(item => {
			return item.id === this.filterText
			})[0]
			this.nodeData.id = select.id
			this.nodeData.name = select.device
			this.$axios
			.post(this.$api.url.inspectionItemUpdateDevByInsId, {
			id: this.clickSelectDevice.rpId,
			type: 1,
			devId: this.nodeData.id
			})
			.then(res => {
			row.isSelectDevice = false
			console.log("row", row);
			this.filterText = 0
			this.getTableData()
			clickNodeSure() {
			if (this.detailId == null) {
			this.projectTable[this.clickSelectDevice.index].deviceId = this.nodeData.id;
			this.projectTable[this.clickSelectDevice.index].deviceName = this.nodeData.name;
			this.centerDialogVisible = false;
			} else {
			this.$axios.post(this.$api.url.inspectionItemUpdateDevByInsId, {
			id: this.clickSelectDevice.rpId,
			devId: this.nodeData.id,
			type: 1
			}).then(res => {
			this.centerDialogVisible = false;
			this.inspectionItems.forEach(a=>{
			if(a.id == this.clickSelectDevice.rpId){
			a.dname = this.nodeData.name
			}
			})
			});
			}
			},
			changeState(row, index) {
			if (row.did != null && row.did != '') {
			// let val = row.empiricalValueAddss.filter(item => {
			// return item != '' && item != null
			// })
			// let eq = val.filter(item => {
			// return /^[^><=]/.test(item)
			// })
			// if (eq.length > 0) {
			// this.$message({
			// message: "æ£æµå¼[" + eq + "]æ ¼å¼é¦ä½åºåå«>,<æè=",
			// type: 'warning'
			// });
			// return
			// }
			let str = ""
			row.empiricalValueAddss.forEach(e => {
			str += e + ","
			@@ -454,7 +422,9 @@
			inspectionItemId: row.id,
			inspectionValue: str.slice(0, -1)
			}, {
			headers: { "Content-Type": "application/json" }
			headers: {
			"Content-Type": "application/json"
			}
			}).then(res => {
			row.result = res.data.result
			row.username = res.data.username
			@@ -471,7 +441,12 @@
			this.search.countSize = val;
			this.defaultInitializationTable();
			},
			handleSpanMethod({ row, column, rowIndex, columnIndex }) {
			handleSpanMethod({
			row,
			column,
			rowIndex,
			columnIndex
			}) {
			if (columnIndex === 0) {
			const _row = this.spanArr[rowIndex];
			const _col = _row > 0 ? 1 : 0;
			@@ -532,7 +507,9 @@
			technologyId: val.technologyId,
			unit: val.unit
			}, {
			headers: { "Content-Type": "application/json" }
			headers: {
			"Content-Type": "application/json"
			}
			}).then(res => {
			if (res.code === 201) {
			this.$message({
			@@ -583,7 +560,6 @@
			}
			uName.push(c['username'])
			c.isSelectDevice = false
			this.filterText = 0
			arr.push(c)
			})
			})
			@@ -680,8 +656,7 @@
			},
			// å é¤æ£éªå¼å
			clickDeleteInspectionColumn() {
			if (this.empiricalValueAdd - 1 === 0) {
			} else {
			if (this.empiricalValueAdd - 1 === 0) {} else {
			if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
			this.empiricalValueAdd = this.empiricalValueAdd - 1;
			this.inspectionItems.forEach(i => {

			@@ -82,74 +82,36 @@
			<el-row>
			<el-col :span="12" style="line-height: 32px;">åæææ£éª</el-col>
			<el-col :span="12" style="text-align: right;">
			<el-button
			type="primary"
			icon="el-icon-plus"
			style="background: #004EA2;"
			@click="goDetail(null)"
			>æ°å¢</el-button
			>
			<el-button type="primary" icon="el-icon-plus" style="background: #004EA2;"
			@click="goDetail(null)">æ°å¢</el-button>
			<el-button icon="el-icon-download">å¯¼åº</el-button>
			</el-col>
			</el-row>
			</div>
			<div class="choose">
			<span>æ¥ææ¥æï¼</span>
			<el-date-picker
			v-model="search.formTime"
			size="small"
			placeholder="è¯·è¾å¥"
			style="width: 13vw;margin-right: 5px;"
			clearable
			value-format="yyyy-MM-dd"
			></el-date-picker>
			<el-date-picker v-model="search.formTime" size="small" placeholder="è¯·è¾å¥" style="width: 13vw;margin-right: 5px;"
			clearable value-format="yyyy-MM-dd"></el-date-picker>
			<span>åææç¼ç ï¼</span>
			<el-input
			v-model="search.code"
			placeholder="è¯·è¾å¥"
			size="small"
			style="width: 13vw;margin-right: 5px;"
			clearable
			></el-input>
			<el-input v-model="search.code" placeholder="è¯·è¾å¥" size="small" style="width: 13vw;margin-right: 5px;"
			clearable></el-input>
			<span>æ£æµç¶æï¼</span>
			<el-select
			v-model="search.insState"
			size="small"
			placeholder="è¯·éæ©"
			style="width: 13vw;margin-right: 5px;"
			>
			<el-select v-model="search.insState" size="small" placeholder="è¯·éæ©" style="width: 13vw;margin-right: 5px;">
			<el-option label="å¨é¨" :value="2"></el-option>
			<el-option label="æªæ£æµ" :value="0"></el-option>
			<el-option label="å·²æ£æµ" :value="1"></el-option>
			</el-select>
			<span>åææåç§°ï¼</span>
			<el-input
			v-model="search.name"
			size="small"
			placeholder="è¯·è¾å¥"
			style="width: 13vw;margin-right: 5px;"
			clearable
			></el-input>
			<el-input v-model="search.name" size="small" placeholder="è¯·è¾å¥" style="width: 13vw;margin-right: 5px;"
			clearable></el-input>
			<el-button size="mini" @click="clean()"><span>é ç½®</span></el-button>
			<el-button
			size="mini"
			type="primary"
			style="background: #004EA2;"
			@click="selectRawInspectsList()"
			><span>æ¥ è¯¢</span></el-button
			>
			<el-button size="mini" type="primary" style="background: #004EA2;" @click="selectRawInspectsList()"><span>æ¥
			è¯¢</span></el-button>
			</div>
			<div class="thing">
			<el-table
			:data="tableData"
			border
			style="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)"
			max-height="calc(100% - 50px)"
			@selection-change="handleSelectionChange"
			default-expand-all
			:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
			row-key="id"
			>
			<el-table :data="tableData" border style="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)"
			max-height="calc(100% - 50px)" @selection-change="handleSelectionChange" default-expand-all
			:tree-props="{ children: 'children', hasChildren: 'hasChildren' }" row-key="id">
			<el-table-column type="selection" width="50"> </el-table-column>
			<el-table-column type="index" label="åºå·" width="70">
			</el-table-column>
			@@ -165,45 +127,27 @@
			<el-table-column prop="createTime" label="æ£éªæ¥æ"> </el-table-column>
			<el-table-column prop="createTime" label="æ£æµç¶æ" width="100">
			<template slot-scope="scope">
			<span style="color: #34BD66;" v-if="scope.row.ins_state == 1"
			>å·²æ£æµ</span
			>
			<span style="color: #E84738;" v-else-if="scope.row.ins_state == 0"
			>æªæ£æµ</span
			>
			<span style="color: #34BD66;" v-if="scope.row.ins_state == 1">å·²æ£æµ</span>
			<span style="color: #E84738;" v-else-if="scope.row.ins_state == 0">æªæ£æµ</span>
			</template>
			</el-table-column>
			<el-table-column prop="judge_state" label="åæ ¼ç¶æ" width="100">
			<template slot-scope="scope">
			<span style="color: #34BD66;" v-if="scope.row.judge_state == 1"
			>åæ ¼</span
			>
			<span style="color: #E84738;" v-else-if="scope.row.judge_state == 0"
			>ä¸åæ ¼</span
			>
			<span style="color: #34BD66;" v-if="scope.row.judge_state == 1">åæ ¼</span>
			<span style="color: #E84738;" v-else-if="scope.row.judge_state == 0">ä¸åæ ¼</span>
			</template>
			</el-table-column>
			<el-table-column label="æä½" width="100">
			<template slot-scope="scope">
			<span class="table_do" @click="changeShowDetail(scope.row)"
			>æ¥ç</span
			>
			<span class="table_do" @click="changeShowDetail(scope.row)">æ¥ç</span>
			<span class="table_do">æå°</span>
			</template>
			</el-table-column>
			</el-table>
			<el-col
			style="height: 50px;display: flex;align-items: center;justify-content: right;"
			>
			<el-pagination
			@size-change="handleSizeChange"
			@current-change="handleCurrentChange"
			:current-page="1"
			:page-sizes="[10, 15, 20, 30, 50]"
			:page-size="search.co"
			layout="total, sizes, prev, pager, next, jumper"
			:total="total"
			>
			<el-col style="height: 50px;display: flex;align-items: center;justify-content: right;">
			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="1"
			:page-sizes="[10, 15, 20, 30, 50]" :page-size="search.co" layout="total, sizes, prev, pager, next, jumper"
			:total="total">
			</el-pagination>
			</el-col>
			</div>
			@@ -245,7 +189,9 @@
			},
			selectRawInspectsList() {
			this.$axios
			.get(this.$api.url.selectRawInspectsList, { params: this.search })
			.get(this.$api.url.selectRawInspectsList, {
			params: this.search
			})
			.then(res => {
			this.tableData = res.data.row;
			this.total = res.data.total;
			@@ -262,7 +208,9 @@
			};
			this.selectRawInspectsList();
			},
			changeShowDetail({ id }) {
			changeShowDetail({
			id
			}) {
			this.goDetail(id);
			// console.log(id)
			// const res = await this.$axios.post(this.$api.url.selectRawInspectsListById,{params:{id}})

			@@ -1,4 +1,3 @@

			<style scoped>

			</style>
			@@ -14,15 +13,17 @@
			import RawIns from './raw-ins.vue'
			import RawInsDetail from './rawInsDetail.vue'
			export default {
			components:{RawIns,RawInsDetail},
			components: {
			RawIns,
			RawInsDetail
			},
			data() {
			return {
			showDetail: false,
			id:0
			}
			},
			mounted(){
			},
			mounted() {},
			methods:{
			goDetail(id) {
			this.showDetail = true

			@@ -4,140 +4,74 @@
			<el-row>
			<el-col :span="12" style="line-height: 32px;">åæææ£éª</el-col>
			<el-col :span="12" style="text-align: right;">
			<el-button
			icon="el-icon-circle-plus-outline"
			v-show="detailId === null"
			@click="addNewRawInspect"
			style="background-color: #004ea2; color: #ffffff;"
			>æ äº¤</el-button
			>
			<el-button
			icon="el-icon-back"
			@click="
			<el-button icon="el-icon-circle-plus-outline" v-show="detailId === null" @click="addNewRawInspect"
			style="background-color: #004ea2; color: #ffffff;">æ äº¤</el-button>
			<el-button icon="el-icon-back" @click="
			() => {
			goBack();
			}
			"
			>è¿ å</el-button
			>
			">è¿ å</el-button>
			</el-col>
			</el-row>
			</div>
			<div
			class="raw-detail-info"
			:class="detailId === null ? 'raw-detail-info-edit' : ''"
			>
			<div class="raw-detail-info" :class="detailId === null ? 'raw-detail-info-edit' : ''">
			<el-form v-model="detailInfo" label-position="right" label-width="120px">
			<el-row>
			<el-col :span="7">
			<el-form-item label="æ¥ææ¥æ:">
			<el-input
			v-if="detailId !== null"
			:disabled="detailId !== null"
			v-model="detailInfo.formTime"
			></el-input>
			<el-date-picker
			v-else
			type="date"
			value-format="yyyy-MM-dd"
			v-model="detailInfo.formTime"
			placeholder="éæ©æ¥æ"
			>
			<el-input v-if="detailId !== null" :disabled="detailId !== null" v-model="detailInfo.formTime"></el-input>
			<el-date-picker v-else type="date" value-format="yyyy-MM-dd" v-model="detailInfo.formTime"
			placeholder="éæ©æ¥æ">
			</el-date-picker>
			</el-form-item>
			</el-col>
			<el-col :span="7">
			<el-form-item label="åææåç§°:">
			<el-input
			v-if="detailId !== null"
			:disabled="detailId !== null"
			v-model="detailInfo.name"
			></el-input>
			<el-input
			v-else
			v-model="detailInfo.name"
			placeholder="è¯·è¾å¥åææåç§°"
			></el-input> </el-form-item
			></el-col>
			<el-input v-if="detailId !== null" :disabled="detailId !== null" v-model="detailInfo.name"></el-input>
			<el-input v-else v-model="detailInfo.name" placeholder="è¯·è¾å¥åææåç§°"></el-input> </el-form-item></el-col>
			<el-col :span="7">
			<el-form-item label="åææç¼ç :">
			<el-input
			v-if="detailId !== null"
			:disabled="detailId !== null"
			v-model="detailInfo.code"
			></el-input>
			<el-input
			v-else
			v-model="detailInfo.code"
			placeholder="è¯·è¾å¥åææç¼ç "
			></el-input>
			<el-input v-if="detailId !== null" :disabled="detailId !== null" v-model="detailInfo.code"></el-input>
			<el-input v-else v-model="detailInfo.code" placeholder="è¯·è¾å¥åææç¼ç "></el-input>
			</el-form-item>
			</el-col>
			</el-row>
			<el-row>
			<el-col :span="7">
			<el-form-item label="è§æ ¼åå·:">
			<el-input
			v-if="detailId !== null"
			:disabled="detailId !== null"
			v-model="detailInfo.specifications"
			></el-input>
			<el-input
			v-else
			v-model="detailInfo.specifications"
			placeholder="è¯·è¾å¥è§æ ¼åå·"
			></el-input>
			<el-input v-if="detailId !== null" :disabled="detailId !== null"
			v-model="detailInfo.specifications"></el-input>
			<el-input v-else v-model="detailInfo.specifications" placeholder="è¯·è¾å¥è§æ ¼åå·"></el-input>
			</el-form-item>
			</el-col>
			<el-col :span="7">
			<el-form-item label="åä½:">
			<el-input
			v-if="detailId !== null"
			:disabled="detailId !== null"
			v-model="detailInfo.runit"
			></el-input>
			<el-input
			v-else
			placeholder="è¯·è¾å¥æ£éªåä½"
			:disabled="detailId !== null"
			v-model="detailInfo.unit"
			></el-input>
			<el-input v-if="detailId !== null" :disabled="detailId !== null" v-model="detailInfo.runit"></el-input>
			<el-input v-else placeholder="è¯·è¾å¥æ£éªåä½" :disabled="detailId !== null" v-model="detailInfo.unit"></el-input>
			</el-form-item>
			</el-col>
			<el-col :span="7">
			<el-form-item label="æ°é:">
			<el-input
			:placeholder="detailId !== null ? '' : 'è¯·è¾å¥æ£éªæ°é'"
			:disabled="detailId !== null"
			v-model="detailInfo.number"
			></el-input>
			<el-input :placeholder="detailId !== null ? '' : 'è¯·è¾å¥æ£éªæ°é'" :disabled="detailId !== null"
			v-model="detailInfo.number"></el-input>
			</el-form-item>
			</el-col>
			</el-row>
			<el-row>
			<el-col :span="7">
			<el-form-item label="ä¾åºååç§°:">
			<el-input
			:placeholder="detailId !== null ? '' : 'è¯·è¾å¥ä¾åºååç§°'"
			:disabled="detailId !== null"
			v-model="detailInfo.supplier"
			></el-input>
			<el-input :placeholder="detailId !== null ? '' : 'è¯·è¾å¥ä¾åºååç§°'" :disabled="detailId !== null"
			v-model="detailInfo.supplier"></el-input>
			</el-form-item>
			</el-col>
			<el-col :span="7">
			<el-form-item v-show="detailId !== null" label="æ¥æ£æ¥æ:">
			<el-input
			:disabled="detailId !== null"
			v-model="detailInfo.creatTime"
			></el-input>
			<el-input :disabled="detailId !== null" v-model="detailInfo.creatTime"></el-input>
			</el-form-item>
			</el-col>
			<el-col :span="7">
			<el-form-item v-show="detailId !== null" label="æ¥æ£äºº:">
			<el-input
			:disabled="detailId !== null"
			v-model="detailInfo.userName"
			></el-input>
			<el-input :disabled="detailId !== null" v-model="detailInfo.userName"></el-input>
			</el-form-item>
			</el-col>
			</el-row>
			@@ -147,22 +81,10 @@
			<el-row>
			<el-col :span="12" style="line-height: 32px;">æ£éªé¡¹ç®</el-col>
			<el-col :span="12" style="line-height: 32px; padding-top: 6px;">
			<el-button
			style="float: right;"
			@click="clickDeleteInspectionColumn()"
			>å é¤æ£éªå¼å</el-button
			>
			<el-button
			style="float: right;margin-right: 30px;"
			@click="clickAddInspectionColumn()"
			>æ·»å æ£éªå¼å</el-button
			>
			<el-button
			v-if="detailId == null"
			style="float: right;margin-right: 30px;"
			@click="clickAddLine()"
			>æ·»å æ£éªè¡</el-button
			>
			<el-button style="float: right;" @click="clickDeleteInspectionColumn()">å é¤æ£éªå¼å</el-button>
			<el-button style="float: right;margin-right: 30px;" @click="clickAddInspectionColumn()">æ·»å æ£éªå¼å</el-button>
			<el-button v-if="detailId == null" style="float: right;margin-right: 30px;"
			@click="clickAddLine()">æ·»å æ£éªè¡</el-button>
			</el-col>
			</el-row>
			</div>
			@@ -172,65 +94,35 @@
			</el-table-column>
			<el-table-column prop="rpName" label="é¡¹ç®" width="212">
			<template slot-scope="scope">
			<el-input
			v-if="detailId == null"
			v-model="scope.row.name"
			placeholder="è¯·è¾å¥é¡¹ç®åç§°"
			></el-input>
			<el-input v-if="detailId == null" v-model="scope.row.name" placeholder="è¯·è¾å¥é¡¹ç®åç§°"></el-input>
			<el-input v-else v-model="scope.row.rpName" disabled></el-input>
			</template>
			</el-table-column>
			<el-table-column prop="unit" label="åä½" width="148">
			<template slot-scope="scope">
			<el-input
			v-if="detailId == null"
			v-model="scope.row.unit"
			placeholder="è¯·è¾å¥åä½"
			></el-input>
			<el-input v-if="detailId == null" v-model="scope.row.unit" placeholder="è¯·è¾å¥åä½"></el-input>
			<el-input v-else v-model="scope.row.rpUnit" disabled></el-input>
			</template>
			</el-table-column>
			<el-table-column prop="required" label="æ åå¼" min-width="150">
			<template slot-scope="scope">
			<el-input
			:disabled="detailId != null"
			@blur="assertTest(scope.row)"
			v-model="scope.row.required"
			placeholder="è¯·è¾å¥æ åå¼"
			></el-input>
			<el-input :disabled="detailId != null" @blur="assertTest(scope.row)" v-model="scope.row.required"
			placeholder="è¯·è¾å¥æ åå¼"></el-input>
			</template>
			</el-table-column>
			<el-table-column prop="internal" label="åæ§å¼" min-width="150">
			<template slot-scope="scope">
			<el-input
			@blur="assertTest(scope.row)"
			:disabled="detailId != null"
			v-model="scope.row.internal"
			placeholder="è¯·è¾å¥åæ§å¼"
			></el-input>
			<el-input @blur="assertTest(scope.row)" :disabled="detailId != null" v-model="scope.row.internal"
			placeholder="è¯·è¾å¥åæ§å¼"></el-input>
			</template>
			</el-table-column>
			<el-table-column
			prop="testValue"
			label="æ£æµå¼"
			min-width="150"
			v-for="(item, index) in empiricalValueAdd"
			:key="index"
			>
			<el-table-column prop="testValue" label="æ£æµå¼" min-width="150" v-for="(item, index) in empiricalValueAdd"
			:key="index">
			<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"
			v-model="scope.row.testValueList[index]"
			@blur="changeState(scope.row, index)"
			placeholder="è¯·è¾å¥æ£æµå¼"
			></el-input>
			<el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="è¯·åéæ©è®¾å¤ï¼"
			placement="top-start">
			<el-input :disabled="scope.row.deviceId == null" v-model="scope.row.testValueList[index]"
			@blur="changeState(scope.row, index)" placeholder="è¯·è¾å¥æ£æµå¼"></el-input>
			</el-tooltip>
			</template>
			</el-table-column>
			@@ -241,28 +133,17 @@
			}}</el-button>
			</template>
			</el-table-column>
			<el-table-column
			v-if="detailId !== null"
			prop="testState"
			label="ç»è®º"
			min-width="100"
			>
			<el-table-column v-if="detailId !== null" prop="testState" label="ç»è®º" min-width="100">
			<template slot-scope="scope">
			<span
			v-show="scope.row.testState != null"
			:style="{
			<span v-show="scope.row.testState != null" :style="{
			color: scope.row.testState === 1 ? '#67C23A' : '#F56C6C'
			}"
			>{{ scope.row.testState === 1 ? "åæ ¼" : "ä¸åæ ¼" }}</span
			>
			}">{{ scope.row.testState === 1 ? "åæ ¼" : "ä¸åæ ¼" }}</span>
			<span v-show="scope.row.testState == 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
			>
			<el-button type="text" @click="clickDeleteline(scope)">å é¤</el-button>
			</template>
			</el-table-column>
			</el-table>
			@@ -278,68 +159,38 @@
			<el-table-column prop="name" label="ç©æåç§°"> </el-table-column>
			<el-table-column v-if="detailId != null" prop="uName" label="æ£éªå">
			<template slot-scope="scope">
			<span
			v-for="item in scope.row.uName"
			:key="item && item.uName"
			:style="{ marginRight: '8px' }"
			>{{ item }}</span
			>
			<span v-for="item in scope.row.uName" :key="item && item.uName"
			:style="{ marginRight: '8px' }">{{ item }}</span>
			</template>
			</el-table-column>
			<el-table-column prop="testState" label="æ£éªç»è®º">
			<template slot-scope="scope">
			<span
			v-show="scope.row.testState != null"
			:style="{
			<span v-show="scope.row.testState != null" :style="{
			color: scope.row.testState === 1 ? '#67C23A' : '#F56C6C'
			}"
			>{{ scope.row.testState === 1 ? "åæ ¼" : "ä¸åæ ¼" }}</span
			>
			}">{{ scope.row.testState === 1 ? "åæ ¼" : "ä¸åæ ¼" }}</span>
			<span v-show="scope.row.testState == null">ææªç»è®º</span>
			</template>
			</el-table-column>
			<el-table-column v-if="detailId !== null" label="æä½" width="120">
			<template>
			<el-button type="text" size="small" @click.once="submitSave"
			>ä¸æ¥</el-button
			>
			<el-button type="text" size="small" @click.once="submitSave">ä¸æ¥</el-button>
			</template>
			</el-table-column>
			</el-table>
			</div>
			<el-dialog
			title="è¯·éæ©è®¾å¤"
			:visible.sync="centerDialogVisible"
			width="20%"
			>
			<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 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"
			>
			<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="
			<span><i :class="
			`node_i ${
			data.children ? 'el-icon-folder-opened' : 'el-icon-tickets'
			}`
			"
			></i>
			{{ data.name }}</span
			>
			"></i>
			{{ data.name }}</span>
			</div>
			</el-tree>
			</div>
			@@ -352,10 +203,14 @@
			</template>

			<script>
			import { triggerRef } from "vue";
			import {
			triggerRef
			} from "vue";
			import RawIns from "./raw-ins.vue";
			export default {
			components: { RawIns },
			components: {
			RawIns
			},
			props: ["goBack", "detailId"],
			created() {
			// æ¸ç©º
			@@ -455,7 +310,9 @@
			async getDetailInfo() {
			await this.$axios
			.get(this.$api.url.selectRawInspectsListById + `${this.detailId}`, {
			params: { id: this.detailId }
			params: {
			id: this.detailId
			}
			})
			.then(res => {
			console.log(res);
			@@ -499,9 +356,13 @@
			});
			this.detailInfo.rawInsProducts = this.projectTable;
			this.$axios.post(
			this.$api.url.addRawInspects,
			{ ...this.detailInfo },
			{ headers: { "Content-Type": "application/json" } }
			this.$api.url.addRawInspects, {
			...this.detailInfo
			}, {
			headers: {
			"Content-Type": "application/json"
			}
			}
			).then(res=>{
			console.log(res);
			if(res.code=="201"){
			@@ -538,7 +399,7 @@
			this.$message.success("æäº¤æå");
			this.getDetailInfo();
			this.goBack()
			Â Â Â });
			});
			},
			// è·åè®¾å¤æ åå®¹
			getOptions() {
			@@ -599,8 +460,7 @@
			},
			// å é¤æ£éªå¼å
			clickDeleteInspectionColumn() {
			if (this.empiricalValueAdd - 1 === 0) {
			} else {
			if (this.empiricalValueAdd - 1 === 0) {} else {
			if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
			this.empiricalValueAdd = this.empiricalValueAdd - 1;
			this.projectTable.forEach(i => {
			@@ -621,10 +481,12 @@
			.node_i {
			color: orange;
			}

			.div_device_dialog {
			min-height: 400px;
			overflow: auto;
			}

			.rawInsBox {
			height: 100%;
			width: 100%;
			@@ -632,24 +494,29 @@
			display: flex;
			flex-direction: column;
			}

			.el-table__fixed-body-wrapper {
			top: 48px;
			}

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

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

			/* æ£éªè¯¦æ */
			.raw-detail-info {
			background: #fff;
			padding: 26px 0px 11px 80px;
			}

			.raw-detail-info >>> .el-form-item__label {
			color: rgb(51, 51, 51);
			font-family: å¾®è½¯éé»;
			@@ -657,12 +524,15 @@
			font-weight: 400;
			letter-spacing: 0px;
			}

			.raw-detail-info .el-input {
			width: auto;
			}

			.raw-detail-info.raw-detail-info-edit >>> .el-input__inner {
			background: #fff;
			}

			.raw-detail-info >>> .el-input__inner {
			width: 224px;
			height: 32px;
			@@ -671,9 +541,11 @@
			border: 1px solid rgb(221, 221, 221);
			border-radius: 4px;
			}

			.raw-detail-info .el-form-item {
			margin-bottom: 24px;
			}

			.raw-detail-info .el-form-item .el-button {
			height: 32px;
			border: 1px solid rgba(190, 190, 190, 0.44);
			@@ -689,6 +561,7 @@
			/* max-height: 360px; */
			/* overflow-y: hidden; */
			}

			/* æ£éªç»è®º */
			.raw-conclusion-table {
			padding: 9px 14px;

			@@ -5,42 +5,26 @@
			<el-col :span="12" style="line-height: 32px;">çäº§è®°å½ç»´æ¤</el-col>
			<el-col :span="12" style="text-align: right;">
			<el-button type="primary" icon="el-icon-plus" style="background: #004EA2;" @click="addend">æ°å¢</el-button>
			<!-- <el-button icon="el-icon-edit-outline" @click="modify">ä¿®æ¹</el-button> -->
			<el-button icon="el-icon-delete" @click="dels">å é¤</el-button>
			</el-col>
			</el-row>
			</div>
			<div class="choose">
			<span>ç±»åï¼</span>
			<el-select v-model="search.type" size="small" @change="TYpe" placeholder="è¯·éæ©" style="width: 224px;margin-right: 30px;">
			<el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
			<el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
			<el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
			<el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
			<el-select v-model="search.type" size="small" @change="TYpe" placeholder="è¯·éæ©"
			style="width: 224px;margin-right: 30px;">
			<el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
			</el-select>
			<!-- <span>å·¥åºï¼</span>
			<el-select v-model="search.name" size="small" placeholder="è¯·éæ©" style="width: 224px;margin-right: 30px;">
			<el-option v-for="(a, ai) in process" key="ai" :label="a.name" :value="a.id"></el-option>
			</el-select>
			<el-button size="mini" @click="clean()"><span>é ç½®</span></el-button>
			<el-button size="mini" type="primary" style="background: #004EA2;"><span>æ¥
			è¯¢</span></el-button> -->
			<!-- :style="{height: scrollerHeight,overflow:'auto',display: 'flex'}" -->

			</div>
			<div class="thing">
			<div class="left">
			<el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="è¯·è¾å¥æç´¢åå®¹" size="small" clearable @input="query"></el-input>
			<el-tree :data="list" ref="tree"
			:props="{children: 'children',label: 'name'}" node-key="name" default-expand-all
			@node-click="handleNodeClick" highlight-current
			:key="upIndex">
			<el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="è¯·è¾å¥æç´¢åå®¹" size="small" clearable
			@input="query"></el-input>
			<el-tree :data="list" ref="tree" :props="{children: 'children',label: 'name'}" node-key="name"
			default-expand-all @node-click="handleNodeClick" highlight-current :key="upIndex" style="padding-top: 8px;">
			<div class="custom-tree-node" slot-scope="{ node, data }">
			<span><i :class="`node_i ${data.code != '[2]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
			{{ data.code }}{{ data.name }}</span>
			<!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
			<i class="el-icon-delete"></i>
			</el-button> -->
			</div>
			</el-tree>
			</div>
			@@ -73,10 +57,7 @@
			<el-col :span="16" :offset="1">
			<template>
			<el-select v-model="edit.type" disabled placeholder="è¯·éæ©" style="width: 310px;">
			<el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
			<el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
			<el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
			<el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
			<el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
			</el-select>
			</template>
			</el-col>
			@@ -85,16 +66,8 @@
			<el-col :span="4" style="font-size: 14px;text-align: right;">å·¥åº:</el-col>
			<el-col :span="16" :offset="1">
			<template>
			<el-select v-model="edit.techFather"
			placeholder="è¯·éæ©"
			disabled
			@change="workevent"
			style="width: 310px;">
			<el-option
			v-for="item in process"
			:key="item.name"
			:label="item.name"
			:value="item.name">
			<el-select v-model="edit.techFather" placeholder="è¯·éæ©" disabled @change="workevent" style="width: 310px;">
			<el-option v-for="item in process" :key="item.name" :label="item.name" :value="item.name">
			</el-option>
			</el-select>
			</template>
			@@ -105,11 +78,7 @@
			<el-col :span="16" :offset="1">
			<template>
			<el-select v-model="edit.techName" disabled placeholder="è¯·éæ©" style="width: 310px;">
			<el-option
			v-for="item in craftapi"
			:key="item.id"
			:label="item.name"
			:value="item.id">
			<el-option v-for="item in craftapi" :key="item.id" :label="item.name" :value="item.id">
			</el-option>
			</el-select>
			</template>
			@@ -140,31 +109,20 @@
			</span>
			</el-dialog>
			<!-- æ°å¢å¼¹çª -->
			<el-dialog title="çäº§è®°å½æ°å¢" :visible.sync="dialogVisible" :rules="Rules"
			ref="ruleForm" width="35%">
			<el-dialog title="çäº§è®°å½æ°å¢" :visible.sync="dialogVisible" :rules="Rules" ref="ruleForm" width="35%">
			<div>
			<el-form ref="form" :model="form" label-width="80px">
			<el-form-item label="ç±»å" prop="type">
			<template>
			<el-select v-model="form.type"
			@change="edittype" placeholder="è¯·éæ©" style="width: 100%;">
			<el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
			<el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
			<el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
			<el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
			<el-select v-model="form.type" @change="edittype" placeholder="è¯·éæ©" style="width: 100%;">
			<el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
			</el-select>
			</template>
			</el-form-item>
			<el-form-item label="å·¥åº" prop="work">
			<template>
			<el-select v-model="form.work"
			@change="workevent"
			placeholder="è¯·éæ©" style="width: 100%;">
			<el-option
			v-for="item in process"
			:key="item.name"
			:label="item.name"
			:value="item.name">
			<el-select v-model="form.work" @change="workevent" placeholder="è¯·éæ©" style="width: 100%;">
			<el-option v-for="item in process" :key="item.name" :label="item.name" :value="item.name">
			</el-option>
			</el-select>
			</template>
			@@ -172,11 +130,7 @@
			<el-form-item label="å·¥èºåç§°" prop="name">
			<template>
			<el-select v-model="form.craft" placeholder="è¯·éæ©" style="width: 100%;">
			<el-option
			v-for="item in craftapi"
			:key="item.id"
			:label="item.name"
			:value="item.id">
			<el-option v-for="item in craftapi" :key="item.id" :label="item.name" :value="item.id">
			</el-option>
			</el-select>
			</template>
			@@ -195,63 +149,6 @@
			<span slot="footer" class="dialog-footer">
			<el-button type="primary" @click="add(form)">ç¡® å®</el-button>
			<el-button @click="dialogVisible = false">å æ¶</el-button>
			</span>
			</el-dialog>

			<!-- ä¿®æ¹å¼¹çª -->
			<el-dialog title="å·¥åºç¼è¾" :visible.sync="modifyVisible" width="35%">
			<div>
			<el-form ref="form" :model="form" label-width="80px">
			<el-form-item label="ç±»å">
			<template>
			<el-select v-model="value" placeholder="è¯·éæ©" style="width: 480px;">
			<el-option
			v-for="item in options"
			:key="item.value"
			:label="item.label"
			:value="item.value">
			</el-option>
			</el-select>
			</template>
			</el-form-item>
			<el-form-item label="å·¥åº">
			<template>
			<el-select v-model="value" placeholder="è¯·éæ©" style="width: 480px;">
			<el-option
			v-for="item in options"
			:key="item.value"
			:label="item.label"
			:value="item.value">
			</el-option>
			</el-select>
			</template>
			</el-form-item>
			<el-form-item label="å·¥èºåç§°">
			<template>
			<el-select v-model="value" placeholder="è¯·éæ©" style="width: 480px;">
			<el-option
			v-for="item in options"
			:key="item.value"
			:label="item.label"
			:value="item.value">
			</el-option>
			</el-select>
			</template>
			</el-form-item>
			<el-form-item label="è®°å½">
			<el-input v-model="form.record"></el-input>
			</el-form-item>
			<el-form-item label="å¤æ³¨">
			<el-input v-model="form.remarks"></el-input>
			</el-form-item>
			<el-form-item label="åä½">
			<el-input v-model="form.unit"></el-input>
			</el-form-item>
			</el-form>
			</div>
			<span slot="footer" class="dialog-footer">
			<el-button type="primary" @click="modifyVisible = false">ç¡® å®</el-button>
			<el-button @click="modifyVisible = false">å æ¶</el-button>
			</span>
			</el-dialog>
			</div>
			@@ -285,11 +182,32 @@
			unit:'',
			},
			Rules:{
			type:{validator:checktype,required:true,message:'ç±»åä¸è½ä¸ºç©º',trigger:'change'},
			work:{required:true,message:'å·¥åºä¸è½ä¸ºç©º',trigger:'change'},
			name:{required:true,message:'å·¥èºä¸è½ä¸ºç©º',trigger:'change'},
			record:{required:true,message:'è®°å½ä¸è½ä¸ºç©º',trigger:'blur'},
			unit:{required:true,message:'åä½ä¸è½ä¸ºç©º',trigger:'blur'},
			type: {
			validator: checktype,
			required: true,
			message: 'ç±»åä¸è½ä¸ºç©º',
			trigger: 'change'
			},
			work: {
			required: true,
			message: 'å·¥åºä¸è½ä¸ºç©º',
			trigger: 'change'
			},
			name: {
			required: true,
			message: 'å·¥èºä¸è½ä¸ºç©º',
			trigger: 'change'
			},
			record: {
			required: true,
			message: 'è®°å½ä¸è½ä¸ºç©º',
			trigger: 'blur'
			},
			unit: {
			required: true,
			message: 'åä½ä¸è½ä¸ºç©º',
			trigger: 'blur'
			},
			},
			modifyVisible:false,
			dialogVisible:false,
			@@ -317,20 +235,28 @@
			type:'',
			unit:'',
			},
			bigType: []
			}
			},
			mounted() {
			this.selectAllleft()
			this.selectjilu()
			this.chooseType()
			},
			methods: {
			chooseType() {
			this.$axios.get(this.$api.url.chooseType).then(res => {
			this.bigType = res.data
			this.typeselect = res.data[0]
			this.search.type = res.data[0]
			this.selectAllleft()
			this.selectjilu()
			})
			},
			delQueById() {
			this.$axios.get(this.$api.url.delQueById,)
			},
			childrenClick() {},
			TYpe(val) {
			this.typeselect = val
			console.log(this.typeselect);
			this.selectAllleft()
			},
			edittype(val) {
			@@ -339,17 +265,16 @@
			},
			//æ°å¢
			workevent(val){
			console.log(val);
			let idx = this.process.findIndex(el => el.name === val)
			this.craftapi = this.process[idx].children
			console.log( this.craftapi);
			},
			chooseTechFath() {
			this.$axios.get(this.$api.url.chooseTechFath,{
			params:{type:this.typeselect}
			params: {
			type: this.typeselect
			}
			}).then(res => {
			this.process = res.data;
			console.log(this.process);
			}, {
			headers: {
			"Content-Type": "application/json"
			@@ -364,27 +289,18 @@
			note:this.form.remarks,
			techTemId:this.form.craft,
			unit:this.form.unit,
			}
			, {
			}, {
			headers: {
			"Content-Type": "application/json"
			}
			}
			).then(res =>{
			}).then(res => {
			this.$message.success('æ·»å æå')
			this.selectjilu()
			})
			},
			add(formName) {
			this.dialogVisible = false
			this.addRecord()
			// this.$refs[formName].validate((valid) => {
			// if (valid) {
			// alert('submit!');
			// } else {
			// console.log('error submit!!');
			// return false;
			// }
			// });
			this.form = {};
			},
			query() {
			@@ -393,21 +309,20 @@
			//ä¸»ä½å·¦
			selectAllleft() {
			this.$axios.get(this.$api.url.selectAllleft,{
			params:{type:this.typeselect,message:this.search.technology}
			params: {
			type: this.typeselect,
			message: this.search.technology
			}
			}).then(res => {
			this.list = res.data;
			this.selectDataList()
			this.$nextTick(() => {
			this.$refs.tree.setCurrentKey(this.list[0].children[0].name) // é»è®¤éä¸èç¹ç¬¬ä¸ä¸ª
			})
			console.log("=======");
			console.log(this.list);
			let one=this.list.filter(item=>{
			return item.children.length>0
			})[0]
			console.log(one);
			let name=one.children[0].id
			console.log(name);
			this.checkTreeNode.id = name
			this.selectjiluStart(name)
			this.selectDataList();
			@@ -416,20 +331,21 @@
			//é»è®¤
			selectjiluStart(name) {
			this.$axios.get(this.$api.url.selectjilu,{
			params:{id:name}
			params: {
			id: name
			}
			}).then(res => {
			this.tableData = res.data;
			console.log(this.tableData);
			})
			},
			//selectjilu checkTreeNode
			selectjilu() {
			console.log(this.checkTreeNode.id);
			this.$axios.get(this.$api.url.selectjilu,{
			params:{id:this.checkTreeNode.id}
			params: {
			id: this.checkTreeNode.id
			}
			}).then(res => {
			this.tableData = res.data;
			console.log(this.tableData);
			})
			},
			modify(){
			@@ -470,11 +386,9 @@
			this.upIndex++
			},
			handleNodeClick(data) {
			if(data.code != '[2]') return
			this.checkTreeNode = data
			this.selectjilu()
			if(data.code=='[3]'){
			console.log(data);
			}
			},
			nodeOpen(data, node, el) {
			$($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder-opened')
			@@ -498,7 +412,6 @@
			return el.id
			})
			this.delete = cc.join(',')
			console.log(this.delete);
			this.delAllRecord()
			this.$message.success('å é¤å®æ')
			},
			@@ -519,14 +432,11 @@
			this.tableData.splice(index,1)
			this.upData.id = rows.id
			this.delQueByIdapi()
			// this.selectjilu()
			},
			//ç¼è¾
			upContent(ob) {
			this.upData = ob
			// console.log(this.upData);
			this.selecRecord()
			// this.chooseTechFath()
			this.upDia = true
			},
			selecRecord() {
			@@ -539,7 +449,6 @@
			})
			},
			writeRecordById() {
			// console.log(this.upData.id);
			this.$axios.post(this.$api.url.writeRecordById + '?id=' + this.upData.id,{
			name:this.upData.name,
			note:this.upData.note,
			@@ -556,16 +465,7 @@
			submitUpData() {
			this.writeRecordById()
			this.$message.success('ä¿®æ¹æå')

			this.upDia = false
			// this.tableData.forEach(a => {
			// if (a.id == this.upData.id) {
			// a.name = this.upData.name
			// a.unit = this.upData.unit
			// a.thing = this.upData.thing
			// }
			// })
			// console.log(this.upData);
			}
			}
			}
			@@ -679,5 +579,3 @@
			border-radius: 2px;
			}
			</style>

			@@ -118,7 +118,6 @@
			<el-button type="success" @click="syncOrder"
			:icon="isSync ? 'el-icon-loading' : 'el-icon-refresh'">åæ¥</el-button>
			<el-button type="primary" icon="el-icon-plus" @click="openAddDia">æ°å¢</el-button>
			<!-- <el-button icon="el-icon-edit-outline">ä¿®æ¹</el-button> -->
			<el-button icon="el-icon-delete" @click="delSales">å é¤</el-button>
			<el-button icon="el-icon-download">å¯¼åº</el-button>
			</el-col>
			@@ -164,7 +163,7 @@
			</el-table-column>
			<el-table-column prop="äº¤è´§æ¥æ" label="äº¤è´§æ¥æ" width="150">
			</el-table-column>
			<el-table-column prop="note" label="å¤æ³¨" width="150">
			<el-table-column prop="note" label="å¤æ³¨" width="150" show-overflow-tooltip>
			</el-table-column>
			<el-table-column prop="type" label="ç¶æ" width="100">
			<template slot-scope="scope">

			@@ -96,12 +96,7 @@
			color: #004ea2;
			}

			.record_content
			.thing
			.left
			.el-tree--highlight-current
			.el-tree-node.is-current
			> .el-tree-node__content {
			.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;
			}
			@@ -118,313 +113,128 @@
			<el-row>
			<el-col :span="12" style="line-height: 32px">å·¥èºè·¯çº¿ç»´æ¤</el-col>
			<el-col :span="12" style="text-align: right">
			<el-button
			type="primary"
			icon="el-icon-plus"
			style="background: #004ea2"
			@click="addend"
			>æ°å¢</el-button
			>
			<!-- <el-button icon="el-icon-edit-outline" @click="modify">ä¿®æ¹</el-button> -->
			<el-button type="primary" icon="el-icon-plus" style="background: #004ea2" @click="addend">æ°å¢</el-button>
			<el-button icon="el-icon-delete" @click="dels">å é¤</el-button>
			</el-col>
			</el-row>
			</div>
			<div class="choose">
			<span>ç±»åï¼</span>
			<el-select
			v-model="search.type"
			size="small"
			placeholder="è¯·éæ©"
			@change="type"
			style="width: 224px; margin-right: 30px"
			>
			<el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
			<el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
			<el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
			<el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
			<el-select v-model="search.type" size="small" placeholder="è¯·éæ©" @change="type"
			style="width: 224px; margin-right: 30px">
			<el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
			</el-select>
			<!-- <span>å·¥åºï¼</span>
			<el-select v-model="search.name" size="small" placeholder="è¯·éæ©" style="width: 224px;margin-right: 30px;">
			<el-option v-for="(a, ai) in process" key="ai" :label="a.name" :value="a.id"></el-option>
			</el-select>
			<span>è®¾å¤ç»ï¼</span>
			<el-select v-model="search.name" size="small" placeholder="è¯·éæ©" style="width: 224px;margin-right: 30px;">
			<el-option v-for="(a, ai) in product" key="ai" :label="a.name" :value="a.id"></el-option>
			</el-select> -->
			<!-- <el-button size="mini" @click="clean()"><span>é ç½®</span></el-button>
			<el-button size="mini" type="primary" style="background: #004EA2;"><span>æ¥
			è¯¢</span></el-button> -->
			</div>
			<div class="thing">
			<div class="left">
			<el-input
			v-model="search.technology"
			suffix-icon="el-icon-search"
			placeholder="è¯·è¾å¥æç´¢åå®¹"
			size="small"
			clearable
			@input="query"
			>
			<!-- clearable @input="(val)=>$refs.tree.filter(val)"> -->
			<el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="è¯·è¾å¥æç´¢åå®¹" size="small" clearable
			@input="query">
			</el-input>
			<el-tree
			:data="towTree"
			ref="tree"
			:props="{ children: 'children', label: 'father' }"
			node-key="father"
			default-expand-all
			@node-click="handleNodeClick"
			:key="upIndex"
			highlight-current
			>
			<el-tree :data="towTree" ref="tree" :props="{ children: 'children', label: 'father' }" node-key="father"
			default-expand-all @node-click="handleNodeClick" :key="upIndex" highlight-current style="padding-top: 8px;">
			<div class="custom-tree-node" slot-scope="{ node, data }">
			<span
			><i
			:class="`node_i ${
			<span><i :class="`node_i ${
			data.code != '[2]'
			? 'el-icon-folder-opened'
			: 'el-icon-tickets'
			}`"
			></i>
			{{ data.father }}</span
			>
			<!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
			<i class="el-icon-delete"></i>
			</el-button> -->
			}`"></i>
			{{ data.father }}</span>
			</div>
			</el-tree>
			</div>
			<div class="right">
			<el-table
			:data="tableData"
			border
			style="width: 100%; overflow-y: auto; min-height: 100%"
			max-height="100%"
			@selection-change="handleSelectionChange"
			default-expand-all
			>
			<el-table :data="tableData" border style="width: 100%; overflow-y: auto; min-height: 100%" max-height="100%"
			@selection-change="handleSelectionChange" default-expand-all>
			<el-table-column type="selection" width="50"> </el-table-column>
			<el-table-column type="index" label="åºå·" width="70">
			</el-table-column>
			<el-table-column prop="name" label="å·¥èºåç§°"> </el-table-column>
			<el-table-column prop="device_group" label="è®¾å¤ç»">
			</el-table-column>
			<el-table-column label="åä»¶">
			<template slot-scope="scope">
			<el-tag type="info" style="margin-right: 10px;" v-for="(a, index) in JSON.parse(scope.row.element)" :key="index">{{ a }}</el-tag>
			</template>
			</el-table-column>
			<el-table-column label="æä½" width="130">
			<template slot-scope="scope">
			<span class="table_do" @click="upContent(scope.row)"
			>ç¼è¾      </span
			>
			<span class="table_do" @click="deleteRow(scope.$index, scope.row)"
			>å é¤</span
			>
			<span class="table_do" @click="upContent(scope.row)">ç¼è¾      </span>
			<span class="table_do" @click="deleteRow(scope.$index, scope.row)">å é¤</span>
			</template>
			</el-table-column>
			</el-table>
			</div>
			</div>



			<el-dialog title="ç¼è¾è®°å½åå®¹" :visible.sync="upDia" width="500px">
			<el-dialog title="ç¼è¾å·¥èºä¿¡æ¯" :visible.sync="upDia" width="500px">
			<div class="body">
			<el-row style="line-height: 46px">
			<el-col :span="4" style="font-size: 14px; text-align: right"
			>ç±»å:</el-col
			>
			<el-col :span="4" style="font-size: 14px; text-align: right">ç±»å:</el-col>
			<el-col :span="16" :offset="1">
			<template>
			<el-select
			v-model="edit.type"
			placeholder="è¯·éæ©"
			disabled
			style="width: 310px"
			>
			<el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
			<el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
			<el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
			<el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
			<el-select v-model="edit.type" placeholder="è¯·éæ©" disabled style="width: 310px">
			<el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
			</el-select>
			</template>
			</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="4" style="font-size: 14px; text-align: right">å·¥åº:</el-col>
			<el-col :span="16" :offset="1">
			<el-select
			v-model="edit.father"
			style="width: 310px"
			disabled
			placeholder="è¯·éæ©"
			>
			<el-option
			v-for="item in procedure"
			:key="item"
			:label="item"
			disabled
			:value="item"
			>
			<el-select v-model="edit.father" style="width: 310px" disabled placeholder="è¯·éæ©">
			<el-option v-for="item in procedure" :key="item" :label="item" disabled :value="item">
			</el-option>
			</el-select>
			</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 v-model="cell"
			placeholder="è¯·è¾å¥åä»¶åç§°"
			style="width: 200px">
			</el-input>
			<!-- <el-select
			v-model="cell"
			style="width: 310px"
			disabled
			multiple
			placeholder="è¯·éæ©"
			>
			<el-option
			v-for="item in element"
			:key="item.id"
			:label="item.name"
			:value="item.id"
			>
			</el-option>
			</el-select> -->
			</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="4" style="font-size: 14px; text-align: right">å·¥èºåç§°:</el-col>
			<el-col :span="16" :offset="1">
			<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="4" style="font-size: 14px; text-align: right">è®¾å¤ç»:</el-col>
			<el-col :span="16" :offset="1">
			<!-- <el-input
			v-model="upData.device_group"
			size="small"
			clearable
			></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-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>
			<el-button @click="upDia = false">å æ¶</el-button>
			</span>
			</el-dialog>

			<!-- å·¥èºè·¯çº¿æ°å¢ -->
			<el-dialog title="å·¥èºè·¯çº¿æ°å¢" :visible.sync="dialogVisible" width="35%">
			<div>
			<el-form ref="form" :model="form" label-width="80px">
			<el-form-item label="ç±»å">
			<template>
			<el-select
			v-model="form.type"
			placeholder="è¯·éæ©"
			style="width: 100%"
			@change="edittype"
			>
			<el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
			<el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
			<el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
			<el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
			<el-select v-model="form.type" allow-create filterable placeholder="è¯·éæ©" style="width: 100%"
			@change="edittype">
			<el-option v-for="(a,ai) in bigType" :key="ai" :value="a">
			</el-option>
			</el-select>
			</template>
			</el-form-item>
			<el-form-item label="å·¥åº">
			<template>
			<el-select
			v-model="form.father"
			allow-create
			filterable
			@create=""

			placeholder="è¯·éæ©"
			style="width: 100%"
			>
			<el-option
			v-for="item in procedure"
			:key="item"
			:label="item"
			:value="item"
			>
			<el-select v-model="form.father" allow-create filterable @create="" placeholder="è¯·éæ©" style="width: 100%">
			<el-option v-for="item in procedure" :key="item" :label="item" :value="item">
			</el-option>
			</el-select>
			</template>
			</el-form-item>
			<el-form-item label="è®¾å¤ç»">
			<template>
			<el-select
			v-model="form.deviceGroup"
			placeholder="è¯·éæ©"
			style="width: 100%"
			>
			<el-option
			v-for="item in equipment"
			:key="item.index"
			:label="item.father"
			:value="item.father"
			>
			<el-select v-model="form.deviceGroup" placeholder="è¯·éæ©" style="width: 100%">
			<el-option v-for="item in equipment" :key="item.index" :label="item.father" :value="item.father">
			</el-option>
			</el-select>
			</template>
			</el-form-item>
			<el-row>
			<el-col :span="12">
			<el-form-item label="åä»¶">
			<template>
			<el-input v-model="form.elementId" placeholder="è¯·è¾å¥åä»¶åç§°" style="width: 100%"></el-input>
			<!-- <el-select
			v-model="form.elementId"
			multiple
			placeholder="è¯·éæ©"
			style="width: 200px"
			>
			<el-option
			v-for="item in element"
			:key="item.id"
			:label="item.name"
			:value="item.id"
			>
			</el-option>
			</el-select> -->
			</template>
			</el-form-item>
			</el-col>
			<el-col :span="12">
			<el-col :span="24">
			<el-form-item label="å·¥èºåç§°">
			<el-input placeholder="è¯·è¾å¥å·¥èºåç§°" v-model="form.name" style="width: 100%"></el-input>
			</el-form-item>
			@@ -437,80 +247,6 @@
			<el-button @click="Deleteapi">å æ¶</el-button>
			</span>
			</el-dialog>
			<!-- å·¥èºè·¯çº¿ä¿®æ¹ -->
			<el-dialog title="å·¥èºè·¯çº¿æ°å¢" :visible.sync="modifyevent" width="35%">
			<div>
			<el-form ref="form" :model="form" label-width="80px">
			<el-form-item label="ç±»å">
			<template>
			<el-select
			v-model="value"
			placeholder="è¯·éæ©"
			style="width: 480px"
			>
			<!-- <el-option
			v-for="item in options"
			:key="item.value"
			:label="item."
			:value="item.value">
			</el-option> -->
			<el-option label="æ©¡è¶è¿æ¥å¨" :value="0"></el-option>
			<el-option label="éå±è¿æ¥å¨" :value="1"></el-option>
			<el-option label="æ¹¿ææçµè¿æ¥å¨" :value="2"></el-option>
			<el-option label="åæ¯ç»ä»¶" :value="3"></el-option>
			</el-select>
			</template>
			</el-form-item>
			<el-form-item label="å·¥åº">
			<template>
			<el-select
			v-model="value"
			placeholder="è¯·éæ©"
			style="width: 480px"
			>
			<el-option
			v-for="item in procedure"
			:key="item.value"
			:label="item.j"
			:value="item.value"
			>
			</el-option>
			</el-select>
			</template>
			</el-form-item>
			<el-row>
			<el-col :span="10">
			<el-form-item label="å·¥èºåç§°">
			<template>
			<el-select
			v-model="value"
			placeholder="è¯·éæ©"
			style="width: 200px"
			>
			<el-option
			v-for="item in options"
			:key="item.value"
			:label="item.label"
			:value="item.value"
			>
			</el-option>
			</el-select>
			</template>
			</el-form-item>
			</el-col>
			<el-col :span="10" :offset="2">
			<el-form-item label="åä»¶">
			<el-input v-model="form.name" style="width: 200px"></el-input>
			</el-form-item>
			</el-col>
			</el-row>
			</el-form>
			</div>
			<span slot="footer" class="dialog-footer">
			<el-button type="primary" @click="modifyevent = false">ç¡® å®</el-button>
			<el-button @click="modifyevent = false">å æ¶</el-button>
			</span>
			</el-dialog>
			</div>
			</template>

			@@ -519,7 +255,7 @@
			data() {
			return {
			search: {
			type: 0,
			type: '',
			technology: null,
			},
			options: {},
			@@ -530,9 +266,6 @@
			elementId: "",
			deviceGroup: "",
			},
			// search: {
			// type: "",
			// },
			delete: [],
			treetrunk: [],
			process: [],
			@@ -552,11 +285,9 @@
			element: [],
			equipment: [0],
			cell:[],
			AAA: [
			{
			AAA: [{
			id: "",
			},
			],
			}, ],
			edit: {
			deviceGroup: "",
			father: "",
			@@ -571,23 +302,29 @@
			father: "",
			type: "",
			},
			typeselect: 0,
			typeselect: '',
			newdata: {
			type: "",
			},
			upIndex: 0,
			treeList:[],
			elerow:{},
			bigType: []
			};
			},
			mounted() {
			this.selectAllTechTem();

			this.selectAllTechNam();
			console.log(this.treeList);

			this.chooseType()
			},
			methods: {
			chooseType() {
			this.$axios.get(this.$api.url.chooseType).then(res => {
			this.bigType = res.data
			this.typeselect = res.data[0]
			this.search.type = res.data[0]
			this.selectAllTechTem();
			this.selectAllTechNam();
			})
			},
			selectDataList() {
			this.towTree.forEach((a) => {
			a.code = "[1]";
			@@ -616,21 +353,14 @@
			this.form = {};
			},
			addTechTemp() {
			console.log(this.form.elementId.split(','));

			this.$axios
			.post(
			this.$api.url.addTechTemp,
			{
			this.$api.url.addTechTemp, {
			deviceGroup: this.form.deviceGroup,
			// elementId: JSON.stringify(this.form.elementId).replace("[","").replace("]",""),
			// element:this.form.elementId.split(','),
			element:JSON.stringify(this.form.elementId.split(',')),
			father: this.form.father,
			name: this.form.name,
			type: this.form.type,
			},
			{
			}, {
			headers: {
			"Content-Type": "application/json",
			},
			@@ -638,29 +368,16 @@
			)
			.then((res) => {
			console.log(res);
			/* this.selectAllTechNam(); */
			this.form = {};
			this.$parent.removeAllTab()
			});
			},

			//åä»¶
			// chooseElement() {
			// this.$axios.get(this.$api.url.chooseElement).then((res) => {
			// this.element = res.data;
			// console.log(this.element);
			// });
			// },
			//è®¾å¤
			chooseDevGroup() {
			this.$axios.get(this.$api.url.chooseDevGroup).then((res) => {
			this.equipment = res.data;
			// console.log(this.equipment);
			});
			},
			// onTypeBlur(e) {
			// if (e.target.value) {
			// this.type = e.target.value;}},
			//å·¥åº
			chooseTech() {
			this.$axios.get(this.$api.url.chooseTech,{
			@@ -668,7 +385,6 @@
			type:this.typeselect
			}
			}).then(res =>{
			console.log(res);
			this.procedure = res.data
			})
			},
			@@ -678,7 +394,6 @@
			},
			//æ¹éå é¤
			delAllTech() {
			console.log(this.delete);
			this.$axios.post(this.$api.url.delAllTech, {
			ids: this.delete,
			}).then(res=>{
			@@ -687,7 +402,6 @@
			},
			//å é¤
			delTechById() {
			console.log(this.$api.url.delTechById, this.upData.id);
			this.$axios.post(this.$api.url.delTechById, {
			id: this.upData.id,
			}).then(res=>{
			@@ -696,95 +410,71 @@
			},
			//ç¼è¾
			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 + `?id=${this.upData.id}`,
			{
			this.$api.url.writeTechById + `?id=${this.upData.id}`, {
			deviceGroup: this.upData.device_group,
			element:JSON.stringify(this.cell.split(',')),
			// element:JSON.stringify(this.form.elementId.split(','))
			father: this.edit.father,
			name: this.edit.name,
			type: this.edit.type
			},
			{
			}, {
			headers: {
			"Content-Type": "application/json",
			},
			}
			)
			.then((res) => {
			/* this.selectAllTechNam(), */
			this.$message.success("ä¿®æ¹æå");
			this.$parent.removeAllTab()
			});
			},

			query(val) {
			this.selectAllTechTem();
			},
			selectAllTechTem() {
			this.$axios
			.get(this.$api.url.selectAllTechTem, {
			params: { type: this.typeselect, message: this.search.technology },
			params: {
			type: this.typeselect,
			message: this.search.technology
			},
			})
			.then((res) => {
			this.towTree = res.data;
			console.log(this.towTree);
			this.$nextTick(() => {
			this.$refs.tree.setCurrentKey(this.towTree[0].father) // é»è®¤éä¸èç¹ç¬¬ä¸ä¸ª
			})
			// let one=this.towTree.filter(item=>{
			// return item.children.length>0
			// })[0]
			// let name=one.children[0].name
			// this.checkTreeNode.name=name
			// this.selectAllTechNamStart(name)
			// this.selectDataList();
			let one=this.towTree[0]
			let name =one.father
			this.checkTreeNode.father = name
			console.log(name);
			this.selectAllTechNamStart(name)
			});
			},
			handleNodeClick(data, node) {
			console.log(data);
			this.checkTreeNode = data;
			// this.treetrunk = node;
			// console.log(this.treetrunk);
			// console.log(this.checkTreeNode);
			this.selectAllTechNam();

			},
			selectAllTechNam() {
			this.$axios
			.get(this.$api.url.selectAllTechNam, {
			params: { father: this.checkTreeNode.father },
			params: {
			father: this.checkTreeNode.father
			},
			})
			.then((res) => {
			this.tableData = res.data;

			let kk =this.tableData.map(el =>{
			console.log(el);
			return el.element
			})[0]
			// console.log(kk.replace('[','').replace(']','') );
			// console.log(kk.split(','));
			this.elerow = kk

			});
			},
			selectAllTechNamStart(name) {
			this.$axios
			.get(this.$api.url.selectAllTechNam, {
			params: { father: name },
			params: {
			father: name
			},
			})
			.then((res) => {
			this.tableData = res.data;
			@@ -792,12 +482,7 @@
			},
			addend() {
			this.dialogVisible = true;
			this.chooseTech();
			this.chooseDevGroup();
			// this.chooseElement();
			},
			modify() {
			this.modifyevent = true;
			},
			filterNode(value, data) {
			if (!value) return true;
			@@ -815,18 +500,6 @@
			})
			.catch((e) => {});
			},
			// selectDataList() {
			// this.list.forEach(a => {
			// a.code = '[1]'
			// if (a.children != undefined) {
			// a.children.forEach(b => {
			// b.code = '[2]'
			// })
			// }
			// })
			// this.upIndex++
			// },

			nodeOpen(data, node, el) {
			$($(el.$el).find(".node_i")[0]).attr(
			"class",
			@@ -870,28 +543,6 @@
			})
			.then((res) => {
			this.edit = res.data[0];
			this.cell = this.edit.element
			console.log(this.cell);
			let cc = JSON.parse(this.cell).join(",")
			console.log(cc);
			this.cell = cc
			console.log(this.cell);
			// this.cell = this.edit.children.map(el => {
			// return el.id
			// })
			// this.cell = this.cell.join(',')
			// this.cell = nn
			// console.log(this.cell);



			// let cc = this.edit.element.join(", ")
			// let str = cc.join(", ");
			// let cc = JSON.parse(this.edit.element)
			// console.log(cc);
			// console.log(gg);
			// console.log(json.parse(gg));

			});
			},
			//ç¼è¾åå®¹
			@@ -901,19 +552,11 @@
			this.selecTechById()
			this.upDia = true;
			},

			submitUpData() {
			// this.tableData.forEach(a => {
			// if (a.id == this.upData.id) {
			// a.name = this.upData.name
			// a.ask = this.upData.device_group
			// }
			// })
			this.writeTechById();
			this.$message.success("ä¿®æ¹æå");
			this.upIndex++;
			this.upDia = false;
			},
			}
			},
			};
			</script>

			@@ -23,7 +23,7 @@
			Vue.use(qs);
			Vue.use(api);

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

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

			@@ -358,12 +358,6 @@
			u: ""
			},
			{
			k: 16,
			v: "ååç®¡ç",
			i: "font icon-shouye",
			u: ""
			},
			{
			k: 17,
			v: "åæååºå",
			i: "font icon-shouye",
			@@ -413,7 +407,7 @@
			},
			{
			k: 6,
			v: "æåæ£éª",
			v: "äº§åæ£éª",
			i: "font icon-shouye",
			u: "finishedProductInspection"
			},
			@@ -472,12 +466,6 @@
			u: "record-content"
			},
			{
			k: 24,
			v: "èªæ£é¡¹ç®ç»´æ¤",
			i: "font icon-shouye",
			u: "self-inspection"
			},
			{
			k: 25,
			v: "ææ¯ææ ç»´æ¤",
			i: "font icon-shouye",
			@@ -500,12 +488,6 @@
			v: "ç©ææ¸åç»´æ¤",
			i: "font icon-shouye",
			u: "mbom"
			},
			{
			k: 30,
			v: "çäº§å·¥èºç»´æ¤",
			i: "font icon-shouye",
			u: "equipmentmaintain"
			}
			]
			}