From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突
---
src/views/technology/document/document-form.vue | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/views/technology/document/document-form.vue b/src/views/technology/document/document-form.vue
index 93cf63a..e101abb 100644
--- a/src/views/technology/document/document-form.vue
+++ b/src/views/technology/document/document-form.vue
@@ -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">
@@ -130,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
@@ -147,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
@@ -170,7 +172,7 @@
style="width:100%"
></el-input>
</el-form-item>
- </el-col>
+ </el-col>
<el-col :span="6">
<el-form-item label="澶囨敞" prop="remark">
<el-input
@@ -433,7 +435,7 @@
宸ュ簭鍙傛暟
</div>
</div>
-
+
<!-- <div class="document-bom-div" v-show="item.showBom">
<el-tooltip
class="item"
@@ -785,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'
--
Gitblit v1.9.3