From 22b45a79b2ceab7625e0fe248458c398cc26110d Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 25 九月 2023 12:53:59 +0800
Subject: [PATCH] modified: src/components/view/Processingproducts.vue modified: src/components/view/rawInsDetail.vue modified: src/components/view/sale.vue
---
src/components/view/finishedProductInspection.vue | 856 ++++++++++++++++++++++++++++----------------------------
1 files changed, 432 insertions(+), 424 deletions(-)
diff --git a/src/components/view/finishedProductInspection.vue b/src/components/view/finishedProductInspection.vue
index 7dc48e2..428fd11 100644
--- a/src/components/view/finishedProductInspection.vue
+++ b/src/components/view/finishedProductInspection.vue
@@ -1,436 +1,444 @@
<template>
- <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 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>
- </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">鎵撳嵃</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>
- </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 class="content-main">
+ <div v-if="!showAdd&&!showLook&&!showUp" 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 icon="el-icon-download" size="mini">瀵煎嚭</el-button>
+ </el-col>
+ </el-row>
+ </div>
+ <div class="nav">
+ <span>妫�娴嬬粨鏋滐細</span>
+ <el-select v-model="searchData.result" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 52px;">
+ <el-option :value="''" label="鍏ㄩ儴"></el-option>
+ <el-option :value="1" label="鍚堟牸"></el-option>
+ <el-option :value="0" label="涓嶅悎鏍�"></el-option>
+ </el-select>
+ <span>浜у搧鍚嶇О锛�</span>
+ <el-input v-model="searchData.material" size="small" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�"
+ style="width: 224px;margin-right: 52px;"></el-input>
+ <el-button size="mini" @click="()=>{searchData={};getInspectionTableData()}"><span>閲� 缃�</span></el-button>
+ <el-button size="mini" type="primary" @click="getInspectionTableData" style="background: #004EA2;"><span>鏌�
+ 璇�</span></el-button>
+ </div>
+ <div class="content-body">
+ <div class="inspectionTable">
+ <el-table ref="inspectionTable" height="620" :cell-style="{textAlign: 'center'}"
+ :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
+ :data="inspectionTable" style="width: 100%">
+ <el-table-column type="selection" width="50">
+ </el-table-column>
+ <el-table-column prop="order_number" label="璁㈠崟鍙�" min-width="100" />
+ <el-table-column prop="customer_name" label="瀹㈡埛鍚嶇О" min-width="80" />
+ <el-table-column prop="project_name" label="宸ョ▼鍚嶇О" min-width="80" />
+ <el-table-column prop="quality_traceability" label="璐ㄩ噺杩芥函鍙�" min-width="108" />
+ <el-table-column prop="material_code" label="浜у搧缂栫爜" min-width="100" />
+ <el-table-column prop="material" label="浜у搧澶х被" min-width="72" />
+ <el-table-column prop="specifications_model" label="瑙勬牸鍨嬪彿" min-width="110" />
+ <el-table-column prop="unit" label="鍗曚綅" min-width="50" />
+ <el-table-column prop="quantity" label="鏁伴噺" min-width="50" />
+ <el-table-column prop="detectionPeriod" label="妫�楠屾棩鏈�" min-width="80" />
+ <el-table-column prop="result" label="妫�娴嬬粨鏋�" min-width="80">
+ <template slot-scope="scope">
+ <span style="color: #34BD66;" v-if="scope.row.result === 1">鍚堟牸</span>
+ <span style="color: #E84738;" v-else-if="scope.row.result === 0">涓嶅悎鏍�</span>
+ <span v-else-if="scope.row.result === null || scope.row.result === undefined">鏆傛湭缁撹</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" min-width="80">
+ <template slot-scope="scope">
+ <el-button type="text" size="small" @click="goToDetail(scope.row)">鏌ョ湅</el-button>
+ <el-button type="text" size="small">鎵撳嵃</el-button>
+ <el-button v-if="scope.row.result == null" type="text" size="small"
+ @click="goUp(scope.row)">缂栬緫</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <!-- 鍒嗛〉鍣� -->
+ <div class="pagination">
+ <el-pagination :current-page="pageParams.pageSize" :page-sizes="[10, 50, 100, 200]"
+ :page-size="pageParams.countSize" layout="total, sizes, prev, pager, next, jumper" :total="pageParams.total"
+ @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+ </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;showDetail = false}" type="primary" size="mini"
+ icon="el-icon-back" style="background: #004EA2; ">杩斿洖</el-button>
+ </el-col>
+ </el-row>
+ <el-form :model="addInspectionform" ref="addInspectionform" class="addInspectionform" label-position="right"
+ label-width="100px" size="mini">
+ <div class="formwrapper">
+ <el-row>
+ <el-col :span="7">
+ <el-form-item label="璁㈠崟鍙凤細">
+ <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.number"
+ placeholder="璇疯緭鍏ヨ鍗曞彿" autocomplete="off" />
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.order_number"
+ placeholder="璇疯緭鍏ヨ鍗曞彿1" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="瀹㈡埛鍚嶇О锛�">
+ <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.username"
+ placeholder="璇疯緭鍏ュ鎴峰悕绉�" autocomplete="off" />
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.customer_name"
+ placeholder="璇疯緭鍏ュ鎴峰悕绉�" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="宸ョ▼鍚嶇О锛�">
+ <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.projectname"
+ placeholder="璇疯緭鍏ュ伐绋嬪悕绉�" autocomplete="off" />
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.project_name"
+ placeholder="璇疯緭鍏ュ伐绋嬪悕绉�" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="7">
+ <el-form-item label="璐ㄩ噺杩芥函鍙凤細">
+ <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.tracenumber"
+ placeholder="璇疯緭鍏ヨ拷婧彿" autocomplete="off" />
+ <el-input v-show="showDetail !== false" style="width: 180px;"
+ v-model="finishedInsInfo.quality_traceability" placeholder="璇疯緭鍏ヨ拷婧彿" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="浜у搧缂栫爜锛�">
+ <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.material_code"
+ placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.material_code"
+ placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="浜у搧鍚嶇О锛�">
+ <el-select v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.class"
+ size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
+ <el-option value="閫夐」1"></el-option>
+ <el-option value="閫夐」2"></el-option>
+ </el-select>
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.material"
+ placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
- </div>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="7">
+ <el-form-item label="瑙勬牸鍨嬪彿锛�">
+ <el-select v-show="showDetail == false" style="width: 180px;"
+ v-model="addInspectionform.specificationmodel" size="small" placeholder="璇烽�夋嫨瑙勬牸鍨嬪彿">
+ <el-option value="閫夐」1"></el-option>
+ <el-option value="閫夐」2"></el-option>
+ </el-select>
+ <el-input v-show="showDetail !== false" style="width: 180px;"
+ v-model="finishedInsInfo.specifications_model" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="鍗曚綅锛�">
+ <el-select v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.unit"
+ size="small" placeholder="璇烽�夋嫨鍗曚綅">
+ <el-option value="閫夐」1"></el-option>
+ <el-option value="閫夐」2"></el-option>
+ </el-select>
+ <el-input v-show="showDetail !== false" style="width: 180px;"
+ v-model="finishedInsInfo.specifications_model" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="鏁伴噺锛�">
+ <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.quantity"
+ placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.quantity"
+ placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
+
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col v-show="showDetail !== false" :span="7">
+ <el-form-item label="涓绘満宸ワ細">
+ <el-input style="width: 180px;" v-model="finishedInsInfo.name" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�"
+ autocomplete="off" />
+ </el-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 class="newPage" v-if="showAdd">
+ <finishedProductInspectionAdd />
+ </div>
+ <div class="newPage" v-if="showLook">
+ <finishedProductInspectionLook :rowInfo="rowInfo" />
+ </div>
+ <div class="newPage" v-if="showUp">
+ <finishedProductInspectionUp :rowInfo="rowInfo" />
+ </div>
+ </div>
</template>
<script>
-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:''
- }]
- }
- },
- methods:{
- // 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
- handleSizeChange(val) {
- console.log(`姣忛〉 ${val} 鏉)
- this.currentPage = 1
- this.pageSize = val
- },
- // 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤�
- handleCurrentChange(val) {
- console.log(`褰撳墠椤�: ${val}`)
- this.currentPage = val
- },
- handleAddNew(){
- this.showAddPage=true
- }
- }
+ import finishedProductInspectionAdd from '@/components/view/finishedProductInspectionAdd'
+ import finishedProductInspectionUp from '@/components/view/finishedProductInspectionUp'
+ import finishedProductInspectionLook from '@/components/view/finishedProductInspectionLook'
+ export default {
+ components: {
+ finishedProductInspectionAdd,
+ finishedProductInspectionUp,
+ finishedProductInspectionLook
+ },
+ data() {
+ return {
+ searchData: {
+ result: '',
+ material: '',
+ },
+ // 涓绘満宸ヤ笅鎷夋
+ usernameOptions: [],
+ inspectionTable: [],
+ rowInfo: {},
+ pageParams: {
+ countSize: 10, //姣忛〉鏁伴噺
+ pageSize: 1, // 褰撳墠椤电爜
+ total: 0
+ },
+ showAddPage: false,
+ showAdd: false,
+ showLook: false,
+ showUp: false,
+ showDetail: 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: ''
+ }],
+ finishedInsInfo: {}
+ }
+ },
+ created() {
+ this.init()
+ this.getInspectionTableData()
+ },
+ methods: {
+ // 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
+ handleSizeChange(val) {
+ console.log(`姣忛〉 ${val} 鏉)
+ this.currentPage = 1
+ this.pageSize = val
+ },
+ // 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤�
+ handleCurrentChange(val) {
+ console.log(`褰撳墠椤�: ${val}`)
+ this.currentPage = val
+ },
+ handleAddNew() {
+ this.showAdd = true
+ },
+ async getInspectionTableData() {
+ const {
+ data: {
+ row,
+ total
+ }
+ } = await this.$axios.get(this.$api.url.finishedInsListPage, {
+ params: {
+ ...this.pageParams,
+ ...this.searchData
+ }
+ })
+ this.inspectionTable = row
+ this.pageParams.total = total
+ },
+ goToDetail(row) {
+ this.rowInfo = row
+ this.showLook = true
+ },
+ goUp(row) {
+ this.rowInfo = row
+ this.showUp = true
+ },
+ async init() {
+ // const {data} = await this.$axios.get(this.$api.url.finishedInspectUser)
+ // this.usernameOptions = data
-}
+ },
+ comBackMain(val) {
+ this.showAdd = false
+ this.showLook = false
+ this.showUp = false
+ this.init()
+ this.getInspectionTableData()
+ if (val) {
+ this.$parent.removeAllTab()
+ }
+ }
+ }
+
+ }
</script>
<style>
-.title{
- padding: 12px;
+ .title {
+ padding: 12px;
-}
-.nav{
- display: flex;
- padding: 20px 20px;
- align-items: center;
- background-color: #fff;
-}
-.nav *{
- font-size: 14px;
-}
-.content-body {
- background-color: #fff;
- overflow: hidden;
- margin-top: 12px;
-}
-.inspectionTable{
- padding: 20px 20px;
-}
-.pagination{
- float: right;
- margin-right: 20px;
-}
-.newPage{
- overflow: hidden;
-}
-.header{
- padding: 12px;
-}
-.addInspectionform{
- background-color: #fff;
-}
-.addInspectionform .formwrapper{
- padding: 20px 0px;
- margin-left: 100px;
-}
-.inspectionProject span{
- display: block;
- padding: 5px 0px;
-}
-.inspectionProject .el-table{
- background-color: #fff;
- padding: 10px 12px;
-}
-.inspectionResult span{
- display: block;
- padding: 5px 0px;
-}
-.inspectionResult .el-table{
- background-color: #fff;
- padding: 10px 12px;
-}
+ }
+
+ .nav {
+ display: flex;
+ padding: 20px 20px;
+ align-items: center;
+ background-color: #fff;
+ }
+
+ .nav * {
+ font-size: 14px;
+ }
+
+ .content-body {
+ background-color: #fff;
+ overflow: hidden;
+ margin-top: 12px;
+ }
+
+ .inspectionTable {
+ padding: 20px 20px;
+ }
+
+ .pagination {
+ float: right;
+ margin-right: 20px;
+ }
+
+ .newPage {
+ overflow: hidden;
+ }
+
+ .header {
+ padding: 12px;
+ }
+
+ .addInspectionform {
+ background-color: #fff;
+ }
+
+ .addInspectionform .formwrapper {
+ padding: 20px 0px;
+ margin-left: 100px;
+ }
+
+ .inspectionProject span {
+ display: block;
+ padding: 5px 0px;
+ }
+
+ .inspectionProject .el-table {
+ background-color: #fff;
+ padding: 10px 12px;
+ }
+
+ .inspectionResult span {
+ display: block;
+ padding: 5px 0px;
+ }
+
+ .inspectionResult .el-table {
+ background-color: #fff;
+ padding: 10px 12px;
+ }
+
+ .rawPage {
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ overflow-y: scroll;
+ }
+
+ .rawPage .content-body {
+ flex: 1;
+ }
+
+ /* .inspectionTable{
+ flex: 1;
+ overflow-y: scroll;
+} */
</style>
\ No newline at end of file
--
Gitblit v1.9.3