From a42a810052e04ea604bd3f0d80ea62110ed40577 Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期五, 26 一月 2024 09:30:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/kb/repairMark/index.vue | 202 ++++++++++++++++++++++++++++++--------------------
1 files changed, 120 insertions(+), 82 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/repairMark/index.vue b/jcdm-ui/src/views/main/kb/repairMark/index.vue
index ffea7be..9741cd2 100644
--- a/jcdm-ui/src/views/main/kb/repairMark/index.vue
+++ b/jcdm-ui/src/views/main/kb/repairMark/index.vue
@@ -2,7 +2,7 @@
<div class="app-container">
<el-card class="box-card" >
<el-row>
- <el-divider style="margin-bottom: 10px"><span style="font-size: 40px">鍙戝姩鏈鸿繑淇爣璁扮郴缁�</span></el-divider>
+ <el-divider><span style="font-size: 30px">鍙戝姩鏈鸿繑淇爣璁扮郴缁�</span></el-divider>
</el-row>
<el-row style="margin-top: 10px">
<el-form :model="queryParams.sfcCode" ref="queryForm" :inline="true" label-width="68px" >
@@ -21,74 +21,82 @@
</el-form>
</el-row>
</el-card>
- <el-row :gutter="0">
+ <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}') }}</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}') }}</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}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鑺傛媿鏃堕棿" align="center" prop="beatTime">
- </el-table-column>
- </el-table>
+ <el-tabs v-model="activeName">
+ <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" @tab-click="handleClick">
+ <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">
- <el-card style="margin-top: 10px; min-height: 490px" class="box-card">
- <el-button type="success" icon="el-icon-s-grid" @click="selectAll" style="margin-left: 40px;width: 120px;margin-top: 10px">閫夋嫨鎵�鏈�</el-button>
- <el-button type="success" icon="el-icon-close" @click="clearAll" style="margin-left: 40px; width: 120px;margin-top: 10px">鍙栨秷閫夋嫨</el-button>
- <el-button type="success" icon="el-icon-document-remove" @click="selectUnqualified" style="margin-left: 40px; width: 120px;margin-top: 10px">閫夋嫨涓嶅悎鏍�</el-button>
- <el-button type="success" icon="el-icon-s-flag" @click="markComplete" style="margin-left: 40px; width: 120px;margin-top: 10px">鏍囪瀹屾垚</el-button>
- <el-button type="success" icon="el-icon-files" @click="repairRecord" style="margin-left: 40px; width: 120px;margin-top: 10px">杩斾慨璁板綍</el-button>
- <el-button type="success" icon="el-icon-date" @click="operationLog" style="margin-left: 40px; width: 120px;margin-top: 10px">鎿嶄綔鏃ュ織</el-button>
-
+ <el-card style="margin-top: 10px; min-height: 490px">
+ <el-row class="centered-row">
+ <el-button type="success" style="margin-top: 10px;width:120px;height:40px" icon="el-icon-s-grid" @click="selectAll" >閫� 鎷� 鎵� 鏈�</el-button>
+ </el-row>
+ <el-row class="centered-row">
+ <el-button type="success" style="margin-top: 10px;width:120px;height:40px" icon="el-icon-close" @click="clearAll">鍙� 娑� 閫� 鎷�</el-button>
+ </el-row>
+ <el-row class="centered-row">
+ <el-button type="success" style="margin-top: 10px;width:120px;height:40px" icon="el-icon-document-remove" @click="selectUnqualified">閫夋嫨涓嶅悎鏍�</el-button>
+ </el-row>
+ <el-row class="centered-row">
+ <el-button type="success" style="margin-top: 10px;width:120px;height:40px" icon="el-icon-s-flag" @click="markComplete">鏍� 璁� 瀹� 鎴�</el-button>
+ </el-row>
+ <el-row class="centered-row">
+ <el-button type="success" style="margin-top: 10px;width:120px;height:40px" icon="el-icon-files" @click="repairRecord">杩� 淇� 璁� 褰�</el-button>
+ </el-row>
+ <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-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>
@@ -96,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: [],
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -117,14 +127,24 @@
outRsSign: '',
},
ids: [],
- allSelected: false
-
+ allSelected: false,
+ boxCode: '',
+ // rules: {
+ // boxCode: [
+ // { required: true, message: "鐘舵�佷笉鑳戒负绌�", trigger: "blur" }
+ // ]
+ // },
}
},
mounted() {
- this.getList()
+ // this.getList()
},
methods:{
+ handleClick(tab, event) {
+ console.log(tab, event);
+ this.$modal.msgSuccess(tab,event);
+
+ },
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
@@ -152,10 +172,14 @@
let queryParams = {
ids: this.ids
}
+ this.repairRecordList = []
insertRepairRecordByIds(queryParams).then(response => {
});
+ // this.initRepairRecord()
+ // this.getList();
}
+ this. handleQuery();
},
repairRecord(){
this.$modal.msgSuccess('杩斾慨璁板綍');
@@ -170,28 +194,37 @@
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();
+ let sfcCode = this.queryParams.sfcCode
+ if(sfcCode === null||sfcCode ===''){
+ this.$message({
+ message: '璇峰～鍐欏彂鍔ㄦ満鍙凤紒',
+ type: 'warning'
+ });
+ }else {
+ this.$modal.msgSuccess('鎼滅储');
+ this.getList();
+ this.initRepairRecord();
+ }
},
/** 鏌ヨ浜у搧杩囩珯閲囬泦鍒楄〃 */
getList() {
- listPassingStationCollection(this.queryParams).then(response => {
+ noPageList(this.queryParams).then(response => {
this.passingStationCollectionList = response.rows;
- this.total = response.total;
});
},
@@ -203,7 +236,12 @@
::v-deep .el-form-item__label{
font-size: large;
}
-::v-deep .el-card__body{
- padding: 15px 20px 0px 20px;
+.el-icon-close {
+ margin-left: 20px;
+}
+.centered-row {
+ margin-top: 10px;
+ display: flex;
+ justify-content: center;
}
</style>
--
Gitblit v1.9.3