From 80aef38e7abcf453b1522f1d7f42f01581ba91d9 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 30 Jun 2024 00:00:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E8=AF=A6=E6=83=85=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/ApprovalDetail.vue        |  6 ++--
 .../DetailComponent/CompanyPicker.vue         |  2 +-
 .../DetailComponent/ExpenseDetail.vue         |  2 +-
 .../DetailComponent/FileComponent.vue         |  5 ++--
 src/stores/userstore.js                       |  2 +-
 src/views/expense-management/share/add.vue    |  1 +
 .../moblieDetail/CollectionDetailMoblie.vue   |  6 ++--
 .../implementation/phaseDetail.vue            |  4 +--
 .../mobledetail/SpecialFundDetailMobile.vue   |  2 +-
 .../mobledetail/StepsMoblie.vue               |  6 ++--
 .../mobledetail/SummaryDetailMoblie.vue       | 28 +++++++++++--------
 .../ApprovalDetailMoblie.vue                  |  4 +--
 .../phaseDetailMoblie/index.vue               |  4 +--
 .../workflow/process/common/UserPicker.vue    | 10 +++----
 14 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue
index 0c507bd..6163c3e 100644
--- a/src/components/DetailComponent/ApprovalDetail.vue
+++ b/src/components/DetailComponent/ApprovalDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-loading="loading">
     <fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>
-    <el-form :model="formData" label-width="auto">
+    <el-form :model="formData" label-width="auto"  style="margin-top: -15px">
       <file-component :title="getTagName(type)+'附件'" :tag="getTagName(type)"
                       v-model:value="formData.fileList" :processViewer="processViewer"
                       :file-list-show="fileListShow"/>
@@ -18,8 +18,8 @@
       </el-form-item>
     </div>
     <div class="approval-record">
-      <div class="approval-title">
-        <baseTitle title="审批记录"></baseTitle>
+      <div class="approval-title"  style="margin-top: -15px">
+        <baseTitle title="审批记录" ></baseTitle>
         <div class="diagram">
           <div class="base-title">流程图</div>
           <el-switch
