diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue index e5b4858..f14f6bf 100644 --- a/src/views/project-demand/requirement/add.vue +++ b/src/views/project-demand/requirement/add.vue @@ -1,14 +1,15 @@ @@ -142,6 +148,7 @@ import {useTagsView} from '@/stores/tagsview.js' import {getFundOption} from "@/api/special-fund"; import CompanyPicker from "@/components/DetailComponent/CompanyPicker.vue"; import {useCacheStore} from '@/stores/cache.js' + const filePreviewParam = ref({ fileUrl: '', fileName: '', @@ -184,11 +191,11 @@ const processInstanceData = ref() const formPermMap = ref(new Map()); const companyNameArray = ref([]) const rules = reactive({ - requirementName: [{required: true, message: '请输入征集名称', trigger: ['blur','change']}], - isSpecialFund: [{required: true, message: '请选择是否专项资金', trigger: ['blur','change']}], - collectType: [{required: true, message: '请选择征集类型', trigger: ['blur','change']}], - deadline: [{required: true, message: '请选择需求上报截止时间', trigger: ['blur','change']}], - specialFundId: [{required: true, message: '请选择专项资金名称', trigger: ['blur','change']}], + requirementName: [{required: true, message: '请输入征集名称', trigger: ['blur', 'change']}], + isSpecialFund: [{required: true, message: '请选择是否专项资金', trigger: ['blur', 'change']}], + collectType: [{required: true, message: '请选择征集类型', trigger: ['blur', 'change']}], + deadline: [{required: true, message: '请选择需求上报截止时间', trigger: ['blur', 'change']}], + specialFundId: [{required: true, message: '请选择专项资金名称', trigger: ['blur', 'change']}], }) const tableConfig = reactive({ @@ -244,7 +251,7 @@ const clickToPreview = (row) => { fileName: row.originalFileName, fileType: row.fileType } - nextTick(()=>{ + nextTick(() => { filePreviewShow.value = true }) // filePreviewRef.value.show() @@ -278,7 +285,7 @@ const showCompany = () => { } const selected = (select) => { - formData.value.companyIds=[] + formData.value.companyIds = [] for (let val of select) { formData.value.companyIds.push(val.value) } @@ -462,18 +469,18 @@ const handleResubmit = (instance) => { }) }) } -const matterTree = (array,data, id) => { +const matterTree = (array, data, id) => { if (id) { data.forEach(item => { if (item.value == id) { - let obj={ - label:item.label, - value:item.value + let obj = { + label: item.label, + value: item.value } array.push(obj); } if (item.children && item.children.length > 0) { - matterTree(array,item.children,id) + matterTree(array, item.children, id) } }) return array; @@ -493,8 +500,8 @@ const getDetailInfo = async () => { if (res.data.formData.companyIds[0] == -1) { selectedCompanyList.value = [ { - value:-1, - label:'所有公司' + value: -1, + label: '所有公司' } ] } else { @@ -581,7 +588,7 @@ onMounted(async () => { //justify-content: space-between; overflow-x: hidden; overflow-y: auto; - padding: 0 30px 0 15px; + padding: 0 0 0 40px; a { cursor: pointer; @@ -593,4 +600,20 @@ onMounted(async () => { position: relative; } } + +:deep(.el-table__header) { + .is-leaf:first-child { + .cell { + margin-left: -20px !important; + } + } +} + +:deep(.el-table__body) { + .el-table__cell:first-child { + .cell { + margin-left: -10px !important; + } + } +} diff --git a/src/views/special-fund/add.vue b/src/views/special-fund/add.vue index be6d2a7..c541f16 100644 --- a/src/views/special-fund/add.vue +++ b/src/views/special-fund/add.vue @@ -1,35 +1,43 @@ @@ -63,7 +73,7 @@ import OperationRender from '@/views/workflow/common/OperationRender.vue' import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'; import {ElNotification} from "element-plus"; -import {addFund, resubmitFund, getFundDetail,getFundDetailProcess, getFundProcess} from "@/api/special-fund"; +import {addFund, resubmitFund, getFundDetail, getFundDetailProcess, getFundProcess} from "@/api/special-fund"; import {useRouter} from "vue-router"; import {useTagsView} from '@/stores/tagsview.js' import {useProcessStore} from '@/stores/processStore.js'; @@ -100,7 +110,8 @@ const tableConfig = reactive({ label: '文件名', align: 'center', showOverflowTooltip: false, - currentRender: ({row, index}) => (
clickToPreview(row)}>{row.originalFileName}
) + currentRender: ({row, index}) => ( +
clickToPreview(row)}>{row.originalFileName}
) }, { prop: 'tag', @@ -133,9 +144,9 @@ const tableConfig = reactive({ }) const routerName = ref(router.currentRoute.value.name) const rules = reactive({ - name: [{required: true, message: '请输入专项资金名称', trigger: 'blur'}], - fundAmount: [{required: true, message: '请输入金额', trigger: 'blur'}], - introduce: [{required: true, message: '请输入介绍', trigger: 'blur'}], + name: [{required: true, message: '请输入专项资金名称', trigger: ['blur', 'change']}], + fundAmount: [{required: true, message: '请输入金额', trigger: ['blur', 'change']}], + introduce: [{required: true, message: '请输入专项资金情况说明', trigger: ['blur', 'change']}], }) const filePreviewParam = ref({ @@ -144,14 +155,14 @@ const filePreviewParam = ref({ fileType: 'pdf' }) const filePreviewShow = ref(false) -const clickToPreview=(row)=>{ +const clickToPreview = (row) => { filePreviewShow.value = false filePreviewParam.value = { fileUrl: row.url, fileName: row.originalFileName, fileType: row.fileType } - nextTick(()=>{ + nextTick(() => { filePreviewShow.value = true }) } @@ -322,8 +333,34 @@ onMounted(async () => { :deep(.el-table--fit ) { height: 300px !important; } -.add-block{ - padding: 0 30px 30px 15px; +.add-block { + padding: 0 40px; +} + +:deep(.el-input-number) { + width: 88%; +.el-input__wrapper{ + padding: 1px 11px!important; +} + .el-input__inner { + text-align: left; + } +} + +:deep(.el-table__header) { + .is-leaf:first-child { + .cell { + margin-left: -20px !important; + } + } +} + +:deep(.el-table__body) { + .el-table__cell:first-child { + .cell { + margin-left: -10px !important; + } + } }