no message
parent
f4029374a9
commit
1e9b7415ac
|
|
@ -86,6 +86,19 @@ export const columns: BasicColumn[] = [
|
||||||
align: 'center',
|
align: 'center',
|
||||||
dataIndex: 'customerCode',
|
dataIndex: 'customerCode',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: '优先级',
|
||||||
|
align: 'center',
|
||||||
|
dataIndex: 'priority',
|
||||||
|
customRender: ({ text }) => {
|
||||||
|
const priorityMap = {
|
||||||
|
0: '普通',
|
||||||
|
1: '加急',
|
||||||
|
2: '紧急',
|
||||||
|
};
|
||||||
|
return priorityMap[text];
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title: '订单日期',
|
title: '订单日期',
|
||||||
align: 'center',
|
align: 'center',
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,11 @@
|
||||||
<a-input v-model:value="formData.conNo" placeholder="请输入柜号" allow-clear></a-input>
|
<a-input v-model:value="formData.conNo" placeholder="请输入柜号" allow-clear></a-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
<a-col class="form-row" :span="8">
|
||||||
|
<a-form-item label="优先级" v-bind="validateInfos.priority" id="PickForm-priority" name="priority">
|
||||||
|
<JSearchSelect v-model:value="formData.priority" placeholder="请选择" :dict-options="priorityOptions" />
|
||||||
|
</a-form-item>
|
||||||
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
<a-row class="form-row" :gutter="24">
|
<a-row class="form-row" :gutter="24">
|
||||||
<a-col :span="24">
|
<a-col :span="24">
|
||||||
|
|
@ -115,11 +119,11 @@
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { defineComponent, ref, reactive, computed, toRaw } from 'vue';
|
import { defineComponent, ref, reactive, computed, toRaw } from 'vue';
|
||||||
import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
|
import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
|
||||||
import { queryPickDetailListByMainId, queryDataById, saveOrUpdate,queryTaskByMainId } from '../Pick.api';
|
import { queryPickDetailListByMainId, queryDataById, saveOrUpdate, queryTaskByMainId } from '../Pick.api';
|
||||||
import { JVxeTable } from '/@/components/jeecg/JVxeTable';
|
import { JVxeTable } from '/@/components/jeecg/JVxeTable';
|
||||||
import { pickDetailColumns, taskColumns } from '../Pick.data';
|
import { pickDetailColumns, taskColumns } from '../Pick.data';
|
||||||
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
|
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
|
||||||
import { JDictSelectTag } from '@/components/Form';
|
import { JDictSelectTag, JSearchSelect } from '@/components/Form';
|
||||||
import { Form } from 'ant-design-vue';
|
import { Form } from 'ant-design-vue';
|
||||||
import { getDateByPicker } from '/@/utils';
|
import { getDateByPicker } from '/@/utils';
|
||||||
import { getTenantId } from '@/utils/auth';
|
import { getTenantId } from '@/utils/auth';
|
||||||
|
|
@ -127,9 +131,12 @@
|
||||||
|
|
||||||
const useForm = Form.useForm;
|
const useForm = Form.useForm;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
name: 'PickForm',
|
name: 'PickForm',
|
||||||
components: {
|
components: {
|
||||||
|
JSearchSelect,
|
||||||
JVxeTable,
|
JVxeTable,
|
||||||
JDictSelectTag,
|
JDictSelectTag,
|
||||||
JFormContainer,
|
JFormContainer,
|
||||||
|
|
@ -147,6 +154,12 @@
|
||||||
},
|
},
|
||||||
emits: ['success'],
|
emits: ['success'],
|
||||||
setup(props, { emit }) {
|
setup(props, { emit }) {
|
||||||
|
//优先级
|
||||||
|
const priorityOptions = [
|
||||||
|
{ value: '0', text: '普通' },
|
||||||
|
{ value: '1', text: '加急' },
|
||||||
|
{ value: '2', text: '紧急' },
|
||||||
|
];
|
||||||
const loading = ref(false);
|
const loading = ref(false);
|
||||||
const formRef = ref();
|
const formRef = ref();
|
||||||
//出库明细
|
//出库明细
|
||||||
|
|
@ -165,7 +178,6 @@
|
||||||
dataSource: [],
|
dataSource: [],
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
const activeKey = ref('pickDetail');
|
const activeKey = ref('pickDetail');
|
||||||
//仓库 ID
|
//仓库 ID
|
||||||
let tenantId = getTenantId();
|
let tenantId = getTenantId();
|
||||||
|
|
@ -179,6 +191,7 @@
|
||||||
conNo: '',
|
conNo: '',
|
||||||
orderType: '',
|
orderType: '',
|
||||||
status: 1,
|
status: 1,
|
||||||
|
priority: '0',
|
||||||
orderDate: dayjs(),
|
orderDate: dayjs(),
|
||||||
tenantId: tenantId,
|
tenantId: tenantId,
|
||||||
description: '',
|
description: '',
|
||||||
|
|
@ -342,6 +355,7 @@
|
||||||
add,
|
add,
|
||||||
edit,
|
edit,
|
||||||
formRef,
|
formRef,
|
||||||
|
priorityOptions
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue