huojin
/
Cpte-Vue3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2026-01-07 22:47:50 +08:00
parent 3609c87458
commit a8800e46f1
6 changed files with 55 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/agvTask/AgvTask.api.ts
View File

@ -12,7 +12,7 @@ enum Api {
importExcel = '/agvTask/importExcel', importExcel = '/agvTask/importExcel',
exportXls = '/agvTask/exportXls', exportXls = '/agvTask/exportXls',
taskReporter = '/api/robot/reporter/task', taskReporter = '/api/robot/reporter/task',
callBackTask = '/tes/apiv2/callBackTask', callBackTask = '/tes/callBackTask',
cancelTes = '/tes/cancelTes', cancelTes = '/tes/cancelTes',
cancelAgv = '/api/robot/cancelAgv', cancelAgv = '/api/robot/cancelAgv',
resendTes = '/tes/apiv2/resendTes', resendTes = '/tes/apiv2/resendTes',

33
src/views/agvTask/TesAgvList.vue
View File

@ -13,15 +13,17 @@
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="carrierCode"> <a-form-item name="carrierCode">
<template #label><span title="容器">容器</span></template> <template #label><span title="容器">容器</span></template>
<StockSelect v-model:value="queryParam.carrierCode" :return-value="'carrierCode'" /> <StockSelect v-model:value="queryParam.carrierCode" :return-value="'stockCode'" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="createTime"> <a-form-item name="status_MultiString">
<template #label><span title="创建日期">创建日期</span></template> <template #label><span title="状态">状态</span></template>
<JRangeDate v-model:value="queryParam.createTime" /> <JSelectMultiple v-model:value="queryParam.status_MultiString" dictCode="agv_task_status" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons"> <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6"> <a-col :lg="6">
@ -37,9 +39,9 @@
</a-row> </a-row>
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :lg="6"> <a-col :lg="6">
<a-form-item v-if="toggleSearchStatus" name="status_MultiString"> <a-form-item v-if="toggleSearchStatus" name="createTime">
<template #label><span title="状态">状态</span></template> <template #label><span title="创建日期">创建日期</span></template>
<JSelectMultiple v-model:value="queryParam.status_MultiString" dictCode="asn_status" /> <JRangeDate v-model:value="queryParam.createTime" />
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
@ -158,6 +160,7 @@
}, },
}); });
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext; const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
const toggleSearchStatus = ref<boolean>(false);
const labelCol = reactive({ const labelCol = reactive({
xs: 24, xs: 24,
sm: 4, sm: 4,
@ -188,10 +191,10 @@
/** /**
* 详情 * 详情
*/ */
/* function handleDetail(record: Recordable) { /* function handleDetail(record: Recordable) {
registerModal.value.disableSubmit = true; registerModal.value.disableSubmit = true;
registerModal.value.edit(record); registerModal.value.edit(record);
}*/ }*/
/** /**
* 删除事件 * 删除事件
@ -286,10 +289,10 @@
*/ */
function getDropDownAction(record) { function getDropDownAction(record) {
return [ return [
/* { /* {
label: '任务详情', label: '任务详情',
onClick: handleDetail.bind(null, record), onClick: handleDetail.bind(null, record),
},*/ },*/
{ {
label: '任务完成', label: '任务完成',
popConfirm: { popConfirm: {

8
src/views/monitor/log/log.data.ts
View File

@ -33,6 +33,12 @@ export const columns: BasicColumn[] = [
width: 100, width: 100,
align: 'left', align: 'left',
}, },
{
title: '耗时',
dataIndex: 'costTime',
sorter: true,
width: 60,
},
{ {
title: '创建时间', title: '创建时间',
@ -47,6 +53,7 @@ export const columns: BasicColumn[] = [
*/ */
export const operationLogColumn: BasicColumn[] = [ export const operationLogColumn: BasicColumn[] = [
...columns, ...columns,
/* { /* {
title: '操作类型', title: '操作类型',
dataIndex: 'operateType_dictText', dataIndex: 'operateType_dictText',
@ -86,6 +93,7 @@ export const exceptionColumns: BasicColumn[] = [
align: 'left', align: 'left',
}, },
{ {
title: '创建时间', title: '创建时间',
dataIndex: 'createTime', dataIndex: 'createTime',

12
src/views/receive/asn/AsnList.vue
View File

@ -17,9 +17,9 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="orderDate"> <a-form-item name="status_MultiString">
<template #label><span title="订单日期">订单日期</span></template> <template #label><span title="状态">状态</span></template>
<JRangeDate v-model:value="queryParam.orderDate" /> <JSelectMultiple v-model:value="queryParam.status_MultiString" dictCode="asn_status" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
@ -37,9 +37,9 @@
</a-row> </a-row>
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :lg="6"> <a-col :lg="6">
<a-form-item v-if="toggleSearchStatus" name="status_MultiString"> <a-form-item v-if="toggleSearchStatus" name="orderDate">
<template #label><span title="状态">状态</span></template> <template #label><span title="订单日期">订单日期</span></template>
<JSelectMultiple v-model:value="queryParam.status_MultiString" dictCode="asn_status" /> <JRangeDate v-model:value="queryParam.orderDate" />
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>

16
src/views/shipping/Pick.data.ts
View File

@ -116,6 +116,14 @@ export const pickDetailColumns: JVxeColumn[] = [
placeholder: '请选择${title}', placeholder: '请选择${title}',
defaultValue: '托', defaultValue: '托',
}, },
{
title: '容器',
key: 'stockId',
type: JVxeTypes.selectDictSearch,
width: 150,
async: true, // 异步搜索，默认为 true
dict: 'base_stock,stock_code,id',
},
{ {
title: '需求数量', title: '需求数量',
key: 'orderQty', key: 'orderQty',
@ -226,6 +234,14 @@ export const taskColumns: JVxeColumn[] = [
async: true, // 异步搜索，默认为 true async: true, // 异步搜索，默认为 true
dict: 'base_item,item_code,id', dict: 'base_item,item_code,id',
}, },
{
title: '容器',
key: 'stockId',
type: JVxeTypes.selectDictSearch,
disabled: true,
async: true, // 异步搜索，默认为 true
dict: 'base_stock,stock_code,id',
},
{ {
title: '原库位', title: '原库位',
key: 'fromPointId', key: 'fromPointId',

12
src/views/shipping/PickList.vue
View File

@ -17,9 +17,9 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="orderDate"> <a-form-item name="status_MultiString">
<template #label><span title="订单日期">订单日期</span></template> <template #label><span title="状态">状态</span></template>
<JRangeDate v-model:value="queryParam.orderDate" /> <JSelectMultiple v-model:value="queryParam.status_MultiString" dictCode="pick_status" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
@ -37,9 +37,9 @@
</a-row> </a-row>
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :lg="6"> <a-col :lg="6">
<a-form-item v-if="toggleSearchStatus" name="status_MultiString"> <a-form-item v-if="toggleSearchStatus" name="orderDate">
<template #label><span title="状态">状态</span></template> <template #label><span title="订单日期">订单日期</span></template>
<JSelectMultiple v-model:value="queryParam.status_MultiString" dictCode="pick_status" /> <JRangeDate v-model:value="queryParam.orderDate" />
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>