From 264795ac21be1ef5e36ec431005acb84777dad79 Mon Sep 17 00:00:00 2001 From: liuying <1427574514@qq.com> Date: 周四, 25 4月 2024 14:07:46 +0800 Subject: [PATCH] css --- iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 92 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 69 insertions(+), 23 deletions(-) diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue index 6da1ac1..6af8f65 100644 --- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue +++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue @@ -125,13 +125,16 @@ </template> <script> -import { WmsMaterialAdd, GetAreas, GetStations, materialTypeDataList } from '@/api/modular/main/WmsMaterialManage' + +import { + WmsMaterialAdd, WmsMaterialEdit, WmsMaterialDetailList,materialTypeDataList +} from '@/api/modular/main/WmsBase/WmsMaterialManage' import addForm from './tabItem/addForm.vue' import addFormBaseCustomer from './tabItem/addFormBaseCustomer/addFormBaseCustomer.vue' import addFormContainerPackaging from './tabItem/WmsContainerPackaging/addFormContainerPackaging.vue' import addFormSub from './tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue' import addControlRule from './tabItem/WmsControlRule/addForm.vue' -import { WmsUnitPage, WmsUnitDelete, WmsUnitToExcel } from '@/api/modular/main/WmsBase/WmsUnitManage' +import { WmsUnitPage} from '@/api/modular/main/WmsBase/WmsUnitManage' export default { components: { addForm, @@ -165,7 +168,9 @@ visible: false, confirmLoading: false, form: this.$form.createForm(this), - materialTypeData2:[] + materialTypeData2: [], + selectTypeData2:[], + selectTypeData1:[] } }, methods: { @@ -210,20 +215,43 @@ }, handleOk() { }, // 鍒濆鍖栨柟娉� - add(record) { - - + add(record, type) { this.visible = true if (record) {//缂栬緫 - this.title = '缂栬緫鍩虹鐗╂枡淇℃伅'; + if (type == '璇︽儏') { + this.title = '璇︽儏鐗╂枡淇℃伅璇︽儏';// 璇︽儏 + } else { + this.title = '缂栬緫鍩虹鐗╂枡淇℃伅'; + } this.$nextTick(() => { this.form.setFieldsValue({ ...record }) }) - - } else { // 鏂板 - this.title = '鏂板鍩虹鐗╂枡淇℃伅'; + WmsMaterialDetailList({ + id: record.id + }) + .then(res => { + if (res.success) { + console.log("666666666666") + console.log(res) + this.$refs.WmsControlRule.list = res.data.baseCustomerList || [] + this.$refs.addFormBaseCustomer.list = res.data.controlRuleDetailList || [] + this.$refs.addFormWmsSubstituteGoodRef.list = res.data.substituteGoodList || [] + // this.$message.success('缂栬緫鎴愬姛') + // this.confirmLoading = false + // this.$emit('ok', values) + // this.handleCancel() + } else { + this.$message.error('璇︽儏澶辫触锛�' + JSON.stringify(res.message)) + } + }) + .finally(res => { + this.confirmLoading = false + }) + + } else { + this.title = '鏂板鍩虹鐗╂枡淇℃伅';// 鏂板 } }, getSelects() { @@ -297,20 +325,38 @@ // ContainerPackagingList: this.$refs.addFormContainerPackagingRef.list //鍖呰鍏崇郴 } this.confirmLoading = true - WmsMaterialAdd(param) - .then(res => { - if (res.success) { - this.$message.success('鏂板鎴愬姛') + if (this.title == '鏂板鍩虹鐗╂枡淇℃伅') { + WmsMaterialAdd(param) + .then(res => { + if (res.success) { + this.$message.success('鏂板鎴愬姛') + this.confirmLoading = false + this.$emit('ok', values) + this.handleCancel() + } else { + this.$message.error('鏂板澶辫触锛�' + JSON.stringify(res.message)) + } + }) + .finally(res => { this.confirmLoading = false - this.$emit('ok', values) - this.handleCancel() - } else { - this.$message.error('鏂板澶辫触锛�' + JSON.stringify(res.message)) - } - }) - .finally(res => { - this.confirmLoading = false - }) + }) + } else { + WmsMaterialEdit(param) + .then(res => { + if (res.success) { + this.$message.success('缂栬緫鎴愬姛') + this.confirmLoading = false + this.$emit('ok', values) + this.handleCancel() + } else { + this.$message.error('缂栬緫澶辫触锛�' + JSON.stringify(res.message)) + } + }) + .finally(res => { + this.confirmLoading = false + }) + } + } else { this.confirmLoading = false } -- Gitblit v1.9.3