From e31a294cd6ce4cdc41a2df4a5d3994b0f14f1eb2 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 13 九月 2023 14:31:17 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/standard.vue | 33
src/components/view/technology.vue | 2
src/components/view/mbom.vue | 436 +++----
src/components/view/self-inspection.vue | 2
src/components/view/equipmentmaintain.vue | 2
src/components/view/record-content.vue | 2
src/main.js | 8
src/components/view/Technicalindex.vue | 1010 ++++++++---------
src/components/view/processInspection.vue | 527 ++++-----
src/view/index.vue | 1135 ++++++++++----------
src/assets/api/controller.js | 5
src/components/view/sale.vue | 36
12 files changed, 1,516 insertions(+), 1,682 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index f5e32db..5e90ab6 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -67,11 +67,14 @@
// listMaterial:"/finished-inspect/list_material",//娣诲姞妫�楠屽崟鏃剁殑椤圭洰鍒楄〃
finishedInspectUser: "/finished-inspect/page_user", //鑾峰彇鎵�鏈変富鏈哄伐
projectListByfinishId: "/inspection-item/list_user", //鏍规嵁id鏌ヨ鎵�鏈夐」鐩�
-
+ processInspectAddProcess: "/processInspect/addProcess",//鏂板妫�楠�
+ inspectionItemListUser: "/inspection-item/list_user",//鏌ヨ鎵�鏈夋楠岄」鐩�
}
// 杩囩▼妫�楠�
const processInspection = {
selectProcessInspectsList: "/processInspect/selectProcessInspectsList", // 鍒嗛〉鏌ヨ杩囩▼妫�楠屽崟鍒楄〃
+ chooseMaterProcessInspect: "/processInspect/chooseMater",//鏍规嵁璁㈠崟鍙烽�夋嫨浜у搧鍜屽伐鑹�
+
}
// QMS瀹為獙瀹ょ鐞�
const laboratory = {
diff --git a/src/components/view/Technicalindex.vue b/src/components/view/Technicalindex.vue
index 9211f57..03d8f56 100644
--- a/src/components/view/Technicalindex.vue
+++ b/src/components/view/Technicalindex.vue
@@ -1,320 +1,242 @@
<template>
<div class="record_content">
<div class="title">
- <el-row>
+ <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="event">鏂板</el-button>
<!-- <el-button icon="el-icon-edit-outline" @click="modify">淇敼</el-button> -->
- <el-button icon="el-icon-delete" @click="dels" >鍒犻櫎</el-button>
+ <el-button icon="el-icon-delete" @click="dels">鍒犻櫎</el-button>
</el-col>
</el-row>
</div>
-
- <div>
- <!-- 缂栬緫寮圭獥 -->
- <div>
- <el-dialog
- title="鎶�鏈寚鏍囩紪杈�"
- :visible.sync="modifyevent"
- width="40%"
- :before-close="handleClose">
- <el-form ref="form" :model="form" label-width="80px">
- <el-form-item label="绫诲瀷">
- <template>
- <el-select v-model="value" placeholder="璇烽�夋嫨" style="width: 560px;">
- <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-row>
- <el-col :span="11">
- <el-form-item label="宸ュ簭">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ユ垨閫夋嫨宸ュ簭"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="11" :offset="2">
- <el-form-item label="宸ヨ壓">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ユ垨閫夋嫨宸ヨ壓"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
+ <div style="height: calc(100% - 42px);">
+ <!-- 缂栬緫寮圭獥 -->
+ <div>
+ <el-dialog title="鎶�鏈寚鏍囩紪杈�" :visible.sync="modifyevent" width="40%" :before-close="handleClose">
+ <el-form ref="form" :model="form" label-width="80px">
+ <el-form-item label="绫诲瀷">
+ <template>
+ <el-select v-model="value" placeholder="璇烽�夋嫨" style="width: 560px;">
+ <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-row>
+ <el-col :span="11">
+ <el-form-item label="宸ュ簭">
+ <el-input v-model="form.name" placeholder="璇疯緭鍏ユ垨閫夋嫨宸ュ簭"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" :offset="2">
+ <el-form-item label="宸ヨ壓">
+ <el-input v-model="form.name" placeholder="璇疯緭鍏ユ垨閫夋嫨宸ヨ壓"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
- <el-row>
- <el-col :span="11">
- <el-form-item label="椤圭洰缁�">
- <el-input v-model="form.name" placeholder="璇烽�夋嫨"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="11" :offset="2">
- <el-form-item label="椤圭洰">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ラ」鐩�"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
+ <el-row>
+ <el-col :span="11">
+ <el-form-item label="椤圭洰缁�">
+ <el-input v-model="form.name" placeholder="璇烽�夋嫨"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" :offset="2">
+ <el-form-item label="椤圭洰">
+ <el-input v-model="form.name" placeholder="璇疯緭鍏ラ」鐩�"></el-input>
+ </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>
- </el-form>
- <span slot="footer" class="dialog-footer">
- <el-button @click="modifyevent = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="modifyevent = false">纭� 瀹�</el-button>
- </span>
- </el-dialog>
- </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>
- <!-- <span>宸ュ簭锛�</span>
+ <el-form-item label="鍗曚綅">
+ <el-input v-model="form.name" placeholder="璇疯緭鍏ュ崟浣�" style="width: 220px;"></el-input>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="modifyevent = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="modifyevent = false">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ </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>
+ <!-- <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"
- suffix-icon="el-icon-search"
- placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�"
- size="small"
- clearable @input="query" ></el-input>
- <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'father'}" node-key="name" default-expand-all
- @node-click="handleNodeClick" highlight-current
- >
- <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)">
+ </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: 'father'}" node-key="name"
+ default-expand-all @node-click="handleNodeClick" highlight-current>
+ <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%;margin-bottom: 20px;"
- row-key="name"
- border
- @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">
- </el-table-column>
- <el-table-column
- prop="name"
- label="椤圭洰"
- sortable
- width="400px">
- <template slot-scope="scope">
- <el-tag>
- <div class="firstDiv" :style="`color: ${scope.row.children? '#16a7ff' : '#58c173'}`">
- {{ scope.row.children ? "01" : "02" }}
- </div>
- </el-tag>
- <span style="color: black">{{ scope.row.name }}</span>
+ </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 @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">
+ </el-table-column>
+ <el-table-column prop="name" label="椤圭洰" sortable width="400px">
+ <template slot-scope="scope">
+ <el-tag>
+ <div class="firstDiv" :style="`color: ${scope.row.children? '#16a7ff' : '#58c173'}`">
+ {{ scope.row.children ? "01" : "02" }}
+ </div>
+ </el-tag>
+ <span style="color: black">{{ scope.row.name }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="unit" label="鍗曚綅">
+ </el-table-column>
+ <el-table-column prop="address" label="鎿嶄綔" width="200px">
+ <template slot-scope="scope" style="text-align: center;">
+ <div v-if="!scope.row.children">
+ <el-button type="text" size="mini" @click="childrenClick(scope.row)">缂栬緫</el-button>
+ <el-button type="text" size="mini" @click="deleteRow(scope.$index, scope.row)">鍒犻櫎</el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <div>
+ <el-dialog title="缂栬緫鎶�鏈唴瀹�" :visible.sync="upDia" width="500px">
+ <div class="body">
- </template>
- </el-table-column>
- <el-table-column
- prop="unit"
- label="鍗曚綅">
- </el-table-column>
- <el-table-column
- prop="address"
- label="鎿嶄綔"
- width="200px">
- <template slot-scope="scope" style="text-align: center;">
- <div v-if="!scope.row.children">
- <el-button type="text" size="mini" @click="childrenClick(scope.row)">缂栬緫</el-button>
- <el-button type="text" size="mini" @click="deleteRow(scope.$index, scope.row)">鍒犻櫎</el-button>
- </div>
- </template>
- </el-table-column>
- </el-table>
- </div>
- <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-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="16" :offset="1">
+ <template>
+ <el-select v-model="edit.techFather" placeholder="璇烽�夋嫨" allow-create disabled style="width: 306px;"
+ filterable @change="workevent">
+ <el-option v-for="(item,index) in process" :key="item.name" :label="item.name" :value="item.name">
+ </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="16" :offset="1">
+ <template>
+ <el-select v-model="edit.techName" placeholder="璇烽�夋嫨" disabled style="width: 306px;" allow-create
+ filterable>
+ <el-option v-for="item in craftapi" :key="item.id" :label="item.name" :value="item.id">
+ </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="16" :offset="1">
+ <el-input v-model="edit.father" :disabled="true" size="small" clearable></el-input>
+ </el-col>
+ </el-row>
+ <el-row style="line-height: 46px;">
+ <el-col :span="4" style="font-size: 14px;text-align: right;">椤圭洰鍚嶇О:</el-col>
+ <el-col :span="16" :offset="1">
+ <el-input v-model="edit.name" size="small" clearable></el-input>
+ </el-col>
+ </el-row>
+ <el-row style="line-height: 46px;">
+ <el-col :span="4" style="font-size: 14px;text-align: right;">鍗曚綅:</el-col>
+ <el-col :span="16" :offset="1">
+ <el-input v-model="edit.unit" size="small" clearable></el-input>
+ </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>
+ </div>
+ <!-- 鏂板寮圭獥 -->
+ <div>
+ <el-dialog title="鎶�鏈寚鏍囨柊澧�" :visible.sync="dialogVisible" width="40%">
+ <el-form ref="form" :model="form" label-width="80px">
+ <el-form-item label="绫诲瀷">
+ <template>
+ <el-select v-model="form.type" size="small" placeholder="璇烽�夋嫨" @change="edittype"
+ style="width: 554px;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>
+ </template>
+ </el-form-item>
+ <el-row>
+ <el-col :span="11">
+ <el-form-item label="宸ュ簭">
+ <template>
+ <el-select v-model="form.work" placeholder="璇烽�夋嫨" allow-create filterable @change="workevent">
+ <el-option v-for="(item,index) in process" :key="item.name" :label="item.name"
+ :value="item.name">
+ </el-option>
+ </el-select>
+ </template>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" :offset="2">
+ <el-form-item label="宸ヨ壓">
+ <template>
+ <el-select v-model="form.name" placeholder="璇烽�夋嫨" allow-create filterable>
+ <el-option v-for="item in craftapi" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
+ </template>
+ </el-form-item>
+ </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">
- <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-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="16" :offset="1">
- <template>
- <el-select v-model="edit.techFather"
- placeholder="璇烽�夋嫨"
- allow-create
- disabled
- style="width: 306px;"
- filterable
- @change="workevent"
- >
- <el-option
- v-for="(item,index) in process"
- :key="item.name"
- :label="item.name"
- :value="item.name">
- </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="16" :offset="1">
- <template>
- <el-select v-model="edit.techName"
- placeholder="璇烽�夋嫨"
- disabled
- style="width: 306px;"
- allow-create
- filterable
- >
- <el-option
- v-for="item in craftapi"
- :key="item.id"
- :label="item.name"
- :value="item.id">
- </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="16" :offset="1">
- <el-input v-model="edit.father" :disabled="true" size="small" clearable></el-input>
- </el-col>
- </el-row>
- <el-row style="line-height: 46px;">
- <el-col :span="4" style="font-size: 14px;text-align: right;">椤圭洰鍚嶇О:</el-col>
- <el-col :span="16" :offset="1">
- <el-input v-model="edit.name" size="small" clearable></el-input>
- </el-col>
- </el-row>
- <el-row style="line-height: 46px;">
- <el-col :span="4" style="font-size: 14px;text-align: right;">鍗曚綅:</el-col>
- <el-col :span="16" :offset="1">
- <el-input v-model="edit.unit" size="small" clearable></el-input>
- </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>
- </div>
-
- <!-- 鏂板寮圭獥 -->
- <div>
- <el-dialog
- title="鎶�鏈寚鏍囨柊澧�"
- :visible.sync="dialogVisible"
- width="40%"
- >
- <el-form ref="form" :model="form" label-width="80px">
- <el-form-item label="绫诲瀷">
- <template>
- <el-select v-model="form.type" size="small" placeholder="璇烽�夋嫨" @change="edittype" style="width: 554px;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>
- </template>
- </el-form-item>
- <el-row>
- <el-col :span="11">
- <el-form-item label="宸ュ簭">
- <template>
- <el-select v-model="form.work"
- placeholder="璇烽�夋嫨"
- allow-create
- filterable
- @change="workevent"
- >
- <el-option
- v-for="(item,index) in process"
- :key="item.name"
- :label="item.name"
- :value="item.name">
- </el-option>
- </el-select>
- </template>
- </el-form-item>
- </el-col>
- <el-col :span="11" :offset="2">
- <el-form-item label="宸ヨ壓">
- <template>
- <el-select v-model="form.name"
- placeholder="璇烽�夋嫨"
- allow-create
- filterable
- >
- <el-option
- v-for="item in craftapi"
- :key="item.id"
- :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
- </template>
- </el-form-item>
- </el-col>
- </el-row>
-
- <el-row>
- <el-col :span="11">
- <el-form-item label="椤圭洰缁�" >
- <template>
- <el-select v-model="form.father"
- placeholder="璇烽�夋嫨"
- allow-create
- filterable
- @create="electadd"
- >
- <el-option
- v-for="item in higherlevel"
- :key="item"
- :label="item"
- :value="item">
- </el-option>
- </el-select>
- <!-- <el-autocomplete
+ <el-row>
+ <el-col :span="11">
+ <el-form-item label="椤圭洰缁�">
+ <template>
+ <el-select v-model="form.father" placeholder="璇烽�夋嫨" allow-create filterable @create="electadd">
+ <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"
@@ -331,86 +253,82 @@
</template>
</el-autocomplete> -->
- </template>
- </el-form-item>
- </el-col>
- <el-col :span="11" :offset="2">
- <el-form-item label="椤圭洰">
- <el-input v-model="form.project" style="width: 200px;" placeholder="璇疯緭鍏ラ」鐩�"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
+ </template>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" :offset="2">
+ <el-form-item label="椤圭洰">
+ <el-input v-model="form.project" style="width: 200px;" placeholder="璇疯緭鍏ラ」鐩�"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
- <el-form-item label="鍗曚綅">
- <el-input v-model="form.unit" placeholder="璇疯緭鍏ュ崟浣�" style="width: 200px;"></el-input>
- </el-form-item>
- </el-form>
- <span slot="footer" class="dialog-footer">
- <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="add">纭� 瀹�</el-button>
- </span>
- </el-dialog>
- </div>
- </div>
-
+ <el-form-item label="鍗曚綅">
+ <el-input v-model="form.unit" placeholder="璇疯緭鍏ュ崟浣�" style="width: 200px;"></el-input>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="add">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ </div>
+ </div>
</div>
</div>
</template>
<script>
-export default {
+ export default {
data() {
return {
- search:{
- type:0,
- technology:null,
- },
- // handleClose:[],
- checkTreeNode :{
- id:'',
- },
- higherlevel:[],
- value:{},
- options:[],
- process:[],
- filterNode:[],
- list: [],
- form:{
- father:'',
- work:'',
- name:'',
- unit:'',
- project:'',
- },
- children:[],
- modifyevent:false,
- dialogVisible:false,
- tableData: [],
- typeselect:0,
- upData:{},
- upDia:false,
- craftapi:[],
- edit:{
- techFather:'',
- techName:'',
- father:'',
- name:'',
- unit:'',
- id:'',
-
- }
- }
-
- },
- mounted() {
- this.selectAllleft()
- this.selectAllright()
-
+ search: {
+ type: 0,
+ technology: null,
+ },
+ // handleClose:[],
+ checkTreeNode: {
+ id: '',
+ },
+ higherlevel: [],
+ value: {},
+ options: [],
+ process: [],
+ filterNode: [],
+ list: [],
+ form: {
+ father: '',
+ work: '',
+ name: '',
+ unit: '',
+ project: '',
+ },
+ children: [],
+ modifyevent: false,
+ dialogVisible: false,
+ tableData: [],
+ typeselect: 0,
+ upData: {},
+ upDia: false,
+ craftapi: [],
+ edit: {
+ techFather: '',
+ techName: '',
+ father: '',
+ name: '',
+ unit: '',
+ id: ''
+ }
+ }
},
- methods:{
- handleClose(){
+ mounted() {
+ this.selectAllleft()
+ this.selectAllright()
+ },
+ methods: {
+ handleClose() {
- },
- selectDataList() {
+ },
+ selectDataList() {
this.list.forEach(a => {
a.code = '[1]'
if (a.children != undefined) {
@@ -426,66 +344,66 @@
})
this.upIndex++
},
- //缂栬緫
- selecTech() {
- this.$axios.get(this.$api.url.selecTech,{
- params:{
- id:this.upData.id
+ //缂栬緫
+ selecTech() {
+ this.$axios.get(this.$api.url.selecTech, {
+ params: {
+ id: this.upData.id
}
}).then(res => {
this.edit = res.data[0]
console.log(this.edit);
})
},
- childrenClick(val) {
+ childrenClick(val) {
this.upData = val
- this.selecTech()
- this.upDia = true
- },
- writeTechByIdskill() {
+ this.selecTech()
+ this.upDia = true
+ },
+ writeTechByIdskill() {
// console.log(this.upData.id);
- this.$axios.post(this.$api.url.writeTechByIdskill + '?id=' + this.upData.id,{
- name:this.edit.name,
- father:this.edit.father,
- techTemId:this.edit.id,
- unit:this.edit.unit
+ this.$axios.post(this.$api.url.writeTechByIdskill + '?id=' + this.upData.id, {
+ name: this.edit.name,
+ father: this.edit.father,
+ techTemId: this.edit.id,
+ unit: this.edit.unit
}, {
headers: {
- "Content-Type": "application/json"
- }
+ "Content-Type": "application/json"
+ }
}).then(res => {
this.selectAllright()
})
- },
- submitUpData() {//纭畾
- this.writeTechByIdskill()
- this.upDia = false
- },
- //鍒犻櫎
- delTechBy() {
- console.log(this.$api.url.delTechBy,this.upData.id);
- this.$axios.post(this.$api.url.delTechBy,{
- id:this.upData.id
- }).then(res =>{
- this.selectAllright()
- this.$message.success('鍒犻櫎瀹屾垚')
- })
},
- deleteRow(index, rows) {
- this.tableData.splice(index,1)
- this.upData = rows
+ submitUpData() { //纭畾
+ this.writeTechByIdskill()
+ this.upDia = false
+ },
+ //鍒犻櫎
+ delTechBy() {
+ console.log(this.$api.url.delTechBy, this.upData.id);
+ this.$axios.post(this.$api.url.delTechBy, {
+ id: this.upData.id
+ }).then(res => {
+ this.selectAllright()
+ this.$message.success('鍒犻櫎瀹屾垚')
+ })
+ },
+ deleteRow(index, rows) {
+ this.tableData.splice(index, 1)
+ this.upData = rows
this.upData.id = rows.id
this.delTechBy()
},
- //鎵归噺鍒犻櫎
- delAllTechskill() {
- this.$axios.post(this.$api.url.delAllTechskill,{
- ids:this.delete
- }).then(res =>{
- this.selectAllright()
- })
- },
- dels() {
+ //鎵归噺鍒犻櫎
+ delAllTechskill() {
+ this.$axios.post(this.$api.url.delAllTechskill, {
+ ids: this.delete
+ }).then(res => {
+ this.selectAllright()
+ })
+ },
+ dels() {
this.selects.forEach(a => {
for (var b = 0; b < this.tableData.length; b++) {
if (this.tableData[b].id == a.id) {
@@ -494,7 +412,7 @@
}
}
})
- let cc = this.selects.map(el => {
+ let cc = this.selects.map(el => {
return el.id
})
this.delete = cc.join(',')
@@ -502,141 +420,152 @@
this.delAllTechskill()
this.$message.success('鍒犻櫎瀹屾垚')
},
- add() {
- this.dialogVisible = false
- this.addTechMode()
+ add() {
+ this.dialogVisible = false
+ this.addTechMode()
this.form = {};
- },
- electadd(value) {
- console.log(value);
- this.higherlevel.push({});
- this.form.father = value;
- },
- addTechMode() {
- this.$axios.post(this.$api.url.addTechMode,{
- father:this.form.father,
- name:this.form.project,
- techTemId:this.form.name,
- unit:this.form.unit,
- }, {
+ },
+ electadd(value) {
+ console.log(value);
+ this.higherlevel.push({});
+ this.form.father = value;
+ },
+ addTechMode() {
+ this.$axios.post(this.$api.url.addTechMode, {
+ father: this.form.father,
+ name: this.form.project,
+ techTemId: this.form.name,
+ unit: this.form.unit,
+ }, {
headers: {
- "Content-Type": "application/json"
- }
- }).then(res =>{
- this.$message.success('鏂板瀹屾垚')
- this.selectAllright()
+ "Content-Type": "application/json"
+ }
+ }).then(res => {
+ this.$message.success('鏂板瀹屾垚')
+ this.selectAllright()
- })
- },
- TYpe(val) {
- this.typeselect = val
- console.log(this.typeselect);
- this.selectAllleft()
- },
- edittype(val) {
+ })
+ },
+ TYpe(val) {
+ this.typeselect = val
+ console.log(this.typeselect);
+ this.selectAllleft()
+ },
+ edittype(val) {
this.typeselect = val
this.chooseTechFath()
},
- //涓讳綋宸�
- selectAllleft() {
- this.$axios.get(this.$api.url.selectAllleft,{
- 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) // 榛樿閫変腑鑺傜偣绗竴涓�
- })
- 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.selectAllrightStart(name)
- this.selectDataList();
- });
+ //涓讳綋宸�
+ selectAllleft() {
+ this.$axios.get(this.$api.url.selectAllleft, {
+ 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) // 榛樿閫変腑鑺傜偣绗竴涓�
+ })
+ 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.selectAllrightStart(name)
+ this.selectDataList();
+ });
},
- selectAllrightStart(name) {
- this.$axios.get(this.$api.url.selectAllright,{
- params:{id:name}
- }).then(res => {
- this.tableData = res.data;
- console.log(this.tableData);
- });
+ selectAllrightStart(name) {
+ this.$axios.get(this.$api.url.selectAllright, {
+ params: {
+ id: name
+ }
+ }).then(res => {
+ this.tableData = res.data;
+ console.log(this.tableData);
+ });
},
- //
- //鏌ヨ
- query(val) {
- this.selectAllleft()
- },
- //鍙�
- selectAllright() {
- this.$axios.get(this.$api.url.selectAllright,{
- params:{id:this.checkTreeNode.id}
- }).then(res => {
- this.tableData = res.data;
- console.log(this.tableData);
- });
+ //
+ //鏌ヨ
+ query(val) {
+ this.selectAllleft()
},
- //涓婄骇
- chooseProFath() {
- console.log(this.checkTreeNode.id);
- this.$axios.get(this.$api.url.chooseProFath,{
- params:{techTemId:this.checkTreeNode.id}
- }).then(res => {
- this.higherlevel = res.data;
- console.log(this.higherlevel);
- }, {
- headers: {
- "Content-Type": "application/json"
- }
- })
+ //鍙�
+ selectAllright() {
+ this.$axios.get(this.$api.url.selectAllright, {
+ params: {
+ id: this.checkTreeNode.id
+ }
+ }).then(res => {
+ this.tableData = res.data;
+ console.log(this.tableData);
+ });
},
- //宸ュ簭宸ヨ壓
- chooseTechFath() {
- this.$axios.get(this.$api.url.chooseTechFath,{
- params:{type:this.typeselect}
- }).then(res => {
- this.process = res.data;
- console.log(this.process);
- }, {
- headers: {
- "Content-Type": "application/json"
- }
- })
+ //涓婄骇
+ chooseProFath() {
+ console.log(this.checkTreeNode.id);
+ this.$axios.get(this.$api.url.chooseProFath, {
+ params: {
+ techTemId: this.checkTreeNode.id
+ }
+ }).then(res => {
+ this.higherlevel = res.data;
+ console.log(this.higherlevel);
+ }, {
+ headers: {
+ "Content-Type": "application/json"
+ }
+ })
},
- workevent(val){
- console.log(val);
- let idx = this.process.findIndex(el => el.name === val)
- this.craftapi = this.process[idx].children
- },
-
- handleNodeClick(data){
- this.checkTreeNode = data
+ //宸ュ簭宸ヨ壓
+ chooseTechFath() {
+ this.$axios.get(this.$api.url.chooseTechFath, {
+ params: {
+ type: this.typeselect
+ }
+ }).then(res => {
+ this.process = res.data;
+ console.log(this.process);
+ }, {
+ headers: {
+ "Content-Type": "application/json"
+ }
+ })
+ },
+ workevent(val) {
+ console.log(val);
+ let idx = this.process.findIndex(el => el.name === val)
+ this.craftapi = this.process[idx].children
+ },
+
+ handleNodeClick(data) {
+ this.checkTreeNode = data
console.log(this.checkTreeNode.id);
this.selectAllright()
- },
- event(){
- this.dialogVisible = true
- this.chooseProFath()
- this.chooseTechFath()
- },
- modify(){
- this.modifyevent = true
- },
- // deleteRow(index, rows) {
- // console.log();
- // rows.splice(index, 1);
+ },
+ event() {
+ this.dialogVisible = true
+ this.chooseProFath()
+ this.chooseTechFath()
+ },
+ modify() {
+ this.modifyevent = true
+ },
+ // deleteRow(index, rows) {
+ // console.log();
+ // rows.splice(index, 1);
// },
- handleSelectionChange(val) {
+ handleSelectionChange(val) {
this.selects = val;
},
- //缂栬緫
-
- }
- }
+ //缂栬緫
+
+ }
+ }
</script>
<style scoped>
@@ -677,7 +606,7 @@
.thing {
width: 100%;
- height: calc(100% - 120px);
+ height: calc(100% - 78px);
background-color: #fff;
display: flex;
}
@@ -687,6 +616,7 @@
height: calc(100% - 20px);
border-right: 3px solid rgb(245, 247, 251);
padding: 16px;
+ overflow-y: auto;
}
.thing .left .custom-tree-node span {
@@ -726,8 +656,9 @@
color: #004ea0;
cursor: pointer;
}
-.firstDiv {
- /* float: left;
+
+ .firstDiv {
+ /* float: left;
width: 20px;
height: 20px;
border-radius: 60px;
@@ -737,11 +668,12 @@
display: flex;
align-items: center;
margin-right: 8px; */
- /* border-radius: 60px; */
-}
-.el-tag{
- border-radius: 50%;
-}
+ /* border-radius: 60px; */
+ }
+
+ .el-tag {
+ border-radius: 50%;
+ }
</style>
<style>
.record_content .title .el-button * {
@@ -761,4 +693,4 @@
height: 30px;
border-radius: 2px;
}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/components/view/equipmentmaintain.vue b/src/components/view/equipmentmaintain.vue
index 0de5776..0defcf5 100644
--- a/src/components/view/equipmentmaintain.vue
+++ b/src/components/view/equipmentmaintain.vue
@@ -245,7 +245,6 @@
placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�"
size="small" clearable ></el-input>
<el-tree :data="list" ref="tree"
- style="height: 500px;overflow-y: auto;"
:props="{children: 'children',label: 'name'}" highlight-current node-key="name" default-expand-all
@node-click="handleNodeClick"
@@ -662,6 +661,7 @@
height: calc(100% - 20px);
border-right: 3px solid rgb(245, 247, 251);
padding: 16px;
+ overflow-y: auto;
}
.thing .left .custom-tree-node span {
diff --git a/src/components/view/mbom.vue b/src/components/view/mbom.vue
index cfe1abd..b608179 100644
--- a/src/components/view/mbom.vue
+++ b/src/components/view/mbom.vue
@@ -1,127 +1,96 @@
<template>
<div class="record_content">
<div class="title">
- <el-row>
+ <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="event">鏂板</el-button>
- <el-button icon="el-icon-delete" @click="dels" >鍒犻櫎</el-button>
+ <el-button icon="el-icon-delete" @click="dels">鍒犻櫎</el-button>
</el-col>
</el-row>
</div>
<div>
- <el-dialog
- title="鐗╂枡娓呭崟鐨勭淮鎶�"
- :visible.sync="dialogVisible"
- width="80%"
- :before-close="handleClose" :center="true">
- <div>
- <el-form>
- <el-row :gutter="2">
- <el-col :span="8">
- <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-select>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="宸ュ簭">
- <template>
- <el-select v-model="search.work"
- placeholder="璇烽�夋嫨"
- allow-create
- filterable
- @change="workevent"
- >
- <el-option
- v-for="(item,index) in process"
- :key="item.name"
- :label="item.name"
- :value="item.name">
- </el-option>
- </el-select>
- </template>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="宸ヨ壓鍚嶇О:">
- <el-select v-model="search.craft" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
- <el-option
- v-for="item in craftapi"
- :key="item.id"
- :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <el-button size="mini" @click="Addrow" >娣诲姞琛�</el-button>
- </div>
- <div style="margin: 10px 0px;">
- <template>
- <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>
- </template>
- </el-table-column>
- <el-table-column
- prop="name"
- label="鍘熸潗鏂欏悕绉�">
- <template slot-scope="scope">
- <el-input v-model="scope.row.name" placeholder="" ></el-input>
- </template>
- </el-table-column>
- <el-table-column
- prop="address"
- label="瑙勬牸鍨嬪彿">
- <template slot-scope="scope">
- <el-input v-model="scope.row.specifications" placeholder="" ></el-input>
- </template>
- </el-table-column>
- <el-table-column
- prop="unit"
- label="鍗曚綅">
- <template slot-scope="scope">
- <el-input v-model="scope.row.unit" placeholder="" ></el-input>
- </template>
- </el-table-column>
- </el-table>
- </template>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="skipshow">纭� 瀹�</el-button>
- </span>
- </el-dialog>
- </div>
-
+ <el-dialog title="鐗╂枡娓呭崟鐨勭淮鎶�" :visible.sync="dialogVisible" width="80%" :before-close="handleClose" :center="true">
+ <div>
+ <el-form>
+ <el-row :gutter="2">
+ <el-col :span="8">
+ <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-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="宸ュ簭">
+ <template>
+ <el-select v-model="search.work" placeholder="璇烽�夋嫨" allow-create filterable @change="workevent">
+ <el-option v-for="(item,index) in process" :key="item.name" :label="item.name" :value="item.name">
+ </el-option>
+ </el-select>
+ </template>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="宸ヨ壓鍚嶇О:">
+ <el-select v-model="search.craft" size="small" placeholder="璇烽�夋嫨"
+ style="width: 224px;margin-right: 30px;">
+ <el-option v-for="item in craftapi" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <el-button size="mini" @click="Addrow">娣诲姞琛�</el-button>
+ </div>
+ <div style="margin: 10px 0px;">
+ <template>
+ <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>
+ </template>
+ </el-table-column>
+ <el-table-column prop="name" label="鍘熸潗鏂欏悕绉�">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.name" placeholder=""></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="address" label="瑙勬牸鍨嬪彿">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.specifications" placeholder=""></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="unit" label="鍗曚綅">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.unit" placeholder=""></el-input>
+ </template>
+ </el-table-column>
+ </el-table>
+ </template>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="skipshow">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ </div>
<div class="choose">
- <span>绫诲瀷锛�</span>
- <el-select v-model="search.type" size="small" @change="TYpe" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
+ <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>
@@ -136,15 +105,11 @@
</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="height: 500px;overflow-y: auto;"
- highlight-current
- :props="{children: 'children',label: 'name'}"
- node-key="name"
- default-expand-all
- @node-click="handleNodeClick" >
+ <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
+ :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>
@@ -155,7 +120,7 @@
</el-tree>
</div>
<div class="right">
- <el-table :data="tableData" border style="width: 100%;overflow-y: auto;min-height: 100%" max-height="100%"
+ <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>
@@ -183,41 +148,41 @@
</div>
</template>
<script>
-export default {
+ export default {
data() {
return {
- search:{
+ search: {
type: 0,
technology: ''
},
- list:[],
- process:{},
+ list: [],
+ process: {},
// handleClose:[],
- checkTreeNode:{
- id:2,
+ checkTreeNode: {
+ id: 2,
},
- tableData:[],
- tableapi:[{
- supplier:'',
- qualityTraceability:'',
- name:'',
- specifications:'',
- unit:'',
- }],
- addsearch:{},
- upData:{},
- form:{},
- dialogVisible:false,
- typeselect:0,
- input:'',
- craftapi:[],
- }
- },
- mounted() {
- this.selectAllleft()
- this.selectAllMbom()
+ tableData: [],
+ tableapi: [{
+ supplier: '',
+ qualityTraceability: '',
+ name: '',
+ specifications: '',
+ unit: '',
+ }],
+ addsearch: {},
+ upData: {},
+ form: {},
+ dialogVisible: false,
+ typeselect: 0,
+ input: '',
+ craftapi: [],
+ }
},
- methods:{
+ mounted() {
+ this.selectAllleft()
+ this.selectAllMbom()
+ },
+ methods: {
selectDataList() {
this.list.forEach(a => {
a.code = '[1]'
@@ -234,39 +199,41 @@
})
this.upIndex++
},
- workevent(val){
- console.log(val);
- let idx = this.process.findIndex(el => el.name === val)
- this.craftapi = this.process[idx].children
- },
+ workevent(val) {
+ console.log(val);
+ let idx = this.process.findIndex(el => el.name === val)
+ this.craftapi = this.process[idx].children
+ },
//鏂板
chooseTechFath() {
- this.$axios.get(this.$api.url.chooseTechFath,{
- params:{type:this.typeselect}
- }).then(res => {
- this.process = res.data;
- console.log(this.process);
- }, {
- headers: {
- "Content-Type": "application/json"
- }
- })
+ this.$axios.get(this.$api.url.chooseTechFath, {
+ params: {
+ type: this.typeselect
+ }
+ }).then(res => {
+ this.process = res.data;
+ console.log(this.process);
+ }, {
+ headers: {
+ "Content-Type": "application/json"
+ }
+ })
},
addMbom(data) {
- this.$axios.post(this.$api.url.addMbom,data
- // {
+ this.$axios.post(this.$api.url.addMbom, data
+ // {
// name:this.tableapi.name,
// qualityTraceability:this.tableapi.qualityTraceability,
// specifications:this.tableapi.specifications,
// supplier:this.tableapi.supplier,
// techTemId:this.craftapi.id,
// unit:this.tableapi.unit,
- // }
- , {
- headers: {
- "Content-Type": "application/json"
- }
- }).then(res =>{
+ // }
+ , {
+ headers: {
+ "Content-Type": "application/json"
+ }
+ }).then(res => {
console.log(res);
this.$message.success('娣诲姞瀹屾垚')
this.selectAllMbom()
@@ -276,11 +243,11 @@
//鍒犻櫎
material(index) {
console.log(this.upData.id);
- this.$axios.post(this.$api.url.material,{
- id:this.upData.id
- }).then(res =>{
+ this.$axios.post(this.$api.url.material, {
+ id: this.upData.id
+ }).then(res => {
this.$message.success(res.message)
- this.tableData.splice(index,1)
+ this.tableData.splice(index, 1)
// console.log(res);
})
@@ -294,61 +261,64 @@
},
//宸﹁竟
selectAllleft() {
- this.$axios.get(this.$api.url.selectAllleft,{
- 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) // 榛樿閫変腑鑺傜偣绗竴涓�
- })
- }, {
- headers: {
- "Content-Type": "application/json"
- }
- })
+ this.$axios.get(this.$api.url.selectAllleft, {
+ 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) // 榛樿閫変腑鑺傜偣绗竴涓�
+ })
+ }, {
+ headers: {
+ "Content-Type": "application/json"
+ }
+ })
},
//鍙宠竟
selectAllMbom() {
- this.$axios.get(this.$api.url.selectAllMbom,{
- params:{id:this.checkTreeNode.id}
- }).then(res => {
- this.tableData = res.data;
- console.log(this.tableData);
- }, {
- headers: {
- "Content-Type": "application/json"
- }
- })
+ this.$axios.get(this.$api.url.selectAllMbom, {
+ params: {
+ id: this.checkTreeNode.id
+ }
+ }).then(res => {
+ this.tableData = res.data;
+ console.log(this.tableData);
+ }, {
+ headers: {
+ "Content-Type": "application/json"
+ }
+ })
},
- handleNodeClick(data){
- this.checkTreeNode = data
+ handleNodeClick(data) {
+ this.checkTreeNode = data
console.log(this.checkTreeNode.id);
this.selectAllMbom()
- },
+ },
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
- .then(_ => {
- done();
- })
- .catch(_ => {});
+ .then(_ => {
+ done();
+ })
+ .catch(_ => {});
},
- event(){
- this.dialogVisible = true
+ event() {
+ this.dialogVisible = true
this.chooseTechFath()
- },
- Addrow() {
- if (this.tableapi == undefined) {
- this.tableapi = new Array();
- }
- let obj = [];
-
- this.tableapi.push(obj);
},
- skipshow(){
+ Addrow() {
+ if (this.tableapi == undefined) {
+ this.tableapi = new Array();
+ }
+ let obj = [];
+
+ this.tableapi.push(obj);
+ },
+ skipshow() {
console.log('666');
let data = this.tableapi.at(-1)
// this.addMbom()
@@ -357,17 +327,17 @@
// console.log(data);
this.addMbom(data)
-
+
this.dialogVisible = false
},
//delAllMbom 鎵归噺鍒犻櫎
delAllMbom() {
- this.$axios.post(this.$api.url.delAllMbom,{
- ids:this.delete
- }).then(res =>{
- this.selectAllMbom()
- })
- },
+ this.$axios.post(this.$api.url.delAllMbom, {
+ ids: this.delete
+ }).then(res => {
+ this.selectAllMbom()
+ })
+ },
dels() {
this.selects.forEach(a => {
for (var b = 0; b < this.tableData.length; b++) {
@@ -396,8 +366,8 @@
this.material(index)
},
- }
- }
+ }
+ }
</script>
<style scoped>
@@ -416,7 +386,8 @@
.title * {
font-size: 16px;
}
- .choose-1{
+
+ .choose-1 {
padding: 5px 24px;
display: flex;
align-items: center;
@@ -455,6 +426,7 @@
height: calc(100% - 20px);
border-right: 3px solid rgb(245, 247, 251);
padding: 16px;
+ overflow-y: auto;
}
.thing .left .custom-tree-node span {
@@ -513,4 +485,4 @@
height: 30px;
border-radius: 2px;
}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/components/view/processInspection.vue b/src/components/view/processInspection.vue
index f844244..a4d05e1 100644
--- a/src/components/view/processInspection.vue
+++ b/src/components/view/processInspection.vue
@@ -5,137 +5,70 @@
<el-row>
<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-download" size="mini">瀵煎嚭</el-button>
</el-col>
</el-row>
</div>
<div class="nav">
<span>妫�楠岀姸鎬侊細</span>
- <el-select
- size="small"
- v-model="search.result"
- placeholder="璇烽�夋嫨妫�娴嬬姸鎬�"
- style="width: 224px;margin-right: 52px;"
- >
+ <el-select size="small" v-model="search.result" placeholder="璇烽�夋嫨妫�娴嬬姸鎬�" style="width: 224px;margin-right: 52px;">
<el-option :value="''" label="鍏ㄩ儴"></el-option>
<el-option :value="1" label="宸叉娴�"></el-option>
<el-option :value="2" label="寰呮娴�"></el-option>
</el-select>
<span>浜у搧鍚嶇О锛�</span>
- <el-input
- size="small"
- style="width: 224px;margin-right: 30px;"
- v-model="search.name"
- placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�"
- ></el-input>
+ <el-input size="small" style="width: 224px;margin-right: 30px;" v-model="search.name"
+ placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�"></el-input>
<span>宸ュ簭锛�</span>
- <el-input
- size="small"
- style="width: 224px;margin-right: 30px;"
- v-model="search.techfather"
- placeholder="璇疯緭鍏ュ伐搴�"
- ></el-input>
+ <el-input size="small" style="width: 224px;margin-right: 30px;" v-model="search.techfather"
+ placeholder="璇疯緭鍏ュ伐搴�"></el-input>
<el-button size="mini"><span>閲� 缃�</span></el-button>
- <el-button size="mini" type="primary" style="background: #004EA2;"
- ><span>鏌� 璇�</span></el-button
- >
+ <el-button size="mini" 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' }"
+ <el-table ref="inspectionTable" height="calc(100vh - 320px)" :cell-style="{ textAlign: 'center' }"
:header-cell-style="{
border: '0px',
background: '#f5f7fa',
color: '#606266',
boxShadow: 'inset 0 1px 0 #ebeef5',
textAlign: 'center'
- }"
- border
- :data="inspectionTable"
- style="width: 100%"
- >
+ }" 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>
- <el-table-column
- prop="order_number"
- label="璁㈠崟缂栧彿"
- min-width="90"
- />
+ <el-table-column label="搴忓彿" type="index" width="60"></el-table-column>
+ <el-table-column prop="order_number" label="璁㈠崟缂栧彿" min-width="90" />
<el-table-column prop="material" label="浜у搧鍚嶇О" min-width="80" />
- <el-table-column
- prop="specifications_model"
- label="瑙勬牸鍨嬪彿"
- min-width="60"
- />
+ <el-table-column prop="specifications_model" label="瑙勬牸鍨嬪彿" min-width="60" />
<el-table-column prop="techfather" label="宸ュ簭" min-width="70" />
<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="60" />
<el-table-column prop="name" label="鎶ユ浜�" min-width="50" />
- <el-table-column
- prop="updateTime"
- label="妫�娴嬫棩鏈�"
- min-width="60"
- />
+ <el-table-column prop="updateTime" label="妫�娴嬫棩鏈�" min-width="60" />
<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 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">
<template slot-scope="scope">
- <el-button type="text" size="small" style="margin-left: 0;"
- >璇︽儏</el-button
- >
- <el-button
- type="text"
- size="small"
- @click="handleClick(scope.row)"
- >鏌ョ湅</el-button
- >
- <el-button type="text" size="small" style="margin-left: 0;"
- >缂栬緫</el-button
- >
+ <el-button type="text" size="small" style="margin-left: 0;">璇︽儏</el-button>
+ <el-button type="text" size="small" @click="handleClick(scope.row)">鏌ョ湅</el-button>
+ <el-button type="text" size="small" style="margin-left: 0;">缂栬緫</el-button>
</template>
</el-table-column>
</el-table>
</div>
<!-- 鍒嗛〉鍣� -->
<div class="pagination">
- <el-pagination
- :current-page="1"
- :page-sizes="[10, 20, 30, 40]"
- :page-size="pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="inspectionTableTotal"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- />
+ <el-pagination :current-page="1" :page-sizes="[10, 20, 30, 40]" :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper" :total="inspectionTableTotal" @size-change="handleSizeChange"
+ @current-change="handleCurrentChange" />
</div>
</div>
</div>
@@ -146,109 +79,60 @@
<el-col :span="12">鏂板杩囩▼妫�楠屽崟</el-col>
<el-col :span="12" style="text-align: right;">
<!-- 鐐瑰嚮杩斿洖锛屽綋鍓嶉〉闈㈠�间负false -->
- <el-button
- type="primary"
- size="mini"
- style="background: #004EA2; "
- icon="el-icon-circle-plus-outline"
- >鏂板</el-button
- >
- <el-button
- @click="showAddPage = false"
- type="primary"
- size="mini"
- icon="el-icon-back"
- style="background: #004EA2; "
- >杩斿洖</el-button
- >
+ <el-button type="primary" size="mini" style="background: #004EA2; "
+ icon="el-icon-circle-plus-outline">鏂板</el-button>
+ <el-button @click="showAddPage = false" type="primary" size="mini" icon="el-icon-back"
+ style="background: #004EA2; ">杩斿洖</el-button>
</el-col>
</el-row>
- <el-form
- :model="addInspectionform"
- ref="addInspectionform"
- class="addInspectionform"
- label-position="right"
- label-width="120px"
- size="small"
- >
+ <el-form :model="processInspectVo" ref="addInspectionform" class="addInspectionform" label-position="right"
+ label-width="120px" size="small">
<div class="formwrapper">
<el-row :gutter="230">
<el-col :span="7">
<el-form-item label="璁㈠崟鍙凤細">
- <el-input
- style="width: 210px;"
- size="small"
- v-model="addInspectionform.number"
- placeholder="璇疯緭鍏ヨ鍗曞彿"
- />
+ <el-input @blur="selectInfoByOrderId" style="width: 210px;" size="small"
+ v-model="processInspectVo.orderNumber" placeholder="璇疯緭鍏ヨ鍗曞彿" />
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="浜у搧鍚嶇О锛�">
- <el-input
- style="width: 210px;"
- size="small"
- v-model="addInspectionform.code"
- placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�"
- />
+ <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>
</el-col>
<el-col :span="7">
<el-form-item label="浜у搧缂栫爜锛�">
- <el-input
- style="width: 210px;"
- size="small"
- disabled
- v-model="addInspectionform.code"
- 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="addInspectionform.number"
- 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
- v-model="value"
- placeholder="璇烽�夋嫨"
- style="width: 210px;"
- size="small"
- >
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
+ <el-select @change="changeOptionSoptionSprocesses" v-model="processInspectVo.techfather"
+ placeholder="璇烽�夋嫨" style="width: 210px;" size="small">
+ <el-option v-for="item in optionSoptionSprocesses" :key="item.name" :label="item.name"
+ :value="item.name">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="宸ヨ壓鍚嶇О锛�">
- <el-select
- v-model="value"
- placeholder="璇烽�夋嫨"
- style="width: 210px;"
- size="small"
- >
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
+ <el-select v-model="processInspectVo.techname" placeholder="璇烽�夋嫨" style="width: 210px;" size="small">
+ <el-option v-for="item in optionTechnology" :key="item.id" :label="item.name"
+ :value="item.id + '-' + item.name">
</el-option>
</el-select>
</el-form-item>
@@ -257,31 +141,17 @@
<el-row :gutter="230">
<el-col :span="7">
<el-form-item label="鍗曚綅锛�">
- <el-input
- style="width: 210px;"
- size="small"
- disabled
- v-model="addInspectionform.quantity"
- placeholder="璇疯緭鍏ュ崟浣�"
- />
+ <el-input style="width: 210px;" size="small" disabled v-model="processInspectVo.unit"
+ placeholder="璇疯緭鍏ュ崟浣�" />
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="鏁伴噺锛�">
- <el-input
- style="width: 210px;"
- size="small"
- v-model="addInspectionform.quantity"
- placeholder="璇疯緭鍏ユ暟閲�"
- />
+ <el-input style="width: 210px;" size="small" v-model="processInspectVo.quantity" placeholder="璇疯緭鍏ユ暟閲�" />
</el-form-item>
</el-col>
- <el-col :span="7">
- <el-button
- type="primary"
- style="float: right; font-size: 14px; !important"
- >鐢熸垚妫�楠岄」鐩�</el-button
- >
+ <el-col :span="10" style="display: flex;justify-content: end;">
+ <el-button type="primary" @click="addTestProjevt">鐢熸垚妫�楠岄」鐩�</el-button>
</el-col>
</el-row>
</div>
@@ -291,92 +161,52 @@
<el-row>
<el-col :span="12" class="inspectionProject_span">妫�楠岄」鐩�</el-col>
<el-col :span="12" class="inspectionProject_span">
- <el-button size="mini" @click="clickDeleteInspectionColumn()"
- >鍒犻櫎妫�楠屽�煎垪</el-button
- >
- <el-button
- style="margin-right: 30px;"
- size="mini"
- @click="clickAddInspectionColumn()"
- >娣诲姞妫�楠屽�煎垪</el-button
- >
- <el-button
+ <el-button size="mini" @click="clickDeleteInspectionColumn()">鍒犻櫎妫�楠屽�煎垪</el-button>
+ <el-button style="margin-right: 30px;" size="mini" @click="clickAddInspectionColumn()">娣诲姞妫�楠屽�煎垪</el-button>
+ <!-- <el-button
size="mini"
style="margin-right: 30px;"
@click="clickAddLine()"
>娣诲姞妫�楠岃</el-button
- >
+ > -->
</el-col>
</el-row>
- <el-table
- :data="inspectionItems"
- height="calc(100vh - 550px)"
- style="width: 100%"
- >
- <el-table-column
- type="index"
- label="搴忓彿"
- width="60"
- ></el-table-column>
- <el-table-column prop="material" label="椤圭洰"></el-table-column>
+ <el-table :row-key="inspectionItems.id" :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)" style="width: 100%">
+ <el-table-column type="index" label="搴忓彿" width="60"></el-table-column>
+ <el-table-column label="椤圭洰" prop="father"></el-table-column>
+ <el-table-column prop="name" label="鎸囨爣"></el-table-column>
<el-table-column prop="unit" label="鍗曚綅"></el-table-column>
- <el-table-column prop="standardVal" label="鏍囧噯鍊�"></el-table-column>
- <el-table-column prop="controlVal" label="鍐呮祴鍊�"></el-table-column>
- <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>
- </template>
- </el-table-column>
+ <el-table-column prop="required" label="鏍囧噯鍊�"></el-table-column>
+ <el-table-column prop="internal" label="鍐呮祴鍊�"></el-table-column>
+ <el-table-column prop="inspectionValue" label="妫�娴嬪��" min-width="100" style="text-align: center;">
+ <template slot-scope="scope">
+ <el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�"
+ placement="top-start">
+ <el-input :disabled="scope.row.deviceId === null" :value="item"
+ @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
+ </el-tooltip>
+ </template>
+ </el-table-column>
<el-table-column label="璇曢獙璁惧">
<template slot-scope="scope">
{{ scope.row.device }}
- <el-select
- v-model="scope.row.device"
- size="small"
- slot="append"
- style="width: 100px;"
- >
+ <el-select v-model="scope.row.device" size="small" slot="append" style="width: 100px;">
<el-option value="閫夐」1"></el-option>
<el-option value="閫夐」2"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column prop="conclusion" label="缁撹">
+ <el-table-column label="缁撹">
<template slot-scope="scope">
- <span style="color: #34BD66;" v-if="scope.row.insState == 1"
- >鍚堟牸</span
- >
- <span style="color: #E84738;" v-else-if="scope.row.insState == 0"
- >涓嶅悎鏍�</span
- >
+ <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 v-if="detailId == null" label="鎿嶄綔" width="100">
- <template slot-scope="scope">
- <el-button type="text" @click="clickDeleteline(scope)"
- >鍒犻櫎</el-button
- >
- </template>
- </el-table-column>
+ <template slot-scope="scope">
+ <el-button type="text" @click="clickDeleteline(scope)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
</el-table>
</div>
<div class="inspectionResult">
@@ -397,6 +227,7 @@
export default {
data() {
return {
+ detailId: null,
search: {
countSize: 10,
pageSize: 1,
@@ -404,13 +235,29 @@
name: "", // 浜у搧鍚嶇О
techfather: "" // 宸ュ簭
},
+ optionsSamplename: [],
inspectionTable: [],
+ optionSoptionSprocesses: [],
+ optionTechnology: [],
inspectionTableTotal: "",
+ treeProject: [],
// 娣诲姞鍒�
- empiricalValueAdd: 1,
+ empiricalValueAdd: [],
// 缂栬緫鏃跺瓨鍌ㄦ渶闀跨殑鍒楁暟瀛楋紝鍋氬垹闄ゅ垽鏂�
empiricalValueAddMaxNumber: 0,
showAddPage: false,
+ processInspectVo: {
+ material: null,
+ materialCode: null,
+ orderNumber: "D-001",
+ quantity: null,
+ specificationsModel: null,
+ techfather: null,
+ techname: null,
+ technologyId: null,
+ unit: null
+ },
+ InspectioniD: null,
addInspectionform: [
{
number: "",
@@ -425,8 +272,8 @@
group: "",
worker: "",
machine: ""
- }
- ],
+ }]
+ ,
inspectionItems: [], // 鏂板妫�楠岄」鐩〃鏍�
inspectionResultForm: [
{
@@ -437,36 +284,151 @@
operation: ""
}
],
- options: [
- {
- value: "閫夐」1",
- label: "榛勯噾绯�"
- },
- {
- value: "閫夐」2",
- label: "鍙岀毊濂�"
- },
- {
- value: "閫夐」3",
- label: "铓典粩鐓�"
- },
- {
- value: "閫夐」4",
- label: "榫欓』闈�"
- },
- {
- value: "閫夐」5",
- label: "鍖椾含鐑ら腑"
- }
- ],
- value: ""
+ options: [],
+ value: "",
+ rowList: [],
+ spanArr: [],
+ position: 0
};
+ },
+ mounted() {
+ // this.getTableData()
},
methods: {
// 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
handleSizeChange(val) {
this.search.countSize = val;
this.defaultInitializationTable();
+ },
+ getInsArr(val){
+ console.log(val);
+ return val.split(",")
+ },
+ handleSpanMethod({ row, column, rowIndex, columnIndex }) {
+ if (columnIndex === 0) {
+ const _row = this.spanArr[rowIndex];
+ const _col = _row>0 ? 1 : 0;
+ return {
+ rowspan: _row,
+ colspan: _col
+ }
+ }
+ if(columnIndex === 1){
+ const _row = this.spanArr[rowIndex];
+ const _col = _row>0 ? 1 : 0;
+ return {
+ rowspan: _row,
+ colspan: _col
+ }
+ }
+ },
+ // 鍚堝苟琛ㄦ牸
+ mergeTable() {
+ this.rowList=[]
+ this.spanArr=[]
+ this.position=0
+ this.inspectionItems.forEach((item,index) => {
+ if( index === 0){
+ this.spanArr.push(1);
+ this.position = 0;
+ }else{
+ if(this.inspectionItems[index].father === this.inspectionItems[index-1].father ){
+ this.spanArr[this.position] += 1;
+ this.spanArr.push(0);
+ }else{
+ this.spanArr.push(1);
+ this.position = index;
+ }
+ }
+ })
+ },
+ changeOptionSoptionSprocesses() {
+ this.optionTechnology = []
+ let working = this.optionSoptionSprocesses.filter(item => {
+ return item.name === this.processInspectVo.techfather
+ })[0]
+ this.optionTechnology = working.children
+ },
+ addTestProjevt() {
+ let val = JSON.parse(JSON.stringify(this.processInspectVo))
+ val.techname = this.processInspectVo.techname.split("-")[1]
+ val.technologyId = this.processInspectVo.techname.split("-")[0]
+ this.$axios.post(this.$api.url.processInspectAddProcess, {
+ material: val.material,
+ materialCode: val.materialCode,
+ orderNumber: val.orderNumber,
+ quantity: val.quantity,
+ specificationsModel: val.specificationsModel,
+ techfather: val.techfather,
+ techname: val.techname,
+ technologyId: val.technologyId,
+ unit: val.unit
+ }, {
+ headers: { "Content-Type": "application/json" }
+ }).then(res => {
+ if (res.code === 201) {
+ this.$message({
+ message: res.message,
+ type: 'warning'
+ });
+ return
+ }
+ this.InspectioniD = res.data
+ this.getTableData()
+ })
+ },
+ getTableData() {
+ this.$axios.get(this.$api.url.inspectionItemListUser, {
+ params: {
+ id: 28,
+ type: 1
+ }
+ }).then(res => {
+ this.inspectionItems = res.data
+ let arr = []
+ let val=JSON.parse(JSON.stringify(this.inspectionItems))
+ //杞垚涓�缁存暟缁�
+ val.forEach(l => {
+ let father = l.father
+ l.children.forEach(c => {
+ c.father = father
+ c.empiricalValueAdd=[]
+ arr.push(c)
+ })
+ })
+ this.inspectionItems = arr
+ console.log(this.inspectionItems);
+ this.mergeTable(arr)
+ })
+ },
+ selectSample() {
+ let sample = this.optionsSamplename.filter(item => {
+ return item.name === this.processInspectVo.material
+ })[0]
+ this.processInspectVo.techfather = null
+ this.processInspectVo.techname = null
+ this.processInspectVo.materialCode = sample.code
+ this.processInspectVo.specificationsModel = sample.specifications
+ this.processInspectVo.unit = sample.unit
+ this.optionSoptionSprocesses = []
+ this.optionSoptionSprocesses = sample.children
+ },
+ selectInfoByOrderId() {
+ this.$axios.get(this.$api.url.chooseMaterProcessInspect, {
+ params: {
+ orderNumber: this.processInspectVo.orderNumber
+ }
+ }).then(res => {
+ if (res.data.length > 0) {
+ console.log(res.data);
+ this.optionsSamplename = res.data
+ } else {
+ this.$message({
+ message: '娌℃湁璇ヨ鍗曞彿锛�',
+ type: 'warning'
+ });
+ }
+ })
},
// 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤�
handleCurrentChange(val) {
@@ -476,6 +438,7 @@
// 鏄剧ず鏂板椤甸潰
handleAddNew() {
this.showAddPage = true;
+ this.getTableData()
},
// 琛ㄦ牸鍒濆鍖栨帴鍙�
defaultInitializationTable() {
@@ -535,52 +498,66 @@
align-items: center;
background-color: #fff;
}
+
.table_header {
height: calc(100vh - 550px);
}
+
.nav * {
font-size: 14px;
}
+
.content-body .rawPage {
background-color: #fff;
overflow: hidden;
}
+
.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 .el-table {
background-color: #fff;
padding: 10px 12px;
}
+
.inspectionResult span {
display: block;
padding: 5px 0px;
}
+
.inspectionResult .el-table {
background-color: #fff;
padding: 10px 12px;
}
+
.inspectionProject_span {
line-height: 32px;
padding: 10px 20px;
}
+
.inspectionProject_span .el-button {
float: right;
font-size: 13px !important;
diff --git a/src/components/view/record-content.vue b/src/components/view/record-content.vue
index fd9e74b..504470a 100644
--- a/src/components/view/record-content.vue
+++ b/src/components/view/record-content.vue
@@ -46,6 +46,7 @@
height: calc(100% - 20px);
border-right: 3px solid rgb(245, 247, 251);
padding: 16px;
+ overflow-y: auto;
}
.thing .left .custom-tree-node span {
@@ -141,7 +142,6 @@
<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"
- style="height: 500px;overflow-y: auto;"
:props="{children: 'children',label: 'name'}" node-key="name" default-expand-all
@node-click="handleNodeClick" highlight-current
:key="upIndex">
diff --git a/src/components/view/sale.vue b/src/components/view/sale.vue
index bdec015..b106e8f 100644
--- a/src/components/view/sale.vue
+++ b/src/components/view/sale.vue
@@ -132,9 +132,8 @@
<span>鐘舵�侊細</span>
<el-select v-model="search.type" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
<el-option label="鍏ㄩ儴" :value="null"></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="1"></el-option>
+ <el-option label="涓嶉�氳繃" :value="0"></el-option>
</el-select>
<span>浜よ揣鏃ユ湡锛�</span>
<el-date-picker v-model="search.delTime" size="small" placeholder="璇疯緭鍏�" style="width: 224px;margin-right: 30px;"
@@ -174,7 +173,8 @@
<span class="table_do" @click="changeShowDetail(scope.row)"> 鏌ョ湅璇︽儏 </span>
<span class="table_do" v-if="scope.row.type==null" @click="saleCheck(scope)"> 瀹℃牳 </span>
<span class="table_do" v-else> </span>
- <span class="table_do" @click="openUpDia(scope.row.id)"> 缂栬緫 </span>
+ <span class="table_do" v-if="scope.row.type==null" @click="openUpDia(scope.row.id)"> 缂栬緫 </span>
+ <span class="table_do" v-else> </span>
<span class="table_do" @click="delSale(scope.$index)"> 鍒犻櫎 </span>
</template>
</el-table-column>
@@ -402,7 +402,7 @@
delTime: null
},
tableData: [],
- selects: [],
+ selects: '',
currentPage: 1,
countSize: 0,
pageSize: 10,
@@ -430,7 +430,13 @@
},
methods: {
handleSelectionChange(val) {
- this.selects = val.id;
+ this.selects = ''
+ val.forEach((a, ai)=>{
+ this.selects += a.id
+ if(ai!=val.length-1){
+ this.selects += ','
+ }
+ })
},
handleSizeChange(val) {
this.pageSize = val
@@ -456,7 +462,7 @@
})
},
clean() {
- this.selects = []
+ this.selects = ''
this.currentPage = 1
this.countSize = 0
this.pageSize = 10
@@ -464,7 +470,8 @@
formTime: null,
createTime: null,
insState: 2,
- judgeState: 2
+ judgeState: 2,
+ type: null
}
this.selectRawInspectsList()
},
@@ -565,7 +572,6 @@
})
},
upSale() {
- console.log(this.addData);
for (var b = 0; b < this.addData.saleMaterialList.length; b++) {
if (Object.keys(this.addData.saleMaterialList[b]).length == 0) {
this.addData.saleMaterialList.splice(b, 1)
@@ -581,7 +587,8 @@
}
}
for (var a in this.addData) {
- if ((this.addData[a] == null || this.addData[a] == '') && a != 'type') {
+ console.log(a);
+ if ((this.addData[a] == null || this.addData[a] == '') && a!='checkname' && a!='checkTime' && a != 'type') {
if (a == 'saleMaterialList') {
this.$message.error('浜у搧淇℃伅涓嶈兘涓虹┖')
} else {
@@ -612,13 +619,12 @@
})
},
delSales(){
- console.log(this.selects);
+ if(this.selects=='') {
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹垹闄�')
+ return
+ }
this.axios.post(this.$api.url.delAllSale,{
ids: this.selects
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
}).then(res=>{
this.$message.success('鍒犻櫎鎴愬姛')
this.selectRawInspectsList()
diff --git a/src/components/view/self-inspection.vue b/src/components/view/self-inspection.vue
index a10d40f..55b8cbc 100644
--- a/src/components/view/self-inspection.vue
+++ b/src/components/view/self-inspection.vue
@@ -141,7 +141,7 @@
<div class="thing">
<div class="left">
<el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" size="small" clearable @input="(val)=>$refs.tree.filter(val)"></el-input>
- <el-tree :data="list" style="height: 500px;overflow-y: auto;" ref="tree" :props="{children: 'children',label: 'name'}" node-key="name" default-expand-all
+ <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'name'}" node-key="name" default-expand-all
@node-click="handleNodeClick" highlight-current @node-expand="nodeOpen" @node-collapse="nodeClose" :filter-node-method="filterNode"
:key="upIndex">
<div class="custom-tree-node" slot-scope="{ node, data }">
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index c757612..2018424 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -5,7 +5,7 @@
<el-col :span="12" style="line-height: 32px;">鏍囧噯BOM</el-col>
<el-col :span="12" style="text-align: right;">
<el-button type="primary" icon="el-icon-plus" style="background: #004EA2;"
- @click="showBomAddModel">鏂板</el-button>
+ @click="bomAddModelVisible = true">鏂板</el-button>
<el-button icon="el-icon-plus">鏂板鐗堟湰</el-button>
<el-button @click="bomRightDl=true" icon="el-icon-delete">鍒犻櫎</el-button>
</el-col>
@@ -32,8 +32,6 @@
</div>
</el-tree>
</div>
-
-
<div class="right">
<div class="choose">
<span>绫诲瀷锛�</span>
@@ -45,30 +43,28 @@
<el-option :value="3" label="鐢熶骇宸ヨ壓"></el-option>
</el-select>
<span>{{ tableType == 1 ? '椤圭洰锛�' : '宸ヨ壓鍚嶇О锛�' }}</span>
- <el-input v-model="searchName" size="small" placeholder="璇疯緭鍏�" style="width: 224px;margin-right: 24px;"
+ <el-input v-model="searchName" size="small" placeholder="璇疯緭鍏�" style="width: 224px;margin-right: 50px;"
clearable></el-input>
- <span>{{ tableType == 1 ? '鐗堟湰锛�' : '鐗堟湰锛�' }}</span>
- <el-select size="small" v-model="VER" @change="verevent" style="width: 280px;" placeholder="璇烽�夋嫨">
+ <span>鐗堟湰锛�</span>
+ <el-select v-model="version2" @change="verevent" size="small" style="width: 280px;margin-right: 10px;" placeholder="璇烽�夋嫨">
<el-option v-for="item in version" :key="item" :label="item" :value="item">
</el-option>
</el-select>
- <el-button style="margin-left:10px;" size="mini" @click="() => { searchName = ''; selectProductTableData() }"><span>閲� 缃�</span></el-button>
+ <el-button size="mini" @click="() => { searchName = ''; selectProductTableData() }"><span>閲� 缃�</span></el-button>
<el-button size="mini" type="primary" style="background: #004EA2;" @click="selectProductTableData"><span>鏌�
璇�</span></el-button>
</div>
- <div v-if="this.typeselect == 0">
+ <div class="contentTable" v-if="this.typeselect == 0">
<technology :tableType="tableType" :tableData="tableData"></technology>
</div>
<div v-if="this.typeselect == 1">
<target :tableType="tableType" :tableData="tableData"></target>
</div>
<div v-if="this.typeselect == 2">
- <material :tableType="tableType" :tableData="tableData"></material>
+ <bom :tableType="tableType" :tableData="tableData"></bom>
</div>
- <div v-if="this.typeselect == 3">
- <product :tableType="tableType" :tableData="tableData"></product>
- </div>
+ <div v-if="this.typeselect == 3">鐢熶骇宸ヨ壓</div>
</div>
</div>
@@ -336,11 +332,11 @@
<script>
import technology from "./standard-table/technology.vue"
import material from "./standard-table/material.vue"
-import target from "./standard-table/target.vue"
-import product from "./standard-table/product.vue"
+// import bom from "./standard-table/bom.vue"
import bomClickAdd from '@/components/view/standard-box/bomClickAdd'
export default {
- components: { technology,material,target,product,bomClickAdd },
+ components: { technology,material,bomClickAdd },
+
data() {
var checkPq = (rule,value,callback)=>{
if(value!='' && !Number.isInteger(value)){
@@ -454,7 +450,7 @@
name: null,
specifications: null
},
- VER: {},
+ version2: {},
verdata: {},
character: 0,
restaurants: [],
@@ -576,7 +572,7 @@
this.$refs[formName].resetFields();
},
leftAddBom(){
-
+
},
//鍙充晶bom,纭鏂板
confirmAdd(formName){
@@ -840,6 +836,7 @@
TYPE(val) {//绫诲瀷.鏁版嵁
// console.log(val);
this.typeselect = val
+
// console.log(this.typeselect);
this.selectVersion()
},
@@ -866,7 +863,7 @@
return this.verdata[0]
})
this.character=v
- this.VER="v"+v
+ this.version2="v"+v
this.selectAll()
},
//鍙充晶鏁版嵁
diff --git a/src/components/view/technology.vue b/src/components/view/technology.vue
index 6fa3369..1693634 100644
--- a/src/components/view/technology.vue
+++ b/src/components/view/technology.vue
@@ -46,6 +46,7 @@
height: calc(100% - 20px);
border-right: 3px solid rgb(245, 247, 251);
padding: 16px;
+ overflow-y: auto;
}
.thing .left .custom-tree-node span {
@@ -174,7 +175,6 @@
node-key="name"
default-expand-all
@node-click="handleNodeClick"
- style="height: 500px;overflow-y: auto;"
:key="upIndex"
highlight-current
>
diff --git a/src/main.js b/src/main.js
index a3be056..bf058d2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,12 +23,7 @@
Vue.use(qs);
Vue.use(api);
-const javaApi = 'http://192.168.0.23:8001'
-// localhost 127.0.0.1
-
-// const javaApi = 'http://127.0.0.1'
-
-
+const javaApi = 'http://192.168.0.24:8001/'
axios.defaults.baseURL = javaApi
axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
@@ -60,7 +55,6 @@
config.data = qs.parse(config.data)
// console.log(config.data)
}
-
return config
}, function(error) {
diff --git a/src/view/index.vue b/src/view/index.vue
index 09cfbd5..95ba3db 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -1,629 +1,582 @@
<style scoped>
-.all {
- width: 100vw;
- height: 100vh;
- background-size: 100% 100%;
- display: flex;
- flex-wrap: wrap;
-}
+ .all {
+ width: 100vw;
+ height: 100vh;
+ background-size: 100% 100%;
+ display: flex;
+ flex-wrap: wrap;
+ }
-.title {
- width: 100%;
- height: 58px;
- display: flex;
- align-items: center;
- padding: 0 30px;
-}
+ .title {
+ width: 100%;
+ height: 58px;
+ display: flex;
+ align-items: center;
+ padding: 0 30px;
+ }
-.logo {
- width: 130px;
-}
+ .logo {
+ width: 130px;
+ }
-.logo img {
- width: 100%;
- height: 100%;
-}
+ .logo img {
+ width: 100%;
+ height: 100%;
+ }
-.title .label {
- font-size: 18px;
- text-align: center;
- width: calc(100% - 130px - 200px);
-}
+ .title .label {
+ font-size: 18px;
+ text-align: center;
+ width: calc(100% - 130px - 200px);
+ }
-.user {
- width: 200px;
- height: 100%;
- display: flex;
- align-items: center;
- justify-content: right;
- color: #000;
-}
+ .user {
+ width: 200px;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: right;
+ color: #000;
+ }
-.user * {
- margin: 0 5px;
-}
+ .user * {
+ margin: 0 5px;
+ }
-.user img {
- margin-left: 20px;
- cursor: pointer;
- width: 14px;
-}
+ .user img {
+ margin-left: 20px;
+ cursor: pointer;
+ width: 14px;
+ }
-.user span {
- font-size: 14px;
-}
+ .user span {
+ font-size: 14px;
+ }
-.left {
- height: calc(100vh - 58px - 40px);
- background-color: #004ea2;
- display: flex;
- align-items: center;
- flex-direction: column;
- padding: 20px 0;
- transition: 0.3s;
- overflow-y: auto;
-}
+ .left {
+ height: calc(100vh - 58px - 40px);
+ background-color: #004ea2;
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+ padding: 20px 0;
+ transition: 0.3s;
+ overflow-y: auto;
+ }
-.left::-webkit-scrollbar {
- width: 0;
-}
+ .left::-webkit-scrollbar {
+ width: 0;
+ }
-.left .box {
- color: #fff;
- width: 68px;
- height: 68px;
- margin: 8px 0;
- cursor: pointer;
- display: flex;
- align-items: center;
- justify-content: center;
- flex-direction: column;
- border-radius: 8px;
-}
+ .left .box {
+ color: #fff;
+ width: 68px;
+ height: 68px;
+ margin: 8px 0;
+ cursor: pointer;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
+ border-radius: 8px;
+ }
-.left .box:active {
- opacity: 0.8;
-}
+ .left .box:active {
+ opacity: 0.8;
+ }
-.left .active_box {
- background-color: #fff;
- color: #004ea2;
-}
+ .left .active_box {
+ background-color: #fff;
+ color: #004ea2;
+ }
-.left .box i {
- font-size: 32px;
- margin-bottom: 8px;
-}
+ .left .box i {
+ font-size: 32px;
+ margin-bottom: 8px;
+ }
-.left .box div {
- font-size: 14px;
-}
+ .left .box div {
+ font-size: 14px;
+ }
-.small_menu {
- color: #666;
-}
+ .small_menu {
+ color: #666;
+ }
-.small_menu .active_p {
- color: #004ea2;
-}
+ .small_menu .active_p {
+ color: #004ea2;
+ }
-.small_menu p {
- padding: 12px 15px;
- cursor: pointer;
-}
+ .small_menu p {
+ padding: 12px 15px;
+ cursor: pointer;
+ }
-.small_menu p:hover {
- background-color: rgba(0, 0, 0, 0.05);
-}
+ .small_menu p:hover {
+ background-color: rgba(0, 0, 0, 0.05);
+ }
-.small_menu i {
- font-size: 16px;
-}
+ .small_menu i {
+ font-size: 16px;
+ }
-.small_menu span {
- font-size: 14px;
-}
+ .small_menu span {
+ font-size: 14px;
+ }
-.right {
- height: calc(100vh - 58px);
- transition: 0.3s;
-}
+ .right {
+ height: calc(100vh - 58px);
+ transition: 0.3s;
+ }
-.tag {
- width: 100%;
- height: 36px;
- background: rgb(255, 255, 255);
- opacity: 0.8;
- box-shadow: 0px 4px 16px rgba(0, 0, 0, 0.1);
- display: flex;
- align-items: center;
- color: #999;
- font-size: 14px;
-}
+ .tag {
+ width: 100%;
+ height: 36px;
+ background: rgb(255, 255, 255);
+ opacity: 0.8;
+ box-shadow: 0px 4px 16px rgba(0, 0, 0, 0.1);
+ display: flex;
+ align-items: center;
+ color: #999;
+ font-size: 14px;
+ }
-.tag > .el-icon-s-unfold,
-.el-icon-s-fold {
- font-size: 18px;
- cursor: pointer;
- margin: 0 8px;
-}
+ .tag .el-icon-delete {
+ display: none;
+ }
-.tabs {
- min-width: calc(100% - 34px);
- height: 100%;
- align-items: center;
- display: flex;
- overflow-x: auto;
-}
+ .tag .el-icon-delete:hover {
+ color: #F56C6C;
+ }
-.tab {
- cursor: pointer;
- font-size: 14px;
- margin: 0 8px;
- line-height: 32px;
- transition: 0.3s;
- border-top: 2px solid transparent;
- border-bottom: 2px solid transparent;
- user-select: none;
- flex-shrink: 0;
-}
+ .tag:hover .el-icon-delete {
+ display: block;
+ }
-.tab i {
- font-size: 12px;
- display: none;
-}
+ .tag>.el-icon-s-unfold,
+ .el-icon-s-fold,
+ .el-icon-delete {
+ font-size: 18px;
+ cursor: pointer;
+ margin: 0 8px;
+ }
-.active_tab {
- border-bottom: 2px solid #004ea2;
- color: #004ea2;
-}
+ .tabs {
+ min-width: calc(100% - 68px);
+ height: 100%;
+ align-items: center;
+ display: flex;
+ overflow-x: auto;
+ }
-.active_tab i {
- display: inline;
- color: #004ea2;
-}
+ .tab {
+ cursor: pointer;
+ font-size: 14px;
+ margin: 0 8px;
+ line-height: 32px;
+ transition: 0.3s;
+ border-top: 2px solid transparent;
+ border-bottom: 2px solid transparent;
+ user-select: none;
+ flex-shrink: 0;
+ }
-.component_view {
- height: calc(100vh - 94px - 22px);
- width: calc(100% - 48px);
- padding: 11px 24px;
- background: rgb(245, 247, 251);
- overflow-y: auto;
-}
+ .tab i {
+ font-size: 12px;
+ display: none;
+ }
-.com_index {
- width: 100%;
- height: 100%;
-}
+ .active_tab {
+ border-bottom: 2px solid #004ea2;
+ color: #004ea2;
+ }
+
+ .active_tab i {
+ display: inline;
+ color: #004ea2;
+ }
+
+ .component_view {
+ height: calc(100vh - 94px - 22px);
+ width: calc(100% - 48px);
+ padding: 11px 24px;
+ background: rgb(245, 247, 251);
+ overflow-y: auto;
+ }
+
+ .com_index {
+ width: 100%;
+ height: 100%;
+ }
</style>
<style></style>
<template>
- <div class="all">
- <div class="title">
- <div class="logo">
- <img src="../../static/img/logo 1.png" />
- </div>
- <div class="label">涓ぉ娴锋磱鏂颁竴浠om绯荤粺</div>
- <div class="user">
- <el-avatar :size="24">{{ userName.substring(0, 1) }}</el-avatar>
- <span>{{ userName }}</span>
- <img src="../../static/img/閫�鍑�.png" @click="out" />
- </div>
- </div>
- <div class="left" :style="`width: ${leftOpen ? '92' : '0'}px;`">
- <div
- :class="`box ${activeBox == 0 ? 'active_box' : ''}`"
- @click="addTab(menu[0].c[0])"
- >
- <i class="font icon-shouye"></i>
- <div>棣栭〉</div>
- </div>
- <div
- :class="`box ${activeBox == 3 ? 'active_box' : ''}`"
- @click="addTab(menu[1].c[0])"
- >
- <i class="font icon-jine"></i>
- <div>閿�鍞鐞�</div>
- </div>
- <el-popover
- placement="right-start"
- width="90"
- trigger="click"
- v-for="(a, ai) in menu"
- :key="ai"
- v-if="a.k != '0' && a.k != '3'"
- >
- <div
- :class="`box ${activeBox == a.k ? 'active_box' : ''}`"
- @click="activeBox = a.k"
- slot="reference"
- >
- <i :class="a.i"></i>
- <div>{{ a.v }}</div>
- </div>
- <div class="small_menu">
- <p
- v-for="(b, bi) in a.c"
- :key="bi"
- :class="activeP == b.k ? 'active_p' : ''"
- @click="addTab(b)"
- >
- <i :class="b.i"></i>
- <span>{{ b.v }}</span>
- </p>
- </div>
- </el-popover>
- </div>
- <div
- class="right"
- :style="`width: calc(100% - ${leftOpen ? '92' : '0'}px);`"
- >
- <div class="tag">
- <i
- :class="`${leftOpen ? 'el-icon-s-unfold' : 'el-icon-s-fold'}`"
- @click="leftOpen = !leftOpen"
- ></i>
- <div class="tabs">
- <div
- :class="`tab ${tabActive == a.k ? 'active_tab' : ''}`"
- v-for="(a, ai) in tabs"
- :key="ai"
- @click="upTabActive(a.k)"
- >
- {{ a.v }}
- <i
- class="el-icon-close"
- @click="removeTab(ai)"
- v-if="tabActive != 0"
- ></i>
- </div>
- </div>
- </div>
- <div class="component_view">
- <component
- class="com_index"
- v-for="(com, index) in tabs"
- :is="com.u"
- :key="upIndex + '|' + index"
- v-show="com.k == tabActive"
- >
- </component>
- </div>
- </div>
- </div>
+ <div class="all">
+ <div class="title">
+ <div class="logo">
+ <img src="../../static/img/logo 1.png" />
+ </div>
+ <div class="label">涓ぉ娴锋磱鏂颁竴浠om绯荤粺</div>
+ <div class="user">
+ <el-avatar :size="24">{{ userName.substring(0, 1) }}</el-avatar>
+ <span>{{ userName }}</span>
+ <img src="../../static/img/閫�鍑�.png" @click="out" />
+ </div>
+ </div>
+ <div class="left" :style="`width: ${leftOpen ? '92' : '0'}px;`">
+ <div :class="`box ${activeBox == 0 ? 'active_box' : ''}`" @click="addTab(menu[0].c[0])">
+ <i class="font icon-shouye"></i>
+ <div>棣栭〉</div>
+ </div>
+ <div :class="`box ${activeBox == 3 ? 'active_box' : ''}`" @click="addTab(menu[1].c[0])">
+ <i class="font icon-jine"></i>
+ <div>閿�鍞鐞�</div>
+ </div>
+ <el-popover placement="right-start" width="90" trigger="click" v-for="(a, ai) in menu" :key="ai"
+ v-if="a.k != '0' && a.k != '3'">
+ <div :class="`box ${activeBox == a.k ? 'active_box' : ''}`" @click="activeBox = a.k" slot="reference">
+ <i :class="a.i"></i>
+ <div>{{ a.v }}</div>
+ </div>
+ <div class="small_menu">
+ <p v-for="(b, bi) in a.c" :key="bi" :class="activeP == b.k ? 'active_p' : ''" @click="addTab(b)">
+ <i :class="b.i"></i>
+ <span>{{ b.v }}</span>
+ </p>
+ </div>
+ </el-popover>
+ </div>
+ <div class="right" :style="`width: calc(100% - ${leftOpen ? '92' : '0'}px);`">
+ <div class="tag">
+ <i :class="`${leftOpen ? 'el-icon-s-unfold' : 'el-icon-s-fold'}`" @click="leftOpen = !leftOpen"></i>
+ <div class="tabs">
+ <div :class="`tab ${tabActive == a.k ? 'active_tab' : ''}`" v-for="(a, ai) in tabs" :key="ai"
+ @click="upTabActive(a.k)">
+ {{ a.v }}
+ <i class="el-icon-close" @click="removeTab(ai)" v-if="tabActive != 0"></i>
+ </div>
+ </div>
+ <i class="el-icon-delete" @click="allDel" title="鍒犻櫎鎵�鏈夋爣绛鹃〉"></i>
+ </div>
+ <div class="component_view">
+ <component class="com_index" v-for="(com, index) in tabs" :is="com.u" :key="upIndex + '|' + index"
+ v-show="com.k == tabActive">
+ </component>
+ </div>
+ </div>
+ </div>
</template>
<script>
-const requireComponent = require.context("../components/view", false, /\.vue/);
-var comObj = {};
-requireComponent.keys().forEach(fileName => {
- var names = fileName
- .split("/")
- .pop()
- .replace(".vue", "");
- const componentConfig = requireComponent(fileName);
- comObj[names] = componentConfig.default || componentConfig;
-});
-export default {
- components: comObj,
- data() {
- return {
- userName: "value",
- leftOpen: true,
- menu: [
- {
- k: 0,
- v: "棣栭〉",
- i: "font icon-shouye",
- c: [
- {
- k: 0,
- v: "棣栭〉",
- i: "font icon-shouye",
- u: "index-index"
- }
- ]
- },
- {
- k: 3,
- v: "閿�鍞鐞�",
- i: "font icon-jine",
- c: [
- {
- k: 11,
- v: "閿�鍞鐞�",
- i: "font icon-jine",
- u: "sale"
- }
- ]
- },
- {
- k: 1,
- v: "鎶�鏈鐞�",
- i: "font icon-ic_form_set24px",
- c: [
- {
- k: 1,
- v: "鏍囧噯BOM",
- i: "font icon-shouye",
- u: "standard"
- },
- {
- k: 2,
- v: "璁㈠崟BOM",
- i: "font icon-shouye",
- u: "technical"
- }
- ]
- },
- {
- k: 4,
- v: "鐢熶骇绠＄悊",
- i: "font icon-shengchanguanli",
- c: [
- {
- k: 12,
- v: "鐢熶骇璁㈠崟",
- i: "font icon-shouye",
- u: ""
- },
- {
- k: 13,
- v: "鐢熶骇璁″垝",
- i: "font icon-shouye",
- u: ""
- },
- {
- k: 14,
- v: "鐢熶骇鎶ュ伐",
- i: "font icon-shouye",
- u: ""
- }
- ]
- },
- {
- k: 5,
- v: "WMS绠＄悊",
- i: "font icon-a-Inventorydumprequest",
- c: [
- {
- k: 15,
- v: "鍘熸潗鏂欏簱瀛�",
- i: "font icon-shouye",
- u: ""
- },
- {
- k: 16,
- v: "鍥炲崟绠＄悊",
- i: "font icon-shouye",
- u: ""
- },
- {
- k: 17,
- v: "鍗婃垚鍝佸簱瀛�",
- i: "font icon-shouye",
- u: ""
- },
- {
- k: 18,
- v: "鎴愬搧搴撳瓨",
- i: "font icon-shouye",
- u: ""
- },
- {
- k: 19,
- v: "鎴愬搧鍙戣揣",
- i: "font icon-shouye",
- u: ""
- },
- {
- k: 20,
- v: "鎴愬搧鍏ュ簱",
- i: "font icon-shouye",
- u: ""
- }
- ]
- },
- {
- k: 2,
- v: "QMS绠＄悊",
- i: "font icon-xunhuan",
- c: [
- {
- k: 3,
- v: "鍘熸潗鏂欐楠�",
- i: "font icon-shouye",
- u: "rawInsBox"
- },
- {
- k: 4,
- v: "鍘熸潗鏂欎笉鍚堟牸鍝�",
- i: "font icon-shouye",
- u: "rawUnqualifiedBox"
- },
- {
- k: 5,
- v: "杩囩▼妫�楠�",
- i: "font icon-shouye",
- u: "processInspection"
- },
- {
- k: 6,
- v: "鎴愬搧妫�楠�",
- i: "font icon-shouye",
- u: "finishedProductInspection"
- },
- {
- k: 7,
- v: "涓嶅悎鏍煎搧绠＄悊",
- i: "font icon-shouye",
- u: "unqualifiedManagement"
- },
- {
- k: 9,
- v: "璐ㄩ噺缁熻",
- i: "font icon-shouye",
- u: ""
- },
- {
- k: 10,
- v: "璁￠噺绠＄悊",
- i: "font icon-shouye",
- u: "measurementManagement"
- },
- {
- k: 10.1,
- v: "涓嶅悎鏍煎搧澶勭疆",
- i: "font icon-shouye",
- u: "Processingproducts"
- }
- ]
- },
- {
- k: 6,
- v: "鏍哥畻绠＄悊",
- i: "font icon-caiwuhesuanxitong",
- c: [
- {
- k: 21,
- v: "浜ч噺宸ヨ祫",
- i: "font icon-shouye",
- u: ""
- },
- {
- k: 22,
- v: "鍛樺伐鍑哄嫟",
- i: "font icon-shouye",
- u: ""
- }
- ]
- },
- {
- k: 7,
- v: "鍩虹鏁版嵁",
- i: "font icon-a-ziyuan20",
- c: [
- {
- k: 23,
- v: "鐢熶骇璁板綍缁存姢",
- i: "font icon-shouye",
- u: "record-content"
- },
- {
- k: 24,
- v: "鑷椤圭洰缁存姢",
- i: "font icon-shouye",
- u: "self-inspection"
- },
- {
- k: 25,
- v: "鎶�鏈寚鏍囩淮鎶�",
- i: "font icon-shouye",
- u: "Technicalindex"
- },
- {
- k: 26,
- v: "宸ヨ壓璺嚎缁存姢",
- i: "font icon-shouye",
- u: "technology"
- },
- {
- k: 27,
- v: "璁惧缁存姢",
- i: "font icon-shouye",
- u: "laboratoryManagement"
- },
- {
- k: 28,
- v: "鐗╂枡娓呭崟缁存姢",
- i: "font icon-shouye",
- u: "mbom"
- },
- // {
- // k: 29,
- // v: "宸℃椤圭洰缁存姢",
- // i: "font icon-shouye",
- // u: "routinginspection"
- // },
- {
- k: 30,
- v: "鐢熶骇宸ヨ壓缁存姢",
- i: "font icon-shouye",
- u: "equipmentmaintain"
- }
- ]
- }
- ],
- activeBox: 0,
- activeP: 0,
- tabActive: 0,
- tabs: [
- {
- k: 0,
- v: "棣栭〉",
- i: "font icon-shouye",
- u: "index-index"
- }
- ],
- upIndex: 0
- };
- },
- created() {},
- mounted() {
- this.userName = JSON.parse(localStorage.getItem("user")).name;
- },
- methods: {
- addTab(ob) {
- if (ob.k == 0) this.activeBox = 0;
- if (ob.k == 11) this.activeBox = 3;
- this.activeP = ob.k; //0
- this.tabActive = ob.k; //0
- let num = -1;
- this.tabs.forEach((a, ai) => {
- if (ob.k == a.k) {
- num = a.k;
- }
- });
- // 濡傛灉娌℃湁閬嶅巻鍒皌abs閲屾病鏈夎ob瀵瑰簲鐨則able锛屽線tabs閲岄潰鍔犲叆璇b
- if (num == -1) {
- this.tabs.push(ob);
- }
- },
- removeTab(index) {
- if (this.tabs.length > 1) {
- this.tabs.splice(index, 1);
- this.activeP = this.tabs[this.tabs.length - 1].k;
- this.tabActive = this.tabs[this.tabs.length - 1].k;
- } else {
- this.$message.warning("涓嶈兘鍏抽棴鏈�鍚庣殑鏍囩");
- }
- },
- upTabActive(num) {
- this.tabActive = num;
- this.activeP = num;
- if (num == 0) {
- this.activeBox = 0;
- } else if (num > 0 && num <= 2) {
- this.activeBox = 1;
- } else if (num > 2 && num < 11) {
- this.activeBox = 2;
- } else if (num == 11) {
- this.activeBox = 3;
- } else if (num > 11 && num <= 14) {
- this.activeBox = 4;
- } else if (num > 14 && num <= 20) {
- this.activeBox = 5;
- } else if (num > 20 && num <= 22) {
- this.activeBox = 6;
- } else if (num > 22 && num <= 30) {
- this.activeBox = 7;
- }
- },
- out() {
- sessionStorage.clear();
- localStorage.removeItem("autoenter");
- this.$router.push("/enter");
- }
- }
-};
-</script>
+ const requireComponent = require.context("../components/view", false, /\.vue/);
+ var comObj = {};
+ requireComponent.keys().forEach(fileName => {
+ var names = fileName
+ .split("/")
+ .pop()
+ .replace(".vue", "");
+ const componentConfig = requireComponent(fileName);
+ comObj[names] = componentConfig.default || componentConfig;
+ });
+ export default {
+ components: comObj,
+ data() {
+ return {
+ userName: "value",
+ leftOpen: true,
+ menu: [{
+ k: 0,
+ v: "棣栭〉",
+ i: "font icon-shouye",
+ c: [{
+ k: 0,
+ v: "棣栭〉",
+ i: "font icon-shouye",
+ u: "index-index"
+ }]
+ },
+ {
+ k: 3,
+ v: "閿�鍞鐞�",
+ i: "font icon-jine",
+ c: [{
+ k: 11,
+ v: "閿�鍞鐞�",
+ i: "font icon-jine",
+ u: "sale"
+ }]
+ },
+ {
+ k: 1,
+ v: "鎶�鏈鐞�",
+ i: "font icon-ic_form_set24px",
+ c: [{
+ k: 1,
+ v: "鏍囧噯BOM",
+ i: "font icon-shouye",
+ u: "standard"
+ },
+ {
+ k: 2,
+ v: "璁㈠崟BOM",
+ i: "font icon-shouye",
+ u: "technical"
+ }
+ ]
+ },
+ {
+ k: 4,
+ v: "鐢熶骇绠＄悊",
+ i: "font icon-shengchanguanli",
+ c: [{
+ k: 12,
+ v: "鐢熶骇璁㈠崟",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 13,
+ v: "鐢熶骇璁″垝",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 14,
+ v: "鐢熶骇鎶ュ伐",
+ i: "font icon-shouye",
+ u: ""
+ }
+ ]
+ },
+ {
+ k: 5,
+ v: "WMS绠＄悊",
+ i: "font icon-a-Inventorydumprequest",
+ c: [{
+ k: 15,
+ v: "鍘熸潗鏂欏簱瀛�",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 16,
+ v: "鍥炲崟绠＄悊",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 17,
+ v: "鍗婃垚鍝佸簱瀛�",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 18,
+ v: "鎴愬搧搴撳瓨",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 19,
+ v: "鎴愬搧鍙戣揣",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 20,
+ v: "鎴愬搧鍏ュ簱",
+ i: "font icon-shouye",
+ u: ""
+ }
+ ]
+ },
+ {
+ k: 2,
+ v: "QMS绠＄悊",
+ i: "font icon-xunhuan",
+ c: [{
+ k: 3,
+ v: "鍘熸潗鏂欐楠�",
+ i: "font icon-shouye",
+ u: "rawInsBox"
+ },
+ {
+ k: 4,
+ v: "鍘熸潗鏂欎笉鍚堟牸鍝�",
+ i: "font icon-shouye",
+ u: "rawUnqualifiedBox"
+ },
+ {
+ k: 5,
+ v: "杩囩▼妫�楠�",
+ i: "font icon-shouye",
+ u: "processInspection"
+ },
+ {
+ k: 6,
+ v: "鎴愬搧妫�楠�",
+ i: "font icon-shouye",
+ u: "finishedProductInspection"
+ },
+ {
+ k: 7,
+ v: "涓嶅悎鏍煎搧绠＄悊",
+ i: "font icon-shouye",
+ u: "unqualifiedManagement"
+ },
+ {
+ k: 9,
+ v: "璐ㄩ噺缁熻",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 10,
+ v: "璁￠噺绠＄悊",
+ i: "font icon-shouye",
+ u: "measurementManagement"
+ },
+ {
+ k: 10.1,
+ v: "涓嶅悎鏍煎搧澶勭疆",
+ i: "font icon-shouye",
+ u: "Processingproducts"
+ }
+ ]
+ },
+ {
+ k: 6,
+ v: "鏍哥畻绠＄悊",
+ i: "font icon-caiwuhesuanxitong",
+ c: [{
+ k: 21,
+ v: "浜ч噺宸ヨ祫",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 22,
+ v: "鍛樺伐鍑哄嫟",
+ i: "font icon-shouye",
+ u: ""
+ }
+ ]
+ },
+ {
+ k: 7,
+ v: "鍩虹鏁版嵁",
+ i: "font icon-a-ziyuan20",
+ c: [{
+ k: 23,
+ v: "鐢熶骇璁板綍缁存姢",
+ i: "font icon-shouye",
+ u: "record-content"
+ },
+ {
+ k: 24,
+ v: "鑷椤圭洰缁存姢",
+ i: "font icon-shouye",
+ u: "self-inspection"
+ },
+ {
+ k: 25,
+ v: "鎶�鏈寚鏍囩淮鎶�",
+ i: "font icon-shouye",
+ u: "Technicalindex"
+ },
+ {
+ k: 26,
+ v: "宸ヨ壓璺嚎缁存姢",
+ i: "font icon-shouye",
+ u: "technology"
+ },
+ {
+ k: 27,
+ v: "璁惧缁存姢",
+ i: "font icon-shouye",
+ u: "laboratoryManagement"
+ },
+ {
+ k: 28,
+ v: "鐗╂枡娓呭崟缁存姢",
+ i: "font icon-shouye",
+ u: "mbom"
+ },
+ {
+ k: 30,
+ v: "鐢熶骇宸ヨ壓缁存姢",
+ i: "font icon-shouye",
+ u: "equipmentmaintain"
+ }
+ ]
+ }
+ ],
+ activeBox: 0,
+ activeP: 0,
+ tabActive: 0,
+ tabs: [{
+ k: 0,
+ v: "棣栭〉",
+ i: "font icon-shouye",
+ u: "index-index"
+ }],
+ upIndex: 0
+ };
+ },
+ created() {},
+ mounted() {
+ this.userName = JSON.parse(localStorage.getItem("user")).name;
+ },
+ methods: {
+ addTab(ob) {
+ if (ob.k == 0) this.activeBox = 0;
+ if (ob.k == 11) this.activeBox = 3;
+ this.activeP = ob.k; //0
+ this.tabActive = ob.k; //0
+ let num = -1;
+ this.tabs.forEach((a, ai) => {
+ if (ob.k == a.k) {
+ num = a.k;
+ }
+ });
+ // 濡傛灉娌℃湁閬嶅巻鍒皌abs閲屾病鏈夎ob瀵瑰簲鐨則able锛屽線tabs閲岄潰鍔犲叆璇b
+ if (num == -1) {
+ this.tabs.push(ob);
+ }
+ },
+ removeTab(index) {
+ this.tabs.splice(index, 1);
+ this.activeP = this.tabs[this.tabs.length - 1].k;
+ this.tabActive = this.tabs[this.tabs.length - 1].k;
+ },
+ allDel() {
+ this.activeBox = 0
+ this.activeP = 0
+ this.tabActive = 0
+ this.tabs = [{
+ k: 0,
+ v: " 棣栭〉",
+ i: "font icon-shouye",
+ u: "index-index"
+ }]
+ },
+ upTabActive(num) {
+ this.tabActive = num;
+ this.activeP = num;
+ for (var i = 0; i < this.menu.length; i++) {
+ this.menu[i].c.forEach(b => {
+ if (b.k == num) {
+ this.activeBox = this.menu[i].k;
+ return
+ }
+ })
+ }
+ },
+ out() {
+ sessionStorage.clear();
+ localStorage.removeItem("autoenter");
+ this.$router.push("/enter");
+ }
+ }
+ };
+</script>
\ No newline at end of file
--
Gitblit v1.9.3