From 6d313a4a6f9f9d7ea65ec50ab0d4491e595edb97 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 15 十月 2024 09:47:26 +0800
Subject: [PATCH] -打印bug修改
---
jcdm-ui/src/views/main/da/paramCollection/index.vue | 62 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 19 deletions(-)
diff --git a/jcdm-ui/src/views/main/da/paramCollection/index.vue b/jcdm-ui/src/views/main/da/paramCollection/index.vue
index c4cded5..8e4394f 100644
--- a/jcdm-ui/src/views/main/da/paramCollection/index.vue
+++ b/jcdm-ui/src/views/main/da/paramCollection/index.vue
@@ -2,18 +2,42 @@
<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="productCode">
+ <el-form-item label="宸ュ崟缂栧彿" prop="workOrderNo">
<el-input
- v-model="queryParams.productCode"
- placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�"
+ v-model="queryParams.workOrderNo"
+ placeholder="璇疯緭鍏ュ伐鍗曠紪鍙�"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="浜у搧鍚嶇О" prop="productName">
+ <el-form-item label-width="100px" label="鎬绘垚搴忓垪鍙�" prop="sfcCode">
<el-input
- v-model="queryParams.productName"
- placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�"
+ v-model="queryParams.sfcCode"
+ placeholder="璇疯緭鍏ユ�绘垚搴忓垪鍙�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍙傛暟缂栫爜" prop="paramCode">
+ <el-input
+ v-model="queryParams.paramCode"
+ 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="productCode">
+ <el-input
+ v-model="queryParams.productCode"
+ placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -73,23 +97,23 @@
<el-table v-loading="loading" border :data="paramCollectionList" @selection-change="handleSelectionChange" v-if="paramCollectionList.length > 0">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="宸ュ崟缂栧彿" align="center" prop="workOrderNo"></el-table-column>
- <el-table-column label="鎬绘垚搴忓垪鍙�" align="center" width="140" 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="equipmentNo"></el-table-column>
- <el-table-column label="鍙傛暟缂栫爜" align="center" prop="paramCode"></el-table-column>
- <el-table-column label="鍙傛暟鍊�" align="center" prop="paramValue"></el-table-column>
- <el-table-column label="鍙傛暟涓婇檺" align="center" prop="paramUpper"></el-table-column>
- <el-table-column label="鍙傛暟涓嬮檺" align="center" prop="paramLower"></el-table-column>
+ <el-table-column label="宸ュ崟缂栧彿" width="100" align="center" prop="workOrderNo"></el-table-column>
+ <el-table-column label="鎬绘垚搴忓垪鍙�" align="center" width="290" prop="sfcCode" ></el-table-column>
+ <el-table-column label="浜у搧缂栧彿" align="center" width="100" 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="equipmentNo"></el-table-column>-->
+ <el-table-column label="鍙傛暟缂栫爜" width="190" align="center" prop="paramCode"></el-table-column>
+ <el-table-column label="鍙傛暟鍚嶇О" width="150" align="center" prop="paramName"></el-table-column>
+ <el-table-column label="鍙傛暟鍊�" width="330" align="center" prop="paramValue"></el-table-column>
+<!-- <el-table-column label="鍙傛暟涓婇檺" align="center" prop="paramUpper"></el-table-column>
+ <el-table-column label="鍙傛暟涓嬮檺" align="center" prop="paramLower"></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="state"></el-table-column>
- <el-table-column label="鍙傛暟鍚嶇О" align="center" prop="paramName" width="150" ></el-table-column>
+<!-- <el-table-column label="鐘舵��" align="center" prop="state"></el-table-column>
<el-table-column label="鍗曚綅" align="center" prop="unit"></el-table-column>
<el-table-column label="绫诲瀷" align="center" prop="type"></el-table-column>
<el-table-column fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width" >
@@ -113,7 +137,7 @@
v-hasPermi="['main:paramCollection:remove']"
>鍒犻櫎</el-button>
</template>
- </el-table-column>
+ </el-table-column>-->
</el-table>
<el-empty v-else>
<span slot="description">鏆傛棤鏁版嵁</span>
--
Gitblit v1.9.3