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/bs/formulaChild/index.vue | 81 ++++++++++++++++++++++------------------
1 files changed, 45 insertions(+), 36 deletions(-)
diff --git a/jcdm-ui/src/views/main/bs/formulaChild/index.vue b/jcdm-ui/src/views/main/bs/formulaChild/index.vue
index 83916c2..963afa4 100644
--- a/jcdm-ui/src/views/main/bs/formulaChild/index.vue
+++ b/jcdm-ui/src/views/main/bs/formulaChild/index.vue
@@ -2,22 +2,6 @@
<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="workshopCode">
- <el-input
- v-model="queryParams.workshopCode"
- placeholder="璇疯緭鍏ヨ溅闂�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="浜х嚎" prop="lineCode">
- <el-input
- v-model="queryParams.lineCode"
- placeholder="璇疯緭鍏ヤ骇绾�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
<el-form-item label="宸ュ簭" prop="processesCode">
<el-input
v-model="queryParams.processesCode"
@@ -26,24 +10,40 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="浜у搧缂栧彿" prop="productCode">
+ <el-form-item label="鍙傛暟缂栫爜" prop="paramCode">
<el-input
- v-model="queryParams.productCode"
- placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�"
+ v-model="queryParams.paramCode"
+ placeholder="璇疯緭鍏ュ弬鏁扮紪鐮�"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
-<!-- <el-form-item label="绫诲瀷" prop="operationType">-->
-<!-- <el-select v-model="queryParams.operationType" placeholder="璇烽�夋嫨绫诲瀷" clearable>-->
-<!-- <el-option-->
-<!-- v-for="dict in dict.type.${dictType}"-->
-<!-- :key="dict.value"-->
-<!-- :label="dict.label"-->
-<!-- :value="dict.value"-->
-<!-- />-->
-<!-- </el-select>-->
+<!-- <el-form-item label="浜х嚎" prop="lineCode">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.lineCode"-->
+<!-- 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"-->
+<!-- />-->
+<!-- </el-form-item>-->
+ <el-form-item label="绫诲瀷" prop="operationType">
+ <el-select v-model="queryParams.operationType" placeholder="璇烽�夋嫨绫诲瀷" clearable>
+ <el-option
+ v-for="dict in dict.type.operation_type"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -146,7 +146,7 @@
<!-- </el-table-column>-->
<el-table-column label="宸ュ簭" width="90" align="center" prop="processesCode">
</el-table-column>
- <el-table-column label="鐗╂枡缂栧彿" width="150" align="center" prop="productCode">
+ <el-table-column label="浜у搧缂栧彿" width="150" align="center" prop="productCode">
</el-table-column>
<el-table-column label="鎿嶄綔鍐呭" :show-overflow-tooltip='true' width="150" align="center" prop="operationSteps">
</el-table-column>
@@ -218,12 +218,12 @@
/>
<!-- 娣诲姞鎴栦慨鏀归厤鏂归厤缃瓙淇℃伅瀵硅瘽妗� -->
- <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="500px" append-to-body>
+ <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="1000px" append-to-body>
<span slot="title">
<i class="el-icon-s-order"></i>
{{titleName}}
</span>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form ref="form" :inline="true" :model="form" :rules="rules" label-width="80px">
<!-- <el-form-item label="杞﹂棿" prop="workshopCode">-->
<!-- <el-input v-model="form.workshopCode" placeholder="璇疯緭鍏ヨ溅闂�" />-->
<!-- </el-form-item>-->
@@ -264,11 +264,17 @@
<el-form-item label="鐗╂枡缂栫爜" prop="materialCode">
<el-input v-model="form.materialCode" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" />
</el-form-item>
-<!-- <el-form-item label="閰嶆柟缂栫爜" prop="formulaCode">-->
-<!-- <el-input v-model="form.formulaCode" placeholder="璇疯緭鍏ラ厤鏂圭紪鐮�" />-->
-<!-- </el-form-item>-->
- <el-form-item label="鍥剧墖" prop="picture">
- <el-input v-model="form.picture" placeholder="璇疯緭鍏ュ浘鐗�" />
+ <el-form-item label="涓婇檺" prop="spareField2">
+ <el-input v-model="form.spareField2" placeholder="璇疯緭鍏ュ娉�" />
+ </el-form-item>
+ <el-form-item label="涓嬮檺" prop="spareField3">
+ <el-input v-model="form.spareField3" placeholder="璇疯緭鍏ュ娉�" />
+ </el-form-item>
+ <el-form-item label="鍙傛暟鍊�" prop="collectData">
+ <el-input v-model="form.collectData" placeholder="璇疯緭鍏ュ娉�" />
+ </el-form-item>
+ <el-form-item label="鐘舵��" prop="results">
+ <el-input v-model="form.results" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
<el-form-item label="澶囨敞" prop="remarks">
<el-input v-model="form.remarks" placeholder="璇疯緭鍏ュ娉�" />
@@ -392,6 +398,8 @@
createUser: null,
createTime: null,
updateUser: null,
+ collectData: null,
+ results: null,
updateTime: null,
spareField1: null,
spareField2: null,
@@ -427,6 +435,7 @@
this.reset();
const id = row.id || this.ids
getFormulaChild(id).then(response => {
+ console.log(response.data)
this.form = response.data;
this.open = true;
this.titleName = "淇敼閰嶆柟閰嶇疆瀛愪俊鎭�";
--
Gitblit v1.9.3