iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
@@ -23,10 +23,18 @@ </a-col> <a-col :md="8" :sm="24"> <a-form-item label="物料类型名称"> <a-input v-model="queryParam.materialTypeName" allow-clear placeholder="请输入物料类型名称" /> <!-- <a-input v-model="queryParam.materialTypeName" allow-clear placeholder="请输入物料类型名称" /> --> <a-select style="width: 100%" placeholder="请选择物料类型" v-model="queryParam.materialTypeName"> <a-select-option v-for="(item, index) in materialTypeData" :key="index" :value="item.materialTypeName">{{ item.materialTypeName }}</a-select-option> </a-select> </a-form-item> </a-col> <!-- <a-col :md="8" :sm="24"> <a-form-item label="物料类型描述"> <a-input v-model="queryParam.materialTypeDescr" allow-clear @@ -44,11 +52,12 @@ <a-input v-model="queryParam.materialGroup" allow-clear placeholder="请输入物料组" /> </a-form-item> </a-col> <a-col :md="8" :sm="24"> <!-- <a-col :md="8" :sm="24"> <a-form-item label="ABC分类名称"> <a-input v-model="queryParam.abcClassName" allow-clear placeholder="请输入ABC分类名称" /> </a-form-item> </a-col><a-col :md="8" :sm="24"> </a-col> --> <a-col :md="8" :sm="24"> <a-form-item label="ABC分类"> <a-input-number v-model="queryParam.abcClass" style="width: 100%" allow-clear placeholder="请输入ABC分类" /> @@ -223,7 +232,7 @@ <script> import { STable } from '@/components' import moment from 'moment' import { WmsMaterialPage, WmsMaterialDelete, WmsMaterialToExcel } from '@/api/modular/main/WmsBase/WmsMaterialManage' import { WmsMaterialPage, WmsMaterialDelete, WmsMaterialToExcel ,materialTypeDataList} from '@/api/modular/main/WmsBase/WmsMaterialManage' //自定义table高度 import setTableHtMixin from '@/mixins/handleTableHt.js' import addForm from './addForm.vue' @@ -768,7 +777,8 @@ }) }, selectedRowKeys: [], selectedRows: [] selectedRows: [], materialTypeData:[] } }, created() { @@ -804,7 +814,11 @@ }, false ) materialTypeDataList().then((d) => { this.materialTypeData = d.data || [] }).catch(() => { }) }, methods: { moment, iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -154,7 +154,7 @@ addControlRule }, created() { this.materialTypeDataList() const materialTypeOption = this.$options this.materialTypeData2 = materialTypeOption.filters['dictData']('abc_class_type') }, @@ -191,20 +191,13 @@ }).catch(() => { }) // 库存单位 // 库存单位 采购单位 WmsUnitPage().then((d) => { this.selectTypeData1 = d.data.rows || [] }).catch(() => { }) // 采购单位 WmsUnitPage().then((d) => { this.selectTypeData2 = d.data.rows || [] }).catch(() => { }) }, callbacktab(e) { @@ -228,6 +221,7 @@ handleOk() { }, // 初始化方法 add(record, type) { this.materialTypeDataList() this.visible = true if (record) {//编辑 if (type == '详情') { iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/addForm.vue
@@ -168,9 +168,9 @@ const placeStatusOption = this.$options this.placeStatusData = placeStatusOption.filters['dictData']('place_status') WmsAreaPage().then(res => { this.WmsAreaData = res.data.rows }) // WmsAreaPage().then(res => { // this.WmsAreaData = res.data.rows // }) }, /** * 提交表单 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/editForm.vue
@@ -153,7 +153,8 @@ placeStatusData: [], visible: false, confirmLoading: false, form: this.$form.createForm(this) form: this.$form.createForm(this), WmsAreaData:[] } }, iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsPlace/index.vue
@@ -110,16 +110,10 @@ <a-input v-model="queryParam.environment" allow-clear placeholder="请输入库存环境" /> </a-form-item> </a-col> <a-col :md="8" :sm="24"> <a-form-item label="库区编号"> <a-input v-model="queryParam.areaCode" allow-clear placeholder="请输入库区编号" /> </a-form-item> </a-col> <a-col :md="8" :sm="24"> <a-form-item label="所在库区"> <!-- <a-input v-model="queryParam.areaId" allow-clear placeholder="请输入所在库区" /> --> <a-select v-model="queryParam.areaCode" style="width: 100%" placeholder="请选择所在库区"> <a-select-option v-for="(item, index) in WmsAreaData" :key="index" :value="item.id">{{ item.areaName @@ -1264,8 +1258,8 @@ }, false ) WmsAreaPage().then(res => { this.WmsAreaData = res.data.rows WmsAreaPage().then(d => { this.WmsAreaData = d.data.rows this.$refs.addForm.WmsAreaData = d.data.rows || [] }) },