From f63c7fada47471fc108a7a980127511e85ff7768 Mon Sep 17 00:00:00 2001
From: bawei <95887577@qq.com>
Date: Fri, 10 Mar 2023 15:32:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicInformation/areasetting/index.vue    |  4 +--
 .../basicInformation/contractfile/index.vue   |  8 +++---
 .../scm/basicInformation/customer/index.vue   | 24 ++++++++---------
 .../basicInformation/inventoryOrd/index.vue   | 15 ++++++-----
 .../inventoryOrdDetail/index.vue              | 15 ++++++-----
 .../scm/basicInformation/material/index.vue   | 25 ++++++++++--------
 .../basicInformation/monitormanage/index.vue  |  4 +--
 .../scm/basicInformation/natural/index.vue    |  9 ++++---
 .../basicInformation/reservoirarea/index.vue  |  4 +--
 .../scm/basicInformation/supplier/index.vue   | 26 +++++++++++--------
 .../scm/basicInformation/vehicle/index.vue    |  9 ++++---
 .../scm/basicInformation/warehouse/index.vue  |  4 +--
 12 files changed, 83 insertions(+), 64 deletions(-)

diff --git a/SC-web/src/views/scm/basicInformation/areasetting/index.vue b/SC-web/src/views/scm/basicInformation/areasetting/index.vue
index 32caab5c..73582a67 100644
--- a/SC-web/src/views/scm/basicInformation/areasetting/index.vue
+++ b/SC-web/src/views/scm/basicInformation/areasetting/index.vue
@@ -24,8 +24,8 @@
             </el-button>
             <el-button type="text" icon="el-icon-download" v-has="'btn_download'" @click="exportData()">导出
             </el-button>
-            <el-button type="text" icon="el-icon-download" v-has="'btn_upload'" @click="">导入
-            </el-button>
+<!--            <el-button type="text" icon="el-icon-download" v-has="'btn_upload'" @click="">导入-->
+<!--            </el-button>-->
             <el-button type="text" icon="el-icon-download"  v-has="'btn_edit'"  @click="">编辑
             </el-button>
             <el-button type="text" icon="el-icon-delete" v-has="'btn_batchRemove'" @click="handleBatchRemoveDel()">批量删除
diff --git a/SC-web/src/views/scm/basicInformation/contractfile/index.vue b/SC-web/src/views/scm/basicInformation/contractfile/index.vue
index e7c78ca8..dce538ca 100644
--- a/SC-web/src/views/scm/basicInformation/contractfile/index.vue
+++ b/SC-web/src/views/scm/basicInformation/contractfile/index.vue
@@ -25,10 +25,10 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="el-icon-plus" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
-            </el-button>
-            <!--            <el-button type="text" icon="=el-icon-detail" @click="goDetail(scope.row.id)">查看-->
-            <!--            </el-button>-->
+<!--            <el-button type="primary" icon="el-icon-plus" v-has="'btn_add'" @click="addOrUpdateHandle()">新增-->
+<!--            </el-button>-->
+<!--                        <el-button type="text" icon="=el-icon-detail" @click="goDetail(scope.row.id)">查看-->
+<!--                        </el-button>-->
             <el-button type="text" icon="el-icon-download" v-has="'btn_download'" @click="exportData()">导出
             </el-button>
 
diff --git a/SC-web/src/views/scm/basicInformation/customer/index.vue b/SC-web/src/views/scm/basicInformation/customer/index.vue
index e55221e2..f385c692 100644
--- a/SC-web/src/views/scm/basicInformation/customer/index.vue
+++ b/SC-web/src/views/scm/basicInformation/customer/index.vue
@@ -43,14 +43,14 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
-            </el-button>
+<!--            <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
+<!--            </el-button>-->
             <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
-            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
-            </el-button>
-            <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
-            </el-button>
+<!--            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入-->
+<!--            </el-button>-->
+<!--            <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除-->
+<!--            </el-button>-->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="刷新" placement="top">
@@ -117,13 +117,13 @@
 
 
           <el-table-column label="操作" fixed="right"
-                           width="150">
+                           width="80">
             <template slot-scope="scope">
