From c2e92c3bd4fc134b27ba6a6271f63b032b2b9d99 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期三, 28 八月 2024 15:46:32 +0800
Subject: [PATCH] -打印bug修改
---
jcdm-ui/src/views/main/da/passingStationCollection/index.vue | 62 ++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 17 deletions(-)
diff --git a/jcdm-ui/src/views/main/da/passingStationCollection/index.vue b/jcdm-ui/src/views/main/da/passingStationCollection/index.vue
index bcde3fa..5e54595 100644
--- a/jcdm-ui/src/views/main/da/passingStationCollection/index.vue
+++ b/jcdm-ui/src/views/main/da/passingStationCollection/index.vue
@@ -2,6 +2,30 @@
<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="宸ュ崟缂栧彿" prop="workOrderNo">
+ <el-input
+ v-model="queryParams.workOrderNo"
+ placeholder="璇疯緭鍏ュ伐鍗曠紪鍙�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label-width="100px" label="鎬绘垚搴忓垪鍙�" prop="sfcCode">
+ <el-input
+ v-model="queryParams.sfcCode"
+ placeholder="璇疯緭鍏ユ�绘垚搴忓垪鍙�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="宸ュ簭" prop="locationCode">
+ <el-input
+ v-model="queryParams.locationCode"
+ placeholder="璇疯緭鍏ュ伐搴�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
<el-form-item label="鍏ョ珯鏃堕棿" prop="inboundTime">
<el-date-picker clearable
v-model="queryParams.inboundTime"
@@ -73,11 +97,11 @@
<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="宸ュ崟缂栧彿" width="100" align="center" prop="workOrderNo">
</el-table-column>
-<!-- <el-table-column label="鎬绘垚搴忓垪鍙�" align="center" prop="sfcCode">-->
-<!-- </el-table-column>-->
- <el-table-column label="浜у搧搴忓垪鍙�" align="center" prop="productCode">
+ <el-table-column label="鎬绘垚搴忓垪鍙�" width="310" 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>-->
@@ -94,7 +118,10 @@
</template>
</el-table-column>
- <el-table-column label="鏄惁鍚堟牸" align="center" prop="outRsSign">
+ <el-table-column label="鏄惁鍚堟牸" align="center">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.qualified_status" :value="scope.row.outRsSign"/>
+ </template>
</el-table-column>
<el-table-column label="NG鍘熷洜" align="center" prop="outMsgSign">
</el-table-column>
@@ -103,19 +130,19 @@
<!-- <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
- size="mini"
- type="success"
- plain
- style="width: 72px"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['da:passingStationCollection:edit']"
- >淇敼</el-button>
+<!-- <el-button-->
+<!-- size="mini"-->
+<!-- type="success"-->
+<!-- plain-->
+<!-- style="width: 72px"-->
+<!-- icon="el-icon-edit"-->
+<!-- @click="handleUpdate(scope.row)"-->
+<!-- v-hasPermi="['da:passingStationCollection:edit']"-->
+<!-- >淇敼</el-button>-->
<el-button
size="mini"
type="danger"
@@ -178,7 +205,7 @@
placeholder="璇烽�夋嫨鍑虹珯鏃堕棿">
</el-date-picker>
</el-form-item>
- <el-form-item label="鏄惁鍚堟牸" prop="outRsSign">
+ <el-form-item label="鏄惁鍚堟牸">
<el-input v-model="form.outRsSign" placeholder="璇疯緭鍏ュ嚭绔欐槸鍚﹀悎鏍�" />
</el-form-item>
<el-form-item label="NG鍘熷洜" prop="outMsgSign">
@@ -209,6 +236,7 @@
export default {
name: "PassingStationCollection",
+ dicts: ['qualified_status'],
data() {
return {
// 閬僵灞�
--
Gitblit v1.9.3