Browse Source

HL-5312 pda提交后,pc明细的数量是盘点的数量,导致盘平,盲盘的时候不显示数量

hella_online_20240816
张立 10 months ago
parent
commit
f817a189a6
  1. 94
      src/views/wms/countManage/count/countJobMain/index.vue

94
src/views/wms/countManage/count/countJobMain/index.vue

@ -1,7 +1,11 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="CountJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search
:schema="CountJobMain.allSchemas.searchSchema"
@search="setSearchParams"
@reset="setSearchParams"
/>
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -16,7 +20,8 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<Table v-clientTable <Table
v-clientTable
:columns="tableColumns" :columns="tableColumns"
:data="tableObject.tableList" :data="tableObject.tableList"
:loading="tableObject.loading" :loading="tableObject.loading"
@ -33,7 +38,10 @@
</el-button> </el-button>
</template> </template>
<template #action="{ row, $index }"> <template #action="{ row, $index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" /> <ButtonBase
:Butttondata="butttondata(row, $index)"
@button-base-click="buttonTableClick($event, row)"
/>
</template> </template>
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -58,7 +66,7 @@
ref="detailRef" ref="detailRef"
:isBasic="false" :isBasic="false"
:allSchemas="CountJobMain.allSchemas" :allSchemas="CountJobMain.allSchemas"
:detailAllSchemas="CountJobDetail.allSchemas" :detailAllSchemas="countJobDetailTableColumns"
:detailAllSchemasRules="CountJobDetailRules" :detailAllSchemasRules="CountJobDetailRules"
:searchTableParams="searchTableParams" :searchTableParams="searchTableParams"
:apiPage="CountJobDetailApi.getCountJobDetailPage" :apiPage="CountJobDetailApi.getCountJobDetailPage"
@ -76,17 +84,21 @@
:extend="rowMasterIdRef" :extend="rowMasterIdRef"
:isShowDownloadBtn="true" :isShowDownloadBtn="true"
/> />
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import download from '@/utils/download' import download from '@/utils/download'
import { CountJobMain,CountJobMainRules,CountJobDetail,CountJobDetailRules } from './countJobMain.data' import {
CountJobMain,
CountJobMainRules,
CountJobDetail,
CountJobDetailRules
} from './countJobMain.data'
import * as CountJobMainApi from '@/api/wms/countJobMain' import * as CountJobMainApi from '@/api/wms/countJobMain'
import * as CountJobDetailApi from '@/api/wms/countJobDetail' import * as CountJobDetailApi from '@/api/wms/countJobDetail'
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 * as PackageunitApi from "@/api/wms/packageunit"; import * as PackageunitApi from '@/api/wms/packageunit'
import { formatDate } from '@/utils/formatTime' import { formatDate } from '@/utils/formatTime'
// //
defineOptions({ name: 'CountJobMain' }) defineOptions({ name: 'CountJobMain' })
@ -155,7 +167,7 @@ const HeadButttondata = [
defaultButtons.defaultExportBtn({ hasPermi: 'wms:count-job-main:export' }), // defaultButtons.defaultExportBtn({ hasPermi: 'wms:count-job-main:export' }), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), // defaultButtons.defaultSetBtn(null) //
// { // {
// label: '', // label: '',
// name: 'zdy', // name: 'zdy',
@ -168,9 +180,11 @@ const HeadButttondata = [
// //
const buttonBaseClick = (val, item) => { const buttonBaseClick = (val, item) => {
if (val == 'export') { // if (val == 'export') {
//
handleExport() handleExport()
} else if (val == 'refresh') { // } else if (val == 'refresh') {
//
if (tableObject.params.filters && tableObject.params.filters.length > 0) { if (tableObject.params.filters && tableObject.params.filters.length > 0) {
searchFormClick({ searchFormClick({
filters: tableObject.params.filters filters: tableObject.params.filters
@ -178,8 +192,10 @@ const buttonBaseClick = (val, item) => {
} else { } else {
getList() getList()
} }
} else if (val == 'filtrate') { // } else if (val == 'filtrate') {
} else { // //
} else {
//
console.log('其他按钮', item) console.log('其他按钮', item)
} }
} }
@ -195,10 +211,12 @@ const isShowMainButton = (row,val) => {
// - // -
const butttondata = (row, $index) => { const butttondata = (row, $index) => {
return [ return [
defaultButtons.mainListJobAccBtn({ hide: isShowMainButton(row, ['1']) }), // defaultButtons.mainListJobAccBtn({ hide: isShowMainButton(row, ['1']) }), //
defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1','2']),hasPermi:'wms:count-job-main:close'}), // defaultButtons.mainListJobCloBtn({
hide: isShowMainButton(row, ['1', '2']),
hasPermi: 'wms:count-job-main:close'
}), //
{ {
label: '导出', label: '导出',
name: 'exportCountJob', name: 'exportCountJob',
@ -226,16 +244,18 @@ const butttondata = (row,$index) => {
color: '', color: '',
link: true, // link: true, //
hasPermi: '' // wms:count-job-main:importCountJob hasPermi: '' // wms:count-job-main:importCountJob
}, }
// defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), //
] ]
} }
// - // -
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'mainJobExe') { // if (val == 'mainJobExe') {
//
console.log('列表-操作按钮事件-执行') console.log('列表-操作按钮事件-执行')
} else if (val == 'mainJobAba') { // } else if (val == 'mainJobAba') {
//
console.log('列表-操作按钮事件-放弃') console.log('列表-操作按钮事件-放弃')
tableObject.loading = true tableObject.loading = true
try { try {
@ -244,9 +264,11 @@ const buttonTableClick = async (val, row) => {
} finally { } finally {
tableObject.loading = false tableObject.loading = false
} }
} else if (val == 'mainJobClo') { // } else if (val == 'mainJobClo') {
//
handleClose(row.id) handleClose(row.id)
} else if (val == 'mainJobAcc') { // } else if (val == 'mainJobAcc') {
//
tableObject.loading = true tableObject.loading = true
try { try {
await CountJobMainApi.acceptCountJobMain(row.id) await CountJobMainApi.acceptCountJobMain(row.id)
@ -255,14 +277,16 @@ const buttonTableClick = async (val, row) => {
tableObject.loading = false tableObject.loading = false
} }
console.log('列表-操作按钮事件-承接') console.log('列表-操作按钮事件-承接')
} else if (val == 'exportCountJob'){// } else if (val == 'exportCountJob') {
//
handleExportCountJob(row.id, row.number) handleExportCountJob(row.id, row.number)
} else if( val == 'importCountJob'){ // } else if (val == 'importCountJob') {
//
handleImport(row.id) handleImport(row.id)
} else if( val == 'done'){ // } else if (val == 'done') {
//
handleDone(row.id) handleDone(row.id)
} }
} }
/** 关闭按钮操作 */ /** 关闭按钮操作 */
@ -289,15 +313,31 @@ const handleDone = async (id: number) => {
} }
} }
// //
const { wsCache } = useCache() const { wsCache } = useCache()
/** 详情操作 */ /** 详情操作 */
const detailRef = ref() const detailRef = ref()
const countJobDetailTableColumns = ref({})
const openDetail = (row: any, titleName: any, titleValue: any) => { const openDetail = (row: any, titleName: any, titleValue: any) => {
const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name const departmentCode = wsCache
.get(CACHE_KEY.DEPT)
.find((account) => account.id == row.departmentCode)?.name
if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
detailRef.value.openDetail(row, titleName, titleValue,"jobCountMain") //
countJobDetailTableColumns.value.tableColumns = []
if (!row.isShow) {
CountJobDetail.allSchemas.tableColumns.forEach((item) => {
if (item.field != 'qty') {
countJobDetailTableColumns.value.tableColumns.push(item)
}
})
} else {
countJobDetailTableColumns.value.tableColumns = JSON.parse(
JSON.stringify(CountJobDetail.allSchemas.tableColumns)
)
}
detailRef.value.openDetail(row, titleName, titleValue, 'jobCountMain')
} }
/** 导出按钮操作 */ /** 导出按钮操作 */
@ -336,7 +376,7 @@ const handleExportCountJob = async (id: number,number: string) => {
const importFormRef = ref() const importFormRef = ref()
const rowMasterIdRef = ref('') const rowMasterIdRef = ref('')
const handleImport = (id: string) => { const handleImport = (id: string) => {
rowMasterIdRef.value = id; rowMasterIdRef.value = id
importFormRef.value.open() importFormRef.value.open()
} }

Loading…
Cancel
Save