From da2b21618e8cc71dc24f21d4d2c8b5661d72a08e Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 01 十一月 2023 09:08:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/finishedProductInspection/index.vue | 92 ++++-----------------------------------------
1 files changed, 9 insertions(+), 83 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 73c770a..1ab2496 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -1,31 +1,6 @@
<template>
<div class="content-main">
- <div v-if="!showAdd&&!showLook&&!showUp" class="rawPage">
- <!-- <div class="nav"> -->
- <!-- <div class="title">
- <el-row>
- <el-col :span="12">浜у搧妫�楠�</el-col>
- <el-col :span="12">
- <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> -->
- <!-- <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="rawPage">
<basic-container>
<ttable
:table="table"
@@ -37,56 +12,6 @@
<template #toolbar></template>
</ttable>
</basic-container>
- <!-- <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="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>
@@ -227,7 +152,7 @@
{
text: '鏂板',
type: 'primary',
- fun: ()=>this.showAdd=true
+ fun: this.addOrUpdateHandle
},
{
text: '鍒犻櫎',
@@ -315,6 +240,13 @@
// this.getInspectionTableData()
},
methods: {
+ // 鏂板 / 淇敼
+ addOrUpdateHandle(row) {
+ this.$router.push({
+ name: 'finishedProductForm',
+ query: { id: row == null ? null : row.id }
+ })
+ },
formatResult(row, column, cellValue){
if(cellValue != undefined || cellValue != null){
if(cellValue == 0){
@@ -326,12 +258,6 @@
},
formatDateTime(row, column, cellValue) {
return cellValue ? fecha.format(new Date(cellValue), 'yyyy-MM-dd') : ''
- },
- addOrUpdateHandle(row) {
- this.$router.push({
- name: 'rawMaterialForm',
- query: { id: row == null ? null : row.id }
- })
},
handleSelectionChange(){
--
Gitblit v1.9.3