From b78307d92ab70853597a785085f8e1d44192ef5f Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 14 九月 2023 11:45:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/finishedProductInspection.vue | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/components/view/finishedProductInspection.vue b/src/components/view/finishedProductInspection.vue
index 18c8b6b..d0c4a51 100644
--- a/src/components/view/finishedProductInspection.vue
+++ b/src/components/view/finishedProductInspection.vue
@@ -1,6 +1,6 @@
<template>
<div class="content-main">
- <div v-if="!showAdd" class="rawPage">
+ <div v-if="!showAdd&&!showLook&&!showUp" class="rawPage">
<div class="title">
<el-row>
<el-col :span="12">鎴愬搧妫�楠�</el-col>
@@ -12,7 +12,7 @@
</el-row>
</div>
<div class="nav">
- <span>妫�楠岀粨鏋滐細</span>
+ <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>
@@ -93,8 +93,10 @@
min-width="80"
>
<template slot-scope="scope">
- <span>{{scope.row.result===1?'鍚堟牸':'涓嶅悎鏍�'}}</span>
- </template>
+ <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>
@@ -105,7 +107,7 @@
<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 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>
@@ -348,21 +350,31 @@
},
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
-
- // this.addInspectionform = []
+ 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()
+ }
}
}
--
Gitblit v1.9.3