From ecf3c9735379270912d16f37c486d085b36f4c8a Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期二, 30 一月 2024 09:48:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/kb/repairMark/index.vue | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/repairMark/index.vue b/jcdm-ui/src/views/main/kb/repairMark/index.vue
index 23e7ab1..9952468 100644
--- a/jcdm-ui/src/views/main/kb/repairMark/index.vue
+++ b/jcdm-ui/src/views/main/kb/repairMark/index.vue
@@ -28,14 +28,14 @@
<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 label="宸ュ崟缂栧彿" width="120" align="center" prop="workOrderNo">
+ </el-table-column>-->
+ <el-table-column label="鍙戝姩鏈哄彿" min-width="160" align="center" prop="sfcCode">
</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 label="浜у搧缂栧彿" align="center" prop="productCode">
</el-table-column>
<el-table-column label="浜х嚎缂栧彿" align="center" prop="productionLine">
- </el-table-column>
+ </el-table-column>-->
<el-table-column label="宸ヤ綅缂栧彿" align="center" prop="locationCode">
</el-table-column>
<el-table-column label="鍏ョ珯鏃堕棿" align="center" prop="inboundTime" width="160">
@@ -50,24 +50,24 @@
</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="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-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="鍙戝姩鏈哄彿" min-width="160" 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-column label="杩斾慨鏃堕棿" align="center" prop="repairTime" />
</el-table>
</el-tab-pane>
</el-tabs>
@@ -108,6 +108,7 @@
insertRepairRecordByIds
} from "@/api/main/da/passingStationCollection/passingStationCollection";
import {noPagelist} from "@/api/main/rm/repairRecord/repairRecord";
+import {warning} from "@riophae/vue-treeselect/src/utils";
export default {
name: "index",
dicts: ['sys_normal_disable'],
@@ -169,10 +170,14 @@
},
markComplete(){
if(this.ids.length === 0){
- this.$modal.msgSuccess('鏈�夋嫨');
+ this.$message({
+ message: '鏈爣璁帮紒',
+ type: 'warning'
+ })
}else {
this.loading = true; // 寮�濮嬪姞杞芥暟鎹�
this.$modal.msgSuccess('鏍囪瀹屾垚');
+
let queryParams = {
ids: this.ids
}
--
Gitblit v1.9.3