From 4983abda27a10440ed6e9d5d45849f499b0f6f25 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 25 十月 2023 11:35:19 +0800
Subject: [PATCH] modified: src/views/basic/company/company-form.vue modified: src/views/basic/part/index.vue modified: src/views/basic/part/part-form.vue modified: src/views/common/operationParamTemplate.vue modified: src/views/common/rich-text.vue modified: src/views/technology/document/document-form.vue modified: src/views/technology/document/index.vue modified: src/views/technology/operation/index.vue modified: src/views/technology/operation/operation-form.vue modified: src/views/technology/routing/index.vue modified: src/views/technology/routing/routing-form.vue modified: src/views/technology/structure/index.vue modified: src/views/technology/structure/single-structure-form.vue
---
src/views/technology/routing/routing-form.vue | 16 +-
src/views/technology/document/index.vue | 36 ++--
src/views/basic/part/part-form.vue | 150 +++++++++---------
src/views/technology/operation/operation-form.vue | 24 +-
src/views/common/rich-text.vue | 1
src/views/basic/company/company-form.vue | 8
src/views/basic/part/index.vue | 2
src/views/technology/structure/single-structure-form.vue | 8
src/views/technology/operation/index.vue | 116 +++++++-------
src/views/technology/document/document-form.vue | 50 ++---
src/views/common/operationParamTemplate.vue | 2
src/views/technology/routing/index.vue | 30 +-
src/views/technology/structure/index.vue | 36 ++--
13 files changed, 237 insertions(+), 242 deletions(-)
diff --git a/src/views/basic/company/company-form.vue b/src/views/basic/company/company-form.vue
index b138c7f..ac6162b 100644
--- a/src/views/basic/company/company-form.vue
+++ b/src/views/basic/company/company-form.vue
@@ -38,7 +38,7 @@
</el-col>
</el-row>
- <el-row>
+ <!-- <el-row>
<el-col :span="12">
<el-form-item label="logo涓枃" prop="iconNameCn" label-width="100px">
<el-input
@@ -55,7 +55,7 @@
></el-input>
</el-form-item>
</el-col>
- </el-row>
+ </el-row> -->
<el-tabs v-model="showAllVisible" type="card" style="margin-top: 20px">
<!--鍦板潃椤甸潰-->
@@ -191,7 +191,7 @@
</el-table-column>
</el-table>
</el-tab-pane>
- <el-tab-pane label="logo" name="third">
+ <!-- <el-tab-pane label="logo" name="third">
<el-upload
class="upload-demo"
action="/mes/company/upload"
@@ -211,7 +211,7 @@
鍙兘涓婁紶png鍥剧墖锛屼笖涓嶈秴杩�2MB锛屽儚绱犱负220*60
</div>
</el-upload>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
</el-form>
<span slot="footer" class="dialog-footer">
diff --git a/src/views/basic/part/index.vue b/src/views/basic/part/index.vue
index e677457..9154b53 100644
--- a/src/views/basic/part/index.vue
+++ b/src/views/basic/part/index.vue
@@ -169,7 +169,7 @@
{
minWidth: '120',
prop: 'sunit',
- label: '鍗曚綅2',
+ label: '閲嶉噺鍗曚綅',
sort: true,
isTrue: true,
isSearch: true,
diff --git a/src/views/basic/part/part-form.vue b/src/views/basic/part/part-form.vue
index be71876..4cc3d06 100644
--- a/src/views/basic/part/part-form.vue
+++ b/src/views/basic/part/part-form.vue
@@ -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">
diff --git a/src/views/common/operationParamTemplate.vue b/src/views/common/operationParamTemplate.vue
index 0b5960c..213ab2e 100644
--- a/src/views/common/operationParamTemplate.vue
+++ b/src/views/common/operationParamTemplate.vue
@@ -161,8 +161,10 @@
},
saveSelectRow() {
if (this.multiSelect) {
+ console.log("aaaaaaa--",this.multiSelect,this.multipleSelection)
this.$emit('handleSelectionParamTemplateChange', this.multipleSelection)
} else {
+ console.log("bbbbbbb--",this.multiSelect,this.currentRow)
this.$emit('listenToParamTemplateEvent', this.currentRow)
}
this.innerVisible = false
diff --git a/src/views/common/rich-text.vue b/src/views/common/rich-text.vue
index f61765c..402a295 100644
--- a/src/views/common/rich-text.vue
+++ b/src/views/common/rich-text.vue
@@ -115,7 +115,6 @@
},
mounted() {
this.flag = true
- console.log(this.richContent)
this.content = this.richContent
},
watch: {
diff --git a/src/views/technology/document/document-form.vue b/src/views/technology/document/document-form.vue
index b39ec6f..a6c7556 100644
--- a/src/views/technology/document/document-form.vue
+++ b/src/views/technology/document/document-form.vue
@@ -36,7 +36,7 @@
</el-input>
</el-form-item>
</el-col>
- <el-col :span="4">
+ <!-- <el-col :span="4">
<el-form-item prop="docType" label="绫诲瀷">
<el-select
v-model="dataForm.docType"
@@ -52,7 +52,7 @@
</el-option>
</el-select>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="3">
<el-form-item prop="version" label="鐗堟湰鍙�">
<el-input
@@ -61,7 +61,7 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="3">
+ <!-- <el-col :span="3">
<el-form-item prop="sheathColor" label="鎶ゅ棰滆壊">
<el-input
v-model="dataForm.sheathColor"
@@ -76,7 +76,7 @@
placeholder="缁濈紭棰滆壊"
></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
<!-- <el-col :span="4">
<el-form-item label="椤圭洰鍙�" prop="projectNo">
<el-input
@@ -108,9 +108,7 @@
<countrySelector v-model="dataForm.country"></countrySelector>
</el-form-item>
</el-col> -->
- </el-row>
- <el-row>
- <el-col :span="5">
+ <el-col :span="6">
<el-form-item label="浜у搧闆朵欢鍙�" prop="partNo">
<el-input v-model="dataForm.partNo" placeholder="璇烽�夋嫨闆朵欢">
<el-button
@@ -121,11 +119,13 @@
</el-input>
</el-form-item>
</el-col>
- <el-col :span="7">
+ <el-col :span="6">
<el-form-item label="浜у搧闆朵欢鎻忚堪" prop="partName">
<el-input v-model="dataForm.partName" disabled> </el-input>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="5">
<el-form-item label="澶囨敞" prop="remark">
<el-input
@@ -219,7 +219,7 @@
</TeststandardDialog>
</el-tab-pane>
<el-tab-pane label="浜у搧缁撴瀯宸ュ簭鍙傛暟" style="height: 100%">
- <div class="document-related-stock-part">
+ <!-- <div class="document-related-stock-part">
<div
style="padding-left:18px;font-size:14px;font-weight:700;color:#000;height:20px;line-height:20px;"
>
@@ -306,9 +306,9 @@
>
</el-table-column>
</el-table>
- </div>
- <el-card class="document-bom" header="BOM-宸ュ簭鍙傛暟">
- <div slot="header">
+ </div> -->
+ <el-card class="document-bom" header="">
+ <!-- <div slot="header">
<span>BOM-宸ュ簭鍙傛暟</span>
<el-tooltip
class="item"
@@ -339,7 +339,7 @@
>娣诲姞
</el-button>
</el-tooltip>
- </div>
+ </div> -->
<el-collapse
v-model="currTechnologyBomPartName"
accordion
@@ -367,7 +367,7 @@
</el-checkbox>
</template>
<div style="display:flex;">
- <div
+ <!-- <div
style="font-size:13px;font-weight:bold;cursor: pointer;border-radius:2px 2px 0px 0px;width:80px;text-align:center;"
:class="[
item.showBom
@@ -377,21 +377,16 @@
@click="item.showBom = true"
>
BOM缁撴瀯
- </div>
+ </div> -->
<div
style="font-size:13px;font-weight:bold;cursor: pointer;margin-left: 10px;border-radius:2px 2px 0px 0px;width:80px;text-align:center;"
- :class="[
- !item.showBom
- ? 'highlight-tab-class'
- : 'unhighlight-tab-class'
- ]"
- @click="item.showBom = false"
+ :class="['highlight-tab-class']"
>
宸ュ簭鍙傛暟
</div>
</div>
-
- <div class="document-bom-div" v-show="item.showBom">
+
+ <!-- <div class="document-bom-div" v-show="item.showBom">
<el-tooltip
class="item"
effect="dark"
@@ -428,8 +423,9 @@
<el-table-column prop="unit" label="鍗曚綅">
</el-table-column>
</el-table>
- </div>
- <div class="document-technology-div" v-show="!item.showBom">
+ </div> -->
+
+ <div class="document-technology-div" v-show="item.showBom">
<div
style="border: 1px solid #ebeef5;height: 440px;overflow: auto;"
>
@@ -666,7 +662,7 @@
</el-select>
<div id="demo" style="margin:5px auto;"></div>
</div>
- <!--<el-upload
+ <el-upload
class="upload-demo"
action="/mes/document/uploadLct"
:headers="headers"
@@ -686,7 +682,7 @@
<div slot="tip" class="el-upload__tip">
鍙兘涓婁紶jpg鍥剧墖锛屼笖涓嶈秴杩�2MB
</div>
- </el-upload>-->
+ </el-upload>
<el-dialog :visible.sync="dialogFlowVisible">
<img width="100%" :src="dialogFlowImageUrl" alt="" />
</el-dialog>
diff --git a/src/views/technology/document/index.vue b/src/views/technology/document/index.vue
index 5404930..a59a433 100644
--- a/src/views/technology/document/index.vue
+++ b/src/views/technology/document/index.vue
@@ -142,25 +142,25 @@
searchInfoType: 'text'
},
// 缁濈紭棰滆壊
- {
- minWidth: '120',
- prop: 'insulationColor',
- label: '缁濈紭棰滆壊',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'insulationColor',
+ // label: '缁濈紭棰滆壊',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
// 鎶ゅ棰滆壊
- {
- minWidth: '120',
- prop: 'sheathColor',
- label: '鎶ゅ棰滆壊',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'sheathColor',
+ // label: '鎶ゅ棰滆壊',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
{
minWidth: '120',
prop: 'testStandard',
diff --git a/src/views/technology/operation/index.vue b/src/views/technology/operation/index.vue
index b3cac78..8d06f7e 100644
--- a/src/views/technology/operation/index.vue
+++ b/src/views/technology/operation/index.vue
@@ -85,15 +85,15 @@
searchInfoType: 'text'
},
// 闆朵欢鏃�
- {
- minWidth: '120',
- prop: 'partFamilyName',
- label: '闆朵欢鏃�',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'partFamilyName',
+ // label: '闆朵欢鏃�',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
// 宸ヤ綔涓績
{
minWidth: '120',
@@ -109,25 +109,25 @@
}
},
// 鏈哄櫒杩愯浆鍥犵礌
- {
- minWidth: '120',
- prop: 'machRunFactor',
- label: '鏈哄櫒杩愯浆鍥犵礌',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'machRunFactor',
+ // label: '鏈哄櫒杩愯浆鍥犵礌',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
// 鏈哄櫒璁剧疆鏃堕棿
- {
- minWidth: '120',
- prop: 'machSetupTime',
- label: '鏈哄櫒璁剧疆鏃堕棿',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'machSetupTime',
+ // label: '鏈哄櫒璁剧疆鏃堕棿',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
// 浜哄伐绫诲埆
{
minWidth: '120',
@@ -143,39 +143,39 @@
}
},
// 鍔冲姏杩愯浆鍥犵礌
- {
- minWidth: '120',
- prop: 'laborRunFactor',
- label: '鍔冲姏杩愯浆鍥犵礌',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'laborRunFactor',
+ // label: '鍔冲姏杩愯浆鍥犵礌',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
// 鍔冲姏璁剧疆鏃堕棿
- {
- minWidth: '120',
- prop: 'laborSetupTime',
- label: '鍔冲姏璁剧疆鏃堕棿',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'laborSetupTime',
+ // label: '鍔冲姏璁剧疆鏃堕棿',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
// 鍥犵礌鍗曚綅
- {
- minWidth: '120',
- prop: 'runTimeCodeDb',
- label: '鍥犵礌鍗曚綅',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'select',
- formatter: this.formatRunTimeCodeDbType,
- optList: () => {
- return this.runTimeCodeDbTypeOptions
- }
- },
+ // {
+ // minWidth: '120',
+ // prop: 'runTimeCodeDb',
+ // label: '鍥犵礌鍗曚綅',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'select',
+ // formatter: this.formatRunTimeCodeDbType,
+ // optList: () => {
+ // return this.runTimeCodeDbTypeOptions
+ // }
+ // },
// 鐝粍浜哄憳
{
minWidth: '120',
diff --git a/src/views/technology/operation/operation-form.vue b/src/views/technology/operation/operation-form.vue
index e08f90f..b510c9a 100644
--- a/src/views/technology/operation/operation-form.vue
+++ b/src/views/technology/operation/operation-form.vue
@@ -35,7 +35,7 @@
placeholder="宸ュ簭缂栧彿"
></el-input>
</el-form-item>
- <el-form-item label="闆朵欢鏃�" prop="partFamilyId">
+ <!-- <el-form-item label="闆朵欢鏃�" prop="partFamilyId">
<el-select
v-model="dataForm.partFamilyId"
filterable
@@ -50,7 +50,7 @@
>
</el-option>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="宸ヤ綔涓績" prop="workCenter">
<el-select
v-model="dataForm.workCenter"
@@ -66,7 +66,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鏈哄櫒杩愯浆鍥犵礌" prop="machRunFactor">
+ <!-- <el-form-item label="鏈哄櫒杩愯浆鍥犵礌" prop="machRunFactor">
<el-input
v-model="dataForm.machRunFactor"
placeholder="鏈哄櫒杩愯浆鍥犵礌"
@@ -77,7 +77,7 @@
v-model="dataForm.machSetupTime"
placeholder="鏈哄櫒璁剧疆鏃堕棿"
></el-input>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="浜哄伐绫诲埆" prop="laborClassNo">
<el-select
v-model="dataForm.laborClassNo"
@@ -94,19 +94,19 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍔冲姏杩愯浆鍥犵礌" prop="laborRunFactor">
+ <!-- <el-form-item label="鍔冲姏杩愯浆鍥犵礌" prop="laborRunFactor">
<el-input
v-model="dataForm.laborRunFactor"
placeholder="鍔冲姏杩愯浆鍥犵礌"
></el-input>
- </el-form-item>
- <el-form-item label="鍔冲姏璁剧疆鏃堕棿" prop="laborSetupTime">
+ </el-form-item> -->
+ <!-- <el-form-item label="鍔冲姏璁剧疆鏃堕棿" prop="laborSetupTime">
<el-input
v-model="dataForm.laborSetupTime"
placeholder="鍔冲姏璁剧疆鏃堕棿"
></el-input>
- </el-form-item>
- <el-form-item label="鍥犵礌鍗曚綅" prop="runTimeCodeDb">
+ </el-form-item> -->
+ <!-- <el-form-item label="鍥犵礌鍗曚綅" prop="runTimeCodeDb">
<el-select
v-model="dataForm.runTimeCodeDb"
placeholder="鍥犵礌鍗曚綅"
@@ -119,14 +119,14 @@
:value="item.value"
/>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="鐝粍浜哄憳" prop="crewSize">
<el-input
v-model="dataForm.crewSize"
placeholder="鐝粍浜哄憳"
></el-input>
</el-form-item>
- <el-form-item label="澶栭儴宸ュ簭椤圭洰" prop="outsideOpItem">
+ <!-- <el-form-item label="澶栭儴宸ュ簭椤圭洰" prop="outsideOpItem">
<el-select
v-model="dataForm.outsideOpItem"
placeholder="澶栭儴宸ュ簭椤圭洰"
@@ -140,7 +140,7 @@
:value="item.value"
/>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="澶囨敞" prop="remark">
<el-input
v-model="dataForm.remark"
diff --git a/src/views/technology/routing/index.vue b/src/views/technology/routing/index.vue
index 87bf396..1dca9cb 100644
--- a/src/views/technology/routing/index.vue
+++ b/src/views/technology/routing/index.vue
@@ -320,21 +320,21 @@
searchInfoType: 'text'
},
// 鏄惁宸插悓姝ヨ嚦IFS
- {
- minWidth: '120',
- prop: 'ifsSync',
- label: '宸插悓姝ヨ嚦IFS',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'select',
- optList: () => {
- return this.getIfsSyncOptionList()
- },
- formatter: (row, column, cellValue) => {
- return cellValue == true ? '鏄�' : '鍚�'
- }
- },
+ // {
+ // minWidth: '120',
+ // prop: 'ifsSync',
+ // label: '宸插悓姝ヨ嚦IFS',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'select',
+ // optList: () => {
+ // return this.getIfsSyncOptionList()
+ // },
+ // formatter: (row, column, cellValue) => {
+ // return cellValue == true ? '鏄�' : '鍚�'
+ // }
+ // },
// 鏇存柊鏃堕棿
{
minWidth: '200',
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index af7f6b3..2465b01 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -115,24 +115,24 @@
>
</el-date-picker>
</el-form-item>
- <el-form-item prop="alternativeNo" label="鏇夸唬">
+ <!-- <el-form-item prop="alternativeNo" label="鏇夸唬">
<el-input
v-model="dataForm.alternativeNo"
placeholder="鏇夸唬"
></el-input>
- </el-form-item>
- <el-form-item prop="alternativeDesc" label="鏇夸唬鎻忚堪">
+ </el-form-item> -->
+ <!-- <el-form-item prop="alternativeDesc" label="鏇夸唬鎻忚堪">
<el-input
v-model="dataForm.alternativeDesc"
placeholder="鏇夸唬鎻忚堪"
></el-input>
- </el-form-item>
- <el-form-item label="宸插悓姝ヨ嚦IFS" prop="ifsSync">
+ </el-form-item> -->
+ <!-- <el-form-item label="宸插悓姝ヨ嚦IFS" prop="ifsSync">
<span
style="width: 146px;display: inline-block;font-size:12px;font-weight:bold;"
>{{ dataForm.ifsSync ? '鏄�' : '鍚�' }}</span
>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="涓诲伐鑹�" prop="master">
<el-switch v-model="dataForm.master"> </el-switch>
</el-form-item>
@@ -494,7 +494,7 @@
></rich-text>
</div>
</el-tab-pane>
- <el-tab-pane label="宸ュ簭鍙傛暟" style="height: 100%">
+ <el-tab-pane label="宸ュ簭鍙傛暟" style="height: 100%" v-if="dataForm.routingNo!=null">
<el-card class="params-template">
<div slot="header">
<span>鍙傛暟闆�</span>
@@ -1036,6 +1036,7 @@
this.$set(e, 'active', false)
})
row.active = true
+ console.log(row)
this.getRoutingTemplate(row.id)
},
// 鏍规嵁宸ヨ壓銆佸伐搴廼d鍘昏幏鍙栧弬鏁伴泦妯℃澘
@@ -1085,7 +1086,6 @@
}
},
dragEnd() {
- console.log(this.dataForm.operations)
this.dataForm.operations.forEach((e, i) => {
e.index = i + 1
})
diff --git a/src/views/technology/structure/index.vue b/src/views/technology/structure/index.vue
index 0538871..d3a6693 100644
--- a/src/views/technology/structure/index.vue
+++ b/src/views/technology/structure/index.vue
@@ -199,25 +199,25 @@
}
},
// 鏇夸唬
- {
- minWidth: '120',
- prop: 'alternativeNo',
- label: '鏇夸唬',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'alternativeNo',
+ // label: '鏇夸唬',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
// 鏇夸唬鎻忚堪
- {
- minWidth: '120',
- prop: 'alternativeDesc',
- label: '鏇夸唬鎻忚堪',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'alternativeDesc',
+ // label: '鏇夸唬鎻忚堪',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
// 鏄惁宸插悓姝ヨ嚦ERP
{
minWidth: '120',
diff --git a/src/views/technology/structure/single-structure-form.vue b/src/views/technology/structure/single-structure-form.vue
index 13e7cd0..fd0319d 100644
--- a/src/views/technology/structure/single-structure-form.vue
+++ b/src/views/technology/structure/single-structure-form.vue
@@ -59,7 +59,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鏇夸唬" prop="alternativeNo">
+ <!-- <el-form-item label="鏇夸唬" prop="alternativeNo">
<el-input v-model="dataForm.alternativeNo"></el-input>
</el-form-item>
<el-form-item label="鏇夸唬鎻忚堪" prop="alternativeDesc">
@@ -68,7 +68,7 @@
:autosize="{ minRows: 1, maxRows: 3 }"
v-model="dataForm.alternativeDesc"
></el-input>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="鐗堟湰鍙�" prop="version">
<el-input v-model="dataForm.version" disabled></el-input>
</el-form-item>
@@ -79,12 +79,12 @@
v-model="dataForm.remark"
></el-input>
</el-form-item>
- <el-form-item label="宸插悓姝ヨ嚦IFS" prop="ifsSync">
+ <!-- <el-form-item label="宸插悓姝ヨ嚦IFS" prop="ifsSync">
<span
style="width: 146px;display: inline-block;font-size:12px;font-weight:bold;"
>{{ dataForm.ifsSync ? '鏄�' : '鍚�' }}</span
>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="榛樿缁撴瀯" prop="master">
<el-checkbox v-model="dataForm.master"></el-checkbox>
</el-form-item>
--
Gitblit v1.9.3