diff --git a/fe/PC/public/version.json b/fe/PC/public/version.json index 6d0f75797..a2f845c7c 100644 --- a/fe/PC/public/version.json +++ b/fe/PC/public/version.json @@ -1,3 +1,3 @@ { - "version": "1.0.15" + "version": "1.0.16" } \ No newline at end of file diff --git a/fe/PC/src/api/wms-core.js b/fe/PC/src/api/wms-core.js index 04dd36b43..d2e2a94d8 100644 --- a/fe/PC/src/api/wms-core.js +++ b/fe/PC/src/api/wms-core.js @@ -44,4 +44,13 @@ export function postSplitPacking(data) { method: 'post', data }) +} + +// 拆箱记录列表 +export function splitPackingList(data) { + return request({ + url: baseURL + 'wms/store/transfer-note/get-split-packing-list', + method: 'post', + data + }) } \ No newline at end of file diff --git a/fe/PC/src/mixins/TableHeaderMixins.js b/fe/PC/src/mixins/TableHeaderMixins.js index d5c6ef682..50fb4ecb7 100644 --- a/fe/PC/src/mixins/TableHeaderMixins.js +++ b/fe/PC/src/mixins/TableHeaderMixins.js @@ -200,9 +200,7 @@ export const TableHeaderMixins = { this.Loading.tableLoading = true; this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount; this.PageListParams.condition = {filters:_all_filters} - getPageList(this.PageListParams, this.URL).then(res => { - this.tableData = res.items - this.totalCount = res.totalCount + this.paging(()=>{ //快速搜索清空 if(_vm_quickly){_vm_quickly.searchNormalClear(true)} //关闭高级筛选 @@ -211,10 +209,22 @@ export const TableHeaderMixins = { this.httpOverallSearchData = {} this.httpOverallSearchData.params = JSON.parse(JSON.stringify(_data_primary)) this.httpOverallSearchData.moreList = JSON.parse(JSON.stringify(_data_moreList)) - this.pagingCallback() - }).catch(err => { - this.Loading.tableLoading = false }) + // getPageList(this.PageListParams, this.URL).then(res => { + // this.tableData = res.items + // this.totalCount = res.totalCount + // //快速搜索清空 + // if(_vm_quickly){_vm_quickly.searchNormalClear(true)} + // //关闭高级筛选 + // if(_vm_moreList){_vm_moreList.changeMoreListShow(false)} + // // 同步当前列表数据请求接口的筛选条件 + // this.httpOverallSearchData = {} + // this.httpOverallSearchData.params = JSON.parse(JSON.stringify(_data_primary)) + // this.httpOverallSearchData.moreList = JSON.parse(JSON.stringify(_data_moreList)) + // this.pagingCallback() + // }).catch(err => { + // this.Loading.tableLoading = false + // }) }, // 全面筛选所有按钮操作集 20230215 overallSearchFormClick(options){ diff --git a/fe/PC/src/mixins/TableMixins.js b/fe/PC/src/mixins/TableMixins.js index 95fa446be..0c300a7ba 100644 --- a/fe/PC/src/mixins/TableMixins.js +++ b/fe/PC/src/mixins/TableMixins.js @@ -41,13 +41,14 @@ export const tableMixins = { }, methods: { //渲染数据 - paging() { + paging(callback) { this.Loading.tableLoading = true; this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount, getPageList(this.PageListParams, this.URL).then(res => { this.tableData = res.items this.totalCount = res.totalCount this.pagingCallback() + if(callback)callback() }).catch(err => { this.Loading.tableLoading = false }) @@ -101,6 +102,7 @@ export const tableMixins = { } else { this.propsData = res } + console.log(105,this.propsData) this.inlineDialogCallback() }).catch(err => { this.Loading.DrawerLoading = false diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js index 9867553c3..e418d64e4 100644 --- a/fe/PC/src/router/index.js +++ b/fe/PC/src/router/index.js @@ -135,21 +135,21 @@ export const constantRoutes = [ }] }, // 开发中模拟路由 - { - path: '/', - component: Layout, - redirect: '/splitLabels', - hidden: true, - children: [{ - path: 'splitLabels', - component: () => import('@/views/labelManage/PartiallyPreparedProducts/splitLabels.vue'), - name: 'splitLabels', - meta: { - title: 'splitLabels', - icon: '拆分箱标签', - } - }] - }, + // { + // path: '/', + // component: Layout, + // redirect: '/splitPackingList', + // hidden: true, + // children: [{ + // path: 'splitPackingList', + // component: () => import('@/views/inventoryManage/InventoryQuery/splitPackingList.vue'), + // name: 'splitPackingList', + // meta: { + // title: 'splitPackingList', + // icon: '拆分记录', + // } + // }] + // }, // { // path: '/', // component: Layout, diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index 27a27af14..15563d999 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -3129,4 +3129,47 @@ export const safetyStockWarning = [ { label: "创建时间", prop: "creationTime",type: "dateTime",showProp: true }, { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime',showProp: true }, { label: "备注", prop: 'remark' }, +] + +// 拆箱记录 +export const splitPackingList = [ + { + label: "单号", + prop: "number", + fixed: "left", + type: "name" + }, + { label: "原箱码", prop: "fromPackingCode" }, + { label: "新签箱码", prop: "toPackingCode" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, + { label: "创建时间", prop: 'creationTime', type:'dateTime' }, + { label: "标包数量", prop: "stdPackQty" }, + { label: "数量", prop: "qty" }, + { label: "单位", prop: "uom" }, + { label: "供应商批次", prop: "supplierBatch" }, + { label: "原库区", prop: "fromLocationArea" }, + { label: "新签库区", prop: "toLocationArea" }, + { label: "原库位代码", prop: "fromLocationCode" }, + { label: "新签库位代码", prop: "toLocationCode" }, + { label: "原ERP库位", prop: "fromLocationErpCode" }, + { label: "新签ERP库位", prop: "toLocationErpCode" }, + { label: "原库位组", prop: "fromLocationGroup" }, + { label: "新签库位组", prop: "toLocationGroup" }, + { label: "原批次", prop: "fromLot" }, + { label: "新签批次", prop: "toLot" }, + { label: "生产日期", prop: "produceDate",type: "dateTime" }, + { label: "过期时间", prop: "expireDate",type: "dateTime" }, + { label: "原器具号", prop: 'fromContainerCode' }, + { label: "新签器具号", prop: 'toContainerCode' }, + { label: "原状态", prop: "fromStatus",type: "filter", filters: "inventoryStage" }, + { label: "新签状态", prop: "toStatus",type: "filter", filters: "inventoryStage" }, + // { label: "原仓库代码", prop: "fromWarehouseCode" }, + // { label: "新签仓库代码", prop: "toWarehouseCode" }, + { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: "备注", prop: 'remark' }, + { label: "原因", prop: 'reason' }, + // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, ] \ No newline at end of file diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 5b9032ea9..ae96d2d09 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -2771,6 +2771,21 @@ export const safetyStockWarning = [ { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" }, ] +// 拆箱记录 +export const splitPackingList = [ + { + label: "单号", + prop: "number", + fixed: "left", + type: "name" + }, + { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: "创建时间", prop: 'creationTime', type:'dateTime' }, + { label: "备注", prop: 'remark' }, + { label: "操作员", prop: 'worker' }, + // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, +] + // 非生产领料申请 20230417 export const pickingRequest = [ { diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index acf8633f3..c791c6b88 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -2005,6 +2005,21 @@ export const safetyStockWarning = [ { label: "备注", prop: 'remark' }, ] +// 拆箱记录 +export const splitPackingList = [ + { + label: "单号", + prop: "number", + fixed: "left", + type: "name" + }, + { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: "创建时间", prop: 'creationTime', type:'dateTime' }, + { label: "备注", prop: 'remark' }, + { label: "操作员", prop: 'worker' }, + // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, +] + // 非生产领料申请 20230417 export const pickingRequest = [ { label: "领料单号码", prop: "number" }, diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/splitPackingList.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/splitPackingList.vue new file mode 100644 index 000000000..3d5728862 --- /dev/null +++ b/fe/PC/src/views/inventoryManage/InventoryQuery/splitPackingList.vue @@ -0,0 +1,149 @@ + + + + + \ No newline at end of file