From 9906e6b188bf2c36dddc0d5adadbf02e69ea3e4b Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期五, 25 十月 2024 09:17:29 +0800
Subject: [PATCH] add -sap
---
jcdm-ui/src/views/main/da/passingStationCollection/index.vue | 89 ++++++++++++++++++--------------------------
1 files changed, 36 insertions(+), 53 deletions(-)
diff --git a/jcdm-ui/src/views/main/da/passingStationCollection/index.vue b/jcdm-ui/src/views/main/da/passingStationCollection/index.vue
index d4f1e1e..aa2c646 100644
--- a/jcdm-ui/src/views/main/da/passingStationCollection/index.vue
+++ b/jcdm-ui/src/views/main/da/passingStationCollection/index.vue
@@ -2,6 +2,9 @@
<div class="app-container">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form-item label-width="100" label="鍙戝姩鏈虹紪鐮�" prop="sfcCode">
+ <el-input v-model="queryParams.sfcCode" placeholder="璇疯緭鍏ュ彂鍔ㄦ満缂栫爜" clearable @keyup.enter.native="handleQuery"/>
+ </el-form-item>
<el-form-item label="鍏ョ珯鏃堕棿" prop="inboundTime">
<el-date-picker clearable
v-model="queryParams.inboundTime"
@@ -73,43 +76,38 @@
<el-table v-loading="loading" border :data="passingStationCollectionList" @selection-change="handleSelectionChange" v-if="passingStationCollectionList.length > 0">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="宸ュ崟缂栧彿" align="center" prop="workOrderNo">
+ <el-table-column label="宸ュ崟缂栧彿" align="center" width="150" prop="workOrderNo">
</el-table-column>
- <el-table-column label="鎬绘垚搴忓垪鍙�" align="center" prop="sfcCode">
+ <el-table-column label="鍙戝姩鏈虹紪鐮�" align="center" prop="sfcCode" width="150">
</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="productionLine">-->
+<!-- </el-table-column>-->
<el-table-column label="宸ヤ綅缂栧彿" align="center" prop="locationCode">
</el-table-column>
-<!-- <el-table-column label="璁惧缂栧彿" align="center" prop="equipmentNo">
- </el-table-column>-->
- <el-table-column label="鍏ョ珯鏃堕棿" align="center" prop="inboundTime" width="100">
+ <el-table-column label="鍏ョ珯鏃堕棿" align="center" prop="inboundTime" width="160">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.inboundTime, '{y}-{m}-{d}') }}</span>
+ <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">
+ <el-table-column label="鍑虹珯鏃堕棿" align="center" prop="outboundTime" width="160">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.outboundTime, '{y}-{m}-{d}') }}</span>
+ <span>{{ parseTime(scope.row.outboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
-<!-- <el-table-column label="鍏ョ珯鏄惁鍚堟牸" align="center" prop="inRsSign">
- </el-table-column>
- <el-table-column label="鍏ョ珯NG鍘熷洜" align="center" prop="inMsgSign">
- </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="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.collectionTime, '{y}-{m}-{d}') }}</span>
+ <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-column fixed="right" label="鎿嶄綔" width="200" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -147,26 +145,26 @@
/>
<!-- 娣诲姞鎴栦慨鏀逛骇鍝佽繃绔欓噰闆嗗璇濇 -->
- <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+ <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="1000px" append-to-body>
+ <el-form ref="form" inline :model="form" :rules="rules" label-width="120px">
<el-form-item label="宸ュ崟缂栧彿" prop="workOrderNo">
<el-input v-model="form.workOrderNo" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
</el-form-item>
- <el-form-item label="鎬绘垚搴忓垪鍙�" prop="sfcCode">
+ <el-form-item label="鍙戝姩鏈虹紪鐮�" prop="sfcCode">
<el-input v-model="form.sfcCode" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
</el-form-item>
<el-form-item label="浜у搧缂栧彿" prop="productCode">
<el-input v-model="form.productCode" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
</el-form-item>
- <el-form-item label="浜х嚎缂栧彿" prop="productionLine">
- <el-input v-model="form.productionLine" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
- </el-form-item>
+<!-- <el-form-item label="浜х嚎缂栧彿" prop="productionLine">-->
+<!-- <el-input v-model="form.productionLine" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />-->
+<!-- </el-form-item>-->
<el-form-item label="宸ヤ綅缂栧彿" prop="locationCode">
<el-input v-model="form.locationCode" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
</el-form-item>
- <el-form-item label="璁惧缂栧彿" prop="equipmentNo">
- <el-input v-model="form.equipmentNo" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
- </el-form-item>
+<!-- <el-form-item label="璁惧缂栧彿" prop="equipmentNo">-->
+<!-- <el-input v-model="form.equipmentNo" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />-->
+<!-- </el-form-item>-->
<el-form-item label="鍏ョ珯鏃堕棿" prop="inboundTime">
<el-date-picker clearable
v-model="form.inboundTime"
@@ -183,18 +181,12 @@
placeholder="璇烽�夋嫨鍑虹珯鏃堕棿">
</el-date-picker>
</el-form-item>
-<!-- <el-form-item label="鍏ョ珯鏄惁鍚堟牸" prop="inRsSign">
- <el-input v-model="form.inRsSign" placeholder="璇疯緭鍏ュ叆绔欐槸鍚﹀悎鏍�" />
- </el-form-item>
- <el-form-item label="鍏ョ珯NG鍘熷洜" prop="inMsgSign">
- <el-input v-model="form.inMsgSign" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
- </el-form-item>-->
<el-form-item label="鏄惁鍚堟牸" prop="outRsSign">
<el-input v-model="form.outRsSign" placeholder="璇疯緭鍏ュ嚭绔欐槸鍚﹀悎鏍�" />
</el-form-item>
- <el-form-item label="NG鍘熷洜" prop="outMsgSign">
- <el-input v-model="form.outMsgSign" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
- </el-form-item>
+<!-- <el-form-item label="NG鍘熷洜" prop="outMsgSign">-->
+<!-- <el-input v-model="form.outMsgSign" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />-->
+<!-- </el-form-item>-->
<el-form-item label="閲囬泦鏃堕棿" prop="collectionTime">
<el-date-picker clearable
v-model="form.collectionTime"
@@ -203,21 +195,9 @@
placeholder="璇烽�夋嫨閲囬泦鏃堕棿">
</el-date-picker>
</el-form-item>
-<!-- <el-form-item label="棰勭暀瀛楁1" prop="spareField1">-->
-<!-- <el-input v-model="form.spareField1" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />-->
+<!-- <el-form-item label="鑺傛媿鏃堕棿" prop="beatTime">-->
+<!-- <el-input v-model="form.beatTime" placeholder="璇疯緭鍏ヨ妭鎷嶆椂闂�" />-->
<!-- </el-form-item>-->
-<!-- <el-form-item label="棰勭暀瀛楁2" prop="spareField2">-->
-<!-- <el-input v-model="form.spareField2" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">-->
-<!-- <el-input v-model="form.createUser" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">-->
-<!-- <el-input v-model="form.updateUser" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />-->
-<!-- </el-form-item>-->
- <el-form-item label="鑺傛媿鏃堕棿" prop="beatTime">
- <el-input v-model="form.beatTime" placeholder="璇疯緭鍏ヨ妭鎷嶆椂闂�" />
- </el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -229,6 +209,9 @@
<script>
import { listPassingStationCollection, getPassingStationCollection, delPassingStationCollection, addPassingStationCollection, updatePassingStationCollection } from "@/api/main/da/passingStationCollection/passingStationCollection";
+import {
+ selectDaPassingStationCollectionForSearch
+} from "../../../../api/main/da/passingStationCollection/passingStationCollection";
export default {
name: "PassingStationCollection",
@@ -282,7 +265,7 @@
/** 鏌ヨ浜у搧杩囩珯閲囬泦鍒楄〃 */
getList() {
this.loading = true;
- listPassingStationCollection(this.queryParams).then(response => {
+ selectDaPassingStationCollectionForSearch(this.queryParams).then(response => {
this.passingStationCollectionList = response.rows;
this.total = response.total;
this.loading = false;
@@ -375,7 +358,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎浜у搧杩囩珯閲囬泦缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(function() {
return delPassingStationCollection(ids);
}).then(() => {
this.getList();
--
Gitblit v1.9.3