From 02ff4d3b3c4829e6f97a704c60fe76433e65c4e6 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 07 九月 2023 18:03:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/finishedProductInspection.vue | 246 ++++++++++++++++++++++++-------------------------
1 files changed, 121 insertions(+), 125 deletions(-)
diff --git a/src/components/view/finishedProductInspection.vue b/src/components/view/finishedProductInspection.vue
index 7dc48e2..bc27b7e 100644
--- a/src/components/view/finishedProductInspection.vue
+++ b/src/components/view/finishedProductInspection.vue
@@ -13,31 +13,29 @@
</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 v-model="searchData.inspectResult" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 52px;">
+ <el-option value="1" label="鍚堟牸"></el-option>
+ <el-option value="2" label="涓嶅悎鏍�"></el-option>
</el-select>
<span>妫�楠屾棩鏈燂細</span>
<el-date-picker
- v-model="inspectionDate"
+ v-model="searchData.inspectDate"
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 v-model="searchData.inspectUsername" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 52px;">
+ <el-option :value="item.id" :key="item.id" :label="item.name" v-for="item in usernameOptions"></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>
+ <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="400"
- :max-height="400"
+ 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"
@@ -48,22 +46,22 @@
width="50">
</el-table-column>
<el-table-column
- prop="number"
+ prop="order_number"
label="璁㈠崟鍙�"
min-width="100"
/>
<el-table-column
- prop="username"
+ prop="customer_name"
label="瀹㈡埛鍚嶇О"
min-width="80"
/>
<el-table-column
- prop="projectname"
+ prop="project_name"
label="宸ョ▼鍚嶇О"
min-width="80"
/>
<el-table-column
- prop="tracenumber"
+ prop="quality_traceability"
label="璐ㄩ噺杩芥函鍙�"
min-width="108"
/>
@@ -73,12 +71,12 @@
min-width="100"
/>
<el-table-column
- prop="class"
+ prop="material"
label="浜у搧澶х被"
min-width="72"
/>
<el-table-column
- prop="specificationmodel"
+ prop="specifications_model"
label="瑙勬牸鍨嬪彿"
min-width="110"
/>
@@ -93,22 +91,7 @@
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"
+ prop="detectionPeriod"
label="妫�楠屾棩鏈�"
min-width="80"
/>
@@ -116,13 +99,19 @@
prop="result"
label="妫�娴嬬粨鏋�"
min-width="80"
- />
+ >
+ <template slot-scope="scope">
+ <span>{{scope.row.result===1?'鍚堟牸':'涓嶅悎鏍�'}}</span>
+ </template>
+ </el-table-column>
+
+
<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" @click="goToDetail(scope.row)">鏌ョ湅</el-button>
<el-button type="text" size="small">鎵撳嵃</el-button>
</template>
</el-table-column>
@@ -131,11 +120,11 @@
<!-- 鍒嗛〉鍣� -->
<div class="pagination">
<el-pagination
- :current-page="currentPage"
+ :current-page="pageParams.pageNo"
:page-sizes="[100, 200, 300, 400]"
- :page-size="pageSize"
+ :page-size="pageParams.pageSize"
layout="total, sizes, prev, pager, next, jumper"
- :total="this.inspectionTable.length"
+ :total="pageParams.total"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
@@ -149,93 +138,87 @@
<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-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="left" label-width="100px" size="mini" >
+ <el-form :model="addInspectionform" ref="addInspectionform" class="addInspectionform" label-position="right" label-width="100px" size="mini" >
<div class="formwrapper">
- <el-row :gutter="450">
- <el-col :span="5">
+ <el-row>
+ <el-col :span="7">
<el-form-item label="璁㈠崟鍙凤細">
- <el-input style="width: 180px;" v-model="addInspectionform.number" placeholder="璇疯緭鍏ヨ鍗曞彿" autocomplete="off" />
+ <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.number" placeholder="璇疯緭鍏ヨ鍗曞彿" autocomplete="off" />
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.order_number" placeholder="璇疯緭鍏ヨ鍗曞彿1" autocomplete="off" />
</el-form-item>
</el-col>
- <el-col :span="5">
+ <el-col :span="7">
<el-form-item label="瀹㈡埛鍚嶇О锛�">
- <el-input style="width: 180px;" v-model="addInspectionform.username" placeholder="璇疯緭鍏ュ鎴峰悕绉�" autocomplete="off" />
+ <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.username" placeholder="璇疯緭鍏ュ鎴峰悕绉�" autocomplete="off" />
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.customer_name" placeholder="璇疯緭鍏ュ鎴峰悕绉�" autocomplete="off" />
</el-form-item>
</el-col>
- <el-col :span="5">
+ <el-col :span="7">
<el-form-item label="宸ョ▼鍚嶇О锛�">
- <el-input style="width: 180px;" v-model="addInspectionform.projectname" placeholder="璇疯緭鍏ュ伐绋嬪悕绉�" autocomplete="off" />
+ <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.projectname" placeholder="璇疯緭鍏ュ伐绋嬪悕绉�" autocomplete="off" />
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.project_name" placeholder="璇疯緭鍏ュ伐绋嬪悕绉�" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
- <el-row :gutter="450">
- <el-col :span="5">
+ <el-row >
+ <el-col :span="7">
<el-form-item label="璐ㄩ噺杩芥函鍙凤細" >
- <el-input style="width: 180px;" v-model="addInspectionform.tracenumber" placeholder="璇疯緭鍏ヨ拷婧彿" autocomplete="off" />
+ <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.tracenumber" placeholder="璇疯緭鍏ヨ拷婧彿" autocomplete="off" />
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.quality_traceability" placeholder="璇疯緭鍏ヨ拷婧彿" autocomplete="off" />
</el-form-item>
</el-col>
- <el-col :span="5">
+ <el-col :span="7">
<el-form-item label="浜у搧缂栫爜锛�">
- <el-input style="width: 180px;" v-model="addInspectionform.code" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" /> </el-form-item>
+ <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="5">
+ <el-col :span="7">
<el-form-item label="浜у搧鍚嶇О锛�">
- <el-select style="width: 180px;" v-model="addInspectionform.class" size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
+ <el-select v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.class" size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
<el-option value="閫夐」1"></el-option>
<el-option value="閫夐」2"></el-option>
</el-select>
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.material" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
+
</el-form-item>
</el-col>
</el-row>
- <el-row :gutter="450">
- <el-col :span="5">
+ <el-row >
+ <el-col :span="7">
<el-form-item label="瑙勬牸鍨嬪彿锛�" >
- <el-select style="width: 180px;" v-model="addInspectionform.specificationmodel" size="small" placeholder="璇烽�夋嫨瑙勬牸鍨嬪彿">
+ <el-select v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.specificationmodel" size="small" placeholder="璇烽�夋嫨瑙勬牸鍨嬪彿">
<el-option value="閫夐」1"></el-option>
<el-option value="閫夐」2"></el-option>
</el-select>
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.specifications_model" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
</el-form-item>
</el-col>
- <el-col :span="5">
+ <el-col :span="7">
<el-form-item label="鍗曚綅锛�" >
- <el-select style="width: 180px;" v-model="addInspectionform.unit" size="small" placeholder="璇烽�夋嫨鍗曚綅">
+ <el-select v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.unit" size="small" placeholder="璇烽�夋嫨鍗曚綅">
<el-option value="閫夐」1"></el-option>
<el-option value="閫夐」2"></el-option>
</el-select>
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.specifications_model" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
</el-form-item>
</el-col>
- <el-col :span="5">
+ <el-col :span="7">
<el-form-item label="鏁伴噺锛�">
- <el-input style="width: 180px;" v-model="addInspectionform.quantity" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
+ <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.quantity" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.quantity" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
+
</el-form-item>
</el-col>
</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-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>
@@ -277,8 +260,7 @@
<el-table-column prop="operation" label="涓婃姤"></el-table-column>
</el-table>
</div>
- </div>
-
+ </div>
</div>
</template>
@@ -287,45 +269,22 @@
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,
+ searchData:{
+ inspectionResult: '',
+ inspectionDate: '',
+ inspecter: '',
+ },
+ // 涓绘満宸ヤ笅鎷夋
+ usernameOptions:[],
+ inspectionTable:[
+ ],
+ pageParams:{
+ pageNo: 1, // 褰撳墠椤电爜
+ pageSize: 100,
+ total:0
+ },
showAddPage: false,
+ showDetail:false,
addInspectionform: [{
number: '',
username: '',
@@ -355,8 +314,13 @@
inspecter:'111',
conclusion:'',
operation:''
- }]
+ }],
+ finishedInsInfo:{}
}
+ },
+ created() {
+ this.init()
+ this.getInspectionTableData()
},
methods:{
// 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
@@ -372,6 +336,24 @@
},
handleAddNew(){
this.showAddPage=true
+ },
+ async getInspectionTableData() {
+ const {data:{row,total}} = await this.$axios.get(this.$api.url.finishedInsListPage,{params:{...this.pageParams,...this.searchData}})
+ console.log(row)
+ this.inspectionTable = row
+ this.pageParams.total = total
+ },
+ goToDetail(row) {
+ this.showAddPage = true
+ this.showDetail = true
+ this.finishedInsInfo = row
+ console.log(this.showDetail)
+ // this.addInspectionform = []
+ },
+ async init() {
+ const {data} = await this.$axios.get(this.$api.url.finishedInspectUser)
+ this.usernameOptions = data
+
}
}
@@ -433,4 +415,18 @@
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