From 01fc4d56f860698261204bc0c72420d06cdd9955 Mon Sep 17 00:00:00 2001
From: "XI_TENG\\xixi_" <971623072>
Date: Thu, 11 Jul 2024 11:02:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=8E=BB=E6=8E=89=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/scm/CwsettlementMapper.xml         |  1 +
 .../service/impl/CwsettlementServiceImpl.java | 11 +++++
 .../controller/CwsettlementController.java    |  2 +-
 .../cwsettlement/CwsettlementPagination.java  |  3 ++
 .../src/views/extend/cwsettlement/index.vue   | 40 ++++++++++++++++++-
 .../jnpf-web/src/views/scm/contractL/form.vue |  8 +---
 6 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwsettlementMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwsettlementMapper.xml
index 97233860..077b66e2 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwsettlementMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwsettlementMapper.xml
@@ -60,6 +60,7 @@
         AND i.f_delete_mark
         IS NULL LEFT JOIN base_user i1 ON i1.f_Id = a.f_last_modify_user_id
         AND i1.f_delete_mark
+        IS NULL
         ${ew.customSqlSegment}
         <if test="cwsettlementPagination.keyword != null and cwsettlementPagination.keyword != ''">
             AND (a.settlement_sum = #{cwsettlementPagination.keyword} OR a.settlement_subject_name like concat('%',#{cwsettlementPagination.keyword},'%') OR e.contract_name like concat('%',#{cwsettlementPagination.keyword},'%'))
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
index d50110cc..c66e3ee6 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
@@ -431,6 +431,17 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
                 cwsettlementQueryWrapper.like("e.contract_number",value);
 
             }
+
+            if(ObjectUtil.isNotEmpty(cwsettlementPagination.getContractNo())){
+                cwsettlementNum++;
+
+                String value = cwsettlementPagination.getContractName() instanceof List ?
+                        JsonUtil.getObjectToString(cwsettlementPagination.getContractNo()) :
+                        String.valueOf(cwsettlementPagination.getContractNo());
+                cwsettlementQueryWrapper.like("e.contract_no",value);
+
+            }
+
             if(ObjectUtil.isNotEmpty(cwsettlementPagination.getCode())){
                 cwsettlementNum++;
 
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/CwsettlementController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/CwsettlementController.java
index 203161bd..f45b2a3d 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/CwsettlementController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/CwsettlementController.java
@@ -125,7 +125,7 @@ public class CwsettlementController {
             realList.add(cwsettlementMap);
         }
         //数据转换
-        realList = generaterSwapUtil.swapDataList(realList, CwsettlementConstant.getFormData(), CwsettlementConstant.getColumnData(), cwsettlementPagination.getModuleId(),false);
+//        realList = generaterSwapUtil.swapDataList(realList, CwsettlementConstant.getFormData(), CwsettlementConstant.getColumnData(), cwsettlementPagination.getModuleId(),false);
 
         //流程状态添加
         for(Map<String, Object> vo:realList){
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementPagination.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementPagination.java
index 46867d67..4fdf1b36 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementPagination.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementPagination.java
@@ -55,4 +55,7 @@ public class CwsettlementPagination extends Pagination {
 
     @JsonProperty("contractName")
     private Object contractName;
+
+    @JsonProperty("contractNo")
+    private Object contractNo;
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue
index dda72392..f443eb23 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue
@@ -43,6 +43,13 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="6">
+            <el-form-item label="对方合同号">
+              <el-input v-model="query.contractNo" placeholder="请输入" clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
@@ -76,11 +83,20 @@
           :span-method="arraySpanMethod" show-summary :summary-method="getTableSummaries" border>
           <el-table-column prop="code" label="单据编号" align="center" width="200" fixed="left">
           </el-table-column>
-          <el-table-column label="类型" prop="type" align="center" width="200" fixed="left">
+          <!-- <el-table-column label="类型" prop="type" align="center" width="200" fixed="left">
             <template slot-scope="scope">
               {{ scope.row.type}}
             </template>
+          </el-table-column> -->
+
+          <el-table-column prop="type" fixed="left" label="业务类型" width="150" align="center">
+            <template slot-scope="scope" v-if="!scope.row.top">
+              <el-tag type="warning" v-if="scope.row.type==1">采购结算</el-tag>
+              <el-tag type="success" v-else-if="scope.row.type==2">销售结算</el-tag>
+              <el-tag type="danger" v-else-if="scope.row.type==3">其他结算</el-tag>
+            </template>
           </el-table-column>
+
           <el-table-column prop="businessType" fixed="left" label="业务类型" width="150" align="center">
             <template slot-scope="scope" v-if="!scope.row.top">
               <el-tag type="warning" v-if="scope.row.businessType==1">采购订单</el-tag>
@@ -136,14 +152,33 @@
           </el-table-column>
           <el-table-column prop="completionDate" label="完成时间" align="center" width="200">
           </el-table-column>
-          <el-table-column prop="creatorUserId" label="创建用户" align="center" width="200">
+          <!-- <el-table-column prop="creatorUserId" label="创建用户" align="center" width="200">
           </el-table-column>
           <el-table-column prop="creatorTime" label="创建时间" align="center" width="200">
           </el-table-column>
           <el-table-column prop="lastModifyTime" label="修改时间" align="center" width="200">
           </el-table-column>
           <el-table-column prop="lastModifyUserId" label="修改用户" align="center" width="200">
+          </el-table-column> -->
+
+          <el-table-column prop="creatorTime" label="创建时间" align="center" width="100" sortable>
+            <template slot-scope="scope">
+              {{ scope.row.creatorTime | toDate("yyyy-MM-dd") }}
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="realName" label="创建用户" align="center">
           </el-table-column>
+
+          <el-table-column prop="lastModifyTime" label="修改时间" align="center" width="100" sortable>
+            <template slot-scope="scope">
+              {{ scope.row.lastModifyTime | toDate("yyyy-MM-dd") }}
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="realNameA" label="修改用户" align="center">
+          </el-table-column>
+
           <el-table-column prop="yunguanMark" label="运管返回状态" align="center" width="100">
           </el-table-column>
           <el-table-column prop="yunguanMassage" label="运管返回信息" align="center" width="100">
@@ -269,6 +304,7 @@ export default {
         preparationTime: undefined,
         productName: undefined,
         contractName: undefined,
+        contractNo: undefined,
       },
       treeProps: {
         children: 'children',
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue
index 6e99bde4..d06bc176 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue
@@ -1502,13 +1502,7 @@ export default {
             trigger: "change"
           }
         ],
-        relatedContractId: [
-          {
-            required: true,
-            message: "请选择",
-            trigger: "change"
-          }
-        ],
+
         deliveryModel: [
           {
             required: true,