From ef4e46f182aee6253805e66286dee847c573cbde Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 22 五月 2024 17:18:34 +0800
Subject: [PATCH] 完成原材料、产品检验、过程检，包装检键盘切换输入框
---
src/views/technology/document/document-form.vue | 51 +++++++++++++++++++++++++++++++++------------------
1 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/src/views/technology/document/document-form.vue b/src/views/technology/document/document-form.vue
index 5f9c1a9..e101abb 100644
--- a/src/views/technology/document/document-form.vue
+++ b/src/views/technology/document/document-form.vue
@@ -7,11 +7,11 @@
<h2 v-if="!editable">鏌ョ湅-宸ヨ壓鏂囦欢</h2>
</div>
<div class="btn-group header-right" v-if="editable">
- <el-button @click="save()">淇濆瓨</el-button>
+ <el-button type="primary" @click="save()">淇濆瓨</el-button>
</div>
</div>
<div class="page-main">
- <div class="document-basic">
+ <div class="document-basic" style="height: 28%;">
<el-form
:model="dataForm"
:rules="dataRule"
@@ -24,10 +24,12 @@
<el-row>
<el-col :span="6">
<el-form-item prop="name" label="鏂囦欢鍚嶇О">
+ <el-tooltip class="item" effect="dark" :content="dataForm.name" >
<el-input
v-model="dataForm.name"
placeholder="鏂囦欢鍚嶇О"
></el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -102,7 +104,7 @@
</el-col> -->
<el-col :span="6">
<el-form-item label="浜у搧闆朵欢鍙�" prop="partNo">
- <el-input v-model="dataForm.partNo" placeholder="璇烽�夋嫨闆朵欢">
+ <el-input disabled v-model="dataForm.partNo" placeholder="璇烽�夋嫨闆朵欢">
<el-button
slot="append"
icon="el-icon-search"
@@ -113,7 +115,9 @@
</el-col>
<el-col :span="6">
<el-form-item label="浜у搧闆朵欢鎻忚堪" prop="partName">
+ <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
<el-input v-model="dataForm.partName" disabled> </el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
</el-row>
@@ -128,10 +132,10 @@
</el-col>
<el-col :span="6">
<el-form-item label="BOM" prop="bomId">
- <el-select
- :disabled="dataForm.id != null"
- v-model="dataForm.bomId"
- placeholder=""
+ <el-select
+ :disabled="dataForm.id != null"
+ v-model="dataForm.bomId"
+ placeholder=""
style="width: 100%;"
filterable>
<el-option
@@ -145,10 +149,10 @@
</el-col>
<el-col :span="6">
<el-form-item label="宸ヨ壓璺嚎缂栧彿" prop="routingList">
- <el-select
- :disabled="dataForm.id != null"
- v-model="dataForm.routingId"
- placeholder=""
+ <el-select
+ :disabled="dataForm.id != null"
+ v-model="dataForm.routingId"
+ placeholder=""
style="width: 100%;"
filterable>
<el-option
@@ -160,6 +164,15 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item label="椤圭洰鍙�" prop="projectNo">
+ <el-input
+ v-model="dataForm.projectNo"
+ placeholder="椤圭洰鍙�"
+ style="width:100%"
+ ></el-input>
+ </el-form-item>
+ </el-col>
<el-col :span="6">
<el-form-item label="澶囨敞" prop="remark">
<el-input
@@ -250,7 +263,8 @@
>
<TeststandardDialog
:editable="editable"
- :documentId="Number(dataForm.id)"
+ :key="dataForm.id"
+ :documentId="dataForm.id"
>
</TeststandardDialog>
</el-tab-pane>
@@ -421,7 +435,7 @@
宸ュ簭鍙傛暟
</div>
</div>
-
+
<!-- <div class="document-bom-div" v-show="item.showBom">
<el-tooltip
class="item"
@@ -523,7 +537,7 @@
:richContent="ele.remark"
></rich-text>
</el-tab-pane> -->
- <el-tab-pane label="妫�娴嬫爣鍑�">
+ <!-- <el-tab-pane label="妫�娴嬫爣鍑�">
<checkStandardTable
ref="documentTestStandardTable"
:dataFormId="dataForm.id"
@@ -542,7 +556,7 @@
refreshTestStandardInfo
"
></checkStandardTable>
- </el-tab-pane>
+ </el-tab-pane> -->
<!-- <el-tab-pane label="鎶芥瑙勫垯">
<div>
<div style="padding: 0px 20px;">
@@ -773,14 +787,15 @@
saveLctJson,
getLctJson,
routingChildCheck,
- qryDocSamplingRule
+ qryDocSamplingRule,
+ getTestStandardParams
} from '@/api/technology/document'
import { delDocumentSamplingRule } from '@/api/quality/documentsamplingrule'
import { getObj as getTechnologyDetail } from '@/api/technology/routing'
import { getObj as getStructureDetail } from '@/api/technology/completeproductstructure'
import { fetchList as getBomList } from '@/api/technology/completeproductstructure'
import { getRouting } from '@/api/technology/document'
-import { getTestStandardParams } from '@/api/quality/teststandard'
+//import { getTestStandardParams } from '@/api/quality/teststandard'
import { remote } from '@/api/admin/dict'
import { fetchList as getStandard } from '@/api/quality/standardbind'
import { getStore } from '@/util/store.js'
@@ -854,7 +869,7 @@
{ required: true, message: '鐗堟湰鍙蜂笉鑳戒负绌�', trigger: 'blur' }
],
projectNo: [
- { required: true, message: '椤圭洰鍙蜂笉鑳戒负绌�', trigger: 'blur' }
+ // { required: true, message: '椤圭洰鍙蜂笉鑳戒负绌�', trigger: 'blur' }
],
projectType: [
{ required: true, message: '椤圭洰绫诲埆涓嶈兘涓虹┖', trigger: 'change' }
--
Gitblit v1.9.3