diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index f41081862..02f78b00c 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -2569,7 +2569,7 @@ export const InventoryInitialNote = [ { label: "生效日期", prop: "activeDate" }, { label: "库存初始化请求单号", prop: "requestNumber" }, ] -// 库存余额 +// 库存余额 20230407 export const InventoryBalance = [ { label: "物品代码", @@ -2594,9 +2594,21 @@ export const InventoryBalance = [ { 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: "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' }, ] // 库存事务 export const InventoryTransaction = [ diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index dd8f8590c..7006a7904 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -1933,7 +1933,7 @@ export const InventoryInitialNote = [ { label: "ID", prop: 'id' }, // ----------------------------------------------------------------------- ] -// 库存余额 1 +// 库存余额 20230407 export const InventoryBalance = [ { label: "物品代码", prop: 'itemCode' }, { label: "物品名称", prop: "itemName" }, @@ -1950,27 +1950,27 @@ export const InventoryInitialNote = [ { 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: "lastCountTime", type: "dateTime" }, + { label: "最后盘点计划单号", prop: "lastCountPlanNumber" }, + { label: "最后盘点标签号", prop: "lastCountLabel" }, // ----------------------------------------------------------------------- { label: "物品描述", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "标包计量单位", prop: 'stdPackUom' }, + // { label: "标包计量单位", prop: 'stdPackUom' }, { 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: "transType", type: "filter", filters: "TransTypeBase" }, + { 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: "company" }, + { label: "到货时间", prop: "arriveDate",type:"dateTime" }, + // { label: "公司", prop: "company" }, { label: "仓库", prop: "warehouseCode" }, { label: "ID", prop: "id" }, // ----------------------------------------------------------------------- diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue index d33e8be87..ff0461cf3 100644 --- a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue +++ b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue @@ -25,7 +25,7 @@ > - + > --> { return this.hideButton() }, - name: "active", - size: 'mini' - }, + // { + // 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: "不可为空" }], - }, + // 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(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) - }); - } - }, + // drawerbutton(val){ + // // 启用 + // if(val == "active"){ + // this.$confirm('此操作将启用该数据, 是否继续?', '提示', { + // confirmButtonText: '确定', + // cancelButtonText: '取消', + // type: 'warning' + // }).then(() => { + // this.Loading.appMainLoading = true + // inventoryBalanceActive(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) + // }); + // } + // }, //抽屉下拉按钮操作 库存余额删除 只能删除库存数量为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", - }); - } - } - }, + // 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) - }) - } + // 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) + // }) + // } }, };