-              <el-button type="text" v-has="'btn_edit'"
-                         @click="addOrUpdateHandle(scope.row.id)">编辑
-              </el-button>
-              <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
-              </el-button>
+<!--              <el-button type="text" v-has="'btn_edit'"-->
+<!--                         @click="addOrUpdateHandle(scope.row.id)">编辑-->
+<!--              </el-button>-->
+<!--              <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
+<!--              </el-button>-->
               <el-button type="text"
                          @click="goDetail(scope.row.id)">详情
               </el-button>
diff --git a/SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue b/SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue
index 9791d743..0f6b824b 100644
--- a/SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue
+++ b/SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue
@@ -25,8 +25,8 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" v-has="'btn_add'"  icon="el-icon-plus" @click="addOrUpdateHandle()">新增
-            </el-button>
+<!--            <el-button type="primary" v-has="'btn_add'"  icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
+<!--            </el-button>-->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="刷新" placement="top">
@@ -48,10 +48,13 @@
           <el-table-column label="操作" fixed="right"
                            width="100">
             <template slot-scope="scope">
-              <el-button type="text"  v-has="'btn_edit'"
-                         @click="addOrUpdateHandle(scope.row.id)">编辑
-              </el-button>
-              <el-button type="text" v-has="'btn_remove'"  class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+<!--              <el-button type="text"  v-has="'btn_edit'"-->
+<!--                         @click="addOrUpdateHandle(scope.row.id)">编辑-->
+<!--              </el-button>-->
+<!--              <el-button type="text" v-has="'btn_remove'"  class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
+<!--              </el-button>-->
+              <el-button type="text"
+                         @click="goDetail(scope.row.id)">详情
               </el-button>
             </template>
           </el-table-column>
diff --git a/SC-web/src/views/scm/basicInformation/inventoryOrdDetail/index.vue b/SC-web/src/views/scm/basicInformation/inventoryOrdDetail/index.vue
index d1ce3ae4..c4aa4037 100644
--- a/SC-web/src/views/scm/basicInformation/inventoryOrdDetail/index.vue
+++ b/SC-web/src/views/scm/basicInformation/inventoryOrdDetail/index.vue
@@ -25,8 +25,8 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary"  v-has="'btn_add'"   icon="el-icon-plus" @click="addOrUpdateHandle()">新增
-            </el-button>
+<!--            <el-button type="primary"  v-has="'btn_add'"   icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
+<!--            </el-button>-->
             <el-button type="text"  v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
           </div>
@@ -50,10 +50,13 @@
           <el-table-column label="操作" fixed="right"
                            width="100">
             <template slot-scope="scope">
-              <el-button type="text" v-has="'btn_edit'"
-                         @click="addOrUpdateHandle(scope.row.id)">编辑
-              </el-button>
-              <el-button type="text" v-has="'btn_remove'"  class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+<!--              <el-button type="text" v-has="'btn_edit'"-->
+<!--                         @click="addOrUpdateHandle(scope.row.id)">编辑-->
+<!--              </el-button>-->
+<!--              <el-button type="text" v-has="'btn_remove'"  class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
+<!--              </el-button>-->
+              <el-button type="text"
+                         @click="goDetail(scope.row.id)">详情
               </el-button>
             </template>
           </el-table-column>
diff --git a/SC-web/src/views/scm/basicInformation/material/index.vue b/SC-web/src/views/scm/basicInformation/material/index.vue
index edcf81ea..d5ac3b8a 100644
--- a/SC-web/src/views/scm/basicInformation/material/index.vue
+++ b/SC-web/src/views/scm/basicInformation/material/index.vue
@@ -25,14 +25,14 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
-            </el-button>
+<!--            <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
+<!--            </el-button>-->
             <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
-            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
-            </el-button>
-            <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
-            </el-button>
+<!--            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入-->
+<!--            </el-button>-->
+<!--            <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除-->
+<!--            </el-button>-->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="刷新" placement="top">
@@ -92,12 +92,15 @@
 
 
           <el-table-column label="操作" fixed="right"
-                           width="100">
+                           width="80">
             <template slot-scope="scope">
