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 | 73 +++++++++++++++++++++++++++---------
1 files changed, 54 insertions(+), 19 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/repairMark/index.vue b/jcdm-ui/src/views/main/kb/repairMark/index.vue
index 8b88fe9..9952468 100644
--- a/jcdm-ui/src/views/main/kb/repairMark/index.vue
+++ b/jcdm-ui/src/views/main/kb/repairMark/index.vue
@@ -24,18 +24,18 @@
<el-row>
<el-col :span="20">
<el-card style="margin-top: 10px; height: 490px;" class="box-card">
- <el-tabs v-model="activeName" @tab-click="handleClick">
+ <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 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">
+ <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,11 +108,15 @@
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'],
data(){
return{
+
+ loading: false,//鍒锋柊淇敼
+
activeName: 'first',
// 杩斾慨璁板綍琛ㄦ牸鏁版嵁
@@ -129,13 +133,22 @@
ids: [],
allSelected: false,
boxCode: '',
-
+ // rules: {
+ // boxCode: [
+ // { required: true, message: "鐘舵�佷笉鑳戒负绌�", trigger: "blur" }
+ // ]
+ // },
}
},
mounted() {
// this.getList()
},
methods:{
+ handleClick(tab, event) {
+ console.log(tab, event);
+ this.$modal.msgSuccess(tab,event);
+
+ },
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
@@ -157,16 +170,28 @@
},
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
}
+ this.repairRecordList = []
insertRepairRecordByIds(queryParams).then(response => {
-
+ this.initRepairRecord(); // 鍒锋柊杩斾慨璁板綍
+ this.loading = false; // 缁撴潫鍔犺浇鏁版嵁
+ }).catch(() => {
+ this.loading = false; // 缁撴潫鍔犺浇鏁版嵁
});
+ // this.initRepairRecord()
+ // this.getList();
}
+ this. handleQuery();
},
repairRecord(){
this.$modal.msgSuccess('杩斾慨璁板綍');
@@ -188,20 +213,30 @@
let queryParams = {
boxCode: this.queryParams.sfcCode
}
+
noPagelist(queryParams).then(response => {
this.repairRecordList = response.rows;
});
+
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
- this.getList();
- this.initRepairRecord();
+ let sfcCode = this.queryParams.sfcCode
+ if(sfcCode === null||sfcCode ===''){
+ this.$message({
+ message: '璇峰～鍐欏彂鍔ㄦ満鍙凤紒',
+ type: 'warning'
+ });
+ }else {
+ // this.$modal.msgSuccess('鎼滅储');
+ this.getList();
+ this.initRepairRecord();
+ }
},
/** 鏌ヨ浜у搧杩囩珯閲囬泦鍒楄〃 */
getList() {
noPageList(this.queryParams).then(response => {
this.passingStationCollectionList = response.rows;
- this.total = response.total;
});
},
--
Gitblit v1.9.3