Browse Source

【东阳pc】库存余额解冻页面区分开发

faster_develop
安虹睿 1 year ago
parent
commit
1a5330e4e8
  1. 43
      fe/PC/src/utils/tableColumns/index.js
  2. 41
      fe/PC/src/utils/tabsDesTions/index.js
  3. 43
      fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue
  4. 290
      fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalanceEdit.vue

43
fe/PC/src/utils/tableColumns/index.js

@ -2586,6 +2586,49 @@ export const InventoryBalance = [
{ label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
{ label: "最后事务编号", prop: 'lastTransNumber' },
]
// 库存余额(解/冻) 20230407
export const InventoryBalanceEdit = [
{
label: "物品代码",
prop: "itemCode",
fixed: "left",
type: "name",
width: orderWidth
},
{ label: "物品名称", prop: 'itemName' },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "配置", prop: "item_configurationFromFE" },
{ label: "库存数量", prop: "qty" },
{ label: "计量单位", prop: "uom" },
{ label: "批次", prop: "lot" },
{ label: "库位代码", prop: "locationCode" },
{ label: "库存状态", type: "filter", filters: "inventoryStage", prop: "status" },
{ label: "箱码", prop: "packingCode" },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "是否可用", prop: "isActive", type: "filter", filters: "whetherOrNot" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "生产日期", prop: "produceDate" ,type: "dateTime" },
{ label: "入库时间", prop: "putInTime", type: "dateTime" },
{ label: "过期日期", prop: "expireDate" ,type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "最后盘点时间", prop: "lastCountTime",type: "dateTime" },
{ label: "最后盘点计划单号", prop: "lastCountPlanNumber",width: orderWidth },
{ label: "最后盘点标签", prop: "lastCountLabel" },
{ label: "标包数量", prop: "stdPackQty" },
{ label: "库位组", prop: "locationGroup" },
{ label: "库区", prop: "locationArea" },
{ label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
{ label: "序号", prop: "serialNumber" },
{ label: "备注", prop: "remark" },
{ label: "到货日期", prop: "arriveDate",type: "dateTime" },
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
{ label: "最后事务编号", prop: 'lastTransNumber' },
]
// 库存事务 20230410
export const InventoryTransaction = [
{

41
fe/PC/src/utils/tabsDesTions/index.js

@ -1800,6 +1800,47 @@ export const InventoryInitialNote = [
// { label: "ID", prop: 'id' },
// ************** 确认隐藏 ************************
]
// 库存余额(解/冻)
export const InventoryBalanceEdit = [
{ label: "物品代码", prop: 'itemCode' },
{ label: "物品名称", prop: "itemName" },
{ label: "库存数量", prop: "qty" },
{ label: "计量单位", prop: "uom" },
{ label: "批次", prop: 'lot' },
{ label: "库位代码", prop: "locationCode" },
{ label: "库存状态", prop: "status",type: "filter", filters: "inventoryStage" },
{ label: "箱码", prop: 'packingCode' },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "是否可用", prop: "isActive", type: "filter", filters: "whetherOrNot" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "生产日期", prop: "produceDate" ,type: "dateTime" },
{ label: "入库时间", prop: "putInTime", type: "dateTime" },
{ label: "过期日期", prop: "expireDate" ,type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "最后盘点时间", prop: "lastCountTime", type: "dateTime" },
{ label: "最后盘点计划单号", prop: "lastCountPlanNumber" },
{ label: "最后盘点标签号", prop: "lastCountLabel" },
{ label: "物品描述", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "供应商批次", prop: 'supplierBatch' },
{ label: "事务ID", prop: "tenantId" },
{ label: "序号", prop: "serialNumber" },
{ label: "备注", prop: 'remark' },
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "最后事务编号", prop: "lastTransNumber" },
{ label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
{ label: "库区", prop: "locationArea" },
{ label: "库位组", prop: "locationGroup" },
{ label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
{ label: "到货时间", prop: "arriveDate",type:"dateTime" },
{ label: "仓库代码", prop: "warehouseCode" },
// ************** 确认隐藏 ************************
// { label: "ID", prop: 'id' },
// ************** 确认隐藏 ************************
]
// 库存事务 20230410
export const InventoryTransaction = [
{ label: "事务编号", prop: "transNumber" },

43
fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue

@ -1,5 +1,6 @@
<template>
<div class="page-box" v-loading="Loading.appMainLoading">
<!-- 无批量启用的库存余额页面 -->
<tablePagination
:currenButtonData="currenButtonData"
:tableData="tableData"
@ -9,7 +10,7 @@
:totalCount="totalCount"
:multipleSelection="multipleSelection"
:MaxResultCount="PageListParams.MaxResultCount"
@topbutton="topbuttonHandle"
@topbutton="topbutton"
@inlineDialog="inlineDialog"
@sortChange="sortChange"
@alertoldSkipCount="alertoldSkipCount"
@ -22,7 +23,6 @@
:primarySearchOption="primarySearchOption"
@overallSearchFormClick="overallSearchFormClick"
:httpOverallSearchData="httpOverallSearchData"
:tableSelection="true"
>
</tablePagination>
<!-- 新增与编辑 -->
@ -107,14 +107,6 @@ export default {
currenButtonData: [
this.defaultImportBtn(),//
this.defaultExportBtn(),//
{
type: "success",
icon: "el-icon-check",
label: "批量启用",
name: "batch-active",
size: "mini",
background:"#31bb99"
},
this.defaultFieldSettingBtn(),//
this.defaultFreshBtn(),//
this.defaultFilterBtn(),//
@ -207,37 +199,6 @@ export default {
});
}
},
topbuttonHandle(val,item){
//
if(val == 'batch-active'){
if(!this.multipleSelection || this.multipleSelection.length <= 0){
this.$warningMsg('请选择数据')
return
}
this.$confirm('此操作将启用已选 ('+this.multipleSelection.length+'条) 数据, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.Loading.tableLoading = true
let _ajaxs = []
this.multipleSelection.forEach(item=>{
_ajaxs.push(inventoryBalanceActive({id: item.id}))
})
Promise.all(_ajaxs).then((allData) => {
this.$successMsg('启用成功!')
this.Loading.tableLoading = false
this.paging()
}).catch((err)=>{
this.Loading.tableLoading = false
})
}).catch((err) => {
console.log(err)
});
}else{
this.topbutton(val,item)
}
},
// 0
// drawerHandle(val) {
// if (val == 'delete') {

290
fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalanceEdit.vue

@ -0,0 +1,290 @@
<template>
<div class="page-box" v-loading="Loading.appMainLoading">
<!-- 有批量启用的库存余额(/)页面 -->
<tablePagination
:currenButtonData="currenButtonData"
:tableData="tableData"
:tableLoading="Loading.tableLoading"
:tableColumns="tableColumns"
@rowDrop="rowDrop"
:totalCount="totalCount"
:multipleSelection="multipleSelection"
:MaxResultCount="PageListParams.MaxResultCount"
@topbutton="topbuttonHandle"
@inlineDialog="inlineDialog"
@sortChange="sortChange"
@alertoldSkipCount="alertoldSkipCount"
@alterResultCount="alterResultCount"
@handleSelectionChange="handleSelectionChange"
:currentPageProps="oldSkipCount"
:quicklySearchOption="quicklySearchOption"
@quicklySearchClick="quicklySearchClick"
@quicklySearchClear="quicklySearchClear"
:primarySearchOption="primarySearchOption"
@overallSearchFormClick="overallSearchFormClick"
:httpOverallSearchData="httpOverallSearchData"
:tableSelection="true"
>
</tablePagination>
<!-- 新增与编辑 -->
<!-- <newAndEdiDialog
:loading="Loading.newAndEdiLoading"
:active="active"
:pageStatus="pageStatus"
:formReveal="formReveal"
:formTitle="formTitle"
:displayDialog="editDialog"
:FormData="editFormData"
:Form="editForm"
:Options="editOptions"
:Handle="editHandle"
:Rules="editRules"
@FormSubmit="FormClick(arguments)"
@close="FormClose"
@goBack="goBack"
></newAndEdiDialog> -->
<!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
<!-- methodValue 导入方式默认选项 是否局部导入 默认选项 -->
<importFile
:loading="Loading.importLoading"
:show="displayDialog.importDialog"
:URL="URL"
:disabledMethod = {method1:false,method2:false,method3:false}
:disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
isAllowPartImportValue="1"
@importClick="postImportMergeClick(arguments)"
@postImportDown="importDown"
></importFile>
<curren-Drawer
:title="tableColumns"
:DrawerLoading="Loading.DrawerLoading"
:drawer="displayDialog.detailsDialog"
:Butttondata="DrawerButtonData"
:propsData="propsData"
:tabsDesTions="tabsDesTions"
@drawerShut="(val) => (displayDialog.detailsDialog = val)"
@drawerbutton="drawerbutton"
@handleCommand="drawerHandle"
@close-value="closeValue"
></curren-Drawer>
</div>
</template>
<script>
import { updateExpireDate, postDelete ,getDetailed,inventoryBalanceActive } from "@/api/wms-api"
import { tableMixins } from "@/mixins/TableMixins"
import { LoadingMixins } from "@/mixins/LoadingMixins"
import { drawerMixins } from "@/mixins/drawerMixins"
import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
import { mixins } from "@/mixins/mixins"
export default {
name: "InventoryBalanceEdit",
mixins: [
tableMixins,
LoadingMixins,
drawerMixins,
TableHeaderMixins,
mixins,
newAndEdiDialogMixins
],
computed: {
editDialog: {
get: function () {
return this.displayDialog.newDialog || this.displayDialog.editDialog;
},
},
//
hideButton: function () {
return function () {
return this.propsData.isActive
}
},
},
data () {
return {
showTableBaseFromFE:['configuration'],
URL: 'wms/inventory/inventory-balance',
//
currenButtonData: [
this.defaultImportBtn(),//
this.defaultExportBtn(),//
{
type: "success",
icon: "el-icon-check",
label: "批量启用",
name: "batch-active",
size: "mini",
background:"#31bb99"
},
this.defaultFieldSettingBtn(),//
this.defaultFreshBtn(),//
this.defaultFilterBtn(),//
],
DrawerButtonData: [
{
type: 'success',
icon: 'el-icon-check',
label: '启用',
hide: () => { return this.hideButton() },
name: "active",
size: 'mini'
},
],
//
// editFormData: {
// id: null,
// itemCode: null,
// itemName: null,
// itemDesc1: null,
// itemDesc2: null,
// produceDate: null,
// expireDate: null,
// locationCode: null,
// status: 1,
// lot: true,
// packingCode: true,
// containerCode: null,
// qty: null,
// locationArea: null,
// locationGroup: null,
// locationErpCode: null,
// putInTime: null,
// },
// editOptions: {},
// CreateForm: [
// { type: "input", label: "", prop: 'packingCode', colSpan: 12 },
// { type: "input", label: "", prop: 'sortingBase', colSpan: 12 },
// { type: "input", label: "", prop: 'serialNumber', colSpan: 12 },
// { type: "input", label: "", prop: 'lastCountPlanNumber', colSpan: 12 },
// { type: "input", label: "", prop: 'lastCountLabel', colSpan: 12 },
// { type: "input", label: "", prop: 'itemCode', colSpan: 12 },
// { type: "input", label: "", prop: 'batchCode', colSpan: 12 },
// { type: "input", label: "", prop: 'remark', colSpan: 12 },
// ],
// editForm: [
// { type: "input", label: "", prop: "itemCode", disabled:true, colSpan: 12 },
// { type: "input", label: "", prop: "itemName", disabled:true, colSpan: 12 },
// { type: "input", label: "", prop: "locationCode", disabled:true, colSpan: 12 },
// { type: "input", label: "", prop: "lot", disabled:true, colSpan: 12 },
// { type: "input", label: "", prop: "packingCode", disabled:true, colSpan: 12 },
// { type: "input", label: "", prop: "locationArea", disabled:true, colSpan: 12 },
// { type: "input", label: "", prop: "locationGroup", disabled:true, colSpan: 12 },
// { type: "dateTime", label: "", prop: "putInTime", disabled:true, colSpan: 12 },
// { type: "dateTime", label: "", prop: "produceDate", disabled:true, colSpan: 12 },
// { type: "dateTime", label: "", prop: "expireDate", colSpan: 12 },
// ],
// editRules: {
// expireDate: [{ required: true, trigger: "blur", message: "" }],
// },
};
},
mounted () {
this.paging();
},
methods: {
drawerbutton(val){
//
if(val == "active"){
this.$confirm('此操作将启用该数据, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.Loading.appMainLoading = true
inventoryBalanceActive({id: this.propsData.id}).then(res => {
this.$successMsg('启用成功!')
this.Loading.appMainLoading = false
this.displayDialog.detailsDialog = false
this.paging()
// getDetailed(this.propsData.id, this.URL).then(res => {
// this.propsData = res
// this.Loading.DrawerLoading = false
// })
}).catch(err => {
this.Loading.appMainLoading = false
})
}).catch((err) => {
console.log(err)
});
}
},
topbuttonHandle(val,item){
//
if(val == 'batch-active'){
if(!this.multipleSelection || this.multipleSelection.length <= 0){
this.$warningMsg('请选择数据')
return
}
this.$confirm('此操作将启用已选 ('+this.multipleSelection.length+'条) 数据, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.Loading.tableLoading = true
let _ajaxs = []
this.multipleSelection.forEach(item=>{
_ajaxs.push(inventoryBalanceActive({id: item.id}))
})
Promise.all(_ajaxs).then((allData) => {
this.$successMsg('启用成功!')
this.Loading.tableLoading = false
this.paging()
}).catch((err)=>{
this.Loading.tableLoading = false
})
}).catch((err) => {
console.log(err)
});
}else{
this.topbutton(val,item)
}
},
// 0
// drawerHandle(val) {
// if (val == 'delete') {
// if (this.propsData.qty == '0') {
// this.$confirm(', ?', '', {
// confirmButtonText: '',
// cancelButtonText: '',
// type: 'warning'
// }).then(() => {
// this.Loading.appMainLoading = true
// this.displayDialog.detailsDialog = false
// postDelete(this.propsData.id, this.URL).then(res => {
// this.$successMsg('!')
// this.Loading.appMainLoading = false
// this.paging()
// }).catch(err => {
// this.Loading.appMainLoading = false
// })
// }).catch(() => {
// });
// } else {
// this.$message({
// message: " 0 ",
// type: "warning",
// });
// }
// }
// },
//()
// FormClick (val) {
// let params = {
// id: this.editFormData.id,
// expireDate: this.editFormData.expireDate
// }
// updateExpireDate(params, this.URL).then( res => {
// this.displayDialog.editDialog = false
// this.$message.success("");
// this.paging();
// }).catch( err => {
// this.$message.success("");
// console.log(err)
// })
// }
},
};
</script>
<style lang="scss" scoped>
@import "../../../styles/basicData.scss";
</style>
Loading…
Cancel
Save