优化合同

client/.env.base

@@ -11,6 +11,9 @@ VITE_UPLOAD_URL='/infra/file/upload'
 # File上传路径
 VITE_FILE_BASE_URI='/infra/file'
 
+# 流程详情页面路径
+VITE_PROCESS_DETAIL_URI = 'http://localhost:6090'
+
 # 接口前缀
 VITE_API_BASEPATH=/dev-api
 

client/.env.dev

@@ -10,6 +10,9 @@ VITE_BASE_URL='http://10.10.10.7:48080'
 # 上传路径
 VITE_UPLOAD_URL='/infra/file/upload'
 
+# 流程详情页面路径
+VITE_PROCESS_DETAIL_URI = 'http://localhost:6090'
+
 # 接口前缀
 VITE_API_BASEPATH=/dev-api
 

client/src/views/OaSystem/projectCenter/projectDetail/components/xmht/index.vue

@@ -1,21 +1,19 @@
 <template>
   <div class="_ContractDetail_xmxx form-disabled-style">
     <div class="header">
-      <ul>
-        <template v-if="(contractDetail?.['children']?.length ?? 0) !== 0">
-          <li
-            :class="{ active: contractInfoIndex === 0 }"
-            @click="switchContractInfo(contractDetail, 0)"
-            >主合同
-          </li>
-          <li
-            v-for="(item, index) in contractDetail['children']"
-            :class="{ active: contractInfoIndex === index + 1 }"
-            :key="index"
-            @click="switchContractInfo(item, index + 1)"
-            >分包合同
-          </li>
-        </template>
+      <ul v-if="(contractDetail?.['children']?.length ?? 0) !== 0">
+        <li
+          :class="{ active: contractInfoIndex === 0 }"
+          @click="switchContractInfo(contractDetail, 0)"
+          >主合同
+        </li>
+        <li
+          v-for="(item, index) in contractDetail['children']"
+          :class="{ active: contractInfoIndex === index + 1 }"
+          :key="index"
+          @click="switchContractInfo(item, index + 1)"
+          >分包合同
+        </li>
       </ul>
     </div>
     <div class="content">
@@ -218,9 +216,9 @@
           </table>
         </div>
         <!-- 合同里程碑 -->
-        <ContractMilestone :contractId="contractDetail?.['id']" />
+        <ContractMilestone :contractId="contractDetail?.id" />
         <!-- 回款 -->
-        <ContractReturnedMoney :contractId="contractDetail?.['id']" />
+        <ContractReturnedMoney :contractId="contractDetail?.id" />
       </template>
       <template v-else>
         <div class="titleBox">
@@ -334,6 +332,7 @@ import ContractReturnedMoney from '@/views/OaSystem/projectCenter/projectDetail/
 import ContractSharing from '@/views/OaSystem/projectCenter/projectDetail/components/xmht/ContractSharing.vue'
 import { getContractsByProject, putContract } from '@/service/contract'
 import { useQuery, useMutation } from '@tanstack/vue-query'
+import { Contract } from '@/interface/contract'
 import { ref } from 'vue'
 
 defineOptions({ name: 'XmhtComp' })
@@ -391,8 +390,8 @@ const secondTypeList = shallowReactive<TypeSelectInterface[]>([
   }
 ])
 const editor = ref<Boolean>(false)
-const contractDetail = ref({
-  contractNumber: ''
+const contractDetail = ref<Contract>({
+  id: ''
 })
 
 const handleEdit = () => {
@@ -416,7 +415,6 @@ const { refetch } = useQuery(
   async () => await getContractsByProject(unref(_mainProjectId)),
   {
     onSuccess: (tData) => {
-      console.log('tData: ', tData)
       contractDetail.value = tData
     }
   }

client/src/views/OaSystem/projectCenter/projectDetail/projectDetail.vue

@@ -36,7 +36,7 @@
           <li v-if="projectDetail?.['xmzt'] === 1" @click="editorProjectState(3)">中止</li>
           <li v-if="projectDetail?.['xmzt'] === 4" @click="editorProjectState(2)">结项</li>
           <li v-if="projectDetail?.['xmzt'] === 3" @click="editorProjectState(1)">恢复</li>
-          <li>查看流程</li>
+          <li @click="processLookHandle">查看流程</li>
         </ul>
       </div>
       <div>
@@ -137,6 +137,23 @@ const { data: projectDetail } = useQuery(
     enabled: (query?.id ?? '') !== ''
   }
 )
+/**
+ * 流程查看
+ */
+const processLookHandle = () => {
+  router.push({
+    path: '/processLook',
+    query: {
+      url: `${
+        import.meta.env.VITE_PROCESS_DETAIL_URI
+      }/IFlowInstance/redirectFlowPage?flowInstanceId=018d59d0f09f0a07ad8e8d3e98270145`
+
+      //   url: `${
+      //   import.meta.env.PROCESS_DETAIL_URI
+      // }/IFlowInstance/redirectFlowPage?flowInstanceId=${projectDetail.value?.instanceId}`
+    }
+  })
+}
 /***
  * 查询合同数据
  * **/