From d86353384f4071a3cea77e6151e1a7bda4486501 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周三, 24 4月 2024 13:40:12 +0800
Subject: [PATCH] 物料tab
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/details.vue | 1
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/addForm.vue | 131 ++++++++++-----------
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 84 ++++++-------
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue | 45 ++++--
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue | 89 +++++++-------
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsContainerPackaging/addFormContainerPackaging.vue | 1
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addForm.vue | 1
7 files changed, 176 insertions(+), 176 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/addForm.vue
index e8b8fbb..002a8e9 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/addForm.vue
@@ -1,18 +1,15 @@
锘�<template>
- <a-modal
- title="鏂板鐗╂枡淇℃伅琛�"
- :width="900"
- :visible="visible"
- :confirmLoading="confirmLoading"
- @ok="handleSubmit"
+ <a-modal title="鏂板鐗╂枡淇℃伅琛�" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
- <a-form :form="form">
+ <a-form :form="form">
<a-form-item label="鐗╂枡鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" v-decorator="['materialName', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欏悕绉帮紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欏悕绉�"
+ v-decorator="['materialName', { rules: [{ required: true, message: '璇疯緭鍏ョ墿鏂欏悕绉帮紒' }] }]" />
</a-form-item>
<a-form-item label="鐗╂枡缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" v-decorator="['materialCode', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欑紪鍙凤紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�"
+ v-decorator="['materialCode', { rules: [{ required: true, message: '璇疯緭鍏ョ墿鏂欑紪鍙凤紒' }] }]" />
</a-form-item>
<a-form-item label="ERP缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏RP缂栧彿" v-decorator="['erpCode']" />
@@ -77,69 +74,69 @@
</template>
<script>
- import moment from 'moment'
- import {
+import moment from 'moment'
+import {
WmsMaterialAdd
- } from '@/api/modular/main/WmsBase/WmsMaterialManage'
- export default {
- data () {
- return {
- labelCol: {
- xs: { span: 24 },
- sm: { span: 5 }
+} from '@/api/modular/main/WmsBase/WmsMaterialManage'
+export default {
+ data() {
+ return {
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 }
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 15 }
+ },
+ visible: false,
+ confirmLoading: false,
+ form: this.$form.createForm(this)
+ }
},
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 15 }
- },
- visible: false,
- confirmLoading: false,
- form: this.$form.createForm(this)
- }
- },
- methods: {
- moment,
- // 鍒濆鍖栨柟娉�
- add (record) {
- this.visible = true
- this.$nextTick(() => {
+ methods: {
+ moment,
+ // 鍒濆鍖栨柟娉�
+ add(record) {
+ this.visible = true
+ this.$nextTick(() => {
- });
- },
- /**
- * 鎻愪氦琛ㄥ崟
- */
- handleSubmit () {
- const { form: { validateFields } } = this
- this.confirmLoading = true
- validateFields((errors, values) => {
- if (!errors) {
- for (const key in values) {
- if (typeof (values[key]) === 'object') {
- values[key] = JSON.stringify(values[key])
- }
+ });
+ },
+ /**
+ * 鎻愪氦琛ㄥ崟
+ */
+ handleSubmit() {
+ const { form: { validateFields } } = this
+ this.confirmLoading = true
+ validateFields((errors, values) => {
+ if (!errors) {
+ for (const key in values) {
+ if (typeof (values[key]) === 'object') {
+ values[key] = JSON.stringify(values[key])
}
- WmsMaterialAdd(values).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
}
- })
- },
- handleCancel () {
- this.form.resetFields()
- this.visible = false
- }
+ WmsMaterialAdd(values).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
+ }
+ })
+ },
+ handleCancel() {
+ this.form.resetFields()
+ this.visible = false
}
}
+}
</script>
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 fb67c03..e9a5f21 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -1,12 +1,6 @@
<template>
- <a-modal
- title="鏂板鐗╂枡淇℃伅"
- :width="900"
- :visible="visible"
- :confirmLoading="confirmLoading"
- @ok="handleSubmit"
- @cancel="handleCancel"
- >
+ <a-modal title="鏂板鐗╂枡淇℃伅" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
+ @cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<!-- tab -->
<a-tabs default-active-key="1" @change="callbacktab">
@@ -16,16 +10,12 @@
<!-- 鍩烘湰淇℃伅 -->
<a-form :form="form">
<a-form-item label="鐗╂枡鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input
- placeholder="璇疯緭鍏ョ墿鏂欏悕绉�"
- v-decorator="['materialName', { rules: [{ required: true, message: '璇疯緭鍏ョ墿鏂欏悕绉帮紒' }] }]"
- />
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欏悕绉�"
+ v-decorator="['materialName', { rules: [{ required: true, message: '璇疯緭鍏ョ墿鏂欏悕绉帮紒' }] }]" />
</a-form-item>
<a-form-item label="鐗╂枡缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input
- placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�"
- v-decorator="['materialCode', { rules: [{ required: true, message: '璇疯緭鍏ョ墿鏂欑紪鍙凤紒' }] }]"
- />
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�"
+ v-decorator="['materialCode', { rules: [{ required: true, message: '璇疯緭鍏ョ墿鏂欑紪鍙凤紒' }] }]" />
</a-form-item>
<a-form-item label="ERP缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏RP缂栧彿" v-decorator="['erpCode']" />
@@ -93,7 +83,7 @@
闇�姹傚緟瀹�
</a-tab-pane>
<a-tab-pane key="4" tab="鏇夸唬鍝佺鐞�">
- <add-form-sub ref="addFormWmsSubstituteGood" @ok="handleOk" />
+ <add-form-sub ref="addFormWmsSubstituteGoodRef" @ok="handleOk" />
</a-tab-pane>
<a-tab-pane key="5" tab="瀹㈡埛">
<add-form-base-customer ref="addFormBaseCustomer" @ok="handleOk" />
@@ -149,8 +139,6 @@
if (e == 6) {
this.$nextTick(() => {
// 璋冩帴鍙� 浼犵墿鏂欑被鍨�
- console.log(99999999999999)
- console.log(this.data)
const {
form: { validateFields }
} = this
@@ -162,41 +150,43 @@
values[key] = JSON.stringify(values[key])
}
}
- console.log(22222222222222222)
console.log(values)
this.confirmLoading = false
-
- // var res1 = this.$refs.addFormRef.handleSubmit2()
- // console.log("5555555")
- // console.log( res1 )
-
- // console.log(this.$refs.addFormRef.data)
- // console.log(this.$refs.addFormRef.form.materialType)
-
this.$refs.addFormContainerPackagingRef.initShow(values.materialType)
-
- // WmsMaterialAdd(values).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
- // })
-
- // return values
+
} else {
this.confirmLoading = false
}
})
})
}
+ // 鏇夸唬鍝�
+ if (e == 4) {
+ const {
+ form: { validateFields }
+ } = this
+ this.confirmLoading = true
+ validateFields((errors, values) => {
+ if (!errors) {
+ for (const key in values) {
+ if (typeof values[key] === 'object') {
+ values[key] = JSON.stringify(values[key])
+ }
+ }
+ console.log(66666666666)
+ console.log(values)
+ this.confirmLoading = false
+ debugger
+ // materialName materialCode
+ this.$refs.addFormWmsSubstituteGoodRef.initShow(values.materialCode,values.materialName)
+
+ } else {
+ this.confirmLoading = false
+ }
+ })
+ }
},
- handleOk() {},
+ handleOk() { },
// 鍒濆鍖栨柟娉�
add(record) {
this.visible = true
@@ -246,13 +236,13 @@
})
values.stationNameParameter = values.stationNameParameterArr.join(',')
}
-
+
console.log(6666666666666 + '鎺у埗灞炴��')
console.log(this.$refs.WmsControlRule.selectedRows)
var ControlRuleld = this.$refs.WmsControlRule.selectedRows[0].id
console.log(6666666666666 + '鏇夸唬鍝�')
- console.log(this.$refs.addFormWmsSubstituteGood.list)
+ console.log(this.$refs.addFormWmsSubstituteGoodRef.list)
console.log(6666666666666 + '瀹㈡埛妗ｆ闆嗗悎')
console.log(this.$refs.addFormBaseCustomer.list)
@@ -263,7 +253,7 @@
var param = {
MaterialInput: values,
ControlRuleld: ControlRuleld, //鎺у埗灞炴��
- SubstituteGoodLis: this.$refs.addFormWmsSubstituteGood.list, //鏇夸唬鍝�
+ SubstituteGoodLis: this.$refs.addFormWmsSubstituteGoodRef.list, //鏇夸唬鍝�
BaseCustomerList: this.$refs.addFormBaseCustomer.list, //瀹㈡埛妗ｆ闆嗗悎
ContainerPackagingList: this.$refs.addFormContainerPackagingRef.list //鍖呰鍏崇郴
}
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsContainerPackaging/addFormContainerPackaging.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsContainerPackaging/addFormContainerPackaging.vue
index 53545df..16aa522 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsContainerPackaging/addFormContainerPackaging.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsContainerPackaging/addFormContainerPackaging.vue
@@ -202,7 +202,6 @@
}
},
initShow(materialType) {
- alert(1)
if(materialType==''||materialType==null||materialType==undefined){
this.$message.warning("璇烽�夋嫨鐗╂枡绫诲瀷")
return
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/details.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/details.vue
index 6d76bef..71b86cc 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/details.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/details.vue
@@ -61,7 +61,6 @@
})
},
handleOk(){
- alert("2")
},
handleSubmit() {
const {
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue
index dd3f5fc..f9e969e 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue
@@ -1,24 +1,21 @@
锘�<template>
- <a-modal
- title="鏂板鏇夸唬鍝佺鐞�"
- :width="900"
- :visible="visible"
- :confirmLoading="confirmLoading"
- @ok="handleSubmit"
+ <a-modal title="鏂板鐗╂枡-鏇夸唬鍝佺鐞�" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
- </a-spin> <a-form :form="form">
+ </a-spin> <a-form :form="form">
<a-form-item label="鏇夸唬缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ユ浛浠ｇ紪鍙�"
v-decorator="['substituteCode', { rules: [{ required: true, message: '璇疯緭鍏ユ浛浠ｇ紪鍙凤紒' }] }]" />
</a-form-item>
- <a-form-item label="鐗╂枡缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" v-decorator="['materialCode', { rules: [{ required: true, message: '璇疯緭鍏ョ墿鏂欑紪鍙凤紒' }] }]" />
+ <!-- <a-form-item label="鐗╂枡缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�"
+ v-decorator="['materialCode', { rules: [{ required: true, message: '璇疯緭鍏ョ墿鏂欑紪鍙凤紒' }] }]" />
</a-form-item>
<a-form-item label="鐗╂枡鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" v-decorator="['materialName', { rules: [{ required: true, message: '璇疯緭鍏ョ墿鏂欏悕绉帮紒' }] }]" />
- </a-form-item>
+ <a-input placeholder="璇疯緭鍏ョ墿鏂欏悕绉�"
+ v-decorator="['materialName', { rules: [{ required: true, message: '璇疯緭鍏ョ墿鏂欏悕绉帮紒' }] }]" />
+ </a-form-item> -->
<a-form-item label="鏇夸唬鍝佺墿鏂欑紪鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ユ浛浠ｅ搧鐗╂枡缂栧彿"
v-decorator="['substituteMaterialCode', { rules: [{ required: true, message: '璇疯緭鍏ユ浛浠ｅ搧鐗╂枡缂栧彿锛�' }] }]" />
@@ -35,7 +32,7 @@
<a-switch v-decorator="['isDisabled',{rules: [{ required: true, message: '璇烽�夋嫨鏄惁绂佺敤锛�' }], valuePropName: 'checked'}]" />
</a-form-item> -->
</a-form>
- </a-modal>
+ </a-modal>
</template>
<script>
@@ -64,9 +61,23 @@
// 鍒濆鍖栨柟娉�
add(record) {
this.visible = true
- this.$nextTick(() => {
- });
+ this.$nextTick(() => {
+ this.form.setFieldsValue(
+ {
+ materialCode: record.materialCode,
+ materialName: record.materialName,
+ // id: record.id,
+ substituteCode: "",
+ substituteMaterialCode: "",
+ substituteMaterialName: "",
+ substituteIndex: "",
+ isDisabled: ""
+ }
+ )
+ })
+
+
},
/**
* 鎻愪氦琛ㄥ崟
@@ -81,9 +92,9 @@
values[key] = JSON.stringify(values[key])
}
}
- this.confirmLoading = false
- this.$emit('ok', values)
- this.handleCancel()
+ this.confirmLoading = false
+ this.$emit('ok', values)
+ this.handleCancel()
// WmsSubstituteGoodAdd(values).then((res) => {
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue
index 8f87c49..1d87a39 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue
@@ -7,6 +7,9 @@
<!-- <span style="font-weight:bold;cursor:default;">
<a style="cursor:default;">{{ row.no }}</a>鍗曟嵁璇︽儏
</span> -->
+ 鐗╂枡缂栧彿: {{ materialCode }}
+
+ 鐗╂枡鍚嶇О: {{ materialName }}
<div style="margin-top: 10px;">
<a-table :columns="columns" :data-source="list" row-key="id" :pagination="false" :scroll="{ x: true }">
<template slot="index" slot-scope="text, record, index">{{ index + 1 }}</template>
@@ -89,46 +92,46 @@
sorter: true,
dataIndex: 'substituteCode'
},
- {
- title: '鐗╂枡缂栧彿',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'materialCode'
- },
- {
- title: '鐗╂枡鍚嶇О',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'materialName'
- },
+ // {
+ // title: '鐗╂枡缂栧彿',
+ // align: 'center',
+ // customHeaderCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // customCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // sorter: true,
+ // dataIndex: 'materialCode'
+ // },
+ // {
+ // title: '鐗╂枡鍚嶇О',
+ // align: 'center',
+ // customHeaderCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // customCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // sorter: true,
+ // dataIndex: 'materialName'
+ // },
{
title: '鏇夸唬鍝佺墿鏂欑紪鍙�',
align: 'center',
@@ -231,7 +234,10 @@
this.afterClsoe()
}
},
- initShow() {
+
+ initShow(materialCode,materialName) {
+ this.materialCode = materialCode
+ this.materialName = materialName
this.loading = true
this.getList(() => {
this.loading = false
@@ -258,7 +264,6 @@
},
handleSubmit(item) {
- alert(1)
this.list.push(item)
this.visible = false
},
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addForm.vue
index 6018e7d..b8deaed 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addForm.vue
@@ -98,7 +98,6 @@
});
},
handleSubmit2(){
- alert(this.form)
console.log( 99999999999999)
console.log( this.data)
const { form: { validateFields } } = this
--
Gitblit v1.9.3