Merge remote-tracking branch 'origin/master'

src/views/project/debit/contract/check-list.vue

@@ -572,7 +572,7 @@ const tableColumn = ref([
     { key: 'changePrice', name: '变更后单价' },
     { key: 'changeTotal', name: '变更后数量' },
     { key: 'changeMoney', name: '变更后金额' },
-    { key: 'isSupplement', name: '是否增补' },
+    { key: 'isSupplementName', name: '是否增补' },
 ])
 const tableData = ref([])
 

src/views/project/debit/project/pay.vue

@@ -61,7 +61,14 @@
                             :column="tableCollectColumn" :datas="tableCollectData" :loading="tableCollectLoading"
                             is-new :check-style="{ width: 29 }" :index-style="{ width: 60 }"
                             is-check @selection-change="tableCollectCheckChange"
-                        />
+                        >
+                            <template #isDeduct="{ row }">
+                                <span>{{ row?.isDeduct === 1 ? '是' : '否' }}</span>
+                            </template>
+                            <template #isTotalTerms="{ row }">
+                                <span>{{ row?.isTotalTerms === 1 ? '是' : '否' }}</span>
+                            </template>
+                        </hc-table>
                     </hc-body>
                 </div>
             </div>