init(projects): 模具修改

master
xushilin 11 months ago
parent c144112395
commit a08622053c

@ -86,12 +86,12 @@ const columns: Ref<DataTableColumns<basicsMessage.TableList>> = ref([
align: 'center', align: 'center',
minWidth: 100 minWidth: 100
}, },
{ // {
title: '公差', // title: '',
key: 'engineeringTolerance', // key: 'engineeringTolerance',
align: 'center', // align: 'center',
minWidth: 100 // minWidth: 100
}, // },
{ {
title: '数量', title: '数量',
key: 'moldNum', key: 'moldNum',

@ -87,12 +87,12 @@ const columns: Ref<DataTableColumns<drawing.viewData>> = ref([
align: 'center', align: 'center',
minWidth: 100 minWidth: 100
}, },
{ // {
title: '公差', // title: '',
key: 'engineeringTolerance', // key: 'engineeringTolerance',
align: 'center', // align: 'center',
minWidth: 100 // minWidth: 100
}, // },
{ {
title: '材质', title: '材质',
key: 'moldMaterial', key: 'moldMaterial',

@ -150,13 +150,13 @@
:style="{ width: formItemWidth }" :style="{ width: formItemWidth }"
></n-input> ></n-input>
</n-form-item-grid-item> </n-form-item-grid-item>
<n-form-item-grid-item label="公差"> <!-- <n-form-item-grid-item label="公差">
<n-input-number <n-input-number
v-model:value="addForm.engineeringTolerance" v-model:value="addForm.engineeringTolerance"
placeholder="请输入公差" placeholder="请输入公差"
:style="{ width: formItemWidth }" :style="{ width: formItemWidth }"
/> />
</n-form-item-grid-item> </n-form-item-grid-item> -->
<n-form-item-grid-item label="购买时间"> <n-form-item-grid-item label="购买时间">
<n-date-picker <n-date-picker
@ -368,18 +368,18 @@ const columns: Ref<DataTableColumns<basicsMessage.TableList>> = ref([
align: 'center', align: 'center',
width: 100 width: 100
}, },
{ // {
title: '套模名称', // title: '',
key: 'moldName', // key: 'moldName',
align: 'center', // align: 'center',
width: 100 // width: 100
}, // },
{ // {
title: '公差', // title: '',
key: 'engineeringTolerance', // key: 'engineeringTolerance',
align: 'center', // align: 'center',
width: 100 // width: 100
}, // },
{ {
title: '备注', title: '备注',
key: 'attr2', key: 'attr2',

@ -277,28 +277,28 @@ const columns: Ref<DataTableColumns<joinWarehouse.TableList>> = ref([
align: 'center', align: 'center',
width: 100 width: 100
}, },
{ // {
title: '公差', // title: '',
key: 'engineeringTolerance', // key: 'engineeringTolerance',
align: 'center', // align: 'center',
width: 100 // width: 100
}, // },
{ // {
title: '套模名称', // title: '',
key: 'moldName', // key: 'moldName',
align: 'center', // align: 'center',
width: 100 // width: 100
}, // },
{ // {
title: '入库机台', // title: '',
key: '', // key: '',
align: 'center', // align: 'center',
width: 100, // width: 100,
render: row => { // render: row => {
return <n-space class="space">{row.lsName ? row.lsName : row.qbName}</n-space>; // return <n-space class="space">{row.lsName ? row.lsName : row.qbName}</n-space>;
} // }
}, // },
{ {
title: '归还人', title: '归还人',
key: 'recipient', key: 'recipient',

@ -62,12 +62,12 @@ const range = ref<[number, number] | null>(null);
const data = ref<lifeCycleReport.TableList[]>([]); const data = ref<lifeCycleReport.TableList[]>([]);
const columns: Ref<DataTableColumns<lifeCycleReport.TableList>> = ref([ const columns: Ref<DataTableColumns<lifeCycleReport.TableList>> = ref([
{ // {
title: '套模编号', // title: '',
key: 'moldName', // key: 'moldName',
align: 'center', // align: 'center',
minWidth: 100 // minWidth: 100
}, // },
{ {
title: '模具类别', title: '模具类别',
key: 'moldType', key: 'moldType',

@ -52,7 +52,7 @@
:rules="rules" :rules="rules"
> >
<n-grid x-gap="12" :cols="2"> <n-grid x-gap="12" :cols="2">
<n-form-item-grid-item label="机台类型" path="machineType"> <!-- <n-form-item-grid-item label="机台类型" path="machineType">
<n-select <n-select
v-model:value="addForm.machineType" v-model:value="addForm.machineType"
placeholder="请选择机台类型" placeholder="请选择机台类型"
@ -70,7 +70,7 @@
:options="machineList" :options="machineList"
:style="{ width: formItemWidth }" :style="{ width: formItemWidth }"
></n-select> ></n-select>
</n-form-item-grid-item> </n-form-item-grid-item> -->
<n-form-item-grid-item label="领用人" path="recipient"> <n-form-item-grid-item label="领用人" path="recipient">
<!-- <n-input v-model:value="addForm.recipient" placeholder="请输入领用人" <!-- <n-input v-model:value="addForm.recipient" placeholder="请输入领用人"
:style="{ width: formItemWidth }"></n-input> --> :style="{ width: formItemWidth }"></n-input> -->
@ -90,7 +90,7 @@
:style="{ width: formItemWidth }" :style="{ width: formItemWidth }"
/> />
</n-form-item-grid-item> </n-form-item-grid-item>
<n-form-item-grid-item label="出库位置"> <!-- <n-form-item-grid-item label="出库位置">
<n-select <n-select
v-model:value="addForm.attr1" v-model:value="addForm.attr1"
placeholder="请选择出库位置" placeholder="请选择出库位置"
@ -99,7 +99,7 @@
:style="{ width: formItemWidth }" :style="{ width: formItemWidth }"
filterable filterable
></n-select> ></n-select>
</n-form-item-grid-item> </n-form-item-grid-item> -->
<n-form-item-grid-item label="模具类别" path="moldType"> <n-form-item-grid-item label="模具类别" path="moldType">
<n-select <n-select
v-model:value="addForm.moldType" v-model:value="addForm.moldType"
@ -293,16 +293,16 @@ const classificationId = ref<number>(-1);
const message = useMessage(); const message = useMessage();
const range = ref<[number, number] | null>(null); const range = ref<[number, number] | null>(null);
const formItemWidth = ref<string>('220px'); const formItemWidth = ref<string>('220px');
const machineType = ref<{ label: string; value: number }[]>([ // const machineType = ref<{ label: string; value: number }[]>([
{ label: '拉丝', value: 0 }, // { label: '', value: 0 },
{ label: '漆包', value: 1 } // { label: '', value: 1 }
]); // ]);
const machineList = ref<{ label: string; value: number }[]>([]); // const machineList = ref<{ label: string; value: number }[]>([]);
const wiredrawingList = ref<{ label: string; value: number }[]>([]); const wiredrawingList = ref<{ label: string; value: number }[]>([]);
const eamellingList = ref<{ label: string; value: number }[]>([]); const eamellingList = ref<{ label: string; value: number }[]>([]);
const moldType = ref<{ label: string; value: number }[]>([ const moldType = ref<{ label: string; value: number }[]>([
{ label: '个', value: 0 }, { label: '个', value: 0 }
{ label: '套', value: 1 } // { label: '', value: 1 }
]); ]);
const moldList = ref<{ label: string; value: number }[]>([]); const moldList = ref<{ label: string; value: number }[]>([]);
const drawingList = ref<{ label: string; value: number }[]>([]); const drawingList = ref<{ label: string; value: number }[]>([]);
@ -356,18 +356,18 @@ const columns: Ref<DataTableColumns<outWarehouse.TableList>> = ref([
align: 'center', align: 'center',
width: 100 width: 100
}, },
{ // {
title: '公差', // title: '',
key: 'engineeringTolerance', // key: 'engineeringTolerance',
align: 'center', // align: 'center',
width: 100 // width: 100
}, // },
{ // {
title: '套模名称', // title: '',
key: 'moldName', // key: 'moldName',
align: 'center', // align: 'center',
width: 100 // width: 100
}, // },
{ {
title: '领用人', title: '领用人',
key: 'recipient', key: 'recipient',
@ -380,15 +380,15 @@ const columns: Ref<DataTableColumns<outWarehouse.TableList>> = ref([
align: 'center', align: 'center',
width: 100 width: 100
}, },
{ // {
title: '出库机台', // title: '',
key: 'lsName', // key: 'lsName',
align: 'center', // align: 'center',
width: 140, // width: 140,
render: row => { // render: row => {
return row.lsId ? row.lsName : row.qbName; // return row.lsId ? row.lsName : row.qbName;
} // }
}, // },
{ {
title: '出库时间', title: '出库时间',
key: 'moldOutboundTime', key: 'moldOutboundTime',
@ -492,15 +492,15 @@ function getList(): void {
}); });
} }
function handleUpdateValueMachine(value: number): void { // function handleUpdateValueMachine(value: number): void {
machineList.value = []; // machineList.value = [];
addForm.value.machineId = null; // addForm.value.machineId = null;
if (value === 0) { // if (value === 0) {
machineList.value = wiredrawingList.value; // machineList.value = wiredrawingList.value;
} else { // } else {
machineList.value = eamellingList.value; // machineList.value = eamellingList.value;
} // }
} // }
function handleUpdateValueMold(value: number): void { function handleUpdateValueMold(value: number): void {
nestingName.value = ''; nestingName.value = '';

Loading…
Cancel
Save