sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

intex_online20250327
songguoqiang 1 month ago
parent
84a12ed7b0 3b9e45a094
commit
aa47cb319b
11 changed files with 358 additions and 267 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/utils/dict.ts
  2. 2
      src/views/wms/basicDataManage/supplierManage/deliTimeWms/deliTimeWms.data.ts
  3. 1
      src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts
  4. 1
      src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts
  5. 322
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
  6. 2
      src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
  7. 2
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
  8. 92
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
  9. 100
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
  10. 100
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
  11. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

1
src/utils/dict.ts
View File

@ -429,4 +429,5 @@ export enum DICT_TYPE {
COUNT_MODE = "count_mode",//盘点模式(1:PAD盘点,2:Excel导入)
INVENTORY_MODE = "inventory_mode",
INVOICE_TYPE = 'invoice_type', // 开票种类
DELISHIF = "deliShif",// 班次
}

2
src/views/wms/basicDataManage/supplierManage/deliTimeWms/deliTimeWms.data.ts
View File

@ -19,7 +19,7 @@ export const DeliTimeWms = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '班次',
field: 'shift',
dictType: DICT_TYPE.SHIFT,
dictType: DICT_TYPE.DELISHIF,
dictClass: 'string',
isTable: true,
isDetail: true,

1
src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts
View File

