Explorar o código

分外包详情

songxy hai 1 ano
pai
achega
38924f6c4a

+ 4 - 0
client/src/interface/contract.ts

@@ -33,6 +33,10 @@ export interface Contract {
    * 分包和外包合同
    */
   children?: ExtraConstract[]
+  /**
+   * 分包和外包合同
+   */
+  contractSubList?: ExtraConstract[]
   /**
    * 委托方id
    */

+ 16 - 18
client/src/views/OaSystem/projectCenter/projectDetail/components/xmht/index.vue

@@ -16,7 +16,7 @@
       </el-select>
       <template v-else>
         <ul
-          v-if="mContractDetail['children'] && mContractDetail['children'].length > 0"
+          v-if="mContractDetail['contractSubList'] && mContractDetail['contractSubList'].length > 0"
           class="contractTagList"
         >
           <li
@@ -25,12 +25,12 @@
             >主合同
           </li>
           <li
-            v-for="(item, index) in mContractDetail['children']"
+            v-for="(item, index) in mContractDetail['contractSubList']"
             :key="index"
             :class="{ active: contractInfoIndex === index && contractMainType == 'child' }"
             @click="switchContractInfo(index, 'child')"
           >
-            {{ item.contractType == 2 ? '分包合同' : item.contractType == 3 ? '外包合同' : '' }}
+            {{ item.contractType == 1 ? '分包合同' : '外包合同' }}
           </li>
         </ul>
       </template>
@@ -413,7 +413,7 @@
           <span class="tag">未付清</span>
         </div>
         <div class="tableBox tableBox—first">
-          <h4><i class="icon"></i>基本信息</h4>
+          <h4 class="td_title"><i class="icon"></i>基本信息</h4>
           <ul>
             <li v-if="roles.indexOf('contract_edit') !== -1" @click="handleEditor">
               {{ editor ? '保存' : '编辑' }}合同
@@ -433,17 +433,17 @@
               用款申请
             </li>
           </ul>
-          <table v-if="cContractDetail?.contractType == 2">
+          <table v-if="cContractDetail?.contractType == 1">
             <tr>
               <td class="th">分包理由:</td>
               <td colspan="3">
-                <el-input v-model="cContractDetail.subReason" :disabled="!editor" />
+                <el-input v-model="cContractDetail.reason" :disabled="!editor" />
               </td>
             </tr>
             <tr>
               <td class="th">分包金额(元):</td>
               <td>
-                <el-input v-model="cContractDetail.subAmount" :disabled="!editor" />
+                <el-input v-model="cContractDetail.contractAmount" :disabled="!editor" />
               </td>
               <td class="th">供应商:</td>
               <td>
@@ -511,13 +511,13 @@
             <tr>
               <td class="th">外包包理由:</td>
               <td colspan="3">
-                <el-input v-model="cContractDetail.subReason" :disabled="!editor" />
+                <el-input v-model="cContractDetail.reason" :disabled="!editor" />
               </td>
             </tr>
             <tr>
               <td class="th">外包金额(元):</td>
               <td>
-                <el-input v-model="cContractDetail.subAmount" :disabled="!editor" />
+                <el-input v-model="cContractDetail.contractAmount" :disabled="!editor" />
               </td>
               <td class="th">供应商:</td>
               <td>
@@ -551,7 +551,7 @@
           </table>
         </div>
         <div class="tableBox">
-          <h4><i class="icon"></i>验收信息</h4>
+          <h4 class="td_title"><i class="icon"></i>验收信息</h4>
           <table>
             <tr>
               <td class="th">付款条件:</td>
@@ -560,7 +560,7 @@
           </table>
         </div>
         <div class="tableBox">
-          <h4><i class="icon"></i>财务信息</h4>
+          <h4 class="td_title"><i class="icon"></i>财务信息</h4>
           <table>
             <tr>
               <td class="th">已付款金额(元):</td>
@@ -643,10 +643,8 @@ const { refetch } = useQuery(
   {
     onSuccess: (tData: Contract[]) => {
       for (const contract of tData) {
-        if (contract.children && contract.children.length > 0) {
-          childrenContracts.value = contract.children.filter((child) => {
-            return child?.contractType !== 4
-          })
+        if (contract.contractSubList && contract.contractSubList.length > 0) {
+          childrenContracts.value = contract.contractSubList
           for (let i = 0; i < childrenContracts.value.length; i++) {
             const item = childrenContracts.value[i]
             if (item['id'] === contractId) {
@@ -693,15 +691,15 @@ const { data: assigneeTree } = useQuery(['assigneeTree'], async () => await quer
 const contractInfoIndex = ref<number>(0)
 const contractMainType = ref<string>('main')
 const switchContractInfo = (key: number, type: string): void => {
-  contractMainType.value = type
-  contractInfoIndex.value = key
   if (type === 'main') {
     //主合同
     mContractDetail.value = mContractDetails.value[key]
   } else {
-    cContractDetail.value = mContractDetail['children'][key]
+    cContractDetail.value = mContractDetail.value?.contractSubList[key]
     queryContractPaymentCalcMutate(cContractDetail.value.id)
   }
+  contractMainType.value = type
+  contractInfoIndex.value = key
 }
 
 const saveContractHandle = () => {