Merge pull request 'fix : 修复部门分管领导回显,需求上报排版' (#647) from dd into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/647

src/components/AttachmentUpload.vue

@@ -22,7 +22,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="24">
-        <el-form-item label="其他文件" label-width="120">
+        <el-form-item label="其他文件" :label-width="tag==='需求上报'?120:106">
           <file-upload @getFile="getOtherFile"/>
           <fvTable style="width: 100%;max-height: 162px;" v-if="showTable" height="162" :tableConfig="tableConfig"
                    :data="allFileList" :isSettingCol="false" :pagination="false">

src/components/DetailComponent/ApprovalDetail.vue

@@ -98,7 +98,8 @@ const executeTableConfig = reactive({
       prop: 'originalFileName',
       label: '文件名',
       align: 'center',
-      currentRender: ({row, index}) => (<div style="color: #2a99ff;cursor: pointer;" onClick={()=>clickToPreview(row)}>{row.originalFileName}</div>)
+      currentRender: ({row, index}) => (
+          <div style="color: #2a99ff;cursor: pointer;" onClick={() => clickToPreview(row)}>{row.originalFileName}</div>)
     },
     {
       prop: 'tag',
@@ -246,9 +247,10 @@ let preProcess = {
   component: () => (
       <div>
         {
-          props.formData.preProcess ? props.formData.preProcess.map((item,index) => {
+          props.formData.preProcess ? props.formData.preProcess.map((item, index) => {
             return <span><a target="_blank" style={{color: '#409EFF', cursor: 'pointer'}}
-                            href={props.formData.preProcessBaseUrl + item.requestId}>{item.requestName} {index != (props.formData.preProcess.length -1)? <span>，</span>:''}</a></span>
+                            href={props.formData.preProcessBaseUrl + item.requestId}>{item.requestName} {index != (props.formData.preProcess.length - 1) ?
+                <span>，</span> : ''}</a></span>
           }) : <span>{'--'}</span>
         }
       </div>
@@ -292,6 +294,23 @@ const schema = computed(() => {
             </div>
         )
       },
+      {
+        label: '部门分管领导',
+        prop: 'optionalChargeLeadership',
+        colProps: {
+          span: 24
+        },
+        labelWidth: 'left',
+        component: () => (
+            <div>
+              {
+                props.formData.optionalChargeLeadership ? props.formData.optionalChargeLeadership.map(item => {
+                  return <span>{item.name} </span>
+                }) : <span>{'--'}</span>
+              }
+            </div>
+        )
+      },
     ]
     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 ? <fvTable style="width: 100%;max-height: 80px;" height="80"
-                                                    tableConfig={editSingleTableConfig}
-                                                    data={singleFileArray} isSettingCol={false} pagination={false}>
-            </fvTable>
-            : <span>--</span>
-      }
-    })
+    arr.push(
+        {
+          label: '部门分管领导',
+          prop: 'optionalChargeLeadership',
+          colProps: {
+            span: 24
+          },
+          labelWidth: 'left',
+          component: () => (
+              <div>
+                {
+                  props.formData.optionalChargeLeadership ? props.formData.optionalChargeLeadership.map(item => {
+                    return <span>{item.name} </span>
+                  }) : <span>{'--'}</span>
+                }
+              </div>
+          )
+        },
+        {
+          label: '项目验收附件',
+          prop: 'singleFile',
+          colProps: {
+            span: 24
+          },
+          labelWidth: 'left',
+          component: () => {
+            let singleFileArray = [props.formData.singleFile]
+            return props.formData.singleFile ? <fvTable style="width: 100%;max-height: 80px;" height="80"
+                                                        tableConfig={editSingleTableConfig}
+                                                        data={singleFileArray} isSettingCol={false} pagination={false}>
+                </fvTable>
+                : <span>--</span>
+          }
+        })
   } else if (props.type == 'archivist') {
     arr = [
       {

src/components/DetailComponent/ProjectApply.vue

@@ -33,7 +33,7 @@
       <el-row>
         <el-col :span="24" v-if="title==='apply'">
           <el-form-item label="项目负责人" :required="true" prop=""
-                        label-width="125">
+                        label-width="106">
             <el-button style="margin-right: 10px" color="#DED0B2" @click="handleShowProjectChargePersonTable">
               {{ projectChargePersonUserList.length !== 0 ? '更改' : '请选择' }}
             </el-button>
@@ -46,7 +46,7 @@
         </el-col>
         <el-col :span="24" v-if="title==='apply'">
           <el-form-item label="项目成员" :required="true" prop=""
-                        label-width="125">
+                        label-width="106">
             <el-button color="#DED0B2" style="margin-right: 10px" @click="handleShowProjectPersonTable">
               {{ projectPersonUserList.length !== 0 ? '更改' : getProjectPerson(projectPersonUserList) ? '更改' : '请选择' }}
             </el-button>
@@ -58,15 +58,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="title==='apply'||title==='check'">
-          <el-form-item label="分管领导"
-                        label-width="125">
+          <el-form-item label="部门分管领导"
+                        label-width="106">
             <el-button color="#DED0B2" style="margin-right: 10px" @click="handleShowOptionalChargeLeadershipPicker">
               {{ optionalChargeLeadershipList.length !== 0 ? '更改' : getOptionalChargeLeadershipList(optionalChargeLeadershipList) ? '更改' : '请选择' }}
             </el-button>
             <div v-for="item in getOptionalChargeLeadershipList(optionalChargeLeadershipList)" :key="item.id" style="margin-right: 5px">
               {{ item.name }}
             </div>
-            <user-picker :multiple="true" ref="optionalChargeLeadershipPickerRef" title="请选择分管领导"
+            <user-picker :multiple="true" ref="optionalChargeLeadershipPickerRef" title="请选择部门分管领导"
                          v-model:value="optionalChargeLeadershipList" @ok="optionalChargeLeaderPickerOk"/>
           </el-form-item>
         </el-col>

src/components/DetailComponent/SummaryDetail.vue

@@ -2,7 +2,7 @@
   <div class="detail-block" v-loading="loading">
     <baseTitle title="需求上报信息"></baseTitle>
     <el-form :model="localFormData" ref="summaryForm" :rules="rules">
-      <el-row gutter="14">
+      <el-row gutter="14" style="margin-bottom: -25px">
         <el-col :span="6">
           <el-form-item label="项目名称" prop="projectName">
             <span>{{ localFormData.projectName }}</span>
@@ -48,6 +48,11 @@
             <span>{{ filterDict(cacheStore.getDict('technical_standard'), localFormData.technicalStandard) }}</span>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item label="经济预算(元)" prop="economicEstimate">
+            <span>{{ toThousands(localFormData.economicEstimate) }}</span>
+          </el-form-item>
+        </el-col>
         <el-col :span="6">
           <el-form-item label="产学研联合" prop="industryUniversityResearch">
             <span>{{
@@ -62,6 +67,11 @@
               }}</span>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item label="部门分管领导" prop="optionalChargeLeadership">
+            <span>{{ localFormData.optionalChargeLeadership?.map(item=>item.name).join() }}</span>
+          </el-form-item>
+        </el-col>
         <el-col :span="6" v-if="localFormData.isSpecialFund">
           <el-form-item label="专项资金名称" prop="specialFund">
             <span>{{
@@ -70,19 +80,28 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="知识产权状况" prop="intellectualProperty">
-            <span>{{
-                filterDict(cacheStore.getDict('intellectual_property'), localFormData.intellectualProperty)
-              }}</span>
+          <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount"
+                        v-if="localFormData.isSpecialFund">
+            <span>{{ toThousands(localFormData.specialFundAmount) }}</span>
           </el-form-item>
         </el-col>
+
+      </el-row>
+      <el-row gutter="14" style="margin-bottom: -25px">
+        <el-col :span="24">
+          <baseTitle title="预期知识产权"></baseTitle>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="预期成果形式" prop="resultForm">
             <span>{{ filterDict(cacheStore.getDict('result_form'), localFormData.resultForm) }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="24" style="margin-top: -15px">
-          <baseTitle title="预期知识产权"></baseTitle>
+        <el-col :span="6">
+          <el-form-item label="知识产权状况" prop="intellectualProperty">
+            <span>{{
+                filterDict(cacheStore.getDict('intellectual_property'), localFormData.intellectualProperty)
+              }}</span>
+          </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="发明专利(项)" prop="inventionPatent">
@@ -109,28 +128,22 @@
             <span>{{ localFormData.other }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="经济预算(元)" prop="economicEstimate">
-            <span>{{ toThousands(localFormData.economicEstimate) }}</span>
-          </el-form-item>
+      </el-row>
+      <el-row gutter="14" >
+        <el-col :span="24">
+          <baseTitle title="项目描述"></baseTitle>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount"
-                        v-if="localFormData.isSpecialFund">
-            <span>{{ toThousands(localFormData.specialFundAmount) }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
+        <el-col :span="24">
           <el-form-item label="现有业务描述" prop="serviceDescription">
             <span>{{ localFormData.serviceDescription }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="24">
           <el-form-item label="研发项目关键内容描述" prop="contentDescription">
             <span>{{ localFormData.contentDescription }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="24" style="margin-top: -15px">
+        <el-col :span="24" style="margin-top: -25px">
           <baseTitle title="需求上报申请书"></baseTitle>
         </el-col>
         <el-col :span="24">

src/components/NameCircle.vue

@@ -3,7 +3,7 @@
     <slot name="pre"></slot>
     <div class="user-audit">
       <div class="circle-user">
-        <Tooltip :content="user.name" placement="bottom-start" width="45px"/>
+        <Tooltip :content="user.name" placement="bottom-start" width="45"/>
         <div v-if="user.icon"
              class="el-timeline-item__node" :style="{
                       backgroundColor: user.color

src/components/Tooltip.vue

@@ -5,7 +5,7 @@
       placement="bottom-start"
       :disabled="isShow"
   >
-    <div :class="lines?'content-lines':'content'" :style="{width: props.width}" @mouseover="isShowTooltip">
+    <div :class="lines?'content-lines':textAlign=='left'?'left-content':'content'" :style="{width: props.width+'px'}" @mouseover="isShowTooltip">
       <span ref="contentRef">
         <slot name="content">{{ props.content }}</slot>
       </span>
@@ -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;
 }
 </script>
-<style>
+<style scoped>
+.left-content{
+  width: 45px;
+  text-align: left;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
 .content {
   width: 45px;
   text-align: center;

src/components/steps/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <baseTitle title="基础信息"></baseTitle>
+  <baseTitle title="项目基本信息"></baseTitle>
   <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
   <div class="steps-box">
     <el-steps v-if="stepsShow" :active="localActive" finish-status="success">
@@ -333,7 +333,7 @@ watchEffect(() => {
 
 <style lang="scss" scoped>
 .steps-box {
-  padding: 10px 0;
+  //padding: 10px 0;
 }
 
 .step-success {

src/views/project-demand/requirement/add.vue

@@ -1,14 +1,14 @@
 <template>
   <div v-loading="loading" class="add-block">
     <baseTitle title="需求征集信息录入"></baseTitle>
-    <el-form :model="formData" ref="demandForm" :rules="rules">
-      <el-row gutter="14">
-        <el-col :span="6">
+    <el-form :model="formData" ref="demandForm" :rules="rules" :scroll-to-error="true">
+      <el-row gutter="40">
+        <el-col :span="5">
           <el-form-item label="征集名称" prop="requirementName" >
             <el-input v-model="formData.requirementName" placeholder="请输入名称" clearable></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="5">
           <el-form-item label="征集类型" prop="collectType">
             <el-select v-model="formData.collectType" placeholder="请选择征集类型" clearable filterable>
               <el-option
@@ -20,7 +20,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="5">
           <el-form-item label="需求上报截止时间" prop="deadline">
             <el-config-provider>
               <el-date-picker
@@ -34,15 +34,15 @@
             </el-config-provider>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="专项资金" prop="isSpecialFund" required>
+        <el-col :span="4">
+          <el-form-item label="是否专项资金" prop="isSpecialFund">
             <el-select v-model="formData.isSpecialFund" placeholder="是否专项资金" clearable filterable>
               <el-option :value="true" label="是"></el-option>
               <el-option :value="false" label="否"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="5">
           <el-form-item label="专项资金名称" prop="specialFundId" v-if="formData.isSpecialFund">
             <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable>
               <el-option
@@ -54,7 +54,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="24" style="margin-bottom: -25px">
+        <el-col :span="24" style="margin-bottom: -18px">
           <el-form-item label="征集公司" :required="true" prop="" class="company-select">
             <div style="width: 100%">
               <el-button color="#DED0B2" @click="showCompany">{{ selectedCompanyList.length === 0 ? '请选择征集公司' : '更改' }}
@@ -89,19 +89,22 @@
       </template>
     </fvTable>
     <div class="approval-record">
-      <div style="display: flex;align-items: center;justify-content: flex-start;">
-        <div class="base-title">流程图</div>
-        <el-switch
-            v-model="changeDiagram"
-            style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd;margin-left: 10px"
-        />
+      <div class="approval-title" >
+        <baseTitle title="审批记录"></baseTitle>
+        <div class="diagram">
+          <div class="base-title">流程图</div>
+          <el-switch
+              v-model="changeDiagram"
+              style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd;"
+          />
+        </div>
       </div>
       <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
     </div>
     <div style="width: 100%;height: 30px"></div>
     <div class="oper-page-btn">
       <el-button color="#DED0B2" v-if="routerName==='Requirement/add'" @click="handleSubmit(demandForm)">提交</el-button>
-      <el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
+      <el-button color="#DED0B2" v-else @click="handleResubmit(demandForm)">重新提交</el-button>
       <el-button @click="handleBack">返回</el-button>
     </div>
 
@@ -159,7 +162,7 @@ const formData = ref({
   deadline: '',
   collectExplain: '',
   fileList: [],
-  isSpecialFund: false
+  isSpecialFund: true
 })
 const routerName = ref(router.currentRoute.value.name)
 const processDiagramViewer = ref(false)
@@ -175,9 +178,9 @@ const formPermMap = ref(new Map());
 const companyNameArray = ref([])
 const rules = reactive({
   requirementName: [{required: true, message: '请输入征集名称', trigger: ['blur','change']}],
-  // companyIds: [{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']}],
+  deadline: [{required: true, message: '请选择需求上报截止时间', trigger:  ['blur','change']}],
   specialFundId: [{required: true, message: '请选择专项资金名称', trigger:  ['blur','change']}],
 })
 
@@ -418,19 +421,38 @@ const handleSubmit = async (instance) => {
     }
   })
 }
-const handleResubmit = () => {
-  resubmit(submitParam(formData.value)).then(res => {
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
-    if (res.code === 1000) {
-      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      router.push({
-        name: 'Requirement'
+const handleResubmit = (instance) => {
+  if (!instance) return
+  instance.validate(async (valid) => {
+    if (!valid) {
+      ElNotification({
+        title: '提示',
+        message: '请完善数据,再提交!',
+        type: 'error'
       })
+      return;
     }
+    if (formData.value.companyIds.length === 0) {
+      ElNotification({
+        title: '提示',
+        message: '请选择征集公司',
+        type: 'error'
+      })
+      return;
+    }
+    resubmit(submitParam(formData.value)).then(res => {
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: res.code === 1000 ? 'success' : 'error'
+      })
+      if (res.code === 1000) {
+        tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+        router.push({
+          name: 'Requirement'
+        })
+      }
+    })
   })
 }
 const matterTree = (array,data, id) => {

src/views/project-demand/summary/add.vue

@@ -1,15 +1,21 @@
 <template>
   <div class="detail-block" v-loading="loading">
-    <baseTitle title="需求上报"></baseTitle>
-    <el-form :model="formData" ref="summaryForm" :rules="rules">
-      <el-row gutter="14">
+    <baseTitle title="项目基本信息"></baseTitle>
+    <el-form :model="formData" ref="summaryForm" :rules="rules"  label-width="120" :scroll-to-error="true">
+      <el-row gutter="40" style="margin-bottom: -18px">
         <el-col :span="6">
-          <el-form-item label="项目名称" prop="projectName">
+          <el-form-item label="项目名称" prop="projectName" >
             <el-input v-model="formData.projectName" placeholder="请输入项目名称" clearable></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="开始时间" prop="startTime">
+          <el-form-item label="承办单位"  :label-width="route.query.id && formData.isSpecialFund?135:120">
+            <Tooltip :content="authStore.userinfo?.subCompanyName" placement="bottom-start" width="240" textAlign="left">
+            </Tooltip>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="开始时间" prop="startTime" label-width="135">
             <el-config-provider>
               <el-date-picker
                   v-model="formData.startTime"
@@ -52,7 +58,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="研发主体" prop="rdSubject">
+          <el-form-item label="研发主体" prop="rdSubject"  :label-width="route.query.id && formData.isSpecialFund?135:120">
             <el-select v-model="formData.rdSubject" placeholder="请选择研发主体" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('rd_subject')"
@@ -64,7 +70,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="出资类型" prop="investmentType">
+          <el-form-item label="出资类型" prop="investmentType" label-width="135">
             <el-select v-model="formData.investmentType" placeholder="请选择出资类型" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('invest_type')"
@@ -88,7 +94,7 @@
         <!--          </el-form-item>-->
         <!--        </el-col>-->
         <el-col :span="6">
-          <el-form-item label="业务板块" prop="businessSegment">
+          <el-form-item label="业务板块" prop="businessSegment"   >
             <el-select v-model="formData.businessSegment" placeholder="请选择所属业务板块" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('business_segment')"
@@ -100,7 +106,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="技术标准" prop="technicalStandard">
+          <el-form-item label="标准制定" prop="technicalStandard">
             <el-select v-model="formData.technicalStandard" placeholder="请选择预期技术标准制定" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('technical_standard')"
@@ -112,38 +118,52 @@
           </el-form-item>
         </el-col>
         <!--        <el-col :span="route.query.id && formData.isSpecialFund?8:!formData.isSpecialFund?!route.query.id?6:8:6">-->
-
         <el-col :span="6">
-          <el-form-item label="产学研联合" prop="industryUniversityResearch">
-            <el-radio-group v-model="formData.industryUniversityResearch">
-              <el-radio v-for="item in cacheStore.getDict('industry_university')"
-                        :key="item.value"
-                        :label="item.value">{{ item.label }}
-              </el-radio>
-            </el-radio-group>
+          <el-form-item label="经费预算" prop="economicEstimate" :label-width="route.query.id && formData.isSpecialFund?135:120">
+            <el-input-number v-model="formData.economicEstimate" placeholder="请输入经济预算数量" :controls="false"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="产学研联合" prop="industryUniversityResearch" label-width="135">
+            <el-select v-model="formData.industryUniversityResearch" clearable>
+              <el-option
+                  v-for="item in cacheStore.getDict('industry_university')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
         <!--        <el-col :span="route.query.id && formData.isSpecialFund?8:!formData.isSpecialFund?route.query.id?8:6:6">-->
         <!--      </el-row>-->
         <!--      <el-row gutter="10">-->
         <el-col :span="6">
-          <el-form-item label="开展政府申报" prop="governmentDeclaration">
+          <el-form-item label="开展政府申报" prop="governmentDeclaration"   >
             <!--                        :label-width="route.query.id && formData.isSpecialFund?145:!formData.isSpecialFund?145:145">-->
-            <el-radio-group v-model="formData.governmentDeclaration">
-              <el-radio v-for="item in cacheStore.getDict('government_declaration')"
-                        :key="item.value"
-                        :label="item.value">{{ item.label }}
-              </el-radio>
-            </el-radio-group>
+            <el-select v-model="formData.governmentDeclaration" clearable>
+              <el-option
+                  v-for="item in cacheStore.getDict('government_declaration')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
+
+
         <!--        <el-col :span="!route.query.id && formData.isSpecialFund?4:!route.query.id?12:12" v-if="!route.query.id">-->
         <el-col :span="6" v-if="!route.query.id">
           <el-form-item label="是否专项资金" prop="isSpecialFund" required>
-            <el-radio-group v-model="formData.isSpecialFund" @change="specialFundChange">
-              <el-radio :label="true">是</el-radio>
-              <el-radio :label="false">否</el-radio>
-            </el-radio-group>
+            <el-select v-model="formData.isSpecialFund" clearable @change="specialFundChange">
+              <el-option label="是" :value="true"/>
+              <el-option label="否" :value="false"/>
+            </el-select>
+<!--            <el-radio-group v-model="formData.isSpecialFund" @change="specialFundChange">-->
+<!--              <el-radio :label="true">是</el-radio>-->
+<!--              <el-radio :label="false">否</el-radio>-->
+<!--            </el-radio-group>-->
           </el-form-item>
         </el-col>
         <el-col :span="6" v-if="route.query.id && formData.isSpecialFund">
@@ -152,7 +172,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6" v-if="!route.query.id && formData.isSpecialFund">
-          <el-form-item label="专项资金" prop="specialFundId">
+          <el-form-item label="所属专项资金" prop="specialFundId"  >
             <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable>
               <el-option
                   v-for="item in specialFundOption"
@@ -163,89 +183,13 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row gutter="14">
-        <el-col :span="6" style="margin-bottom: -18px">
-          <!--          :label-width="!formData.isSpecialFund?!route.query.id?125:125:125">-->
-          <el-form-item label="知识产权状况" prop="intellectualProperty">
-            <el-select v-model="formData.intellectualProperty" placeholder="请选择知识产权状况" clearable filterable>
-              <el-option
-                  v-for="item in cacheStore.getDict('intellectual_property')"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12" style="margin-bottom: -18px">
-          <el-form-item label="成果形式" prop="resultForm">
-            <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable multiple>
-              <el-option
-                  v-for="item in cacheStore.getDict('result_form')"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row gutter="14">
-        <el-col :span="24">
-          <baseTitle title="预期知识产权"></baseTitle>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="发明专利(项)" prop="inventionPatent" label-width="105">
-            <el-input-number v-model="formData.inventionPatent" placeholder="请输入发明专利数量" :controls="false"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="新型专利(项)" prop="newPatent">
-            <el-input-number v-model="formData.newPatent" placeholder="请输入实用性新型专利数量" :controls="false"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="软件著作权(项)" prop="softwareCopyright">
-            <el-input-number v-model="formData.softwareCopyright" placeholder="请输入软件著作权数量" :controls="false"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="著作权(项)" prop="copyright">
-            <el-input-number v-model="formData.copyright" placeholder="请输入著作权数量" :controls="false"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="其他(项)" prop="other" label-width="105">
-            <el-input-number v-model="formData.other" placeholder="请输入其他数量" :controls="false"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="经济预算(元)" prop="economicEstimate">
-            <el-input-number v-model="formData.economicEstimate" placeholder="请输入经济预算数量" :controls="false"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12" v-if="formData.isSpecialFund">
-          <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount">
+        <el-col :span="6" v-if="formData.isSpecialFund">
+          <el-form-item label="申请总部专项资金" prop="specialFundAmount" label-width="135">
             <el-input-number v-model="formData.specialFundAmount" placeholder="请输入专项资金" :controls="false"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row gutter="14">
-        <el-col :span="12">
-          <el-form-item label="现有业务描述" prop="serviceDescription">
-            <el-input v-model="formData.serviceDescription" placeholder="请输入现有业务描述" rows="4" type="textarea"
-                      clearable></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="研发项目关键内容描述" prop="contentDescription">
-            <el-input v-model="formData.contentDescription" placeholder="请输入研发项目关键内容描述" rows="4" type="textarea"
-                      clearable></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="分管领导" label-width="120">
+        <el-col :span="6">
+          <el-form-item label="部门分管领导" required prop=""  :label-width="route.query.id && formData.isSpecialFund?135:120">
             <el-button color="#DED0B2" style="margin-right: 10px" @click="handleShowOptionalChargeLeadershipPicker">
               {{ optionalChargeLeadershipList.length !== 0 ? '更改' : '请选择' }}
             </el-button>
@@ -256,19 +200,96 @@
                          v-model:value="optionalChargeLeadershipList" @ok="optionalChargeLeaderPickerOk"/>
           </el-form-item>
         </el-col>
+
+      </el-row>
+      <el-row gutter="40" style="margin-bottom: -18px">
+        <el-col :span="24">
+          <baseTitle title="预期知识产权"></baseTitle>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="预期成果形式" prop="resultForm">
+            <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable multiple>
+              <el-option
+                  v-for="item in cacheStore.getDict('result_form')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <!--          :label-width="!formData.isSpecialFund?!route.query.id?125:125:125">-->
+          <el-form-item label="知识产权状况" prop="intellectualProperty"  label-width="135">
+            <el-select v-model="formData.intellectualProperty" placeholder="请选择知识产权状况" clearable filterable>
+              <el-option
+                  v-for="item in cacheStore.getDict('intellectual_property')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="发明专利(项)" prop="inventionPatent"  >
+            <el-input-number v-model="formData.inventionPatent" placeholder="请输入发明专利数量" :controls="false"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="新型专利(项)" prop="newPatent" >
+            <el-input-number v-model="formData.newPatent" placeholder="请输入实用性新型专利数量" :controls="false"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="软件著作权(项)" prop="softwareCopyright"  :label-width="route.query.id && formData.isSpecialFund?135:120">
+            <el-input-number v-model="formData.softwareCopyright" placeholder="请输入软件著作权数量" :controls="false"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="著作权(项)" prop="copyright"  label-width="135">
+            <el-input-number v-model="formData.copyright" placeholder="请输入著作权数量" :controls="false"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="其他(项)" prop="other"   >
+            <el-input-number v-model="formData.other" placeholder="请输入其他数量" :controls="false"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row gutter="40" style="margin-bottom: -18px">
+        <el-col :span="24">
+          <baseTitle title="项目描述"></baseTitle>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="现有业务描述" prop="serviceDescription">
+            <el-input v-model="formData.serviceDescription" placeholder="请输入现有业务描述" rows="4" type="textarea"
+                      clearable></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="建设目标描述" prop="contentDescription">
+            <el-input v-model="formData.contentDescription" placeholder="请输入研发项目关键内容描述" rows="4" type="textarea"
+                      clearable></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
+    <baseTitle title="附件文件"></baseTitle>
     <AttachmentUpload ref="attachment" label="需求申请书附件" :showTable="showTable" v-model:otherFileList="otherFileList"
                       @getAttachment="getAttachment" v-model:singleList="singleList" :showSingleTable="showSingleTable"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" tag="需求上报"
                       :preview="name === 'Summary/edit'"/>
-    <div class="approval-record" style="margin-left: 70px">
-      <div style="display: flex;align-items: center;justify-content: flex-start;">
-        <div class="base-title">流程图</div>
-        <el-switch
-            v-model="changeDiagram"
-            style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd;margin-left: 10px"
-        />
+    <div class="approval-record">
+      <div class="approval-title" style="margin-top: -15px">
+        <baseTitle title="审批记录"></baseTitle>
+        <div class="diagram">
+          <div class="base-title">流程图</div>
+          <el-switch
+              v-model="changeDiagram"
+              style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd;"
+          />
+        </div>
       </div>
       <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
     </div>
@@ -285,6 +306,7 @@
 import {debounce} from 'lodash'
 import {getDetail, getProcessInfo, requirementReported, resubmitReported} from "@/api/project-demand/summary";
 import {ElNotification} from "element-plus";
+import {useAuthStore} from '@/stores/userstore.js'
 import {useTagsView} from '@/stores/tagsview.js'
 import {useCacheStore} from '@/stores/cache.js'
 import {useProcessStore} from '@/stores/processStore.js';
@@ -294,6 +316,7 @@ import {getFormInfo} from "@/api/project-demand";
 import {getFundOption} from "@/api/special-fund";
 import UserPicker from "@/views/workflow/process/common/UserPicker.vue";
 
+const authStore = useAuthStore()
 const changeDiagram = ref(false)
 const cacheStore = useCacheStore()
 const processStore = useProcessStore()
@@ -553,7 +576,7 @@ const handleResubmit = debounce((instance) => {
 
 const getDetailInfo = async () => {
   loading.value = true
- await getDetail(route.query.projectId).then(res => {
+  await getDetail(route.query.projectId).then(res => {
     ElNotification({
       title: '提示',
       message: res.msg,
@@ -562,6 +585,7 @@ const getDetailInfo = async () => {
     if (res.code === 1000) {
       res.data.formData.specialFundId = res.data.formData.specialFundId === 0 ? null : res.data.formData.specialFundId
       formData.value = res.data.formData
+      optionalChargeLeadershipList.value=formData.value.optionalChargeLeadership
       loading.value = false
     }
   })

src/views/workflow/process/common/AvatarEllipsis.vue

@@ -7,7 +7,7 @@
       <div v-for="(user,index) in userInfo" :key="index" class="avatar_name">
         <div class="user">
           <div class="circle-user">
-            <Tooltip :content="user.name" placement="bottom-start" width="45px">
+            <Tooltip :content="user.name" placement="bottom-start" width="45">
             </Tooltip>
           </div>
           <div v-if="user.icon && mode === 'preview'"