Browse Source

拆分记录+高级筛选特殊接口问题更改

dev_web_online
安虹睿 2 years ago
parent
commit
6600509f51
  1. 2
      fe/PC/public/version.json
  2. 9
      fe/PC/src/api/wms-core.js
  3. 22
      fe/PC/src/mixins/TableHeaderMixins.js
  4. 4
      fe/PC/src/mixins/TableMixins.js
  5. 30
      fe/PC/src/router/index.js
  6. 43
      fe/PC/src/utils/detailsTableColumns/index.js
  7. 15
      fe/PC/src/utils/tableColumns/index.js
  8. 15
      fe/PC/src/utils/tabsDesTions/index.js
  9. 149
      fe/PC/src/views/inventoryManage/InventoryQuery/splitPackingList.vue

2
fe/PC/public/version.json

@ -1,3 +1,3 @@
{ {
"version": "1.0.15" "version": "1.0.16"
} }

9
fe/PC/src/api/wms-core.js

@ -45,3 +45,12 @@ export function postSplitPacking(data) {
data data
}) })
} }
// 拆箱记录列表
export function splitPackingList(data) {
return request({
url: baseURL + 'wms/store/transfer-note/get-split-packing-list',
method: 'post',
data
})
}

22
fe/PC/src/mixins/TableHeaderMixins.js

