界面优化

main
siontion 5 months ago
parent 2403cdc7be
commit 9a445f9769

1
.gitignore vendored

@ -27,3 +27,4 @@ coverage
*.sln
*.sw?
.env
dist.zip

@ -38,6 +38,13 @@
@change="fnChangeA(params)"></vxe-input>
</template>
</vxe-form-item>
<!-- <vxe-form-item title="配电箱类型" field="MatTarget" span="24">
<template #default="params">
<vxe-select v-model="params.data.MatTarget" multiple clearable>
<vxe-option v-for="item in matTargetOptions" :key="item.value" :value="item.value" :label="item.label" placeholder="请选择"></vxe-option>
</vxe-select>
</template>
</vxe-form-item> -->
</vxe-form>
</a-card>
</template>
@ -68,10 +75,50 @@ const formDataAInit = {
"MatName": "",
"MatUnit": "台",
"MatDescption": "",
"Unit": "台"
"Unit": "台",
// "MatTarget":[]
}
// [success]
const emit = defineEmits(['success'])
const matTargetOptions = ref([
{
value: 'guiti',
label: '柜体材质、厚度及尺寸'
},
{
value: 'mupai',
label: '母排'
},
{
value: 'bileiqi',
label: '避雷器'
},
{
value: 'langyong',
label: '浪涌保护器'
},
{
value: 'dianliu',
label: '电流互感器'
},
{
value: 'shengyu',
label: '剩余电流动作保护器'
},
{
value: 'duanluqi',
label: '断路器'
},
{
value: 'dianrongqi',
label: '电容器'
},
{
value: 'rongduanqi',
label: '熔断器式隔离开关'
}
])
//
const refShow = ref(false)
//
@ -125,6 +172,9 @@ const open = async (type: string, row?: any) => {
}
const rowInfoA = await BaseMaterialApi.getBaseMaterial(paramsA)
formDataA.value = rowInfoA.Data
if(formDataA.value.MatTarget.length>0){
formDataA.value.MatTarget = eval(formDataA.value.MatTarget)
}
break;
case 'copy':
await fnResetA()
@ -140,6 +190,9 @@ const open = async (type: string, row?: any) => {
const rowInfoB = await BaseMaterialApi.getBaseMaterial(paramsB)
rowInfoB.Data.Id = 0
formDataA.value = rowInfoB.Data
if(formDataA.value.MatTarget.length>0){
formDataA.value.MatTarget = eval(formDataA.value.MatTarget)
}
break;
case 'delete':
modalTitle.value = '删除物料'
@ -217,7 +270,15 @@ const fnEventCancel = () => {
}
//
const fnResetA = () => {
formDataA.value = formDataAInit
formDataA.value = {
"Id": 0,
"MatNo": "",
"MatName": "",
"MatUnit": "台",
"MatDescption": "",
"Unit": "台",
"MatTarget":""
}
}
</script>
<style scoped></style>

@ -203,7 +203,11 @@
</template>
</template>
</vxe-column>
<vxe-column field="fileName" title="文件原名称"></vxe-column>
<vxe-column field="fileName" title="文件原名称">
<template #default="{ row }">
<a :href="row.fileUrl" target="_blank">{{ row.fileName }}</a>
</template>
</vxe-column>
<!-- <vxe-column field="fileUrl" title="文件Url" width="100"></vxe-column> -->
<vxe-column field="fileType" title="文件格式" width="100">
<template #default="{ row }">

@ -215,7 +215,11 @@
</template>
</template>
</vxe-column>
<vxe-column field="fileName" title="文件原名称"></vxe-column>
<vxe-column field="fileName" title="文件原名称">
<template #default="{ row }">
<a :href="row.fileUrl" target="_blank">{{ row.fileName }}</a>
</template>
</vxe-column>
<!-- <vxe-column field="fileUrl" title="文件Url" width="100"></vxe-column> -->
<vxe-column field="fileType" title="文件格式" width="100">
<template #default="{ row }">

@ -90,6 +90,7 @@ const gridOptionsA: any = ref({
items: [
{ field: 'LotNo', title: '原材料批次号', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入原材料批次号' } } },
{ field: 'Spec', title: '原材料规格型号', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入原材料规格型号' } } },
{ field: 'Brand', title: '原材料品牌', span: 8, itemRender: { name: '$input', props: { placeholder: '请输入原材料品牌' } } },
{ span: 24, align: 'center', collapseNode: true, itemRender: { name: '$buttons', children: [{ props: { type: 'submit', content: '查询', status: 'primary' } }, { props: { type: 'reset', content: '重置' } }] } }
]
},

@ -196,7 +196,11 @@
</template>
</template>
</vxe-column>
<vxe-column field="fileName" title="文件原名称"></vxe-column>
<vxe-column field="fileName" title="文件原名称">
<template #default="{ row }">
<a :href="row.fileUrl" target="_blank">{{ row.fileName }}</a>
</template>
</vxe-column>
<!-- <vxe-column field="fileUrl" title="文件Url" width="100"></vxe-column> -->
<vxe-column field="fileType" title="文件格式" width="100">
<template #default="{ row }">

@ -232,7 +232,11 @@
</template>
</template>
</vxe-column>
<vxe-column field="fileName" title="文件原名称"></vxe-column>
<vxe-column field="fileName" title="文件原名称">
<template #default="{ row }">
<a :href="row.fileUrl" target="_blank">{{ row.fileName }}</a>
</template>
</vxe-column>
<!-- <vxe-column field="fileUrl" title="文件Url" width="100"></vxe-column> -->
<vxe-column field="fileType" title="文件格式" width="100">
<template #default="{ row }">

@ -216,7 +216,11 @@
</template>
</template>
</vxe-column>
<vxe-column field="fileName" title="文件原名称"></vxe-column>
<vxe-column field="fileName" title="文件原名称">
<template #default="{ row }">
<a :href="row.fileUrl" target="_blank">{{ row.fileName }}</a>
</template>
</vxe-column>
<!-- <vxe-column field="fileUrl" title="文件Url" width="100"></vxe-column> -->
<vxe-column field="fileType" title="文件格式" width="100">
<template #default="{ row }">

@ -216,7 +216,11 @@
</template>
</template>
</vxe-column>
<vxe-column field="fileName" title="文件原名称"></vxe-column>
<vxe-column field="fileName" title="文件原名称">
<template #default="{ row }">
<a :href="row.fileUrl" target="_blank">{{ row.fileName }}</a>
</template>
</vxe-column>
<!-- <vxe-column field="fileUrl" title="文件Url" width="100"></vxe-column> -->
<vxe-column field="fileType" title="文件格式" width="100">
<template #default="{ row }">

@ -208,7 +208,11 @@
</template>
</template>
</vxe-column>
<vxe-column field="fileName" title="文件原名称"></vxe-column>
<vxe-column field="fileName" title="文件原名称">
<template #default="{ row }">
<a :href="row.fileUrl" target="_blank">{{ row.fileName }}</a>
</template>
</vxe-column>
<!-- <vxe-column field="fileUrl" title="文件Url" width="100"></vxe-column> -->
<vxe-column field="fileType" title="文件格式" width="100">
<template #default="{ row }">

@ -181,7 +181,7 @@
@change="fnChangeA(params)"></vxe-input>
</template>
</vxe-form-item>
<vxe-form-item title="公称宽(mm)" field="Width" span="12">
<vxe-form-item title="公称宽(mm)" field="Width" span="12">
<template #default="params">
<vxe-input v-model="params.data.Width" placeholder="请输入公称宽度" clearable
@change="fnChangeA(params)"></vxe-input>
@ -214,7 +214,11 @@
</template>
</template>
</vxe-column>
<vxe-column field="fileName" title="文件原名称"></vxe-column>
<vxe-column field="fileName" title="文件原名称">
<template #default="{ row }">
<a :href="row.fileUrl" target="_blank">{{ row.fileName }}</a>
</template>
</vxe-column>
<!-- <vxe-column field="fileUrl" title="文件Url" width="100"></vxe-column> -->
<vxe-column field="fileType" title="文件格式" width="100">
<template #default="{ row }">

@ -64,8 +64,8 @@ const gridOptionsA: any = reactive({
{ field: 'FactoryCode', title: '厂区编号', sortable: true, width: '160px' },
{ field: 'SupplierSupportId', title: '供应商产品编号', sortable: true, width: '140px' },
// { field: 'PdCode', title: '', width: '110px' },
// { field: 'CheckTime', title: '', sortable: true, width: '160px' },
// { field: 'PutCenterTime', title: '', sortable: true, width: '160px' },
{ field: 'CheckTime', title: '采集时间', sortable: true, width: '160px' },
{ field: 'PutCenterTime', title: '入数采中心时间', sortable: true, width: '160px' },
{ field: 'StartTime', title: '开始时间', sortable: true, width: '160px' },
{ field: 'StopTime', title: '结束时间', sortable: true, width: '160px' },
{ field: 'InspectionResults', title: '试验结果', sortable: true, width: '160px', slots: { default: 'slotInspectionResults' } },

@ -63,8 +63,8 @@ const gridOptionsA: any = reactive({
{ field: 'FactoryCode', title: '厂区编号', sortable: true, width: '160px' },
{ field: 'SupplierSupportId', title: '供应商产品编号', sortable: true, width: '140px' },
// { field: 'PdCode', title: '', width: '110px' },
// { field: 'CheckTime', title: '', sortable: true, width: '160px' },
// { field: 'PutCenterTime', title: '', sortable: true, width: '160px' },
{ field: 'CheckTime', title: '采集时间', sortable: true, width: '160px' },
{ field: 'PutCenterTime', title: '入数采中心时间', sortable: true, width: '160px' },
{ field: 'StartTime', title: '开始时间', sortable: true, width: '160px' },
{ field: 'StopTime', title: '结束时间', sortable: true, width: '160px' },
{ field: 'InspectionResults', title: '试验结果', sortable: true, width: '160px', slots: { default: 'slotInspectionResults' } },

@ -222,7 +222,11 @@
</template>
</template>
</vxe-column>
<vxe-column field="fileName" title="文件原名称"></vxe-column>
<vxe-column field="fileName" title="文件原名称">
<template #default="{ row }">
<a :href="row.fileUrl" target="_blank">{{ row.fileName }}</a>
</template>
</vxe-column>
<!-- <vxe-column field="fileUrl" title="文件Url" width="100"></vxe-column> -->
<vxe-column field="fileType" title="文件格式" width="100">
<template #default="{ row }">

Loading…
Cancel
Save