-              <el-button type="text" v-has="'btn_edit'"
-                         @click="addOrUpdateHandle(scope.row.id)">编辑
-              </el-button>
-              <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+<!--              <el-button type="text" v-has="'btn_edit'"-->
+<!--                         @click="addOrUpdateHandle(scope.row.id)">编辑-->
+<!--              </el-button>-->
+<!--              <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
+<!--              </el-button>-->
+              <el-button type="text"
+                         @click="goDetail(scope.row.id)">详情
               </el-button>
             </template>
           </el-table-column>
diff --git a/SC-web/src/views/scm/basicInformation/monitormanage/index.vue b/SC-web/src/views/scm/basicInformation/monitormanage/index.vue
index ca77956a..ef6ceccc 100644
--- a/SC-web/src/views/scm/basicInformation/monitormanage/index.vue
+++ b/SC-web/src/views/scm/basicInformation/monitormanage/index.vue
@@ -34,8 +34,8 @@
             </el-button>
             <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
-            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
-            </el-button>
+<!--            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入-->
+<!--            </el-button>-->
             <el-button type="text"  v-has="'btn_edit'"  icon="el-icon-download" @click="">编辑
             </el-button>
             <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
diff --git a/SC-web/src/views/scm/basicInformation/natural/index.vue b/SC-web/src/views/scm/basicInformation/natural/index.vue
index d53545e1..c855d480 100644
--- a/SC-web/src/views/scm/basicInformation/natural/index.vue
+++ b/SC-web/src/views/scm/basicInformation/natural/index.vue
@@ -29,8 +29,8 @@
             </el-button>
             <el-button type="text" icon="el-icon-download" @click="exportData()" v-has="'btn_download'">导出
             </el-button>
-            <el-button type="text" icon="el-icon-download" v-has="'btn_upload'" @click="">导入
-            </el-button>
+<!--            <el-button type="text" icon="el-icon-download" v-has="'btn_upload'" @click="">导入-->
+<!--            </el-button>-->
             <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" v-has="'btn_batchRemove'" >批量删除
             </el-button>
           </div>
@@ -56,13 +56,16 @@
           <el-table-column prop="creatorTime" label="创建时间" width="300" align="center" sortable
           />
           <el-table-column label="操作" fixed="right"
-                           width="100">
+                           width="150">
             <template slot-scope="scope">
               <el-button type="text" v-has="'btn_edit'"
                          @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
               <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)" v-has="'btn_remove'">删除
               </el-button>
+              <el-button type="text"
+                         @click="goDetail(scope.row.id)">详情
+              </el-button>
             </template>
           </el-table-column>
         </JNPF-table>
diff --git a/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue b/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue
index 29f196a0..25adfa5c 100644
--- a/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue
+++ b/SC-web/src/views/scm/basicInformation/reservoirarea/index.vue
@@ -30,8 +30,8 @@
             <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
 
-            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
-            </el-button>
+<!--            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入-->
+<!--            </el-button>-->
 
             <el-button type="text" v-has="'btn_batchRemove'"  icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
diff --git a/SC-web/src/views/scm/basicInformation/supplier/index.vue b/SC-web/src/views/scm/basicInformation/supplier/index.vue
index aa2fa689..7049a125 100644
--- a/SC-web/src/views/scm/basicInformation/supplier/index.vue
+++ b/SC-web/src/views/scm/basicInformation/supplier/index.vue
@@ -48,14 +48,14 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
-            </el-button>
+<!--            <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
+<!--            </el-button>-->
             <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
-            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
-            </el-button>
-            <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
-            </el-button>
+<!--            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入-->
+<!--            </el-button>-->
+<!--            <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除-->
+<!--            </el-button>-->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="刷新" placement="top">
@@ -151,12 +151,16 @@
           <el-table-column prop="supplierSiteCode" label="供应商地点" width="120" align="center" sortable
                            sortable="custom"/>
           <el-table-column label="操作" fixed="right"
-                           width="100">
+                           width="80">
             <template slot-scope="scope">
