From 67da82f0b0c24df5f19bbfcfec63801d9ae902d8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 16:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/basic/part/part-form.vue | 163 ++++++++++++++++++++++++++---------------------------
1 files changed, 80 insertions(+), 83 deletions(-)
diff --git a/src/views/basic/part/part-form.vue b/src/views/basic/part/part-form.vue
index 9a088f2..f15bf51 100644
--- a/src/views/basic/part/part-form.vue
+++ b/src/views/basic/part/part-form.vue
@@ -20,12 +20,12 @@
placeholder="闆朵欢鍙�"
:disabled="(dataForm.id != null && dataForm.id > 0) || status"
>
- <el-button
+ <!-- <el-button
slot="append"
icon="el-icon-search"
@click="openPartDialog()"
v-show="!dataForm.id"
- ></el-button>
+ ></el-button> -->
</el-input>
</el-form-item>
</el-col>
@@ -36,11 +36,11 @@
placeholder="闆朵欢鍚嶇О"
:disabled="status"
>
- <el-button
+ <!-- <el-button
slot="append"
icon="el-icon-search"
@click="openPartDialog()"
- ></el-button>
+ ></el-button> -->
</el-input>
</el-form-item>
</el-col>
@@ -88,7 +88,7 @@
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鍗曚綅2" prop="sunit">
+ <el-form-item label="閲嶉噺鍗曚綅" prop="sunit">
<el-select
v-model="dataForm.sunit"
filterable
@@ -167,11 +167,45 @@
</el-row>
<el-row>
<el-col :span="12"
- ><el-form-item label="瑙勬牸" prop="specs">
- <el-input v-model="dataForm.specs" placeholder="瑙勬牸"></el-input>
+ ><el-form-item label="瑙勬牸鍨嬪彿" prop="specs">
+ <el-input v-model="dataForm.specs" placeholder="瑙勬牸鍨嬪彿"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
+ <el-form-item label="妫�楠屽憳" prop="examiner">
+ <el-select
+ v-model="dataForm.examiner"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%;"
+ >
+ <el-option
+ v-for="(item, index) in examinerOptions"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <!-- <el-form-item label="妫�楠岃鍒�" prop="testRuleId">
+ <el-select
+ v-model="dataForm.testRuleId"
+ filterable
+ clearable
+ placeholder="璇烽�夋嫨"
+ style="width: 100%;"
+ >
+ <el-option
+ v-for="(item, index) in ruleOptions"
+ :key="index"
+ :label="item.ruleName"
+ :value="item.id"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item> -->
+ </el-col>
+ <!-- <el-col :span="12">
<el-form-item label="鍥惧彿" prop="drawingNumber">
<el-input
v-model="dataForm.drawingNumber"
@@ -186,7 +220,7 @@
placeholder="鍨嬪彿"
></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="闆朵欢鏃�" prop="partFamilyId">-->
@@ -208,12 +242,12 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="EAN缂栫爜" prop="ean">
<el-input v-model="dataForm.ean" placeholder="EAN缂栫爜"></el-input>
</el-form-item>
- </el-col>
- <el-col :span="12">
+ </el-col> -->
+ <!-- <el-col :span="12">
<el-form-item label="绯荤粺缂栧彿绠＄悊" prop="useSystemNo">
<el-select
v-model="dataForm.useSystemNo"
@@ -231,35 +265,16 @@
</el-option>
</el-select>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
<el-row>
- <el-col :span="12">
- <el-form-item label="妫�楠岃鍒�" prop="testRuleId">
- <el-select
- v-model="dataForm.testRuleId"
- filterable
- clearable
- placeholder="璇烽�夋嫨"
- style="width: 100%;"
- >
- <el-option
- v-for="(item, index) in ruleOptions"
- :key="index"
- :label="item.ruleName"
- :value="item.id"
- >
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="鐢靛帇绛夌骇" prop="voltageLevel">
<el-input
v-model="dataForm.voltageLevel"
placeholder="鐢靛帇绛夌骇"
></el-input> </el-form-item
- ></el-col>
+ ></el-col> -->
</el-row>
<el-row>
<el-col :span="12"
@@ -268,21 +283,30 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <!-- <el-form-item label="IFS鍚敤鎵规绠＄悊" prop="lotTrackingIfs">-->
- <!-- <el-select-->
- <!-- v-model="dataForm.lotTrackingIfs"-->
- <!-- placeholder="璇烽�夋嫨"-->
- <!-- style="width: 100%;"-->
- <!-- >-->
- <!-- <el-option-->
- <!-- v-for="(item, index) in lotTrackingIfsOptions"-->
- <!-- :key="index"-->
- <!-- :label="item.label"-->
- <!-- :value="item.value"-->
- <!-- >-->
- <!-- </el-option>-->
- <!-- </el-select>-->
- <!-- </el-form-item>-->
+ <el-form-item label="鐗堟湰鍙�" prop="engChgLevel">
+ <el-input
+ v-model="dataForm.engChgLevel"
+ placeholder="鐗堟湰鍙�"
+ :disabled="dataForm.id && dataForm.id != null ? true : false"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <!-- <el-col :span="12">
+ <el-form-item label="IFS鍚敤鎵规绠＄悊" prop="lotTrackingIfs">
+ <el-select
+ v-model="dataForm.lotTrackingIfs"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%;"
+ >
+ <el-option
+ v-for="(item, index) in lotTrackingIfsOptions"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="鍘熸潗鏂欐" prop="testRuleType">
<el-select
v-model="dataForm.testRuleType"
@@ -293,18 +317,9 @@
<el-option label="鏄�" :value="1"> </el-option>
</el-select>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
<el-row>
- <el-col :span="12">
- <el-form-item label="鐗堟湰鍙�" prop="engChgLevel">
- <el-input
- v-model="dataForm.engChgLevel"
- placeholder="鐗堟湰鍙�"
- :disabled="dataForm.id && dataForm.id != null ? true : false"
- ></el-input>
- </el-form-item>
- </el-col>
<el-col :span="12">
<el-form-item
v-if="permissions.basic_has_ifs"
@@ -330,7 +345,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="闆朵欢灞炴��" prop="materialAttribute">
- <el-select v-model="dataForm.materialAttribute">
+ <el-select v-model="dataForm.materialAttribute" style="width: 100%">
<el-option
v-for="(item, index) in materialAttributeOptions"
:key="index"
@@ -351,41 +366,24 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="12">
- <el-form-item label="妫�楠屽憳" prop="examiner">
- <el-select
- v-model="dataForm.examiner"
- placeholder="璇烽�夋嫨"
- style="width: 100%;"
- >
- <el-option
- v-for="(item, index) in examinerOptions"
- :key="index"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="浜у搧鍚嶇О" prop="prodName">
<el-input
v-model="dataForm.prodName"
placeholder="浜у搧鍚嶇О"
></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
<el-row>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="鑺傝窛" prop="prodName">
<el-input
v-model="dataForm.partPitch"
placeholder="鑺傝窛"
></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -536,7 +534,6 @@
// 鍘婚櫎闆朵欢缂栧彿涓よ竟鐨勭┖鏍�
this.dataForm.partNo = this.dataForm.partNo.trim()
if (this.dataForm.id) {
- console.log(this.dataForm)
putObj(this.dataForm)
.then((data) => {
this.$message.success('淇敼鎴愬姛')
@@ -546,7 +543,7 @@
})
.catch((error) => {
this.isSubmit = false
- console.log(error)
+ console.error(error)
})
} else {
addObj(this.dataForm)
@@ -558,7 +555,7 @@
})
.catch((error) => {
this.isSubmit = false
- console.log(error)
+ console.error(error)
})
}
} else {
--
Gitblit v1.9.3