zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

库存余额字段+业务调整

dev_web_online
安虹睿 2 years ago
parent
25a1fdf8da
commit
ff2e664dd5
3 changed files with 152 additions and 140 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      fe/PC/src/utils/tableColumns/index.js
  2. 18
      fe/PC/src/utils/tabsDesTions/index.js
  3. 254
      fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue

20
fe/PC/src/utils/tableColumns/index.js
View File

@ -2569,7 +2569,7 @@ export const InventoryInitialNote = [
{ label: "生效日期", prop: "activeDate" }, { label: "生效日期", prop: "activeDate" },
{ label: "库存初始化请求单号", prop: "requestNumber" }, { label: "库存初始化请求单号", prop: "requestNumber" },
] ]
// 库存余额 // 库存余额 20230407
export const InventoryBalance = [ export const InventoryBalance = [
{ {
label: "物品代码", label: "物品代码",
@ -2594,9 +2594,21 @@ export const InventoryBalance = [
{ label: "入库时间", prop: "putInTime", type: "dateTime" }, { label: "入库时间", prop: "putInTime", type: "dateTime" },
{ label: "过期日期", prop: "expireDate" ,type: "dateTime" }, { label: "过期日期", prop: "expireDate" ,type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "上次盘点时间", prop: "lastCountTime",type: "dateTime" }, { label: "最后盘点时间", prop: "lastCountTime",type: "dateTime" },
{ label: "上次盘点单号", prop: "lastCountPlanNumber",width: orderWidth }, { label: "最后盘点计划单号", prop: "lastCountPlanNumber",width: orderWidth },
{ label: "上次盘点标签号", prop: "lastCountLabel" }, { 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' },
] ]
// 库存事务 // 库存事务
export const InventoryTransaction = [ export const InventoryTransaction = [

18
fe/PC/src/utils/tabsDesTions/index.js
View File

@ -1933,7 +1933,7 @@ export const InventoryInitialNote = [
{ label: "ID", prop: 'id' }, { label: "ID", prop: 'id' },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
] ]
// 库存余额 1 // 库存余额 20230407
export const InventoryBalance = [ export const InventoryBalance = [
{ label: "物品代码", prop: 'itemCode' }, { label: "物品代码", prop: 'itemCode' },
{ label: "物品名称", prop: "itemName" }, { label: "物品名称", prop: "itemName" },
@ -1950,27 +1950,27 @@ export const InventoryInitialNote = [
{ label: "入库时间", prop: "putInTime", type: "dateTime" }, { label: "入库时间", prop: "putInTime", type: "dateTime" },
{ label: "过期日期", prop: "expireDate" ,type: "dateTime" }, { label: "过期日期", prop: "expireDate" ,type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "上次盘点时间", prop: "lastCountTime", type: "dateTime" }, { label: "最后盘点时间", prop: "lastCountTime", type: "dateTime" },
{ label: "上次盘点单号", prop: "lastCountPlanNumber" }, { label: "最后盘点计划单号", prop: "lastCountPlanNumber" },
{ label: "上次盘点标签号", prop: "lastCountLabel" }, { label: "最后盘点标签号", prop: "lastCountLabel" },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
{ label: "物品描述", prop: "itemDesc1" }, { label: "物品描述", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: "物品描述2", prop: "itemDesc2" },
{ label: "标包数量", prop: 'stdPackQty' }, { label: "标包数量", prop: 'stdPackQty' },
{ label: "标包计量单位", prop: 'stdPackUom' }, // { label: "标包计量单位", prop: 'stdPackUom' },
{ label: "供应商批次", prop: 'supplierBatch' }, { label: "供应商批次", prop: 'supplierBatch' },
{ label: "事务ID", prop: "tenantId" }, { label: "事务ID", prop: "tenantId" },
{ label: "序号", prop: "serialNumber" }, { label: "序号", prop: "serialNumber" },
{ label: "备注", prop: 'remark' }, { label: "备注", prop: 'remark' },
{ label: "创建者ID", prop: "creatorId" }, { label: "创建者ID", prop: "creatorId" },
{ label: "上次修改者ID", prop: "lastModifierId" }, { label: "上次修改者ID", prop: "lastModifierId" },
{ label: "上次事务编号", prop: "lastTransNumber" }, { label: "最后事务编号", prop: "lastTransNumber" },
{ label: "上次事务类型", prop: "transType", type: "filter", filters: "TransTypeBase" }, { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
{ label: "库区", prop: "locationArea" }, { label: "库区", prop: "locationArea" },
{ label: "库位组", prop: "locationGroup" }, { label: "库位组", prop: "locationGroup" },
{ label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" }, { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
{ label: "到达时间", prop: "arriveDate",type:"dateTime" }, { label: "到货时间", prop: "arriveDate",type:"dateTime" },
{ label: "公司", prop: "company" }, // { label: "公司", prop: "company" },
{ label: "仓库", prop: "warehouseCode" }, { label: "仓库", prop: "warehouseCode" },
{ label: "ID", prop: "id" }, { label: "ID", prop: "id" },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------

254
fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue
View File

@ -25,7 +25,7 @@
> >
</tablePagination> </tablePagination>
<!-- 新增与编辑 --> <!-- 新增与编辑 -->
<newAndEdiDialog <!-- <newAndEdiDialog
:loading="Loading.newAndEdiLoading" :loading="Loading.newAndEdiLoading"
:active="active" :active="active"
:pageStatus="pageStatus" :pageStatus="pageStatus"
@ -40,7 +40,7 @@
@FormSubmit="FormClick(arguments)" @FormSubmit="FormClick(arguments)"
@close="FormClose" @close="FormClose"
@goBack="goBack" @goBack="goBack"
></newAndEdiDialog> ></newAndEdiDialog> -->
<!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用--> <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
<!-- methodValue 导入方式默认选项 是否局部导入 默认选项 --> <!-- methodValue 导入方式默认选项 是否局部导入 默认选项 -->
<importFile <importFile
@ -93,11 +93,11 @@ export default {
}, },
}, },
//按钮显示 //按钮显示
hideButton: function () { // hideButton: function () {
return function () { // return function () {
return this.propsData.isActive // return this.propsData.isActive
} // }
}, // },
}, },
data () { data () {
return { return {
@ -111,136 +111,136 @@ export default {
this.defaultFilterBtn(),//筛选 this.defaultFilterBtn(),//筛选
], ],
DrawerButtonData: [ DrawerButtonData: [
{ // {
type: 'success', // type: 'success',
icon: 'el-icon-check', // icon: 'el-icon-check',
label: '启用', // label: '启用',
hide: () => { return this.hideButton() }, // hide: () => { return this.hideButton() },
name: "active", // name: "active",
size: 'mini' // size: 'mini'
}, // },
], ],
//编辑 //编辑
editFormData: { // editFormData: {
id: null, // id: null,
itemCode: null, // itemCode: null,
itemName: null, // itemName: null,
itemDesc1: null, // itemDesc1: null,
itemDesc2: null, // itemDesc2: null,
produceDate: null, // produceDate: null,
expireDate: null, // expireDate: null,
locationCode: null, // locationCode: null,
status: 1, // status: 1,
lot: true, // lot: true,
packingCode: true, // packingCode: true,
containerCode: null, // containerCode: null,
qty: null, // qty: null,
locationArea: null, // locationArea: null,
locationGroup: null, // locationGroup: null,
locationErpCode: null, // locationErpCode: null,
putInTime: null, // putInTime: null,
}, // },
editOptions: {}, // editOptions: {},
CreateForm: [ // CreateForm: [
{ type: "input", label: "箱标签", prop: 'packingCode', colSpan: 12 }, // { type: "input", label: "箱标签", prop: 'packingCode', colSpan: 12 },
{ type: "input", label: "排序依次", prop: 'sortingBase', colSpan: 12 }, // { type: "input", label: "排序依次", prop: 'sortingBase', colSpan: 12 },
{ type: "input", label: "序号", prop: 'serialNumber', colSpan: 12 }, // { type: "input", label: "序号", prop: 'serialNumber', colSpan: 12 },
{ type: "input", label: "最后盘点计划", prop: 'lastCountPlanNumber', colSpan: 12 }, // { type: "input", label: "最后盘点计划", prop: 'lastCountPlanNumber', colSpan: 12 },
{ type: "input", label: "最后盘点标签", prop: 'lastCountLabel', colSpan: 12 }, // { type: "input", label: "最后盘点标签", prop: 'lastCountLabel', colSpan: 12 },
{ type: "input", label: "物品代码", prop: 'itemCode', colSpan: 12 }, // { type: "input", label: "物品代码", prop: 'itemCode', colSpan: 12 },
{ type: "input", label: "批次编号", prop: 'batchCode', colSpan: 12 }, // { type: "input", label: "批次编号", prop: 'batchCode', colSpan: 12 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 }, // { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
], // ],
editForm: [ // editForm: [
{ type: "input", label: "物品代码", prop: "itemCode", disabled:true, colSpan: 12 }, // { type: "input", label: "物品代码", prop: "itemCode", disabled:true, colSpan: 12 },
{ type: "input", label: "物品名称", prop: "itemName", 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: "locationCode", disabled:true, colSpan: 12 },
{ type: "input", label: "批次", prop: "lot", 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: "packingCode", disabled:true, colSpan: 12 },
{ type: "input", label: "库区", prop: "locationArea", disabled:true, colSpan: 12 }, // { type: "input", label: "库区", prop: "locationArea", disabled:true, colSpan: 12 },
{ type: "input", label: "库位组", prop: "locationGroup", 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: "putInTime", disabled:true, colSpan: 12 },
{ type: "dateTime", label: "生产日期", prop: "produceDate", disabled:true, colSpan: 12 }, // { type: "dateTime", label: "生产日期", prop: "produceDate", disabled:true, colSpan: 12 },
{ type: "dateTime", label: "过期日期", prop: "expireDate", colSpan: 12 }, // { type: "dateTime", label: "过期日期", prop: "expireDate", colSpan: 12 },
], // ],
editRules: { // editRules: {
expireDate: [{ required: true, trigger: "blur", message: "不可为空" }], // expireDate: [{ required: true, trigger: "blur", message: "不可为空" }],
}, // },
}; };
}, },
mounted () { mounted () {
this.paging(); this.paging();
}, },
methods: { methods: {
drawerbutton(val){ // drawerbutton(val){
// 启用 // // 启用
if(val == "active"){ // if(val == "active"){
this.$confirm('此操作将启用该数据, 是否继续?', '提示', { // this.$confirm('此操作将启用该数据, 是否继续?', '提示', {
confirmButtonText: '确定', // confirmButtonText: '确定',
cancelButtonText: '取消', // cancelButtonText: '取消',
type: 'warning' // type: 'warning'
}).then(() => { // }).then(() => {
this.Loading.appMainLoading = true // this.Loading.appMainLoading = true
inventoryBalanceActive(this.propsData.id).then(res => { // inventoryBalanceActive(this.propsData.id).then(res => {
this.$successMsg('启用成功!') // this.$successMsg('启用成功!')
this.Loading.appMainLoading = false // this.Loading.appMainLoading = false
this.displayDialog.detailsDialog = false // this.displayDialog.detailsDialog = false
this.paging() // this.paging()
// getDetailed(this.propsData.id, this.URL).then(res => { // // getDetailed(this.propsData.id, this.URL).then(res => {
// this.propsData = res // // this.propsData = res
// this.Loading.DrawerLoading = false // // this.Loading.DrawerLoading = false
// }) // // })
}).catch(err => { // }).catch(err => {
this.Loading.appMainLoading = false // this.Loading.appMainLoading = false
}) // })
}).catch((err) => { // }).catch((err) => {
console.log(err) // console.log(err)
}); // });
} // }
}, // },
//抽屉下拉按钮操作 库存余额删除 只能删除库存数量为0的记录 //抽屉下拉按钮操作 库存余额删除 只能删除库存数量为0的记录
drawerHandle(val) { // drawerHandle(val) {
if (val == 'delete') { // if (val == 'delete') {
if (this.propsData.qty == '0') { // if (this.propsData.qty == '0') {
this.$confirm('此操作将永久删除该消息, 是否继续?', '提示', { // this.$confirm('此操作将永久删除该消息, 是否继续?', '提示', {
confirmButtonText: '确定', // confirmButtonText: '确定',
cancelButtonText: '取消', // cancelButtonText: '取消',
type: 'warning' // type: 'warning'
}).then(() => { // }).then(() => {
this.Loading.appMainLoading = true // this.Loading.appMainLoading = true
this.displayDialog.detailsDialog = false // this.displayDialog.detailsDialog = false
postDelete(this.propsData.id, this.URL).then(res => { // postDelete(this.propsData.id, this.URL).then(res => {
this.$successMsg('删除成功!') // this.$successMsg('删除成功!')
this.Loading.appMainLoading = false // this.Loading.appMainLoading = false
this.paging() // this.paging()
}).catch(err => { // }).catch(err => {
this.Loading.appMainLoading = false // this.Loading.appMainLoading = false
}) // })
}).catch(() => { // }).catch(() => {
}); // });
} else { // } else {
this.$message({ // this.$message({
message: "只能删除库存数量为 0 的记录！！", // message: "只能删除库存数量为 0 的记录！！",
type: "warning", // type: "warning",
}); // });
} // }
} // }
}, // },
//点击表单提交(新增或编辑) //点击表单提交(新增或编辑)
FormClick (val) { // FormClick (val) {
let params = { // let params = {
id: this.editFormData.id, // id: this.editFormData.id,
expireDate: this.editFormData.expireDate // expireDate: this.editFormData.expireDate
} // }
updateExpireDate(params, this.URL).then( res => { // updateExpireDate(params, this.URL).then( res => {
this.displayDialog.editDialog = false // this.displayDialog.editDialog = false
this.$message.success("修改成功！"); // this.$message.success("修改成功！");
this.paging(); // this.paging();
}).catch( err => { // }).catch( err => {
this.$message.success("修改失败！"); // this.$message.success("修改失败！");
console.log(err) // console.log(err)
}) // })
} // }
}, },
}; };
</script> </script>

Write Preview
Loading…
Cancel
Save