Merge remote-tracking branch 'origin/master'

src/views/debit-pay/material/periods.vue

@@ -44,18 +44,18 @@
                 </template>
                 <hc-table :column="tableEditColumn" :datas="tableEditData" is-new is-current-row :index-style="{ width: 60 }" :loading="tableEditLoading" @row-click="hangeRow">
                     <template #periodNumber="{ row }">
-                        <hc-table-input v-model="row.periodNumber" is-new :index-style="{ width: 60 }" :disabled="row.isLock === 1" />
+                        <hc-table-input v-model="row.periodNumber" is-new :index-style="{ width: 60 }" :disabled="row.isLock === 1 || row?.citeStatus === 1" />
                     </template>
                     <template #periodName="{ row }">
-                        <hc-table-input v-model="row.periodName" is-new :index-style="{ width: 60 }" :disabled="row.isLock === 1" />
+                        <hc-table-input v-model="row.periodName" is-new :index-style="{ width: 60 }" :disabled="row.isLock === 1 || row?.citeStatus === 1" />
                     </template>
                     <template #periodYear="{ row }">
-                        <el-select v-model="row.periodYear" placeholder="选择年份" filterable block :disabled="row.isLock === 1">
+                        <el-select v-model="row.periodYear" placeholder="选择年份" filterable block :disabled="row.isLock === 1 || row?.citeStatus === 1">
                             <el-option v-for="item in yearData" :key="item" :label="item" :value="item" />
                         </el-select>
                     </template>
                     <template #periodMonth="{ row }">
-                        <el-select v-model="row.periodMonth" placeholder="选择月份" filterable block :disabled="row.isLock === 1">
+                        <el-select v-model="row.periodMonth" placeholder="选择月份" filterable block :disabled="row.isLock === 1 || row?.citeStatus === 1">
                             <el-option v-for="item in monthData" :key="item" :label="item" :value="item" />
                         </el-select>
                     </template>
@@ -219,9 +219,11 @@ const editModalSave = async () => {
         saveLoading.value = false
         if (!error && code === 200) {
             window?.$message?.success(msg)
+            getTableData()
+            editModalClose()
         }
-        getTableData()
-    editModalClose()
+     
+   
 }
 const editModalClose = () => {
     editModalShow.value = false

src/views/debit-pay/start-work/period.vue

@@ -44,18 +44,18 @@
                 </template>
                 <hc-table :column="tableEditColumn" :datas="tableEditData" is-new is-current-row :index-style="{ width: 60 }" :loading="tableEditLoading" @row-click="hangeRow">
                     <template #periodNumber="{ row }">
-                        <hc-table-input v-model="row.periodNumber" is-new :index-style="{ width: 60 }" :disabled="row.isLock === 1" />
+                        <hc-table-input v-model="row.periodNumber" is-new :index-style="{ width: 60 }" :disabled="row.isLock === 1 || row?.citeStatus === 1" />
                     </template>
                     <template #periodName="{ row }">
-                        <hc-table-input v-model="row.periodName" is-new :index-style="{ width: 60 }" :disabled="row.isLock === 1" />
+                        <hc-table-input v-model="row.periodName" is-new :index-style="{ width: 60 }" :disabled="row.isLock === 1 || row?.citeStatus === 1" />
                     </template>
                     <template #periodYear="{ row }">
-                        <el-select v-model="row.periodYear" placeholder="选择年份" filterable block :disabled="row.isLock === 1">
+                        <el-select v-model="row.periodYear" placeholder="选择年份" filterable block :disabled="row.isLock === 1 || row?.citeStatus === 1">
                             <el-option v-for="item in yearData" :key="item" :label="item" :value="item" />
                         </el-select>
                     </template>
                     <template #periodMonth="{ row }">
-                        <el-select v-model="row.periodMonth" placeholder="选择月份" filterable block :disabled="row.isLock === 1">
+                        <el-select v-model="row.periodMonth" placeholder="选择月份" filterable block :disabled="row.isLock === 1 || row?.citeStatus === 1">
                             <el-option v-for="item in monthData" :key="item" :label="item" :value="item" />
                         </el-select>
                     </template>

src/views/project/debit/contract/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>
@@ -276,22 +283,23 @@ const removeCollectPay = async (id) => {
 const tableCollectColumn = ref([
     { key: 'payNumber', name: '支付项编号' },
     { key: 'payName', name: '支付项名称' },
-    { key: 'payType', name: '支付项类型' },
+    { key: 'payTypeName', name: '支付项类型' },
     { key: 'isDeduct', name: '是否为扣款项' },
     { key: 'isTotalTerms', name: '是否合计项' },
-    { key: 'payApplicableType', name: '支付项适用类型' },
+    { key: 'payApplicableTypeName', name: '支付项适用类型' },
 ])
 const tableCollectData = ref([])
 const tableCollectLoading = ref(false)
 const getTableCollectData = async () => {
     tableCollectLoading.value = true
-    const { error, code, data } = await payApi.getProPayList({
-       type:'',
+    const { error, code, data } = await payApi.getProListPage({
+       type:'1',
        contractId:contractId.value,
+       current: 1, size: 100000,
     })
     tableCollectLoading.value = false
     if (!error && code === 200) {
-        tableCollectData.value = getArrValue(data)
+        tableCollectData.value = getArrValue(data['records'])
       
     } else {
         tableCollectData.value = []