From 18d02e7db16cf5a21f8d5a152dd7ab27212d8eb6 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 23 十月 2023 16:44:27 +0800
Subject: [PATCH] modified: src/views/admin/menu/index.vue modified: src/views/admin/menu/menu-form.vue modified: src/views/plan/customerorder/customerorder-form.vue modified: src/views/technology/completeproductstructure/completeproductstructure-form.vue modified: src/views/technology/completeproductstructure/index.vue modified: src/views/technology/document/document-form.vue modified: src/views/technology/operation/operation-form.vue modified: src/views/technology/structure/index.vue modified: vue.config.js
---
vue.config.js | 2
src/views/technology/completeproductstructure/completeproductstructure-form.vue | 284 +++++++++++----------
src/views/technology/document/document-form.vue | 4
src/views/admin/menu/index.vue | 169 ++++++++-----
src/views/admin/menu/menu-form.vue | 260 ++++++++++---------
src/views/plan/customerorder/customerorder-form.vue | 11
src/views/technology/operation/operation-form.vue | 4
src/views/technology/structure/index.vue | 4
src/views/technology/completeproductstructure/index.vue | 14
9 files changed, 413 insertions(+), 339 deletions(-)
diff --git a/src/views/admin/menu/index.vue b/src/views/admin/menu/index.vue
index a5ed057..b6c705f 100644
--- a/src/views/admin/menu/index.vue
+++ b/src/views/admin/menu/index.vue
@@ -3,8 +3,12 @@
<div class="avue-crud">
<el-form :inline="true">
<el-form-item>
- <el-button v-if="permissions.sys_menu_add" icon="el-icon-plus" type="primary"
- @click="addOrUpdateHandle(false)">
+ <el-button
+ v-if="permissions.sys_menu_add"
+ icon="el-icon-plus"
+ type="primary"
+ @click="addOrUpdateHandle(false)"
+ >
娣诲姞
</el-button>
</el-form-item>
@@ -15,15 +19,25 @@
v-loading="loading"
:data="menuList"
row-key="id"
- :tree-props="{children: 'children', hasChildren: 'hasChildrens'}">
- <el-table-column prop="name" label="鑿滃崟鍚嶇О" :show-overflow-tooltip="true" width="180"></el-table-column>
+ :tree-props="{ children: 'children', hasChildren: 'hasChildrens' }"
+ >
+ <el-table-column
+ prop="name"
+ label="鑿滃崟鍚嶇О"
+ :show-overflow-tooltip="true"
+ width="180"
+ ></el-table-column>
<el-table-column prop="icon" label="鍥炬爣" align="center" width="100">
<template slot-scope="scope">
- <i :class="scope.row.icon"/>
+ <i :class="scope.row.icon" />
</template>
</el-table-column>
<el-table-column prop="sort" label="鎺掑簭" width="60"></el-table-column>
- <el-table-column prop="path" label="缁勪欢璺緞" :show-overflow-tooltip="true"></el-table-column>
+ <el-table-column
+ prop="path"
+ label="缁勪欢璺緞"
+ :show-overflow-tooltip="true"
+ ></el-table-column>
<el-table-column prop="type" label="绫诲瀷" width="80" align="center">
<template slot-scope="scope">
<el-tag type="success" v-if="scope.row.type === '0'">宸﹁彍鍗�</el-tag>
@@ -31,96 +45,121 @@
<el-tag type="info" v-if="scope.row.type === '1'">鎸夐挳</el-tag>
</template>
</el-table-column>
- <el-table-column prop="keepAlive" label="缂撳啿" width="80" align="center">
+ <el-table-column
+ prop="keepAlive"
+ label="缂撳啿"
+ width="80"
+ align="center"
+ >
<template slot-scope="scope">
<el-tag type="info" v-if="scope.row.keepAlive === '0'">鍏抽棴</el-tag>
- <el-tag type="success" v-if="scope.row.keepAlive === '1'">寮�鍚�</el-tag>
+ <el-tag type="success" v-if="scope.row.keepAlive === '1'"
+ >寮�鍚�</el-tag
+ >
</template>
</el-table-column>
- <el-table-column prop="permission" label="鏉冮檺鏍囪瘑" :show-overflow-tooltip="true"></el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column
+ prop="permission"
+ label="鏉冮檺鏍囪瘑"
+ :show-overflow-tooltip="true"
+ ></el-table-column>
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ class-name="small-padding fixed-width"
+ >
<template slot-scope="scope">
<el-button
size="small"
type="text"
icon="el-icon-plus"
- @click="addOrUpdateHandle(false,scope.row.id)"
- v-if="permissions.sys_menu_add">鏂板
+ @click="addOrUpdateHandle(false, scope.row.id)"
+ v-if="permissions.sys_menu_add"
+ >鏂板
</el-button>
- <el-button size="small"
- type="text"
- icon="el-icon-edit"
- @click="addOrUpdateHandle(true,scope.row.id)"
- v-if="permissions.sys_menu_edit">淇敼
+ <el-button
+ size="small"
+ type="text"
+ icon="el-icon-edit"
+ @click="addOrUpdateHandle(true, scope.row.id)"
+ v-if="permissions.sys_menu_edit"
+ >淇敼
</el-button>
<el-button
size="small"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-if="permissions.sys_menu_del">鍒犻櫎
+ v-if="permissions.sys_menu_del"
+ >鍒犻櫎
</el-button>
</template>
</el-table-column>
</el-table>
- <table-form v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList"></table-form>
+ <table-form
+ v-if="addOrUpdateVisible"
+ ref="addOrUpdate"
+ @refreshDataList="getList"
+ ></table-form>
</div>
</basic-container>
</template>
<script>
- import {delObj, fetchMenuTree} from '@/api/admin/menu'
- import TableForm from './menu-form'
- import {mapGetters} from 'vuex'
+import { delObj, fetchMenuTree } from '@/api/admin/menu'
+import TableForm from './menu-form'
+import { mapGetters } from 'vuex'
- export default {
- name: "Menu",
- components: {TableForm},
- data() {
- return {
- addOrUpdateVisible: false,
- // 閬僵灞�
- loading: true,
- // 鑿滃崟琛ㄦ牸鏍戞暟鎹�
- menuList: [],
- // 鑿滃崟鏍戦�夐」
- menuOptions: [],
- };
+export default {
+ name: 'Menu',
+ components: { TableForm },
+ data() {
+ return {
+ addOrUpdateVisible: false,
+ // 閬僵灞�
+ loading: true,
+ // 鑿滃崟琛ㄦ牸鏍戞暟鎹�
+ menuList: [],
+ // 鑿滃崟鏍戦�夐」
+ menuOptions: []
+ }
+ },
+ created() {
+ this.getList()
+ },
+ computed: {
+ ...mapGetters(['permissions'])
+ },
+ methods: {
+ addOrUpdateHandle(isEdit, id) {
+ this.addOrUpdateVisible = true
+ this.$nextTick(() => {
+ this.$refs.addOrUpdate.init(isEdit, id)
+ })
},
- created() {
- this.getList();
+ getList() {
+ this.loading = true
+ fetchMenuTree(false).then((response) => {
+ this.menuList = response.data.data
+ this.loading = false
+ })
},
- computed: {
- ...mapGetters(['permissions']),
- },
- methods: {
- addOrUpdateHandle(isEdit, id) {
- this.addOrUpdateVisible = true
- this.$nextTick(() => {
- this.$refs.addOrUpdate.init(isEdit, id)
+ handleDelete(row) {
+ this.$confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.name + '"鐨勬暟鎹」?', '璀﹀憡', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ closeOnClickModal: false,
+ type: 'warning'
+ })
+ .then(function() {
+ return delObj(row.id)
})
- },
- getList() {
- this.loading = true;
- fetchMenuTree(false).then(response => {
- this.menuList = response.data.data
- this.loading = false;
- });
- },
- handleDelete(row) {
- this.$confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.name + '"鐨勬暟鎹」?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- closeOnClickModal:false,
- type: "warning"
- }).then(function () {
- return delObj(row.id);
- }).then(() => {
- this.getList();
+ .then(() => {
+ this.getList()
this.$message.success('鍒犻櫎鎴愬姛')
})
- }
}
- };
+ }
+}
</script>
diff --git a/src/views/admin/menu/menu-form.vue b/src/views/admin/menu/menu-form.vue
index 9c5639a..2b09af0 100644
--- a/src/views/admin/menu/menu-form.vue
+++ b/src/views/admin/menu/menu-form.vue
@@ -1,7 +1,6 @@
<template>
<!-- 娣诲姞鎴栦慨鏀硅彍鍗曞璇濇 -->
- <el-dialog :title="!form.menuId ? '鏂板': '淇敼'"
- :visible.sync="visible">
+ <el-dialog :title="!form.menuId ? '鏂板' : '淇敼'" :visible.sync="visible">
<el-form ref="dataForm" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
@@ -15,35 +14,51 @@
</el-col>
<el-col :span="12">
<el-form-item label="涓婄骇鑿滃崟">
- <treeselect v-model="form.parentId"
- :options="menuOptions"
- :normalizer="normalizer"
- :show-count="true"
- placeholder="閫夋嫨涓婄骇鑿滃崟"
+ <treeselect
+ v-model="form.parentId"
+ :options="menuOptions"
+ :normalizer="normalizer"
+ :show-count="true"
+ placeholder="閫夋嫨涓婄骇鑿滃崟"
/>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="鍥炬爣" prop="icon" v-if="form.type !== '1'">
- <avue-icon-select v-model="form.icon" :icon-list="iconList"></avue-icon-select>
+ <avue-icon-select
+ v-model="form.icon"
+ :icon-list="iconList"
+ ></avue-icon-select>
</el-form-item>
<el-form-item label="鍚嶇О" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ヨ彍鍗曞悕绉�"/>
+ <el-input v-model="form.name" placeholder="璇疯緭鍏ヨ彍鍗曞悕绉�" />
</el-form-item>
<el-form-item label="璺敱鍦板潃" prop="path" v-if="form.type !== '1'">
- <el-input v-model="form.path" placeholder="璇疯緭鍏ヨ矾鐢卞湴鍧�"/>
+ <el-input v-model="form.path" placeholder="璇疯緭鍏ヨ矾鐢卞湴鍧�" />
</el-form-item>
<el-form-item label="鏉冮檺鏍囪瘑" prop="permission" v-if="form.type === '1'">
- <el-input v-model="form.permission" placeholder="璇锋潈闄愭爣璇�" maxlength="50"/>
+ <el-input
+ v-model="form.permission"
+ placeholder="璇锋潈闄愭爣璇�"
+ maxlength="50"
+ />
</el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="鎺掑簭" prop="sort">
- <el-input-number v-model="form.sort" controls-position="right" :min="0"/>
+ <el-input-number
+ v-model="form.sort"
+ controls-position="right"
+ :min="0"
+ />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="璺敱缂撳啿" prop="keepAlive" v-if="form.type !== '1'">
+ <el-form-item
+ label="璺敱缂撳啿"
+ prop="keepAlive"
+ v-if="form.type !== '1'"
+ >
<el-radio-group v-model="form.keepAlive">
<el-radio-button label="0">鍚�</el-radio-button>
<el-radio-button label="1">鏄�</el-radio-button>
@@ -60,117 +75,118 @@
</template>
<script>
- import {addObj, fetchMenuTree, getObj, putObj} from '@/api/admin/menu'
- import Treeselect from "@riophae/vue-treeselect"
- import iconList from '@/const/iconList'
- import TableForm from './'
- import "@riophae/vue-treeselect/dist/vue-treeselect.css"
+import { addObj, fetchMenuTree, getObj, putObj } from '@/api/admin/menu'
+import Treeselect from '@riophae/vue-treeselect'
+import iconList from '@/const/iconList'
+import TableForm from './'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
- export default {
- name: "Menu",
- components: {Treeselect, TableForm},
- data() {
- return {
- // 閬僵灞�
- loading: true,
- // 鑿滃崟鏍戦�夐」
- menuOptions: [],
- // 鏄惁鏄剧ず寮瑰嚭灞�
- visible: false,
- // 鍥炬爣
- iconList: iconList,
- form: {
- menuId: undefined,
- name: undefined,
- path: undefined,
- icon: undefined,
- permission: undefined,
- type: '0',
- keepAlive: '0',
- sort: 999
- },
- // 琛ㄥ崟鏍￠獙
- rules: {
- name: [
- {required: true, message: "鑿滃崟鍚嶇О涓嶈兘涓虹┖", trigger: "blur"}
- ],
- sort: [
- {required: true, message: "鑿滃崟椤哄簭涓嶈兘涓虹┖", trigger: "blur"}
- ],
- path: [
- {required: true, message: "璺敱鍦板潃涓嶈兘涓虹┖", trigger: "blur"}
- ],
- keepAlive: [
- {required: true, message: "璺敱缂撳啿涓嶈兘涓虹┖", trigger: "blur"}
- ],
- permission: [
- {required: true, message: "鏉冮檺鏍囪瘑涓嶈兘涓虹┖", trigger: "blur"}
- ]
- }
- };
- },
- methods: {
- init(isEdit, id) {
- if (id != null) {
- this.form.parentId = id;
- }
- this.visible = true
- this.getTreeselect();
- this.$nextTick(() => {
- this.$refs['dataForm'].resetFields()
- if (isEdit) {
- getObj(id).then(response => {
- this.form = response.data.data
- })
- } else {
- this.form.menuId = undefined
- }
- })
+export default {
+ name: 'Menu',
+ // eslint-disable-next-line vue/no-unused-components
+ components: { Treeselect, TableForm },
+ data() {
+ return {
+ // 閬僵灞�
+ loading: true,
+ // 鑿滃崟鏍戦�夐」
+ menuOptions: [],
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ visible: false,
+ // 鍥炬爣
+ iconList: iconList,
+ form: {
+ menuId: undefined,
+ name: undefined,
+ path: undefined,
+ icon: undefined,
+ permission: undefined,
+ type: '0',
+ keepAlive: '0',
+ sort: 999
},
- // 琛ㄥ崟鎻愪氦
- dataFormSubmit() {
- this.$refs['dataForm'].validate((valid) => {
- if (valid) {
- if (this.form.parentId === undefined) {
- this.form.parentId = -1
- }
-
- if (this.form.menuId) {
- putObj(this.form).then(data => {
- this.$message.success('淇敼鎴愬姛')
- this.visible = false
- this.$emit('refreshDataList')
- });
- } else {
- addObj(this.form).then(data => {
- this.$message.success('娣诲姞鎴愬姛')
- this.visible = false
- this.$emit('refreshDataList')
- })
- }
- }
- })
- },
- /** 鏌ヨ鑿滃崟涓嬫媺鏍戠粨鏋� */
- getTreeselect() {
- fetchMenuTree().then(response => {
- this.menuOptions = [];
- const menu = {id: -1, name: '鏍硅彍鍗�', children: []};
- menu.children = response.data.data;
- this.menuOptions.push(menu);
- });
- },
- /** 杞崲鑿滃崟鏁版嵁缁撴瀯 */
- normalizer(node) {
- if (node.children && !node.children.length) {
- delete node.children;
- }
- return {
- id: node.id,
- label: node.name,
- children: node.children
- };
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ name: [
+ { required: true, message: '鑿滃崟鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }
+ ],
+ sort: [
+ { required: true, message: '鑿滃崟椤哄簭涓嶈兘涓虹┖', trigger: 'blur' }
+ ],
+ path: [
+ { required: true, message: '璺敱鍦板潃涓嶈兘涓虹┖', trigger: 'blur' }
+ ],
+ keepAlive: [
+ { required: true, message: '璺敱缂撳啿涓嶈兘涓虹┖', trigger: 'blur' }
+ ],
+ permission: [
+ { required: true, message: '鏉冮檺鏍囪瘑涓嶈兘涓虹┖', trigger: 'blur' }
+ ]
}
}
- };
+ },
+ methods: {
+ init(isEdit, id) {
+ if (id != null) {
+ this.form.parentId = id
+ }
+ this.visible = true
+ this.getTreeselect()
+ this.$nextTick(() => {
+ this.$refs.dataForm.resetFields()
+ if (isEdit) {
+ getObj(id).then((response) => {
+ this.form = response.data.data
+ })
+ } else {
+ this.form.menuId = undefined
+ }
+ })
+ },
+ // 琛ㄥ崟鎻愪氦
+ dataFormSubmit() {
+ this.$refs.dataForm.validate((valid) => {
+ if (valid) {
+ if (this.form.parentId === undefined) {
+ this.form.parentId = -1
+ }
+
+ if (this.form.menuId) {
+ putObj(this.form).then((data) => {
+ this.$message.success('淇敼鎴愬姛')
+ this.visible = false
+ this.$emit('refreshDataList')
+ })
+ } else {
+ addObj(this.form).then((data) => {
+ this.$message.success('娣诲姞鎴愬姛')
+ this.visible = false
+ this.$emit('refreshDataList')
+ })
+ }
+ }
+ })
+ },
+ /** 鏌ヨ鑿滃崟涓嬫媺鏍戠粨鏋� */
+ getTreeselect() {
+ fetchMenuTree().then((response) => {
+ this.menuOptions = []
+ const menu = { id: -1, name: '鏍硅彍鍗�', children: [] }
+ menu.children = response.data.data
+ this.menuOptions.push(menu)
+ })
+ },
+ /** 杞崲鑿滃崟鏁版嵁缁撴瀯 */
+ normalizer(node) {
+ if (node.children && !node.children.length) {
+ delete node.children
+ }
+ return {
+ id: node.id,
+ label: node.name,
+ children: node.children
+ }
+ }
+ }
+}
</script>
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index 2997ba9..dae2ea8 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -635,15 +635,16 @@
show-overflow-tooltip
>
</el-table-column>
- <el-table-column prop="lineNumber" align="center" label="琛屽彿">
- </el-table-column>
+ <!-- <el-table-column prop="lineNumber" align="center" label="琛屽彿"> -->
+ <!-- </el-table-column> -->
<el-table-column
prop="originalFileName"
align="center"
label="鍘熸枃浠跺悕"
+ width="200"
>
</el-table-column>
- <el-table-column prop="fileName" align="center" label="鏂囦欢鍚�">
+ <el-table-column prop="fileName" align="center" label="鏂囦欢鍚庣紑">
</el-table-column>
<el-table-column prop="createUser" align="center" label="涓婁紶浜�">
</el-table-column>
@@ -676,13 +677,13 @@
<!-- </el-table-column>-->
<el-table-column fixed="right" align="center" label="鎿嶄綔">
<template slot-scope="scope">
- <el-button
+ <!-- <el-button
@click="synchronizeFile(scope.row)"
type="text"
size="small"
:disabled="scope.row.lineNumber !== dataForm.customerNo"
>鍚屾</el-button
- >
+ > -->
<el-button
@click="delProcessConfigFile(scope.row)"
type="text"
diff --git a/src/views/technology/completeproductstructure/completeproductstructure-form.vue b/src/views/technology/completeproductstructure/completeproductstructure-form.vue
index 760d492..d0bdc16 100644
--- a/src/views/technology/completeproductstructure/completeproductstructure-form.vue
+++ b/src/views/technology/completeproductstructure/completeproductstructure-form.vue
@@ -1,5 +1,5 @@
<template>
- <div style="height: 100%">
+ <div>
<div class="page-header">
<div class="header-left">
<a @click="$router.go(-1)"><i class="icon-btn-back"></i></a>
@@ -30,12 +30,12 @@
</el-form-item>
<el-form-item label="闆朵欢鍙�" prop="partNo">
- <el-input v-model="treeForm.partNo" placeholder="闆朵欢" readonly>
- <el-button
+ <el-input v-model="treeForm.partNo" placeholder="闆朵欢" disabled>
+ <!-- <el-button
slot="append"
icon="el-icon-search"
@click="showProductStructure = true"
- ></el-button>
+ ></el-button> -->
</el-input>
</el-form-item>
@@ -117,8 +117,25 @@
</div>
<div class="completeProductStructure-detail">
<div class="completeProductStructure-design">
- <div class="completeProductStructure-design-title">鏋勫缓BOM</div>
+ <div class="completeProductStructure-design-title">BOM</div>
<el-table
+ class="tree-select-table"
+ ref="tableRef"
+ :data="tableData"
+ style="width: 100%;"
+ row-key="id"
+ border
+ height="580"
+ default-expand-all
+ @expand-change="expandChange"
+ :row-class-name="tableRowClassName"
+ >
+ <el-table-column label="闆朵欢缂栧彿" prop="partNo"></el-table-column>
+ <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>
+ <!-- <el-table
class="tree-select-table"
ref="tableRef"
:data="tableData"
@@ -155,10 +172,10 @@
</el-table-column>
<el-table-column prop="operationName" label="娑堣�楀伐搴�">
</el-table-column>
- </el-table>
+ </el-table> -->
</div>
- <div class="completeProductStructure-queryPreview"></div>
- <div class="completeProductStructure-preview">
+ <!-- <div class="completeProductStructure-queryPreview"></div> -->
+ <!-- <div class="completeProductStructure-preview">
<div class="completeProductStructure-preview-title">缁撴灉棰勮</div>
<el-table
:data="preViewData"
@@ -200,7 +217,7 @@
<el-table-column prop="operationName" label="娑堣�楀伐搴�">
</el-table-column>
</el-table>
- </div>
+ </div> -->
</div>
</div>
<productStructureDialog
@@ -336,13 +353,13 @@
this.dataForm.state = resultData.state
this.preViewData = []
this.preViewData.push(resultData.tree)
- this.tableData = []
- getPartAllStructureExt(this.treeForm).then((res) => {
- const result = res.data
- if (result.code === 0) {
- this.tableData.push(result.data)
- }
- })
+ this.tableData = resultData.bomComponentVOS
+ // getPartAllStructureExt(this.treeForm).then((res) => {
+ // const result = res.data
+ // if (result.code === 0) {
+ // this.tableData.push(result.data)
+ // }
+ // })
})
} else {
this.initDefaultForm()
@@ -395,110 +412,111 @@
}
},
dataFormSubmit() {
- const mapTree = (org) => {
- const haveChildren =
- Array.isArray(org.children) && org.children.length > 0
- return {
- checked: org.checked,
- compId: org.compId,
- discNum: org.discNum || 1,
- expand: org.expand,
- id: org.id,
- operationId: org.operationId,
- operationName: org.operationName,
- operationNo: org.operationNo,
- originalQpa: org.originalQpa,
- parentId: org.parentId,
- partId: org.partId,
- partName: org.partName,
- partNo: org.partNo,
- version: org.version,
- alternativeNo: org.alternativeNo,
- alternativeDesc: org.alternativeDesc,
- qpa: org.qpa,
- structureId: org.structureId,
- unit: org.unit,
- color: org.color,
- planningMethod: org.planningMethod,
- children: haveChildren ? org.children.map((i) => mapTree(i)) : []
- }
- }
+ console.log(this.treeForm)
+ // const mapTree = (org) => {
+ // const haveChildren =
+ // Array.isArray(org.children) && org.children.length > 0
+ // return {
+ // checked: org.checked,
+ // compId: org.compId,
+ // discNum: org.discNum || 1,
+ // expand: org.expand,
+ // id: org.id,
+ // operationId: org.operationId,
+ // operationName: org.operationName,
+ // operationNo: org.operationNo,
+ // originalQpa: org.originalQpa,
+ // parentId: org.parentId,
+ // partId: org.partId,
+ // partName: org.partName,
+ // partNo: org.partNo,
+ // version: org.version,
+ // alternativeNo: org.alternativeNo,
+ // alternativeDesc: org.alternativeDesc,
+ // qpa: org.qpa,
+ // structureId: org.structureId,
+ // unit: org.unit,
+ // color: org.color,
+ // planningMethod: org.planningMethod,
+ // children: haveChildren ? org.children.map((i) => mapTree(i)) : []
+ // }
+ // }
- this.isSubmit = true
- this.generateStructure()
- if (this.preViewData != null && this.preViewData.length > 0) {
- if (this.preViewData.length === 1) {
- if (this.dataForm.id) {
- var updateObj = {}
- updateObj.id = this.dataForm.id
- updateObj.partId = this.treeForm.partId
- updateObj.number = this.treeForm.number
- updateObj.insulationColor = this.treeForm.insulationColor
- updateObj.sheathColor = this.treeForm.sheathColor
- updateObj.characteristicOne = this.treeForm.characteristicOne
- updateObj.version = this.treeForm.version
- updateObj.alternativeNo = this.treeForm.alternativeNo
- updateObj.alternativeDesc = this.treeForm.alternativeDesc
- updateObj.bomTypeDb = this.treeForm.bomTypeDb
+ // this.isSubmit = true
+ // this.generateStructure()
+ // if (this.preViewData != null && this.preViewData.length > 0) {
+ // if (this.preViewData.length === 1) {
+ // if (this.dataForm.id) {
+ // var updateObj = {}
+ // updateObj.id = this.dataForm.id
+ // updateObj.partId = this.treeForm.partId
+ // updateObj.number = this.treeForm.number
+ // updateObj.insulationColor = this.treeForm.insulationColor
+ // updateObj.sheathColor = this.treeForm.sheathColor
+ // updateObj.characteristicOne = this.treeForm.characteristicOne
+ // updateObj.version = this.treeForm.version
+ // updateObj.alternativeNo = this.treeForm.alternativeNo
+ // updateObj.alternativeDesc = this.treeForm.alternativeDesc
+ // updateObj.bomTypeDb = this.treeForm.bomTypeDb
- // const tree = this.preViewData[0];
- const gxqTree = this.preViewData.map((org) => mapTree(org))
- // this.setDefaultDiscNum(gxqTree);
- updateObj.tree = gxqTree[0]
- putObj(updateObj)
- .then((response) => {
- var data = response.data
- if (data.code === 0) {
- this.$message.success('淇敼鎴愬姛')
- } else {
- this.$message.error('淇敼澶辫触')
- }
- this.isSubmit = false
- })
- .catch((error) => {
- this.isSubmit = false
- console.log(error)
- })
- } else {
- var newObj = {}
- newObj.id = null
- newObj.partId = this.treeForm.partId
- newObj.number = this.treeForm.number
- newObj.insulationColor = this.treeForm.insulationColor
- newObj.sheathColor = this.treeForm.sheathColor
- newObj.characteristicOne = this.treeForm.characteristicOne
- newObj.version = this.treeForm.version
- newObj.alternativeNo = this.treeForm.alternativeNo
- newObj.alternativeDesc = this.treeForm.alternativeDesc
- newObj.bomTypeDb = this.treeForm.bomTypeDb
- const gxqTree = this.preViewData.map((org) => mapTree(org))
+ // // const tree = this.preViewData[0];
+ // const gxqTree = this.preViewData.map((org) => mapTree(org))
+ // // this.setDefaultDiscNum(gxqTree);
+ // updateObj.tree = gxqTree[0]
+ // putObj(updateObj)
+ // .then((response) => {
+ // var data = response.data
+ // if (data.code === 0) {
+ // this.$message.success('淇敼鎴愬姛')
+ // } else {
+ // this.$message.error('淇敼澶辫触')
+ // }
+ // this.isSubmit = false
+ // })
+ // .catch((error) => {
+ // this.isSubmit = false
+ // console.log(error)
+ // })
+ // } else {
+ // var newObj = {}
+ // newObj.id = null
+ // newObj.partId = this.treeForm.partId
+ // newObj.number = this.treeForm.number
+ // newObj.insulationColor = this.treeForm.insulationColor
+ // newObj.sheathColor = this.treeForm.sheathColor
+ // newObj.characteristicOne = this.treeForm.characteristicOne
+ // newObj.version = this.treeForm.version
+ // newObj.alternativeNo = this.treeForm.alternativeNo
+ // newObj.alternativeDesc = this.treeForm.alternativeDesc
+ // newObj.bomTypeDb = this.treeForm.bomTypeDb
+ // const gxqTree = this.preViewData.map((org) => mapTree(org))
- newObj.tree = gxqTree[0]
- addObj(newObj)
- .then((response) => {
- var data = response.data
- if (data.code === 0) {
- this.dataForm.id = data.data.id
- this.treeForm.number = data.data.number
- this.$message.success('淇濆瓨鎴愬姛')
- } else {
- this.$message.error('淇濆瓨澶辫触')
- }
- this.isSubmit = false
- })
- .catch((error) => {
- this.isSubmit = false
- console.log(error)
- })
- }
- } else {
- this.isSubmit = false
- this.$message.error('瀛樺湪澶氫釜鏍硅妭鐐癸紝鏃犳硶杩涜淇濆瓨')
- }
- } else {
- this.isSubmit = false
- this.$message.error('璇峰厛鏋勫缓BOM锛屽啀杩涜淇濆瓨')
- }
+ // newObj.tree = gxqTree[0]
+ // addObj(newObj)
+ // .then((response) => {
+ // var data = response.data
+ // if (data.code === 0) {
+ // this.dataForm.id = data.data.id
+ // this.treeForm.number = data.data.number
+ // this.$message.success('淇濆瓨鎴愬姛')
+ // } else {
+ // this.$message.error('淇濆瓨澶辫触')
+ // }
+ // this.isSubmit = false
+ // })
+ // .catch((error) => {
+ // this.isSubmit = false
+ // console.log(error)
+ // })
+ // }
+ // } else {
+ // this.isSubmit = false
+ // this.$message.error('瀛樺湪澶氫釜鏍硅妭鐐癸紝鏃犳硶杩涜淇濆瓨')
+ // }
+ // } else {
+ // this.isSubmit = false
+ // this.$message.error('璇峰厛鏋勫缓BOM锛屽啀杩涜淇濆瓨')
+ // }
},
// 鐢熸垚鏈�缁堢殑缁撴瀯
generateStructure() {
@@ -924,19 +942,19 @@
}
},
bomTypeDbChange(e) {
- if (e) {
- this.before = this.treeForm.bomTypeDb
- } else {
- if (this.before !== this.treeForm.bomTypeDb) {
- this.treeForm.partId = null
- this.treeForm.partNo = null
- this.treeForm.partName = null
- this.treeForm.version = null
- this.treeForm.alternativeNo = null
- this.treeForm.alternativeDesc = null
- this.tableData = []
- }
- }
+ // if (e) {
+ // this.before = this.treeForm.bomTypeDb
+ // } else {
+ // if (this.before !== this.treeForm.bomTypeDb) {
+ // this.treeForm.partId = null
+ // this.treeForm.partNo = null
+ // this.treeForm.partName = null
+ // this.treeForm.version = null
+ // this.treeForm.alternativeNo = null
+ // this.treeForm.alternativeDesc = null
+ // this.tableData = []
+ // }
+ // }
},
// table璁剧疆琛屾牱寮�
tableRowClassName({ row, rowIndex }) {
@@ -989,8 +1007,8 @@
.completeProductStructure-design {
float: left;
- width: 48%;
- height: 800px;
+ width: 100%;
+ height: 650px;
padding: 10px 20px;
border: 1px solid #ddd;
background-color: #fff;
@@ -1026,7 +1044,7 @@
color: #006eff;
}
.forbid-row .cell {
- color: #c0c4cc;
+ color: #000;
}
.tree-select-table th.gutter {
diff --git a/src/views/technology/completeproductstructure/index.vue b/src/views/technology/completeproductstructure/index.vue
index d8d450f..5fdc6cd 100644
--- a/src/views/technology/completeproductstructure/index.vue
+++ b/src/views/technology/completeproductstructure/index.vue
@@ -214,13 +214,13 @@
}
],
toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle,
- disabled: false,
- permitArr: []
- },
+ // {
+ // text: '鏂板',
+ // type: 'primary',
+ // fun: this.addOrUpdateHandle,
+ // disabled: false,
+ // permitArr: []
+ // },
{
text: '浜у搧缁撴瀯鐢熸垚BOM',
fun: this.addByStructureHandle,
diff --git a/src/views/technology/document/document-form.vue b/src/views/technology/document/document-form.vue
index 81ffb96..b408ea2 100644
--- a/src/views/technology/document/document-form.vue
+++ b/src/views/technology/document/document-form.vue
@@ -604,7 +604,7 @@
</el-collapse>
</el-card>
</el-tab-pane>
- <el-tab-pane label="鍥剧墖涓婁紶" style="height: 100%">
+ <!-- <el-tab-pane label="鍥剧墖涓婁紶" style="height: 100%">
<el-card class="document-structure">
<div slot="header">
<span>缁撴瀯鍥�</span>
@@ -691,7 +691,7 @@
<img width="100%" :src="dialogFlowImageUrl" alt="" />
</el-dialog>
</el-card>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
</div>
</div>
diff --git a/src/views/technology/operation/operation-form.vue b/src/views/technology/operation/operation-form.vue
index 7c8b026..e08f90f 100644
--- a/src/views/technology/operation/operation-form.vue
+++ b/src/views/technology/operation/operation-form.vue
@@ -307,7 +307,7 @@
</el-table>
</el-card>
</el-tab-pane>
- <el-tab-pane
+ <!-- <el-tab-pane
v-if="isShowStepBusiness"
label="宸ユ"
style="height: 100%"
@@ -363,7 +363,7 @@
</el-table-column>
</el-table>
</el-card>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
<ParamTemplateDialog
:currshowlist.sync="showOperationTemplate"
diff --git a/src/views/technology/structure/index.vue b/src/views/technology/structure/index.vue
index ef5f8fe..0538871 100644
--- a/src/views/technology/structure/index.vue
+++ b/src/views/technology/structure/index.vue
@@ -13,9 +13,9 @@
ref="structureTable"
>
<template #toolbar>
- <el-button type="primary" :loading="ifsSynsLoading" @click="syncIfs"
+ <!-- <el-button type="primary" :loading="ifsSynsLoading" @click="syncIfs"
>ERP鍚屾</el-button
- >
+ > -->
</template>
</ttable>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
diff --git a/vue.config.js b/vue.config.js
index 7503dc5..64b6d3b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,7 +2,7 @@
* 閰嶇疆鍙傝��:
* https://cli.vuejs.org/zh/config/
*/
-const url = 'http://192.168.83.249:9999'
+const url = 'http://192.168.0.23:9999'
const localUrl = 'http://localhost:8089'
//const localUrl = 'http://10.88.15.95:8089'
const CompressionWebpackPlugin = require('compression-webpack-plugin')
--
Gitblit v1.9.3