From 0c525ecf57809add2b988f331e22a74022ad1070 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周三, 24 4月 2024 20:25:56 +0800
Subject: [PATCH] 物料
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/index.vue | 4
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue | 4
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 39 ++++++------
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addForm.vue | 10 +--
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/index.vue | 21 +------
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue | 15 ++--
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue | 34 +++++------
7 files changed, 53 insertions(+), 74 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
index 9666405..496e596 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
@@ -176,9 +176,9 @@
<a-button type="info" v-if="hasPerm('WmsMaterial:exportExcel')" icon="download" @click="WmsMaterialToExcel()">
瀵煎嚭
</a-button>
- <a-button type="primary" v-if="hasPerm('WmsMaterial:add')" icon="plus" @click="$refs.addForm.add()">鏂板鐗╂枡淇℃伅琛�</a-button>
+ <!-- <a-button type="primary" v-if="hasPerm('WmsMaterial:add')" icon="plus" @click="$refs.addForm.add()">鏂板鐗╂枡淇℃伅琛�</a-button> -->
<!-- 鑷畾涔� -->
- <a-button type="primary" v-if="hasPerm('WmsMaterial:add')" icon="plus" @click="$refs.tabForm.add()">鏂板tab</a-button>
+ <a-button type="primary" v-if="hasPerm('WmsMaterial:add')" icon="plus" @click="$refs.tabForm.add()">鏂板鐗╂枡淇℃伅</a-button>
</div>
</template>
<span slot="isDisabledscopedSlots" slot-scope="text">
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 b8f8f15..2e2fd21 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -6,7 +6,6 @@
<a-tabs default-active-key="1" @change="callbacktab">
<a-tab-pane key="1" tab="鍩烘湰淇℃伅">
<!-- <add-form ref="addFormRef" @ok="handleOk" /> -->
-
<!-- 鍩烘湰淇℃伅 -->
<a-form :form="form">
<a-form-item label="鐗╂枡鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
@@ -89,16 +88,16 @@
</a-form>
</a-tab-pane>
<a-tab-pane key="2" tab="鎺у埗灞炴��" force-render>
- <add-control-rule ref="WmsControlRule" />
+ <add-control-rule v-if="visible" ref="WmsControlRule" />
</a-tab-pane>
<a-tab-pane key="3" tab="鎵规灞炴��">
闇�姹傚緟瀹�
</a-tab-pane>
<a-tab-pane key="4" tab="鏇夸唬鍝佺鐞�">
- <add-form-sub ref="addFormWmsSubstituteGoodRef" />
+ <add-form-sub v-if="visible" ref="addFormWmsSubstituteGoodRef" />
</a-tab-pane>
<a-tab-pane key="5" tab="瀹㈡埛">
- <add-form-base-customer ref="addFormBaseCustomer" />
+ <add-form-base-customer v-if="visible" ref="addFormBaseCustomer" />
</a-tab-pane>
<!-- <a-tab-pane key="6" tab="鍖呰鍏崇郴">
@@ -160,19 +159,18 @@
callbacktab(e) {
//鍖呰鍏崇郴
- if (e == 6) {
- this.$nextTick(() => {
- let materialType = this.form.getFieldValue('materialType');
- // 璋冩帴鍙� 浼犵墿鏂欑被鍨�
- this.$refs.addFormContainerPackagingRef.initShow(materialType)
-
- })
- }
+ // if (e == 6) {
+ // this.$nextTick(() => {
+ // let materialType = this.form.getFieldValue('materialType');
+ // // 璋冩帴鍙� 浼犵墿鏂欑被鍨�
+ // this.$refs.addFormContainerPackagingRef.initShow(materialType)
+ // })
+ // }
// 鏇夸唬鍝�
if (e == 4) {
- let materialCode = this.form.getFieldValue('materialCode');
- let materialName = this.form.getFieldValue('materialName');
- this.$refs.addFormWmsSubstituteGoodRef.initShow(materialCode, materialName)
+ // let materialCode = this.form.getFieldValue('materialCode');
+ // let materialName = this.form.getFieldValue('materialName');
+ this.$refs.addFormWmsSubstituteGoodRef.initShowSubstituteGood()
}
},
handleOk() { },
@@ -208,7 +206,7 @@
const {
form: { validateFields }
} = this
-
+
validateFields((errors, values) => {
if (!errors) {
// if (this.$getObjectType(values.areas) === 'array') {
@@ -227,18 +225,17 @@
// }
console.log(6666666666666 + '鎺у埗灞炴��')
-
var ControlRuleld = this.$refs.WmsControlRule.form.getFieldValue('id') || ''
let SubstituteGoodList = []
- if(this.$refs.addFormWmsSubstituteGoodRef && this.$refs.addFormWmsSubstituteGoodRef.list.length>0){
+ if (this.$refs.addFormWmsSubstituteGoodRef && this.$refs.addFormWmsSubstituteGoodRef.list.length > 0) {
SubstituteGoodList = this.$refs.addFormWmsSubstituteGoodRef.list
}
console.log(6666666666666 + '鏇夸唬鍝�')
let BaseCustomerList = [];
- if(this.$refs.addFormBaseCustomer && this.$refs.addFormBaseCustomer.list.length>0){
+ if (this.$refs.addFormBaseCustomer && this.$refs.addFormBaseCustomer.list.length > 0) {
BaseCustomerList = this.$refs.addFormWmsSubstituteGoodRef.list
}
console.log(6666666666666 + '瀹㈡埛妗ｆ闆嗗悎')
@@ -286,6 +283,10 @@
handleCancel() {
this.form.resetFields()
this.visible = false
+ // this.$refs.WmsControlRule.form.resetFields()
+ // this.$refs.addFormWmsSubstituteGoodRef.list =[]
+ // this.$refs.addFormWmsSubstituteGoodRef.list =[]
+
}
}
}
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue
index c6a5a60..cffb421 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue
@@ -67,6 +67,9 @@
}
},
methods: {
+ handleOk(){
+
+ },
moment,
// 鍒濆鍖栨柟娉�
add(record) {
@@ -80,14 +83,12 @@
*/
handleSubmit() {
- // if(){
-
- // }
+ if(this.$refs.showList.selectedRows.length!=1){
+ this.$message.warning("鍙兘閫夋嫨涓�涓�")
+ return
+ }
this.visible = false
- let record1 = this.$refs.showList.selectedRows[0];
- let record =record1;
- console.log("5555555")
-debugger
+ let record = this.$refs.showList.selectedRows[0];
this.form.setFieldsValue({
id: record.id,
ruleCode: record.ruleCode,
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/index.vue
index d764dad..e0ad10c 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/index.vue
@@ -1,6 +1,6 @@
锘�<template>
<!-- 鎺у埗灞炴�ц鍒� -->
- <div ref="boxOutWrap" class="boxOutWrap">
+ <div ref="boxOutWrap">
<div ref="boxForm" class="boxForm">
<a-card :bordered="false" :bodyStyle="tstyle">
<div class="table-page-search-wrapper" v-if="hasPerm('WmsControlRule:page')">
@@ -84,7 +84,7 @@
</div>
<a-card :bordered="false">
<s-table ref="table" :columns="columns" :data="loadData" :alert="true" @changeTablePage="pageInfo = $event"
- :scroll="{ x: true, y: tableHeight }" :rowKey="record => record.id"
+ :scroll="{ x: true}" :rowKey="record => record.id"
:rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
<template class="table-operator" slot="operator" v-if="hasPerm('WmsControlRule:add')">
<!-- <div ref="actionBar" class="actionBar">
@@ -124,12 +124,6 @@
</a-popconfirm>
</span> -->
</s-table>
- <add-form ref="addForm" @ok="handleOk" />
- <edit-form ref="editForm" @ok="handleOk" />
- <excel-form ref="excelForm" @ok="handleOk" />
-
- <!-- 鑷畾涔� -->
- <detail-form ref="detailForm" @ok="handleOk" />
</a-card>
</div>
@@ -144,22 +138,13 @@
} from '@/api/modular/main/WmsBase/WmsControlRuleManage'
//鑷畾涔塼able楂樺害
import setTableHtMixin from '@/mixins/handleTableHt.js'
-import addForm from './addForm.vue'
import { exportExcel } from '@/utils/exportToExcel'
import { downloadFile } from '@/utils/util'
-import editForm from './editForm.vue'
-import excelForm from './excelForm.vue'
-import detailForm from './details.vue'
-
export default {
- mixins: [setTableHtMixin],
+ // mixins: [setTableHtMixin],
components: {
STable,
- addForm,
- editForm,
- excelForm,
- detailForm
},
data() {
return {
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 53ff524..20543ce 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
@@ -19,8 +19,8 @@
<a-form-item label="鏇夸唬鍝佺墿鏂欑紪鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<!-- <a-input placeholder="璇疯緭鍏ユ浛浠ｅ搧鐗╂枡缂栧彿"
v-decorator="['substituteMaterialCode', { rules: [{ required: true, message: '璇疯緭鍏ユ浛浠ｅ搧鐗╂枡缂栧彿锛�' }] }]" /> -->
- <a-select style="width: 100%" placeholder="璇烽�夋嫨鏇夸唬鍝佺墿鏂欑紪鍙�" v-decorator="['substituteMaterialCode']">
- <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.materialCode">{{
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨鏇夸唬鍝佺墿鏂欑紪鍙�" v-decorator="['substituteMaterialCode', { rules: [{ required: true, message: '璇疯緭鍏ユ浛浠ｅ搧鐗╂枡缂栧彿锛�' }] }]" >
+ <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.materialCode" >{{
item.materialName }}</a-select-option>
</a-select>
@@ -42,11 +42,7 @@
<script>
import moment from 'moment'
-import {
- WmsSubstituteGoodAdd
-} from '@/api/modular/main/WmsBase/WmsSubstituteGoodManage'
-
-import { WmsMaterialPage, WmsMaterialDelete, WmsMaterialToExcel } from '@/api/modular/main/WmsBase/WmsMaterialManage'
+import { WmsMaterialPage } from '@/api/modular/main/WmsBase/WmsMaterialManage'
export default {
data() {
return {
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 7b61409..b751075 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
@@ -1,5 +1,5 @@
锘�<template>
- <!-- 鏇夸唬鍝佺鐞� -->
+ <!-- 鏇夸唬鍝佺鐞� -琛ㄦ牸鍐呭 -->
<div style="background-color: white">
<!-- <a-spin :spinning="loading"> -->
<div class="wms-task-management-detail-div">
@@ -7,9 +7,8 @@
<!-- <span style="font-weight:bold;cursor:default;">
<a style="cursor:default;">{{ row.no }}</a>鍗曟嵁璇︽儏
</span> -->
- 鐗╂枡缂栧彿: {{ materialCode }}
-
- 鐗╂枡鍚嶇О: {{ materialName }}
+ <!-- 鐗╂枡缂栧彿: {{ 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>
@@ -27,11 +26,8 @@
</a-table>
</div>
</div>
-
<p @click="$refs.showList.add()">鏂板琛�</p>
-
<show-list ref="showList" @ok="handleSubmit" />
-
</div>
</div>
</template>
@@ -235,13 +231,13 @@
}
},
- initShow(materialCode,materialName) {
- this.materialCode = materialCode
- this.materialName = materialName
- this.loading = true
- this.getList(() => {
- this.loading = false
- })
+ initShowSubstituteGood() {
+ // this.materialCode = materialCode
+ // this.materialName = materialName
+ // this.loading = true
+ // this.getList(() => {
+ // this.loading = false
+ // })
},
getList(row) {
let params = { id: row.id }
@@ -264,6 +260,11 @@
},
handleSubmit(item) {
+ var arr1 = this.list.filter(key => key.substituteMaterialCode === item.substituteMaterialCode)
+ if(arr1.length>0){
+ this.$message.warning("宸插瓨鍦ㄧ浉鍚岀墿鏂�")
+ return
+ }
this.list.push(item)
this.visible = false
},
@@ -272,11 +273,6 @@
},
itemDelete(record, index) {
this.list.splice(index, 1)
- },
- addLine(){
- this.list.push({
-
- })
}
}
}
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/index.vue
index 060d952..2d2dfeb 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/index.vue
@@ -1,5 +1,5 @@
锘�<template>
- <div ref="boxOutWrap" class="boxOutWrap">
+ <div ref="boxOutWrap" class="">
<div ref="boxForm" class="boxForm">
<a-card :bordered="false" :bodyStyle="tstyle">
@@ -135,7 +135,7 @@
</div>
<a-card :bordered="false">
<s-table ref="table" :columns="columns" :data="loadData" :alert="true" @changeTablePage="pageInfo = $event"
- :scroll="{ x: true, y: tableHeight }" :rowKey="(record) => record.id"
+ :scroll="{ x: true }" :rowKey="(record) => record.id"
:rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
<template class="table-operator" slot="operator" v-if="hasPerm('BaseCustomer:add')">
<!-- <div ref="actionBar" class="actionBar">
--
Gitblit v1.9.3