Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/components/NameCircle.vue

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({
+    arr.push(
-      label: '项目验收附件',
+        {
-      prop: 'singleFile',
+          label: '部门分管领导',
-      colProps: {
+          prop: 'optionalChargeLeadership',
-        span: 24
+          colProps: {
-      },
+            span: 24
-      labelWidth: 'left',
+          },
-      component: () => {
+          labelWidth: 'left',
-        let singleFileArray = [props.formData.singleFile]
+          component: () => (
-        return props.formData.singleFile ? <fvTable style="width: 100%;max-height: 80px;" height="80"
+              <div>
-                                                    tableConfig={editSingleTableConfig}
+                {
-                                                    data={singleFileArray} isSettingCol={false} pagination={false}>
+                  props.formData.optionalChargeLeadership ? props.formData.optionalChargeLeadership.map(item => {
-            </fvTable>
+                    return <span>{item.name} </span>
-            : <span>--</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 = [
       {
@@ -511,12 +548,6 @@ watchEffect(() => {
   Object.keys(props.formData).length && (form.value?.setValues(props.formData))
 })
 
-onMounted(() => {
-  // if (props.formData.mode == 'view' && props.type == 'execute') {
-  //   handleSearchImplementationFileList()
-  //   getTagsOption()
-  // }
-})
 
 if (props.formData.mode == 'view' && props.type == 'execute') {
   handleSearchImplementationFileList()

src/components/DetailComponent/CollectionDetail.vue

@@ -33,17 +33,24 @@
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="24" style="margin-top: -15px;margin-bottom: -15px">
+        <el-col :span="24"  style="margin-bottom: -15px">
-          <baseTitle title="征集说明"></baseTitle>
+          <el-form-item label="征集说明">
-          <el-form-item>
+            <div v-if="formData.collectExplain" v-html="formData.collectExplain">
-            <el-card style="width: 100%">
+            </div>
-              <div v-html="formData.collectExplain">
+            <div v-else>--</div>
-              </div>
-            </el-card>
           </el-form-item>
         </el-col>
-        <baseTitle v-if="fileListShow === 'READ' || fileListShow === 'EDIT'" title="附件列表"> </baseTitle>
+<!--        <el-col :span="24" style="margin-top: -15px;margin-bottom: -15px">-->
+<!--          <baseTitle title="征集说明"></baseTitle>-->
+<!--          <el-form-item>-->
+<!--            <el-card style="width: 100%">-->
+<!--              <div v-html="formData.collectExplain">-->
+<!--              </div>-->
+<!--            </el-card>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
         <el-col :span="24">
+          <baseTitle v-if="fileListShow === 'READ' || fileListShow === 'EDIT'" title="附件列表"> </baseTitle>
           <file-component title="" tag="需求征集"
                           v-model:value="formData.fileList" :processViewer="processViewer"
                           :file-list-show="fileListShow"/>

src/components/DetailComponent/ProjectApply.vue

@@ -4,7 +4,7 @@
       <el-col :span="24">
         <baseTitle :title="'附件信息'"></baseTitle>
       </el-col>
-      <el-form :model="attachmentParam" inline style="margin-top: 15px">
+      <el-form :model="attachmentParam" inline >
         <el-form-item label="标签" prop="tag">
           <el-select v-model="attachmentParam.tag" placeholder="请选择标签" clearable filterable style="width: 300px">
             <el-option
@@ -33,9 +33,9 @@
       <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 ? '更改' : '请选择' }}
+              {{ projectChargePersonUserList?.length !== 0 ? '更改' : '请选择' }}
             </el-button>
             <div v-for="item in projectChargePersonUserList" :key="item.id" style="margin-right: 5px">
               {{ item.name }}
@@ -46,9 +46,9 @@
         </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) ? '更改' : '请选择' }}
+              {{ projectPersonUserList?.length !== 0 ? '更改' : getProjectPerson(projectPersonUserList) ? '更改' : '请选择' }}
             </el-button>
             <div v-for="item in getProjectPerson(projectPersonUserList)" :key="item.id" style="margin-right: 5px">
               {{ item.name }}
@@ -58,15 +58,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="title==='apply'||title==='check'">
-          <el-form-item label="分管领导"
+          <el-form-item label="部门分管领导"
-                        label-width="125">
+                        label-width="106">
             <el-button color="#DED0B2" style="margin-right: 10px" @click="handleShowOptionalChargeLeadershipPicker">
-              {{ optionalChargeLeadershipList.length !== 0 ? '更改' : getOptionalChargeLeadershipList(optionalChargeLeadershipList) ? '更改' : '请选择' }}
+              {{ 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>
@@ -74,12 +74,12 @@
           <el-form-item label="前置流程" :required="preProcessRequired" prop="preProcess" label-width="125">
             <el-button color="#DED0B2" @click="handleShowPreTable" style="margin-right: 10px">
               {{
-                localFormData.preProcess && localFormData.preProcess.length > 0 ? '更改' : sessionParams.preProcess && sessionParams.preProcess.length > 0 ? '更改' : '请选择'
+                localFormData.preProcess && localFormData.preProcess?.length > 0 ? '更改' : sessionParams.preProcess && sessionParams.preProcess?.length > 0 ? '更改' : '请选择'
               }}
             </el-button>
             <div v-for="(item,index) in getRequestName(localFormData.preProcess)" :key="item.requestId">
               <a :href="item.baseUrl" target="_blank"
-                 style="color: #2a99ff;cursor: pointer">{{ item.requestName }}<span v-if="index != localFormData.preProcess.length -1">，</span>
+                 style="color: #2a99ff;cursor: pointer">{{ item.requestName }}<span v-if="index != localFormData.preProcess?.length -1">，</span>
               </a>
             </div>
           </el-form-item>
@@ -94,9 +94,10 @@
                       :preview="mode == 'resubmit'"/>
     <div>
       <div class="approval-record">
-        <div class="approval-title">
+        <div class="approval-title" style="margin-top: -15px">
-          <baseTitle title="审批记录" v-if="mode === 'resubmit'"></baseTitle>
+<!--          <baseTitle title="审批记录" v-if="mode === 'resubmit'"></baseTitle>-->
-          <div v-else></div>
+<!--          <div v-else></div>-->
+          <baseTitle title="审批记录"></baseTitle>
           <div class="diagram">
             <div class="base-title">流程图</div>
             <el-switch
@@ -105,8 +106,9 @@
             />
           </div>
         </div>
+        <el-empty  :image-size="100" description="暂无审批记录" v-if="!data?.operationList&&!changeDiagram"/>
         <div class="process">
-          <operation-render v-if="mode === 'resubmit'&&!changeDiagram" :operation-list="data.operationList"
+          <operation-render v-if="mode === 'resubmit'&&processDiagramViewer&& data?.operationList && data?.operationList.length > 0&&!changeDiagram"  :operation-list="data.operationList"
                             :state="data.state"/>
           <process-diagram-viewer mode="view" :idName="title" v-if="processDiagramViewer&&changeDiagram"/>
         </div>
@@ -730,11 +732,15 @@ const init = async () => {
 
 watchEffect(() => {
   if (props.formData.projectChargePerson == null) {
-    //   projectChargePersonUserList.value = []
+      projectChargePersonUserList.value = []
   } else {
     projectChargePersonUserList.value = [props.formData.projectChargePerson]
   }
-  // console.log('props.formData.projectPersonList',props.formData.projectPersonList)
+  if (props.formData.optionalChargeLeadership == null) {
+    optionalChargeLeadershipList.value = []
+  } else {
+    optionalChargeLeadershipList.value=props.formData.optionalChargeLeadership
+  }
   projectPersonUserList.value = props.formData.projectPersonList ? props.formData.projectPersonList : []
   let flag = Object.keys(props.formData).length && (localFormData.value = props.formData)
   if (props.formData.projectChargePerson != null) {

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: -18px">
         <el-col :span="6">
           <el-form-item label="项目名称" prop="projectName">
             <span>{{ localFormData.projectName }}</span>
@@ -33,11 +33,7 @@
             <span>{{ filterDict(cacheStore.getDict('invest_type'), localFormData.investmentType) }}</span>
           </el-form-item>
         </el-col>
-        <!--        <el-col :span="8">-->
+
-        <!--          <el-form-item label="项目影响" prop="projectImpact">-->
-        <!--            <span>{{ filterDict(cacheStore.getDict('project_impact'), localFormData.projectImpact) }}</span>-->
-        <!--          </el-form-item>-->
-        <!--        </el-col>-->
         <el-col :span="6">
           <el-form-item label="所属业务板块" prop="businessSegment">
             <span>{{ filterDict(cacheStore.getDict('business_segment'), localFormData.businessSegment) }}</span>
@@ -48,6 +44,16 @@
             <span>{{ filterDict(cacheStore.getDict('technical_standard'), localFormData.technicalStandard) }}</span>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item label="项目影响" prop="projectImpact">
+            <span>{{ filterDict(cacheStore.getDict('project_impact'), localFormData.projectImpact) }}</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>{{
@@ -69,20 +75,32 @@
               }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="6" v-if="localFormData.isSpecialFund">
-          <el-form-item label="知识产权状况" prop="intellectualProperty">
+          <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount">
-            <span>{{
+            <span>{{ toThousands(localFormData.specialFundAmount) }}</span>
-                filterDict(cacheStore.getDict('intellectual_property'), localFormData.intellectualProperty)
-              }}</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-row>
+      <el-row gutter="14" style="margin-bottom: -18px">
+        <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">
+        <el-col :span="6">
-          <baseTitle title="预期知识产权"></baseTitle>
+          <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 +127,22 @@
             <span>{{ localFormData.other }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+      </el-row>
-          <el-form-item label="经济预算(元)" prop="economicEstimate">
+      <el-row gutter="14" >
-            <span>{{ toThousands(localFormData.economicEstimate) }}</span>
+        <el-col :span="24">
-          </el-form-item>
+          <baseTitle title="项目描述"></baseTitle>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="24">
-          <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-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: -18px">
           <baseTitle title="需求上报申请书"></baseTitle>
         </el-col>
         <el-col :span="24">
@@ -142,7 +154,7 @@
           <!--            </el-button>-->
           <!--          </el-form-item>-->
         </el-col>
-        <el-col :span="24" style="margin-top: -15px">
+        <el-col :span="24" style="margin-top: -12px">
           <baseTitle title="附件列表"></baseTitle>
         </el-col>
         <el-col :span="24">
@@ -189,7 +201,7 @@
         </el-col>
       </el-row>
       <div class="approval-record">
-        <div class="approval-title" style="margin-top: -15px">
+        <div class="approval-title" style="margin-top: -12px">
           <baseTitle title="审批记录"></baseTitle>
           <div class="diagram">
             <div class="base-title">流程图</div>

src/components/NameCircle.vue

@@ -79,6 +79,10 @@ const initUser = (user) => {
     user["icon"] = 'MoreFilled'
     user["color"] = "#c0c4cc"
   }
+  if (state === 'ROLLBACK') {
+    user["icon"] = 'RefreshLeft'
+    user["color"] = "#f78f5f"
+  }
   return user;
 }
 
@@ -111,19 +115,5 @@ init()
   }
 
 
-}
-@media print {
-  /* 打印时应用的样式 */
-  .el-checkbox.is-checked .el-checkbox__inner .svg-icon {
-    background-color: #f5f7fa !important;
-    border-color: #409eff !important;
-  }
-  .el-checkbox__inner::after {
-    /* 设置选中的checkbox符号颜色 */
-    color: #409eff !important;
-  }
-  //.el-icon {
-  //  color: rgba(0, 0, 0, 1) !important;
-  //}
 }
 </style>

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">
@@ -124,7 +124,7 @@ const schema = computed(() => {
       }
     },
     {
-      label: '征集描述',
+      label: '征集说明',
       prop: 'collectExplain',
       colProps: {
         span: 24
@@ -333,7 +333,7 @@ watchEffect(() => {
 
 <style lang="scss" scoped>
 .steps-box {
-  padding: 10px 0;
+  //padding: 10px 0;
 }
 
 .step-success {

src/views/expense-management/share/add.vue

@@ -40,7 +40,8 @@
             <template #default="scope">
               <el-form-item prop="researchPersonnelId">
                 {{ scope.row.researchPersonnel }}
-                <el-button color="#DED0B2"  @click="showPersonnelPicker(scope.row,scope.$index)" style="margin-left: 10px">
+                <el-button color="#DED0B2" @click="showPersonnelPicker(scope.row,scope.$index)"
+                           style="margin-left: 10px">
                   {{ scope.row.researchPersonnel ? '更改' : '请选择研发人员' }}
                 </el-button>
               </el-form-item>
@@ -112,16 +113,18 @@
     </div>
     <div class="approval-record">
       <div class="approval-title">
-        <baseTitle title="审批记录" v-if="processDiagramViewer&& opentionData?.operationList"></baseTitle>
+        <!--        <baseTitle title="审批记录" v-if="processDiagramViewer&& opentionData?.operationList"></baseTitle>-->
-        <div v-else></div>
+        <!--        <div v-else></div>-->
-        <div style="display: flex;align-items: center;justify-content: flex-start;">
+        <baseTitle title="审批记录"></baseTitle>
-          <div class="base-title" style="margin-left: 10px;margin-right: 10px">流程图</div>
+        <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>
+      <el-empty :image-size="100" description="暂无审批记录" v-if="processDiagramViewer&& !opentionData?.operationList&&!changeDiagram"/>
       <div class="process">
         <operation-render
             v-if="processDiagramViewer&& opentionData?.operationList && opentionData?.operationList.length > 0&&!changeDiagram"
@@ -171,7 +174,7 @@ const rules = reactive({
   researchDuration: [{required: true, message: '请输入研发时长', trigger: ['blur', 'change']}],
 })
 const processStore = useProcessStore()
-const opentionData = ref()
+const opentionData = ref({})
 const processInstanceData = ref()
 const processDiagramViewer = ref(false)
 const loading = ref(false)
@@ -206,16 +209,16 @@ const researchOptions = ref([])
 const showPersonnelPicker = (row, index) => {
   currentRow.value = row
   currentIndex.value = index
-  if(row.companyName){
+  if (row.companyName) {
     let userObj = {
       id: row.researchPersonnelId,
       name: row.researchPersonnel,
       companyName: row.companyName,
       accountType: row.accountType,
     }
-    userList.value=[userObj]
+    userList.value = [userObj]
-  }else if(!row.researchPersonnel){
+  } else if (!row.researchPersonnel) {
-    userList.value=[]
+    userList.value = []
   }
   nextTick(() => {
     userPicker.value.showUserPicker()
@@ -233,7 +236,7 @@ const selected = (select) => {
       item.accountType = select[0].accountType
     }
   })
-  userList.value=select
+  userList.value = select
 }
 const getResearchOptions = async () => {
   const res = await getResearchUser()
@@ -370,7 +373,7 @@ const handleResubmit = (instance) => {
       allocationId: formData.value.allocationId,
       shareName: formData.value.shareName,
       apportionmentMonth: formData.value.apportionmentMonth,
-      usrAllocations:formData.value.tableData,
+      usrAllocations: formData.value.tableData,
       deploymentId: processInstanceData.value.deploymentId,
     }
     // console.log('params', params, formData.value.tableData)

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-form :model="formData" ref="demandForm" :rules="rules" :scroll-to-error="true">
-      <el-row gutter="14">
+      <el-row gutter="40">
-        <el-col :span="6">
+        <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-col :span="4">
-          <el-form-item label="专项资金" prop="isSpecialFund" required>
+          <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,22 +89,32 @@
       </template>
     </fvTable>
     <div class="approval-record">
-      <div style="display: flex;align-items: center;justify-content: flex-start;">
+      <div class="approval-title" >
-        <div class="base-title">流程图</div>
+        <baseTitle title="审批记录"></baseTitle>
-        <el-switch
+        <div class="diagram">
-            v-model="changeDiagram"
+          <div class="base-title">流程图</div>
-            style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd;margin-left: 10px"
+          <el-switch
-        />
+              v-model="changeDiagram"
+              style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd;"
+          />
+        </div>
+      </div>
+      <el-empty  :image-size="100" description="暂无审批记录" v-if="processDiagramViewer&& !opentionData?.operationList&&!changeDiagram"/>
+<!--      <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>-->
+      <div class="process">
+        <operation-render
+            v-if="processDiagramViewer&& opentionData?.operationList && opentionData?.operationList.length > 0&&!changeDiagram"
+            :operation-list="opentionData?.operationList"
+            :state="opentionData.state"/>
+        <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
       </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>
-
     <company-picker :multiple="true" ref="companyRef" title="请选择征集公司" @ok="selected"
                     v-model:value="selectedCompanyList"/>
     <file-preview ref="filePreviewRef" v-if="filePreviewShow" :fileName="filePreviewParam.fileName" :fileUrl="filePreviewParam.fileUrl"
@@ -118,20 +128,19 @@ import {useProcessStore} from '@/stores/processStore.js';
 import {
   getWorkflowInfo,
   addRequirement,
-  getFormInfo,
+  getInfo,
   resubmit,
   deleteFile,
   downloadFile
 } from "@/api/project-demand/index.js";
 import FileUpload from "@/components/FileUpload.vue";
+import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
 import {ElNotification} from "element-plus";
-import {useRoute, useRouter} from 'vue-router'
 import {getSubCompOpt} from '@/api/user/user.js'
 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: '',
@@ -141,6 +150,7 @@ const filePreviewParam = ref({
 const filePreviewShow = ref(false)
 const cacheStore = useCacheStore()
 const companyRef = ref()
+const opentionData = ref({})
 const showExpendText = ref('')
 const showMoreCompany = ref(false)
 const selectedCompanyList = ref([])
@@ -159,7 +169,7 @@ const formData = ref({
   deadline: '',
   collectExplain: '',
   fileList: [],
-  isSpecialFund: false
+  isSpecialFund: true
 })
 const routerName = ref(router.currentRoute.value.name)
 const processDiagramViewer = ref(false)
@@ -175,9 +185,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 +428,38 @@ const handleSubmit = async (instance) => {
     }
   })
 }
-const handleResubmit = () => {
+const handleResubmit = (instance) => {
-  resubmit(submitParam(formData.value)).then(res => {
+  if (!instance) return
-    ElNotification({
+  instance.validate(async (valid) => {
-      title: '提示',
+    if (!valid) {
-      message: res.msg,
+      ElNotification({
-      type: res.code === 1000 ? 'success' : 'error'
+        title: '提示',
-    })
+        message: '请完善数据,再提交!',
-    if (res.code === 1000) {
+        type: 'error'
-      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      router.push({
-        name: 'Requirement'
       })
+      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) => {
@@ -459,9 +488,9 @@ const getCompanyOptionItem = (val) => {
   return companyNameArray.value;
 }
 const getDetailInfo = async () => {
-  getFormInfo(route.query.id).then(res => {
+  getInfo(route.query.id).then(res => {
     if (res.code === 1000) {
-      if (res.data.companyIds[0] == -1) {
+      if (res.data.formData.companyIds[0] == -1) {
         selectedCompanyList.value = [
           {
             value:-1,
@@ -469,10 +498,11 @@ const getDetailInfo = async () => {
           }
         ]
       } else {
-        selectedCompanyList.value = getCompanyOptionItem(res.data.companyIds)
+        selectedCompanyList.value = getCompanyOptionItem(res.data.formData.companyIds)
       }
-      formData.value = res.data
+      formData.value = res.data.formData
-      if (res.data.fileList.length !== 0) {
+      opentionData.value = res.data
+      if (res.data.formData.fileList.length !== 0) {
         showTable.value = false
         nextTick(() => {
           showTable.value = true
@@ -551,6 +581,7 @@ onMounted(async () => {
   //justify-content: space-between;
   overflow-x: hidden;
   overflow-y: auto;
+  padding: 0 30px  0 15px;
 
   a {
     cursor: pointer;

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

@@ -1,15 +1,21 @@
 <template>
   <div class="detail-block" v-loading="loading">
-    <baseTitle title="需求上报"></baseTitle>
+    <baseTitle title="项目基本信息"></baseTitle>
-    <el-form :model="formData" ref="summaryForm" :rules="rules">
+    <el-form :model="formData" ref="summaryForm" :rules="rules"  label-width="120" :scroll-to-error="true">
-      <el-row gutter="14">
+      <el-row gutter="40" style="margin-bottom: -18px">
         <el-col :span="6">
-          <el-form-item label="项目名称" prop="projectName">
+          <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="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="开始时间" 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-form-item label="经费预算" prop="economicEstimate" :label-width="route.query.id && formData.isSpecialFund?135:120">
-            <el-radio-group v-model="formData.industryUniversityResearch">
+            <el-input-number v-model="formData.economicEstimate" placeholder="请输入经济预算数量" :controls="false"/>
-              <el-radio v-for="item in cacheStore.getDict('industry_university')"
+          </el-form-item>
-                        :key="item.value"
+        </el-col>
-                        :label="item.value">{{ item.label }}
+        <el-col :span="6">
-              </el-radio>
+          <el-form-item label="产学研联合" prop="industryUniversityResearch" label-width="135">
-            </el-radio-group>
+            <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-select v-model="formData.governmentDeclaration" clearable>
-              <el-radio v-for="item in cacheStore.getDict('government_declaration')"
+              <el-option
-                        :key="item.value"
+                  v-for="item in cacheStore.getDict('government_declaration')"
-                        :label="item.value">{{ item.label }}
+                  :key="item.value"
-              </el-radio>
+                  :label="item.label"
-            </el-radio-group>
+                  :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-select v-model="formData.isSpecialFund" clearable @change="specialFundChange">
-              <el-radio :label="true">是</el-radio>
+              <el-option label="是" :value="true"/>
-              <el-radio :label="false">否</el-radio>
+              <el-option label="否" :value="false"/>
-            </el-radio-group>
+            </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-col :span="6" v-if="formData.isSpecialFund">
-      <el-row gutter="14">
+          <el-form-item label="申请总部专项资金" prop="specialFundAmount" label-width="135">
-        <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-input-number v-model="formData.specialFundAmount" placeholder="请输入专项资金" :controls="false"/>
           </el-form-item>
         </el-col>
-      </el-row>
+        <el-col :span="6">
-      <el-row gutter="14">
+          <el-form-item label="部门分管领导" required prop=""  :label-width="route.query.id && formData.isSpecialFund?135:120">
-        <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-button color="#DED0B2" style="margin-right: 10px" @click="handleShowOptionalChargeLeadershipPicker">
               {{ optionalChargeLeadershipList.length !== 0 ? '更改' : '请选择' }}
             </el-button>
@@ -256,21 +200,106 @@
                          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 class="approval-record">
-      <div style="display: flex;align-items: center;justify-content: flex-start;">
+      <div class="approval-title" style="margin-top: -15px">
-        <div class="base-title">流程图</div>
+        <baseTitle title="审批记录"></baseTitle>
-        <el-switch
+        <div class="diagram">
-            v-model="changeDiagram"
+          <div class="base-title">流程图</div>
-            style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd;margin-left: 10px"
+          <el-switch
-        />
+              v-model="changeDiagram"
+              style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd;"
+          />
+        </div>
+      </div>
+      <el-empty  :image-size="100" description="暂无审批记录" v-if="processDiagramViewer&& !opentionData?.operationList&&!changeDiagram"/>
+<!--      <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>-->
+      <div class="process">
+        <operation-render
+            v-if="processDiagramViewer&& opentionData?.operationList && opentionData?.operationList.length > 0&&!changeDiagram"
+            :operation-list="opentionData?.operationList"
+            :state="opentionData.state"/>
+        <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
       </div>
-      <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
     </div>
     <div class="oper-page-btn">
       <!--      <el-button type="info" @click="staging">存为草稿</el-button>-->
@@ -282,9 +311,11 @@
 </template>
 
 <script setup lang="jsx">
+import OperationRender from '@/views/workflow/common/OperationRender.vue'
 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,7 +325,9 @@ 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 opentionData = ref({})
 const cacheStore = useCacheStore()
 const processStore = useProcessStore()
 const router = useRouter()
@@ -553,7 +586,7 @@ const handleResubmit = debounce((instance) => {
 
 const getDetailInfo = async () => {
   loading.value = true
-  getDetail(route.query.projectId).then(res => {
+  await getDetail(route.query.projectId).then(res => {
     ElNotification({
       title: '提示',
       message: res.msg,
@@ -562,6 +595,8 @@ 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
+      opentionData.value = res.data
+      optionalChargeLeadershipList.value=formData.value.optionalChargeLeadership
       loading.value = false
     }
   })
@@ -616,7 +651,7 @@ const staging = async () => {
 <style lang="scss" scoped>
 .detail-block {
   overflow: hidden;
-  padding-bottom: 30px;
+  padding: 0 30px 30px 15px;
 
   :deep(.el-input-number) {
     width: 100%;

src/views/project-management/implementation/account.vue

@@ -5,7 +5,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item prop="requirementName" label="征集名称">
-            <span>{{ basicData.requirementName }}</span>
+            <span>{{ basicData.requirementName ||'--'}}</span>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -328,8 +328,16 @@ onActivated(() => {
 })
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 :deep(.el-table--fit) {
   min-height: 400px !important;
 }
+:deep(.el-form-item__label-wrap){
+  margin-left: 0!important;
+}
+:deep(.el-form-item__content){
+  .el-input{
+    width: 100%!important;
+  }
+}
 </style>

src/views/project-management/implementation/phase.vue

@@ -1,9 +1,10 @@
 <template>
   <div class="apply-block" v-loading="loading">
-    <baseTitle title="基础信息"></baseTitle>
+    <baseTitle title="项目基本信息"></baseTitle>
-    <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" style="margin-left: 56px"></fvForm>
+    <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" ></fvForm>
+    <baseTitle title="阶段变更信息" style="margin-top: -10px"></baseTitle>
     <el-form :model="formData" label-width="auto">
-      <el-form-item label="抄送人员" label-width="125">
+      <el-form-item label="抄送人员" label-width="105">
         <Ttsup :modelValue="chooseUserInfo()" @clickCopyUser="chooseUser"/>
       </el-form-item>
     </el-form>
@@ -12,15 +13,26 @@
                       @getAttachment="getAttachment"  v-model:singleList="singleList" :showSingleTable="showSingleTable"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" tag="阶段变更"
                       :preview="name === 'Phase/edit'"/>
-    <div class="approval-record"  style="margin-left: 68px">
+    <div class="approval-record" >
-      <div style="display: flex;align-items: center;justify-content: flex-start;">
+      <div class="approval-title"  style="margin-top: -15px">
-        <div class="base-title">流程图</div>
+        <baseTitle title="审批记录"></baseTitle>
-        <el-switch
+        <div class="diagram">
-            v-model="changeDiagram"
+          <div class="base-title">流程图</div>
-            style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd;margin-left: 10px"
+          <el-switch
-        />
+              v-model="changeDiagram"
+              style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd;"
+          />
+        </div>
+      </div>
+      <el-empty  :image-size="100" description="暂无审批记录" v-if="processDiagramViewer&& !opentionData?.operationList&&!changeDiagram"/>
+<!--      <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>-->
+      <div class="process">
+        <operation-render
+            v-if="processDiagramViewer&& opentionData?.operationList && opentionData?.operationList.length > 0&&!changeDiagram"
+            :operation-list="opentionData?.operationList"
+            :state="opentionData.state"/>
+        <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
       </div>
-      <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
     </div>
     <div class="oper-page-btn">
       <el-button color="#DED0B2" v-if="name==='Phase/change'" @click="handleSubmit">提交</el-button>
@@ -30,10 +42,11 @@
 </template>
 
 <script setup lang="jsx">
+import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
 import UserPicker from "@/views/workflow/process/common/UserPicker.vue";
 import Ttsup from './components/ToolToShowUserPicker.vue'
-import {getPhaseProcess, submitPhaseChange, getPhaseForm, resubmitPhaseForm} from "@/api/project-manage";
+import {getPhaseProcess, submitPhaseChange, getPhaseDetail, resubmitPhaseForm} from "@/api/project-manage";
 import {ElNotification} from "element-plus";
 import {useProcessStore} from '@/stores/processStore.js';
 import {useTagsView} from '@/stores/tagsview.js'
@@ -46,6 +59,7 @@ const router = useRouter()
 const route = useRoute()
 const attachment = ref()
 const userPicker = ref()
+const opentionData = ref({})
 const showSingleTable = ref(false)
 const singleList = ref([])
 const name = ref(router.currentRoute.value.name)
@@ -290,15 +304,16 @@ const init = async () => {
   }
 }
 const getDetailInfo = async () => {
-  getPhaseForm(route.query.projectId).then(res => {
+  getPhaseDetail(route.query.projectId).then(res => {
     ElNotification({
       title: '提示',
       message: res.msg,
       type: res.code === 1000 ? 'success' : 'error'
     })
     if (res.code === 1000) {
-      userList.value=res.data.userInfoList?res.data.userInfoList:[]
+      userList.value=res.data.formData.userInfoList?res.data.formData.userInfoList:[]
-      formData.value = res.data
+      formData.value = res.data.formData
+      opentionData.value = res.data
       loading.value = false
     }
   })

src/views/project-management/mobledetail/ApprovalDetailMoblie.vue

@@ -16,10 +16,10 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="handleSearch" color="#DED0B2">搜索</el-button>
+          <el-button @click="handleSearchImplementationFileList" color="#DED0B2">搜索</el-button>
         </el-form-item>
       </el-form>
-      <fvTable style="width: 100%;min-height:162px;max-height: 162px" v-if="showAttachmentTable" height="162"  :tableConfig="tableConfig"
+      <fvTable style="width: 100%;min-height:162px;max-height: 162px" v-if="showAttachmentTable" height="162"  :tableConfig="executeTableConfig"
                :data="otherAttachmentList" :isSettingCol="false" :pagination="false">
         <template #empty>
           <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
@@ -80,7 +80,19 @@ import {searchImplementationFileList} from "@/api/project-manage/attachment";
 import {getTags} from "@/api/project-manage";
 
 
-const tableConfig = reactive({
+const filePreviewParam = ref({
+  fileUrl: '',
+  fileName: '',
+  fileType: 'pdf'
+})
+const filePreviewShow = ref(false)
+const attachmentParam = reactive({
+  tag: ''
+})
+
+const tagsOption = ref([])
+
+const executeTableConfig = reactive({
   columns: [
     {
       prop: 'index',
@@ -121,17 +133,6 @@ const tableConfig = reactive({
     }
   ]
 })
-const filePreviewParam = ref({
-  fileUrl: '',
-  fileName: '',
-  fileType: 'pdf'
-})
-const filePreviewShow = ref(false)
-const attachmentParam = reactive({
-  tag: ''
-})
-
-const tagsOption = ref([])
 const changeDiagram = ref(false)
 const showAttachmentTable = ref(true)
 const props = defineProps({
@@ -238,6 +239,25 @@ const editSingleTableConfig = reactive({
     }
   ]
 })
+let preProcess = {
+  label: '前置流程',
+  prop: 'preProcess',
+  colProps: {
+    span: 24
+  },
+  labelWidth: 'left',
+  component: () => (
+      <div>
+        {
+          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>
+          }) : <span>{'--'}</span>
+        }
+      </div>
+  )
+}
 const schema = computed(() => {
   let arr
   if (props.type == 'approval') {
@@ -277,75 +297,111 @@ const schema = computed(() => {
         )
       },
       {
+        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 = {
         label: '前置流程',
         prop: 'preProcess',
         colProps: {
           span: 24
         },
-        labelWidth:'left',
+        labelWidth: 'left',
         component: () => (
             <div>
               {
-                props.formData.preProcess ? props.formData.preProcess.map(item => {
+                <select-pre-process formData={props.formData}/>
-                  return <span><a target="_blank" style={{color: '#409EFF', cursor: 'pointer'}}
-                                  href={props.formData.preProcessBaseUrl + item.requestId}>{item.requestName}</a> </span>
-                }) : <span>{'--'}</span>
               }
             </div>
         )
+      }
+    }
+    arr.push(preProcess)
+    arr.push({
+      label: '项目立项附件',
+      prop: 'singleFile',
+      colProps: {
+        span: 24
       },
-      {
+      labelWidth: 'left',
-        label: '项目立项附件',
+      component: () => {
-        prop: 'singleFile',
+        let singleFileArray = [props.formData.singleFile]
-        colProps: {
+        return props.formData.singleFile ? <fvTable style="width: 100%;max-height: 80px;" height="80"
-          span: 24
+                                                    tableConfig={editSingleTableConfig}
-        },
+                                                    data={singleFileArray} isSettingCol={false} pagination={false}>
-        labelWidth:'left',
+            </fvTable>
-        component: () => {
+            : <span>--</span>
-          let singleFileArray = [props.formData.singleFile]
+      }
-          return <fvTable style="width: 100%;max-height: 80px;" height="80"
+    })
-                          tableConfig={editSingleTableConfig}
-                          data={singleFileArray} isSettingCol={false} pagination={false}>
-          </fvTable>
-        }
-      },
-    ]
   } else if (props.type == 'execute') {
-    arr = [
+    arr = []
-      {
+    if (props.preProcessShow == 'EDIT') {
+      preProcess = {
         label: '前置流程',
         prop: 'preProcess',
         colProps: {
           span: 24
         },
-        labelWidth:'left',
+        labelWidth: 'left',
         component: () => (
             <div>
               {
-                props.formData.preProcess ? props.formData.preProcess.map(item => {
+                <select-pre-process formData={props.formData}/>
-                  return <span><a target="_blank" style={{color: '#409EFF', cursor: 'pointer'}}
-                                  href={props.formData.preProcessBaseUrl + item.requestId}>{item.requestName}</a> </span>
-                }) : <span>{'--'}</span>
               }
             </div>
         )
-      },
+      }
-      {
+    }
-        label: '项目验收附件',
+    arr.push(preProcess)
-        prop: 'singleFile',
+    arr.push(
-        colProps: {
+        {
-          span: 24
+          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>
+          )
         },
-        labelWidth:'left',
+        {
-        component: () => {
+          label: '项目验收附件',
-          let singleFileArray = [props.formData.singleFile]
+          prop: 'singleFile',
-          return <fvTable style="width: 100%;max-height: 80px;" height="80"
+          colProps: {
-                          tableConfig={editSingleTableConfig}
+            span: 24
-                          data={singleFileArray} isSettingCol={false} pagination={false}>
+          },
-          </fvTable>
+          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 = [
       {
@@ -354,13 +410,14 @@ const schema = computed(() => {
         colProps: {
           span: 24
         },
-        labelWidth:'left',
+        labelWidth: 'left',
         component: () => {
           let singleFileArray = [props.formData.singleFile]
-          return <fvTable style="width: 100%;max-height: 80px;" height="80"
+          return props.formData.singleFile ? <fvTable style="width: 100%;max-height: 80px;" height="80"
-                          tableConfig={editSingleTableConfig}
+                                                      tableConfig={editSingleTableConfig}
-                          data={singleFileArray} isSettingCol={false} pagination={false}>
+                                                      data={singleFileArray} isSettingCol={false} pagination={false}>
-          </fvTable>
+              </fvTable>
+              : <span>--</span>
         }
       },
     ]
@@ -421,7 +478,7 @@ const getTagsOption = () => {
     }
   })
 }
-const handleSearch = () => {
+const handleSearchImplementationFileList = () => {
   let params = {
     targetId: route.query.projectId,
     targetState: "40"
@@ -473,14 +530,14 @@ const handleDownload = (row) => {
     loading.close()
   })
 }
-if(props.type&&props.type==='execute'){
+
-  handleSearch()
-  getTagsOption()
-}
 watchEffect(() => {
   Object.keys(props.formData).length && (form.value?.setValues(props.formData))
 })
-
+if (props.formData.mode == 'view' && props.type == 'execute') {
+  handleSearchImplementationFileList()
+  getTagsOption()
+}
 watch(() => props.loading, (newVal) => {
   props.loading = newVal
 }, {deep: true})

src/views/project-management/mobledetail/CollectionDetailMoblie.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-loading="loading">
-    <el-form :model="formData" label-width="auto">
+    <el-form :model="formData" >
       <el-row>
         <el-col :span="24" v-if="type==='singleDetail'">
           <el-form-item label="征集名称">
@@ -13,7 +13,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="截止时间">
+          <el-form-item label="需求上报截止时间">
             <span>{{ formData.deadline }}</span>
           </el-form-item>
         </el-col>
@@ -33,22 +33,29 @@
             </div>
           </el-form-item>
         </el-col>
-        <baseTitle title="征集说明"></baseTitle>
+        <el-col :span="6"  style="margin-bottom: -15px">
-        <el-col :span="24">
+          <el-form-item label="征集说明">
-          <el-form-item>
+            <div v-if="formData.collectExplain" v-html="formData.collectExplain">
-            <el-card style="width: 100%">
+            </div>
-              <div v-html="formData.collectExplain">
+            <div v-else>--</div>
-              </div>
-            </el-card>
           </el-form-item>
         </el-col>
-        <baseTitle v-if="fileListShow === 'READ' || fileListShow === 'EDIT'" title="附件列表"></baseTitle>
+<!--        <el-col :span="24" style="margin-bottom: -15px">-->
+<!--          <baseTitle title="征集说明"></baseTitle>-->
+<!--          <el-form-item>-->
+<!--            <el-card style="width: 100%">-->
+<!--              <div v-html="formData.collectExplain">-->
+<!--              </div>-->
+<!--            </el-card>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
         <el-col :span="24">
+          <baseTitle v-if="fileListShow === 'READ' || fileListShow === 'EDIT'" title="附件列表"></baseTitle>
           <file-component title="" tag="需求征集" :fullscreen="true"
                           v-model:value="formData.fileList" :processViewer="processViewer"
                           :file-list-show="fileListShow"/>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="24" style="margin-top: -15px">
           <div v-if="data.taskId">
             <baseTitle title="审核意见"></baseTitle>
             <el-form-item prop="_value">
@@ -62,7 +69,7 @@
           </div>
         </el-col>
       </el-row>
-      <div class="approval-record">
+      <div class="approval-record"  style="margin-top: -15px">
         <div class="approval-title">
           <baseTitle title="审批记录"></baseTitle>
           <div class="diagram">

src/views/project-management/mobledetail/SummaryDetailMoblie.vue

@@ -8,13 +8,6 @@
             <span>{{ localFormData.projectName }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <el-form-item label="专项资金名称" prop="specialFund" v-if="localFormData.isSpecialFund">
-            <span>{{
-                localFormData.specialFundId === 0 ? localFormData.specialFund : changeName(fundOption, localFormData.specialFundId)
-              }}</span>
-          </el-form-item>
-        </el-col>
         <el-col :span="24">
           <el-form-item label="开始时间" prop="startTime">
             <span>{{ localFormData.startTime }}</span>
@@ -40,26 +33,28 @@
             <span>{{ filterDict(cacheStore.getDict('invest_type'), localFormData.investmentType) }}</span>
           </el-form-item>
         </el-col>
-<!--        <el-col :span="24">-->
+
-<!--          <el-form-item label="项目影响" prop="projectImpact">-->
-<!--            <span>{{ filterDict(cacheStore.getDict('project_impact'), localFormData.projectImpact) }}</span>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
         <el-col :span="24">
           <el-form-item label="所属业务板块" prop="businessSegment">
             <span>{{ filterDict(cacheStore.getDict('business_segment'), localFormData.businessSegment) }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <el-form-item label="预期成果形式" prop="resultForm">
-            <span>{{ filterDict(cacheStore.getDict('result_form'), localFormData.resultForm) }}</span>
-          </el-form-item>
-        </el-col>
         <el-col :span="24">
           <el-form-item label="预期技术标准制定" prop="technicalStandard">
             <span>{{ filterDict(cacheStore.getDict('technical_standard'), localFormData.technicalStandard) }}</span>
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <el-form-item label="项目影响" prop="projectImpact">
+            <span>{{ filterDict(cacheStore.getDict('project_impact'), localFormData.projectImpact) }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="经济预算(元)" prop="economicEstimate">
+            <span>{{ toThousands(localFormData.economicEstimate) }}</span>
+          </el-form-item>
+        </el-col>
+
         <el-col :span="24">
           <el-form-item label="产学研联合" prop="industryUniversityResearch">
             <span>{{
@@ -74,6 +69,31 @@
               }}</span>
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <el-form-item label="专项资金名称" prop="specialFund" v-if="localFormData.isSpecialFund">
+            <span>{{
+                localFormData.specialFundId === 0 ? localFormData.specialFund : changeName(fundOption, localFormData.specialFundId)
+              }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24"  v-if="localFormData.isSpecialFund">
+          <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount">
+            <span>{{ toThousands(localFormData.specialFundAmount) }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="部门分管领导" prop="optionalChargeLeadership">
+            <span>{{ localFormData.optionalChargeLeadership?.map(item=>item.name).join() }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" style="margin-top: -15px">
+          <baseTitle title="预期知识产权"></baseTitle>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="预期成果形式" prop="resultForm">
+            <span>{{ filterDict(cacheStore.getDict('result_form'), localFormData.resultForm) }}</span>
+          </el-form-item>
+        </el-col>
         <el-col :span="24">
           <el-form-item label="知识产权状况" prop="intellectualProperty">
             <span>{{
@@ -82,9 +102,6 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="24" style="margin-top: -15px">
-          <baseTitle title="预期知识产权"></baseTitle>
-        </el-col>
         <el-col :span="24">
           <el-form-item label="发明专利(项)" prop="inventionPatent">
             <span>{{ localFormData.inventionPatent }}</span>
@@ -110,16 +127,11 @@
             <span>{{ localFormData.other }}</span>
           </el-form-item>
         </el-col>
+
+      </el-row>
+      <el-row gutter="14" >
         <el-col :span="24">
-          <el-form-item label="经济预算(元)" prop="economicEstimate">
+          <baseTitle title="项目描述"></baseTitle>
-            <span>{{ toThousands(localFormData.economicEstimate) }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount"
-                        v-if="localFormData.isSpecialFund">
-            <span>{{ toThousands(localFormData.specialFundAmount) }}</span>
-          </el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item label="现有业务描述" prop="serviceDescription">
@@ -131,7 +143,7 @@
             <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">
@@ -158,7 +170,31 @@
           />
         </el-col>
         <el-col :span="24" style="margin-top: -15px">
-          <div v-if="data.taskId||data.state==='4'">
+          <div v-if="data.taskId">
+            <baseTitle title="审核意见"></baseTitle>
+            <el-form-item prop="_value">
+              <el-input
+                  v-model="_value"
+                  :rows="3"
+                  type="textarea"
+                  placeholder="请输入审核意见"
+              />
+            </el-form-item>
+          </div>
+          <div v-if="data.state==='5'" style="margin-bottom: 15px">
+            <baseTitle title="前置流程"></baseTitle>
+            <div style="display: flex;align-items: center;flex-wrap: wrap;">
+              <div v-for="(item,index) in localFormData.preProcess" :key="item.requestId">
+                <a :href="item.baseUrl" target="_blank"
+                   style="color: #2a99ff;cursor: pointer">{{ item.requestName }}<span
+                    v-if="index != localFormData.preProcess.length -1">，</span>
+                </a>
+              </div>
+            </div>
+          </div>
+          <div v-perm="['annual:plan:approve']" v-if="data.state==='4'">
+            <baseTitle title="前置流程"></baseTitle>
+            <select-pre-process :formData="localFormData"/>
             <baseTitle title="审核意见"></baseTitle>
             <el-form-item prop="_value">
               <el-input
@@ -211,6 +247,7 @@ import FileComponent from "@/components/DetailComponent/FileComponent.vue";
 import {ElNotification} from "element-plus";
 import {approvePlan} from "@/api/project-demand/summary";
 
+import SelectPreProcess from "@/components/SelectPreProcess.vue";
 const emit = defineEmits(['update:value'])
 const tagsViewStore = useTagsView()
 const cacheStore = useCacheStore()

src/views/special-fund/add.vue

@@ -29,14 +29,25 @@
       </template>
     </fvTable>
     <div class="approval-record">
-      <div style="display: flex;align-items: center;justify-content: flex-start;">
+      <div class="approval-title" >
-        <div class="base-title">流程图</div>
+        <baseTitle title="审批记录"></baseTitle>
-        <el-switch
+        <div class="diagram">
-            v-model="changeDiagram"
+          <div class="base-title">流程图</div>
-            style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd;margin-left: 10px"
+          <el-switch
-        />
+              v-model="changeDiagram"
+              style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd;"
+          />
+        </div>
+      </div>
+      <el-empty  :image-size="100" description="暂无审批记录" v-if="processDiagramViewer&& !opentionData?.operationList&&!changeDiagram"/>
+<!--      <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>-->
+      <div class="process">
+        <operation-render
+            v-if="processDiagramViewer&& opentionData?.operationList && opentionData?.operationList.length > 0&&!changeDiagram"
+            :operation-list="opentionData?.operationList"
+            :state="opentionData.state"/>
+        <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
       </div>
-      <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
     </div>
     <div class="oper-page-btn">
       <el-button color="#DED0B2" v-if="routerName === 'Fund/add'" @click="handleSubmit(fundForm)">提交</el-button>
@@ -49,9 +60,10 @@
 </template>
 
 <script setup lang="jsx">
+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, 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';
@@ -62,6 +74,7 @@ const tagsViewStore = useTagsView()
 const router = useRouter()
 const route = useRoute()
 const processStore = useProcessStore()
+const opentionData = ref({})
 const loading = ref(false)
 const showTable = ref(true)
 const processInstanceData = ref()
@@ -279,14 +292,15 @@ const init = async () => {
   })
 }
 const getDetailInfo = async () => {
-  getFundDetail(route.query.id).then(res => {
+  getFundDetailProcess(route.query.id).then(res => {
     ElNotification({
       title: '提示',
       message: res.msg,
       type: res.code === 1000 ? 'success' : 'error'
     })
     if (res.code === 1000) {
-      formData.value = res.data
+      formData.value = res.data.formData
+      opentionData.value = res.data
       showTable.value = false
       nextTick(() => {
         showTable.value = true

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'"

src/views/workflow/process/nodes/CcNode.vue

@@ -2,7 +2,7 @@
   <node :title="config.name" :show-error="showError" :select-user="selectUser" :mode="mode" :content="content"
         :node-id="config.id"
         :error-info="errorInfo"
-        :show-avatar="config.props.assignedType === 'ASSIGN_USER'" :user-info="config.props.assignedUser"
+        :show-avatar="config.props.assignedType === 'ASSIGN_USER'" :user-info="config.props.assignedUser" nodeType="carbonCopyRecipient"
         @selected="emit('selected')" @delNode="emit('delNode')" @insertNode="type => emit('insertNode', type)"
         placeholder="请设置抄送人" :header-bgc="headerBgc" :header-icon="Promotion"/>
 </template>