6.28

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwaccountServiceImpl.java

@@ -384,10 +384,10 @@ public class CwaccountServiceImpl extends ServiceImpl<CwaccountMapper, Cwaccount
                 cwaccountQueryWrapper.lambda().eq(CwaccountEntity::getBusinessType,cwaccountPagination.getBusinessType());
 
             }
-            if(ObjectUtil.isNotEmpty(cwaccountPagination.getContractCode())){
+            if(cwaccountPagination.getContractCodeList() != null && cwaccountPagination.getContractCodeList().size() > 0){
                 cwaccountNum++;
 
-                cwaccountQueryWrapper.lambda().eq(CwaccountEntity::getContractCode,cwaccountPagination.getContractCode());
+                cwaccountQueryWrapper.lambda().in(CwaccountEntity::getContractCode,cwaccountPagination.getContractCodeList());
 
             }
             if(ObjectUtil.isNotEmpty(cwaccountPagination.getAccountState())){

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountPagination.java

@@ -45,7 +45,7 @@ public class CwaccountPagination extends Pagination {
     private List<String> excludeIdList;
     @JsonProperty("idList")
     private List<String> idList;
-    private String contractCode;
+    private List<String>  contractCodeList;
     private String accountState;
     @JsonProperty("queryFlowTaskPass")
     private String queryFlowTaskPass;

jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue

@@ -2476,8 +2476,12 @@ export default {
       for (let i = 0; i < this.dataForm.cwsettlementaccountList.length; i++) {
         excludeIdList.push(this.dataForm.cwsettlementaccountList[i].accountId);
       }
+      let contractNameList = [];
+      for (let i = 0; i < this.dataForm.cwsettlementcontractList.length; i++) {
+        contractNameList.push(this.dataForm.cwsettlementcontractList[i].contractName);
+      }
       this.$nextTick(() => {
-        this.$refs.goodsBox.init(excludeIdList, this.dataForm.cwsettlementsubjectList[0].subjectName, this.dataForm.cwsettlementcontractList[0].contractName, '1', this.dataForm.type, this.dataForm.businessType)
+        this.$refs.goodsBox.init(excludeIdList, this.dataForm.cwsettlementsubjectList[0].subjectName, contractNameList, '1', this.dataForm.type, this.dataForm.businessType)
       })
     },
     choice2() {

jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/settlementaccountList.vue

@@ -45,7 +45,7 @@
           {{ scope.row.type}}
         </template>
       </el-table-column>
-      <el-table-column prop="contractCode" label="关联合同" align="center" width="200">
+      <el-table-column prop="contractCodeList" label="关联合同" align="center" width="200">
       </el-table-column>
       <el-table-column prop="docmentNum" label="关联单据数" align="center" width="150">
       </el-table-column>
@@ -87,7 +87,7 @@ export default {
       },
       excludeIdList: [],
       accountSubjectName: '',
-      contractCode: '',
+      contractCodeListList: '',
       accountState: '',
       type: '',
       businessType: '',
@@ -95,7 +95,7 @@ export default {
     }
   },
   methods: {
-    init(excludeIdList, accountSubjectName, contractCode, accountState, type, businessType) {
+    init(excludeIdList, accountSubjectName, contractCodeList, accountState, type, businessType) {
       this.visible = true
       this.listLoading = true
       if (excludeIdList && excludeIdList instanceof Array) {
@@ -104,8 +104,8 @@ export default {
       if (accountSubjectName && typeof (accountSubjectName) == 'string') {
         this.accountSubjectName = accountSubjectName;
       }
-      if (contractCode && typeof (contractCode) == 'string') {
-        this.contractCode = contractCode;
+      if (contractCodeList && contractCodeList instanceof Array) {
+        this.contractCodeList = contractCodeList;
       }
       if (accountState && typeof (accountState) == 'string') {
         this.accountState = accountState;
@@ -121,7 +121,7 @@ export default {
         keyword: this.keyword,
         excludeIdList: this.excludeIdList,
         accountSubjectName: this.accountSubjectName,
-        contractCode: this.contractCode,
+        contractCodeList: this.contractCodeList,
         accountState: this.accountState,
         type: this.type,
         businessType: this.businessType,