no message
HUOJIN\92525
parent
3aa23d97f5
commit
cfb4aaf5a4
|
|
@ -4,11 +4,6 @@
|
|||
<template #detail>
|
||||
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="AgvTaskForm">
|
||||
<a-row>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="任务ID" v-bind="validateInfos.id" v-if="formData.id" id="AgvTaskForm-id" name="id">
|
||||
<a-input v-model:value="formData.id" allow-clear ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="容器" v-bind="validateInfos.carrierCode" id="AgvTaskForm-carrierCode" name="carrierCode">
|
||||
<JDictSelectTag v-model:value="formData.carrierCode" placeholder="请选择容器" dictCode="base_stock where iz_active=1 and del_flag=0,stock_code,stock_code" allowClear />
|
||||
|
|
@ -95,7 +90,7 @@
|
|||
priority: 99,
|
||||
startCode: '',
|
||||
endCode: '',
|
||||
resMessage: '',
|
||||
agvVendor:'HIK',
|
||||
tenantId: tenantId,
|
||||
});
|
||||
const { createMessage } = useMessage();
|
||||
|
|
|
|||
|
|
@ -5,55 +5,50 @@
|
|||
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="AgvTaskForm">
|
||||
<a-row>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="任务ID" v-bind="validateInfos.id" v-if="formData.id" id="AgvTaskForm-id" name="id">
|
||||
<a-input v-model:value="formData.id" allow-clear ></a-input>
|
||||
<a-form-item label="容器" v-bind="validateInfos.carrierCode" id="AgvTaskForm-carrierCode" name="carrierCode">
|
||||
<JDictSelectTag
|
||||
v-model:value="formData.carrierCode"
|
||||
placeholder="请选择容器"
|
||||
dictCode="base_stock where iz_active=1 and del_flag=0,stock_code,stock_code"
|
||||
allowClear
|
||||
/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="容器" v-bind="validateInfos.carrierCode" id="AgvTaskForm-carrierCode" name="carrierCode">
|
||||
<JDictSelectTag v-model:value="formData.carrierCode" placeholder="请选择容器" dictCode="base_stock where iz_active=1 and del_flag=0,stock_code,stock_code" allowClear />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<!-- <a-col :span="24">
|
||||
<a-form-item label="任务类型" v-bind="validateInfos.taskType" id="AgvTaskForm-taskType" name="taskType">
|
||||
<a-input v-model:value="formData.taskType" placeholder="请输入任务类型" allow-clear ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>-->
|
||||
<a-col :span="24">
|
||||
<a-form-item label="业务类型" v-bind="validateInfos.type" id="AgvTaskForm-type" name="type">
|
||||
<!-- <a-col :span="24">
|
||||
<a-form-item label="任务类型" v-bind="validateInfos.taskType" id="AgvTaskForm-taskType" name="taskType">
|
||||
<a-input v-model:value="formData.taskType" placeholder="请输入任务类型" allow-clear ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>-->
|
||||
<a-col :span="24">
|
||||
<a-form-item label="业务类型" v-bind="validateInfos.type" id="AgvTaskForm-type" name="type">
|
||||
<JDictSelectTag type="select" v-model:value="formData.type" dictCode="business_type" placeholder="请选择业务类型" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="任务状态" v-bind="validateInfos.status" id="AgvTaskForm-status" name="status">
|
||||
<JDictSelectTag type="select" v-model:value="formData.status" dictCode="agv_task_status" placeholder="请选择任务状态" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="优先级" v-bind="validateInfos.priority" id="AgvTaskForm-priority" name="priority">
|
||||
<a-input-number v-model:value="formData.priority" placeholder="请输入优先级" style="width: 100%" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="目标库位" v-bind="validateInfos.endCode" id="AgvTaskForm-endCode" name="endCode">
|
||||
<JDictSelectTag
|
||||
type="select"
|
||||
v-model:value="formData.type"
|
||||
dictCode="business_type"
|
||||
placeholder="请选择业务类型"
|
||||
v-model:value="formData.endCode"
|
||||
placeholder="请选择目标库位"
|
||||
dictCode="base_point where iz_active=1 and del_flag=0 ,point_code,point_code"
|
||||
allowClear
|
||||
/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="任务状态" v-bind="validateInfos.status" id="AgvTaskForm-status" name="status">
|
||||
<JDictSelectTag
|
||||
type="select"
|
||||
v-model:value="formData.status"
|
||||
dictCode="agv_task_status"
|
||||
placeholder="请选择任务状态"
|
||||
/>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="返回报文" v-bind="validateInfos.resMessage" v-if="formData.id" id="AgvTaskForm-resMessage" name="resMessage">
|
||||
<a-textarea v-model:value="formData.resMessage" :rows="4" placeholder="请输入返回报文" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="优先级" v-bind="validateInfos.priority" id="AgvTaskForm-priority" name="priority">
|
||||
<a-input-number v-model:value="formData.priority" placeholder="请输入优先级" style="width: 100%" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="目标库位" v-bind="validateInfos.endCode" id="AgvTaskForm-endCode" name="endCode">
|
||||
<JDictSelectTag v-model:value="formData.endCode" placeholder="请选择目标库位" dictCode="base_point where iz_active=1 and del_flag=0 ,point_code,point_code" allowClear />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="返回报文" v-bind="validateInfos.resMessage" v-if="formData.id" id="AgvTaskForm-resMessage" name="resMessage">
|
||||
<a-textarea v-model:value="formData.resMessage" :rows="4" placeholder="请输入返回报文" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form>
|
||||
</template>
|
||||
|
|
@ -70,10 +65,11 @@
|
|||
import { Form } from 'ant-design-vue';
|
||||
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
|
||||
import { JDictSelectTag } from '@/components/Form';
|
||||
|
||||
const props = defineProps({
|
||||
formDisabled: { type: Boolean, default: false },
|
||||
formData: { type: Object, default: () => ({})},
|
||||
formBpm: { type: Boolean, default: true }
|
||||
formData: { type: Object, default: () => ({}) },
|
||||
formBpm: { type: Boolean, default: true },
|
||||
});
|
||||
const formRef = ref();
|
||||
const useForm = Form.useForm;
|
||||
|
|
@ -90,7 +86,7 @@
|
|||
priority: 3,
|
||||
startCode: '',
|
||||
endCode: '',
|
||||
resMessage: '',
|
||||
agvVendor: 'TES',
|
||||
tenantId: tenantId,
|
||||
});
|
||||
const { createMessage } = useMessage();
|
||||
|
|
@ -99,30 +95,28 @@
|
|||
const confirmLoading = ref<boolean>(false);
|
||||
//表单验证
|
||||
const validatorRules = reactive({
|
||||
carrierCode: [{ required: true, message: '请选择容器!'},],
|
||||
type: [{ required: true, message: '请选择业务类型!'},],
|
||||
priority: [{ required: true, message: '请输入优先级!'},],
|
||||
endCode: [{ required: true, message: '请选择目标库位!'},],
|
||||
status: [{ required: true, message: '请选择任务状态!'},]
|
||||
carrierCode: [{ required: true, message: '请选择容器!' }],
|
||||
type: [{ required: true, message: '请选择业务类型!' }],
|
||||
priority: [{ required: true, message: '请输入优先级!' }],
|
||||
endCode: [{ required: true, message: '请选择目标库位!' }],
|
||||
status: [{ required: true, message: '请选择任务状态!' }],
|
||||
});
|
||||
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
|
||||
//日期个性化选择
|
||||
const fieldPickers = reactive({
|
||||
});
|
||||
const fieldPickers = reactive({});
|
||||
|
||||
// 表单禁用
|
||||
const disabled = computed(()=>{
|
||||
if(props.formBpm === true){
|
||||
if(props.formData.disabled === false){
|
||||
const disabled = computed(() => {
|
||||
if (props.formBpm === true) {
|
||||
if (props.formData.disabled === false) {
|
||||
return false;
|
||||
}else{
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return props.formDisabled;
|
||||
});
|
||||
|
||||
|
||||
/**
|
||||
* 新增
|
||||
*/
|
||||
|
|
@ -138,10 +132,10 @@
|
|||
resetFields();
|
||||
const tmpData = {};
|
||||
Object.keys(formData).forEach((key) => {
|
||||
if(record.hasOwnProperty(key)){
|
||||
tmpData[key] = record[key]
|
||||
if (record.hasOwnProperty(key)) {
|
||||
tmpData[key] = record[key];
|
||||
}
|
||||
})
|
||||
});
|
||||
//赋值
|
||||
Object.assign(formData, tmpData);
|
||||
});
|
||||
|
|
@ -197,7 +191,6 @@
|
|||
});
|
||||
}
|
||||
|
||||
|
||||
defineExpose({
|
||||
add,
|
||||
edit,
|
||||
|
|
|
|||
|
|
@ -33,18 +33,18 @@
|
|||
</a-col>
|
||||
|
||||
<a-col :span="24">
|
||||
<a-form-item label="排" v-bind="validateInfos.row" id="PointForm-row" name="row">
|
||||
<a-input v-model:value="formData.row" placeholder="请输入排" allow-clear></a-input>
|
||||
<a-form-item label="排" v-bind="validateInfos.rows" id="PointForm-rows" name="rows">
|
||||
<a-input v-model:value="formData.rows" placeholder="请输入排" allow-clear></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="列" v-bind="validateInfos.col" id="PointForm-col" name="col">
|
||||
<a-input v-model:value="formData.col" placeholder="请输入列" allow-clear></a-input>
|
||||
<a-form-item label="列" v-bind="validateInfos.cols" id="PointForm-cols" name="cols">
|
||||
<a-input v-model:value="formData.cols" placeholder="请输入列" allow-clear></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="层" v-bind="validateInfos.layer" id="PointForm-layer" name="layer">
|
||||
<a-input v-model:value="formData.layer" placeholder="请输入层" allow-clear></a-input>
|
||||
<a-form-item label="层" v-bind="validateInfos.layers" id="PointForm-layers" name="layers">
|
||||
<a-input v-model:value="formData.layers" placeholder="请输入层" allow-clear></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
|
|
@ -87,12 +87,12 @@
|
|||
let tenantId = getTenantId();
|
||||
const formData = reactive<Record<string, any>>({
|
||||
id: '',
|
||||
areaId: undefined,
|
||||
areaId: '',
|
||||
pointCode: '',
|
||||
status: 0,
|
||||
row: '00',
|
||||
col: '00',
|
||||
layer: '00',
|
||||
rows: '00',
|
||||
cols: '00',
|
||||
layers: '00',
|
||||
description: '',
|
||||
delFlag: 0,
|
||||
izActive: 1,
|
||||
|
|
|
|||
Loading…
Reference in New Issue