From 5fc5876a94dcbd5e9a9fb91f5e3c01211e9c2d96 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期三, 24 一月 2024 16:59:19 +0800
Subject: [PATCH] 返修标记
---
jcdm-ui/src/views/main/kb/repairMark/index.vue | 141 ++++++++++++++++------------------
jcdm-ui/src/api/main/da/passingStationCollection/passingStationCollection.js | 9 ++
jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java | 11 ++
jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/controller/RmRepairRecordController.java | 10 ++
jcdm-ui/src/api/main/rm/repairRecord/repairRecord.js | 11 ++
5 files changed, 106 insertions(+), 76 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java
index 19831e2..6e67eda 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java
@@ -50,6 +50,17 @@
return getDataTable(list);
}
+ /**
+ * 鏌ヨ浜у搧杩囩珯閲囬泦鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('da:passingStationCollection:list')")
+ @GetMapping("/noPageList")
+ public TableDataInfo noPageList(DaPassingStationCollection daPassingStationCollection)
+ {
+ List<DaPassingStationCollection> list = daPassingStationCollectionService.selectDaPassingStationCollectionList(daPassingStationCollection);
+ return getDataTable(list);
+ }
+
@PreAuthorize("@ss.hasPermi('da:passingStationCollection:list')")
@GetMapping("/getProduceNumToday")
public R getProduceNumToday(String fieldName)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/controller/RmRepairRecordController.java b/jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/controller/RmRepairRecordController.java
index b4ed99a..afdb8ab 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/controller/RmRepairRecordController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/controller/RmRepairRecordController.java
@@ -47,6 +47,16 @@
}
/**
+ * 涓嶅垎椤垫煡璇㈣繑淇褰曞垪琛�
+ */
+ @GetMapping("/noPagelist")
+ public TableDataInfo noPagelist(RmRepairRecord rmRepairRecord)
+ {
+ List<RmRepairRecord> list = rmRepairRecordService.selectRmRepairRecordList(rmRepairRecord);
+ return getDataTable(list);
+ }
+
+ /**
* 瀵煎嚭杩斾慨璁板綍鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('rm:repairRecord:export')")
diff --git a/jcdm-ui/src/api/main/da/passingStationCollection/passingStationCollection.js b/jcdm-ui/src/api/main/da/passingStationCollection/passingStationCollection.js
index 57673db..a253eab 100644
--- a/jcdm-ui/src/api/main/da/passingStationCollection/passingStationCollection.js
+++ b/jcdm-ui/src/api/main/da/passingStationCollection/passingStationCollection.js
@@ -9,6 +9,15 @@
})
}
+// 涓嶅垎椤垫煡璇骇鍝佽繃绔欓噰闆嗗垪琛�
+export function noPageList(query) {
+ return request({
+ url: '/da/passingStationCollection/noPageList',
+ method: 'get',
+ params: query
+ })
+}
+
// 鑾峰彇棣栭〉鍗曟棩绱閲忎骇鏁版嵁
export function getProduceNumToday(query) {
return request({
diff --git a/jcdm-ui/src/api/main/rm/repairRecord/repairRecord.js b/jcdm-ui/src/api/main/rm/repairRecord/repairRecord.js
index 0083674..3fa3804 100644
--- a/jcdm-ui/src/api/main/rm/repairRecord/repairRecord.js
+++ b/jcdm-ui/src/api/main/rm/repairRecord/repairRecord.js
@@ -9,7 +9,16 @@
})
}
-// 鏌ヨ杩斾慨璁板綍璇︾粏
+// 鏌ヨ杩斾慨璁板綍鍒楄〃
+export function noPagelist(query) {
+ return request({
+ url: '/rm/repairRecord/noPagelist',
+ method: 'get',
+ params: query
+ })
+}
+
+// 涓嶅垎椤垫煡璇㈣繑淇褰曡缁�
export function getRepairRecord(id) {
return request({
url: '/rm/repairRecord/' + id,
diff --git a/jcdm-ui/src/views/main/kb/repairMark/index.vue b/jcdm-ui/src/views/main/kb/repairMark/index.vue
index 5e9fd60..8b88fe9 100644
--- a/jcdm-ui/src/views/main/kb/repairMark/index.vue
+++ b/jcdm-ui/src/views/main/kb/repairMark/index.vue
@@ -24,40 +24,54 @@
<el-row>
<el-col :span="20">
<el-card style="margin-top: 10px; height: 490px;" class="box-card">
- <el-table border ref="multipleTable" :data="passingStationCollectionList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="宸ュ崟缂栧彿" width="120" align="center" prop="workOrderNo">
- </el-table-column>
- <el-table-column label="鎬绘垚搴忓垪鍙�" width="150" align="center" prop="sfcCode">
- </el-table-column>
- <el-table-column label="浜у搧缂栧彿" align="center" prop="productCode">
- </el-table-column>
- <el-table-column label="浜х嚎缂栧彿" align="center" prop="productionLine">
- </el-table-column>
- <el-table-column label="宸ヤ綅缂栧彿" align="center" prop="locationCode">
- </el-table-column>
- <el-table-column label="鍏ョ珯鏃堕棿" align="center" prop="inboundTime" width="100">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.inboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鍑虹珯鏃堕棿" align="center" prop="outboundTime" width="100">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.outboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鏄惁鍚堟牸" align="center" prop="outRsSign">
- </el-table-column>
- <el-table-column label="NG鍘熷洜" align="center" prop="outMsgSign">
- </el-table-column>
- <el-table-column label="閲囬泦鏃堕棿" align="center" prop="collectionTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.collectionTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鑺傛媿鏃堕棿" align="center" prop="beatTime">
- </el-table-column>
- </el-table>
+ <el-tabs v-model="activeName" @tab-click="handleClick">
+ <el-tab-pane label="杩囩珯閲囬泦" name="first">
+ <el-table max-height="410px" border ref="multipleTable" :data="passingStationCollectionList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column label="宸ュ崟缂栧彿" width="120" align="center" prop="workOrderNo">
+ </el-table-column>
+ <el-table-column label="鎬绘垚搴忓垪鍙�" width="150" align="center" prop="sfcCode">
+ </el-table-column>
+ <el-table-column label="浜у搧缂栧彿" align="center" prop="productCode">
+ </el-table-column>
+ <el-table-column label="浜х嚎缂栧彿" align="center" prop="productionLine">
+ </el-table-column>
+ <el-table-column label="宸ヤ綅缂栧彿" align="center" prop="locationCode">
+ </el-table-column>
+ <el-table-column label="鍏ョ珯鏃堕棿" align="center" prop="inboundTime" width="160">
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.inboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍑虹珯鏃堕棿" align="center" prop="outboundTime" width="160">
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.outboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏄惁鍚堟牸" align="center" prop="outRsSign">
+ </el-table-column>
+ <el-table-column label="NG鍘熷洜" align="center" prop="outMsgSign">
+ </el-table-column>
+ <el-table-column label="閲囬泦鏃堕棿" align="center" prop="collectionTime" width="160">
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.collectionTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鑺傛媿鏃堕棿" align="center" prop="beatTime">
+ </el-table-column>
+ </el-table>
+ </el-tab-pane>
+ <el-tab-pane label="杩斾慨璁板綍" name="second">
+ <el-table max-height="410px" border :data="repairRecordList">
+ <el-table-column label="鍙戝姩鏈哄彿" width="150" align="center" prop="boxCode" />
+ <el-table-column label="宸ヤ綅鍙�" align="center" prop="processesCode" />
+ <el-table-column label="杩斾慨缁撴灉" align="center" prop="repairResults" />
+ <el-table-column label="鍘熺粨鏋�" align="center" prop="originalResult" />
+ <el-table-column label="杩斾慨鏃堕棿" align="center" width="160" prop="repairTime" />
+ </el-table>
+ </el-tab-pane>
+ </el-tabs>
+
</el-card>
</el-col>
<el-col :span="4">
@@ -80,34 +94,9 @@
<el-row class="centered-row">
<el-button type="success" style="margin-top: 10px;width:120px;height:40px" icon="el-icon-date" @click="operationLog" >鎿� 浣� 鏃� 蹇�</el-button>
</el-row>
-
-
-
-<!-- <el-button type="success" icon="el-icon-close" @click="clearAll">鍙栨秷閫夋嫨</el-button>-->
-<!-- <el-button type="success" icon="el-icon-document-remove" @click="selectUnqualified">閫夋嫨涓嶅悎鏍�</el-button>-->
-<!-- <el-button type="success" icon="el-icon-s-flag" @click="markComplete">鏍囪瀹屾垚</el-button>-->
-<!-- <el-button type="success" icon="el-icon-files" @click="repairRecord">杩斾慨璁板綍</el-button>-->
-<!-- <el-button type="success" icon="el-icon-date" @click="operationLog" >鎿嶄綔鏃ュ織</el-button>-->
</el-card>
</el-col>
</el-row>
-
- <el-dialog v-dialogpop-up :visible.sync="open" width="700px" append-to-body>
- <span slot="title">
- <i class="el-icon-s-order"></i>
- 杩斾慨杩涘害
- </span>
- <el-table border :data="repairRecordList">
- <el-table-column label="鍙戝姩鏈哄彿" width="150" align="center" prop="boxCode" />
- <el-table-column label="宸ヤ綅鍙�" align="center" prop="processesCode" />
- <el-table-column label="杩斾慨缁撴灉" align="center" prop="repairResults" />
- <el-table-column label="鍘熺粨鏋�" align="center" prop="originalResult" />
- <el-table-column label="杩斾慨鏃堕棿" align="center" width="160" prop="repairTime" />
- </el-table>
- <div slot="footer" class="dialog-footer">
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
</div>
@@ -115,15 +104,17 @@
<script>
import {
- listPassingStationCollection,
+ noPageList,
insertRepairRecordByIds
} from "@/api/main/da/passingStationCollection/passingStationCollection";
-import {listRepairRecord} from "@/api/main/rm/repairRecord/repairRecord";
+import {noPagelist} from "@/api/main/rm/repairRecord/repairRecord";
export default {
name: "index",
dicts: ['sys_normal_disable'],
data(){
return{
+ activeName: 'first',
+
// 杩斾慨璁板綍琛ㄦ牸鏁版嵁
repairRecordList: [],
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -136,12 +127,13 @@
outRsSign: '',
},
ids: [],
- allSelected: false
+ allSelected: false,
+ boxCode: '',
}
},
mounted() {
- this.getList()
+ // this.getList()
},
methods:{
// 鍙栨秷鎸夐挳
@@ -189,26 +181,25 @@
this.multiple = !selection.length
},
repairProgressHandleQuery(){
- this.open = true;
- if(this.queryParams.engineNo === ''||this.queryParams.engineNo=== null){
- this.$modal.msgSuccess('璇疯緭鍏ュ彂鍔ㄦ満鍙�');
- }else {
- /** 鏌ヨ杩斾慨璁板綍鍒楄〃 */
- let queryParams = {
- boxCode: this.queryParams.engineNo
- }
- listRepairRecord(queryParams).then(response => {
- this.repairRecordList = response.rows;
- });
+ this.activeName = 'second'
+ },
+ initRepairRecord(){
+ /** 鏌ヨ杩斾慨璁板綍鍒楄〃 */
+ let queryParams = {
+ boxCode: this.queryParams.sfcCode
}
+ noPagelist(queryParams).then(response => {
+ this.repairRecordList = response.rows;
+ });
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
this.getList();
+ this.initRepairRecord();
},
/** 鏌ヨ浜у搧杩囩珯閲囬泦鍒楄〃 */
getList() {
- listPassingStationCollection(this.queryParams).then(response => {
+ noPageList(this.queryParams).then(response => {
this.passingStationCollectionList = response.rows;
this.total = response.total;
});
--
Gitblit v1.9.3