From 37578dc41551e36ee2ef08fe57114173661949f5 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 25 4月 2024 10:35:07 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Web/src/mixins/handleTableHt.js | 6
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/addForm.vue | 37 +
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/index.vue | 953 ++++++++++++++++----------------
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/editForm.vue | 190 +++---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue | 222 ++++---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/addForm.vue | 2
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue | 13
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue | 211 +++---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/addForm.vue | 16
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/editForm.vue | 55 +
10 files changed, 900 insertions(+), 805 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/mixins/handleTableHt.js b/iWare_RawMaterialWarehouse_Web/src/mixins/handleTableHt.js
index 12af838..82ea67d 100644
--- a/iWare_RawMaterialWarehouse_Web/src/mixins/handleTableHt.js
+++ b/iWare_RawMaterialWarehouse_Web/src/mixins/handleTableHt.js
@@ -77,15 +77,15 @@
handleTableHt() {
this.$nextTick(() => {
if (!this.$refs.boxOutWrap) {
- console.log("娌℃湁DOM:boxOutWrap,鏃犳硶鑷姩璁＄畻琛ㄦ牸楂樺害")
+ // console.log("娌℃湁DOM:boxOutWrap,鏃犳硶鑷姩璁＄畻琛ㄦ牸楂樺害")
return
}
if (!this.$refs.boxForm) {
- console.log("娌℃湁DOM:boxForm,鏃犳硶鑷姩璁＄畻琛ㄦ牸楂樺害")
+ // console.log("娌℃湁DOM:boxForm,鏃犳硶鑷姩璁＄畻琛ㄦ牸楂樺害")
return
}
if (!this.$refs.actionBar) {
- console.log("娌℃湁DOM:actionBar,鏃犳硶鑷姩璁＄畻琛ㄦ牸楂樺害")
+ // console.log("娌℃湁DOM:actionBar,鏃犳硶鑷姩璁＄畻琛ㄦ牸楂樺害")
return
}
let mainTableHt = 0
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 e6b3f1f..c02c4a8 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue
@@ -92,6 +92,12 @@
form: this.$form.createForm(this)
}
},
+ created() {
+ WmsWarehousePage().then((d) => {
+ this.warehouseIdData = d.data.rows || []
+ }).catch(() => {
+ })
+ },
methods: {
moment,
// 鍒濆鍖栨柟娉�
@@ -102,12 +108,7 @@
});
// const warehouseIdOption = this.$options
// this.warehouseIdData = warehouseIdOption.filters['dictData']('area_type')
- WmsWarehousePage().then((d) => {
- // this.selectTypeData = d.data || []
- this.warehouseIdData = d.data.rows || []
- }).catch(() => {
-
- })
+
},
/**
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 627322b..89430a3 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/editForm.vue
@@ -1,53 +1,60 @@
锘�<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-item label="搴撳尯缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ簱鍖虹紪鐮�" v-decorator="['areaCode', {rules: [{required: true, message: '璇疯緭鍏ュ簱鍖虹紪鐮侊紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ュ簱鍖虹紪鐮�"
+ v-decorator="['areaCode', { rules: [{ required: true, message: '璇疯緭鍏ュ簱鍖虹紪鐮侊紒' }] }]" />
</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 placeholder="璇疯緭鍏ヤ粨搴撶紪鍙�" v-decorator="['warehouseCode', {rules: [{required: true, message: '璇疯緭鍏ヤ粨搴撶紪鍙凤紒'}]}]" />
- </a-form-item>
+ </a-form-item> -->
<a-form-item label="浠撳簱鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ヤ粨搴撳悕绉�" v-decorator="['warehouseName', {rules: [{required: true, message: '璇疯緭鍏ヤ粨搴撳悕绉帮紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ヤ粨搴撳悕绉�"
+ v-decorator="['warehouseName', { rules: [{ required: true, message: '璇疯緭鍏ヤ粨搴撳悕绉帮紒' }] }]" />
</a-form-item>
<a-form-item label="搴撳尯鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ簱鍖哄悕绉�" v-decorator="['areaName', {rules: [{required: true, message: '璇疯緭鍏ュ簱鍖哄悕绉帮紒'}]}]" />
+ <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']" />
</a-form-item>
<!-- <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-input-number placeholder="璇疯緭鍏ュ簱鍖虹姸鎬�" style="width: 100%"
+ v-decorator="['areaStatus', { 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', {rules: [{required: true, message: '璇疯緭鍏RP浠ｇ爜锛�'}]}]" />
+ <a-input placeholder="璇疯緭鍏RP浠ｇ爜"
+ v-decorator="['erpCode', { rules: [{ required: true, message: '璇疯緭鍏RP浠ｇ爜锛�' }] }]" />
</a-form-item>
<a-form-item label="鎵�灞炰粨搴�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select style="width: 100%" placeholder="璇烽�夋嫨鎵�灞炰粨搴�" v-decorator="['warehouseId', {rules: [{ required: true, message: '璇烽�夋嫨鎵�灞炰粨搴擄紒' }]}]">
- <a-select-option v-for="(item,index) in warehouseIdData" :key="index" :value="Number(item.code)">{{ item.name }}</a-select-option>
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨鎵�灞炰粨搴�"
+ v-decorator="['warehouseId', { rules: [{ required: true, message: '璇烽�夋嫨鎵�灞炰粨搴擄紒' }] }]">
+ <a-select-option v-for="(item, index) in warehouseIdData" :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="['isBarcodeLevelControl',{rules: [{ required: true, message: '璇烽�夋嫨闆朵欢绾х鎺э紒' }], valuePropName: 'checked'}]" />
+ <a-switch
+ v-decorator="['isBarcodeLevelControl', { rules: [{ required: true, message: '璇烽�夋嫨闆朵欢绾х鎺э紒' }], valuePropName: 'checked' }]" />
</a-form-item>
<a-form-item label="妫�楠屽厛杩涘厛鍑�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-switch v-decorator="['isFIFO',{rules: [{ required: true, message: '璇烽�夋嫨妫�楠屽厛杩涘厛鍑猴紒' }], valuePropName: 'checked'}]" />
+ <a-switch
+ v-decorator="['isFIFO', { rules: [{ required: true, message: '璇烽�夋嫨妫�楠屽厛杩涘厛鍑猴紒' }], valuePropName: 'checked' }]" />
</a-form-item>
<a-form-item label="闆朵欢绾х鎺�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-switch v-decorator="['isPartLevelControl',{rules: [{ required: true, message: '璇烽�夋嫨闆朵欢绾х鎺э紒' }], valuePropName: 'checked'}]" />
+ <a-switch
+ v-decorator="['isPartLevelControl', { rules: [{ required: true, message: '璇烽�夋嫨闆朵欢绾х鎺э紒' }], valuePropName: 'checked' }]" />
</a-form-item>
<a-form-item label="鍏佽娣锋穯" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-switch v-decorator="['isAllowConfusion',{rules: [{ required: true, message: '璇烽�夋嫨鍏佽娣锋穯锛�' }], valuePropName: 'checked'}]" />
+ <a-switch
+ v-decorator="['isAllowConfusion', { rules: [{ required: true, message: '璇烽�夋嫨鍏佽娣锋穯锛�' }], valuePropName: 'checked' }]" />
</a-form-item>
<a-form-item label="鍏佽璐熷簱瀛�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-switch v-decorator="['isAllowNegativeInventory',{rules: [{ required: true, message: '璇烽�夋嫨鍏佽璐熷簱瀛橈紒' }], valuePropName: 'checked'}]" />
+ <a-switch
+ v-decorator="['isAllowNegativeInventory', { rules: [{ required: true, message: '璇烽�夋嫨鍏佽璐熷簱瀛橈紒' }], valuePropName: 'checked' }]" />
</a-form-item>
<a-form-item label="鏄惁铏氭嫙" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-switch v-decorator="['isVirtually', { valuePropName: 'checked' }]" />
@@ -55,7 +62,6 @@
<a-form-item label="鏄惁绂佺敤" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-switch v-decorator="['isDisabled', { valuePropName: 'checked' }]" />
</a-form-item>
- <a-form-item v-show="false"><a-input v-decorator="['id']" /></a-form-item>
</a-form>
</a-spin>
</a-modal>
@@ -63,98 +69,91 @@
<script>
import moment from 'moment'
- import {
+import {
WmsAreaEdit
- } from '@/api/modular/main/WmsBase/WmsAreaManage'
- export default {
- data () {
- return {
- Id: 0,
- labelCol: {
- xs: { span: 24 },
- sm: { span: 5 }
+} from '@/api/modular/main/WmsBase/WmsAreaManage'
+import { WmsWarehousePage, WmsWarehouseDelete, WmsWarehouseToExcel } from '@/api/modular/main/WmsBase/WmsWarehouseManage'
+
+export default {
+ data() {
+ return {
+ Id: 0,
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 }
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 15 }
+ },
+ record: {},
+ warehouseIdData: [],
+ visible: false,
+ confirmLoading: false,
+ form: this.$form.createForm(this)
+ }
},
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 15 }
+ created() {
+ WmsWarehousePage().then((d) => {
+ this.warehouseIdData = d.data.rows || []
+ }).catch(() => {
+ })
},
- record: {},
- warehouseIdData: [],
- visible: false,
- confirmLoading: false,
- form: this.$form.createForm(this)
- }
+ methods: {
+ moment,
+ // 鍒濆鍖栨柟娉�
+ edit(record) {
+ this.visible = true;
+ this.Id = record.id;
+ this.$nextTick(() => {
+ });
+ //娣卞害鎷疯礉 绉婚櫎VUE鐨勭洃鍚紝闃叉INDEX椤甸潰鍊煎彉鍔�
+ this.record = JSON.parse(JSON.stringify(record))
+ // const warehouseIdOption = this.$options
+ // this.warehouseIdData = warehouseIdOption.filters['dictData']('area_type')
+ this.$nextTick(() => {
+ this.form.setFieldsValue(
+ {
+ ...record
+ }
+ )
+ })
},
- methods: {
- moment,
- // 鍒濆鍖栨柟娉�
- edit (record) {
- this.visible = true;
- this.Id = record.id;
- this.$nextTick(() => {
- });
- //娣卞害鎷疯礉 绉婚櫎VUE鐨勭洃鍚紝闃叉INDEX椤甸潰鍊煎彉鍔�
- this.record = JSON.parse(JSON.stringify(record))
- const warehouseIdOption = this.$options
- this.warehouseIdData = warehouseIdOption.filters['dictData']('area_type')
- this.$nextTick(() => {
- this.form.setFieldsValue(
- {
- id: record.id,
- areaCode: record.areaCode,
- warehouseCode: record.warehouseCode,
- warehouseName: record.warehouseName,
- areaName: record.areaName,
- areaDesc: record.areaDesc,
- areaStatus: record.areaStatus,
- erpCode: record.erpCode,
- warehouseId: record.warehouseId,
- isBarcodeLevelControl: record.isBarcodeLevelControl,
- isFIFO: record.isFIFO,
- isPartLevelControl: record.isPartLevelControl,
- isAllowConfusion: record.isAllowConfusion,
- isAllowNegativeInventory: record.isAllowNegativeInventory,
- isVirtually: record.isVirtually,
- isDisabled: record.isDisabled
+ 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]
}
- )
- })
- },
- 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) => {
+ }
+ WmsAreaEdit(this.record).then((res) => {
+ if (res.success) {
+ this.$message.success('缂栬緫鎴愬姛')
this.confirmLoading = false
- })
- }else{
+ this.$emit('ok', this.record)
+ this.handleCancel()
+ } else {
+ this.$message.error('缂栬緫澶辫触锛�' + JSON.stringify(res.message))
+ }
+ }).finally((res) => {
this.confirmLoading = false
- }
- });
- },
- handleCancel () {
- this.form.resetFields()
- this.visible = false
- }
+ })
+ } else {
+ this.confirmLoading = false
+ }
+ });
+ },
+ handleCancel() {
+ this.form.resetFields()
+ this.visible = false
}
}
+}
</script>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/addForm.vue
index 653979d..478e054 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/addForm.vue
@@ -98,15 +98,10 @@
}
},
- methods: {
- moment,
- // 鍒濆鍖栨柟娉�
- add(record) {
- this.visible = true;
- WmsContainerTypePage().then((d) => {
+ created() {
+ WmsContainerTypePage().then((d) => {
this.selectTypeData = d.data.rows || []
}).catch(() => {
-
})
WmsContainerPackagingPage().then((d) => {
@@ -114,8 +109,13 @@
}).catch(() => {
})
+ },
+ methods: {
+ moment,
+ // 鍒濆鍖栨柟娉�
+ add(record) {
+ this.visible = true;
this.$nextTick(() => {
-
});
},
/**
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue
index 9d32d6c..279acb1 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue
@@ -1,27 +1,36 @@
锘�<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-item label="缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ョ紪鍙�" v-decorator="['containerCode', {rules: [{required: true, message: '璇疯緭鍏ョ紪鍙凤紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ョ紪鍙�"
+ v-decorator="['containerCode', { rules: [{ required: true, message: '璇疯緭鍏ョ紪鍙凤紒' }] }]" />
</a-form-item>
<a-form-item label="鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ悕绉�" v-decorator="['containerName', {rules: [{required: true, message: '璇疯緭鍏ュ悕绉帮紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ュ悕绉�"
+ v-decorator="['containerName', { rules: [{ required: true, message: '璇疯緭鍏ュ悕绉帮紒' }] }]" />
</a-form-item>
- <a-form-item label="绫诲瀷ID" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ョ被鍨婭D" v-decorator="['containerTypeId', {rules: [{required: true, message: '璇疯緭鍏ョ被鍨婭D锛�'}]}]" />
+ <a-form-item label="绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <!-- <a-input placeholder="璇疯緭鍏ョ被鍨�" v-decorator="['containerTypeId', {rules: [{required: true, message: '璇疯緭鍏ョ被鍨婭D锛�'}]}]" /> -->
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨绫诲瀷" v-decorator="['containerTypeId']">
+ <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.typeCode">{{
+ item.typeName }}</a-select-option>
+ </a-select>
+
</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 placeholder="璇疯緭鍏ョ被鍨嬪悕绉�" v-decorator="['containerTypeName', {rules: [{required: true, message: '璇疯緭鍏ョ被鍨嬪悕绉帮紒'}]}]" />
- </a-form-item>
- <a-form-item label="瀹瑰櫒鍏崇郴ID" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ鍣ㄥ叧绯籌D" v-decorator="['packagingId', {rules: [{required: true, message: '璇疯緭鍏ュ鍣ㄥ叧绯籌D锛�'}]}]" />
+ </a-form-item> -->
+ <a-form-item label="瀹瑰櫒鍏崇郴" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <!-- <a-input placeholder="璇疯緭鍏ュ鍣ㄥ叧绯籌D"
+ v-decorator="['packagingId', { rules: [{ required: true, message: '璇疯緭鍏ュ鍣ㄥ叧绯籌D锛�' }] }]" /> -->
+
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨瀹瑰櫒鍏崇郴" v-decorator="['packagingId']">
+ <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.containerTypeId">{{
+ item.containerTypeName }}</a-select-option>
+ </a-select>
+
</a-form-item>
<a-form-item label="闀垮害" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ラ暱搴�" v-decorator="['specLength']" />
@@ -44,19 +53,18 @@
<a-form-item label="杞介噸涓婇檺" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ヨ浇閲嶄笂闄�" v-decorator="['maxWeight']" />
</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 placeholder="璇疯緭鍏ョ埗瀹瑰櫒鍚嶇О" v-decorator="['parentContainerName']" />
</a-form-item>
<a-form-item label="鐖跺鍣↖d" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ョ埗瀹瑰櫒Id" v-decorator="['parentContainerId']" />
- </a-form-item>
+ </a-form-item> -->
<a-form-item label="鏄惁铏氭嫙" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input-number placeholder="璇疯緭鍏ユ槸鍚﹁櫄鎷�" style="width: 100%" v-decorator="['isVirtually']" />
</a-form-item>
<a-form-item label="鏄惁绂佺敤" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-switch v-decorator="['isDisabled', { valuePropName: 'checked' }]" />
</a-form-item>
- <a-form-item v-show="false"><a-input v-decorator="['id']" /></a-form-item>
</a-form>
</a-spin>
</a-modal>
@@ -64,96 +72,110 @@
<script>
import moment from 'moment'
- import {
+import {
WmsContainerEdit
- } from '@/api/modular/main/WmsBase/WmsContainerManage'
- export default {
- data () {
- return {
- Id: 0,
- labelCol: {
- xs: { span: 24 },
- sm: { span: 5 }
+} from '@/api/modular/main/WmsBase/WmsContainerManage'
+import { WmsContainerTypePage, WmsContainerTypeDelete, WmsContainerTypeToExcel } from '@/api/modular/main/WmsBase/WmsContainerTypeManage'
+import { WmsContainerPackagingPage, WmsContainerPackagingDelete, WmsContainerPackagingToExcel } from '@/api/modular/main/WmsBase/WmsContainerPackagingManage'
+export default {
+ data() {
+ return {
+ Id: 0,
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 }
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 15 }
+ },
+ record: {},
+ visible: false,
+ confirmLoading: false,
+ form: this.$form.createForm(this)
+ }
},
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 15 }
+ created() {
+ WmsContainerTypePage().then((d) => {
+ this.selectTypeData = d.data.rows || []
+ }).catch(() => {
+ })
+
+ WmsContainerPackagingPage().then((d) => {
+ this.selectTypeData2 = d.data.rows || []
+ }).catch(() => {
+
+ })
},
- record: {},
- visible: false,
- confirmLoading: false,
- form: this.$form.createForm(this)
- }
+ methods: {
+ moment,
+ // 鍒濆鍖栨柟娉�
+ edit(record) {
+ this.visible = true;
+ this.Id = record.id;
+ this.$nextTick(() => {
+ });
+ //娣卞害鎷疯礉 绉婚櫎VUE鐨勭洃鍚紝闃叉INDEX椤甸潰鍊煎彉鍔�
+ this.record = JSON.parse(JSON.stringify(record))
+ this.$nextTick(() => {
+ this.form.setFieldsValue(
+ {
+ id: record.id,
+ containerCode: record.containerCode,
+ containerName: record.containerName,
+ containerTypeId: record.containerTypeId,
+ containerTypeName: record.containerTypeName,
+ packagingId: record.packagingId,
+ specLength: record.specLength,
+ specWidth: record.specWidth,
+ specHeight: record.specHeight,
+ limitLength: record.limitLength,
+ limitWidth: record.limitWidth,
+ limitHeight: record.limitHeight,
+ maxWeight: record.maxWeight,
+ parentContainerName: record.parentContainerName,
+ parentContainerId: record.parentContainerId,
+ isVirtually: record.isVirtually,
+ isDisabled: record.isDisabled
+ }
+ )
+ })
},
- methods: {
- moment,
- // 鍒濆鍖栨柟娉�
- edit (record) {
- this.visible = true;
- this.Id = record.id;
- this.$nextTick(() => {
- });
- //娣卞害鎷疯礉 绉婚櫎VUE鐨勭洃鍚紝闃叉INDEX椤甸潰鍊煎彉鍔�
- this.record = JSON.parse(JSON.stringify(record))
- this.$nextTick(() => {
- this.form.setFieldsValue(
- {
- id: record.id,
- containerCode: record.containerCode,
- containerName: record.containerName,
- containerTypeId: record.containerTypeId,
- containerTypeName: record.containerTypeName,
- packagingId: record.packagingId,
- specLength: record.specLength,
- specWidth: record.specWidth,
- specHeight: record.specHeight,
- limitLength: record.limitLength,
- limitWidth: record.limitWidth,
- limitHeight: record.limitHeight,
- maxWeight: record.maxWeight,
- parentContainerName: record.parentContainerName,
- parentContainerId: record.parentContainerId,
- isVirtually: record.isVirtually,
- isDisabled: record.isDisabled
+ 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]
}
- )
- })
- },
- 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]
- }
- }
- WmsContainerEdit(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) => {
+ }
+ WmsContainerEdit(this.record).then((res) => {
+ if (res.success) {
+ this.$message.success('缂栬緫鎴愬姛')
this.confirmLoading = false
- })
- }else{
+ this.$emit('ok', this.record)
+ this.handleCancel()
+ } else {
+ this.$message.error('缂栬緫澶辫触锛�' + JSON.stringify(res.message))
+ }
+ }).finally((res) => {
this.confirmLoading = false
- }
- });
- },
- handleCancel () {
- this.form.resetFields()
- this.visible = false
- }
+ })
+ } else {
+ this.confirmLoading = false
+ }
+ });
+ },
+ handleCancel() {
+ this.form.resetFields()
+ this.visible = false
}
}
+}
</script>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/addForm.vue
index 18640fc..6953930 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/addForm.vue
@@ -8,14 +8,26 @@
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
- <a-form-item label="瀹瑰櫒绫诲瀷ID" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ鍣ㄧ被鍨婭D" v-decorator="['containerTypeId', {rules: [{required: true, message: '璇疯緭鍏ュ鍣ㄧ被鍨婭D锛�'}]}]" />
+ <a-form-item label="瀹瑰櫒绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <!-- <a-input placeholder="璇疯緭鍏ュ鍣ㄧ被鍨婭D" v-decorator="['containerTypeId', {rules: [{required: true, message: '璇疯緭鍏ュ鍣ㄧ被鍨婭D锛�'}]}]" /> -->
+
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨瀹瑰櫒绫诲瀷鍚嶇О" v-decorator="['containerTypeId']">
+ <a-select-option v-for="(item, index) in selectTypeData" :key="index"
+ :value="item.typeCode">{{ item.typeName }}</a-select-option>
+ </a-select>
+
</a-form-item>
<!-- <a-form-item label="瀹瑰櫒绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ュ鍣ㄧ被鍨嬪悕绉�" v-decorator="['containerTypeName', {rules: [{required: true, message: '璇疯緭鍏ュ鍣ㄧ被鍨嬪悕绉帮紒'}]}]" />
</a-form-item> -->
- <a-form-item label="鐗╂枡绫诲瀷ID" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ョ墿鏂欑被鍨婭D" v-decorator="['materialTypeId', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欑被鍨婭D锛�'}]}]" />
+ <a-form-item label="鐗╂枡绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <!-- <a-input placeholder="璇疯緭鍏ョ墿鏂欑被鍨婭D" v-decorator="['materialTypeId', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欑被鍨婭D锛�'}]}]" /> -->
+
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨鐗╂枡绫诲瀷鍚嶇О" v-decorator="['materialTypeId']">
+ <a-select-option v-for="(item, index) in selectTypeData2" :key="index"
+ :value="item.materialTypeCode">{{ item.materialTypeName }}</a-select-option>
+ </a-select>
+
</a-form-item>
<!-- <a-form-item label="鐗╂枡绫诲瀷缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬬紪鍙�" v-decorator="['materialTypeCode', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欑被鍨嬬紪鍙凤紒'}]}]" />
@@ -36,6 +48,9 @@
import {
WmsContainerPackagingAdd
} from '@/api/modular/main/WmsBase/WmsContainerPackagingManage'
+
+ import { WmsContainerTypePage, WmsContainerTypeDelete, WmsContainerTypeToExcel } from '@/api/modular/main/WmsBase/WmsContainerTypeManage'
+ import { WmsMaterialTypePage,} from '@/api/modular/main/WmsBase/WmsMaterialTypeManage'
export default {
data () {
return {
@@ -52,6 +67,18 @@
form: this.$form.createForm(this)
}
},
+ created() {
+ WmsContainerTypePage().then((d) => {
+ this.selectTypeData = d.data.rows || []
+ }).catch(() => {
+
+ })
+ WmsMaterialTypePage().then((d) => {
+ this.selectTypeData2 = d.data.rows || []
+ }).catch(() => {
+
+ })
+ },
methods: {
moment,
// 鍒濆鍖栨柟娉�
@@ -60,6 +87,8 @@
this.$nextTick(() => {
});
+
+
},
/**
* 鎻愪氦琛ㄥ崟
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/editForm.vue
index 474d889..fc14202 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/editForm.vue
@@ -8,25 +8,36 @@
@cancel="handleCancel">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
- <a-form-item label="瀹瑰櫒绫诲瀷ID" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ鍣ㄧ被鍨婭D" v-decorator="['containerTypeId', {rules: [{required: true, message: '璇疯緭鍏ュ鍣ㄧ被鍨婭D锛�'}]}]" />
- </a-form-item>
<a-form-item label="瀹瑰櫒绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <!-- <a-input placeholder="璇疯緭鍏ュ鍣ㄧ被鍨婭D" v-decorator="['containerTypeId', {rules: [{required: true, message: '璇疯緭鍏ュ鍣ㄧ被鍨婭D锛�'}]}]" /> -->
+
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨瀹瑰櫒绫诲瀷鍚嶇О" v-decorator="['containerTypeId']">
+ <a-select-option v-for="(item, index) in selectTypeData" :key="index"
+ :value="item.typeCode">{{ item.typeName }}</a-select-option>
+ </a-select>
+
+ </a-form-item>
+ <!-- <a-form-item label="瀹瑰櫒绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ュ鍣ㄧ被鍨嬪悕绉�" v-decorator="['containerTypeName', {rules: [{required: true, message: '璇疯緭鍏ュ鍣ㄧ被鍨嬪悕绉帮紒'}]}]" />
+ </a-form-item> -->
+ <a-form-item label="鐗╂枡绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <!-- <a-input placeholder="璇疯緭鍏ョ墿鏂欑被鍨婭D" v-decorator="['materialTypeId', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欑被鍨婭D锛�'}]}]" /> -->
+
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨鐗╂枡绫诲瀷鍚嶇О" v-decorator="['materialTypeId']">
+ <a-select-option v-for="(item, index) in selectTypeData2" :key="index"
+ :value="item.materialTypeCode">{{ item.materialTypeName }}</a-select-option>
+ </a-select>
+
</a-form-item>
- <a-form-item label="鐗╂枡绫诲瀷ID" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ョ墿鏂欑被鍨婭D" v-decorator="['materialTypeId', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欑被鍨婭D锛�'}]}]" />
- </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 placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬬紪鍙�" v-decorator="['materialTypeCode', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欑被鍨嬬紪鍙凤紒'}]}]" />
</a-form-item>
<a-form-item label="鐗╂枡绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬪悕绉�" v-decorator="['materialTypeName', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欑被鍨嬪悕绉帮紒'}]}]" />
- </a-form-item>
+ </a-form-item> -->
<a-form-item label="鐗╂枡瀹瑰櫒瀹归噺" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ョ墿鏂欏鍣ㄥ閲�" v-decorator="['boxQty', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欏鍣ㄥ閲忥紒'}]}]" />
</a-form-item>
- <a-form-item v-show="false"><a-input v-decorator="['id']" /></a-form-item>
</a-form>
</a-spin>
</a-modal>
@@ -37,6 +48,11 @@
import {
WmsContainerPackagingEdit
} from '@/api/modular/main/WmsBase/WmsContainerPackagingManage'
+
+
+ import { WmsContainerTypePage, WmsContainerTypeDelete, WmsContainerTypeToExcel } from '@/api/modular/main/WmsBase/WmsContainerTypeManage'
+ import { WmsMaterialTypePage,} from '@/api/modular/main/WmsBase/WmsMaterialTypeManage'
+
export default {
data () {
return {
@@ -55,6 +71,18 @@
form: this.$form.createForm(this)
}
},
+ created() {
+ WmsContainerTypePage().then((d) => {
+ this.selectTypeData = d.data.rows || []
+ }).catch(() => {
+
+ })
+ WmsMaterialTypePage().then((d) => {
+ this.selectTypeData2 = d.data.rows || []
+ }).catch(() => {
+
+ })
+ },
methods: {
moment,
// 鍒濆鍖栨柟娉�
@@ -68,15 +96,10 @@
this.$nextTick(() => {
this.form.setFieldsValue(
{
- id: record.id,
- containerTypeId: record.containerTypeId,
- containerTypeName: record.containerTypeName,
- materialTypeId: record.materialTypeId,
- materialTypeCode: record.materialTypeCode,
- materialTypeName: record.materialTypeName,
- boxQty: record.boxQty
+ ...record
}
)
+
})
},
handleSubmit () {
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/index.vue
index 589f476..8b25e71 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/index.vue
@@ -1,498 +1,507 @@
锘�<template>
- <div ref="boxOutWrap" class="boxOutWrap">
- <div ref="boxForm" class="boxForm">
- <a-card :bordered="false" :bodyStyle="tstyle">
+ <div ref="boxOutWrap" class="boxOutWrap">
+ <div ref="boxForm" class="boxForm">
+ <a-card :bordered="false" :bodyStyle="tstyle">
- <div class="table-page-search-wrapper" v-if="hasPerm('WmsContainerPackaging:page')">
- <a-form layout="inline">
- <a-row :gutter="48">
- <a-col :md="8" :sm="24">
- <a-form-item label="瀹瑰櫒绫诲瀷ID">
- <a-input v-model="queryParam.containerTypeId" allow-clear placeholder="璇疯緭鍏ュ鍣ㄧ被鍨婭D"/>
+ <div class="table-page-search-wrapper" v-if="hasPerm('WmsContainerPackaging:page')">
+ <a-form layout="inline">
+ <a-row :gutter="48">
+ <!-- <a-col :md="8" :sm="24">
+ <a-form-item label="瀹瑰櫒绫诲瀷">
+ <a-input v-model="queryParam.containerTypeId" allow-clear placeholder="璇疯緭鍏ュ鍣ㄧ被鍨�"/>
</a-form-item>
- </a-col>
- <a-col :md="8" :sm="24">
- <a-form-item label="瀹瑰櫒绫诲瀷鍚嶇О">
- <a-input v-model="queryParam.containerTypeName" allow-clear placeholder="璇疯緭鍏ュ鍣ㄧ被鍨嬪悕绉�"/>
- </a-form-item>
- </a-col><template v-if="advanced">
- <a-col :md="8" :sm="24">
- <a-form-item label="鐗╂枡绫诲瀷ID">
- <a-input v-model="queryParam.materialTypeId" allow-clear placeholder="璇疯緭鍏ョ墿鏂欑被鍨婭D"/>
- </a-form-item>
- </a-col>
- <a-col :md="8" :sm="24">
- <a-form-item label="鐗╂枡绫诲瀷缂栧彿">
- <a-input v-model="queryParam.materialTypeCode" allow-clear placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬬紪鍙�"/>
- </a-form-item>
- </a-col>
- <a-col :md="8" :sm="24">
- <a-form-item label="鐗╂枡绫诲瀷鍚嶇О">
- <a-input v-model="queryParam.materialTypeName" allow-clear placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬪悕绉�"/>
- </a-form-item>
- </a-col>
- <a-col :md="8" :sm="24">
- <a-form-item label="鐗╂枡瀹瑰櫒瀹归噺">
- <a-input v-model="queryParam.boxQty" allow-clear placeholder="璇疯緭鍏ョ墿鏂欏鍣ㄥ閲�"/>
- </a-form-item>
- </a-col> <!--骞存湀鏃ユ椂鍒嗙-->
- <!--鏃堕棿鑼冨洿-->
+ </a-col> -->
+ <a-col :md="8" :sm="24">
+ <a-form-item label="瀹瑰櫒绫诲瀷鍚嶇О">
+ <a-input v-model="queryParam.containerTypeName" allow-clear placeholder="璇疯緭鍏ュ鍣ㄧ被鍨嬪悕绉�" />
+ </a-form-item>
+ </a-col>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="鐗╂枡绫诲瀷">
+ <a-input v-model="queryParam.materialTypeId" allow-clear placeholder="璇疯緭鍏ョ墿鏂欑被鍨�" />
+ </a-form-item>
+ </a-col>
+ <template v-if="advanced">
+
+ <a-col :md="8" :sm="24">
+ <a-form-item label="鐗╂枡绫诲瀷缂栧彿">
+ <a-input v-model="queryParam.materialTypeCode" allow-clear
+ placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬬紪鍙�" />
+ </a-form-item>
+ </a-col>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="鐗╂枡绫诲瀷鍚嶇О">
+ <a-input v-model="queryParam.materialTypeName" allow-clear
+ placeholder="璇疯緭鍏ョ墿鏂欑被鍨嬪悕绉�" />
+ </a-form-item>
+ </a-col>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="鐗╂枡瀹瑰櫒瀹归噺">
+ <a-input v-model="queryParam.boxQty" allow-clear placeholder="璇疯緭鍏ョ墿鏂欏鍣ㄥ閲�" />
+ </a-form-item>
+ </a-col> <!--骞存湀鏃ユ椂鍒嗙-->
+ <!--鏃堕棿鑼冨洿-->
- <a-col :md="8" :sm="24">
- <a-form-item label="鍒涘缓鏃堕棿">
- <a-range-picker style="width: 100%" :placeholder="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']" :show-time="{
-format: 'HH:mm:ss', defaultValue: [moment('00:00:00', 'HH:mm:ss'),moment('23:59:59', 'HH:mm:ss')]}" v-model="queryParam.createdTime" value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss" @change="onChangecreatedTime"/>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="鍒涘缓鏃堕棿">
+ <a-range-picker style="width: 100%" :placeholder="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']" :show-time="{
+ format: 'HH:mm:ss', defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
+ }"
+ v-model="queryParam.createdTime" value-format="YYYY-MM-DD HH:mm:ss"
+ format="YYYY-MM-DD HH:mm:ss" @change="onChangecreatedTime" />
- </a-form-item>
- </a-col>
- <!--骞存湀鏃ユ椂鍒嗙-->
- <!--鏃堕棿鑼冨洿-->
+ </a-form-item>
+ </a-col>
+ <!--骞存湀鏃ユ椂鍒嗙-->
+ <!--鏃堕棿鑼冨洿-->
- <a-col :md="8" :sm="24">
- <a-form-item label="鏇存柊鏃堕棿">
- <a-range-picker style="width: 100%" :placeholder="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']" :show-time="{
-format: 'HH:mm:ss', defaultValue: [moment('00:00:00', 'HH:mm:ss'),moment('23:59:59', 'HH:mm:ss')]}" v-model="queryParam.updatedTime" value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss" @change="onChangeupdatedTime"/>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="鏇存柊鏃堕棿">
+ <a-range-picker style="width: 100%" :placeholder="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']" :show-time="{
+ format: 'HH:mm:ss', defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
+ }"
+ v-model="queryParam.updatedTime" value-format="YYYY-MM-DD HH:mm:ss"
+ format="YYYY-MM-DD HH:mm:ss" @change="onChangeupdatedTime" />
- </a-form-item>
- </a-col>
-
- <a-col :md="8" :sm="24">
- <a-form-item label="鍒涘缓鑰呭悕绉�">
- <a-input v-model="queryParam.createdUserName" allow-clear placeholder="璇疯緭鍏ュ垱寤鸿�呭悕绉�"/>
- </a-form-item>
- </a-col>
- <a-col :md="8" :sm="24">
- <a-form-item label="淇敼鑰呭悕绉�">
- <a-input v-model="queryParam.updatedUserName" allow-clear placeholder="璇疯緭鍏ヤ慨鏀硅�呭悕绉�"/>
- </a-form-item>
- </a-col> </template>
+ </a-form-item>
+ </a-col>
- <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-col :md="8" :sm="24">
+ <a-form-item label="鍒涘缓鑰呭悕绉�">
+ <a-input v-model="queryParam.createdUserName" allow-clear placeholder="璇疯緭鍏ュ垱寤鸿�呭悕绉�" />
+ </a-form-item>
+ </a-col>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="淇敼鑰呭悕绉�">
+ <a-input v-model="queryParam.updatedUserName" allow-clear placeholder="璇疯緭鍏ヤ慨鏀硅�呭悕绉�" />
+ </a-form-item>
+ </a-col> </template>
- </a-row>
- </a-form>
- </div>
- </a-card>
- </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"
- :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
- <template class="table-operator" slot="operator" v-if="hasPerm('WmsContainerPackaging:add')" >
- <div ref="actionBar" class="actionBar">
- <a-button type="info" v-if="hasPerm('sysExcelTemplate:importExcel')" icon="upload" @click="$refs.excelForm.index()">
- 瀵煎叆
- </a-button>
- <a-button type="info" v-if="hasPerm('WmsContainerPackaging:exportExcel')" icon="download" @click="WmsContainerPackagingToExcel()">
- 瀵煎嚭
- </a-button>
- <a-button type="primary" v-if="hasPerm('WmsContainerPackaging:add')" icon="plus" @click="$refs.addForm.add()">鏂板瀹瑰櫒鍏崇郴</a-button>
+ <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>
</div>
- </template>
- <span slot="action" slot-scope="text, record">
-
- <a v-if="hasPerm('WmsContainerPackaging:edit')" @click="$refs.editForm.edit(record)">缂栬緫</a>
- <a-divider type="vertical" v-if="hasPerm('WmsContainerPackaging:edit') & hasPerm('WmsContainerPackaging:delete')"/>
- <a-popconfirm v-if="hasPerm('WmsContainerPackaging:delete')" placement="topRight" title="纭鍒犻櫎锛�" @confirm="() => WmsContainerPackagingDelete(record)">
- <a>鍒犻櫎</a>
- </a-popconfirm>
- </span>
- </s-table>
- <add-form ref="addForm" @ok="handleOk" />
- <edit-form ref="editForm" @ok="handleOk" />
- <excel-form ref="excelForm" @ok="handleOk" />
- </a-card>
- </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"
+ :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
+ <template class="table-operator" slot="operator" v-if="hasPerm('WmsContainerPackaging:add')">
+ <div ref="actionBar" class="actionBar">
+ <a-button type="info" v-if="hasPerm('sysExcelTemplate:importExcel')" icon="upload"
+ @click="$refs.excelForm.index()">
+ 瀵煎叆
+ </a-button>
+ <a-button type="info" v-if="hasPerm('WmsContainerPackaging:exportExcel')" icon="download"
+ @click="WmsContainerPackagingToExcel()">
+ 瀵煎嚭
+ </a-button>
+ <a-button type="primary" v-if="hasPerm('WmsContainerPackaging:add')" icon="plus"
+ @click="$refs.addForm.add()">鏂板瀹瑰櫒鍏崇郴</a-button>
+ </div>
+ </template>
+ <span slot="action" slot-scope="text, record">
+
+ <a v-if="hasPerm('WmsContainerPackaging:edit')" @click="$refs.editForm.edit(record)">缂栬緫</a>
+ <a-divider type="vertical"
+ v-if="hasPerm('WmsContainerPackaging:edit') & hasPerm('WmsContainerPackaging:delete')" />
+ <a-popconfirm v-if="hasPerm('WmsContainerPackaging:delete')" placement="topRight" title="纭鍒犻櫎锛�"
+ @confirm="() => WmsContainerPackagingDelete(record)">
+ <a>鍒犻櫎</a>
+ </a-popconfirm>
+ </span>
+ </s-table>
+ <add-form ref="addForm" @ok="handleOk" />
+ <edit-form ref="editForm" @ok="handleOk" />
+ <excel-form ref="excelForm" @ok="handleOk" />
+ </a-card>
+ </div>
</template>
<script>
- import { STable } from '@/components'
- import moment from 'moment'
- import { WmsContainerPackagingPage, WmsContainerPackagingDelete, WmsContainerPackagingToExcel } from '@/api/modular/main/WmsBase/WmsContainerPackagingManage'
- //鑷畾涔塼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'
- export default {
+import { STable } from '@/components'
+import moment from 'moment'
+import { WmsContainerPackagingPage, WmsContainerPackagingDelete, WmsContainerPackagingToExcel } from '@/api/modular/main/WmsBase/WmsContainerPackagingManage'
+//鑷畾涔塼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'
+export default {
mixins: [setTableHtMixin],
components: {
- STable,
- addForm,
- editForm,
- excelForm
+ STable,
+ addForm,
+ editForm,
+ excelForm
},
- data () {
- return {
- advanced: false, // 楂樼骇鎼滅储 灞曞紑/鍏抽棴
- queryParam: {},
- pageInfo: {
- current: 1,
- pageSize: 10
- },
- columns: [
- {
- title:'搴忓彿',
- width: '60px',
- align: 'center',
- customRender: (text, record, index) => `${index + 1 + (this.pageInfo.current - 1) * this.pageInfo.pageSize}`
+ data() {
+ return {
+ advanced: false, // 楂樼骇鎼滅储 灞曞紑/鍏抽棴
+ queryParam: {},
+ pageInfo: {
+ current: 1,
+ pageSize: 10
+ },
+ columns: [
+ {
+ title: '搴忓彿',
+ width: '60px',
+ align: 'center',
+ customRender: (text, record, index) => `${index + 1 + (this.pageInfo.current - 1) * this.pageInfo.pageSize}`
+ },
+ // {
+ // title: '瀹瑰櫒绫诲瀷Id',
+ // align: 'center',
+ // customHeaderCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '130px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // customCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '130px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // sorter: true,
+ // dataIndex: 'containerTypeId'
+ // },
+ {
+ title: '瀹瑰櫒绫诲瀷鍚嶇О',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '130px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '130px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'containerTypeName'
+ },
+ // {
+ // title: '鐗╂枡绫诲瀷Id',
+ // align: 'center',
+ // customHeaderCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '130px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // customCell: () => {
+ // return {
+ // style: {
+ // 'min-width': '130px'//鏈�灏忓垪瀹借缃�
+ // }
+ // }
+ // },
+ // sorter: true,
+ // dataIndex: 'materialTypeId'
+ // },
+ {
+ title: '鐗╂枡绫诲瀷缂栧彿',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '130px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '130px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'materialTypeCode'
+ },
+ {
+ title: '鐗╂枡绫诲瀷鍚嶇О',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '130px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '130px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'materialTypeName'
+ },
+ {
+ title: '鐗╂枡瀹瑰櫒瀹归噺',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '130px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '130px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'boxQty'
+ },
+ {
+ title: '鍒涘缓鏃堕棿',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'createdTime'
+ },
+ {
+ title: '鏇存柊鏃堕棿',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'updatedTime'
+ },
+ {
+ title: '鍒涘缓鑰呭悕绉�',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'createdUserName'
+ },
+ {
+ title: '淇敼鑰呭悕绉�',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'updatedUserName'
+ }
+ ],
+ tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
+ // 鍔犺浇鏁版嵁鏂规硶 蹇呴』涓� Promise 瀵硅薄
+ loadData: parameter => {
+ return WmsContainerPackagingPage(Object.assign(parameter, this.switchingDate())).then((res) => {
+ return res.data
+ })
+ },
+ selectedRowKeys: [],
+ selectedRows: []
+ }
},
- {
- title: '瀹瑰櫒绫诲瀷ID',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '130px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '130px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'containerTypeId'
- },
- {
- title: '瀹瑰櫒绫诲瀷鍚嶇О',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '130px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '130px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'containerTypeName'
- },
- {
- title: '鐗╂枡绫诲瀷ID',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '130px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '130px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'materialTypeId'
- },
- {
- title: '鐗╂枡绫诲瀷缂栧彿',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '130px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '130px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'materialTypeCode'
- },
- {
- title: '鐗╂枡绫诲瀷鍚嶇О',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '130px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '130px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'materialTypeName'
- },
- {
- title: '鐗╂枡瀹瑰櫒瀹归噺',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '130px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '130px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'boxQty'
- },
- {
- title: '鍒涘缓鏃堕棿',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'createdTime'
- },
- {
- title: '鏇存柊鏃堕棿',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'updatedTime'
- },
- {
- title: '鍒涘缓鑰呭悕绉�',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'createdUserName'
- },
- {
- title: '淇敼鑰呭悕绉�',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'updatedUserName'
- }
- ],
- tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
- // 鍔犺浇鏁版嵁鏂规硶 蹇呴』涓� Promise 瀵硅薄
- loadData: parameter => {
- return WmsContainerPackagingPage(Object.assign(parameter, this.switchingDate())).then((res) => {
- return res.data
- })
- },
- selectedRowKeys: [],
- selectedRows: []
- }
- },
- created () {
- if (this.hasPerm('WmsContainerPackaging:edit') || this.hasPerm('WmsContainerPackaging:delete')) {
- this.columns.push({
- title: '鎿嶄綔',
- width: '150px',
- dataIndex: 'action',
- scopedSlots: { customRender: 'action' }
- })
- }
- const path = this.$route.path
- const columnStr = window.localStorage.getItem(path)
- if(columnStr) {
- var _columns = JSON.parse(columnStr)
- this.columns.forEach(element => {
- var fObj = _columns.find((item, index) => {
- return item.dataIndex === element.dataIndex;
- })
- if(fObj!=undefined && fObj!=null){
- element.checked=fObj.checked;
- }
- });
- }
+ created() {
+ if (this.hasPerm('WmsContainerPackaging:edit') || this.hasPerm('WmsContainerPackaging:delete')) {
+ this.columns.push({
+ title: '鎿嶄綔',
+ width: '150px',
+ dataIndex: 'action',
+ scopedSlots: { customRender: 'action' }
+ })
+ }
+ const path = this.$route.path
+ const columnStr = window.localStorage.getItem(path)
+ if (columnStr) {
+ var _columns = JSON.parse(columnStr)
+ this.columns.forEach(element => {
+ var fObj = _columns.find((item, index) => {
+ return item.dataIndex === element.dataIndex;
+ })
+ if (fObj != undefined && fObj != null) {
+ element.checked = fObj.checked;
+ }
+ });
+ }
- this.handleTableHt() //璁剧疆涓昏〃琛ㄦ牸楂樺害
- window.addEventListener(
- 'resize',
- () => {
- this.handleTableHt() // 鐩戝惉灞忓箷澶у皬鏀瑰彉琛ㄦ牸楂樺害
- },
- false
- )
-
+ this.handleTableHt() //璁剧疆涓昏〃琛ㄦ牸楂樺害
+ window.addEventListener(
+ 'resize',
+ () => {
+ this.handleTableHt() // 鐩戝惉灞忓箷澶у皬鏀瑰彉琛ㄦ牸楂樺害
+ },
+ false
+ )
+
},
methods: {
- moment,
- /**
- * 鏌ヨ鍙傛暟缁勮
- */
- switchingDate () {
- const obj = JSON.parse(JSON.stringify(this.queryParam))
- return obj
- },
- WmsContainerPackagingDelete (record) {
- WmsContainerPackagingDelete(record).then((res) => {
- if (res.success) {
- this.$message.success('鍒犻櫎鎴愬姛')
- this.$refs.table.refresh()
- } else {
- this.$message.error('鍒犻櫎澶辫触') // + res.message
- }
- })
- },
+ moment,
+ /**
+ * 鏌ヨ鍙傛暟缁勮
+ */
+ switchingDate() {
+ const obj = JSON.parse(JSON.stringify(this.queryParam))
+ return obj
+ },
+ WmsContainerPackagingDelete(record) {
+ WmsContainerPackagingDelete(record).then((res) => {
+ if (res.success) {
+ this.$message.success('鍒犻櫎鎴愬姛')
+ this.$refs.table.refresh()
+ } else {
+ this.$message.error('鍒犻櫎澶辫触') // + res.message
+ }
+ })
+ },
- WmsContainerPackagingToExcel() {
- this.loading = true
- let entozh = {};
- const path = this.$route.path;
- if (window.localStorage.getItem(path)) {
- JSON.parse(window.localStorage.getItem(path)).forEach(item => {
- if (item.dataIndex != 'action' && item.checked) {
- entozh[item.dataIndex] = item.title
- }
- })
- } else { //鐩存帴鐐瑰鍑�
- this.columns.forEach(item => {
- if (item.dataIndex != 'action') {
- entozh[item.dataIndex] = item.title
- }
- })
- }
- WmsContainerPackagingPage(Object.assign({ pageSize: 100000, pageIndex: 1 }, this.queryParam)).then((res) => {
- this.loading = false;
- //闇�瑕佹埅鍙栨棩鏈熺殑瀛楁
- var arrDataCutout = this.columns.filter(v => v.customCutout == true);
- res.data.rows.forEach(item => {
- var arrKeys = Object.keys(item);
- arrKeys.forEach(key => {
- var strFieldDic = key + 'Data';
- //鏋氫妇杞��
- if (this[strFieldDic] && this[strFieldDic].length > 0) {
- let arrFieldDic = this[strFieldDic].filter(v => String(v.code) == String(item[key]));
- if (arrFieldDic.length > 0) {
- item[key] = arrFieldDic[0]?.name || '娌℃湁鏋氫妇鍊�';
- }
- }
- // 鏃ユ湡鎴彇
- if (arrDataCutout.length > 0) {
- arrDataCutout.forEach(itemIn => {
- if (key == itemIn.dataIndex && item[key]) {
- item[key] = item[key].split(" ")[0]
- }
- })
- }
- });
- })
- exportExcel(res.data.rows, entozh, "xlsx", `${this.$route.meta.title}`)
- }).catch((err) => {
- this.loading = false
- this.$message.error('涓嬭浇閿欒锛氳幏鍙栨枃浠舵祦閿欒' + err)
- })
- },
+ WmsContainerPackagingToExcel() {
+ this.loading = true
+ let entozh = {};
+ const path = this.$route.path;
+ if (window.localStorage.getItem(path)) {
+ JSON.parse(window.localStorage.getItem(path)).forEach(item => {
+ if (item.dataIndex != 'action' && item.checked) {
+ entozh[item.dataIndex] = item.title
+ }
+ })
+ } else { //鐩存帴鐐瑰鍑�
+ this.columns.forEach(item => {
+ if (item.dataIndex != 'action') {
+ entozh[item.dataIndex] = item.title
+ }
+ })
+ }
+ WmsContainerPackagingPage(Object.assign({ pageSize: 100000, pageIndex: 1 }, this.queryParam)).then((res) => {
+ this.loading = false;
+ //闇�瑕佹埅鍙栨棩鏈熺殑瀛楁
+ var arrDataCutout = this.columns.filter(v => v.customCutout == true);
+ res.data.rows.forEach(item => {
+ var arrKeys = Object.keys(item);
+ arrKeys.forEach(key => {
+ var strFieldDic = key + 'Data';
+ //鏋氫妇杞��
+ if (this[strFieldDic] && this[strFieldDic].length > 0) {
+ let arrFieldDic = this[strFieldDic].filter(v => String(v.code) == String(item[key]));
+ if (arrFieldDic.length > 0) {
+ item[key] = arrFieldDic[0]?.name || '娌℃湁鏋氫妇鍊�';
+ }
+ }
+ // 鏃ユ湡鎴彇
+ if (arrDataCutout.length > 0) {
+ arrDataCutout.forEach(itemIn => {
+ if (key == itemIn.dataIndex && item[key]) {
+ item[key] = item[key].split(" ")[0]
+ }
+ })
+ }
+ });
+ })
+ exportExcel(res.data.rows, entozh, "xlsx", `${this.$route.meta.title}`)
+ }).catch((err) => {
+ this.loading = false
+ this.$message.error('涓嬭浇閿欒锛氳幏鍙栨枃浠舵祦閿欒' + err)
+ })
+ },
- toggleAdvanced () {
- this.advanced = !this.advanced
- this.handleTableHt() //璁剧疆涓昏〃琛ㄦ牸楂樺害
- },
- onChangecreatedTime(date, dateString) {
- this.queryParam.createdTime = dateString
- },
- onChangeupdatedTime(date, dateString) {
- this.queryParam.updatedTime = dateString
- },
- handleOk () {
- this.$refs.table.refresh()
- },
- onSelectChange (selectedRowKeys, selectedRows) {
- this.selectedRowKeys = selectedRowKeys
- this.selectedRows = selectedRows
+ toggleAdvanced() {
+ this.advanced = !this.advanced
+ this.handleTableHt() //璁剧疆涓昏〃琛ㄦ牸楂樺害
+ },
+ onChangecreatedTime(date, dateString) {
+ this.queryParam.createdTime = dateString
+ },
+ onChangeupdatedTime(date, dateString) {
+ this.queryParam.updatedTime = dateString
+ },
+ 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>
+.table-operator {
+ margin-bottom: 18px;
+}
+
+button {
+ margin-right: 8px;
+}</style>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/addForm.vue
index eab2305..1d1cb16 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/addForm.vue
@@ -54,7 +54,7 @@
WmsWarehouseAdd
} from '@/api/modular/main/WmsBase/WmsWarehouseManage'
-import { WmsFactoryPage, WmsFactoryDelete, WmsFactoryToExcel } from '@/api/modular/main/WmsBase/WmsFactoryManage'
+import { WmsFactoryPage } from '@/api/modular/main/WmsBase/WmsFactoryManage'
export default {
created() {
this.getSelectDataList()
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/editForm.vue
index 533f2b6..a4a5657 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/editForm.vue
@@ -1,24 +1,26 @@
锘�<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-item label="浠撳簱缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ヤ粨搴撶紪鍙�" v-decorator="['code', {rules: [{required: true, message: '璇疯緭鍏ヤ粨搴撶紪鍙凤紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ヤ粨搴撶紪鍙�" v-decorator="['code', { rules: [{ required: true, message: '璇疯緭鍏ヤ粨搴撶紪鍙凤紒' }] }]" />
</a-form-item>
<a-form-item label="浠撳簱鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ヤ粨搴撳悕绉�" v-decorator="['name', {rules: [{required: true, message: '璇疯緭鍏ヤ粨搴撳悕绉帮紒'}]}]" />
+ <a-input placeholder="璇疯緭鍏ヤ粨搴撳悕绉�" v-decorator="['name', { rules: [{ required: true, message: '璇疯緭鍏ヤ粨搴撳悕绉帮紒' }] }]" />
</a-form-item>
<a-form-item label="浠撳簱鍦板潃" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ヤ粨搴撳湴鍧�" v-decorator="['address']" />
</a-form-item>
- <a-form-item label="宸ュ巶缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <a-input placeholder="璇疯緭鍏ュ伐鍘傜紪鍙�" v-decorator="['factoryCode', {rules: [{required: true, message: '璇疯緭鍏ュ伐鍘傜紪鍙凤紒'}]}]" />
+ <a-form-item label="鎵�灞炲伐鍘�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <!-- <a-input placeholder="璇烽�夋嫨鎵�灞炲伐鍘�" v-decorator="['factoryCode', {rules: [{required: true, message: '璇烽�夋嫨鎵�灞炲伐鍘傦紒'}]}]" /> -->
+
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨鎵�灞炲伐鍘�" v-decorator="['factoryCode']">
+ <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.factoryCode">{{
+ item.factoryName }}</a-select-option>
+ </a-select>
+
+
</a-form-item>
<a-form-item label="闀�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ラ暱" v-decorator="['length']" />
@@ -41,7 +43,6 @@
<a-form-item label="澶囨敞" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<a-input placeholder="璇疯緭鍏ュ娉�" v-decorator="['remarks']" />
</a-form-item>
- <a-form-item v-show="false"><a-input v-decorator="['id']" /></a-form-item>
</a-form>
</a-spin>
</a-modal>
@@ -49,91 +50,102 @@
<script>
import moment from 'moment'
- import {
+import { WmsFactoryPage } from '@/api/modular/main/WmsBase/WmsFactoryManage'
+import {
WmsWarehouseEdit
- } from '@/api/modular/main/WmsBase/WmsWarehouseManage'
- export default {
- data () {
- return {
- Id: 0,
- labelCol: {
- xs: { span: 24 },
- sm: { span: 5 }
+} from '@/api/modular/main/WmsBase/WmsWarehouseManage'
+export default {
+ created() {
+ this.getSelectDataList()
},
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 15 }
+ data() {
+ return {
+ Id: 0,
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 }
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 15 }
+ },
+ record: {},
+ visible: false,
+ confirmLoading: false,
+ form: this.$form.createForm(this)
+ }
},
- record: {},
- visible: false,
- confirmLoading: false,
- form: this.$form.createForm(this)
- }
+ methods: {
+ moment,
+ getSelectDataList() {
+ WmsFactoryPage().then((d) => {
+ this.selectTypeData = d.data.rows || []
+ }).catch(() => {
+
+ })
},
- methods: {
- moment,
- // 鍒濆鍖栨柟娉�
- edit (record) {
- this.visible = true;
- this.Id = record.id;
- this.$nextTick(() => {
- });
- //娣卞害鎷疯礉 绉婚櫎VUE鐨勭洃鍚紝闃叉INDEX椤甸潰鍊煎彉鍔�
- this.record = JSON.parse(JSON.stringify(record))
- this.$nextTick(() => {
- this.form.setFieldsValue(
- {
- id: record.id,
- code: record.code,
- name: record.name,
- address: record.address,
- factoryCode: record.factoryCode,
- length: record.length,
- width: record.width,
- height: record.height,
- baseUnit: record.baseUnit,
- position: record.position,
- isDisabled: record.isDisabled,
- remarks: record.remarks
+ // 鍒濆鍖栨柟娉�
+ edit(record) {
+ this.visible = true;
+ this.Id = record.id;
+ this.$nextTick(() => {
+ });
+ //娣卞害鎷疯礉 绉婚櫎VUE鐨勭洃鍚紝闃叉INDEX椤甸潰鍊煎彉鍔�
+ this.record = JSON.parse(JSON.stringify(record))
+ this.$nextTick(() => {
+ this.form.setFieldsValue(
+ {
+ id: record.id,
+ code: record.code,
+ name: record.name,
+ address: record.address,
+ factoryCode: record.factoryCode,
+ length: record.length,
+ width: record.width,
+ height: record.height,
+ baseUnit: record.baseUnit,
+ position: record.position,
+ isDisabled: record.isDisabled,
+ remarks: record.remarks
+ }
+ )
+ })
+ },
+ 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]
}
- )
- })
- },
- 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]
- }
- }
- WmsWarehouseEdit(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) => {
+ }
+ WmsWarehouseEdit(this.record).then((res) => {
+ if (res.success) {
+ this.$message.success('缂栬緫鎴愬姛')
this.confirmLoading = false
- })
- }else{
+ this.$emit('ok', this.record)
+ this.handleCancel()
+ } else {
+ this.$message.error('缂栬緫澶辫触锛�' + JSON.stringify(res.message))
+ }
+ }).finally((res) => {
this.confirmLoading = false
- }
- });
- },
- handleCancel () {
- this.form.resetFields()
- this.visible = false
- }
+ })
+ } else {
+ this.confirmLoading = false
+ }
+ });
+ },
+ handleCancel() {
+ this.form.resetFields()
+ this.visible = false
}
}
+}
</script>
--
Gitblit v1.9.3