Browse Source

Merge remote-tracking branch 'origin/master_hella' into master_hella

master_hella_20240701
高竟松 9 months ago
parent
commit
5d5cda8fb3
  1. 37
      src/api/home/index.ts
  2. 5
      src/api/wms/inventoryinitRecordDetail/index.ts
  3. 3
      src/api/wms/unplannedissueRecordDetail/index.ts
  4. 3
      src/api/wms/unplannedissueRequestDetail/index.ts
  5. 5
      src/components/BasicForm/src/BasicForm.vue
  6. 2
      src/config/axios/config.ts
  7. 14
      src/utils/disposition/defaultButtons.ts
  8. 1
      src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
  9. 23
      src/views/wms/basicDataManage/factoryModeling/dock/index.vue
  10. 4
      src/views/wms/basicDataManage/orderManage/team/team.data.ts
  11. 9
      src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts
  12. 20
      src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
  13. 20
      src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
  14. 7
      src/views/wms/inventoryManage/balance/index.vue
  15. 59
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
  16. 2
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts
  17. 149
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
  18. 2
      src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
  19. 2
      src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
  20. 2
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
  21. 2
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
  22. 58
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
  23. 2
      src/views/wms/reportList/index.vue

37
src/api/home/index.ts

@ -20,3 +20,40 @@ export const getProductData = async () => {
return await request.get({ url: `/wms/index/indexProduct` }) return await request.get({ url: `/wms/index/indexProduct` })
} }
// 超期库存预警
export const getOverdueBalance = async (params) => {
return await request.get({ url: `/wms/index/pageOverdueBalance`,params })
}
// 呆滞库存预警
export const getStagnantBalance = async (params) => {
return await request.get({ url: `/wms/index/pageStagnantBalance` ,params})
}
// 高低储预警
export const getWarningBalance = async (params) => {
return await request.get({ url: `/wms/index/pageWarningBalance` ,params})
}
// 本月退货明细
export const getPurchasereturnRecordMonth = async (params) => {
return await request.get({ url: `/wms/index/pagePurchasereturnRecordMonth`,params })
}
// 本月索赔明细
export const getPurchaseclaimRecordMonth = async (params) => {
return await request.get({ url: `/wms/index/pagePurchaseclaimRecordMonth`,params })
}
// 今日生产计划
export const getProductionToday = async (params) => {
return await request.get({ url: `/wms/index/pageProductionToday`,params })
}
// 线边安全库存
export const getSafeLocation = async (params) => {
return await request.get({ url: `/wms/index/pageSafeLocation`,params })
}
// 待上架成品库存
export const getProductputawayJobDetail = async (params) => {
return await request.get({ url: `/wms/index/pageProductputawayJobDetail`,params })
}

5
src/api/wms/inventoryinitRecordDetail/index.ts

@ -72,4 +72,9 @@ export const exportInventoryinitRecordDetail = async (params) => {
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/inventoryinit-record-detail/get-import-template' }) return request.download({ url: '/wms/inventoryinit-record-detail/get-import-template' })
}
// 批量打印
export const printLabelBatchByIdSelection = async (data: any) => {
return await request.post({ url: `/wms/inventoryinit-record-main/printLabelBatchById` ,data})
} }

3
src/api/wms/unplannedissueRecordDetail/index.ts