@ -263,6 +263,7 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive<CrudSchema[]>([
},
form: {
component: 'Select',
value:[''],
componentProps: {
showAll: true,// 备用做全选
multiple: true,

1
src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts
View File

@ -256,6 +256,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
label: '品番',
field: 'itemCode',
sort: 'custom',
isSearch:true,
table: {
width: 150
},

322
src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
View File

@ -1,23 +1,31 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="[...InventoryinitRequestMain.allSchemas.searchSchema,...InventoryinitRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
<Search
:schema="[
...InventoryinitRequestMain.allSchemas.searchSchema,
...InventoryinitRequestDetail.allSchemas.searchSchema
]"
@search="setSearchParams"
@reset="setSearchParams"
/>
</ContentWrap>
<!-- 列表头部 -->
<TableHead
:HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="InventoryinitRequestMain.allSchemas"
:detailAllSchemas="InventoryinitRequestDetail.allSchemas"
/>
<!-- 列表头部 -->
<TableHead
:HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="InventoryinitRequestMain.allSchemas"
:detailAllSchemas="InventoryinitRequestDetail.allSchemas"
/>
<!-- 列表 -->
<ContentWrap>
<Table v-clientTable
<Table
v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
@ -28,13 +36,16 @@
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
<template #number="{row}">
<template #number="{ row }">
<el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row,$index }">
<ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
<template #action="{ row, $index }">
<ButtonBaseMore
:Butttondata="butttondata(row, $index)"
@button-base-click="buttonTableClick($event, row)"
/>
</template>
</Table>
</ContentWrap>
@ -78,17 +89,36 @@
/>
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/inventoryinit-request-main/import" :importTemplateData="importTemplateData"
@success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
<ImportForm
ref="importFormRef"
url="/wms/inventoryinit-request-main/import"
:importTemplateData="importTemplateData"
@success="importSuccess"
:updateIsDisable="true"
:coverIsDisable="true"
:mode="2"
/>
<ImportForm ref="importFormRefLine" url="/wms/inventoryinit-request-main/importLine" :importTemplateData="importTemplateData"
@success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
<ImportForm
ref="importFormRefLine"
url="/wms/inventoryinit-request-main/importLine"
:importTemplateData="importTemplateData"
@success="importSuccess"
:updateIsDisable="true"
:coverIsDisable="true"
:mode="2"
/>
</template>
<script setup lang="ts">
import download from '@/utils/download'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import { InventoryinitRequestMain,InventoryinitRequestMainRules,InventoryinitRequestDetail,InventoryinitRequestDetailRules } from './inventoryinitRequestMain.data'
import {
InventoryinitRequestMain,
InventoryinitRequestMainRules,
InventoryinitRequestDetail,
InventoryinitRequestDetailRules
} from './inventoryinitRequestMain.data'
import * as InventoryinitRequestMainApi from '@/api/wms/inventoryinitRequestMain'
import * as InventoryinitRequestDetailApi from '@/api/wms/inventoryinitRequestDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
@ -105,7 +135,10 @@ const { t } = useI18n() // 国际化
const route = useRoute() // 路由信息
const routeName = ref()
routeName.value = route.name
const tableColumns = ref([...InventoryinitRequestMain.allSchemas.tableColumns,...InventoryinitRequestDetail.allSchemas.tableMainColumns])
const tableColumns = ref([
...InventoryinitRequestMain.allSchemas.tableColumns,
...InventoryinitRequestDetail.allSchemas.tableMainColumns
])
// 字段设置 更新主列表字段
const updataTableColumns = (val) => {
@ -113,21 +146,25 @@ const updataTableColumns = (val) => {
}
// 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
nextTick(() => {
if (type == 'tableForm') {
// 明细查询页赋值
if(formField=='itemCode'){
if (formField == 'itemCode') {
//品番
let itemCodes = val.filter(item=>tableData.value.find(item1=>item1['itemCode']==item['code']))
if(itemCodes.length>0){
itemCodes = itemCodes.map(item=>(item['code']))
let itemCodes = val.filter((item) =>
tableData.value.find((item1) => item1['itemCode'] == item['code'])
)
if (itemCodes.length > 0) {
itemCodes = itemCodes.map((item) => item['code'])
message.warning(`物料${itemCodes.join(',')}已经存在`)
}
val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['code']))
if(val.length==0) return
val.forEach(item=>{
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
val = val.filter(
(item) => !tableData.value.find((item1) => item1['itemCode'] == item['code'])
)
if (val.length == 0) return
val.forEach((item) => {
const newRow = JSON.parse(JSON.stringify({ ...tableFormKeys, ...item }))
newRow[formField] = item[searchField]
newRow['packUnit'] = item['defaultPackUnit']
newRow['packQty'] = item['defaultPackQty']
@ -135,22 +172,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
newRow['batch'] = formatTime(new Date(), 'yyyyMMdd')
tableData.value.push(newRow)
})
}else if(formField=='packUnit'){
} else if (formField == 'packUnit') {
//包装规格1
row[formField] = val[0][searchField]
row['packUnit'] = val[0]['packUnit']
row['packQty'] = val[0]['packQty']
}else if(formField=='secondPackUnit'){
} else if (formField == 'secondPackUnit') {
//包装规格2
row[formField] = val[0][searchField]
row['secondPackUnit'] = val[0]['packUnit']
row['secondPackQty'] = val[0]['packQty']
}else if(formField == 'balancePackUnit'){
} else if (formField == 'balancePackUnit') {
// 入库存包装规格
row[formField] = val[0][searchField]
row['balancePackUnit'] = val[0]['packUnit']
}else{
} else {
row[formField] = val[0][searchField]
}
} else {
@ -163,24 +199,24 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
})
}
// 查询页面返回——详情
const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
nextTick(() => {
const setV = {}
if(formField=='itemCode'){
//品番
setV['uom'] = val[0]['uom']
}else if(formField=='packUnit'){
//包装规格1
setV['packUnit'] = val[0]['packUnit']
setV['packQty'] = val[0]['packQty']
}else if(formField=='secondPackUnit'){
//包装规格2
setV['secondPackUnit'] = val[0]['packUnit']
setV['secondPackQty'] = val[0]['packQty']
}else if(formField == 'balancePackUnit'){
// 入库存包装规格
setV['balancePackUnit'] = val[0]['packUnit']
}
if (formField == 'itemCode') {
//品番
setV['uom'] = val[0]['uom']
} else if (formField == 'packUnit') {
//包装规格1
setV['packUnit'] = val[0]['packUnit']
setV['packQty'] = val[0]['packQty']
} else if (formField == 'secondPackUnit') {
//包装规格2
setV['secondPackUnit'] = val[0]['packUnit']
setV['secondPackQty'] = val[0]['packQty']
} else if (formField == 'balancePackUnit') {
// 入库存包装规格
setV['balancePackUnit'] = val[0]['packUnit']
}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
})
@ -188,7 +224,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
// 子表新增的时候选择表格之后需要会显得字段
// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
const Echo = []
const Echo = []
const { tableObject, tableMethods } = useTable({
getListApi: InventoryinitRequestDetailApi.getInventoryinitRequestDetailPage // 分页接口
@ -199,8 +235,8 @@ const { getList, setSearchParams } = tableMethods
// 列表头部按钮
const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:inventoryinit-request-main:create'}), // 新增
defaultButtons.defaultImportBtn({hasPermi:'wms:inventoryinit-request-main:import'}), // 导入
defaultButtons.defaultAddBtn({ hasPermi: 'wms:inventoryinit-request-main:create' }), // 新增
defaultButtons.defaultImportBtn({ hasPermi: 'wms:inventoryinit-request-main:import' }), // 导入
{
label: '线边导入',
name: 'importLine',
@ -210,10 +246,10 @@ const HeadButttondata = [
color: '',
hasPermi: ''
},
defaultButtons.defaultExportBtn({hasPermi:'wms:inventoryinit-request-main:export'}), // 导出
defaultButtons.defaultExportBtn({ hasPermi: 'wms:inventoryinit-request-main:export' }), // 导出
defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选
defaultButtons.defaultSetBtn(null), // 设置
defaultButtons.defaultSetBtn(null) // 设置
// {
// label: '自定义扩展按钮',
// name: 'zdy',
@ -226,30 +262,36 @@ const HeadButttondata = [
// 头部按钮事件
const buttonBaseClick = (val, item) => {
if (val == 'add') { // 新增
if (val == 'add') {
// 新增
openForm('create')
} else if (val == 'import') { // 导入
} else if (val == 'import') {
// 导入
handleImport()
} else if(val == 'importLine'){
} else if (val == 'importLine') {
handleImportLine()
}else if (val == 'export') { // 导出
} else if (val == 'export') {
// 导出
handleExport()
} else if (val == 'refresh') { // 刷新
if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
} else if (val == 'refresh') {
// 刷新
if (tableObject.params.filters && tableObject.params.filters.length > 0) {
searchFormClick({
filters: tableObject.params.filters
})
} else {
getList()
}
} else if (val == 'filtrate') { // 筛选
} else { // 其他按钮
} else if (val == 'filtrate') {
// 筛选
} else {
// 其他按钮
console.log('其他按钮', item)
}
}
// 根据状态返回该按钮是否显示
const isShowMainButton = (row,val) => {
const isShowMainButton = (row, val) => {
if (val.indexOf(row.status) > -1) {
return false
} else {
@ -258,44 +300,71 @@ const isShowMainButton = (row,val) => {
}
// 列表-操作按钮
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>-1&&findIndex<$index){
const butttondata = (row, $index) => {
const findIndex = row['masterId']
? tableObject.tableList.findIndex((item) => item['masterId'] == row['masterId'])
: -1
if (findIndex > -1 && findIndex < $index) {
return []
}
return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:inventoryinit-request-main:close'}), // 关闭
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:inventoryinit-request-main:reAdd'}), //重新添加
defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventoryinit-request-main:submit'}), // 提交审批
defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventoryinit-request-main:refused'}), // 驳回
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventoryinit-request-main:agree'}), // 审批通过
defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:inventoryinit-request-main:handle'}), // 处理
defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventoryinit-request-main:update'}), // 编辑
]
return [
defaultButtons.mainListCloseBtn({
hide: isShowMainButton(row, ['1', '2', '3', '4']),
hasPermi: 'wms:inventoryinit-request-main:close'
}), // 关闭
defaultButtons.mainListReAddBtn({
hide: isShowMainButton(row, ['5']),
hasPermi: 'wms:inventoryinit-request-main:reAdd'
}), //重新添加
defaultButtons.mainListSubmitBtn({
hide: isShowMainButton(row, ['1']),
hasPermi: 'wms:inventoryinit-request-main:submit'
}), // 提交审批
defaultButtons.mainListTurnDownBtn({
hide: isShowMainButton(row, ['2']),
hasPermi: 'wms:inventoryinit-request-main:refused'
}), // 驳回
defaultButtons.mainListApproveBtn({
hide: isShowMainButton(row, ['2']),
hasPermi: 'wms:inventoryinit-request-main:agree'
}), // 审批通过
defaultButtons.mainListHandleBtn({
hide: isShowMainButton(row, ['3']),
hasPermi: 'wms:inventoryinit-request-main:handle'
}), // 处理
defaultButtons.mainListEditBtn({
hide: isShowMainButton(row, ['1']),
hasPermi: 'wms:inventoryinit-request-main:update'
}) // 编辑
]
}
// 列表-操作按钮事件
const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { // 关闭
if (val == 'mainClose') {
// 关闭
handleClose(row.masterId)
} else if (val == 'mainReAdd') { // 重新添加
} else if (val == 'mainReAdd') {
// 重新添加
handleReAdd(row.masterId)
} else if (val == 'mainSubmit') { // 提交审批
} else if (val == 'mainSubmit') {
// 提交审批
handleSubmit(row.masterId)
} else if (val == 'mainTurnDown') { // 驳回
} else if (val == 'mainTurnDown') {
// 驳回
handleRefused(row.masterId)
} else if (val == 'mainApprove') { // 审批通过
} else if (val == 'mainApprove') {
// 审批通过
handleAgree(row.masterId)
} else if (val == 'mainHandle') { // 处理
} else if (val == 'mainHandle') {
// 处理
handleHandle(row.masterId)
} else if (val == 'edit') { // 编辑
} else if (val == 'edit') {
// 编辑
openForm('update', row)
}
}
/** 关闭按钮操作 */
const handleClose = async (id: number) => {
try {
@ -304,13 +373,13 @@ const handleClose = async (id: number) => {
await InventoryinitRequestMainApi.closeInventoryinitRequestMain(id)
message.success(t('common.closeSuccess'))
tableObject.loading = false
buttonBaseClick('refresh',null)
} catch {}finally{
buttonBaseClick('refresh', null)
} catch {
} finally {
tableObject.loading = false
}
}
/** 重新添加按钮操作 */
const handleReAdd = async (id: number) => {
try {
@ -319,13 +388,13 @@ const handleReAdd = async (id: number) => {
await InventoryinitRequestMainApi.reAddInventoryinitRequestMain(id)
message.success(t('common.reAddSuccess'))
tableObject.loading = false
buttonBaseClick('refresh',null)
} catch {}finally{
buttonBaseClick('refresh', null)
} catch {
} finally {
tableObject.loading = false
}
}
/** 提交按钮操作 */
const handleSubmit = async (id: number) => {
try {
@ -334,13 +403,13 @@ const handleSubmit = async (id: number) => {
await InventoryinitRequestMainApi.submitInventoryinitRequestMain(id)
message.success(t('common.updateSuccess'))
tableObject.loading = false
buttonBaseClick('refresh',null)
} catch {}finally{
buttonBaseClick('refresh', null)
} catch {
} finally {
tableObject.loading = false
}
}
/** 审批通过按钮操作 */
const handleAgree = async (id: number) => {
try {
@ -349,13 +418,13 @@ const handleAgree = async (id: number) => {
await InventoryinitRequestMainApi.agreeInventoryinitRequestMain(id)
message.success(t('common.agreeSuccess'))
tableObject.loading = false
buttonBaseClick('refresh',null)
} catch {}finally{
buttonBaseClick('refresh', null)
} catch {
} finally {
tableObject.loading = false
}
}
/** 处理按钮操作 */
const handleHandle = async (id: number) => {
try {
@ -363,13 +432,13 @@ const handleHandle = async (id: number) => {
tableObject.loading = true
await InventoryinitRequestMainApi.handleInventoryinitRequestMain(id)
message.success(t('common.handleSuccess'))
buttonBaseClick('refresh',null)
} catch {}finally{
buttonBaseClick('refresh', null)
} catch {
} finally {
tableObject.loading = false
}
}
/** 审批驳回按钮操作 */
const handleRefused = async (id: number) => {
try {
@ -378,19 +447,33 @@ const handleRefused = async (id: number) => {
await InventoryinitRequestMainApi.refusedInventoryinitRequestMain(id)
message.success(t('common.refusedSuccess'))
tableObject.loading = false
buttonBaseClick('refresh',null)
} catch {}finally{
buttonBaseClick('refresh', null)
} catch {
} finally {
tableObject.loading = false
}
}
/** 添加/修改操作 */
const formRef = ref()
const openForm =async (type: string, row?: any) => {
const openForm = async (type: string, row?: any) => {
tableData.value = [] // 重置明细数据
const row1 = {...row}
const row1 = { ...row }
if (type == 'update') {
row1.remark = row.remark1
InventoryinitRequestMain.allSchemas.formSchema.forEach((item) => {
if (item.field == 'warehouseCode') {
item.componentProps.isSearchList = false
item.componentProps.disabled = true
}
})
} else {
InventoryinitRequestMain.allSchemas.formSchema.forEach((item) => {
if (item.field == 'warehouseCode') {
item.componentProps.isSearchList = true
item.componentProps.disabled = false
}
})
}
formRef.value.open(type, row1)
}
@ -400,9 +483,11 @@ const { wsCache } = useCache()
/** 详情操作 */
const detailRef = ref()
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))
detailRef.value.openDetail(row, titleName, titleValue,'requestInventoryinitMain')
detailRef.value.openDetail(row, titleName, titleValue, 'requestInventoryinitMain')
}
/** 删除按钮操作 */
@ -426,7 +511,9 @@ const handleExport = async () => {
// 发起导出
loadStart()
const excelTitle = ref(route.meta.title)
const data = await InventoryinitRequestMainApi.exportInventoryinitRequestMain(tableObject.params)
const data = await InventoryinitRequestMainApi.exportInventoryinitRequestMain(
tableObject.params
)
download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
@ -435,10 +522,10 @@ const handleExport = async () => {
}
/**
* tableForm方法
*/
* tableForm方法
*/
const tableFormKeys = {}
InventoryinitRequestDetail.allSchemas.tableFormColumns.forEach(item => {
InventoryinitRequestDetail.allSchemas.tableFormColumns.forEach((item) => {
tableFormKeys[item.field] = item.default ? item.default : ''
})
const tableData = ref([])
@ -450,16 +537,16 @@ const handleAddTable = () => {
// 删除明细
const handleDeleteTable = (item, index) => {
let itemIndex = tableData.value.indexOf(item)
if(itemIndex>-1){
if (itemIndex > -1) {
tableData.value.splice(itemIndex, 1)
}
}
const tableSelectionDelete = (selection) => {
tableData.value = tableData.value.filter(item => !selection.includes(item))
tableData.value = tableData.value.filter((item) => !selection.includes(item))
}
// 主子数据 提交
const submitForm = async (formType, submitData) => {
let data = {...submitData}
let data = { ...submitData }
// if(data.masterId){
// data.id = data.masterId
// }
@ -477,8 +564,8 @@ const submitForm = async (formType, submitData) => {
// 刷新当前列表
if (formType === 'create') {
getList()
}else{
buttonBaseClick('refresh',null)
} else {
buttonBaseClick('refresh', null)
}
} finally {
formRef.value.formLoading = false
@ -491,7 +578,6 @@ const handleImport = () => {
importFormRef.value.open()
}
/** 线边导入 */
const importFormRefLine = ref()
const handleImportLine = () => {

2
src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
View File

@ -237,7 +237,7 @@ const butttondata = (row, $index) => {
// hide: row.putawayRequestFlag == 'FALSE' || row.recoveryRequestFlag == 'TRUE'
// }), // 生成采购上架申请
// defaultButtons.mainListPointBtn(null), // 标签打印
defaultButtons.mainListRecoveryBtn({ hide: row.recoveryRequestFlag == 'TRUE' }) // 制品回收 //recoveryRequestFlag==TRUE不展示
// defaultButtons.mainListRecoveryBtn({ hide: row.recoveryRequestFlag == 'TRUE' }) // 制品回收 //recoveryRequestFlag==TRUE不展示
]
}

2
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
View File

@ -241,7 +241,7 @@ const butttondata = (row,$index) => {
// defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
// defaultButtons.mainPutawayRequestCpBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" || row.recoveryRequestFlag == "TRUE"}),// 生成采购上架申请
// defaultButtons.mainListPointBtn(null), // 标签打印
defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示
// defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示
]
}

92
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
View File

@ -82,52 +82,52 @@ export const PurchasereturnRecordMain = useCrudSchemas(
},
isTable: false
},
{
label: 'Q2通知单号',
field: 'q2Number',
sort: 'custom',
isSearch: false,
isDetail: true,
sortTableDefault: 4,
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
enterSearch: true,
// multiple: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段
searchTitle: 'Q2通知单号', // 查询弹窗标题
searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},
{
key: 'status',
value: '0',
isMainValue: false
}
],
verificationParams: [
{
key: 'number',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
}
},
// {
// label: 'Q2通知单号',
// field: 'q2Number',
// sort: 'custom',
// isSearch: false,
// isDetail: true,
// sortTableDefault: 4,
// table: {
// width: 150
// },
// form: {
// // labelMessage: '信息提示说明！！！',
// componentProps: {
// enterSearch: true,
// // multiple: true,
// isSearchList: true, // 开启查询弹窗
// searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
// searchField: 'number', // 查询弹窗赋值字段
// searchTitle: 'Q2通知单号', // 查询弹窗标题
// searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
// searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
// searchCondition: [
// {
// key: 'available',
// value: 'TRUE',
// isMainValue: false
// },
// {
// key: 'status',
// value: '0',
// isMainValue: false
// }
// ],
// verificationParams: [
// {
// key: 'number',
// action: '==',
// value: '',
// isMainValue: false,
// isSearch: true,
// isFormModel: true
// }
// ] // 失去焦点校验参数
// }
// }
// },
{
label: '供应商代码',
field: 'supplierCode',

100
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
View File

@ -275,56 +275,56 @@ export const PurchasereturnRequestMain = useCrudSchemas(
isForm: false,
isTable: false
},
{
label: 'Q2通知单号',
field: 'q2Number',
sort: 'custom',
isSearch: false,
isDetail: true,
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
enterSearch: true,
// multiple: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段
searchTitle: 'Q2通知单号', // 查询弹窗标题
searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},
{
key: 'status',
value: '0',
isMainValue: false
},
{
key: 'supplierCode',
value: 'supplierCode',
isMainValue: true
}
],
verificationParams: [
{
key: 'number',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
}
},
// {
// label: 'Q2通知单号',
// field: 'q2Number',
// sort: 'custom',
// isSearch: false,
// isDetail: true,
// table: {
// width: 150
// },
// form: {
// // labelMessage: '信息提示说明！！！',
// componentProps: {
// enterSearch: true,
// // multiple: true,
// isSearchList: true, // 开启查询弹窗
// searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
// searchField: 'number', // 查询弹窗赋值字段
// searchTitle: 'Q2通知单号', // 查询弹窗标题
// searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
// searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
// searchCondition: [
// {
// key: 'available',
// value: 'TRUE',
// isMainValue: false
// },
// {
// key: 'status',
// value: '0',
// isMainValue: false
// },
// {
// key: 'supplierCode',
// value: 'supplierCode',
// isMainValue: true
// }
// ],
// verificationParams: [
// {
// key: 'number',
// action: '==',
// value: '',
// isMainValue: false,
// isSearch: true,
// isFormModel: true
// }
// ] // 失去焦点校验参数
// }
// }
// },
{
label: '承运商',
field: 'carrierCode',

100
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
View File

@ -275,56 +275,56 @@ export const PurchasereturnRequestMain = useCrudSchemas(
isForm: false,
isTable: false
},
{
label: 'Q2通知单号',
field: 'q2Number',
sort: 'custom',
isSearch: false,
isDetail: true,
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
enterSearch: true,
// multiple: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段
searchTitle: 'Q2通知单号', // 查询弹窗标题
searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'available',
value: 'TRUE',
isMainValue: false
},
{
key: 'status',
value: '0',
isMainValue: false
},
{
key: 'supplierCode',
value: 'supplierCode',
isMainValue: true
}
],
verificationParams: [
{
key: 'number',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
}
},
// {
// label: 'Q2通知单号',
// field: 'q2Number',
// sort: 'custom',
// isSearch: false,
// isDetail: true,
// table: {
// width: 150
// },
// form: {
// // labelMessage: '信息提示说明！！！',
// componentProps: {
// enterSearch: true,
// // multiple: true,
// isSearchList: true, // 开启查询弹窗
// searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本
// searchField: 'number', // 查询弹窗赋值字段
// searchTitle: 'Q2通知单号', // 查询弹窗标题
// searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类
// searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法
// searchCondition: [
// {
// key: 'available',
// value: 'TRUE',
// isMainValue: false
// },
// {
// key: 'status',
// value: '0',
// isMainValue: false
// },
// {
// key: 'supplierCode',
// value: 'supplierCode',
// isMainValue: true
// }
// ],
// verificationParams: [
// {
// key: 'number',
// action: '==',
// value: '',
// isMainValue: false,
// isSearch: true,
// isFormModel: true
// }
// ] // 失去焦点校验参数
// }
// }
// },
{
label: '承运商',
field: 'carrierCode',

2
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
View File

@ -560,6 +560,7 @@ const butttondata = (row, $index) => {
},
defaultButtons.mainListPointBtn({
hide: isShowMainButton(row, ['3', '8']),
type: row.isShowSuccess ? 'success' : 'primary',
hasPermi: 'wms:supplierdeliver-request-main:printLabel'
}), // 标签打印
//defaultButtons.mainListDocumentPrintBtn({ hide: isShowMainButton(row, ['3','8']) }), // 单据打印
@ -1233,6 +1234,7 @@ const labelPrint = async (row) => {
tableColumns.forEach((item) => {
item.width = item.table?.width
})
row.isShowSuccess = true
searchTableRef.value.openData(t('ts.标签信息'), tableObjectPrint, { tableColumns }, true)
}

Write Preview
Loading…
Cancel
Save