diff --git a/fe/PC/src/api/wms-api.js b/fe/PC/src/api/wms-api.js index bc2f58d28..8f8c59486 100644 --- a/fe/PC/src/api/wms-api.js +++ b/fe/PC/src/api/wms-api.js @@ -409,11 +409,20 @@ export function notifyMessage(params, id) { }) } -// 库存-启用 | 库存余额 -export function inventoryBalanceActive(id) { +// 库存-启用 | 库存余额 +// export function inventoryBalanceActive(id) { +// return request({ +// url: baseURL + 'wms/inventory/inventory-balance/active?id=' + id, +// method: 'post', +// }) +// } + +// 库存-启用 | 库存余额 改 +export function inventoryBalanceActive(params) { return request({ - url: baseURL + 'wms/inventory/inventory-balance/active?id=' + id, + url: baseURL + 'wms/inventory/inventory-balance/' + params.id + '/active', method: 'post', + params: params, }) } diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index acc6c7964..718f06e1f 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -3078,7 +3078,6 @@ export const lineSideWarehouseAdjustmentSheetNote = [ { label: "调整原因代码", prop:"reasonCode" }, { label: "调整原因说明", prop:"reasonCode", type: "filter", filters: "getDict" , dictType:"AdjustmentReason" }, // ----------------------------------------------------------------------- - { label: "标包数量", prop: 'stdPackQty' }, { label: "供应商批次", prop: "supplierBatch" }, { label: "到货时间", prop: "arriveDate",type: "dateTime" }, { label: "生产时间", prop: 'produceDate', type: "dateTime" }, @@ -3107,11 +3106,14 @@ export const lineSideWarehouseAdjustmentSheetNote = [ { label: "目标仓库", prop: 'toWarehouseCode' }, { label: "目标ERP库位", prop: 'toLocationErpCode' }, { label: "原因", prop: 'reason' }, - { label: "fromStatus", prop: 'fromStatus' }, - { label: "toStatus", prop: 'toStatus' }, { label: "事务ID", prop: "tenantId" }, { label: "主表ID", prop: "masterID" }, { label: "ID", prop: 'id' }, + // ************** 临时隐藏 ************************ + // { label: "标包数量", prop: 'stdPackQty' }, + // { label: "fromStatus", prop: 'fromStatus' }, + // { label: "toStatus", prop: 'toStatus' }, + // ************** 临时隐藏 ************************ // { label: "仓库", prop: 'warehouseCode' }, // { label: "盘点标签", prop: "containerCode" }, // { label: "盘点数量", prop: "countQty" }, diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 1b8e58d89..e2bc6e916 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -3461,11 +3461,13 @@ export const lineSideWarehouseAdjustmentSheetNote = [ { label: "上次修改者ID", prop: "lastModifierId" }, { label: "调整单号", prop: "requestNumber",width: orderWidth }, { label: "备注", prop: 'remark' }, - // { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, - // { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "任务ID", prop: 'jobNumber',width: orderWidth }, { label: "事务ID", prop: "tenantId" }, { label: "类型", prop: 'type' }, + // ************** 临时隐藏 ************************ + // { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, + // { label: "确认时间", prop: "confirmTime",type:"dateTime" }, + // ************** 临时隐藏 ************************ // { label: "盘点记录单号", prop: 'countNoteNumber', width: orderWidth }, // { label: "盘点计划单号", prop: "countPlanNumber",width: orderWidth }, // { label: "公司", prop: 'company' }, diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue index ff0461cf3..2c3dafad8 100644 --- a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue +++ b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue @@ -93,11 +93,11 @@ export default { }, }, //按钮显示 - // hideButton: function () { - // return function () { - // return this.propsData.isActive - // } - // }, + hideButton: function () { + return function () { + return this.propsData.isActive + } + }, }, data () { return { @@ -111,14 +111,14 @@ export default { this.defaultFilterBtn(),//筛选 ], DrawerButtonData: [ - // { - // type: 'success', - // icon: 'el-icon-check', - // label: '启用', - // hide: () => { return this.hideButton() }, - // name: "active", - // size: 'mini' - // }, + { + type: 'success', + icon: 'el-icon-check', + label: '启用', + hide: () => { return this.hideButton() }, + name: "active", + size: 'mini' + }, ], //编辑 // editFormData: { @@ -172,32 +172,32 @@ export default { 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({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) + }); + } + }, //抽屉下拉按钮操作 库存余额删除 只能删除库存数量为0的记录 // drawerHandle(val) { // if (val == 'delete') {