From 4a8e0216519b32c7e5059a87ab2a74ef7774e9aa Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Oct 2021 14:43:10 +0800
Subject: [PATCH] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C=E6=B5=81=E7=A8=8B=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExpenditureContractDetail.vue             | 16 ++++-----
 .../ExpenditureContractList.vue               | 35 ++++++++++++-------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
index c8396ba..f8a28dc 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
@@ -156,8 +156,7 @@
         </div>
 
         <!--        状态非已存档显示-->
-        <!--        v-if="detailData.status < 5"-->
-        <template>
+        <template v-if="detailData.status < 5">
           <a-divider></a-divider>
           <!--      编辑、审核、存档-->
           <div>
@@ -165,28 +164,25 @@
               <div class="part-title-text">操作</div>
             </div>
             <div class="operator-btn">
-              <!--              v-if="detailData.status === 1 || detailData.status === 4"-->
               <a-button
                 type="primary"
                 @click="handleEdit(detailData.id)"
-
+                v-if="detailData.status === 1 || detailData.status === 4"
                 v-has="'revenueContract:edit'">
                 编辑
               </a-button>
-              <!--              v-if="detailData.status === 2"-->
               <a-button
                 type="primary"
                 @click="handleAudit(detailData.id)"
-
-                v-has="'revenueContract:aduit'">
+                v-if="detailData.status === 2"
+                v-has="'expenditureContract:aduit'">
                 审核
               </a-button>
-              <!--              v-if="detailData.status === 3"-->
               <a-button
                 type="primary"
                 @click="handleArchive(detailData.id)"
-
-                v-has="'revenueContract:archive'">
+                v-if="detailData.status === 3"
+                v-has="'expenditureContract:archive'">
                 存档
               </a-button>
             </div>
diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
index da725d3..c4f7eda 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
@@ -16,7 +16,7 @@
                 <a-input placeholder="请输入合同名称" v-model="queryParam.contractName" :maxLength='50'></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xxl="8" :xl="10" :lg="11" :md="12" :sm="24">
+            <a-col :xxl="8" :xl="10" :lg="12" :md="12" :sm="24">
               <a-form-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-date
                   placeholder="请选择开始日期"
@@ -35,6 +35,13 @@
                 </j-date>
               </a-form-item>
             </a-col>
+            <a-col :xxl="4" :xl="10" :lg="12" :md="12" :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="4" :lg="7" :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" icon="search" @click="searchQuery"
@@ -93,19 +100,15 @@
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
-
-<!--            v-if="record.status === 2"-->
-            <a @click="handleAudit(record.id)" v-has="'revenueContract:aduit'">审核</a>
-            <!--            v-if="record.status === 1 || record.status === 4" -->
+            <a @click="handleAudit(record.id)" v-has="'expenditureContract:aduit'" v-if="record.status === 2">审核</a>
             <a @click="handleEdit(record.id, record.contractNum)"
-               v-has="'expenditureContract:edit'">编辑</a>
-            <!--            v-if="record.status === 3" -->
-            <a @click="handleArchive(record.id)" v-has="'revenueContract:archive'">存档</a>
-            <!--            v-if="record.status === 1 || record.status === 2 || record.status === 4"-->
+               v-has="'expenditureContract:edit'"
+               v-if="record.status === 1 || record.status === 4">编辑</a>
+            <a @click="handleArchive(record.id)" v-has="'expenditureContract:archive'" v-if="record.status === 3">存档</a>
             <a @click="handleDelete(record.id)"
-               v-has="'expenditureContract:delete'">删除</a>
-            <!--            v-if="record.status === 5"-->
-            <a :disabled="true">已存档</a>
+               v-has="'expenditureContract:delete'"
+               v-if="record.status === 1 || record.status === 2 || record.status === 4">删除</a>
+            <a :disabled="true" v-if="record.status === 5">已存档</a>
           </span>
         </a-table>
       </div>
@@ -188,6 +191,12 @@ export default {
           dataIndex: 'contractAmount',
           width: 200,
           scopedSlots: { customRender: 'text' }
+        }, {
+          title: '状态',
+          align: 'center',
+          dataIndex: 'status_dictText',
+          width: 150,
+          scopedSlots: { customRender: 'text' }
         }, {
           title: '创建时间',
           align: 'center',
@@ -276,7 +285,7 @@ export default {
           })
         }
       })
-    },
+    }
   }
 }
 </script>