From 79f7d8c1fbba7617bfc7610d1578627c2ae0b609 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 23 十月 2023 17:49:06 +0800
Subject: [PATCH] modified: src/api/technology/completeproductstructure.js modified: src/views/technology/completeproductstructure/completeproductstructure-form.vue modified: src/views/technology/document/document-form.vue modified: src/views/technology/document/index.vue
---
src/views/technology/completeproductstructure/completeproductstructure-form.vue | 46 +++++++++++++++--------
src/api/technology/completeproductstructure.js | 8 ++++
src/views/technology/document/document-form.vue | 8 ++--
src/views/technology/document/index.vue | 8 ++--
4 files changed, 46 insertions(+), 24 deletions(-)
diff --git a/src/api/technology/completeproductstructure.js b/src/api/technology/completeproductstructure.js
index 25da9c1..2f31570 100644
--- a/src/api/technology/completeproductstructure.js
+++ b/src/api/technology/completeproductstructure.js
@@ -82,3 +82,11 @@
data: ids
})
}
+
+export function updateObj(obj) {
+ return request({
+ url: '/mes/bom/updateBom',
+ method: 'put',
+ data: obj
+ })
+}
diff --git a/src/views/technology/completeproductstructure/completeproductstructure-form.vue b/src/views/technology/completeproductstructure/completeproductstructure-form.vue
index b8febf2..c821f69 100644
--- a/src/views/technology/completeproductstructure/completeproductstructure-form.vue
+++ b/src/views/technology/completeproductstructure/completeproductstructure-form.vue
@@ -25,7 +25,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="BOM缂栧彿">
- <el-input v-model="treeForm.number" placeholder="BOM缂栧彿">
+ <el-input v-model="treeForm.number" disabled placeholder="BOM缂栧彿">
</el-input>
</el-form-item>
@@ -125,7 +125,7 @@
style="width: 100%;"
row-key="id"
border
- height="580"
+ height="720"
default-expand-all
@expand-change="expandChange"
:row-class-name="tableRowClassName"
@@ -238,7 +238,8 @@
getPartAllStructureExt,
addObj,
getObj,
- putObj
+ putObj,
+ updateObj
} from '@/api/technology/completeproductstructure'
import { remote } from '@/api/admin/dict'
import productStructureDialog from '@/views/common/productstructure.vue'
@@ -339,17 +340,22 @@
if (this.dataForm.id) {
getObj(this.dataForm.id).then((response) => {
var resultData = response.data.data
- this.treeForm.partId = resultData.partId
- this.treeForm.partNo = resultData.partNo
- this.treeForm.partName = resultData.partName
- this.treeForm.number = resultData.number
- this.treeForm.insulationColor = resultData.insulationColor
- this.treeForm.sheathColor = resultData.sheathColor
- this.treeForm.characteristicOne = resultData.characteristicOne
- this.treeForm.version = resultData.version
- this.treeForm.alternativeNo = resultData.alternativeNo
- this.treeForm.alternativeDesc = resultData.alternativeDesc
- this.treeForm.bomTypeDb = resultData.bomTypeDb
+ console.log(resultData)
+ this.treeForm = resultData
+ // this.treeForm.id = resultData.id
+ // this.treeForm.partId = resultData.partId
+ // this.treeForm.partNo = resultData.partNo
+ // this.treeForm.partName = resultData.partName
+ // this.treeForm.number = resultData.number
+ // this.treeForm.insulationColor = resultData.insulationColor
+ // this.treeForm.sheathColor = resultData.sheathColor
+ // this.treeForm.characteristicOne = resultData.characteristicOne
+ // this.treeForm.version = resultData.version
+ // this.treeForm.alternativeNo = resultData.alternativeNo
+ // this.treeForm.alternativeDesc = resultData.alternativeDesc
+ // this.treeForm.bomTypeDb = resultData.bomTypeDb
+ // this.treeForm.state = resultData.state
+ // this.treeForm.remark = resultData.remark
this.dataForm.state = resultData.state
this.preViewData = []
this.preViewData.push(resultData.tree)
@@ -412,7 +418,15 @@
}
},
dataFormSubmit() {
- console.log(this.treeForm)
+ let data = this.treeForm
+ if(data.id != null){
+ updateObj(data).then(res=>{
+ this.$message.success("淇濆瓨鎴愬姛")
+
+ }).catch(error=>{
+ this.$message.error("淇濆瓨澶辫触")
+ })
+ }
// const mapTree = (org) => {
// const haveChildren =
// Array.isArray(org.children) && org.children.length > 0
@@ -1008,7 +1022,7 @@
.completeProductStructure-design {
float: left;
width: 100%;
- height: 650px;
+ height: 800px;
padding: 10px 20px;
border: 1px solid #ddd;
background-color: #fff;
diff --git a/src/views/technology/document/document-form.vue b/src/views/technology/document/document-form.vue
index b408ea2..b39ec6f 100644
--- a/src/views/technology/document/document-form.vue
+++ b/src/views/technology/document/document-form.vue
@@ -483,14 +483,14 @@
></el-table-column>
</el-table>
</el-tab-pane>
- <el-tab-pane label="澶囨敞" style="height: 100%">
+ <!-- <el-tab-pane label="澶囨敞" style="height: 100%">
<rich-text
:editorId="
'fwb' + item.id + '-' + ele.id + '-' + j
"
:richContent="ele.remark"
></rich-text>
- </el-tab-pane>
+ </el-tab-pane> -->
<el-tab-pane label="妫�娴嬫爣鍑�">
<checkStandardTable
ref="documentTestStandardTable"
@@ -511,7 +511,7 @@
"
></checkStandardTable>
</el-tab-pane>
- <el-tab-pane label="鎶芥瑙勫垯">
+ <!-- <el-tab-pane label="鎶芥瑙勫垯">
<div>
<div style="padding: 0px 20px;">
<el-button
@@ -594,7 +594,7 @@
</el-table>
</div>
</div>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
</el-collapse-item>
</el-collapse>
diff --git a/src/views/technology/document/index.vue b/src/views/technology/document/index.vue
index c642dc1..7db3d0f 100644
--- a/src/views/technology/document/index.vue
+++ b/src/views/technology/document/index.vue
@@ -11,21 +11,21 @@
ref="documentTable"
>
<template #toolbar>
- <el-button type="primary" :loading="ifsSynsLoading" @click="syncIfs"
+ <!-- <el-button type="primary" :loading="ifsSynsLoading" @click="syncIfs"
>ERP鍚屾</el-button
- >
+ > -->
<el-button
type="primary"
@click="deleteBatch"
v-if="permissions.technology_document_del"
>鎵归噺鍒犻櫎</el-button
>
- <el-button
+ <!-- <el-button
type="primary"
@click="bindTestStandard"
v-if="permissions.technology_document_standard_upload"
>鎵归噺缁戝畾妫�娴嬫爣鍑�</el-button
- >
+ > -->
</template>
</ttable>
<el-dialog
--
Gitblit v1.9.3