From 1f6340d13fc98b189c0ebec5e3eab021d643c574 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周三, 24 4月 2024 21:05:18 +0800
Subject: [PATCH] 细节
---
/dev/null | 232 --------------------------------------
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 67 ++++++++---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue | 4
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue | 4
4 files changed, 53 insertions(+), 254 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsArea/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsArea/addForm.vue
deleted file mode 100644
index b3d4a72..0000000
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsArea/addForm.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-锘�<template>
- <a-modal
- title="鏂板搴撳尯淇℃伅"
- :width="900"
- :visible="visible"
- :confirmLoading="confirmLoading"
- @ok="handleSubmit"
- @cancel="handleCancel">
- <a-spin :spinning="confirmLoading">
- <a-form :form="form">
- <a-form-item label="鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ悕绉�" v-decorator="['areaName', {rules: [{ required: true, message: '璇疯緭鍏ュ悕绉帮紒' }]}]" />
- </a-form-item>
- <a-form-item label="鎻忚堪" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ユ弿杩�" v-decorator="['areaDesc', {rules: [{ required: true, message: '璇疯緭鍏ユ弿杩帮紒' }]}]" />
- </a-form-item>
- <!-- <a-form-item label="鐘舵��" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select style="width: 100%" placeholder="璇烽�夋嫨鐘舵��" v-decorator="['areaStatus', {rules: [{ required: true, message: '璇烽�夋嫨鐘舵�侊紒' }]}]">
- <a-select-option v-for="(item,index) in areaStatusData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
- </a-select>
- </a-form-item> -->
- <a-form-item label="鍒嗙被" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select style="width: 100%" placeholder="璇烽�夋嫨鍒嗙被" v-decorator="['areaType', {rules: [{ required: true, message: '璇烽�夋嫨鍒嗙被锛�' }]}]">
- <a-select-option v-for="(item,index) in areaTypeData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
- </a-select>
- </a-form-item>
- <a-form-item label="鎵�灞炶溅闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select style="width: 100%" placeholder="璇烽�夋嫨鎵�灞炶溅闂�" v-decorator="['workShopType', {rules: [{ required: true, message: '璇烽�夋嫨鎵�灞炶溅闂达紒' }]}]">
- <a-select-option v-for="(item,index) in workShopTypeData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
- </a-select>
- </a-form-item>
- <a-form-item label="鏄惁涓洪挗骞冲彴" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-switch v-decorator="['isSteel', { valuePropName: 'checked' }]" />
- </a-form-item>
- <!-- <a-form-item label="绛炬牳鐘舵��" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select style="width: 100%" placeholder="璇烽�夋嫨绛炬牳鐘舵��" v-decorator="['issueState', {rules: [{ required: true, message: '璇烽�夋嫨绛炬牳鐘舵�侊紒' }]}]">
- <a-select-option v-for="(item,index) in issueStateData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
- </a-select>
- </a-form-item> -->
- </a-form>
- </a-spin>
- </a-modal>
-</template>
-
-<script>
- import {
- WmsAreaAdd
- } from '@/api/modular/main/WmsAreaManage'
- export default {
- data () {
- return {
- labelCol: {
- xs: { span: 24 },
- sm: { span: 5 }
- },
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 15 }
- },
- areaStatusData: [],
- areaTypeData: [],
- workShopTypeData: [],
- //issueStateData: [],
- visible: false,
- confirmLoading: false,
- form: this.$form.createForm(this)
- }
- },
- methods: {
- // 鍒濆鍖栨柟娉�
- add (record) {
- this.visible = true
- this.$nextTick(() => {
-
- });
- const areaStatusOption = this.$options
- this.areaStatusData = areaStatusOption.filters['dictData']('common_status')
- const areaTypeOption = this.$options
- this.areaTypeData = areaTypeOption.filters['dictData']('area_type')
- const workShopTypeOption = this.$options
- this.workShopTypeData = workShopTypeOption.filters['dictData']('les_workshop_type')
- // const issueStateOption = this.$options
- // this.issueStateData = issueStateOption.filters['dictData']('issue_state')
- },
- /**
- * 鎻愪氦琛ㄥ崟
- */
- 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])
- }
- }
- WmsAreaAdd(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/WmsArea/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsArea/editForm.vue
deleted file mode 100644
index 6872344..0000000
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsArea/editForm.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-锘�<template>
- <a-modal
- title="缂栬緫搴撳尯淇℃伅"
- :width="900"
- :visible="visible"
- :confirmLoading="confirmLoading"
- @ok="handleSubmit"
- @cancel="handleCancel">
- <a-spin :spinning="confirmLoading">
- <a-form :form="form">
- <a-form-item label="鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ悕绉�" v-decorator="['areaName']" />
- </a-form-item>
- <a-form-item label="鎻忚堪" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ユ弿杩�" v-decorator="['areaDesc']" />
- </a-form-item>
- <!-- <a-form-item label="鐘舵��" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select style="width: 100%" placeholder="璇烽�夋嫨鐘舵��" v-decorator="['areaStatus', {rules: [{ required: true, message: '璇烽�夋嫨鐘舵�侊紒' }]}]">
- <a-select-option v-for="(item,index) in areaStatusData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
- </a-select>
- </a-form-item> -->
- <a-form-item label="鍒嗙被" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select style="width: 100%" placeholder="璇烽�夋嫨鍒嗙被" v-decorator="['areaType', {rules: [{ required: true, message: '璇烽�夋嫨鍒嗙被锛�' }]}]">
- <a-select-option v-for="(item,index) in areaTypeData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
- </a-select>
- </a-form-item>
- <a-form-item label="鎵�灞炶溅闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select style="width: 100%" placeholder="璇烽�夋嫨鎵�灞炶溅闂�" v-decorator="['workShopType', {rules: [{ required: true, message: '璇烽�夋嫨鎵�灞炶溅闂达紒' }]}]">
- <a-select-option v-for="(item,index) in workShopTypeData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
- </a-select>
- </a-form-item>
- <a-form-item label="鏄惁涓洪挗骞冲彴" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-switch v-decorator="['isSteel', { valuePropName: 'checked' }]" />
- </a-form-item>
- <a-form-item v-show="false">
- <a-input v-decorator="['id']" />
- </a-form-item>
- <!-- <a-form-item label="绛炬牳鐘舵��" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select style="width: 100%" placeholder="璇烽�夋嫨绛炬牳鐘舵��" v-decorator="['issueState', {rules: [{ required: true, message: '璇烽�夋嫨绛炬牳鐘舵�侊紒' }]}]">
- <a-select-option v-for="(item,index) in issueStateData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
- </a-select>
- </a-form-item> -->
- </a-form>
- </a-spin>
- </a-modal>
-</template>
-
-<script>
- import {
- WmsAreaEdit
- } from '@/api/modular/main/WmsAreaManage'
- export default {
- data () {
- return {
- Id: 0,
- labelCol: {
- xs: { span: 24 },
- sm: { span: 5 }
- },
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 15 }
- },
- record: {},
- areaStatusData: [],
- areaTypeData: [],
- workShopTypeData: [],
- //issueStateData: [],
- visible: false,
- confirmLoading: false,
- form: this.$form.createForm(this)
- }
- },
- methods: {
- // 鍒濆鍖栨柟娉�
- edit (record) {
- this.visible = true;
- this.Id = record.id;
- this.$nextTick(() => {
- });
- //娣卞害鎷疯礉 绉婚櫎VUE鐨勭洃鍚紝闃叉INDEX椤甸潰鍊煎彉鍔�
- this.record = JSON.parse(JSON.stringify(record))
- const areaStatusOption = this.$options
- this.areaStatusData = areaStatusOption.filters['dictData']('common_status')
- const areaTypeOption = this.$options
- this.areaTypeData = areaTypeOption.filters['dictData']('area_type')
- const workShopTypeOption = this.$options
- this.workShopTypeData = workShopTypeOption.filters['dictData']('les_workshop_type')
- // const issueStateOption = this.$options
- // this.issueStateData = issueStateOption.filters['dictData']('issue_state')
- this.$nextTick(() => {
- this.form.setFieldsValue(
- {
- id: record.id,
- areaName: record.areaName,
- areaDesc: record.areaDesc,
- areaStatus: record.areaStatus,
- areaType: record.areaType,
- isSteel: record.isSteel,
- workShopType: record.workShopType,
- issueState: record.issueState
- }
- )
- })
- },
- handleSubmit () {
- const { form: { validateFields } } = this
- this.confirmLoading = true
- validateFields((errors, values) => {
- if (!errors) {
- for (const key in values) {
- if (values[key] == null) continue
- if (typeof (values[key]) === 'object') {
- values[key] = JSON.stringify(values[key])
- this.record[key] = values[key]
- } else {
- this.record[key] = values[key]
- }
- }
- WmsAreaEdit(this.record).then((res) => {
- if (res.success) {
- this.$message.success('缂栬緫鎴愬姛')
- this.confirmLoading = false
- this.$emit('ok', this.record)
- 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/WmsArea/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsArea/index.vue
deleted file mode 100644
index 9d1db00..0000000
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsArea/index.vue
+++ /dev/null
@@ -1,232 +0,0 @@
-锘�<template>
- <div>
- <a-card :bordered="false" :bodyStyle="tstyle">
- <div class="table-page-search-wrapper" v-if="hasPerm('WmsArea:page')">
- <a-form layout="inline">
- <a-row :gutter="48">
- <a-col :md="8" :sm="24">
- <a-form-item label="鍚嶇О">
- <a-input v-model="queryParam.areaName" allow-clear placeholder="璇疯緭鍏ュ悕绉�"/>
- </a-form-item>
- </a-col>
- <a-col :md="8" :sm="24">
- <a-form-item label="鍒嗙被">
- <a-select :allowClear="true" style="width: 100%" v-model="queryParam.areaType" placeholder="璇烽�夋嫨鍒嗙被">
- <a-select-option v-for="(item,index) in areaTypeData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- <template v-if="advanced">
- <!-- <a-col :md="8" :sm="24">
- <a-form-item label="鐘舵��">
- <a-select :allowClear="true" style="width: 100%" v-model="queryParam.areaStatus" placeholder="璇烽�夋嫨鐘舵��">
- <a-select-option v-for="(item,index) in areaStatusData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
- </a-select>
- </a-form-item>
- </a-col> -->
- <a-col :md="8" :sm="24">
- <a-form-item label="鎵�灞炶溅闂�">
- <a-select :allowClear="true" style="width: 100%" v-model="queryParam.workShopType" placeholder="璇烽�夋嫨鎵�灞炶溅闂�">
- <a-select-option v-for="(item,index) in workShopTypeData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- <!-- <a-col :md="8" :sm="24">
- <a-form-item label="绛炬牳鐘舵��">
- <a-select :allowClear="true" style="width: 100%" v-model="queryParam.issueState" placeholder="璇烽�夋嫨绛炬牳鐘舵��">
- <a-select-option v-for="(item,index) in issueStateData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
- </a-select>
- </a-form-item>
- </a-col> -->
- </template>
- <a-col :md="8" :sm="24" >
- <span class="table-page-search-submitButtons">
- <a-button type="primary" @click="$refs.table.refresh(true)" >鏌ヨ</a-button>
- <a-button style="margin-left: 8px" @click="() => queryParam = {}">閲嶇疆</a-button>
- <a @click="toggleAdvanced" style="margin-left: 8px"> {{ advanced ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="advanced ? 'up' : 'down'"/>
- </a>
- </span>
- </a-col>
- </a-row>
- </a-form>
- </div>
- </a-card>
- <a-card :bordered="false">
- <s-table
- ref="table"
- :columns="columns"
- :data="loadData"
- :alert="true"
- :rowKey="(record) => record.id"
- :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
- <template class="table-operator" slot="operator" v-if="hasPerm('WmsArea:add')" >
- <a-button type="info" v-if="hasPerm('sysExcelTemplate:importExcel')" icon="upload" @click="$refs.excelForm.index()">
- 瀵煎叆
- </a-button>
- <a-button type="info" v-if="hasPerm('wmsArea:exportExcel')" icon="download" @click="wmsAreaToExcel()">
- 瀵煎嚭
- </a-button>
- <a-button type="primary" v-if="hasPerm('WmsArea:add')" icon="plus" @click="$refs.addForm.add()">鏂板</a-button>
- </template>
- <span slot="areaStatusscopedSlots" slot-scope="text">
- {{ 'common_status' | dictType(text) }}
- </span>
- <span slot="areaTypescopedSlots" slot-scope="text">
- {{ 'area_type' | dictType(text) }}
- </span>
- <span slot="workShopTypescopedSlots" slot-scope="text">
- {{ 'les_workshop_type' | dictType(text) }}
- </span>
- <!-- <span slot="issueStatescopedSlots" slot-scope="text">
- {{ 'issue_state' | dictType(text) }}
- </span> -->
- <span slot="action" slot-scope="text, record">
- <a v-if="hasPerm('WmsArea:edit')" @click="$refs.editForm.edit(record)">缂栬緫</a>
- <a-divider type="vertical" v-if="hasPerm('WmsArea:edit') & hasPerm('WmsArea:delete')"/>
- <a-popconfirm v-if="hasPerm('WmsArea:delete')" placement="topRight" title="纭鍒犻櫎锛�" @confirm="() => WmsAreaDelete(record)">
- <a>鍒犻櫎</a>
- </a-popconfirm>
- </span>
- </s-table>
- <add-form ref="addForm" @ok="handleOk" />
- <edit-form ref="editForm" @ok="handleOk" />
- </a-card>
- </div>
-</template>
-<script>
- import { STable } from '@/components'
- import { WmsAreaPage, WmsAreaDelete } from '@/api/modular/main/WmsAreaManage'
- import addForm from './addForm.vue'
- import editForm from './editForm.vue'
- export default {
- components: {
- STable,
- addForm,
- editForm
- },
- data () {
- return {
- advanced: false, // 楂樼骇鎼滅储 灞曞紑/鍏抽棴
- queryParam: {},
- columns: [
- {
- title: '鍚嶇О',
- align: 'center',
- dataIndex: 'areaName'
- },
- {
- title: '鎻忚堪',
- align: 'center',
- dataIndex: 'areaDesc'
- },
- {
- title: '鍒嗙被',
- align: 'center',
- dataIndex: 'areaType',
- scopedSlots: { customRender: 'areaTypescopedSlots' }
- },
- // {
- // title: '鐘舵��',
- // align: 'center',
- // dataIndex: 'areaStatus',
- // scopedSlots: { customRender: 'areaStatusscopedSlots' }
- // },
- {
- title: '鏄惁涓洪挗骞冲彴',
- align: 'center',
- customRender: (value) => (value ? <a-tag color="#87d068">鏄�</a-tag> : <a-tag color="gray">鍚�</a-tag>),
- dataIndex: 'isSteel'
- },
- {
- title: '鎵�灞炶溅闂�',
- align: 'center',
- dataIndex: 'workShopType',
- scopedSlots: { customRender: 'workShopTypescopedSlots' }
- },
- // {
- // title: '绛炬牳鐘舵��',
- // align: 'center',
- // dataIndex: 'issueState',
- // scopedSlots: { customRender: 'issueStatescopedSlots' }
- // }
- ],
- tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
- // 鍔犺浇鏁版嵁鏂规硶 蹇呴』涓� Promise 瀵硅薄
- loadData: parameter => {
- return WmsAreaPage(Object.assign(parameter, this.queryParam)).then((res) => {
- res.data.rows = res.data.rows.map((_obj)=>{
- _obj.areaStatus= _obj.areaStatus.toString()
- _obj.areaType= _obj.areaType.toString()
- _obj.workShopType= _obj.workShopType.toString()
- _obj.issueState= _obj.issueState.toString()
- return _obj;
- })
- return res.data
- })
- },
- areaStatusData: [],
- areaTypeData: [],
- workShopTypeData: [],
- issueStateData: [],
- selectedRowKeys: [],
- selectedRows: []
- }
- },
- created () {
- if (this.hasPerm('WmsArea:edit') || this.hasPerm('WmsArea:delete')) {
- this.columns.push({
- title: '鎿嶄綔',
- width: '150px',
- dataIndex: 'action',
- scopedSlots: { customRender: 'action' }
- })
- }
- const areaStatusOption = this.$options
- this.areaStatusData = areaStatusOption.filters['dictData']('common_status')
- const areaTypeOption = this.$options
- this.areaTypeData = areaTypeOption.filters['dictData']('area_type')
- const workShopTypeOption = this.$options
- this.workShopTypeData = workShopTypeOption.filters['dictData']('les_workshop_type')
- // const issueStateOption = this.$options
- // this.issueStateData = issueStateOption.filters['dictData']('issue_state')
- },
- methods: {
- /**
- * 鏌ヨ鍙傛暟缁勮
- */
- switchingDate () {
- const obj = JSON.parse(JSON.stringify(this.queryParam))
- return obj
- },
- WmsAreaDelete (record) {
- WmsAreaDelete(record).then((res) => {
- if (res.success) {
- this.$message.success('鍒犻櫎鎴愬姛')
- this.$refs.table.refresh()
- } else {
- this.$message.error('鍒犻櫎澶辫触') // + res.message
- }
- })
- },
- toggleAdvanced () {
- this.advanced = !this.advanced
- },
- handleOk () {
- this.$refs.table.refresh()
- },
- onSelectChange (selectedRowKeys, selectedRows) {
- this.selectedRowKeys = selectedRowKeys
- this.selectedRows = selectedRows
- }
- }
- }
-</script>
-<style lang="less">
- .table-operator {
- margin-bottom: 18px;
- }
- button {
- margin-right: 8px;
- }
-</style>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue
index 7561b4b..e6b3f1f 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue
@@ -21,10 +21,10 @@
<a-form-item label="搴撳尯鎻忚堪" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ュ簱鍖烘弿杩�" v-decorator="['areaDesc']" />
</a-form-item>
- <a-form-item label="搴撳尯鐘舵��" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <!-- <a-form-item label="搴撳尯鐘舵��" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input-number placeholder="璇疯緭鍏ュ簱鍖虹姸鎬�" style="width: 100%"
v-decorator="['areaStatus', { rules: [{ required: true, message: '璇疯緭鍏ュ簱鍖虹姸鎬侊紒' }] }]" />
- </a-form-item>
+ </a-form-item> -->
<a-form-item label="ERP浠ｇ爜" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏RP浠ｇ爜"
v-decorator="['erpCode', { rules: [{ required: true, message: '璇疯緭鍏RP浠ｇ爜锛�' }] }]" />
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue
index 0e283e7..627322b 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue
@@ -23,9 +23,9 @@
<a-form-item label="搴撳尯鎻忚堪" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ュ簱鍖烘弿杩�" v-decorator="['areaDesc']" />
</a-form-item>
- <a-form-item label="搴撳尯鐘舵��" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <!-- <a-form-item label="搴撳尯鐘舵��" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input-number placeholder="璇疯緭鍏ュ簱鍖虹姸鎬�" style="width: 100%" v-decorator="['areaStatus', {rules: [{required: true, message: '璇疯緭鍏ュ簱鍖虹姸鎬侊紒'}]}]" />
- </a-form-item>
+ </a-form-item> -->
<a-form-item label="ERP浠ｇ爜" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏RP浠ｇ爜" v-decorator="['erpCode', {rules: [{required: true, message: '璇疯緭鍏RP浠ｇ爜锛�'}]}]" />
</a-form-item>
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 9b4f0fc..22e6397 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -34,12 +34,6 @@
</a-select>
</a-form-item>
- <!-- <a-col :md="8" :sm="24">
-
- </a-col> -->
-
-
-
<a-form-item label="鐗╂枡缁�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ョ墿鏂欑粍" v-decorator="['materialGroup']" />
</a-form-item>
@@ -47,7 +41,15 @@
<a-input placeholder="璇疯緭鍏BC鍒嗙被鍚嶇О" v-decorator="['aBCClassName']" />
</a-form-item> -->
<a-form-item label="ABC鍒嗙被" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input-number placeholder="璇疯緭鍏BC鍒嗙被" style="width: 100%" v-decorator="['aBCClass']" />
+ <!-- <a-input-number placeholder="璇疯緭鍏BC鍒嗙被" style="width: 100%" v-decorator="['aBCClass']" /> -->
+
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨ABC鍒嗙被" v-decorator="['factoryCode']">
+ <a-select-option v-for="(item, index) in materialTypeData2" :key="index" :value="Number(item.code)">{{
+ item.name }}</a-select-option>
+ </a-select>
+
+
+
</a-form-item>
<a-form-item label="鐗╂枡瑙勬牸" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ョ墿鏂欒鏍�" v-decorator="['materialSpec']" />
@@ -56,10 +58,24 @@
<a-input placeholder="璇疯緭鍏ラ粯璁ゅ叆搴撳簱浣�" v-decorator="['inPlaceCode']" />
</a-form-item>
<a-form-item label="搴撳瓨鍗曚綅" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ簱瀛樺崟浣�" v-decorator="['materialUnit']" />
+ <!-- <a-input placeholder="璇疯緭鍏ュ簱瀛樺崟浣�" v-decorator="['materialUnit']" /> -->
+
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨搴撳瓨鍗曚綅" v-decorator="['materialUnit']">
+ <a-select-option v-for="(item, index) in selectTypeData1" :key="index" :value="Number(item.unitCode)">{{
+ item.unitName }}</a-select-option>
+ </a-select>
+
+
</a-form-item>
<a-form-item label="閲囪喘鍗曚綅" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ラ噰璐崟浣�" v-decorator="['pOUnit']" />
+ <!-- <a-input placeholder="璇疯緭鍏ラ噰璐崟浣�" v-decorator="['pOUnit']" /> -->
+
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨閲囪喘鍗曚綅" v-decorator="['pOUnit']">
+ <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="Number(item.unitCode)">{{
+ item.unitName }}</a-select-option>
+ </a-select>
+
+
</a-form-item>
<a-form-item label="棰滆壊" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ラ鑹�" v-decorator="['color']" />
@@ -115,7 +131,7 @@
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'
export default {
components: {
addForm,
@@ -149,12 +165,27 @@
}
},
methods: {
+ // 鐗╂枡绫诲瀷
materialTypeDataList() {
materialTypeDataList().then((d) => {
this.materialTypeData = d.data || []
}).catch(() => {
})
+ // 搴撳瓨鍗曚綅
+ WmsUnitPage().then((d) => {
+ this.selectTypeData1 = d.data.rows || []
+ }).catch(() => {
+
+ })
+
+ // 閲囪喘鍗曚綅
+ WmsUnitPage().then((d) => {
+ this.selectTypeData2 = d.data.rows || []
+ }).catch(() => {
+
+ })
+
},
callbacktab(e) {
@@ -177,13 +208,13 @@
// 鍒濆鍖栨柟娉�
add(record) {
this.visible = true
- this.$nextTick(() => {
- // this.getSelects()
- })
- // const materialTypeOption = this.$options
- // this.materialTypeData = materialTypeOption.filters['dictData']('material_type')
- const inspectionMethodOption = this.$options
- this.inspectionMethodData = inspectionMethodOption.filters['dictData']('material_inspection')
+ // this.$nextTick(() => {
+ // // this.getSelects()
+ // })
+ const materialTypeOption = this.$options
+ this.materialTypeData2 = materialTypeOption.filters['dictData']('abc_class')
+ // const inspectionMethodOption = this.$options
+ // this.inspectionMethodData = inspectionMethodOption.filters['dictData']('material_inspection')
},
getSelects() {
if (this.areaNameParameterData.length <= 0 || this.stationNameParameterData.length <= 0) {
@@ -241,7 +272,7 @@
let BaseCustomerList = [];
if (this.$refs.addFormBaseCustomer && this.$refs.addFormBaseCustomer.list.length > 0) {
BaseCustomerList = this.$refs.addFormBaseCustomer.list
-
+
}
console.log(6666666666666 + '瀹㈡埛妗ｆ闆嗗悎')
--
Gitblit v1.9.3