Merge remote-tracking branch 'origin/master'

src/assets/styles/index.scss

@@ -551,12 +551,13 @@ html, body, #app, .el-container, .el-aside, .el-main {
 }
 
 .approval-record {
+  //padding-top: 10px;
   padding-bottom: 30px;
   position: relative;
   .approval-title {
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    //justify-content: space-between;
 
     .diagram {
       display: flex;
@@ -564,6 +565,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
       float: right;
 
       .base-title {
+        margin-left: 10px;
         margin-right: 10px;
       }
 

src/components/AttachmentUpload.vue

@@ -1,8 +1,8 @@
 <template>
-  <el-form :model="formData" ref="applyForm" label-width="auto" :rules="rules" label-position="top">
+  <el-form :model="formData" ref="applyForm" :rules="rules" :label-position="labelPosition">
     <el-row>
       <el-col :span="24">
-        <el-form-item :label="label" prop="attachment">
+        <el-form-item :label="label" prop="attachment" label-width="125">
           <template v-if="preview&&JSON.stringify(singleFile) !== '{}'&&JSON.stringify(singleFile)!=='null'">
             <el-button type="primary" link @click="handleDownload(singleFile)" style="font-size: 16px">
               {{ singleFile ? singleFile?.originalFileName : formData.singleFile?.originalFileName }}
@@ -12,22 +12,29 @@
           </template>
           <template
               v-else-if="!preview||JSON.stringify(singleFile) == '{}'||singleFile==null||formData.singleFile==null">
-            <file-upload @getFile="getAttachment" :showFileList="showFileList" :multiple="false" :maxSize="1"
+            <file-upload @getFile="getAttachment" :multiple="false"
-                         :disabled="isSingleFile" @delete="deleteAttachment"/>
+                         :disabled="isSingleFile" ref="fileUploadRef"/>
-          </template>
+            <!--           :showFileList="showFileList" @delete="deleteAttachment"-->
-        </el-form-item>
+            <fvTable style="width: 100%;max-height: 80px;" v-if="showSingleTable" :tableConfig="singleTableConfig"
-      </el-col>
+                     :data="singleFileList" :isSettingCol="false" :pagination="false">
-      <el-col :span="24">
-        <el-form-item label="其他文件">
-          <el-card style="width: 100%;box-shadow: none">
-            <file-upload @getFile="getOtherFile"/>
-            <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="tableConfig"
-                     :data="allFileList" :isSettingCol="false" :pagination="false">
               <template #empty>
                 <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
               </template>
             </fvTable>
-          </el-card>
+          </template>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="其他文件" label-width="125">
+          <file-upload @getFile="getOtherFile"/>
+          <!--          <el-card style="width: 100%;box-shadow: none">-->
+          <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="tableConfig"
+                   :data="allFileList" :isSettingCol="false" :pagination="false">
+            <template #empty>
+              <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+            </template>
+          </fvTable>
+          <!--          </el-card>-->
         </el-form-item>
       </el-col>
     </el-row>
@@ -50,12 +57,20 @@ const props = defineProps({
   },
   showTable: {
     type: Boolean,
-    default: true
+    default: false
+  },
+  showSingleTable: {
+    type: Boolean,
+    default: false
   },
   preview: {
     type: Boolean,
     default: false
   },
+  singleList: {
+    type: Array,
+    default: []
+  },
   otherFileList: {
     type: Array,
     default: []
@@ -63,6 +78,10 @@ const props = defineProps({
   formData: {
     type: Object,
     default: {}
+  },
+  labelPosition: {
+    type: String,
+    default: ''
   }
 })
 const emit = defineEmits(["getAttachment", "getOtherFile"])
@@ -128,6 +147,69 @@ const tableConfig = reactive({
     }
   ]
 })
+const singleTableConfig = reactive({
+  columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width: '80',
+    },
+    {
+      prop: 'originalFileName',
+      label: '文件名',
+      align: 'center',
+    },
+    {
+      prop: 'tag',
+      label: '标签',
+      align: 'center'
+    },
+    {
+      prop: 'size',
+      label: '文件大小',
+      align: 'center',
+      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        let btn = []
+        btn.push({label: '下载', func: () => handleDownload(row), type: 'primary'})
+        // if (row.newFile) {
+        //   btn.push({label: '删除', func: () => handleDelete(row), type: 'primary'})
+        // }
+        return (
+            <div style={{width: '100%'}}>
+              {
+                btn.map(item => (
+                    <el-button
+                        type={item.type}
+                        onClick={() => item.func()}
+                        link
+                    >
+                      {item.label}
+                    </el-button>
+                ))
+              }
+              {
+                row.newFile || props.preview || !props.preview ?
+                    <popover-delete name={row.originalFileName} type={'文件'} btnType={'danger'}
+                        // perm={['']}
+                                    onDelete={() => handleSingleDelete(row)}/>
+                    : ''
+              }
+            </div>
+        )
+      }
+    }
+  ]
+})
+const fileUploadRef=ref()
 const rules = reactive({
   attachment: [{required: true, message: '请上传附件', trigger: ['blur', 'change']}],
 })
@@ -135,9 +217,17 @@ const applyForm = ref()
 const singleFile = ref(props.formData.singleFile)
 const isSingleFile = ref(false)
 const allFileList = ref([])
+const deleteFileVal = ref({})
+const singleFileList = ref([])
+if (props.formData.fileList !== null && props.formData.fileList?.length > 0) {
+  allFileList.value = props.formData.fileList
+}
 watch(() => props.showTable, (newVal) => {
   props.showTable = newVal
 }, {deep: true})
