diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 633be36..da3e9b3 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; @@ -561,6 +561,7 @@ html, body, #app, .el-container, .el-aside, .el-main { .diagram { display: flex; align-items: center; + float: right; .base-title { margin-right: 10px; diff --git a/src/components/DetailComponent/CompanyPicker.vue b/src/components/DetailComponent/CompanyPicker.vue new file mode 100644 index 0000000..d9acfee --- /dev/null +++ b/src/components/DetailComponent/CompanyPicker.vue @@ -0,0 +1,401 @@ + + + + + diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue index 3fcac73..936b1f5 100644 --- a/src/components/DetailComponent/ProjectApply.vue +++ b/src/components/DetailComponent/ProjectApply.vue @@ -18,10 +18,11 @@ @getAttachment="getAttachment" @getOtherFile="getOtherFile" :showFileList="true" :formData="localFormData" :preview="mode == 'resubmit'"/> -
+
- + +
流程图
-
-
- -
-
-
-
-
- -
- - - - - -
+
+ +
-
- -
+
+ + + + + + + + + + + + + + + + +
提交 重新提交 @@ -80,7 +83,7 @@ @@ -113,7 +116,7 @@ import Paging from "@/components/pagination/index.vue"; const router = useRouter() const route = useRoute() -const changeDiagram = ref(true) +const changeDiagram = ref(false) const emit = defineEmits(["getAttachment", "getOtherFile"]) const props = defineProps({ title: { @@ -392,7 +395,6 @@ watchEffect(() => { }) onMounted(async () => { - // changeDiagram.value = props.mode === 'submit'; await init() }) diff --git a/src/components/TagAndFileUpload.vue b/src/components/TagAndFileUpload.vue index 47a0a68..350888d 100644 --- a/src/components/TagAndFileUpload.vue +++ b/src/components/TagAndFileUpload.vue @@ -70,7 +70,8 @@ const tableConfig = reactive({ { prop: 'tag', label: '文件大小', - align: 'center' + align: 'center', + currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB') }, { prop: 'oper', diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue index 5e222c9..2b3cc74 100644 --- a/src/views/expense-management/share/add.vue +++ b/src/views/expense-management/share/add.vue @@ -125,8 +125,14 @@ 添加一行
- - +
+ + +
+
提交 @@ -143,6 +149,7 @@ import {addAllocation, getAllocationDetail, getAllocationProcess, getResearchUse import {useProcessStore} from '@/stores/processStore.js'; import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'; +const changeDiagram = ref(false) const rules = reactive({ shareName: [{required: true, message: '请输入分摊名称', trigger: 'blur'}], apportionmentMonth: [{required: true, message: '请选择月份', trigger: 'blur'}], @@ -171,13 +178,13 @@ const formData = ref({ projectId:'', projectName: '', researchPersonnel:'', - wagesPayable:'', - performance:'', - reserveFund:'', - socialSecurity:'', - annuity:'', - workday:'', - researchDuration:'' + wagesPayable:null, + performance:null, + reserveFund:null, + socialSecurity:null, + annuity:null, + workday:'21.75', + researchDuration:null, } ] }) @@ -207,19 +214,30 @@ const handleAdd = () => { projectId: '', projectName: '', researchPersonnel: '', - wagesPayable: '', - performance: '', - reserveFund: '', - socialSecurity: '', - annuity: '', - workday: '', - researchDuration: '', - // subtotal: '', + wagesPayable:null, + performance:null, + reserveFund:null, + socialSecurity:null, + annuity:null, + workday:'21.75', + researchDuration:null, } formData.value.tableData.push(row) } const handleCopy = (row) => { - formData.value.tableData.push(row) + let copyObj = { + projectId: row.projectId, + projectName: '', + researchPersonnel: row.researchPersonnel, + wagesPayable: row.wagesPayable, + performance: row.performance, + reserveFund: row.reserveFund, + socialSecurity: row.socialSecurity, + annuity: row.annuity, + workday:'21.75', + researchDuration: row.researchDuration, + } + formData.value.tableData.push(copyObj) } const handleDelete = (index) => { formData.value.tableData.splice(index, 1) @@ -243,7 +261,7 @@ const handleSubmit = (instance) => { usrAllocations: formData.value.tableData, deploymentId: processInstanceData.value.deploymentId, } - console.log('params',params) + // console.log('params',params) const {code, msg} = await addAllocation(params) ElNotification({ title: '提示', @@ -279,7 +297,7 @@ const handleResubmit = (instance) => { usrAllocations: formData.value.tableData, deploymentId: processInstanceData.value.deploymentId, } - console.log('params',params) + // console.log('params',params) const {code, msg} = await editAllocation(params) ElNotification({ title: '提示', @@ -321,7 +339,6 @@ const getDetailList = async () => { item.researchPersonnel = Number(item.researchPersonnel) }) formData.value.tableData = data.rows - console.log('formData.value.tableData',formData.value.tableData) nextTick(() => { showTable.value = true }) diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue index a7578b7..530f616 100644 --- a/src/views/project-demand/requirement/add.vue +++ b/src/views/project-demand/requirement/add.vue @@ -34,7 +34,7 @@ - + @@ -79,8 +79,14 @@
- - +
+ + +
+
提交 @@ -109,6 +115,7 @@ import {getSubCompOpt} from '@/api/user/user.js' import {useTagsView} from '@/stores/tagsview.js' import {getFundOption} from "@/api/special-fund"; +const changeDiagram = ref(false) const tagsViewStore = useTagsView() const authStore = useAuthStore() const router = useRouter() @@ -389,7 +396,8 @@ onMounted(async () => { :deep(.el-empty__description) { margin-top: 0; } -.tree-select{ + +.tree-select { :deep(.el-form-item__content .el-select__wrapper ) { width: 750px; } diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index 6963ed8..d461f33 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -237,8 +237,14 @@ @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" :preview="name === 'Summary/edit'"/>
- - +
+ + +
+
@@ -261,6 +267,7 @@ import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.v import {getFormInfo} from "@/api/project-demand"; import {getFundOption} from "@/api/special-fund"; +const changeDiagram = ref(false) const cacheStore = useCacheStore() const processStore = useProcessStore() const router = useRouter() diff --git a/src/views/project-management/filing/upload.vue b/src/views/project-management/filing/upload.vue index a93a3cf..ed3ec34 100644 --- a/src/views/project-management/filing/upload.vue +++ b/src/views/project-management/filing/upload.vue @@ -1,7 +1,7 @@