From 820e0a3ba5a1cb735c85a82d5ee5855dfd7afd60 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 05 十二月 2023 13:05:42 +0800
Subject: [PATCH] 修复工艺bug
---
src/views/technology/routing/routing-form.vue | 20 ++--
src/views/technology/structure/single-structure-form.vue | 8
src/views/technology/completeproductstructure/completeproductstructure-form.vue | 22 +--
src/views/technology/operation/index.vue | 28 ++--
src/views/technology/routing/edit-routing-operation.vue | 12 +-
src/views/common/operation.vue | 6
src/views/technology/routing/index.vue | 12 +-
src/views/technology/operation/operation-form.vue | 4
src/views/technology/structure/index.vue | 4
src/views/technology/completeproductstructure/index.vue | 177 ++++++++++++++++++-----------------
10 files changed, 146 insertions(+), 147 deletions(-)
diff --git a/src/views/common/operation.vue b/src/views/common/operation.vue
index cef559f..6c75fdd 100644
--- a/src/views/common/operation.vue
+++ b/src/views/common/operation.vue
@@ -94,8 +94,8 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
- {
+ }/*,
+ {
minWidth: '100',
prop: 'productionCounting',
label: '鏄惁鎶ュ伐',
@@ -159,7 +159,7 @@
optList: () => {
return this.getChangeList()
}
- }
+ } */
]
},
addOrUpdateVisible: false,
diff --git a/src/views/technology/completeproductstructure/completeproductstructure-form.vue b/src/views/technology/completeproductstructure/completeproductstructure-form.vue
index 74b5c07..b0931ef 100644
--- a/src/views/technology/completeproductstructure/completeproductstructure-form.vue
+++ b/src/views/technology/completeproductstructure/completeproductstructure-form.vue
@@ -75,32 +75,26 @@
</el-input>
</el-form-item>
- <el-form-item label="鏇夸唬鍙�" prop="alternativeNo">
+ <!-- <el-form-item label="鏇夸唬鍙�" prop="alternativeNo">
<el-input
v-model="treeForm.alternativeNo"
placeholder="鏇夸唬鍙�"
disabled
>
</el-input>
- </el-form-item>
+ </el-form-item> -->
- <el-form-item label="鏇夸唬鎻忚堪" prop="alternativeDesc">
+ <!-- <el-form-item label="鏇夸唬鎻忚堪" prop="alternativeDesc">
<el-input
v-model="treeForm.alternativeDesc"
placeholder="鏇夸唬鎻忚堪"
disabled
>
</el-input>
- </el-form-item>
+ </el-form-item> -->
- <el-form-item label="缁濈紭棰滆壊">
- <el-input
- v-model="treeForm.insulationColor"
- placeholder="缁濈紭棰滆壊"
- >
- </el-input>
- </el-form-item>
- <el-form-item label="鎶ゅ棰滆壊">
+ <!-- -->
+ <!-- <el-form-item label="鎶ゅ棰滆壊">
<el-input v-model="treeForm.sheathColor" placeholder="鎶ゅ棰滆壊">
</el-input>
</el-form-item>
@@ -110,7 +104,7 @@
placeholder="鐗规��1"
>
</el-input>
- </el-form-item>
+ </el-form-item> -->
</el-col>
</el-row>
</el-form>
@@ -134,7 +128,7 @@
<el-table-column label="闆朵欢鍚嶇О" prop="partName"></el-table-column>
<el-table-column label="鍗曚綅" prop="unit"></el-table-column>
<el-table-column label="鏁伴噺" prop="qpa"></el-table-column>
- <el-table-column label="鐩樻暟" prop="discNum"></el-table-column>
+ <!-- <el-table-column label="鐩樻暟" prop="discNum"></el-table-column> -->
</el-table>
<!-- <el-table
class="tree-select-table"
diff --git a/src/views/technology/completeproductstructure/index.vue b/src/views/technology/completeproductstructure/index.vue
index 4af4a00..1be5f56 100644
--- a/src/views/technology/completeproductstructure/index.vue
+++ b/src/views/technology/completeproductstructure/index.vue
@@ -20,12 +20,13 @@
import {
fetchList,
delObj,
- addByStructure
+ addByStructure,
} from '@/api/technology/completeproductstructure'
import ttable from '@/views/common/ztt-table.vue'
import { mapGetters } from 'vuex'
import { changeState } from '../../../api/technology/completeproductstructure'
import { remote } from '@/api/admin/dict'
+
export default {
data() {
return {
@@ -34,7 +35,7 @@
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
isShow: true,
- url: 'mes/bom/uploadExcel'
+ url: 'mes/bom/uploadExcel',
},
prelang: 'completeProductStructure',
options: {
@@ -49,7 +50,7 @@
isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
isSearch: false, // 楂樼骇鏌ヨ鎸夐挳
- defaultOrderBy: { column: 'id', direction: 'desc' }
+ defaultOrderBy: { column: 'id', direction: 'desc' },
},
table: {
total: 0,
@@ -67,7 +68,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text',
- render: { fun: this.addOrUpdateHandle }
+ render: { fun: this.addOrUpdateHandle },
},
// 闆朵欢鍚嶇О
{
@@ -77,7 +78,7 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
+ searchInfoType: 'text',
},
// 闆朵欢鍙�
{
@@ -87,7 +88,7 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
+ searchInfoType: 'text',
},
// 鐘舵��
@@ -112,7 +113,7 @@
formatVal = '宸插彇娑�'
}
return formatVal
- }
+ },
},
// 绫诲瀷
@@ -127,7 +128,7 @@
formatter: this.formatBomTypeDbType,
optList: () => {
return this.bomTypeDbOptions
- }
+ },
},
// 鐗堟湰鍙�
{
@@ -137,61 +138,61 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
+ searchInfoType: 'text',
},
// 鏇夸唬鍙�
- {
- 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',
+ // },
// 缁濈紭棰滆壊
- {
- 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',
+ // },
// 鐗规��1
- {
- minWidth: '120',
- prop: 'characteristicOne',
- label: '鐗规��1',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'characteristicOne',
+ // label: '鐗规��1',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text',
+ // },
// 鍒涘缓浜�
{
minWidth: '120',
@@ -200,7 +201,7 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
+ searchInfoType: 'text',
},
// 鍒涘缓鏃堕棿
{
@@ -210,8 +211,8 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'datetimerange'
- }
+ searchInfoType: 'datetimerange',
+ },
],
toolbar: [
// {
@@ -226,7 +227,7 @@
text: '浜у搧缁撴瀯鐢熸垚BOM',
fun: this.addByStructureHandle,
disabled: false,
- permitArr: []
+ permitArr: [],
},
{
text: '鎵瑰噯',
@@ -234,7 +235,7 @@
this.approveHandle('ACCEPT')
},
disabled: false,
- permitArr: ['01draft']
+ permitArr: ['01draft'],
},
{
text: '鎾ゅ洖',
@@ -242,7 +243,7 @@
this.approveHandle('REVOKE')
},
disabled: false,
- permitArr: ['02accepted']
+ permitArr: ['02accepted'],
},
{
text: '鎷掔粷',
@@ -250,7 +251,7 @@
this.approveHandle('CANCEL')
},
disabled: false,
- permitArr: ['02accepted']
+ permitArr: ['02accepted'],
},
{
text: '鍒犻櫎',
@@ -258,46 +259,46 @@
this.deleteAll()
},
disabled: false,
- permitArr: []
- }
+ permitArr: [],
+ },
],
operator: [
{
text: '鍒犻櫎',
type: 'text',
size: 'small',
- fun: this.deleteHandle
- }
+ fun: this.deleteHandle,
+ },
],
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
width: 100,
- minWidth: 100
- }
+ minWidth: 100,
+ },
},
stateOptionList: [
{
value: '01draft',
- label: '鑽夌'
+ label: '鑽夌',
},
{
value: '02accepted',
- label: '宸叉帴鍙�'
+ label: '宸叉帴鍙�',
},
{
value: '03cancelled',
- label: '宸插彇娑�'
- }
+ label: '宸插彇娑�',
+ },
],
- bomTypeDbOptions: []
+ bomTypeDbOptions: [],
}
},
components: {
- ttable
+ ttable,
},
computed: {
- ...mapGetters(['permissions'])
+ ...mapGetters(['permissions']),
},
activated() {
this.getData()
@@ -334,16 +335,20 @@
addOrUpdateHandle(row) {
this.$router.push({
name: 'completeProductStructure',
- params: { id: row == null ? null : row.id }
+ params: { id: row == null ? null : row.id },
})
},
// 鎸変骇鍝佺粨鏋勭敓鎴怋OM
addByStructureHandle() {
- addByStructure()
- this.$message({
- message: '宸插湪鍚庡彴鐢熸垚BOM锛岃鎵ц缁撴潫鍚庡埛鏂伴〉闈�',
- type: 'success'
+ addByStructure().then((res) => {
+ let result = Array.from(new Set(res.data.data))
+ this.$message.success(result.join(','))
+ this.getData()
})
+ // this.$message({
+ // message: '宸插湪鍚庡彴鐢熸垚BOM锛岃鎵ц缁撴潫鍚庡埛鏂伴〉闈�',
+ // type: 'success',
+ // })
},
// 鍒犻櫎
deleteHandle(row) {
@@ -351,9 +356,9 @@
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning',
- closeOnClickModal: false
+ closeOnClickModal: false,
})
- .then(function() {
+ .then(function () {
const ids = []
ids.push(row.id)
return delObj(ids)
@@ -375,9 +380,9 @@
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning',
- closeOnClickModal: false
+ closeOnClickModal: false,
})
- .then(function() {
+ .then(function () {
const ids = that.multipleSelection.map((item) => {
return item.id
})
@@ -428,7 +433,7 @@
handleSelectionChange(val) {
// 鏍规嵁鐘舵�侊紝绂佺敤琛ㄥご鎸夐挳
// 绛涢�夊嚭閫変腑璁板綍鐨勭姸鎬�
- var stateArr = val.map(function(value, index) {
+ var stateArr = val.map(function (value, index) {
return value.state
})
// 閫変腑鐘舵�佹暟缁勫厓绱犲幓閲�
@@ -458,7 +463,7 @@
},
getStateOptionList() {
return this.stateOptionList
- }
- }
+ },
+ },
}
</script>
diff --git a/src/views/technology/operation/index.vue b/src/views/technology/operation/index.vue
index 2aa2d7c..70e46eb 100644
--- a/src/views/technology/operation/index.vue
+++ b/src/views/technology/operation/index.vue
@@ -35,7 +35,7 @@
multipleSelection: [],
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: true,
+ isShow: false,
url: '/mes/operation/excel/upload'
},
prelang: 'operation',
@@ -186,19 +186,19 @@
// isSearch: true,
// searchInfoType: 'text'
// },
- {
- minWidth: '120',
- prop: 'outsideOpItem',
- label: '澶栭儴宸ュ簭椤圭洰',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'select',
- formatter: this.formatOutsideOpItem,
- optList: () => {
- return this.outsideOpItemOptions
- }
- },
+ // {
+ // minWidth: '120',
+ // prop: 'outsideOpItem',
+ // label: '澶栭儴宸ュ簭椤圭洰',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'select',
+ // formatter: this.formatOutsideOpItem,
+ // optList: () => {
+ // return this.outsideOpItemOptions
+ // }
+ // },
// 澶囨敞
{
minWidth: '120',
diff --git a/src/views/technology/operation/operation-form.vue b/src/views/technology/operation/operation-form.vue
index 169365b..d6bd9e4 100644
--- a/src/views/technology/operation/operation-form.vue
+++ b/src/views/technology/operation/operation-form.vue
@@ -150,7 +150,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row style="padding-top: 10px">
+ <!-- <el-row style="padding-top: 10px">
<el-col :span="24">
<el-form-item label="閰嶇疆椤�">
<el-checkbox-group
@@ -182,7 +182,7 @@
</el-checkbox-group>
</el-form-item>
</el-col>
- </el-row>
+ </el-row> -->
</el-form>
</div>
diff --git a/src/views/technology/routing/edit-routing-operation.vue b/src/views/technology/routing/edit-routing-operation.vue
index afeecf0..9823313 100644
--- a/src/views/technology/routing/edit-routing-operation.vue
+++ b/src/views/technology/routing/edit-routing-operation.vue
@@ -35,7 +35,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="鍥犵礌鍗曚綅" prop="runTimeCodeDb" :rules="disabled ? [{required: false}] : dataRule.runTimeCodeDb">
<el-select
v-model="dataForm.runTimeCodeDb"
@@ -51,9 +51,9 @@
/>
</el-select>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
- <el-row>
+ <!-- <el-row>
<el-col :span="12">
<el-form-item label="鏈哄櫒杩愯浆鍥犵礌" prop="machRunFactor" :rules="disabled ? [{required: false}] : dataRule.machRunFactor">
<el-input
@@ -92,7 +92,7 @@
></el-input>
</el-form-item>
</el-col>
- </el-row>
+ </el-row> -->
<el-row>
<el-col :span="12">
<el-form-item label="浜哄伐绫诲埆" prop="laborClassNo">
@@ -124,7 +124,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="澶栭儴宸ュ簭椤圭洰" prop="outsideOpItem">
<el-select
v-model="dataForm.outsideOpItem"
@@ -141,7 +141,7 @@
/>
</el-select>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12"> </el-col>
</el-row>
</el-form>
diff --git a/src/views/technology/routing/index.vue b/src/views/technology/routing/index.vue
index 7b31528..e3d7d29 100644
--- a/src/views/technology/routing/index.vue
+++ b/src/views/technology/routing/index.vue
@@ -196,7 +196,7 @@
noShowTip: false
},
// 鏄惁涓轰富宸ヨ壓
- {
+ /* {
minWidth: '120',
prop: 'master',
label: '涓诲伐鑹�',
@@ -210,7 +210,7 @@
formatter: (row, column, cellValue) => {
return cellValue == true ? '鏄�' : '鍚�'
}
- },
+ }, */
// 鐘舵��
{
minWidth: '120',
@@ -300,7 +300,7 @@
searchInfoType: 'datetimerange'
},
// 鏇夸唬
- {
+ /* {
minWidth: '120',
prop: 'alternativeNo',
label: '鏇夸唬',
@@ -308,9 +308,9 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
+ }, */
// 鏇夸唬鎻忚堪
- {
+ /* {
minWidth: '120',
prop: 'alternativeDesc',
label: '鏇夸唬鎻忚堪',
@@ -318,7 +318,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
+ }, */
// 鏄惁宸插悓姝ヨ嚦IFS
// {
// minWidth: '120',
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index b65541c..38698da 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -58,13 +58,13 @@
style="width: 280px"
></el-input>
</el-form-item>
- <el-form-item prop="wireCore" label="绾胯姱">
+ <!-- <el-form-item prop="wireCore" label="绾胯姱">
<el-input
v-model="dataForm.wireCore"
placeholder="绾胯姱"
style="width: 60px"
></el-input>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="BOM" prop="bomId">
<el-select :disabled="dataForm.id != null" v-model="dataForm.bomId" placeholder="" filterable>
<el-option
@@ -133,9 +133,9 @@
>{{ dataForm.ifsSync ? '鏄�' : '鍚�' }}</span
>
</el-form-item> -->
- <el-form-item label="涓诲伐鑹�" prop="master">
+ <!-- <el-form-item label="涓诲伐鑹�" prop="master">
<el-switch v-model="dataForm.master"> </el-switch>
- </el-form-item>
+ </el-form-item> -->
</el-col>
</el-row>
</el-form>
@@ -277,13 +277,13 @@
<span v-if="!editable">{{ scope.row.operationName }}</span>
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
prop="outsideOpItem"
label="澶栭儴宸ュ簭椤圭洰"
align="center"
show-overflow-tooltip
>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
prop="partName"
label="闆朵欢"
@@ -310,7 +310,7 @@
}}</span>
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
prop="runTimeCodeDb"
label="鍥犵礌鍗曚綅"
align="center"
@@ -350,7 +350,7 @@
label="鍔冲姏璁剧疆鏃堕棿"
align="center"
>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
prop="laborClassNo"
label="浜哄伐绫诲埆"
@@ -428,7 +428,7 @@
</el-input>
</div>
- <el-divider content-position="left">閰嶇疆椤�</el-divider>
+ <!-- <el-divider content-position="left">閰嶇疆椤�</el-divider>
<div class="node-content-config">
<el-checkbox-group
@@ -462,7 +462,7 @@
>宸ュ崟棰勭暀</el-checkbox-button
>
</el-checkbox-group>
- </div>
+ </div> -->
<!-- <el-divider content-position="left">鑳藉姏</el-divider>
<div class="node-content">
diff --git a/src/views/technology/structure/index.vue b/src/views/technology/structure/index.vue
index 996ffb6..74037af 100644
--- a/src/views/technology/structure/index.vue
+++ b/src/views/technology/structure/index.vue
@@ -235,7 +235,7 @@
}
},
// 鏄惁涓洪粯璁ょ粨鏋�
- {
+ /* {
minWidth: '120',
prop: 'master',
label: '榛樿缁撴瀯',
@@ -249,7 +249,7 @@
formatter: (row, column, cellValue) => {
return cellValue == true ? '鏄�' : '鍚�'
}
- },
+ }, */
// 鎻忚堪
{
minWidth: '120',
diff --git a/src/views/technology/structure/single-structure-form.vue b/src/views/technology/structure/single-structure-form.vue
index 87eca90..8611912 100644
--- a/src/views/technology/structure/single-structure-form.vue
+++ b/src/views/technology/structure/single-structure-form.vue
@@ -88,9 +88,9 @@
>{{ dataForm.ifsSync ? '鏄�' : '鍚�' }}</span
>
</el-form-item> -->
- <el-form-item label="榛樿缁撴瀯" prop="master">
+ <!-- <el-form-item label="榛樿缁撴瀯" prop="master">
<el-checkbox v-model="dataForm.master"></el-checkbox>
- </el-form-item>
+ </el-form-item> -->
</el-col>
</el-row>
</el-form>
@@ -196,7 +196,7 @@
<el-table-column label="鍗曚綅" prop="unit" align="center">
</el-table-column>
- <el-table-column label="鐩樻暟(鐩�)" prop="discNum" align="center">
+ <!-- <el-table-column label="鐩樻暟(鐩�)" prop="discNum" align="center">
<template slot-scope="scope">
<el-input
size="small"
@@ -208,7 +208,7 @@
scope.row.discNum
}}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<!-- <el-table-column label="鍥惧彿" prop="drawingNumber" align="center">
</el-table-column> -->
<el-table-column align="center" label="鎿嶄綔" width="85px">
--
Gitblit v1.9.3