Merge pull request 'master' (#658) from master into prod

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

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
@@ -35,7 +35,7 @@
           <el-form-item label="项目负责人" :required="true" prop=""
                         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 }}
@@ -48,7 +48,7 @@
           <el-form-item label="项目成员" :required="true" prop=""
                         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 }}
@@ -61,7 +61,7 @@
           <el-form-item label="部门分管领导"
                         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 }}
@@ -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,7 +94,7 @@
                       :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>-->
 <!--          <div v-else></div>-->
           <baseTitle title="审批记录"></baseTitle>
@@ -732,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/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

@@ -2,7 +2,7 @@
   <div class="apply-block" v-loading="loading">
     <baseTitle title="项目基本信息"></baseTitle>
     <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" ></fvForm>
-    <baseTitle title="阶段变更信息"></baseTitle>
+    <baseTitle title="阶段变更信息" style="margin-top: -10px"></baseTitle>
     <el-form :model="formData" label-width="auto">
       <el-form-item label="抄送人员" label-width="105">
         <Ttsup :modelValue="chooseUserInfo()" @clickCopyUser="chooseUser"/>
@@ -14,7 +14,7 @@
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" tag="阶段变更"
                       :preview="name === 'Phase/edit'"/>
     <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>