From 7867fe8c467bea3ad03e979f0215d175b5b1b94e Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周四, 25 4月 2024 20:09:07 +0800
Subject: [PATCH] 1
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 40 ++++++++++++++++++++++++----------------
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue | 4 ++++
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue | 12 ++++++------
3 files changed, 34 insertions(+), 22 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 4e2c9bb..da96c2d 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -1,9 +1,10 @@
<template>
<a-modal :title="title" :width="1300" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
- @cancel="handleCancel">
+ @cancel="handleCancel" :footer="null">
+
<a-spin :spinning="confirmLoading">
<!-- tab -->
- <a-tabs default-active-key="1" @change="callbacktab">
+ <a-tabs default-active-key="1" @change="callbacktab" v-if="visible">
<a-tab-pane key="1" tab="鍩烘湰淇℃伅">
<!-- <add-form ref="addFormRef" @ok="handleOk" /> -->
<!-- 鍩烘湰淇℃伅 layout="inline" layout="vertical" -->
@@ -28,7 +29,8 @@
</a-form-item> -->
<a-form-item label="鐗╂枡绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select style="width: 100%" placeholder="璇烽�夋嫨鐗╂枡绫诲瀷" v-decorator="['materialType', { rules: [{ required: true, message: '璇烽�夋嫨鐗╂枡绫诲瀷锛�' }] }]">
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨鐗╂枡绫诲瀷"
+ v-decorator="['materialType', { rules: [{ required: true, message: '璇烽�夋嫨鐗╂枡绫诲瀷锛�' }] }]">
<a-select-option v-for="(item, index) in materialTypeData" :key="index" :value="item.id">{{
item.materialTypeName }}</a-select-option>
</a-select>
@@ -104,17 +106,18 @@
<a-form-item v-show="false"><a-input v-decorator="['id']" /></a-form-item>
</a-form>
</a-tab-pane>
+ <!-- force-render 寰堥噸瑕� 涓嶇劧ref瀹炰緥鑾峰彇涓嶅埌 -->
<a-tab-pane key="2" tab="鎺у埗灞炴��" force-render>
- <add-control-rule v-if="visible" ref="WmsControlRuleRef" />
+ <add-control-rule ref="WmsControlRuleRef" />
</a-tab-pane>
- <a-tab-pane key="3" tab="鎵规灞炴��">
+ <a-tab-pane key="3" tab="鎵规灞炴��" force-render>
闇�姹傚緟瀹�
</a-tab-pane>
- <a-tab-pane key="4" tab="鏇夸唬鍝佺鐞�">
- <add-form-sub v-if="visible" ref="addFormWmsSubstituteGoodRef" />
+ <a-tab-pane key="4" tab="鏇夸唬鍝佺鐞�" force-render>
+ <add-form-sub ref="addFormWmsSubstituteGoodRef" />
</a-tab-pane>
- <a-tab-pane key="5" tab="寰�鏉ュ崟浣�">
- <add-form-base-customer v-if="visible" ref="addFormBaseCustomer" />
+ <a-tab-pane key="5" tab="寰�鏉ュ崟浣�" force-render>
+ <add-form-base-customer ref="addFormBaseCustomer" />
</a-tab-pane>
<!-- <a-tab-pane key="6" tab="鍖呰鍏崇郴">
@@ -122,6 +125,12 @@
</a-tab-pane> -->
</a-tabs>
</a-spin>
+
+ <div style="text-align: right;">
+ <a-button @click="handleCancel">鑱屾秷</a-button>
+ <a-button v-if="title != '璇︽儏鐗╂枡淇℃伅璇︽儏'" type="primary" @click="handleSubmit">纭畾</a-button>
+ </div>
+
</a-modal>
</template>
@@ -212,7 +221,7 @@
this.$nextTick(() => {
// let materialCode = this.form.getFieldValue('materialCode');
// let materialName = this.form.getFieldValue('materialName');
- this.$refs.addFormWmsSubstituteGoodRef.initShowSubstituteGood()
+ // this.$refs.addFormWmsSubstituteGoodRef.initShowSubstituteGood()
})
}
},
@@ -231,23 +240,22 @@
...record
})
})
+ this.confirmLoading = true
WmsMaterialDetailList({
id: record.id
})
.then(res => {
if (res.success) {
-
- console.log(res)
this.$nextTick(() => {
+ this.$refs.addFormWmsSubstituteGoodRef.list = res.data.substituteGoodList || []
+ this.$refs.addFormBaseCustomer.list = res.data.baseCustomerList || []
if (res.data.controlRuleDetailList && res.data.controlRuleDetailList.length > 0) {
this.$refs.WmsControlRuleRef.form.setFieldsValue({
...res.data.controlRuleDetailList[0]
})
}
- this.$refs.addFormWmsSubstituteGoodRef.list = res.data.substituteGoodList || []
- this.$refs.addFormBaseCustomer.list = res.data.baseCustomerList || []
- })
+ })
} else {
this.$message.error('璇︽儏澶辫触锛�' + JSON.stringify(res.message))
}
@@ -327,7 +335,7 @@
// console.log(6666666666666 + '鍖呰鍏崇郴')
// console.log(this.$refs.addFormContainerPackagingRef.list)
var a1 = []
- BaseCustomerList.forEach((item)=>{
+ BaseCustomerList.forEach((item) => {
a1.push(item.id)
})
var param = {
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 b751075..8a89037 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
@@ -220,6 +220,10 @@
onClose() {
this.close()
},
+ setData(data){
+ alert(1)
+ this.list = data;
+ },
close() {
this.$emit('update:visible', false)
},
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
index 2b5822b..c72b86a 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
@@ -696,14 +696,14 @@
customHeaderCell: () => {
return {
style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ 'min-width': '180px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ 'min-width': '180px'//鏈�灏忓垪瀹借缃�
}
}
},
@@ -1037,14 +1037,14 @@
customHeaderCell: () => {
return {
style: {
- 'min-width': '80px'//鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '80px'//鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
@@ -1057,14 +1057,14 @@
customHeaderCell: () => {
return {
style: {
- 'min-width': '80px'//鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
customCell: () => {
return {
style: {
- 'min-width': '80px'//鏈�灏忓垪瀹借缃�
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
}
}
},
--
Gitblit v1.9.3