diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index f3a4f35..633be36 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -551,7 +551,7 @@ html, body, #app, .el-container, .el-aside, .el-main { } .approval-record { - padding-bottom: 30px; + //padding-bottom: 30px; position: relative; .approval-title { display: flex; diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue index c882e7a..fe26346 100644 --- a/src/components/DetailComponent/ProjectApply.vue +++ b/src/components/DetailComponent/ProjectApply.vue @@ -19,23 +19,38 @@ @getOtherFile="getOtherFile" :showFileList="true" :formData="localFormData" :preview="mode == 'resubmit'"/>
-
- -
-
流程图
- +
+
+ +
+
流程图
+ +
- -
- +
+
+
+ +
+
流程图
+ +
+
+
+
+ +
提交 @@ -63,8 +78,10 @@ @@ -96,7 +113,7 @@ import Paging from "@/components/pagination/index.vue"; const router = useRouter() const route = useRoute() -const changeDiagram = ref(false) +const changeDiagram = ref(true) const emit = defineEmits(["getAttachment", "getOtherFile"]) const props = defineProps({ title: { @@ -273,17 +290,17 @@ const handleSubmit = async () => { // if (localFormData.value.singleFile) { // // } else { - if (attachment.value.singleFile == null) { - attachment.value.validate() - ElNotification({ - title: '提示', - message: '请上传附件', - type: 'error' - }) - return; - } else { - attachment.value.clearValidate() - } + if (attachment.value.singleFile == null) { + attachment.value.validate() + ElNotification({ + title: '提示', + message: '请上传附件', + type: 'error' + }) + return; + } else { + attachment.value.clearValidate() + } // } let params = { @@ -375,6 +392,7 @@ watchEffect(() => { }) onMounted(async () => { + changeDiagram.value = props.mode === 'submit'; await init() }) diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue index 57b02ab..c95f922 100644 --- a/src/components/steps/index.vue +++ b/src/components/steps/index.vue @@ -268,7 +268,7 @@ const getBaseInfo = async () => { const loading = ElLoading.service({fullscreen: true}) try { const {code, data} = await getBaseInfoApi(route.query.projectId) - console.log('data.procedure',data.procedure,route.query.step) + // console.log('data.procedure',data.procedure,route.query.step) if(route.query.step==='40'){ if(data.procedure.indexOf('40')==-1){ data.procedure.push('40') diff --git a/src/views/expense-management/share/index.vue b/src/views/expense-management/share/index.vue index b513f9f..ddfc361 100644 --- a/src/views/expense-management/share/index.vue +++ b/src/views/expense-management/share/index.vue @@ -105,12 +105,12 @@ const tableConfig = reactive({ if (buttons.has("edit")) { btn.push({label: '编辑', prem: ['mosr:requirement:resubmit'], func: () => handleEdit(row), type: 'primary'}) } - if (buttons.has("report")) { - btn.push({label: '明细导出', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'}) - } - if (buttons.has("report")) { - btn.push({label: '汇总导出', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'}) - } + // if (buttons.has("report")) { + // btn.push({label: '明细导出', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'}) + // } + // if (buttons.has("report")) { + // btn.push({label: '汇总导出', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'}) + // } return (
{ diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue index db0359f..c57c30a 100644 --- a/src/views/project-demand/requirement/add.vue +++ b/src/views/project-demand/requirement/add.vue @@ -2,35 +2,44 @@
- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + 请选择 + + + + + @@ -380,6 +389,12 @@ onMounted(async () => { :deep(.el-empty__description) { margin-top: 0; } +.tree-select{ + :deep(.el-form-item__content .el-select__wrapper ) { + width: 750px; + } + +} :deep(.el-table--fit ) { height: 300px !important; diff --git a/src/views/project-demand/requirement/index.vue b/src/views/project-demand/requirement/index.vue index 68830c4..aac9045 100644 --- a/src/views/project-demand/requirement/index.vue +++ b/src/views/project-demand/requirement/index.vue @@ -151,7 +151,7 @@ const tableConfig = reactive({ api: '/workflow/mosr/requirement', btns: [ {name: '新增', key: 'add', color: '#DED0B2',auth: auths.add}, - {name: '导出', key: 'export', type: ''}, + // {name: '导出', key: 'export', type: ''}, ], params: {} }) diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue index 74016b4..9525468 100644 --- a/src/views/project-demand/summary/index.vue +++ b/src/views/project-demand/summary/index.vue @@ -201,8 +201,8 @@ const tableConfig = reactive({ params: {}, btns: [ {name: '新增上报', key: 'add', color: '#DED0B2', auth:auths.report}, - {name: '年度计划导出', key: '_export', auth: ''}, - {name: '经费预算生成', key: 'preMonty', auth: ''}, + // {name: '年度计划导出', key: '_export', auth: ''}, + // {name: '经费预算生成', key: 'preMonty', auth: ''}, ] }) const headBtnClick = (key) => { diff --git a/src/views/special-fund/index.vue b/src/views/special-fund/index.vue index 6ecfac6..ee3e509 100644 --- a/src/views/special-fund/index.vue +++ b/src/views/special-fund/index.vue @@ -156,7 +156,7 @@ const tableConfig = reactive({ params: {}, btns: [ {name: '新增', key: 'add', color: '#DED0B2', auth: ''}, - {name: '导出', key: '_export', color: '#DED0B2', auth: ''}, + // {name: '导出', key: '_export', color: '#DED0B2', auth: ''}, ] }) const tableIns = ref() diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue index 0f07356..f1ec30d 100644 --- a/src/views/system/config/index.vue +++ b/src/views/system/config/index.vue @@ -28,8 +28,8 @@ :icon="Delete" plain :disabled="disabled">删除 - 导出 - + +
新增 - 导出 +
diff --git a/src/views/workflow/listen/index.vue b/src/views/workflow/listen/index.vue index bc1e942..0835c6f 100644 --- a/src/views/workflow/listen/index.vue +++ b/src/views/workflow/listen/index.vue @@ -34,8 +34,8 @@ 删除 - 导出 - + +