diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue index e8809c5..5c984d2 100644 --- a/src/components/AttachmentUpload.vue +++ b/src/components/AttachmentUpload.vue @@ -22,7 +22,7 @@ - + diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue index 2e481b9..e07211c 100644 --- a/src/components/DetailComponent/ApprovalDetail.vue +++ b/src/components/DetailComponent/ApprovalDetail.vue @@ -98,7 +98,8 @@ const executeTableConfig = reactive({ prop: 'originalFileName', label: '文件名', align: 'center', - currentRender: ({row, index}) => (
clickToPreview(row)}>{row.originalFileName}
) + currentRender: ({row, index}) => ( +
clickToPreview(row)}>{row.originalFileName}
) }, { prop: 'tag', @@ -246,9 +247,10 @@ let preProcess = { component: () => (
{ - props.formData.preProcess ? props.formData.preProcess.map((item,index) => { + props.formData.preProcess ? props.formData.preProcess.map((item, index) => { return {item.requestName} {index != (props.formData.preProcess.length -1)? :''} + href={props.formData.preProcessBaseUrl + item.requestId}>{item.requestName} {index != (props.formData.preProcess.length - 1) ? + : ''} }) : {'--'} }
@@ -292,6 +294,23 @@ const schema = computed(() => { ) }, + { + label: '部门分管领导', + prop: 'optionalChargeLeadership', + colProps: { + span: 24 + }, + labelWidth: 'left', + component: () => ( +
+ { + props.formData.optionalChargeLeadership ? props.formData.optionalChargeLeadership.map(item => { + return {item.name} + }) : {'--'} + } +
+ ) + }, ] if (props.preProcessShow == 'EDIT') { preProcess = { @@ -347,22 +366,40 @@ const schema = computed(() => { } } arr.push(preProcess) - arr.push({ - label: '项目验收附件', - prop: 'singleFile', - colProps: { - span: 24 - }, - labelWidth: 'left', - component: () => { - let singleFileArray = [props.formData.singleFile] - return props.formData.singleFile ? - - : -- - } - }) + arr.push( + { + label: '部门分管领导', + prop: 'optionalChargeLeadership', + colProps: { + span: 24 + }, + labelWidth: 'left', + component: () => ( +
+ { + props.formData.optionalChargeLeadership ? props.formData.optionalChargeLeadership.map(item => { + return {item.name} + }) : {'--'} + } +
+ ) + }, + { + label: '项目验收附件', + prop: 'singleFile', + colProps: { + span: 24 + }, + labelWidth: 'left', + component: () => { + let singleFileArray = [props.formData.singleFile] + return props.formData.singleFile ? + + : -- + } + }) } else if (props.type == 'archivist') { arr = [ { diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue index 366b649..0ac17ed 100644 --- a/src/components/DetailComponent/ProjectApply.vue +++ b/src/components/DetailComponent/ProjectApply.vue @@ -33,7 +33,7 @@ + label-width="106"> {{ projectChargePersonUserList.length !== 0 ? '更改' : '请选择' }} @@ -46,7 +46,7 @@ + label-width="106"> {{ projectPersonUserList.length !== 0 ? '更改' : getProjectPerson(projectPersonUserList) ? '更改' : '请选择' }} @@ -58,15 +58,15 @@ - + {{ optionalChargeLeadershipList.length !== 0 ? '更改' : getOptionalChargeLeadershipList(optionalChargeLeadershipList) ? '更改' : '请选择' }}
{{ item.name }}
-
diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue index ffe1156..5329f71 100644 --- a/src/components/DetailComponent/SummaryDetail.vue +++ b/src/components/DetailComponent/SummaryDetail.vue @@ -2,7 +2,7 @@
- + {{ localFormData.projectName }} @@ -48,6 +48,11 @@ {{ filterDict(cacheStore.getDict('technical_standard'), localFormData.technicalStandard) }} + + + {{ toThousands(localFormData.economicEstimate) }} + + {{ @@ -62,6 +67,11 @@ }} + + + {{ localFormData.optionalChargeLeadership?.map(item=>item.name).join() }} + + {{ @@ -70,19 +80,28 @@ - - {{ - filterDict(cacheStore.getDict('intellectual_property'), localFormData.intellectualProperty) - }} + + {{ toThousands(localFormData.specialFundAmount) }} + + + + + + {{ filterDict(cacheStore.getDict('result_form'), localFormData.resultForm) }} - - + + + {{ + filterDict(cacheStore.getDict('intellectual_property'), localFormData.intellectualProperty) + }} + @@ -109,28 +128,22 @@ {{ localFormData.other }} - - - {{ toThousands(localFormData.economicEstimate) }} - + + + + - - - {{ toThousands(localFormData.specialFundAmount) }} - - - + {{ localFormData.serviceDescription }} - + {{ localFormData.contentDescription }} - + diff --git a/src/components/NameCircle.vue b/src/components/NameCircle.vue index 4e016aa..75a1481 100644 --- a/src/components/NameCircle.vue +++ b/src/components/NameCircle.vue @@ -3,7 +3,7 @@
- +
-
+
{{ props.content }} @@ -25,15 +25,26 @@ const props = defineProps({ lines: { type: Boolean, default: false - } + }, + textAlign: { + type: String, + default: '' + }, }) const contentRef = ref() const isShow = ref(false) const isShowTooltip = () => { - isShow.value = props.width > contentRef.value.offsetWidth; + isShow.value = parseInt(props.width) > contentRef.value.offsetWidth; } -