diff --git a/src/components/DetailComponent/CompanyPicker.vue b/src/components/DetailComponent/CompanyPicker.vue
index e54ed84..03f8bed 100644
--- a/src/components/DetailComponent/CompanyPicker.vue
+++ b/src/components/DetailComponent/CompanyPicker.vue
@@ -157,7 +157,7 @@ const filterNode = (value, data) => {
 const show = () => {
   //用于弹开部门选择
   visible.value = true;
-  console.log('_value.value', _value.value, selectList.value)
+  // console.log('_value.value', _value.value, selectList.value)
   // if(selectList.value.length==0){
   //   selectList.value=[]
   //   defaultChecked.value =[]
diff --git a/src/components/DetailComponent/ExpenseDetail.vue b/src/components/DetailComponent/ExpenseDetail.vue
index 02f0e87..63b8486 100644
--- a/src/components/DetailComponent/ExpenseDetail.vue
+++ b/src/components/DetailComponent/ExpenseDetail.vue
@@ -75,7 +75,7 @@ const objectSpanMethod = ({row, column, rowIndex, columnIndex}) => {
     }
   } else {
     let length = Object.keys(row).length
-    console.log(length)
+    // console.log(length)
     if (length > 5) {
       if (concatColumn(columnIndex, length, rowIndex)) {
         if (rowIndex % 5 === 0) {
diff --git a/src/components/DetailComponent/FileComponent.vue b/src/components/DetailComponent/FileComponent.vue
index 359eaa3..f1ec76f 100644
--- a/src/components/DetailComponent/FileComponent.vue
+++ b/src/components/DetailComponent/FileComponent.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form :label-position="labelAlign">
-    <el-form-item label="其他文件" v-if="fileListShow === 'READ' || fileListShow === 'EDIT'" :label-position="labelAlign" label-width="95">
+    <el-form-item :label="title?'其他文件':''" v-if="fileListShow === 'READ' || fileListShow === 'EDIT'" :label-position="labelAlign" :label-width="title?95:''">
       <file-upload @getFile="getOtherFile" v-if="fileListShow === 'EDIT'"/>
       <fvTable style="width: 100%;max-height: 300px;" v-if="processViewer" :tableConfig="tableConfig"
               :data="_value" :isSettingCol="false" :pagination="false">
@@ -50,7 +50,7 @@ const tableConfig = reactive({
       type: 'index',
       label: '序号',
       align: 'center',
-      width: '80',
+      width: 90,
     },
     {
       prop: 'originalFileName',
@@ -66,6 +66,7 @@ const tableConfig = reactive({
       prop: 'size',
       label: '文件大小',
       align: 'center',
+      width: 150,
       currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
     },
     {
diff --git a/src/stores/userstore.js b/src/stores/userstore.js
index 3c74cf6..097a254 100644
--- a/src/stores/userstore.js
+++ b/src/stores/userstore.js
@@ -9,7 +9,7 @@ export const useAuthStore = defineStore('auth', () => {
   const permisstions = ref([])
   const roles = ref([])
   const casToken = (token) => {
-    console.log('getToken()!==token',getToken()!==token)
+    // console.log('getToken()!==token',getToken()!==token)
     let flag=''
     if(getToken()!==token){//切换token
        setToken(token)
diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index 6fe222d..5cb9d99 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -220,6 +220,7 @@ const selected = (select) => {
       item.researchPersonnel = select[0].name
     }
   })
+  userList.value=select
 }
 const getResearchOptions = async () => {
   const res = await getResearchUser()
diff --git a/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue b/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue
index 163e199..eecd401 100644
--- a/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue
+++ b/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue
@@ -13,12 +13,12 @@
           </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>
         <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>
@@ -28,7 +28,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="formData.isSpecialFund">
-          <el-form-item label="专项资金">
+          <el-form-item label="专项资金名称">
             <span>{{ formData.specialFund }}</span>
           </el-form-item>
         </el-col>
diff --git a/src/views/project-management/implementation/phaseDetail.vue b/src/views/project-management/implementation/phaseDetail.vue
index d785850..95cd6b4 100644
--- a/src/views/project-management/implementation/phaseDetail.vue
+++ b/src/views/project-management/implementation/phaseDetail.vue
@@ -1,8 +1,8 @@
 <template>
   <baseTitle title="基础信息"></baseTitle>
   <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" style="margin-left:27px"></fvForm>
-  <baseTitle title="阶段变更详情"></baseTitle>
-  <div style="color: #606266;font-size: 14px;width: 84px;text-align: right">抄送人{{copyName}}</div>
+  <baseTitle title="阶段变更详情" style="margin-top: -10px"></baseTitle>
+  <div style="color: #606266;font-size: 14px;width: 84px;height:25px;text-align: right">抄送人{{copyName}}</div>
   <ApprovalDetail :formData="summaryData.formData" :data="summaryData" type="phase"
                   :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"  v-model:value="auditOpinion"/>
   <opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId"  v-model:value="auditOpinion"></opinion>
diff --git a/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue b/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
index 3de5857..c9a4cb0 100644
--- a/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
+++ b/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
@@ -2,7 +2,7 @@
 <!--  <special-fund-detail :formData="fundData.formData" :data="fundData" :showTable="showTable" :processViewer="fundProcessViewer"-->
 <!--                       :loading="loading"/>-->
 
-  <div v-loading="loading">
+  <div v-loading="loading" style="padding: 0 10px;">
     <baseTitle title="专项资金详情"></baseTitle>
     <el-form :model="formData" ref="form" label-width="auto">
       <el-row>
diff --git a/src/views/project-management/mobledetail/StepsMoblie.vue b/src/views/project-management/mobledetail/StepsMoblie.vue
index dded12f..5fb6999 100644
--- a/src/views/project-management/mobledetail/StepsMoblie.vue
+++ b/src/views/project-management/mobledetail/StepsMoblie.vue
@@ -101,21 +101,21 @@ const schema = computed(() => {
       label: '征集名称',
       prop: 'requirementName',
       colProps: {
-        span: 12
+        span: 24
       }
     },
     {
       label: '所属公司',
       prop: 'affiliatedCompany',
       colProps: {
-        span: 12
+        span: 24
       }
     },
     {
       label: '项目名称',
       prop: 'projectName',
       colProps: {
-        span: 12
+        span: 24
       }
     }
 
diff --git a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
index 45cc9f8..50afca5 100644
--- a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
@@ -9,7 +9,9 @@
         </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>
+            <span>{{
+                localFormData.specialFundId === 0 ? localFormData.specialFund : changeName(fundOption, localFormData.specialFundId)
+              }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -105,7 +107,7 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="经济概算(元)" prop="economicEstimate">
-            <span>{{toThousands( localFormData.economicEstimate )}}</span>
+            <span>{{ toThousands(localFormData.economicEstimate) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -125,21 +127,22 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="需求上报申请书">
-            <el-button type="primary" link @click="handleDownload(localFormData.singleFile)" style="font-size: 16px">
+          <el-form-item label="需求上报申请书" label-position="top" style="display:block;">
+            <!--            style="font-size: 16px"-->
+            <el-button type="primary" link @click="handleDownload(localFormData.singleFile)">
               {{ localFormData.singleFile?.originalFileName }}
             </el-button>
           </el-form-item>
         </el-col>
         <el-col :span="24">
           <file-component
-          title="需求上报附件"
-          tag="需求上报"
-          v-model:value="localFormData.fileList"
-          :processViewer="processViewer"
-          :file-list-show="fileListShow"
-          labelAlign="top"
-        />
+              title="需求上报附件"
+              tag="需求上报"
+              v-model:value="localFormData.fileList"
+              :processViewer="processViewer"
+              :file-list-show="fileListShow"
+              labelAlign="top"
+          />
         </el-col>
         <el-col :span="24">
           <div v-if="data.taskId">
@@ -167,7 +170,8 @@
           </div>
         </div>
         <div class="process">
-          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram" :operation-list="data.operationList"
+          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram"
+                            :operation-list="data.operationList"
                             :state="data.state"/>
           <process-diagram-viewer v-if="processViewer&&changeDiagram" id-name="summaryProcess"/>
         </div>
diff --git a/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue b/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue
index 61a64ab..d1f8948 100644
--- a/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue
+++ b/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-loading="loading">
     <fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>
-    <el-form :model="formData" label-width="auto">
+    <el-form :model="formData" label-width="auto" style="margin-top: -15px">
       <file-component
         :title="getTagName(type)+'附件'"
         :tag="getTagName(type)"
@@ -23,7 +23,7 @@
       </el-form-item>
     </div>
     <div class="approval-record">
-      <div class="approval-title">
+      <div class="approval-title" style="margin-top: -15px">
         <baseTitle title="审批记录"></baseTitle>
         <div class="diagram">
           <div class="base-title">流程图</div>
diff --git a/src/views/project-management/phaseDetailMoblie/index.vue b/src/views/project-management/phaseDetailMoblie/index.vue
index f6625d4..2b16aaa 100644
--- a/src/views/project-management/phaseDetailMoblie/index.vue
+++ b/src/views/project-management/phaseDetailMoblie/index.vue
@@ -2,8 +2,8 @@
   <div style="padding: 0 10px; box-sizing: border-box;">
     <baseTitle title="基础信息"></baseTitle>
     <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
-    <baseTitle title="阶段变更详情"></baseTitle>
-    <div style="color: #606266;font-size: 14px">抄送人：{{copyName}}</div>
+    <baseTitle title="阶段变更详情" style="margin-top: -10px"></baseTitle>
+    <div style="color: #606266;font-size: 14px;height:25px;">抄送人{{copyName}}</div>
     <ApprovalDetailMoblie :formData="summaryData.formData" :data="summaryData" type="phase"
                     :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"  v-model:value="auditOpinion"/>
     <opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId"  v-model:value="auditOpinion"></opinion>
diff --git a/src/views/workflow/process/common/UserPicker.vue b/src/views/workflow/process/common/UserPicker.vue
index 3497021..459236c 100644
--- a/src/views/workflow/process/common/UserPicker.vue
+++ b/src/views/workflow/process/common/UserPicker.vue
@@ -192,13 +192,13 @@ const showUserPicker = () => {
     value: "0"
   };
   dataList.value = [];
-  console.log('_value.value',_value.value)
-  if(props.setNullToSelectList){
-    selectList.value = []
-  }else {
+  // console.log('_value.value',_value.value)
+  // if(props.setNullToSelectList){
+  //   selectList.value = []
+  // }else {
 
     selectList.value =_value.value
-  }
+  // }
   chooseId.value = 0;
   radio.value = 0;
   visible.value = true;

From 87613e81136693c1cf95a3afb4b0ac1357f24871 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 30 Jun 2024 00:10:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E8=AF=A6=E6=83=85=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../share/moblieDetail/AllocationSummaryDetailMoblie.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue b/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue
index 0a27000..98b1851 100644
--- a/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue
+++ b/src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>
+<!--  <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>-->
   <el-table ref="table" :data="tableData" style="width: 100%;height: 479px" :show-summary="true" border
             :summary-method="getSummaries" v-loading="loading" :header-cell-style="{background:'#f5f7fa'}">
     <el-table-column type="index" label="序号" align="center" width="60"/>