@ -38,6 +38,9 @@ export const getUnplannedissueRecordDetailPage = async (params) => {
'action':'==', 'action':'==',
'value':'1' 'value':'1'
} }
if(!data.filters){
data.filters = []
}
data.filters.push(dataTypeCondition) data.filters.push(dataTypeCondition)
return await request.post({ url: '/wms/unplannedissue-record-detail/senior', data }) return await request.post({ url: '/wms/unplannedissue-record-detail/senior', data })
} else { } else {

3
src/api/wms/unplannedissueRequestDetail/index.ts

@ -33,6 +33,9 @@ export const getUnplannedissueRequestDetailPage = async (params) => {
'action':'==', 'action':'==',
'value':'1' 'value':'1'
} }
if(!data.filters){
data.filters = [];
}
data.filters.push(dataTypeCondition) data.filters.push(dataTypeCondition)
return await request.post({ url: '/wms/unplannedissue-request-detail/senior', data }) return await request.post({ url: '/wms/unplannedissue-request-detail/senior', data })
} else { } else {

5
src/components/BasicForm/src/BasicForm.vue

@ -130,6 +130,7 @@ import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
import TableForm from '@/components/TableForm/src/TableForm.vue' import TableForm from '@/components/TableForm/src/TableForm.vue'
import TableFormCountPlan from '@/components/TableFormCountPlan/src/TableFormCountPlan.vue' import TableFormCountPlan from '@/components/TableFormCountPlan/src/TableFormCountPlan.vue'
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
import { debounce } from 'lodash-es'
const props = defineProps({ const props = defineProps({
// //
@ -565,7 +566,9 @@ const buttonBaseClick = (val) => {
} }
// //
else if (val == 'save') { else if (val == 'save') {
submitForm() debounce(() => {
submitForm()
}, 2000)()
} }
// //
else if (val == 'close') { else if (val == 'close') {

2
src/config/axios/config.ts

@ -16,7 +16,7 @@ const config: {
/** /**
* *
*/ */
request_timeout: 30000, request_timeout: 300000,
/** /**
* *

14
src/utils/disposition/defaultButtons.ts

@ -492,7 +492,19 @@ export function mainListOrderPubBtn(option:any) {
hasPermi: '' hasPermi: ''
}) })
} }
// 主列表-订单流程-批量发布按钮
export function mainListSelectionOrderPubBtn(option:any) {
return __defaultBtnOption(option,{
label: t(`ts.发布`).replace('ts.', ''),
name: 'mainOrderSelectionPub',
hide: false,
type: 'primary',
color: '',
float:'left',
link: false, // 文本展现按钮
hasPermi: ''
})
}
// 主列表-订单流程-关闭按钮 // 主列表-订单流程-关闭按钮
export function mainListOrderCloBtn(option:any) { export function mainListOrderCloBtn(option:any) {
return __defaultBtnOption(option,{ return __defaultBtnOption(option,{

1
src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts

@ -80,6 +80,7 @@ export const Dock = useCrudSchemas(reactive<CrudSchema[]>([
form: { form: {
// labelMessage: '信息提示说明!!!', // labelMessage: '信息提示说明!!!',
componentProps: { componentProps: {
enterSearch:true,
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择库位代码', // 输入框占位文本 searchListPlaceholder: '请选择库位代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段 searchField: 'code', // 查询弹窗赋值字段

23
src/views/wms/basicDataManage/factoryModeling/dock/index.vue

@ -48,6 +48,7 @@
:apiCreate="DockApi.createDock" :apiCreate="DockApi.createDock"
@searchTableSuccess="searchTableSuccess" @searchTableSuccess="searchTableSuccess"
:isBusiness="false" :isBusiness="false"
@onEnter="onEnter"
/> />
<!-- 详情 --> <!-- 详情 -->
@ -66,6 +67,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue' import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue' import Detail from '@/components/Detail/src/Detail.vue'
import * as LocationApi from '@/api/wms/location'
import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
defineOptions({ name: 'Dock' }) defineOptions({ name: 'Dock' })
@ -164,6 +167,26 @@ const openForm = (type: string, row?: any) => {
} }
basicFormRef.value.open(type, row) basicFormRef.value.open(type, row)
} }
const onEnter = async (field,value)=>{
console.log('onEnter',field,value)
if('defaultLocationCode'==field){
//
basicFormRef.value.opensearchTable('itemCode', 'code', '库位信息', Location.allSchemas, LocationApi.getLocationPage,[{
key: 'available',
value: 'TRUE',
action: '==',
isSearch: true,
isMainValue: false
},{
key: 'code',
value: value,
action: '==',
isSearch: true,
isMainValue: false
}])
}
}
// //
const searchTableSuccess = (formField, searchField, val, formRef) => { const searchTableSuccess = (formField, searchField, val, formRef) => {

4
src/views/wms/basicDataManage/orderManage/team/team.data.ts

@ -76,8 +76,8 @@ export const Team = useCrudSchemas(reactive<CrudSchema[]>([
field: 'available', field: 'available',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
isSearch: true, isSearch: false,
sort: 'custom', sort: 'custom',
form: { form: {
component: 'Switch', component: 'Switch',

9
src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts

@ -152,6 +152,15 @@ export const SubjectAccount = useCrudSchemas(reactive<CrudSchema[]>([
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
} }
}, },
form: {
component: 'DatePicker',
componentProps: {
style: {width:'100%'},
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
},
isForm: false, isForm: false,
}, },
{ {

20
src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts

@ -24,15 +24,15 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isSearch: true isSearch: true
}, },
{ // {
label: '盘点记录单号', // label: '盘点记录单号',
field: 'countRecordNumber', // field: 'countRecordNumber',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 180 // width: 180
}, // },
isSearch: true // isSearch: true
}, // },
{ {
label: '仓库代码', label: '仓库代码',
field: 'warehouseCode', field: 'warehouseCode',
@ -214,7 +214,7 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'available', field: 'available',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isSearch: true, isSearch: false,
isTable: true, isTable: true,
form: { form: {
component: 'Switch', component: 'Switch',

20
src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts

@ -55,16 +55,16 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
}, },
}, },
{ // {
label: '申请单号', // label: '申请单号',
field: 'requestNumber', // field: 'requestNumber',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
isSearch: true, // isSearch: true,
isForm: false, // isForm: false,
}, // },
{ {
label: '盘点记录单号', label: '盘点记录单号',
field: 'countRecordNumber', field: 'countRecordNumber',

7
src/views/wms/inventoryManage/balance/index.vue

@ -173,8 +173,14 @@ const handleSelectionPoint = async ()=>{
rows = [...rows,...item.selectionRows.map(item1=>item1.packingNumber)] rows = [...rows,...item.selectionRows.map(item1=>item1.packingNumber)]
}) })
console.log('批量打印',rows.join(',')) console.log('批量打印',rows.join(','))
let getLoading = ElLoading.service({
lock: true,
text: 'loading...',
background: 'rgba(0, 0, 0, 0.7)'
})
PackageApi.getBalanceToPackageSelection(rows).then(res => { PackageApi.getBalanceToPackageSelection(rows).then(res => {
console.log('res',res); console.log('res',res);
getLoading?.close()
if(res.zzLabel){ if(res.zzLabel){
// //
const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
@ -188,6 +194,7 @@ const handleSelectionPoint = async ()=>{
}).catch(err => { }).catch(err => {
console.log(err) console.log(err)
getLoading?.close()
}) })
// window.open(srcPoint.value+'&relateNumber='+rows.join(',')) // window.open(srcPoint.value+'&relateNumber='+rows.join(','))
} }

59
src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="[...InventoryinitRecordMain.allSchemas.searchSchema,...InventoryinitRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...InventoryinitRecordMain.allSchemas.searchSchema,...InventoryinitRecordDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -17,7 +17,8 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<Table v-clientTable <Table ref="tableRef" v-clientTable
:selection="true"
:columns="tableColumns" :columns="tableColumns"
:data="tableObject.tableList" :data="tableObject.tableList"
:loading="tableObject.loading" :loading="tableObject.loading"
@ -27,6 +28,7 @@
v-model:pageSize="tableObject.pageSize" v-model:pageSize="tableObject.pageSize"
v-model:currentPage="tableObject.currentPage" v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort" v-model:sort="tableObject.sort"
@getSelectionRows="getSelectionRows"
> >
<template #number="{row}"> <template #number="{row}">
<el-button type="primary" link @click="openDetail(row, '单据号', row.number)"> <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
@ -68,6 +70,8 @@ import * as InventoryinitRecordMainApi from '@/api/wms/inventoryinitRecordMain'
import * as InventoryinitRecordDetailApi from '@/api/wms/inventoryinitRecordDetail' import * as InventoryinitRecordDetailApi from '@/api/wms/inventoryinitRecordDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import { getAccessToken } from '@/utils/auth'
// //
defineOptions({ name: 'InventoryinitRecordMain' }) defineOptions({ name: 'InventoryinitRecordMain' })
@ -94,6 +98,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultExportBtn({hasPermi:'wms:inventoryinit-record-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:inventoryinit-record-main:export'}), //
defaultButtons.mainLisSelectiontPointBtn(null), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), // defaultButtons.defaultSetBtn(null), //
@ -120,6 +125,8 @@ const buttonBaseClick = (val, item) => {
getList() getList()
} }
} else if (val == 'filtrate') { // } else if (val == 'filtrate') { //
} else if (val=='selection_point'){//
handleSelectionPoint()
} else { // } else { //
console.log('其他按钮', item) console.log('其他按钮', item)
} }
@ -171,7 +178,55 @@ const searchFormClick = (searchData) => {
} }
getList() // getList() //
} }
const searchList = (model)=>{
selectionRows.value = []
setSearchParams(model)
}
const selectionRows = ref<any>([])
const tableRef = ref()
const getSelectionRows = (currentPage,currentPageSelectionRows) => {
console.log("getSelectionRows",currentPage,currentPageSelectionRows)
const currentRows = selectionRows.value.find(item=>item.currentPage==currentPage)
if(currentRows){
currentRows.selectionRows = currentPageSelectionRows
}else{
selectionRows.value.push({
currentPage,
selectionRows:currentPageSelectionRows
})
}
}
const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
const handleSelectionPoint = async ()=>{
let rows:any = []
selectionRows.value.forEach(item=>{
rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
})
console.log('批量打印',rows.join(','))
let getLoading = ElLoading.service({
lock: true,
text: 'loading...',
background: 'rgba(0, 0, 0, 0.7)'
})
InventoryinitRecordDetailApi.printLabelBatchByIdSelection(rows.join(",")).then(res => {
console.log('批量打印res',res);
getLoading?.close()
if(res.zzLabel){
//
const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
window.open(src.value+'&asn_number='+res.zzLabel)
}
if (res.cgLabel) {
//
const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
window.open(src.value+'&asn_number='+res.cgLabel)
}
}).catch(err => {
console.log(err)
getLoading?.close()
})
}
/** 初始化 **/ /** 初始化 **/
onMounted(async () => { onMounted(async () => {
getList() getList()

2
src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts

@ -211,7 +211,7 @@ export const InventoryinitRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'available', field: 'available',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isSearch: true, isSearch: false,
isTable: false, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {

149
src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts

@ -14,6 +14,9 @@ import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/item
import * as OwnerApi from '@/api/wms/owner' import * as OwnerApi from '@/api/wms/owner'
import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data' import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data'
import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
import * as ItemPackageApi from '@/api/wms/itempackage/index'
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
// 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值 // 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值
@ -747,6 +750,152 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
valueFormat: 'x', valueFormat: 'x',
} }
}, },
{
label: '包装规格1',
field: 'packUnit',
isTable: true,
sort: 'custom',
table: {
width: 150,
componentProps: {
disabled: true,
isSearchList: true,
searchListPlaceholder: '请选择包装',
searchField: 'packUnit',
searchTitle: '物品包装信息',
searchAllSchemas: Itempackaging.allSchemas,
searchPage: ItemPackageApi.getItempackagingPage,
searchCondition: [
{
key: 'itemCode',
value: 'itemCode',
message: '请选择订单行',
isMainValue: true
},
{
key: 'available',
value: 'TRUE',
isMainValue: false
}
]
}
},
tableForm: {
disabled: true,
isInpuFocusShow: true,
searchListPlaceholder: '请选择包装',
searchField: 'itemCode',
searchTitle: '物品包装信息',
searchAllSchemas: Itempackaging.allSchemas,
searchPage: ItemPackageApi.getItempackagingPage,
searchCondition: [
{
key: 'itemCode',
value: 'itemCode',
message: '请选择订单行',
isTableRowValue: true,
isMainValue:false
},
{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}
},
{
label: '包装数量1',
field: 'packQty',
sort: 'custom',
table: {
width: 150
},
form: {
componentProps: {
}
},
tableForm: {
}
},
{
label: '包装规格2',
field: 'secondPackUnit',
isTable: true,
sort: 'custom',
table: {
width: 150,
componentProps: {
disabled: true,
isSearchList: true,
searchListPlaceholder: '请选择包装',
searchField: 'packUnit',
searchTitle: '物品包装信息',
searchAllSchemas: Itempackaging.allSchemas,
searchPage: ItemPackageApi.getItempackagingPage,
searchCondition: [
{
key: 'itemCode',
value: 'itemCode',
message: '请选择订单行',
isMainValue: true
},
{
key: 'available',
value: 'TRUE',
isMainValue: false
}
]
}
},
tableForm: {
clearable: true,
disabled: true,
isInpuFocusShow: true,
searchListPlaceholder: '请选择包装',
searchField: 'packUnit',
searchTitle: '物品包装信息',
searchAllSchemas: Itempackaging.allSchemas,
searchPage: ItemPackageApi.getItempackagingPage,
searchCondition: [
{
key: 'itemCode',
value: 'itemCode',
message: '请选择订单行',
isTableRowValue: true,
isMainValue:false
},
{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}
},
{
label: '包装数量2',
field: 'secondPackQty',
sort: 'custom',
table: {
width: 150
},
form: {
componentProps: {
}
},
tableForm: {
}
},
{
label: '入库存包装规格',
field: 'balancePackUnit',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '备注', label: '备注',
field: 'remark', field: 'remark',

2
src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts

@ -292,7 +292,7 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'available', field: 'available',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isSearch: true, isSearch: false,
isTable: false, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {

2
src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts

@ -300,7 +300,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'available', field: 'available',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isSearch: true, isSearch: false,
isTable: false, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {

2
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts

@ -281,7 +281,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'available', field: 'available',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isSearch: true, isSearch: false,
isTable: true, isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {

2
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts

@ -252,7 +252,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
field: 'available', field: 'available',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isSearch: true, isSearch: false,
isTable: true, isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {

58
src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="[...PurchasePlanMain.allSchemas.searchSchema,...PurchasePlanDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...PurchasePlanMain.allSchemas.searchSchema,...PurchasePlanDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -11,10 +11,17 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<Table v-clientTable :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{ <Table ref="tableRef" v-clientTable
:selection="true"
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
:pagination="{
total: tableObject.total total: tableObject.total
}" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage" }"
v-model:sort="tableObject.sort"> v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
@getSelectionRows="getSelectionRows">
<template #number="{row}"> <template #number="{row}">
<el-button type="primary" link @click="openDetail(row, '单据号', row.number)"> <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
<span>{{ row.number }}</span> <span>{{ row.number }}</span>
@ -241,6 +248,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-plan-main:create' }), // defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-plan-main:create' }), //
defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-plan-main:import' }), // defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-plan-main:import' }), //
defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-plan-main:export' }), //
defaultButtons.mainListSelectionOrderPubBtn(null), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), // defaultButtons.defaultSetBtn(null), //
@ -271,6 +279,8 @@ const getSearchTableData = async (number,formField,searchField)=>{
} else { } else {
getList() getList()
} }
} else if (val=='mainOrderSelectionPub'){//
handleSelectionPublish()
} else if (val == 'filtrate') { // } else if (val == 'filtrate') { //
} else { // } else { //
console.log('其他按钮', item) console.log('其他按钮', item)
@ -433,7 +443,45 @@ const { wsCache } = useCache()
tableObject.loading = false tableObject.loading = false
} }
} }
const searchList = (model)=>{
selectionRows.value = []
setSearchParams(model)
}
const selectionRows = ref<any>([])
const tableRef = ref()
const getSelectionRows = (currentPage,currentPageSelectionRows) => {
console.log("getSelectionRows",currentPage,currentPageSelectionRows)
const currentRows = selectionRows.value.find(item=>item.currentPage==currentPage)
if(currentRows){
currentRows.selectionRows = currentPageSelectionRows
}else{
selectionRows.value.push({
currentPage,
selectionRows:currentPageSelectionRows
})
}
}
//
const handleSelectionPublish = async ()=>{
//
await message.confirm(t('ts.是否发布所选中数据?'))
tableObject.loading = true
let rows:any = []
selectionRows.value.map(item=>{
rows = [...rows,...item.selectionRows.map(item1=>item1.masterId)]
})
tableObject.loading = true
Promise.all( rows.map(item=>PurchasePlanMainApi.publishPurchasePlanMain(item))).then((res) => {
console.log('发布',res)
if(res.every(item=>item==true)){
message.success(t('ts.发布成功!'))
}
}).finally(()=>{
tableObject.loading = false
//
getList()
})
}
/** 发布按钮操作 */ /** 发布按钮操作 */
const handlePublish = async (id : number) => { const handlePublish = async (id : number) => {
try { try {

2
src/views/wms/reportList/index.vue

@ -9,7 +9,7 @@
import { getAccessToken } from '@/utils/auth' import { getAccessToken } from '@/utils/auth'
// const url = ref('http://localhost:12080/jmreport/view/881686740529258496') // const url = ref('http://localhost:12080/jmreport/view/881686740529258496')
const route = useRoute() // const route = useRoute() //
debugger
const str = route.path.split('/')[3] const str = route.path.split('/')[3]
const url = ref(import.meta.env.VITE_JMREPORT_BASE_URL + '/jmreport/view/'+ str+ '?token='+ getAccessToken()) const url = ref(import.meta.env.VITE_JMREPORT_BASE_URL + '/jmreport/view/'+ str+ '?token='+ getAccessToken())
console.log(url); console.log(url);

Loading…
Cancel
Save