+watch(() => props.showSingleTable, (newVal) => {
+  props.showSingleTable = newVal
+}, {deep: true})
 watch(() => props.formData.fileList, (newVal) => {
   // console.log('newVal-fileList', newVal)
   if (props.preview) {
@@ -149,7 +239,7 @@ watch(() => props.formData.fileList, (newVal) => {
 watch(() => props.otherFileList, (newVal) => {
   // console.log('newotherFileList', newVal, props.formData)
   if (props.preview) {
-    if (props.formData.fileList === null || props.formData.fileList.length === 0) {
+    if (props.formData.fileList === null || props.formData.fileList?.length === 0) {
       allFileList.value = newVal
     } else {
       newVal?.forEach(item => {
@@ -160,6 +250,10 @@ watch(() => props.otherFileList, (newVal) => {
     allFileList.value = newVal
   }
 }, {deep: true})
+watch(() => props.singleList, (newVal) => {
+  // console.log('singleFile', newVal)
+  singleFileList.value = newVal
+}, {deep: true})
 watch(() => props.formData.singleFile, (newVal) => {
   // console.log('singleFile', newVal)
   singleFile.value = newVal
@@ -167,7 +261,7 @@ watch(() => props.formData.singleFile, (newVal) => {
 watch(() => isSingleFile.value, (newVal) => {
   isSingleFile.value = newVal
 }, {deep: true})
-const handleDelete = (row) => {
+const handleDelete = (row, type) => {
   deleteFile(row.fileId).then(res => {
     ElNotification({
       title: '提示',
@@ -175,12 +269,24 @@ const handleDelete = (row) => {
       type: res.code === 1000 ? 'success' : 'error'
     })
     if (res.code === 1000) {
-      allFileList.value.splice(allFileList.value.findIndex((item) => item.id === row.fileId), 1);
+      if (type === 'single') {
+        singleFileList.value.splice(singleFileList.value.findIndex((item) => item.id === row.fileId), 1);
+        isSingleFile.value = false
+      } else {
+        allFileList.value.splice(allFileList.value.findIndex((item) => item.id === row.fileId), 1);
+      }
     }
   });
 }
+const handleSingleDelete = (row) => {
+  console.log('row',row)
+  // fileUploadRef.value.handleRemove(deleteFileVal.value.id)
+  handleDelete(row, 'single')
+}
 const getAttachment = (val) => {
+  console.log('getAttachment', val)
   isSingleFile.value = true
+  // deleteFileVal.value=val
   emit('getAttachment', val)
 }
 const getOtherFile = (val) => {

src/components/DetailComponent/ApprovalDetail.vue

@@ -24,7 +24,7 @@
           <div class="base-title">流程图</div>
           <el-switch
               v-model="changeDiagram"
-              style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+              style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
           />
         </div>
       </div>

src/components/DetailComponent/CollectionDetail.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="6" v-if="type==='singleDetail'">
           <el-form-item label="征集名称">
@@ -13,12 +13,17 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="截止时间">
+          <el-form-item label="需求上报截止时间">
             <span>{{ formData.deadline }}</span>
           </el-form-item>
         </el-col>
+        <el-col :span="6" v-if="formData.isSpecialFund">
+          <el-form-item label="专项资金名称">
+            <span>{{ formData.specialFund }}</span>
+          </el-form-item>
+        </el-col>
         <el-col :span="24" v-if="type==='singleDetail'">
-          <el-form-item label="所属公司">
+          <el-form-item label="征集公司">
             <span :class="showExpendClass(showMoreCompany,formData.companyIds)">{{
                 getCompanyName(formData.companyIds)
               }}</span>
@@ -27,11 +32,7 @@
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="24" v-if="formData.isSpecialFund">
+
-          <el-form-item label="专项资金名称">
-            <span>{{ formData.specialFund }}</span>
-          </el-form-item>
-        </el-col>
         <el-col :span="24">
           <baseTitle title="征集说明"></baseTitle>
           <el-form-item>
@@ -68,7 +69,7 @@
             <div class="base-title">流程图</div>
             <el-switch
                 v-model="changeDiagram"
-                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+                style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd"
             />
           </div>
         </div>

src/components/DetailComponent/CompanyPicker.vue

@@ -168,26 +168,26 @@ const show = () => {
   getList()
 };
 
-const updateTreeCheck = (item, flag) => {
+const updateTreeCheck = (list, flag) => {
-  // list.forEach(item => {
+  list.forEach(item => {
-    tree.value.setChecked(item, flag)
+    if (item.value !== -1) {
-    if (item.children !== undefined) {
+      tree.value.setChecked(item, flag)
-      updateTreeCheck(item.children, flag)
+      if (item.children !== undefined) {
+        updateTreeCheck(item.children, flag)
+      }
     }
-  // })
+  })
 }
 const handleChange = (data, checked) => {
   if (data.value == -1) {
     if(checked){
-      for (const item of dataList.value) {
+      updateTreeCheck(dataList.value, false)
-        if (item.value !== -1) {
-          console.log('item',item)
-          updateTreeCheck(item, false)
-        }
-      }
       tree.value.setChecked(data,true);
     }
   }
+  if(tree.value.getCheckedKeys().length>1&&tree.value.getCheckedKeys().indexOf(-1)!==-1){
+    tree.value.setChecked(-1,false);
+  }
   // 左侧有选择框 + 多选
   if (props.multiple) {
     //不添加重复的数据到右边

src/components/DetailComponent/ProjectApply.vue

@@ -29,7 +29,7 @@
             <div class="base-title">流程图</div>
             <el-switch
                 v-model="changeDiagram"
-                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+                style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
             />
           </div>
         </div>
@@ -414,7 +414,6 @@ const init = async () => {
 watchEffect(() => {
   return Object.keys(props.formData).length && (localFormData.value = props.formData)
 })
-
 onMounted(async () => {
   await init()
 })

src/components/DetailComponent/SpecialFundDetail.vue

@@ -70,7 +70,7 @@
             <div class="base-title">流程图</div>
             <el-switch
                 v-model="changeDiagram"
-                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+                style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
             />
           </div>
         </div>

src/components/DetailComponent/SummaryDetail.vue

@@ -2,82 +2,85 @@
   <div class="detail-block" v-loading="loading">
     <el-form :model="localFormData" ref="summaryForm" :rules="rules">
       <el-row gutter="50">
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="项目名称" prop="projectName">
             <span>{{ localFormData.projectName }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
-          <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="12">
           <el-form-item label="开始时间" prop="startTime">
             <span>{{ localFormData.startTime }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="结束时间" prop="endTime">
             <span>{{ localFormData.endTime }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="项目类型" prop="projectType">
             <span>{{ filterDict(cacheStore.getDict('project_type'), localFormData.projectType) }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="研发主体" prop="rdSubject">
             <span>{{ filterDict(cacheStore.getDict('rd_subject'), localFormData.rdSubject) }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="出资类型" prop="investmentType">
             <span>{{ filterDict(cacheStore.getDict('invest_type'), localFormData.investmentType) }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <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="12">
+        <el-col :span="8">
           <el-form-item label="所属业务板块" prop="businessSegment">
             <span>{{ filterDict(cacheStore.getDict('business_segment'), localFormData.businessSegment) }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
-          <el-form-item label="预期成果形式" prop="resultForm">
-            <span>{{ filterDict(cacheStore.getDict('result_form'), localFormData.resultForm) }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
           <el-form-item label="预期技术标准制定" prop="technicalStandard">
             <span>{{ filterDict(cacheStore.getDict('technical_standard'), localFormData.technicalStandard) }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="产学研联合" prop="industryUniversityResearch">
             <span>{{
                 filterDict(cacheStore.getDict('industry_university'), localFormData.industryUniversityResearch)
               }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="开展政府申报" prop="governmentDeclaration">
             <span>{{
                 filterDict(cacheStore.getDict('government_declaration'), localFormData.governmentDeclaration)
               }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
+          <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="8">
           <el-form-item label="知识产权状况" prop="intellectualProperty">
             <span>{{
                 filterDict(cacheStore.getDict('intellectual_property'), localFormData.intellectualProperty)
               }}</span>
           </el-form-item>
         </el-col>
+        <el-col :span="16">
+          <el-form-item label="预期成果形式" prop="resultForm">
+            <span>{{ filterDict(cacheStore.getDict('result_form'), localFormData.resultForm) }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <baseTitle title="预期知识产权"></baseTitle>
+        </el-col>
         <el-col :span="6">
           <el-form-item label="发明专利(项)" prop="inventionPatent">
             <span>{{ localFormData.inventionPatent }}</span>
@@ -125,14 +128,20 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="需求上报申请书">
+          <baseTitle title="需求上报申请书"></baseTitle>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item>
             <el-button type="primary" link @click="handleDownload(localFormData.singleFile)" style="font-size: 16px">
               {{ localFormData.singleFile?.originalFileName }}
             </el-button>
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <file-component title="需求上报附件" tag="需求上报"
+          <baseTitle title="附件列表"></baseTitle>
+        </el-col>
+        <el-col :span="24">
+          <file-component  tag="需求上报"
                           v-model:value="localFormData.fileList" :processViewer="processViewer"
                           :file-list-show="fileListShow"/>
         </el-col>
@@ -157,7 +166,7 @@
             <div class="base-title">流程图</div>
             <el-switch
                 v-model="changeDiagram"
-                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+                style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
             />
           </div>
         </div>
@@ -231,12 +240,27 @@ const _value = computed({
 const filterDict = (data, value) => {
   if (data === undefined || value === undefined) return;
   let label = ''
-  if (data instanceof Array) {
+  let result=[]
-    data.find(item => {
+  if(value.indexOf(",") >= 0){
-      if (item.value == value) {
+    if (value.split(",") instanceof Array) {
-        label = item.label
+      value.split(",").forEach(item1 => {
-      }
+        console.log('item',item1)
-    })
+        data.find(item => {
+          if (item.value == item1) {
+            result.push(item.label)
+          }
+        })
+      })
+    }
+    label=result.map(item=>item).join('，')
+  }else {
+    if (data instanceof Array) {
+      data.find(item => {
+        if (item.value == value) {
+          label = item.label
+        }
+      })
+    }
   }
   return label
 }

src/components/FileUpload.vue

@@ -44,10 +44,12 @@ const props = defineProps({
   showFileList: {
     type: Boolean,
     default: false
-  }, disabled: {
+  },
+  disabled: {
     type: Boolean,
     default: false
-  }, multiple: {
+  },
+  multiple: {
     type: Boolean,
     default: true
   }
@@ -98,7 +100,9 @@ const uploadError = () => {
     type: 'error'
   })
 }
-
+defineExpose({
+  handleRemove
+})
 </script>
 
 <style lang="scss" scoped>

src/components/Tag.vue

@@ -45,7 +45,7 @@ const filterDict = (data, value) => {
       tagConfig.value = data.find(item => item.value == value)
     }
   }
-  return tagConfig.value.label
+  return tagConfig.value?.label || '未知'
 }
 </script>
 

src/components/steps/index.vue

@@ -1,7 +1,6 @@
 <template>
   <baseTitle title="基础信息"></baseTitle>
   <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
-  <baseTitle title="各流程信息"></baseTitle>
   <div class="steps-box">
     <el-steps :active="localActive" finish-status="success">
       <el-step
@@ -11,12 +10,17 @@
           :class="stepClass(index)"
           @click="handleStep(item.key, index)"
 
-      />
+      >
+        <template #icon>
+          <el-icon style="font-size: 20px;" :class="index == localActive ? 'is-active' : 'is-end'" v-if="localStepSuccess.includes(index)"><SuccessFilled /></el-icon>
+          <el-icon style="font-size: 20px; color: gray;" v-else><WarningFilled /></el-icon>
+        </template>
+      </el-step>
     </el-steps>
   </div>
-
   <!-- 步骤内容 -->
   <div>
+    <baseTitle title="各流程信息"></baseTitle>
     <slot name="content" :localActive="localActive"></slot>
     <!-- <template v-for="(item, index) in stepList" :key="item.key">
       <component v-if="localActive == index" v-bind="item.props || {}" :is="item.component" />
@@ -311,4 +315,10 @@ watchEffect(() => {
 .step-error {
   cursor: not-allowed;
 }
+.is-active {
+  color: #BEA266;
+}
+.is-end {
+  color: #67c23a;
+}
 </style>

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

@@ -36,12 +36,12 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column prop="researchPersonnel" label="研发人员" width="230">
+          <el-table-column prop="researchPersonnelId" label="研发人员" width="230">
             <template #default="scope">
-              <el-form-item prop="researchPersonnel">
+              <el-form-item prop="researchPersonnelId">
-                {{ scope.row.researchPersonnelName }}
+                {{ scope.row.researchPersonnel }}
                 <el-button @click="showPersonnelPicker(scope.row,scope.$index)">
-                  {{ scope.row.researchPersonnelName ? '更改' : '请选择研发人员' }}
+                  {{ scope.row.researchPersonnel ? '更改' : '请选择研发人员' }}
                 </el-button>
               </el-form-item>
             </template>
@@ -114,11 +114,11 @@
       <div class="approval-title">
         <baseTitle title="审批记录" v-if="processDiagramViewer&& opentionData?.operationList"></baseTitle>
         <div v-else></div>
-        <div style="display: flex;align-items: center;justify-content: flex-end;">
+        <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: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
+              style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
           />
         </div>
       </div>
@@ -163,7 +163,7 @@ const rules = reactive({
   shareName: [{required: true, message: '请输入分摊名称', trigger: ['blur', 'change']}],
   apportionmentMonth: [{required: true, message: '请选择月份', trigger: ['blur', 'change']}],
   projectId: [{required: true, message: '请选择项目名称', trigger: ['blur', 'change']}],
-  // researchPersonnel: [{required: true, message: '请选择研发人员', trigger:  ['blur', 'change']}],
+  // researchPersonnelId: [{required: true, message: '请选择研发人员', trigger:  ['blur', 'change']}],
   wagesPayable: [{required: true, message: '请输入应发工资', trigger: ['blur', 'change']}],
   performance: [{required: true, message: '请输入绩效', trigger: ['blur', 'change']}],
   reserveFund: [{required: true, message: '请输入公积金', trigger: ['blur', 'change']}],
@@ -187,7 +187,7 @@ const formData = ref({
     {
       projectId: '',
       projectName: '',
-      researchPersonnel: '',
+      researchPersonnelId: '',
       wagesPayable: null,
       performance: null,
       reserveFund: null,
@@ -216,8 +216,8 @@ const selected = (select) => {
   }
   formData.value.tableData.forEach((item, index) => {
     if (index === currentIndex.value) {
-      item.researchPersonnel = select[0].id
+      item.researchPersonnelId = select[0].id
-      item.researchPersonnelName = select[0].name
+      item.researchPersonnel = select[0].name
     }
   })
 }
@@ -242,8 +242,8 @@ const handleAdd = () => {
   let row = {
     projectId: '',
     projectName: '',
+    researchPersonnelId: '',
     researchPersonnel: '',
-    researchPersonnelName: '',
     wagesPayable: null,
     performance: null,
     reserveFund: null,
@@ -259,8 +259,8 @@ const handleCopy = (row) => {
   let copyObj = {
     projectId: row.projectId,
     projectName: '',
+    researchPersonnelId: row.researchPersonnelId,
     researchPersonnel: row.researchPersonnel,
-    researchPersonnelName: row.researchPersonnelName,
     wagesPayable: row.wagesPayable,
     performance: row.performance,
     reserveFund: row.reserveFund,
@@ -284,15 +284,15 @@ const handleSubmit = (instance) => {
         type: 'error'
       })
     }
-    let researchPersonnel = ''
+    let researchPersonnelId = ''
     formData.value.tableData.forEach(item => {
       item.projectName = getProjectName(item.projectId)
-      researchPersonnel = item.researchPersonnel
+      researchPersonnelId = item.researchPersonnelId
       if (item.performance == 0) {
         item.performance = null
       }
     })
-    if (!researchPersonnel) {
+    if (!researchPersonnelId) {
       ElNotification({
         title: '提示',
         message: '请选择研发人员',
@@ -333,18 +333,18 @@ const handleResubmit = (instance) => {
     }
     let newUsrAllocationsObj = {}
     let newUsrAllocationsObjArray = []
-    let researchPersonnel = ''
+    let researchPersonnelId = ''
     formData.value.tableData.forEach(item => {
       item.allocationId = formData.value.allocationId
       item.projectName = getProjectName(item.projectId)
-      researchPersonnel = item.researchPersonnel
+      researchPersonnelId = item.researchPersonnelId
       if (item.performance == 0) {
         item.performance = null
       }
       newUsrAllocationsObj = {
         projectId: item.projectId,
         projectName: item.projectName,
-        researchPersonnel: item.researchPersonnel,
+        researchPersonnelId: item.researchPersonnelId,
         wagesPayable: item.wagesPayable,
         performance: item.performance,
         reserveFund: item.reserveFund,
@@ -355,7 +355,7 @@ const handleResubmit = (instance) => {
       }
       newUsrAllocationsObjArray.push(newUsrAllocationsObj)
     })
-    if (!researchPersonnel) {
+    if (!researchPersonnelId) {
       ElNotification({
         title: '提示',
         message: '请选择研发人员',
@@ -409,7 +409,7 @@ const getDetailList = async () => {
   const {code, data, msg} = await getAllocationDetailList(params)
   if (code === 1000) {
     data.rows.forEach(item => {
-      item.researchPersonnel = Number(item.researchPersonnel)
+      item.researchPersonnelId = Number(item.researchPersonnelId)
     })
     formData.value.tableData = data.rows
     nextTick(() => {

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

@@ -39,7 +39,7 @@
         <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"
-            style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+            style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
         />
       </div>
     </div>

src/views/expense-management/share/moblieDetail/index.vue

@@ -40,7 +40,7 @@
         <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"
-            style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+            style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
         />
       </div>
     </div>

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

@@ -1,16 +1,16 @@
 <template>
   <div v-loading="loading" class="add-block">
     <baseTitle title="需求征集信息录入"></baseTitle>
-    <el-form :model="formData" inline class="query-form" ref="demandForm" :rules="rules">
+    <el-form :model="formData"  ref="demandForm" :rules="rules">
-      <el-row>
+      <el-row gutter="30">
-        <el-col :span="6">
+        <el-col :span="8">
-          <el-form-item label="名称" prop="requirementName">
+          <el-form-item label="征集名称" prop="requirementName" label-width="96">
             <el-input v-model="formData.requirementName" placeholder="请输入名称" clearable></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
-          <el-form-item label="科技创新与信息化系统建设" prop="collectType">
+          <el-form-item label="征集类型" prop="collectType" label-width="105">
-            <el-select v-model="formData.collectType" placeholder="科技创新与信息化系统建设" clearable filterable>
+            <el-select v-model="formData.collectType" placeholder="请选择征集类型" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('collect_type')"
                   :key="item.value"
@@ -20,7 +20,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="需求上报截止时间" prop="deadline">
             <el-config-provider>
               <el-date-picker
@@ -32,8 +32,28 @@
             </el-config-provider>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="8">
-          <el-form-item label="征集公司" prop="companyIds" class="tree-select">
+          <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="8">
+          <el-form-item label="专项资金名称" prop="specialFundId">
+            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable :disabled="!formData.isSpecialFund">
+              <el-option
+                  v-for="item in specialFundOption"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" style="margin-bottom: -25px">
+          <el-form-item label="征集公司" prop="companyIds" class="tree-select" label-width="96">
             <div style="width: 100%">
               <el-button color="#DED0B2" @click="showCompany">{{ selectedCompanyList.length === 0 ? '请选择征集公司' : '更改' }}
               </el-button>
@@ -43,30 +63,9 @@
             <div style="color: #2a99ff;text-align: center;width: 100%;font-size: 15px;cursor: pointer"
                  @click="handleExpend">
               {{ showExpendText }}
-
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="是否专项资金" prop="isSpecialFund">
-            <el-radio-group v-model="formData.isSpecialFund" size="mini">
-              <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="formData.isSpecialFund">
-          <el-form-item label="专项资金名称" prop="specialFundId">
-            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable>
-              <el-option
-                  v-for="item in specialFundOption"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
       </el-row>
     </el-form>
     <baseTitle title="征集说明"></baseTitle>
@@ -87,11 +86,11 @@
       </template>
     </fvTable>
     <div class="approval-record">
-      <div style="display: flex;align-items: center;justify-content: flex-end;">
+      <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: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
+            style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd;margin-left: 10px"
         />
       </div>
       <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
@@ -146,22 +145,20 @@ const dateValue = ref()
 const formData = ref({
   requirementName: '',
   companyIds: [],
-  collectType: '',
+  collectType: '科技创新与信息化系统建设',
   deadline: '',
   collectExplain: '',
   fileList: [],
   isSpecialFund: false
 })
-const showTinymce = ref(true)
 const routerName = ref(router.currentRoute.value.name)
 const processDiagramViewer = ref(false)
 const companyOption = ref([])
 const specialFundOption = ref([])
 const form = ref(null)
-const expendClass = ref()
 const fileList = ref([])
 const loading = ref(false)
-const showTable = ref(true)
+const showTable = ref(false)
 const processStore = useProcessStore()
 const processInstanceData = ref()
 const formPermMap = ref(new Map());
@@ -370,7 +367,13 @@ const submitParam = (item) => {
 const handleSubmit = async (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
-    if (!valid) return
+    if (!valid) {
+      return ElNotification({
+        title: '提示',
+        message: '请完善数据,再提交!',
+        type: 'error'
+      })
+    }
     const {msg, code} = await addRequirement(submitParam(formData.value))
     ElNotification({
       title: '提示',
@@ -424,12 +427,12 @@ const getDetailInfo = async () => {
     if (res.code === 1000) {
       selectedCompanyList.value = getCompanyOptionItem(res.data.companyIds)
       formData.value = res.data
-      showTinymce.value = false
+      if(res.data.fileList.length!==0){
-      showTable.value = false
+        showTable.value = false
-      nextTick(() => {
+        nextTick(() => {
-        showTinymce.value = true
+          showTable.value = true
-        showTable.value = true
+        })
-      })
+      }
     } else {
       ElNotification({
         title: '提示',
@@ -452,6 +455,7 @@ const handleDelete = (row) => {
     })
     if (res.code === 1000) {
       formData.value.fileList.splice(formData.value.fileList.findIndex((item) => item.id === row.fileId), 1);
+      showTable.value = formData.value.fileList.length !== 0;
     }
   });
 }

src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue

@@ -68,7 +68,7 @@
             <div class="base-title">流程图</div>
             <el-switch
                 v-model="changeDiagram"
-                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+                style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd"
             />
           </div>
         </div>

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

@@ -1,40 +1,15 @@
 <template>
   <div class="detail-block" v-loading="loading">
     <baseTitle title="需求上报"></baseTitle>
-    <el-form :model="formData" ref="summaryForm" :rules="rules" label-width="140">
+    <el-form :model="formData" ref="summaryForm" :rules="rules">
-      <el-row gutter="50">
+      <el-row gutter="15">
-        <el-col :span="12">
+        <el-col :span="8">
-          <el-form-item label="项目名称" prop="projectName">
+          <el-form-item label="项目名称" prop="projectName" label-width="125">
             <el-input v-model="formData.projectName" placeholder="请输入项目名称" clearable></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6" v-if="!route.query.id">
+        <el-col :span="8">
-          <el-form-item label="是否专项资金" prop="isSpecialFund">
+          <el-form-item label="开始时间" prop="startTime" label-width="145">
-            <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="5" v-if="route.query.id && formData.isSpecialFund">
-          <el-form-item label="专项资金" prop="specialFundId">
-            <span>{{ formData.specialFund }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6" v-if="!route.query.id && formData.isSpecialFund">
-          <el-form-item label="专项资金" prop="specialFundId">
-            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金" clearable filterable>
-              <el-option
-                  v-for="item in specialFundOption"
-                  :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="startTime">
             <el-config-provider>
               <el-date-picker
                   v-model="formData.startTime"
@@ -47,9 +22,9 @@
             </el-config-provider>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="结束时间" prop="endTime"
-                        :title="!formData.startTime?'请先选择开始时间!':''">
+                        :title="!formData.startTime?'请先选择开始时间!':''" label-width="134">
             <el-config-provider>
               <el-date-picker
                   v-model="formData.endTime"
@@ -64,8 +39,8 @@
             </el-config-provider>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
-          <el-form-item label="项目类型" prop="projectType">
+          <el-form-item label="项目类型" prop="projectType" label-width="125">
             <el-select v-model="formData.projectType" placeholder="请选择项目类型" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('project_type')"
@@ -76,8 +51,8 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
-          <el-form-item label="研发主体" prop="rdSubject">
+          <el-form-item label="研发主体" prop="rdSubject" label-width="145">
             <el-select v-model="formData.rdSubject" placeholder="请选择研发主体" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('rd_subject')"
@@ -88,8 +63,8 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
-          <el-form-item label="出资类型" prop="investmentType">
+          <el-form-item label="出资类型" prop="investmentType" label-width="134">
             <el-select v-model="formData.investmentType" placeholder="请选择出资类型" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('invest_type')"
@@ -100,8 +75,8 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
-          <el-form-item label="项目影响" prop="projectImpact">
+          <el-form-item label="项目影响" prop="projectImpact" label-width="125">
             <el-select v-model="formData.projectImpact" placeholder="请选择项目影响" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('project_impact')"
@@ -112,8 +87,8 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
-          <el-form-item label="所属业务板块" prop="businessSegment">
+          <el-form-item label="所属业务板块" prop="businessSegment" label-width="145">
             <el-select v-model="formData.businessSegment" placeholder="请选择所属业务板块" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('business_segment')"
@@ -124,19 +99,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
-          <el-form-item label="预期成果形式" prop="resultForm">
-            <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable>
-              <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="12">
           <el-form-item label="预期技术标准制定" prop="technicalStandard">
             <el-select v-model="formData.technicalStandard" placeholder="请选择预期技术标准制定" clearable filterable>
               <el-option
@@ -148,8 +111,8 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="route.query.id && formData.isSpecialFund?8:!formData.isSpecialFund?!route.query.id?6:8:6">
-          <el-form-item label="产学研联合" prop="industryUniversityResearch">
+          <el-form-item label="产学研联合" prop="industryUniversityResearch" label-width="125">
             <el-radio-group v-model="formData.industryUniversityResearch">
               <el-radio v-for="item in cacheStore.getDict('industry_university')"
                         :key="item.value"
@@ -158,8 +121,8 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="route.query.id && formData.isSpecialFund?8:!formData.isSpecialFund?route.query.id?8:6: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"
@@ -168,8 +131,33 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="!route.query.id && formData.isSpecialFund?4:!route.query.id?12:12" v-if="!route.query.id">
-          <el-form-item label="知识产权状况" prop="intellectualProperty">
+          <el-form-item label="是否专项资金" prop="isSpecialFund" >
+            <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="8" v-if="route.query.id && formData.isSpecialFund">
+          <el-form-item label="专项资金名称" prop="specialFundId" :label-width="route.query.id && formData.isSpecialFund?135:''">
+            <span>{{ formData.specialFund }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" v-if="!route.query.id && formData.isSpecialFund" >
+          <el-form-item label="专项资金名称" prop="specialFundId" label-width="135">
+            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable>
+              <el-option
+                  v-for="item in specialFundOption"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="margin-bottom: -18px">
+          <el-form-item label="知识产权状况" prop="intellectualProperty" :label-width="!formData.isSpecialFund?!route.query.id?125:135:125">
             <el-select v-model="formData.intellectualProperty" placeholder="请选择知识产权状况" clearable filterable>
               <el-option
                   v-for="item in cacheStore.getDict('intellectual_property')"
@@ -180,52 +168,64 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="16" style="margin-bottom: -18px">
+          <el-form-item label="预期成果形式" prop="resultForm" label-width="145">
+            <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="24">
           <baseTitle title="预期知识产权"></baseTitle>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
-          <el-form-item label="发明专利(项)" prop="inventionPatent">
+          <el-form-item label="发明专利(项)" prop="inventionPatent" label-width="125">
             <el-input-number v-model="formData.inventionPatent" placeholder="请输入发明专利" :controls="false"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="实用性新型专利(项)" prop="newPatent" label-width="145">
             <el-input-number v-model="formData.newPatent" placeholder="请输入实用性新型专利" :controls="false"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
-          <el-form-item label="软件著作权(项)" prop="softwareCopyright">
+          <el-form-item label="软件著作权(项)" prop="softwareCopyright" label-width="135">
             <el-input-number v-model="formData.softwareCopyright" placeholder="请输入软件著作权" :controls="false"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
-          <el-form-item label="著作权(项)" prop="copyright">
+          <el-form-item label="著作权(项)" prop="copyright" label-width="125">
             <el-input-number v-model="formData.copyright" placeholder="请输入著作权" :controls="false"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
-          <el-form-item label="其他(项)" prop="other">
+          <el-form-item label="其他(项)" prop="other" label-width="145">
             <el-input-number v-model="formData.other" placeholder="请输入其他" :controls="false"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
-          <el-form-item label="经济概算(元)" prop="economicEstimate">
+          <el-form-item label="经济概算(元)" prop="economicEstimate" label-width="135">
             <el-input-number v-model="formData.economicEstimate" placeholder="请输入经济概算" :controls="false"/>
           </el-form-item>
         </el-col>
-        <el-col :span="12" v-if="formData.isSpecialFund!==false">
+        <el-col :span="16" v-if="formData.isSpecialFund">
-          <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount" label-width="280">
+          <el-form-item label="其中申请公司总部科技创新专项资金(元)">
             <el-input-number v-model="formData.specialFundAmount" placeholder="请输入专项资金" :controls="false"/>
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="现有业务描述" prop="serviceDescription">
+          <el-form-item label="现有业务描述" prop="serviceDescription" label-width="125">
             <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" label-width="140">
+          <el-form-item label="研发项目关键内容描述" prop="contentDescription" label-width="125">
             <el-input v-model="formData.contentDescription" placeholder="请输入研发项目关键内容描述" rows="4" type="textarea"
                       clearable></el-input>
           </el-form-item>
@@ -233,15 +233,15 @@
       </el-row>
     </el-form>
     <AttachmentUpload ref="attachment" label="需求申请书附件" :showTable="showTable" :otherFileList="otherFileList"
-                      @getAttachment="getAttachment"
+                      @getAttachment="getAttachment" :singleList="singleList" :showSingleTable="showSingleTable"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
                       :preview="name === 'Summary/edit'"/>
-    <div class="approval-record">
+    <div class="approval-record" style="margin-left: 70px">
-      <div style="display: flex;align-items: center;justify-content: flex-end;">
+      <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: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
+            style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd;margin-left: 10px"
         />
       </div>
       <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
@@ -281,12 +281,15 @@ const companyOption = ref([])
 const summaryForm = ref()
 const deploymentId = ref()
 const specialFundOption = ref([])
-const showTable = ref(true)
+const showTable = ref(false)
+const showSingleTable = ref(false)
 const otherFileList = ref([])
+const singleList = ref([])
 const formData = ref({
-  isSpecialFund: false,
+  isSpecialFund: true,
   industryUniversityResearch: '0',
   governmentDeclaration: '0',
+  resultForm:[]
 })
 
 const rules = reactive({
@@ -337,11 +340,11 @@ const getIsFund = async () => {
   })
 }
 const getFundName = (id) => {
-  let label=''
+  let label = ''
   specialFundOption.value.forEach(item => {
-   if(item.value==id){
+    if (item.value == id) {
-     label=item.label
+      label = item.label
-   }
+    }
   })
   return label
 }
@@ -363,7 +366,12 @@ const compositeParam = (item, type) => {
 
 const getAttachment = (val) => {
   // console.log('上传文件getAttachment', val)
+  showSingleTable.value=false
   formData.value.singleFile = compositeParam(val)
+  singleList.value.push( compositeParam(val))
+  nextTick(() => {
+    showSingleTable.value = true
+  })
 }
 const getOtherFile = (val) => {
   // console.log('上传文件getOtherFile', val)
@@ -374,6 +382,12 @@ const getOtherFile = (val) => {
     showTable.value = true
   })
 }
+watch(() => otherFileList.value, (newVal) => {
+  showTable.value = newVal.length !== 0;
+}, {deep: true})
+watch(() => singleList.value, (newVal) => {
+  showSingleTable.value = newVal.length !== 0;
+}, {deep: true})
 const getFileParam = (item) => {
   if (item === undefined) return;
   return {
@@ -398,6 +412,7 @@ const handleSubmit = debounce(async (instance) => {
     if (formData.value.singleFile !== undefined) {
       formData.value.singleFile = getFileParam(formData.value.singleFile)
     }
+    formData.value.resultForm=formData.value.resultForm.map(item=>item).join(',')
     let params = {
       ...formData.value,
       deploymentId: deploymentId.value,
@@ -448,14 +463,15 @@ const handleResubmit = debounce(() => {
   } else {
     attachment.value.clearValidate()
   }
-  if (formData.value.isSpecialFund&&formData.value.specialFund === null) {
+  if (formData.value.isSpecialFund && formData.value.specialFund === null) {
-    formData.value.specialFund=getFundName(formData.value.specialFundId)
+    formData.value.specialFund = getFundName(formData.value.specialFundId)
   }
+  formData.value.resultForm=formData.value.resultForm.map(item=>item).join(',')
   let params = {
     ...formData.value,
     deploymentId: deploymentId.value,
     fileList: otherFiles,
-    requirementId: route.query.id ? route.query.id : '-1'
+    requirementId: route.query.requirementId ? route.query.requirementId : '-1'
   }
   // console.log('重新提交params', params, formData.value.specialFund, formData.value.specialFundId)
   resubmitReported(params).then(res => {
@@ -482,7 +498,7 @@ const getDetailInfo = async () => {
       type: res.code === 1000 ? 'success' : 'error'
     })
     if (res.code === 1000) {
-      res.data.formData.specialFundId= res.data.formData.specialFundId===0?null:res.data.formData.specialFundId
+      res.data.formData.specialFundId = res.data.formData.specialFundId === 0 ? null : res.data.formData.specialFundId
       formData.value = res.data.formData
       loading.value = false
     }

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

@@ -8,6 +8,35 @@ import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 
 const tableIns = ref()
 const router = useRouter()
+const shortcuts = [
+  {
+    text: '上周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '上月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+      return [start, end]
+    },
+  },
+  {
+    text: '三月前',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+      return [start, end]
+    },
+  },
+]
 const searchConfig = reactive([
   {
     label: '征集名称',
@@ -32,6 +61,18 @@ const searchConfig = reactive([
     },
     colProps: {}
   },
+  {
+    label: '项目影响',
+    prop: 'projectImpact',
+    component: shallowRef(fvSelect),
+    props: {
+      cacheKey: 'project_impact',
+      placeholder: '请选择项目影响',
+      clearable: true,
+      filterable: true,
+    },
+    colProps: {}
+  },
   {
     label: '研发主体',
     prop: 'rdSubject',
@@ -40,9 +81,31 @@ const searchConfig = reactive([
       placeholder: '请选择研发主体',
       cacheKey: 'rd_subject',
       clearable: true,
-      filterable: true
+      filterable: true,
-    },
+    }
-    colProps: {}
+  },
+  {
+    label: '起止时间',
+    prop: 'dateValue',
+    component: 'el-date-picker',
+    props: {
+      clearable: true,
+      type: 'daterange',
+      startPlaceholder: '开始日期',
+      endPlaceholder: '结束日期',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      shortcuts: shortcuts
+    }
+  },
+  {
+    label: '状态',
+    prop: 'state',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择状态',
+      clearable: true,
+      cacheKey: 'project_initiation'
+    }
   },
   // {
   //   label: '项目影响',
@@ -220,9 +283,9 @@ const headBtnClick = (key) => {
 
 const search = (val) => {
   let obj = {...val}
-  if (obj.time) {
+  if (obj.dateValue) {
-    obj.startTime = obj.time[0]
+    obj.startTime = obj.dateValue[0]
-    obj.endTime = obj.time[1]
+    obj.endTime = obj.dateValue[1]
     delete obj.dateValue
   }
   tableConfig.params = obj
@@ -241,7 +304,7 @@ const handleEdit = (row) => {
   router.push({
     name: 'Summary/edit',
     query: {
-      id: row.requirementId,
+      requirementId: row.requirementId,
       projectId: row.projectId
     }
   })

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

@@ -173,10 +173,10 @@ const searchConfig = reactive([
 ])
 const tableConfig = reactive({
   columns: [
-    {
+    // {
-      type: 'selection',
+    //   type: 'selection',
-      prop: 'selection'
+    //   prop: 'selection'
-    },
+    // },
     {
       prop: 'name',
       type: 'index',
@@ -308,6 +308,7 @@ const search = (val) => {
 }
 const init = async () => {
   const {code, msg, data} = await searchUpdateLedgerData(route.query.id)
+  console.log("🚀 ~ init ~ data:", data)
   if (data) {
     tableData.value = data
     baseForm.value.setValues(data)

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

@@ -13,11 +13,11 @@
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
                       :preview="name === 'Phase/edit'"/>
     <div class="approval-record">
-      <div style="display: flex;align-items: center;justify-content: flex-end;">
+      <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: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
+            style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd;margin-left: 10px"
         />
       </div>
       <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>

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

@@ -9,9 +9,9 @@
       </el-col>
       <el-col :span="24">
         <el-form-item prop="projectChargePerson" label="项目负责人">
-          {{tableForm.projectChargePerson?tableForm.projectChargePerson: currentPerson.name }}
+          {{tableForm.projectChargePersonName}}
           <el-button @click="showPersonnelPicker">
-            {{ tableForm.projectChargePerson||currentPerson.name ? '更改' : '请选择研发人员' }}
+            {{ tableForm.projectChargePersonName ? '更改' : '请选择研发人员' }}
           </el-button>
         </el-form-item>
       </el-col>
@@ -55,7 +55,7 @@
       </el-col>
       <el-col :span="6">
         <el-form-item prop="projectCompletionRate" label="项目总体完成率（%）">
-          <el-input-number v-model="tableForm.projectCompletionRate" placeholder="请输入项目总体完成率" :controls="false" style="width: 200px">
+          <el-input-number v-model="tableForm.projectCompletionRate" placeholder="请输入项目总体完成率" min="0" max="100" :controls="false" style="width: 200px">
           </el-input-number>
         </el-form-item>
       </el-col>
@@ -88,23 +88,30 @@ const tagsViewStore = useTagsView()
 const baseForm = ref()
 const route = useRoute()
 const router = useRouter()
-const currentPerson = ref({})
 const tableForm = ref({
   projectName: '',
   completeWork: '',
   endTime: '',
   projectBudgetDescription: '',
   projectChargePerson: '',
+  projectChargePersonName:'',
   projectCompletionRate: '',
   projectDevelopmentWay: '',
   projectId: '',
-  startTime: '',
+  startTime: ''
 })
 const userPicker = ref()
+
+const showPersonnelPicker = () => {
+  userPicker.value.showUserPicker()
+}
 const selected = (select) => {
+  if (!select || select.length === 0) {
+    return
+  }
   for (const selectElement of select) {
-    currentPerson.value = selectElement
     tableForm.value.projectChargePerson = selectElement.id
+    tableForm.value.projectChargePersonName = selectElement.name
   }
 }
 const disabledDate = (time) => {
@@ -113,9 +120,6 @@ const disabledDate = (time) => {
 const handleBack = () => {
   history.back()
 }
-const showPersonnelPicker = () => {
-  userPicker.value.showUserPicker()
-}
 const handleSubmit = async () => {
   let params = {
     ...tableForm.value,
@@ -141,7 +145,7 @@ const handleSubmit = async () => {
 }
 const getBaseInfo = async () => {
   const {code, data} = await getBaseInfoApi(route.query.id)
-  tableForm.value.projectName = data.projectName
+  tableForm.value.projectName = data?.projectName || ''
 }
 getBaseInfo()
 const init = async () => {

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

@@ -114,8 +114,8 @@ const schema = computed(() => {
 const baseForm = ref()
 const rules = reactive({
   time: [{required: true, message: '请选择时间', trigger: 'blur'}],
-  projectCost: [{required: true, message: '请输入项目费用', trigger: 'blur'}],
+  projectCost: [{required: true, message: '请选择项目费用', trigger: 'blur'}],
-  researchStage: [{required: true, message: '请输入研发阶段', trigger: 'blur'}],
+  researchStage: [{required: true, message: '请选择研发阶段', trigger: 'blur'}],
   digest: [{required: true, message: '请输入摘要', trigger: 'blur'}],
   afterTax: [{required: true, message: '请输入税后余额', trigger: 'blur'}]
 })

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

@@ -29,7 +29,7 @@
           <div class="base-title">流程图</div>
           <el-switch
               v-model="changeDiagram"
-              style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+              style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd"
           />
         </div>
       </div>

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

@@ -68,7 +68,7 @@
             <div class="base-title">流程图</div>
             <el-switch
                 v-model="changeDiagram"
-                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+                style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd"
             />
           </div>
         </div>

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

@@ -17,7 +17,7 @@
     </el-form>
     <AttachmentUpload ref="attachment" :label="getTitleName(title)+'附件'" :showTable="showTable"
                       :otherFileList="otherFileList"
-                      @getAttachment="getAttachment"
+                      @getAttachment="getAttachment" :labelPosition="'top'"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="localFormData"
                       :preview="mode == 'resubmit'"/>
     <div>
@@ -29,7 +29,7 @@
             <div class="base-title">流程图</div>
             <el-switch
                 v-model="changeDiagram"
-                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+                style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd"
             />
           </div>
         </div>

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

@@ -40,7 +40,7 @@
         <div class="base-title">流程图</div>
         <el-switch
             v-model="changeDiagram"
-            style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+            style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd"
         />
       </div>
     </div>

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

@@ -73,7 +73,7 @@
             <div class="base-title">流程图</div>
             <el-switch
                 v-model="changeDiagram"
-                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+                style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd"
             />
           </div>
         </div>

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

@@ -11,7 +11,12 @@
           :class="stepClass(index)"
           @click="handleStep(item.key, index)"
 
-      />
+      >
+        <template #icon>
+          <el-icon style="font-size: 20px;" :class="index == localActive ? 'is-active' : 'is-end'" v-if="localStepSuccess.includes(index)"><SuccessFilled /></el-icon>
+          <el-icon style="font-size: 20px; color: gray;" v-else><WarningFilled /></el-icon>
+        </template>
+      </el-step>
     </el-steps>
   </div>
 
@@ -96,21 +101,21 @@ const schema = computed(() => {
       label: '征集名称',
       prop: 'requirementName',
       colProps: {
-        span: 24
+        span: 12
       }
     },
     {
       label: '所属公司',
       prop: 'affiliatedCompany',
       colProps: {
-        span: 24
+        span: 12
       }
     },
     {
       label: '项目名称',
       prop: 'projectName',
       colProps: {
-        span: 24
+        span: 12
       }
     }
 
@@ -311,4 +316,10 @@ watchEffect(() => {
 .step-error {
   cursor: not-allowed;
 }
+.is-active {
+  color: #BEA266;
+}
+.is-end {
+  color: #67c23a;
+}
 </style>

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

@@ -162,7 +162,7 @@
             <div class="base-title">流程图</div>
             <el-switch
                 v-model="changeDiagram"
-                style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+                style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd"
             />
           </div>
         </div>

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

@@ -29,7 +29,7 @@
           <div class="base-title">流程图</div>
           <el-switch
               v-model="changeDiagram"
-              style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266"
+              style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd"
           />
         </div>
       </div>

src/views/special-fund/add.vue

@@ -27,11 +27,11 @@
       </template>
     </fvTable>
     <div class="approval-record">
-      <div style="display: flex;align-items: center;justify-content: flex-end;">
+      <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: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
+            style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd;margin-left: 10px"
         />
       </div>
       <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>

src/views/workflow/common/OperationRender.vue

@@ -312,7 +312,7 @@ init()
       }
 
       > div:nth-child(2) {
-        display: flex;
+        //display: flex;
         margin-top: -5px;
       }
     }