@ -200,9 +200,7 @@ export const TableHeaderMixins = {
this.Loading.tableLoading = true; this.Loading.tableLoading = true;
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount; this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount;
this.PageListParams.condition = {filters:_all_filters} this.PageListParams.condition = {filters:_all_filters}
getPageList(this.PageListParams, this.URL).then(res => { this.paging(()=>{
this.tableData = res.items
this.totalCount = res.totalCount
//快速搜索清空 //快速搜索清空
if(_vm_quickly){_vm_quickly.searchNormalClear(true)} if(_vm_quickly){_vm_quickly.searchNormalClear(true)}
//关闭高级筛选 //关闭高级筛选
@ -211,10 +209,22 @@ export const TableHeaderMixins = {
this.httpOverallSearchData = {} this.httpOverallSearchData = {}
this.httpOverallSearchData.params = JSON.parse(JSON.stringify(_data_primary)) this.httpOverallSearchData.params = JSON.parse(JSON.stringify(_data_primary))
this.httpOverallSearchData.moreList = JSON.parse(JSON.stringify(_data_moreList)) 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 // 全面筛选所有按钮操作集 20230215
overallSearchFormClick(options){ overallSearchFormClick(options){

4
fe/PC/src/mixins/TableMixins.js

@ -41,13 +41,14 @@ export const tableMixins = {
}, },
methods: { methods: {
//渲染数据 //渲染数据
paging() { paging(callback) {
this.Loading.tableLoading = true; this.Loading.tableLoading = true;
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount, this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
getPageList(this.PageListParams, this.URL).then(res => { getPageList(this.PageListParams, this.URL).then(res => {
this.tableData = res.items this.tableData = res.items
this.totalCount = res.totalCount this.totalCount = res.totalCount
this.pagingCallback() this.pagingCallback()
if(callback)callback()
}).catch(err => { }).catch(err => {
this.Loading.tableLoading = false this.Loading.tableLoading = false
}) })
@ -101,6 +102,7 @@ export const tableMixins = {
} else { } else {
this.propsData = res this.propsData = res
} }
console.log(105,this.propsData)
this.inlineDialogCallback() this.inlineDialogCallback()
}).catch(err => { }).catch(err => {
this.Loading.DrawerLoading = false this.Loading.DrawerLoading = false

30
fe/PC/src/router/index.js

@ -135,21 +135,21 @@ export const constantRoutes = [
}] }]
}, },
// 开发中模拟路由 // 开发中模拟路由
{ // {
path: '/', // path: '/',
component: Layout, // component: Layout,
redirect: '/splitLabels', // redirect: '/splitPackingList',
hidden: true, // hidden: true,
children: [{ // children: [{
path: 'splitLabels', // path: 'splitPackingList',
component: () => import('@/views/labelManage/PartiallyPreparedProducts/splitLabels.vue'), // component: () => import('@/views/inventoryManage/InventoryQuery/splitPackingList.vue'),
name: 'splitLabels', // name: 'splitPackingList',
meta: { // meta: {
title: 'splitLabels', // title: 'splitPackingList',
icon: '拆分箱标签', // icon: '拆分记录',
} // }
}] // }]
}, // },
// { // {
// path: '/', // path: '/',
// component: Layout, // component: Layout,

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

@ -3130,3 +3130,46 @@ export const safetyStockWarning = [
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime',showProp: true }, { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime',showProp: true },
{ label: "备注", prop: 'remark' }, { 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" },
]

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

@ -2771,6 +2771,21 @@ export const safetyStockWarning = [
{ label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" }, { 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 // 非生产领料申请 20230417
export const pickingRequest = [ export const pickingRequest = [
{ {

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

@ -2005,6 +2005,21 @@ export const safetyStockWarning = [
{ label: "备注", prop: 'remark' }, { 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 // 非生产领料申请 20230417
export const pickingRequest = [ export const pickingRequest = [
{ label: "领料单号码", prop: "number" }, { label: "领料单号码", prop: "number" },

149
fe/PC/src/views/inventoryManage/InventoryQuery/splitPackingList.vue

@ -0,0 +1,149 @@
<template>
<div class="page-box" v-loading="Loading.appMainLoading">
<tablePagination
:currenButtonData="currenButtonData"
:tableData="tableData"
:tableLoading="Loading.tableLoading"
:tableColumns="tableColumns"
@rowDrop="rowDrop"
:tableSelection="false"
:totalCount="totalCount"
:multipleSelection="multipleSelection"
:MaxResultCount="PageListParams.MaxResultCount"
@topbutton="topbutton"
@inlineDialog="inlineDialog"
@sortChange="sortChange"
@alertoldSkipCount="alertoldSkipCount"
@alterResultCount="alterResultCount"
@handleSelectionChange="handleSelectionChange"
:currentPageProps="oldSkipCount"
:quicklySearchOption="quicklySearchOption"
@quicklySearchClick="quicklySearchClick"
@quicklySearchClear="quicklySearchClear"
:primarySearchOption="primarySearchOption"
@overallSearchFormClick="overallSearchFormClick"
:httpOverallSearchData="httpOverallSearchData"
>
</tablePagination>
<!-- 新导入 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"
:propsData="propsData"
:tabsDesTions="tabsDesTions"
:Butttondata="[]"
@drawerShut="(val) => (displayDialog.detailsDialog = val)"
@handleCommand="drawerHandle"
@close-value="closeValue"
:currenButtonData="currenButtonData"
:tableColumns="detailsTableColumns"
@handleSelectionChange="handleSelectionChange"
@inlineDialog="inlineDialog"
:totalCount="totalCountDetails"
:MaxResultCount="MaxResultCountDetails"
@alterResultCountDetails="alterResultCountDetails"
@alertoldSkipCountDetails="alertoldSkipCountDetails"
></curren-Drawer>
</div>
</template>
<script>
import { getPageListWip } 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 { mixins } from "@/mixins/mixins"
export default {
name: "splitPackingList",
mixins: [
tableMixins,
LoadingMixins,
drawerMixins,
TableHeaderMixins,
mixins,
],
computed: {
editDialog: {
get: function () {
return this.displayDialog.newDialog || this.displayDialog.editDialog;
},
},
},
data () {
return {
URL: 'wms/store/transfer-note/get-split-packing-list',
//
currenButtonData: [
// this.defaultImportBtn(),//
// this.defaultExportBtn(),//
this.defaultFieldSettingBtn(),//
this.defaultFreshBtn(),//
this.defaultFilterBtn(),//
],
};
},
mounted () {
this.paging();
},
methods:{
//
paging() {
this.Loading.tableLoading = true;
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-split-packing-list?includeDetails=true')
.then(res => {
this.tableData = res.items
this.totalCount = res.totalCount
this.pagingCallback()
})
.catch(err => {
this.Loading.tableLoading = false
})
},
//
inlineDialog(val) {
//
this.Loading.DrawerLoading = true
this.displayDialog.detailsDialog = true;
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
this.PageListParams.condition = {filters:[ {
logic: "And",
column: "number",
action: "==",
value: val.number
}]}
getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-split-packing-list?includeDetails=true').then(res => {
this.propsData = res.items[0]
console.log(130,this.propsData)
this.Loading.DrawerLoading = false
}).catch(err => {
this.Loading.DrawerLoading = false
})
},
}
};
</script>
<style lang="scss" scoped>
@import "../../../styles/mainbasicData.scss";
</style>
<style lang="scss">
// .SupplierAsnPage{
// .el-dialog__body{
// padding-top:10px !important
// }
// }
</style>
Loading…
Cancel
Save