Browse Source

fix: 修改合同数据格式

hotchicken1996 1 year ago
parent
commit
ef42f93a3e

+ 5 - 1
client/src/service/contract.ts

@@ -21,13 +21,17 @@ export const getContractsById = async (contractId: ContractId): Promise<Contract
  * @param projectId
  */
 export const getContractsByProject = async (projectId: ProjectId): Promise<Contract> => {
-  return await request.get(
+  const data = await request.get(
     {
       url: '/contract-with-children',
       params: { projectId }
     },
     '/business'
   )
+  if ((data?.length ?? 0) === 0) {
+    return data
+  }
+  return data?.find((item) => item?.flowStatus === 90) ?? data?.[0]
 }
 
 /**

+ 0 - 4
client/src/views/OaSystem/projectCenter/projectDetail/components/xmht/ContractMilestone.vue

@@ -28,7 +28,6 @@ const { data: contractMilestoneList } = useQuery(
           <th>已回款金额(元)</th>
           <th>预计到款时间</th>
           <th>说明</th>
-          <th>操作</th>
         </tr>
       </thead>
       <tbody>
@@ -40,9 +39,6 @@ const { data: contractMilestoneList } = useQuery(
           <td>{{ item['actualReturnAmount'] }}</td>
           <td>{{ item['planReturnTime'] }}</td>
           <td>{{ item['description'] }}</td>
-          <td>
-            <span>开票申请</span>
-          </td>
         </tr>
       </tbody>
     </table>

+ 4 - 2
client/src/views/OaSystem/projectCenter/projectDetail/components/xmht/index.vue

@@ -2,7 +2,7 @@
   <div class="_ContractDetail_xmxx">
     <div class="header">
       <ul>
-        <template v-if="contractDetail['children'].length > 0">
+        <template v-if="(contractDetail?.['children']?.length ?? 0) !== 0">
           <li
             :class="{ active: contractInfoIndex === 0 }"
             @click="switchContractInfo(contractDetail, 0)"
@@ -35,6 +35,7 @@
             <li>用款申请</li>
             <li @click="handleStartSubcontract">分包申请</li>
             <li @click="handleStartOutsourcing">外包申请</li>
+            <li>开票申请</li>
           </ul>
           <table>
             <tr>
@@ -275,7 +276,7 @@
           <table>
             <tr>
               <td class="th">付款条件:</td>
-              <td colspan="3">{{ contractDetail['paymentTerms'] }}</td>
+              <td colspan="3">{{ contractDetail?.['paymentTerms'] ?? '' }}</td>
             </tr>
           </table>
         </div>
@@ -339,6 +340,7 @@ const { refetch } = useQuery(
   async () => await getContractsByProject(unref(_mainProjectId)),
   {
     onSuccess: (tData) => {
+      console.log('tData: ', tData)
       contractDetail.value = tData
     }
   }