[update] 收入合同项目关联接口联调；支出合同页面

src/views/contractManagement/revenueContract/RevenueContractList.vue

@@ -22,6 +22,12 @@
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="合同状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-dict-select-tag v-model="queryParam.status" placeholder="请选择合同状态"
+                                   dictCode="revenue_contract_status"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="10" :lg="11" :md="12" :sm="24">
               <a-form-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-date
                   placeholder="请选择开始日期"
@@ -40,18 +46,12 @@
                 </j-date>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="合同状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-dict-select-tag v-model="queryParam.status" placeholder="请选择合同状态"
-                                   dictCode="revenue_contract_status"/>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="7" :lg="7" :md="9" :sm="24">
+            <a-col :xl="7" :lg="8" :md="9" :sm="24">
               <a-form-item label="来款状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-checkbox-group v-model="queryParam.chargeUse" :options="incomePaymentsStatus"/>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" icon="search" @click="searchQuery">查询</a-button>
               <a-button icon="reload" @click="searchReset" class="reset-button">重置</a-button>
@@ -89,10 +89,17 @@
 
           <!--        项目名称 待审核状态为红色-->
           <template slot="projectName" slot-scope="text, record">
-            <div @click="toRevenueContractDetail(record.id, record.contractNum)"
-                 v-if="record.status === 2 || record.status === 4">{{ text }}
-            </div>
-            <div class="primary-color" @click="toRevenueContractDetail(record.id)" v-else>{{ text }}</div>
+            <j-ellipsis
+              @click="toRevenueContractDetail(record.id, record.contractNum)"
+              v-if="record.status === 2 || record.status === 4"
+              ：value="text"
+              :length="20"></j-ellipsis>
+            <j-ellipsis
+              class="primary-color"
+              @click="toRevenueContractDetail(record.id)"
+              v-else
+              :value="text"
+              :length="20"></j-ellipsis>
           </template>
 
           <template slot="text" slot-scope="text">
@@ -100,9 +107,9 @@
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
-            <a @click="handleAudit(record.id)" v-if="record.status === 2 || record.status === 4">审核</a>
+            <a @click="handleAudit(record.id)" v-if="record.status === 2">审核</a>
             <a @click="handleEdit(record.id, record.contractNum)"
-               v-if="record.status === 1 || record.status === 2 || record.status === 4">编辑</a>
+               v-if="record.status === 1 || record.status === 4">编辑</a>
             <a @click="handleArchive(record.id)" v-if="record.status === 3">存档</a>
             <a @click="handleDelete(record.id)"
                v-if="record.status === 1 || record.status === 2 || record.status === 4">删除</a>
@@ -111,7 +118,7 @@
         </a-table>
       </div>
     </a-card>
-    <revenue-contract-aduit-module ref="aduitForm" @ok="aduitOk"></revenue-contract-aduit-module>
+    <revenue-contract-aduit-module ref="aduitForm" @ok="modalFormOk"></revenue-contract-aduit-module>
   </div>
 </template>
 
@@ -122,6 +129,7 @@ import { JeroListMixin } from '../../../mixins/JeroListMixin'
 import RevenueContractAduitModule from './modules/RevenueContractAduitModule'
 import JDate from '../../../components/tools/JDate'
 import { RangeDateMixin } from '../../../mixins/RangeDateMixin'
+import { archiveRevenueContract } from '../../../api/incomePaymentsApi'
 
 export default {
   name: 'RevenueContractList',
@@ -291,23 +299,22 @@ export default {
         onOk: function () {
           that.loading = true
           that.loading = false
-          // getAction(that.url.deleteBatch, {ids: ids}).then((res) => {
-          //   if (res.success) {
-          //     that.$message.success(res.message)
-          //     // 判断当前删除的数据是否是最后一页的全部数据，如果是的话页码减一
-          //     if (that.ipagination.current > 1 && (that.ipagination.current === Math.ceil(that.ipagination.total / that.ipagination.pageSize)) &&
-          //       that.selectedRowKeys.length === that.dataSource.length
-          //     ) {
-          //       that.ipagination.current -= 1
-          //     }
-          //     that.loadData()
-          //     that.onClearSelected()
-          //   } else {
-          //     that.$message.warning(res.message)
-          //   }
-          // }).finally(() => {
-          //   that.loading = false
-          // })
+          let param = {
+            contractId: id,
+            contractStatus: 5
+          }
+          archiveRevenueContract(param).then((res) => {
+            if (res.success) {
+              that.$message.success(res.message)
+              // 判断当前删除的数据是否是最后一页的全部数据，如果是的话页码减一
+              that.loadData()
+              that.onClearSelected()
+            } else {
+              that.$message.warning(res.message)
+            }
+          }).finally(() => {
+            that.loading = false
+          })
         }
       })
     }