Merge pull request 'fix : 修复年度计划创建及状态' (#580) from dd into master

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

src/components/DetailComponent/SummaryDetail.vue

@@ -149,7 +149,7 @@
                           :file-list-show="fileListShow"/>
         </el-col>
         <el-col :span="24">
-          <div v-if="data.taskId||data.state==='5'">
+          <div v-if="data.taskId||data.state==='4'">
             <baseTitle title="审核意见"></baseTitle>
             <el-form-item prop="_value">
               <el-input
@@ -182,7 +182,7 @@
       </div>
     </el-form>
 
-    <div class="oper-page-btn" v-perm="['annual:plan:approve']" v-if="data.state==='5'">
+    <div class="oper-page-btn" v-perm="['annual:plan:approve']" v-if="data.state==='4'">
       <el-button type="danger" @click="handleRejectPlan">驳回年度计划</el-button>
       <el-button color="#DED0B2" @click="handleAgreePlan">通过年度计划</el-button>
     </div>

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

@@ -3,10 +3,11 @@
   <collection-detail :formData="collectData.formData" :data="collectData" type="singleDetail"
                      :fileListShow="fileListShow"
                      :processViewer="processViewer" :loading="loading" v-model:value="auditOpinion"/>
-<!--  <div class="oper-page-btn" v-if="collectData.state==4">-->
+  <div class="oper-page-btn" v-if="collectData.formData?.report">
-<!--  <el-button color="#DED0B2" @click="handleDemandReport">需求上报</el-button>-->
+    <el-button color="#DED0B2" @click="handleDemandReport">需求上报</el-button>
-<!--  </div>-->
+  </div>
-  <opinion v-if="collectData.taskId" :formData="formData" :taskId="collectData.taskId"  v-model:value="auditOpinion"></opinion>
+  <opinion v-if="collectData.taskId" :formData="formData" :taskId="collectData.taskId"
+           v-model:value="auditOpinion"></opinion>
 </template>
 
 <script setup lang="jsx">
@@ -35,7 +36,7 @@ const collectData = ref([])
 const formData = ref({})
 const companyOption = ref([])
 const companyNameArray = ref([])
-const handleDemandReport=()=>{
+const handleDemandReport = () => {
   router.push({
     name: 'Summary/add',
     query: {
@@ -74,9 +75,9 @@ const init = async () => {
     }
     loading.value = false
     let data = res.data
-    if(data.formData.companyIds[0]==-1){
+    if (data.formData.companyIds[0] == -1) {
       data.formData.companyIds = ['所有公司']
-    }else {
+    } else {
       data.formData.companyIds = getCompanyOptionItem(data.formData.companyIds)
     }
     collectData.value = data
@@ -98,7 +99,7 @@ const init = async () => {
     nextTick(() => {
       processViewer.value = true
       showTable.value = true
-      if (data.formPermMap&&data.formPermMap["fileList"]) {
+      if (data.formPermMap && data.formPermMap["fileList"]) {
         fileListShow.value = data.formPermMap["fileList"].perm
       }
     })

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

@@ -286,7 +286,7 @@ const headBtnClick = (key) => {
       handleAdd()
       break;
     case 'export':
-      handleExport()
+      createAnnualPlan()
       break;
   }
 }
@@ -298,7 +298,7 @@ const selectionChange = (data) => {
   })
   projectSelectList.value = data
 }
-const handleExport = () => {
+const createAnnualPlan = () => {
   let projectIds = []
   projectSelectList.value.map(item => {
     projectIds.push(item.projectId)

src/views/workflow/common/OperationRender.vue

@@ -89,7 +89,7 @@ const init = () => {
         context: '审批进行中'
       }
       break
-    case '5':
+    case '4':
       timeline.value = {
         color: '#f78f5f',
         icon: 'MoreFilled',
@@ -110,14 +110,7 @@ const init = () => {
         context: '审核已驳回'
       }
       break
-    case '4':
+    case '5':
-      timeline.value = {
-        color: '#0bbd87',
-        icon: 'CircleCheckFilled',
-        context: '审批通过'
-      }
-      break
-    case '6':
       timeline.value = {
         color: '#0bbd87',
         icon: 'CircleCheckFilled',