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

no message

main
HUOJIN\92525 2026-01-13 20:24:04 +08:00
parent a0cb9f9f1e
commit d600d48fc3
7 changed files with 73 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/Form/src/jeecg/components/JSelectMultiple.vue
View File

@ -123,6 +123,7 @@
});
function onChange(selectedValue) {
console.log('onChange', selectedValue);
if (props.triggerChange) {
emit('change', selectedValue.join(props.spliter));
emit('update:value', selectedValue.join(props.spliter));

30
src/views/agvTask/TesAgv.data.ts
View File

@ -17,13 +17,25 @@ export const columns: BasicColumn[] = [
{
title: '容器',
align: "center",
width: '120px',
width: '100px',
dataIndex: 'carrierCode'
},
{
title: '柜号',
align: "center",
width: '100px',
dataIndex: 'conNo'
},
{
title: '物料',
align: "center",
width: '100px',
dataIndex: 'itemId_dictText'
},
{
title: '业务类型',
align: "center",
width: '120px',
width: '100px',
dataIndex: 'type_dictText'
},
{
@ -56,18 +68,8 @@ export const columns: BasicColumn[] = [
width: '130px',
dataIndex: 'endCode'
},
{
title: '优先级',
align: "center",
width: '60px',
dataIndex: 'priority'
},
{
title: '供应商',
align: 'center',
width: '90px',
dataIndex: 'agvVendor_dictText',
},
{
title: '返回报文',
align: "center",

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

@ -110,6 +110,7 @@
const formRef = ref();
const queryParam = reactive<any>({
agvVendor: 'TES',
status_MultiString:'2'
});
const registerModal = ref();
const registerResendModal = ref();

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

@ -16,12 +16,21 @@
<JDictSelectTag v-model:value="queryParam.orderType" placeholder="请选择" dictCode="asn_order_type" allowClear />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="status_MultiString">
<a-col :lg="12">
<a-form-item name="status_MultiString" :labelCol="{ span: 2 }" :wrapperCol="{ span: 20 }" >
<template #label><span title="状态">状态</span></template>
<JSelectMultiple v-model:value="queryParam.status_MultiString" dictCode="asn_status" />
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="orderDate">
<template #label><span title="订单日期">订单日期</span></template>
<JRangeDate v-model:value="queryParam.orderDate" />
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6">
@ -35,14 +44,6 @@
</span>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item v-if="toggleSearchStatus" name="orderDate">
<template #label><span title="订单日期">订单日期</span></template>
<JRangeDate v-model:value="queryParam.orderDate" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</div>
<!--引用表格-->
@ -129,7 +130,9 @@
const fieldPickers = reactive({});
const formRef = ref();
const queryParam = reactive<any>({});
const queryParam = reactive<any>({
status_MultiString: '1,3,6', // 默认查询已创建、收货完成、已扫描
});
const { createMessage } = useMessage();
//注册model
const [registerModal, { openModal }] = useModal();
@ -160,6 +163,7 @@
console.error('日期范围处理错误:', error);
}
}
for (let key in fieldPickers) {
if (newQueryParam[key] && fieldPickers[key]) {
newQueryParam[key] = getDateByPicker(newQueryParam[key], fieldPickers[key]);

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

@ -27,6 +27,15 @@ export const columns: BasicColumn[] = [
return render.renderTip(text);
},
},
{
title: '柜号',
align: 'center',
dataIndex: 'conNo',
width: '120px',
customRender: ({ text }) => {
return render.renderTip(text);
},
},
{
title: '订单状态',
align: 'center',

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

@ -6,8 +6,8 @@
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="no">
<template #label><span title="任务号">任务号</span></template>
<JInput v-model:value="queryParam.no" :placeholder="'请输入任务号'" :type="JInputTypeEnum.JINPUT_RIGHT_LIKE" />
<template #label><span title="赛意单号">赛意单号</span></template>
<JInput v-model:value="queryParam.thirdOrderNo" :placeholder="'请输入赛意单号'" :type="JInputTypeEnum.JINPUT_RIGHT_LIKE" />
</a-form-item>
</a-col>
<a-col :lg="6">
@ -16,12 +16,20 @@
<JDictSelectTag v-model:value="queryParam.orderType" placeholder="请选择" dictCode="pick_order_type" allowClear />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="status_MultiString">
<a-col :lg="12">
<a-form-item name="status_MultiString" :labelCol="{ span: 2 }" :wrapperCol="{ span: 20 }">
<template #label><span title="状态">状态</span></template>
<JSelectMultiple v-model:value="queryParam.status_MultiString" dictCode="pick_status" />
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="orderDate">
<template #label><span title="订单日期">订单日期</span></template>
<JRangeDate v-model:value="queryParam.orderDate" />
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6">
@ -35,14 +43,6 @@
</span>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item v-if="toggleSearchStatus" name="orderDate">
<template #label><span title="订单日期">订单日期</span></template>
<JRangeDate v-model:value="queryParam.orderDate" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</div>
<!--引用表格-->
@ -139,18 +139,7 @@
import { useModal } from '/@/components/Modal';
import PickModal from './components/PickModal.vue';
import { columns } from './Pick.data';
import {
list,
deleteOne,
batchDelete,
getImportUrl,
getExportUrl,
allocatePick,
cancelAllocate,
pickTask,
pickBack,
closePick,
} from './Pick.api';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, allocatePick, cancelAllocate, pickTask, pickBack, closePick } from './Pick.api';
import { useMessage } from '/@/hooks/web/useMessage';
import { getDateByPicker } from '/@/utils';
import { JInputTypeEnum } from '@/enums/cpteEnum';
@ -160,7 +149,9 @@
const fieldPickers = reactive({});
const formRef = ref();
const queryParam = reactive<any>({});
const queryParam = reactive<any>({
status_MultiString: '1,2,3,4,5', // 默认查询已创建、部分分配、已分配、部分拣货
});
//注册model
const [registerModal, { openModal }] = useModal();
const { createMessage } = useMessage();
@ -334,7 +325,6 @@
}
}
/**
* 关单事件
*/
@ -342,10 +332,10 @@
async function handleClosePick() {
// 选中的数据中状态有4、5 返回true,否则返回false
const validStatuses = [4, 5];
const validStatuses = [1, 4, 5];
const allValidStatus = selectedRows.value.every((row: any) => validStatuses.includes(row.status));
if (!allValidStatus) {
return createMessage.error('【部分拣货、拣货完成】状态的出库单才允许关单');
return createMessage.error('【已创建、部分拣货、拣货完成】状态的出库单才允许关单');
}
if (closePick_loading.value) {
return;
@ -363,15 +353,14 @@
}
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
let showFooter = true;
if (record.status > 1) {
/* if (record.status > 1) {
showFooter = false;
}
}*/
openModal(true, {
record,
isUpdate: true,

12
src/views/shipping/components/PickForm.vue
View File

@ -5,7 +5,7 @@
<a-form v-bind="formItemLayout" name="PickForm" ref="formRef" class="jeecg-native-form">
<a-row class="form-row" :gutter="24">
<a-col :span="8">
<a-form-item label="外部单号" v-bind="validateInfos.thirdOrderNo" id="PickForm-thirdOrderNo" name="thirdOrderNo">
<a-form-item label="赛意单号" v-bind="validateInfos.thirdOrderNo" id="PickForm-thirdOrderNo" name="thirdOrderNo">
<a-input v-model:value="formData.thirdOrderNo" placeholder="请输入外部单号" allow-clear></a-input>
</a-form-item>
</a-col>
@ -50,6 +50,14 @@
</a-form-item>
</a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col class="form-row" :span="8">
<a-form-item label="柜号" v-bind="validateInfos.conNo" id="PickForm-conNo" name="conNo">
<a-input v-model:value="formData.conNo" placeholder="请输入柜号" allow-clear></a-input>
</a-form-item>
</a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :span="24">
<a-form-item
@ -168,6 +176,7 @@
no: '',
whCode: '',
customerCode: '',
conNo: '',
orderType: '',
status: 1,
orderDate: dayjs(),
@ -181,6 +190,7 @@
no: [{ required: true, message: '请输入任务号!' }],
orderType: [{ required: true, message: '请选择单据类型!' }],
whCode: [{ required: true, message: '请输入外部仓库代码' }],
conNo: [{ required: true, message: '请输入柜号' }],
});
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
//日期个性化选择