-              <el-button type="text" v-has="'btn_edit'"
-                         @click="addOrUpdateHandle(scope.row.id)">编辑
-              </el-button>
-              <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+<!--              <el-button type="text" v-has="'btn_edit'"-->
+<!--                         @click="addOrUpdateHandle(scope.row.id)">编辑-->
+<!--              </el-button>-->
+<!--              <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
+<!--              </el-button>-->
+
+              <el-button type="text"
+                         @click="goDetail(scope.row.id)">详情
               </el-button>
             </template>
           </el-table-column>
diff --git a/SC-web/src/views/scm/basicInformation/vehicle/index.vue b/SC-web/src/views/scm/basicInformation/vehicle/index.vue
index d18828e8..c05aca3f 100644
--- a/SC-web/src/views/scm/basicInformation/vehicle/index.vue
+++ b/SC-web/src/views/scm/basicInformation/vehicle/index.vue
@@ -29,8 +29,8 @@
             </el-button>
             <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
-            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
-            </el-button>
+<!--            <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入-->
+<!--            </el-button>-->
             <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
           </div>
@@ -66,12 +66,15 @@
           <el-table-column prop="contact" label="手机号" width="0" align="center" sortable/>
           <el-table-column prop="creatorusername" label="录入人" width="0" align="center" sortable/>
           <el-table-column prop="creatortime" label="创建时间" width="0" align="center" sortable/>
-          <el-table-column label="操作" fixed="right" width="100">
+          <el-table-column label="操作" fixed="right" width="150">
             <template slot-scope="scope">
               <el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
               <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
               </el-button>
+              <el-button type="text"
+                         @click="goDetail(scope.row.id)">详情
+              </el-button>
             </template>
           </el-table-column>
         </JNPF-table>
diff --git a/SC-web/src/views/scm/basicInformation/warehouse/index.vue b/SC-web/src/views/scm/basicInformation/warehouse/index.vue
index 89b36210..eaeca34f 100644
--- a/SC-web/src/views/scm/basicInformation/warehouse/index.vue
+++ b/SC-web/src/views/scm/basicInformation/warehouse/index.vue
@@ -29,8 +29,8 @@
               </el-button>
               <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
               </el-button>
-              <el-button type="text" v-has="'btn_upload'"  icon="el-icon-download" @click="">导入
-              </el-button>
+<!--              <el-button type="text" v-has="'btn_upload'"  icon="el-icon-download" @click="">导入-->
+<!--              </el-button>-->
               <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
               </el-button>
           </div>

From 8129b61721fcacaa2766d7b6f54db06ec43ebfb8 Mon Sep 17 00:00:00 2001
From: bawei <95887577@qq.com>
Date: Fri, 10 Mar 2023 15:34:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=8E=BB=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jnpf/contractfile/service/impl/ContractFileServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java
index 825d3635..5b093e7a 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java
@@ -378,7 +378,7 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
         for (ContractFileModel model : dt) {
 
                 model.setCreatorTime(DateUtil.cstFormat(model.getCreatorTime()));
-                model.setNum(DateUtil.cstFormat(model.getNum()));
+//                model.setNum(DateUtil.cstFormat(model.getNum()));
                 if (model.getContractType() != null) {
                     if (model.getContractType().equals("采购合同")) {
                         model.setContractType("0");

From e9c5bc412b908e4354d5420f27adebf003fbca56 Mon Sep 17 00:00:00 2001
From: bawei <95887577@qq.com>
Date: Fri, 10 Mar 2023 16:01:57 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=94=B9=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ContractFileServiceImpl.java            | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java
index 5b093e7a..7fe3a285 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java
@@ -411,14 +411,17 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
                 }
                 if (model.getStatus() != null) {
                     if (model.getStatus().equals("合同进行中")) {
-                        model.setStatus("0");
-                    } else if (model.getStatus().equals("合同审批中")) {
                         model.setStatus("1");
-                    } else if (model.getStatus().equals("合同审批结束")) {
+                    } else if (model.getStatus().equals("合同审批中")) {
                         model.setStatus("2");
+                    } else if (model.getStatus().equals("合同审批结束")) {
+                        model.setStatus("3");
+                    }else if (model.getStatus().equals("合同待审批")) {
+                        model.setStatus("0");
                     }
                 }
 
+
         }
         List<ContractFileEntity> entitys = JsonUtil.getJsonToList(dt, ContractFileEntity.class);
         //记录成功了几条