Merge pull request 'fix : 修复需求上报/详情下流程渲染' (#215) from dj into master

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

src/components/DetailComponent/CollectionDetail.vue

@@ -74,10 +74,8 @@ import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.v
 import {matterTree} from '@/utils/matterTree.js';
 import {downloadFile} from "@/api/project-demand";
 
-const emit = defineEmits(['getInfo'])
+const emit = defineEmits(['getInfo',"update:formData"])
 const form = ref()
-const showForm = ref(true)
-const loading = ref(false)
 const showTable = ref(false)
 const companyNameArray = ref([])
 
@@ -97,7 +95,10 @@ const props = defineProps({
   companyOption: {
     type: Array,
     default: []
-  },
+  }, loading: {
+    type: Boolean,
+    default: false
+  }
 })
 const tableConfig = reactive({
   columns: [
@@ -136,10 +137,6 @@ const tableConfig = reactive({
     }
   ]
 })
-
-const getInfo = () => {
-  emit('getInfo')
-}
 const handleDownload = (row) => {
   downloadFile(row.fileId).then(res => {
     const blob = new Blob([res])
@@ -152,28 +149,26 @@ const handleDownload = (row) => {
 const getDataSourceOptionItem = (val) => {
   if (val instanceof Array) {
     val.forEach(item => {
-      matterTree(companyNameArray.value,props.companyOption, item)
+      matterTree(companyNameArray.value, props.companyOption, item)
     })
   }
-  return companyNameArray.value.join('，');
+  let uniqueArr = Array.from(new Set(companyNameArray.value));
+  return uniqueArr.join('，');
 }
-watch(() => props.companyOption, (newVal) => {
-  props.companyOption=newVal
+
+watch(() => props.loading, (newVal) => {
+  props.loading = newVal
 }, {deep: true})
-watch(() => props.formData, (newVal) => {
-  if (newVal) {
-    newVal.companyIds = getDataSourceOptionItem(newVal.companyIds)
-    props.formData=newVal
-  }
+
+watch(() => props.companyOption, (newVal) => {
+  props.companyOption = newVal
+}, {deep: true})
+watch(() => props.formData.companyIds, (newVal) => {
+  props.formData.companyIds = getDataSourceOptionItem(newVal)
 }, {deep: true})
 watch(() => props.processViewer, (newVal) => {
   props.processViewer = newVal
 }, {deep: true})
-onMounted(() => {
-  loading.value = true
-  getInfo()
-  loading.value = false
-})
 </script>
 
 <style scoped>

src/components/DetailComponent/SummaryDetail.vue

@@ -1,158 +1,183 @@
 <template>
-  <el-form :model="localFormData" ref="summaryForm">
-    <el-row gutter="50">
-      <el-col :span="12">
-        <el-form-item label="名称" prop="requirementName">
-          <span>{{ localFormData.requirementId }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="专项资金" prop="specialFund">
-          <span>{{ localFormData.specialFund }}</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-form-item label="结束时间" prop="endTime">
-          <span>{{ formData.endTime }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="所属公司" prop="companyName">
-          <span>{{ localFormData.companyName }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="项目类型" prop="projectType">
-          <span>{{ localFormData.projectType }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="结束时间" prop="endTime">
-          <span>{{ localFormData.endTime }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="出资类型" prop="investmentType">
-          <span>{{ localFormData.investmentType }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="项目影响" prop="projectImpact">
-          <span>{{ localFormData.projectImpact }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="所属业务板块" prop="businessSegment">
-          <span>{{ localFormData.businessSegment }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="预期成果形式" prop="resultForm">
-          <span>{{ localFormData.resultForm }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="预期技术标准制定" prop="technicalStandard">
-          <span>{{ localFormData.technicalStandard }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="产学研联合" prop="industryUniversityResearch">
-          <span>{{ localFormData.industryUniversityResearch }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="开展政府申报" prop="governmentDeclaration">
-          <span>{{ localFormData.governmentDeclaration }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="知识产权状况" prop="intellectualProperty">
-          <span>{{ localFormData.intellectualProperty }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="发明专利(项)" prop="inventionPatent">
-          <span>{{ localFormData.inventionPatent }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="实用性新型专利(项)" prop="newPatent">
-          <span>{{ localFormData.newPatent }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="软件著作权(项)" prop="softwareCopyright">
-          <span>{{ localFormData.softwareCopyright }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="著作权(项)" prop="copyright">
-          <span>{{ localFormData.copyright }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="其他(项)" prop="other">
-          <span>{{ localFormData.other }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="经济概算(万元)" prop="economicEstimate">
-          <span>{{ localFormData.economicEstimate }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="其中申请公司总部科技创新专项资金(万元)" prop="specialFundAmount">
-          <span>{{ localFormData.specialFundAmount }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="现有业务描述" prop="serviceDescription">
-          <span>{{ localFormData.serviceDescription }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="研发项目关键内容描述" prop="contentDescription">
-          <span>{{ localFormData.contentDescription }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="需求上报申请书">
-          <el-button type="primary" link @click="handleDownload(localFormData.singleFile)">{{localFormData.singleFile?.originalFileName}}</el-button>
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="需求上报附件">
-          <fvTable style="width: 100%;max-height: 400px;" v-if="processViewer" :tableConfig="tableConfig"
-                   :data="localFormData.fileList" :isSettingCol="false" :pagination="false">
-            <template #empty>
-              <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-            </template>
-          </fvTable>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <div class="approval-record">
-      <baseTitle title="审批记录"></baseTitle>
-      <div class="process">
-        <operation-render v-if="processViewer" :operation-list="data.operationList"
-                          :state="data.state"/>
-        <process-diagram-viewer v-if="processViewer"/>
+  <div class="detail-block" v-loading="loading">
+    <el-form :model="localFormData" ref="summaryForm" :rules="rules">
+      <el-row gutter="50">
+        <el-col :span="12">
+          <el-form-item label="名称" prop="projectName">
+            <span>{{ localFormData.projectName }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="专项资金" prop="specialFund">
+            <span>{{ localFormData.specialFund }}</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-form-item label="结束时间" prop="endTime">
+            <span>{{ formData.endTime }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="所属公司" prop="companyName">
+            <span>{{ localFormData.companyName }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目类型" prop="projectType">
+            <span>{{ localFormData.projectType }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="研发主体" prop="rdSubject">
+            <span>{{ localFormData.rdSubject }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="出资类型" prop="investmentType">
+            <span>{{ localFormData.investmentType }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目影响" prop="projectImpact">
+            <span>{{ localFormData.projectImpact }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="所属业务板块" prop="businessSegment">
+            <span>{{ localFormData.businessSegment }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="预期成果形式" prop="resultForm">
+            <span>{{ localFormData.resultForm }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="预期技术标准制定" prop="technicalStandard">
+            <span>{{ localFormData.technicalStandard }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="产学研联合" prop="industryUniversityResearch">
+            <span>{{ localFormData.industryUniversityResearch }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="开展政府申报" prop="governmentDeclaration">
+            <span>{{ localFormData.governmentDeclaration }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="知识产权状况" prop="intellectualProperty">
+            <span>{{ localFormData.intellectualProperty }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="发明专利(项)" prop="inventionPatent">
+            <span>{{ localFormData.inventionPatent }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实用性新型专利(项)" prop="newPatent">
+            <span>{{ localFormData.newPatent }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="软件著作权(项)" prop="softwareCopyright">
+            <span>{{ localFormData.softwareCopyright }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="著作权(项)" prop="copyright">
+            <span>{{ localFormData.copyright }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="其他(项)" prop="other">
+            <span>{{ localFormData.other }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="经济概算(万元)" prop="economicEstimate">
+            <span>{{ localFormData.economicEstimate }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="其中申请公司总部科技创新专项资金(万元)" prop="specialFundAmount">
+            <span>{{ localFormData.specialFundAmount }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="现有业务描述" prop="serviceDescription">
+            <span>{{ localFormData.serviceDescription }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="研发项目关键内容描述" prop="contentDescription">
+            <span>{{ localFormData.contentDescription }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="需求上报申请书">
+            <el-button type="primary" link @click="handleDownload(localFormData.singleFile)">
+              {{ localFormData.singleFile?.originalFileName }}
+            </el-button>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="需求上报附件">
+            <fvTable style="width: 100%;max-height: 400px;" v-if="processViewer" :tableConfig="tableConfig"
+                     :data="localFormData.fileList" :isSettingCol="false" :pagination="false">
+              <template #empty>
+                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+              </template>
+            </fvTable>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <div v-if="data.taskId">
+            <baseTitle title="审核意见"></baseTitle>
+            <el-form-item prop="auditOpinion">
+              <el-input
+                  v-model="localFormData.auditOpinion"
+                  :rows="3"
+                  type="textarea"
+                  placeholder="请输入审核意见"
+              />
+            </el-form-item>
+          </div>
+        </el-col>
+      </el-row>
+      <div class="approval-record">
+        <baseTitle title="审批记录"></baseTitle>
+        <div class="process">
+          <operation-render v-if="processViewer" :operation-list="data.operationList"
+                            :state="data.state"/>
+        </div>
       </div>
-    </div>
-  </el-form>
 
+      <div class="oper-page-btn" v-if="data.state === '1' && data.taskId">
+        <el-button @click="handleReject(summaryForm)">驳回</el-button>
+        <el-button color="#DED0B2" @click="handleAgree">同意</el-button>
+      </div>
+    </el-form>
+  </div>
 </template>
 
 <script setup lang="jsx">
 import {downloadFile} from "@/api/project-demand";
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
+import {ElMessage, ElNotification} from "element-plus";
+import {agreeTask, rejectTask} from "@/api/project-demand";
+import {useTagsView} from '@/stores/tagsview.js'
+
+const tagsViewStore = useTagsView()
 const props = defineProps({
   formData: {
     type: Object,
@@ -165,7 +190,10 @@ const props = defineProps({
   processViewer: {
     type: Boolean,
     default: false
-  },
+  }, loading: {
+    type: Boolean,
+    default: false
+  }
 })
 const localFormData = ref({})
 const tableConfig = reactive({
@@ -205,25 +233,78 @@ const tableConfig = reactive({
     }
   ]
 })
-
+const router = useRouter()
+const summaryForm = ref()
+const rules = reactive({
+  auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}],
+})
+const handleReject = (instance) => {
+  if (!instance) return
+  instance.validate(async (valid) => {
+    if (!valid) return
+    let approve = {
+      taskId: props.data.taskId,
+      auditOpinion: localFormData.value.auditOpinion,
+    }
+    rejectTask(approve).then(res => {
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: res.code === 1000 ? 'success' : 'error'
+      })
+      if (res.code === 1000) {
+        tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+        router.push({
+          name: 'Summary'
+        })
+      }
+    })
+  })
+}
+const handleAgree = () => {
+  let approve = {
+    taskId: props.data.taskId,
+    auditOpinion: localFormData.value.auditOpinion,
+    formData: localFormData.value
+  }
+  agreeTask(approve).then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    if (res.code === 1000) {
+      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+      router.push({
+        name: 'Summary'
+      })
+    }
+  })
+}
 const handleDownload = (row) => {
   downloadFile(row.fileId).then(res => {
     const blob = new Blob([res])
     let a = document.createElement('a')
-    a.href=URL.createObjectURL(blob)
+    a.href = URL.createObjectURL(blob)
     a.download = row.originalFileName
     a.click()
   })
 }
 
 watch(
-  ()=>props.formData,
-  (val)=>{
-    console.log(val, 'ssss');
-  }
+    () => props.formData,
+    (val) => {
+      console.log(val, 'ssss');
+    }
 )
+watch(() => props.processViewer, (newVal) => {
+  props.processViewer = newVal
+}, {deep: true})
+watch(() => props.loading, (newVal) => {
+  props.loading = newVal
+}, {deep: true})
 
-watchEffect(()=>{
+watchEffect(() => {
   Object.keys(props.formData).length && (localFormData.value = props.formData)
 })
 </script>
@@ -233,4 +314,10 @@ watchEffect(()=>{
   height: auto !important;
 }
 
+.detail-block {
+  overflow-x: hidden;
+  overflow-y: auto;
+  padding-bottom: 20px;
+}
+
 </style>

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="detail-block">
+  <div class="detail-block" v-loading="loading">
     <baseTitle title="需求上报"></baseTitle>
     <el-form :model="formData" ref="summaryForm" :rules="rules">
       <el-row gutter="50">
@@ -223,6 +223,13 @@
                       @getAttachment="getAttachment"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" :preview="router.currentRoute.value.name === 'Summary/edit'"/>
     <!--  <fvForm :schema="schame" @getInstance="getInstance"></fvForm>-->
+    <div class="approval-record">
+      <baseTitle title="流程"></baseTitle>
+      <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
+      <!--      <div class="process" id="approvalRecord">-->
+      <!--        <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>-->
+      <!--      </div>-->
+    </div>
     <div class="oper-page-btn">
       <el-button type="primary" @click="staging">存为草稿</el-button>
       <el-button type="primary" @click="handleSubmit(summaryForm)">发布</el-button>
@@ -236,12 +243,16 @@ import {getDetail, getProcessInfo, requirementReported, resubmitReported} from "
 import {ElMessage, ElNotification} from "element-plus";
 import {useTagsView} from '@/stores/tagsview.js'
 import {useCacheStore} from '@/stores/cache.js'
+import {useProcessStore} from '@/stores/processStore.js';
 import {getSubCompOpt} from "@/api/user/user";
-
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
 const cacheStore = useCacheStore()
+const processStore = useProcessStore()
 const router = useRouter()
 const route = useRoute()
 const name=ref(router.currentRoute.value.name)
+const loading = ref(false)
+const processDiagramViewer = ref(false)
 const tagsViewStore = useTagsView()
 const companyOption = ref([])
 const summaryForm = ref()
@@ -430,6 +441,7 @@ const getDetailInfo = async () => {
     })
     if (res.code === 1000) {
       formData.value = res.data.formData
+      loading.value=false
     }
   })
 }
@@ -445,20 +457,30 @@ const init = async () => {
     if (res.code === 1000) {
       let data = res.data
       deploymentId.value = data.deploymentId
+      processStore.setDesign(data)
+      processStore.runningList.value = data.runningList;
+      processStore.endList.value = data.endList;
+      processStore.noTakeList.value = data.noTakeList;
+      processStore.refuseList.value = data.refuseList;
+      processStore.passList.value = data.passList;
+      nextTick(() => {
+        processDiagramViewer.value = true
+      })
     }
   })
 }
 onMounted(async () => {
+  loading.value=true
   await init()
   if (route.query.projectId) {
     await getDetailInfo()
   }
+
 })
 const staging = async () => {
 }
 </script>
 <style lang="scss" scoped>
-
 .detail-block {
   overflow: hidden;
   padding-bottom: 30px;

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

@@ -2,9 +2,9 @@
   <steps :active="active" @setDetail="setDetail" @stepChange="stepChange">
     <template #content>
       <collection-detail v-show="showActive == '00'" :formData="summaryData.formData" :data="summaryData"
-                         :processViewer="summaryProcessViewer" :companyOption="companyOption" />
+                         :processViewer="summaryProcessViewer" :companyOption="companyOption" :loading="loading"/>
       <summary-detail v-show="showActive == '10'" :formData="summaryData.formData" :data="summaryData"
-                      :processViewer="summaryProcessViewer"/>
+                      :processViewer="summaryProcessViewer" :loading="loading"/>
     </template>
   </steps>
 </template>
@@ -20,6 +20,7 @@ const route = useRoute()
 const companyOption = ref([])
 const summaryData = ref({})
 const summaryProcessViewer = ref(true)
+const loading = ref(false)
 const processStore = useProcessStore()
 const active = ref(route.query.state)
 const showActive = ref()
@@ -31,8 +32,10 @@ const getInfo = async (state) => {
   const projectId = route.query.projectId
   await getCompanyOption()
   summaryProcessViewer.value = false
+  loading.value = true
   const {code, data} = await getMapProjectStateInfo(projectId, state)
   summaryData.value = data;
+  loading.value = false
   processStore.setDesign(data)
   processStore.runningList.value = data.runningList;
   processStore.endList.value = data.endList;