From 088a78f8649b8aee154f663bfcf73b96885f76ed Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 11 九月 2023 18:07:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/raw-ins.vue | 2
src/components/view/standard.vue | 236 ++++++++++
src/main.js | 2
src/components/view/Processingproducts.vue | 6
src/components/view/processInspection.vue | 987 +++++++++++++++++++++++++------------------
src/components/view/rawUnqualified/raw.vue | 2
src/components/view/unqualifiedManagement.vue | 67 ++
src/assets/api/controller.js | 9
8 files changed, 869 insertions(+), 442 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index bdc3c61..8196507 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -11,6 +11,9 @@
chooseFather: "/technology/chooseFather",//鑾峰彇宸ュ簭鍒楄〃
chooseDevice: "/technology/chooseDevice",//鑾峰彇璁惧缁勫垪琛�
addTechnology: "/technology/add",//娣诲姞宸ヨ壓璺嚎
+ leftAddOneTwo: "/material/add",//宸︿晶鏂板1锛�2绾�
+ leftAddThree: "/standard/add",//宸︿晶涓夌骇鏂板
+ leftAddFour: "/specifications/add",//宸︿晶鍥涚骇鏂板
// 鎶�鏈鐞�-鎶�鏈枃浠�
selectAllOrder: "/orders/selectAllOrder", //鏌ヨ鎵�鏈夎鍗曞垪琛�
selectOrderById: "/orders/selectOrderById", //鏍规嵁璁㈠崟id鏌ヨ璁㈠崟璇︽儏
@@ -55,7 +58,10 @@
projectListByfinishId: "/inspection-item/list_user", //鏍规嵁id鏌ヨ鎵�鏈夐」鐩�
}
-
+// 杩囩▼妫�楠�
+const processInspection = {
+ selectProcessInspectsList: "/processInspect/selectProcessInspectsList", // 鍒嗛〉鏌ヨ杩囩▼妫�楠屽崟鍒楄〃
+}
// QMS瀹為獙瀹ょ鐞�
const laboratory = {
delDeviceById:"/device/delDeviceById",//鍒犻櫎
@@ -139,6 +145,7 @@
...dispose,
...Basicdata,
...unRawInspects,
+ ...processInspection,
// ...gettable,
selectSaleList: "sale/selectSaleList", //鏌ヨ閿�鍞崟鍒楄〃
selectSaleDatilById: "sale/selectSaleDatilById", //鏍规嵁閿�鍞崟id鏌ョ湅璇︽儏,
diff --git a/src/components/view/Processingproducts.vue b/src/components/view/Processingproducts.vue
index d4ed2a1..a9dcf00 100644
--- a/src/components/view/Processingproducts.vue
+++ b/src/components/view/Processingproducts.vue
@@ -157,7 +157,11 @@
</el-card>
</div>
<el-dialog title="鎻愮ず" :visible.sync="dialogVisible" width="30%">
- <el-form label-width="130px">
+ <el-form label-width="130px" style="height: 500px; overflow: auto ;">
+ <el-empty
+ v-if="updateEditList.length == 0"
+ :image-size="200"
+ ></el-empty>
<div v-for="item in updateEditList" :key="item.$index">
<el-form-item
:label="
diff --git a/src/components/view/processInspection.vue b/src/components/view/processInspection.vue
index 1ab23ed..f844244 100644
--- a/src/components/view/processInspection.vue
+++ b/src/components/view/processInspection.vue
@@ -1,435 +1,588 @@
<template>
- <div class="content-main">
- <div v-if="!showAddPage" class="rawPage">
- <div class="title">
+ <div class="content-main">
+ <div v-if="!showAddPage" class="rawPage">
+ <div class="title">
<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 icon="el-icon-delete" size="mini">鍒犻櫎</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 v-model="inspectionResult" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 52px;">
- <el-option value="閫夐」1"></el-option>
- <el-option value="閫夐」2"></el-option>
- </el-select>
- <span>妫�楠屾棩鏈燂細</span>
- <el-date-picker
- v-model="inspectionDate"
- type="date"
- placeholder="閫夋嫨鏃ユ湡"
- style="margin-right: 52px">
- </el-date-picker>
- <span>妫�楠屼汉锛�</span>
- <el-select v-model="inspecter" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 52px;">
- <el-option value="閫夐」1"></el-option>
- <el-option value="閫夐」2"></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>
+ <span>妫�楠岀姸鎬侊細</span>
+ <el-select
+ size="small"
+ v-model="search.result"
+ placeholder="璇烽�夋嫨妫�娴嬬姸鎬�"
+ style="width: 224px;margin-right: 52px;"
+ >
+ <el-option :value="''" label="鍏ㄩ儴"></el-option>
+ <el-option :value="1" label="宸叉娴�"></el-option>
+ <el-option :value="2" label="寰呮娴�"></el-option>
+ </el-select>
+ <span>浜у搧鍚嶇О锛�</span>
+ <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-button size="mini"><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="400"
- :max-height="400"
- :cell-style="{textAlign: 'center'}"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
- :data="inspectionTable"
- style="width: 100%"
- >
- <el-table-column
- type="selection"
- width="50">
- </el-table-column>
- <el-table-column
- prop="number"
- label="璁㈠崟鍙�"
- min-width="100"
- />
- <el-table-column
- prop="username"
- label="瀹㈡埛鍚嶇О"
- min-width="80"
- />
- <el-table-column
- prop="projectname"
- label="宸ョ▼鍚嶇О"
- min-width="80"
- />
- <el-table-column
- prop="tracenumber"
- label="璐ㄩ噺杩芥函鍙�"
- min-width="108"
- />
- <el-table-column
- prop="code"
- label="浜у搧缂栫爜"
- min-width="100"
- />
- <el-table-column
- prop="class"
- label="浜у搧澶х被"
- min-width="72"
- />
- <el-table-column
- prop="specificationmodel"
- label="瑙勬牸鍨嬪彿"
- min-width="110"
- />
- <el-table-column
- prop="unit"
- label="鍗曚綅"
- min-width="50"
- />
- <el-table-column
- prop="quantity"
- label="鏁伴噺"
- min-width="50"
- />
- <el-table-column
- prop="machine"
- label="鏈哄彴"
- min-width="60"
- />
- <el-table-column
- prop="group"
- label="鐝粍"
- min-width="50"
- />
- <el-table-column
- prop="worker"
- label="涓绘満宸�"
- min-width="60"
- />
- <el-table-column
- prop="date"
- label="妫�楠屾棩鏈�"
- min-width="80"
- />
- <el-table-column
- prop="result"
- label="妫�娴嬬粨鏋�"
- min-width="80"
- />
- <el-table-column
- label="鎿嶄綔"
- min-width="80"
- >
- <template slot-scope="scope">
- <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="currentPage"
- :page-sizes="[100, 200, 300, 400]"
- :page-size="pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="this.inspectionTable.length"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
+ <div class="inspectionTable">
+ <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%"
+ >
+ <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"
/>
- </div>
+ <el-table-column prop="material" label="浜у搧鍚嶇О" min-width="80" />
+ <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="name" label="鎶ユ浜�" min-width="50" />
+ <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
+ >
+ </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
+ >
+ </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"
+ />
+ </div>
</div>
- </div>
- <div class="newPage" v-if="showAddPage">
- <!-- 鏂板椤甸潰 -->
- <div class="addInspection">
- <el-row class="header">
- <el-col :span="12">鏂板杩囩▼妫�楠屽崟</el-col>
- <el-col :span="12" style="text-align: right;">
- <!-- 鐐瑰嚮杩斿洖锛屽綋鍓嶉〉闈㈠�间负false -->
- <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="left" label-width="100px" size="mini" >
- <div class="formwrapper">
- <el-row :gutter="450">
- <el-col :span="5">
- <el-form-item label="璁㈠崟鍙凤細">
- <el-input style="width: 180px;" v-model="addInspectionform.number" placeholder="璇疯緭鍏ヨ鍗曞彿" autocomplete="off" />
- </el-form-item>
- </el-col>
- <el-col :span="5">
- <el-form-item label="瀹㈡埛鍚嶇О锛�">
- <el-input style="width: 180px;" v-model="addInspectionform.username" placeholder="璇疯緭鍏ュ鎴峰悕绉�" autocomplete="off" />
- </el-form-item>
- </el-col>
- <el-col :span="5">
- <el-form-item label="宸ョ▼鍚嶇О锛�">
- <el-input style="width: 180px;" v-model="addInspectionform.projectname" placeholder="璇疯緭鍏ュ伐绋嬪悕绉�" autocomplete="off" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="450">
- <el-col :span="5">
- <el-form-item label="璐ㄩ噺杩芥函鍙凤細" >
- <el-input style="width: 180px;" v-model="addInspectionform.tracenumber" placeholder="璇疯緭鍏ヨ拷婧彿" autocomplete="off" />
- </el-form-item>
- </el-col>
- <el-col :span="5">
- <el-form-item label="浜у搧缂栫爜锛�">
- <el-input style="width: 180px;" v-model="addInspectionform.code" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" /> </el-form-item>
- </el-col>
- <el-col :span="5">
- <el-form-item label="浜у搧鍚嶇О锛�">
- <el-select style="width: 180px;" v-model="addInspectionform.class" size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
- <el-option value="閫夐」1"></el-option>
- <el-option value="閫夐」2"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="450">
- <el-col :span="5">
- <el-form-item label="瑙勬牸鍨嬪彿锛�" >
- <el-select style="width: 180px;" v-model="addInspectionform.specificationmodel" size="small" placeholder="璇烽�夋嫨瑙勬牸鍨嬪彿">
- <el-option value="閫夐」1"></el-option>
- <el-option value="閫夐」2"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="5">
- <el-form-item label="鍗曚綅锛�" >
- <el-select style="width: 180px;" v-model="addInspectionform.unit" size="small" placeholder="璇烽�夋嫨鍗曚綅">
- <el-option value="閫夐」1"></el-option>
- <el-option value="閫夐」2"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="5">
- <el-form-item label="鏁伴噺锛�">
- <el-input style="width: 180px;" v-model="addInspectionform.quantity" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="450">
- <!-- <el-col :span="5">
- <el-form-item label="鐝粍锛�" >
- <el-select style="width: 180px;" v-model="addInspectionform.group" size="small" placeholder="璇烽�夋嫨鐝粍">
- <el-option value="閫夐」1"></el-option>
- <el-option value="閫夐」2"></el-option>
- </el-select> </el-form-item>
- </el-col> -->
- <el-col :span="5">
- <el-form-item label="涓绘満宸ワ細" >
- <el-select style="width: 180px;" v-model="addInspectionform.worker" size="small" placeholder="璇烽�夋嫨涓绘満宸�">
- <el-option value="閫夐」1"></el-option>
- <el-option value="閫夐」2"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="5">
- <el-form-item label="鏈哄彴锛�" >
- <el-select style="width: 180px;" v-model="addInspectionform.machine" size="small" placeholder="璇烽�夋嫨浜у搧鏈哄彴">
- <el-option value="閫夐」1"></el-option>
- <el-option value="閫夐」2"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- </div>
- </el-form>
- </div>
- <div class="inspectionProject">
- <span>妫�楠岄」鐩�</span>
- <el-table :data="inspectionItems">
- <el-table-column type="index" label="搴忓彿" width="60"></el-table-column>
- <el-table-column prop="project" 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="detectionVal" label="妫�楠屽��"></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-option value="閫夐」1"></el-option>
- <el-option value="閫夐」2"></el-option>
- </el-select>
- </template>
- </el-table-column>
- <el-table-column prop="conclusion" 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>
- </template>
- </el-table-column>
- </el-table>
- </div>
- <div class="inspectionResult">
- <span>妫�娴嬬粨鏋�</span>
- <el-table :data="inspectionResultForm">
- <el-table-column prop="id" label="鐗╂枡缂栧彿"></el-table-column>
- <el-table-column prop="name" label="鐗╂枡鍚嶇О"></el-table-column>
- <el-table-column prop="inspecter" label="妫�楠屽憳"></el-table-column>
- <el-table-column prop="conclusion" label="妫�楠岀粨璁�"></el-table-column>
- <el-table-column prop="operation" label="涓婃姤"></el-table-column>
- </el-table>
- </div>
- </div>
-
</div>
- </template>
+ <div class="newPage" v-if="showAddPage">
+ <!-- 鏂板椤甸潰 -->
+ <div class="addInspection">
+ <el-row class="header">
+ <el-col :span="12">鏂板杩囩▼妫�楠屽崟</el-col>
+ <el-col :span="12" style="text-align: right;">
+ <!-- 鐐瑰嚮杩斿洖锛屽綋鍓嶉〉闈㈠�间负false -->
+ <el-button
+ type="primary"
+ size="mini"
+ style="background: #004EA2; "
+ icon="el-icon-circle-plus-outline"
+ >鏂板</el-button
+ >
+ <el-button
+ @click="showAddPage = false"
+ type="primary"
+ size="mini"
+ icon="el-icon-back"
+ style="background: #004EA2; "
+ >杩斿洖</el-button
+ >
+ </el-col>
+ </el-row>
+ <el-form
+ :model="addInspectionform"
+ 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-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-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-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-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-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-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="230">
+ <el-col :span="7">
+ <el-form-item label="鍗曚綅锛�">
+ <el-input
+ style="width: 210px;"
+ size="small"
+ disabled
+ v-model="addInspectionform.quantity"
+ 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-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-button
+ type="primary"
+ style="float: right; font-size: 14px; !important"
+ >鐢熸垚妫�楠岄」鐩�</el-button
+ >
+ </el-col>
+ </el-row>
+ </div>
+ </el-form>
+ </div>
+ <div class="inspectionProject">
+ <el-row>
+ <el-col :span="12" class="inspectionProject_span">妫�楠岄」鐩�</el-col>
+ <el-col :span="12" class="inspectionProject_span">
+ <el-button size="mini" @click="clickDeleteInspectionColumn()"
+ >鍒犻櫎妫�楠屽�煎垪</el-button
+ >
+ <el-button
+ style="margin-right: 30px;"
+ size="mini"
+ @click="clickAddInspectionColumn()"
+ >娣诲姞妫�楠屽�煎垪</el-button
+ >
+ <el-button
+ size="mini"
+ style="margin-right: 30px;"
+ @click="clickAddLine()"
+ >娣诲姞妫�楠岃</el-button
+ >
+ </el-col>
+ </el-row>
+ <el-table
+ :data="inspectionItems"
+ 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-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 label="璇曢獙璁惧">
+ <template slot-scope="scope">
+ {{ scope.row.device }}
+ <el-select
+ v-model="scope.row.device"
+ size="small"
+ slot="append"
+ style="width: 100px;"
+ >
+ <el-option value="閫夐」1"></el-option>
+ <el-option value="閫夐」2"></el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column prop="conclusion" 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
+ >
+ </template>
+ </el-table-column>
+ <el-table-column v-if="detailId == null" label="鎿嶄綔" width="100">
+ <template slot-scope="scope">
+ <el-button type="text" @click="clickDeleteline(scope)"
+ >鍒犻櫎</el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <div class="inspectionResult">
+ <span>妫�娴嬬粨鏋�</span>
+ <el-table :data="inspectionResultForm">
+ <el-table-column prop="id" label="鐗╂枡缂栧彿"></el-table-column>
+ <el-table-column prop="name" label="鐗╂枡鍚嶇О"></el-table-column>
+ <el-table-column prop="inspecter" label="妫�楠屽憳"></el-table-column>
+ <el-table-column prop="conclusion" label="妫�楠岀粨璁�"></el-table-column>
+ <el-table-column prop="operation" label="涓婃姤"></el-table-column>
+ </el-table>
+ </div>
+ </div>
+ </div>
+</template>
-
- <script>
- export default {
- data(){
- return {
- inspectionResult: '',
- inspectionDate: '',
- inspecter: '',
- inspectionTable:[{
- number: '8540395029753',
- username: 'jack',
- projectname: '甯冮殕杩�',
- tracenumber: '826403164021',
- code: 'C-982164',
- class: '鎴愬搧',
- specificationmodel: '8.8/15kV JLS-3.2',
- unit: '鍚�',
- quantity: '15',
- machine: '鎷夐椄鏈�',
- group: '1缁�',
- worker: '榛勫皬鏄�',
- date: '2023-08-01',
- result: '鍚堟牸',
- operation: ''
- },{
- number: '2497320327652',
- username: 'rose',
- projectname: '甯冮殕杩�',
- tracenumber: '826403164021',
- code: 'C-24114',
- class: '鎴愬搧',
- specificationmodel: '8.6/15kV JAD-3.2',
- unit: '鍚�',
- quantity: '43',
- machine: '鎷夐椄鏈�',
- group: '1缁�',
- worker: '榛勫皬鏄�',
- date: '2023-08-01',
- result: '鍚堟牸',
- operation: ''
- }],
- currentPage: 1, // 褰撳墠椤电爜
- pageSize: 100,
- showAddPage: false,
- addInspectionform: [{
- number: '',
- username: '',
- projectname: '',
- tracenumber: '',
- code: '',
- class: '',
- specificationmodel: '',
- unit: '',
- quantity: '',
- group: '',
- worker: '',
- machine: ''
- }],
- inspectionItems:[{
- project:'甯冮殕杩�',
- unit:'鍚�',
- standardVal: '8219384314',
- controlVal:'9823401',
- detectionVal:'11111',
- device:'',
- conclusion:'鍚堟牸'
- }],
- inspectionResultForm:[{
- id:'274024',
- name:'111',
- inspecter:'111',
- conclusion:'',
- operation:''
- }]
- }
+<script>
+export default {
+ data() {
+ return {
+ search: {
+ countSize: 10,
+ pageSize: 1,
+ result: "", // 妫�娴嬬姸鎬�
+ name: "", // 浜у搧鍚嶇О
+ techfather: "" // 宸ュ簭
},
- methods:{
- // 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
- handleSizeChange(val) {
- console.log(`姣忛〉 ${val} 鏉)
- this.currentPage = 1
- this.pageSize = val
- },
- // 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤�
- handleCurrentChange(val) {
- console.log(`褰撳墠椤�: ${val}`)
- this.currentPage = val
- },
- handleAddNew(){
- this.showAddPage=true
- }
+ inspectionTable: [],
+ inspectionTableTotal: "",
+ // 娣诲姞鍒�
+ empiricalValueAdd: 1,
+ // 缂栬緫鏃跺瓨鍌ㄦ渶闀跨殑鍒楁暟瀛楋紝鍋氬垹闄ゅ垽鏂�
+ empiricalValueAddMaxNumber: 0,
+ showAddPage: false,
+ addInspectionform: [
+ {
+ number: "",
+ username: "",
+ projectname: "",
+ tracenumber: "",
+ code: "",
+ class: "",
+ specificationmodel: "",
+ unit: "",
+ quantity: "",
+ group: "",
+ worker: "",
+ machine: ""
+ }
+ ],
+ inspectionItems: [], // 鏂板妫�楠岄」鐩〃鏍�
+ inspectionResultForm: [
+ {
+ id: "274024",
+ name: "111",
+ inspecter: "111",
+ conclusion: "",
+ operation: ""
+ }
+ ],
+ options: [
+ {
+ value: "閫夐」1",
+ label: "榛勯噾绯�"
+ },
+ {
+ value: "閫夐」2",
+ label: "鍙岀毊濂�"
+ },
+ {
+ value: "閫夐」3",
+ label: "铓典粩鐓�"
+ },
+ {
+ value: "閫夐」4",
+ label: "榫欓』闈�"
+ },
+ {
+ value: "閫夐」5",
+ label: "鍖椾含鐑ら腑"
+ }
+ ],
+ value: ""
+ };
+ },
+ methods: {
+ // 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
+ handleSizeChange(val) {
+ this.search.countSize = val;
+ this.defaultInitializationTable();
+ },
+ // 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤�
+ handleCurrentChange(val) {
+ this.search.pageSize = val;
+ this.defaultInitializationTable();
+ },
+ // 鏄剧ず鏂板椤甸潰
+ handleAddNew() {
+ this.showAddPage = true;
+ },
+ // 琛ㄦ牸鍒濆鍖栨帴鍙�
+ defaultInitializationTable() {
+ this.$axios
+ .post(this.$api.url.selectProcessInspectsList, this.search)
+ .then(res => {
+ this.inspectionTableTotal = res.data.total;
+ this.inspectionTable = res.data.row;
+ });
+ },
+ // 娣诲姞琛�
+ clickAddLine() {
+ let obj = {
+ material: "",
+ materialCode: "",
+ orderNumber: "",
+ quantity: 0,
+ specificationsModel: "",
+ techfather: "",
+ techname: "",
+ technologyId: 0,
+ unit: ""
+ };
+ this.inspectionItems.push(obj);
+ },
+ // 鍒犻櫎琛�
+ clickDeleteline(scope) {
+ this.inspectionItems.splice(scope.$index, 1);
+ },
+ // 鍒犻櫎妫�楠屽�煎垪
+ clickDeleteInspectionColumn() {
+ if (this.empiricalValueAdd - 1 === 0) {
+ } else {
+ if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
+ this.empiricalValueAdd = this.empiricalValueAdd - 1;
+ this.inspectionItems.forEach(i => {
+ i.testValueList.splice(this.empiricalValueAdd, 1);
+ });
+ }
}
+ },
+ // 娣诲姞妫�楠屽�煎垪
+ clickAddInspectionColumn() {
+ this.empiricalValueAdd = this.empiricalValueAdd + 1;
+ }
+ },
+ created() {
+ this.defaultInitializationTable(); // 鍒濆鍖栬〃鏍兼暟鎹�
+ }
+};
+</script>
- }
- </script>
-
- <style>
- .title{
- padding: 12px;
-
- }
- .nav{
- display: flex;
- padding: 20px 20px;
- align-items: center;
- background-color: #fff;
- }
- .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 span{
- display: block;
- padding: 5px 0px;
- }
- .inspectionProject .el-table{
- background-color: #fff;
- padding: 10px 12px;
- }
- .inspectionResult span{
- display: block;
- padding: 5px 0px;
- }
- .inspectionResult .el-table{
- background-color: #fff;
- padding: 10px 12px;
- }
- </style>
+<style>
+.nav {
+ display: flex;
+ padding: 20px 20px;
+ 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;
+}
+</style>
diff --git a/src/components/view/raw-ins.vue b/src/components/view/raw-ins.vue
index d359349..1d5b2e3 100644
--- a/src/components/view/raw-ins.vue
+++ b/src/components/view/raw-ins.vue
@@ -106,8 +106,8 @@
<span>鍘熸潗鏂欑紪鐮侊細</span>
<el-input
v-model="search.code"
- size="small"
placeholder="璇疯緭鍏�"
+ size="small"
style="width: 224px;margin-right: 30px;"
clearable
></el-input>
diff --git a/src/components/view/rawUnqualified/raw.vue b/src/components/view/rawUnqualified/raw.vue
index 527f21c..cf5aa02 100644
--- a/src/components/view/rawUnqualified/raw.vue
+++ b/src/components/view/rawUnqualified/raw.vue
@@ -86,7 +86,7 @@
>
</el-table-column>
<el-table-column prop="code" label="鏉愭枡缂栫爜"> </el-table-column>
- <el-table-column prop="id" label="鏉愭枡鍚嶇О"> </el-table-column>
+ <el-table-column prop="name" label="鏉愭枡鍚嶇О"> </el-table-column>
<el-table-column prop="specifications" label="瑙勬牸鍨嬪彿">
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅"> </el-table-column>
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index 29fb3c4..d3e8721 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -22,7 +22,7 @@
<el-button size="mini" icon="el-icon-plus" @click="bomLeftAdd=true"></el-button>
</el-col>
</el-row>
- <el-tree :data="list" ref="tree" default-expand-all :props="{ children: 'children', label: 'name' }"
+ <el-tree style="width: ;" :data="list" ref="tree" default-expand-all :props="{ children: 'children', label: 'name' }"
node-key="id" :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current>
<div class="custom-tree-node" slot-scope="{ node, data }">
<span><i :class="`node_i ${data.code != '[5]' ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
@@ -224,13 +224,25 @@
<!-- 宸︿晶鐐瑰嚮+鎸夐挳 -->
<el-dialog title="BOM鏂板" :visible.sync="bomLeftAdd" width="29%">
<el-form ref="leftAdd" :model="leftAdd">
- <el-form-item label="绫诲瀷">
- <el-cascader v-model="leftAdd.type" size="mini" style="width: 93%;" :options="formTypeOptions" :props="{ checkStrictly: true }" clearable></el-cascader>
+ <el-form-item :rules="[{ required: true, message: '璇烽�夋嫨浜у搧绫诲瀷', trigger: 'blur' }]" label="浜у搧绫诲瀷" prop="type">
+ <el-cascader @change="changeLeftAdd" v-model="leftAdd.type" style="width: 86%;" :options="formTypeOptions" :props="{ checkStrictly: true }" clearable></el-cascader>
+ </el-form-item>
+ <el-form-item v-if="leftAdd.type.length<2" label="浜у搧澶х被" prop="father">
+ <el-autocomplete class="inline-input" style="width: 88%;" v-model="leftAdd.father" :fetch-suggestions="querySearch" placeholder="璇烽�夋嫨浜у搧澶х被" @select="handleSelect"></el-autocomplete>
+ </el-form-item>
+ <el-form-item v-if="leftAdd.type.length<3" label="浜у搧鍚嶇О" prop="name">
+ <el-autocomplete class="inline-input" style="width: 88%;" v-model="leftAdd.name" :fetch-suggestions="querySearchName" placeholder="璇烽�夋嫨浜у搧鍚嶇О" @select="handleSelect"></el-autocomplete>
+ </el-form-item>
+ <el-form-item v-if="leftAdd.type.length<4" label="浜у搧鏍囧噯" prop="standard">
+ <el-autocomplete class="inline-input" style="width: 88%;" v-model="leftAdd.standard" :fetch-suggestions="querySearchStandar" placeholder="璇烽�夋嫨浜у搧鏍囧噯" @select="handleSelect"></el-autocomplete>
+ </el-form-item>
+ <el-form-item label="浜у搧鍨嬪彿" prop="specifications">
+ <el-input v-model="leftAdd.specifications" style="width: 88%;" placeholder="璇疯緭鍏ヤ骇鍝佸瀷鍙�"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
- <el-button @click="bomLeftAdd = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="bomLeftAdd = false">纭� 瀹�</el-button>
+ <el-button @click="resetForm('leftAdd')">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitForm('leftAdd')">纭� 瀹�</el-button>
</span>
</el-dialog>
<!-- 鍙充笂渚х偣鍑讳慨鏀规寜閽� -->
@@ -249,7 +261,7 @@
鍒犻櫎
</el-form>
<span slot="footer" class="dialog-footer">
- <el-button @click="bomRightDl = false">鍙� 娑�</el-button>
+ <el-button @click="bomRightDl=false">鍙� 娑�</el-button>
<el-button type="primary" @click="bomRightDl = false">纭� 瀹�</el-button>
</span>
</el-dialog>
@@ -312,7 +324,7 @@
},
version: {},
leftAdd:{
- type: null,
+ type: [],
father: null,
standard: null,
name: null,
@@ -320,7 +332,11 @@
},
VER: {},
verdata: {},
- character: 0
+ character: 0,
+ restaurants: [],
+ bomName:[],
+ bomStandard:[],
+ isLeftAdd: true
}
},
// watch: {
@@ -338,6 +354,113 @@
console.log(this.formTypeOptions);
},
methods: {
+ changeLeftAdd(){
+ if(this.leftAdd.type.length===2){
+ this.leftAdd.father=null
+ this.leftAdd.father=this.leftAdd.type[1]
+ }
+ if(this.leftAdd.type.length===3){
+ this.leftAdd.name=null
+ this.leftAdd.father=this.leftAdd.type[1]
+ this.leftAdd.name=this.leftAdd.type[2]
+ }
+ if(this.leftAdd.type.length===4){
+ this.leftAdd.standard=null
+ this.leftAdd.father=this.leftAdd.type[1]
+ this.leftAdd.name=this.leftAdd.type[2]
+ this.leftAdd.standard=this.leftAdd.type[3]
+ }
+ },
+ submitForm(formName) {
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ let obj=JSON.parse(JSON.stringify(this.leftAdd))
+ console.log(obj);
+ let one=this.list.filter(item=>{
+ return item.name===obj.type[0]
+ })[0]
+ let two=one.children.filter(item=>{
+ return item.name===obj.father
+ })[0]
+ console.log("two",two);
+ //鎵ц涓�浜岀骇鏂板
+ if(two===undefined||two===null){
+ obj.type=this.getType(obj.type[0])
+ this.$axios.post(this.$api.url.leftAddOneTwo,obj,{
+ headers: { "Content-Type": "application/json" }
+ }).then(res=>{
+ this.$message({
+ message: res.message,
+ type: 'success'
+ });
+ this.selectMaterialTree()
+ })
+ }else{
+ let three=two.children.filter(item=>{
+ return item.name===obj.name
+ })[0]
+ console.log("three",three);
+ if(three===undefined||three===null){
+ obj.type=this.getType(obj.type[0])
+ this.$axios.post(this.$api.url.leftAddOneTwo,obj,{
+ headers: { "Content-Type": "application/json" }
+ }).then(res=>{
+ this.$message({
+ message: res.message,
+ type: 'success'
+ });
+ this.selectMaterialTree()
+ })
+ }else{
+ //鏂板鏍囧噯鍨嬪彿
+ let four=three.children.filter(item=>{
+ return item.name===obj.standard
+ })[0]
+ if(four===undefined||four===null){
+ let StandardDto={
+ "id": three.id,
+ "specifications": obj.specifications,
+ "standard": obj.standard
+ }
+ this.$axios.post(this.$api.url.leftAddThree,StandardDto,{
+ headers: { "Content-Type": "application/json" }
+ }).then(res=>{
+ this.$message({
+ message: res.message,
+ type: 'success'
+ });
+ this.selectMaterialTree()
+ })
+ }else{
+ let specificationsDto={
+ "id": four.id,
+ "specifications": obj.specifications
+ }
+ this.$axios.post(this.$api.url.leftAddFour,specificationsDto,{
+ headers: { "Content-Type": "application/json" }
+ }).then(res=>{
+ this.$message({
+ message: res.message,
+ type: 'success'
+ });
+ this.selectMaterialTree()
+ this.selectVersion()
+ })
+ }
+ }
+ }
+ this.resetForm('leftAdd')
+ } else {
+ console.log('error submit!!');
+ return false;
+ }
+ });
+ },
+ resetForm(formName) {
+ this.bomLeftAdd=false
+ this.$refs[formName].resetFields();
+ },
+ leftAddBom(){
confirmAdd(formName){
this.$refs[formName].validate(valid=>{
if(valid){
@@ -388,6 +511,39 @@
startLeftAdd(){
},
+ getType(typeName){
+ return typeName==="鎴愬搧"?1:2
+ },
+ handleSelect(item) {
+ console.log(item);
+ },
+ querySearch(queryString, cb) {
+ var restaurants = this.restaurants;
+ var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+ // 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
+ cb(results);
+ },
+ querySearchName(queryString, cb) {
+ var restaurants = this.bomName;
+ var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+ // 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
+ cb(results);
+ },
+ querySearchStandar(queryString, cb) {
+ var restaurants = this.bomStandard;
+ var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+ // 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
+ cb(results);
+ },
+ loadFatherType(){
+ return [{label:"姗¤兌杩炴帴鍣�",value: "姗¤兌杩炴帴鍣�"},{label:"閲戝睘杩炴帴鍣�",value: "閲戝睘杩炴帴鍣�"},
+ {label:"婀挎彃鎷旂數杩炴帴鍣�",value: "婀挎彃鎷旂數杩炴帴鍣�"},{label:"鍒嗘敮缁勪欢",value: "鍒嗘敮缁勪欢"}]
+ },
+ createFilter(queryString) {
+ return (restaurant) => {
+ return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+ };
+ },
selectDataList() {
this.list.forEach(a => {
a.code = '[1]'
@@ -423,7 +579,12 @@
this.selectVersion()
},
handleNodeClick(val) {//鏍戠殑鍊�
- this.returntree = val
+ if(val.code==='[5]'&&val.children===undefined){
+ console.log(val);
+ this.returntree = val
+ this.typeselect=0
+ this.selectVersion()
+ }
},
async selectVersion() {//鐗堟湰
let v=await this.$axios.get(this.$api.url.selectVersion, {
@@ -556,29 +717,71 @@
break;
}
},
+ // 閫掑綊鏇存敼娣诲姞绾ц仈鎵�闇�灞炴��
replaceProp(arr){
for (let index = 0; index < arr.length; index++) {
let element = arr[index];
element.label=element.name
element.value=element.name
- // if()
+ if(element.children!=undefined){
+ if(element.code==='[4]'){
+ delete element['children']
+ continue
+ }
+ this.replaceProp(element.children)
+ }
}
}
},
watch:{
leftAdd: {
- handler(newVal, oldVal) {
- console.log("鏂扮殑",newVal);
- console.log("鏃х殑",oldVal);
- },
+ handler(newVal, oldVal) {
+ if(this.isLeftAdd){
+ let tree=JSON.parse(JSON.stringify(this.list))
+ let father=null;
+ if(newVal.father!=null&&newVal.father!=''&&newVal.type.length>0){
+ let one=tree.filter(item=>{
+ return item.name===newVal.type[0]
+ })[0]
+ console.log(one);
+ let two=one.children.filter(item=>{
+ return item.name===newVal.father
+ })[0]
+ if(two!=undefined){
+ this.bomName=[]
+ father=JSON.parse(JSON.stringify(two))
+ two.children.forEach(item=>{
+ let obj={label: item.name,value: item.name}
+ this.bomName.push(obj)
+ })
+ }
+ }
+ if(newVal.name!=null&&newVal!=''&&newVal.father!=null&&newVal.father!=''&&newVal.type.length>0){
+ let three=null
+ if(father!=undefined&&father!=null){
+ three=father.children.filter(item=>{
+ return item.name===newVal.name
+ })[0]
+ }
+ if(three!=undefined&&three!=null){
+ this.bomStandard=[]
+ three.children.forEach(item=>{
+ let obj={label: item.name,value: item.name}
+ this.bomStandard.push(obj)
+ })
+ }
+ }
+ }
+ },
deep: true // 娣卞害鐩戝惉瀵硅薄鍐呴儴灞炴�х殑鍙樺寲锛屽彲閫夌殑
},
bomLeftAdd:{
handler(newval,oldVal){
if(newval){
let treeOptions = JSON.parse(JSON.stringify(this.list));
- console.log(treeOptions);
-
+ this.replaceProp(treeOptions)
+ this.formTypeOptions=treeOptions
+ this.restaurants=this.loadFatherType()
}
}
}
@@ -616,6 +819,7 @@
.thing .left {
width: 295px;
height: calc(100% - 32px);
+ overflow-y: auto;
border-right: 3px solid rgb(245, 247, 251);
padding: 16px;
}
diff --git a/src/components/view/unqualifiedManagement.vue b/src/components/view/unqualifiedManagement.vue
index 56a816c..2d8c9d7 100644
--- a/src/components/view/unqualifiedManagement.vue
+++ b/src/components/view/unqualifiedManagement.vue
@@ -30,6 +30,17 @@
clearable
value-format="yyyy-MM-dd"
></el-date-picker>
+ <span>浜у搧澶х被锛�</span>
+ <el-select
+ v-model="search.productCategories"
+ size="small"
+ placeholder="璇烽�夋嫨"
+ style="width: 224px;margin-right: 30px;"
+ >
+ <el-option label="鍏ㄩ儴" :value="''"></el-option>
+ <el-option label="鎴愬搧" :value="1"></el-option>
+ <el-option label="鍗婃垚鍝�" :value="2"></el-option>
+ </el-select>
<el-button size="mini" @click="clean()"><span>閲� 缃�</span></el-button>
<el-button
size="mini"
@@ -71,7 +82,8 @@
</el-table-column>
<el-table-column prop="material_code" label="鏉愭枡缂栫爜">
</el-table-column>
- <el-table-column prop="id" label="鏉愭枡鍚嶇О"> </el-table-column>
+ <el-table-column prop="project_name" label="鏉愭枡鍚嶇О">
+ </el-table-column>
<el-table-column
prop="specifications_model"
label="瑙勬牸鍨嬪彿"
@@ -108,14 +120,49 @@
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" width="100">
- <template>
+ <template slot-scope="scope">
<div style="display: flex;">
- <el-button type="text" siae="small" size="mini">璇勫</el-button>
+ <el-popover
+ placement="left"
+ width="160"
+ :ref="`popover-${scope.$index}`"
+ >
+ <div style="padding: 6px">璇勫鏄惁閫氳繃锛�</div>
+ <div style="text-align: right; margin: 6px;">
+ <el-button
+ size="mini"
+ type="text"
+ style="color: #E84738;"
+ @click="
+ scope._self.$refs[`popover-${scope.$index}`].doClose();
+ rawEvaluate(scope.row, 0);
+ "
+ >涓嶉�氳繃</el-button
+ >
+ <el-button
+ type="text"
+ style="color: #34bd66;"
+ size="mini"
+ @click="
+ scope._self.$refs[`popover-${scope.$index}`].doClose();
+ rawEvaluate(scope.row, 1);
+ "
+ >閫氳繃</el-button
+ >
+ </div>
+ <el-button
+ slot="reference"
+ type="text"
+ siae="small"
+ size="mini"
+ >璇勫</el-button
+ >
+ </el-popover>
<el-button
type="text"
siae="small"
size="mini"
- style=" color:87, 138, 193 ;"
+ style=" color:87, 138, 193 ;margin-left: 10px;"
>鏌ョ湅</el-button
>
</div>
@@ -149,6 +196,7 @@
countSize: 10, // 鏉℃暟/椤�
pageSize: 1, // 璧峰椤�
formTime: "", // 鏉ユ枡鏃ユ湡
+ productCategories: "", // 浜у搧澶х被
dealState: "" // 澶勭悊鐘舵��
},
unqualifiedTable: [], // 椤甸潰琛ㄦ牸鏁版嵁
@@ -185,6 +233,17 @@
dealState: "" // 澶勭悊鐘舵��
};
this.getDetailInfo();
+ },
+ rawEvaluate(row, passOrNo) {
+ this.$axios
+ .post(this.$api.url.evaluatePassOrNo, {
+ rawId: row.id,
+ passOrNo: passOrNo
+ })
+ .then(res => {
+ this.unqualifiedTable = [];
+ this.getDetailInfo();
+ });
}
}
};
diff --git a/src/main.js b/src/main.js
index 1cef795..9aff47f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
Vue.use(qs);
Vue.use(api);
-const javaApi = 'http://192.168.0.23:8001'
+const javaApi = 'http://192.168.0.25:8001'
// const javaApi = '192.168.0.6'
--
Gitblit v1.9.3