From dbbf8f0e1330f6ee3572de7724675b3d4b137733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B7=9D=E8=99=8E?= <h17602169347@163.com>
Date: Fri, 5 Jul 2024 17:44:28 +0800
Subject: [PATCH] =?UTF-8?q?7.5=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jnpf-app/App.vue                              |  15 ++
 jnpf-app/pages/index/portal.vue               |   1 +
 .../scm/form/paymentApplication/index.vue     |  41 +++++-
 jnpf-app/pages/workFlow/flowBefore/index.vue  |   3 -
 .../service/impl/CwsettlementServiceImpl.java |  18 +--
 .../java/jnpf/entity/CwsettlementEntity.java  |  27 ++--
 .../entity/CwsettlementsummaryEntity.java     |   3 +-
 .../model/cwsettlement/CwsettlementForm.java  |  33 +++++
 .../CwsettlementsummaryModel.java             |   2 +
 .../src/views/extend/cwsettlement/form.vue    | 138 +++++++++++++++++-
 10 files changed, 250 insertions(+), 31 deletions(-)

diff --git a/jnpf-app/App.vue b/jnpf-app/App.vue
index 71ef1873..241d020c 100644
--- a/jnpf-app/App.vue
+++ b/jnpf-app/App.vue
@@ -228,4 +228,19 @@
 	@import "@/assets/iconfont/custom/iconfont.css";
 	@import "@/assets/scss/common.scss";
 	@import "@/assets/scss/components.scss";
+	.page-testa{
+		.uni-input-wrapper {
+		    color: #303133 !important;
+		    font-size: 16px !important;
+		}
+		.u-input__input {
+		    color: #303133 !important;
+		    font-size: 16px !important;
+		}
+		.u-form-item {
+			color: #303133 !important;
+			font-size: 16px !important;
+		}
+	}
+	
 </style>
\ No newline at end of file
diff --git a/jnpf-app/pages/index/portal.vue b/jnpf-app/pages/index/portal.vue
index 269c52ce..9c52f139 100644
--- a/jnpf-app/pages/index/portal.vue
+++ b/jnpf-app/pages/index/portal.vue
@@ -366,6 +366,7 @@
 					url: '/api/scm/BusinessEnterpriseRelational/getHomePage',
 					method: 'get'
 				}).then(res => {
+					debugger
 					let _info = res.data[0];
 					this.homeInfo = _info;
 				}).catch(() => {})
diff --git a/jnpf-app/pages/scm/form/paymentApplication/index.vue b/jnpf-app/pages/scm/form/paymentApplication/index.vue
index ed65fedc..8d250cc8 100644
--- a/jnpf-app/pages/scm/form/paymentApplication/index.vue
+++ b/jnpf-app/pages/scm/form/paymentApplication/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="jnpf-wrap jnpf-wrap-form" v-if="!loading">
+	<view class="jnpf-wrap jnpf-wrap-form page-testa" v-if="!loading">
 		<u-form :model="dataForm" :rules="rules" ref="dataForm" :errorType="['toast']" label-position="left"
 			label-align="right" :label-width="labelwidth" class="jnpf-form">
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
@@ -47,13 +47,20 @@
 					</u-input>
 				</u-form-item>
 			</view>
-			<view class="u-p-l-20 u-p-r-20 form-item-box">
+			<view class="u-p-l-20 u-p-r-20 form-item-box" v-if="false">
 				<u-form-item v-if="judgeShow('payer')" :required="requiredList.payer" label="付款方" prop="payer">
 					<u-input v-model="dataForm.payer" :disabled="judgeWrite('payer')" @change="changeData('payer',-1)"
 						 clearable placeholder="请输入" :style='{"width":"100%"}'>
 					</u-input>
 				</u-form-item>
 			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('payer')" :required="requiredList.payer" label="付款方" prop="payer">
+					<u-input v-model="dataForm.payer2" :disabled="judgeWrite('payer')" @change="changeData('payer',-1)"
+						 clearable placeholder="请输入" :style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item v-if="judgeShow('applyAmount')" :required="requiredList.applyAmount" label="申请金额"
 					prop="applyAmount">
@@ -191,6 +198,7 @@
 					contractId: "",
 					payee: '',
 					payer: '',
+					payer2: '',
 					applyAmount: 0,
 					caseStatus: "1",
 					remark: '',
@@ -686,6 +694,13 @@
 			dataInfo(dataAll) {
 				let _dataAll = dataAll
 				this.dataForm = _dataAll
+				if(this.dataForm.payer && this.dataForm.payer != ''){
+					var aa = this.dataForm.payer.split("/");
+					aa.reverse();
+					var str = aa.join('/');
+					this.dataForm.payer2 = str;
+				}
+				
 				this.isEdit = true
 				this.dataAll()
 				if(!_dataAll.paymentapplicationsettlementList){
@@ -707,4 +722,26 @@
 	page {
 		background-color: #f0f2f6;
 	}
+	/* .uni-input-wrapper {
+	    color: #303133 !important;
+	    font-size: 16px !important;
+	}
+	.u-input__input {
+	    color: #303133 !important;
+	    font-size: 16px !important;
+	} */
+</style>
+<style scoped>
+	/* page {
+		background-color: #f0f2f6;
+	}
+	.uni-input-wrapper {
+		color: #303133 !important;
+		font-size: 16px !important;
+	} */
+	/* .u-form-item {
+		color: #303133 !important;
+		font-size: 16px !important;
+	} */
+	
 </style>
\ No newline at end of file
diff --git a/jnpf-app/pages/workFlow/flowBefore/index.vue b/jnpf-app/pages/workFlow/flowBefore/index.vue
index a31f3884..77e4b79d 100644
--- a/jnpf-app/pages/workFlow/flowBefore/index.vue
+++ b/jnpf-app/pages/workFlow/flowBefore/index.vue
@@ -648,9 +648,6 @@
 					}
 					setTimeout(() => {
 						this.$nextTick(() => {
-							console.log('aaaaaaaaaaa', this.$refs.child);
-							console.log('bbbbbbbbbbb', this.$refs.child.$refs.form);
-							console.log('ccccccccccc', this.$refs.child.$refs.form.init);
 							if (!this.$refs.child || !this.$refs.child.$refs.form || !this.$refs
 								.child.$refs.form.init) {
 								uni.showToast({
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 9313c98b..8882ef15 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
@@ -1093,19 +1093,19 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
         yunguanSaleSettlementModel.setATTRIBUTE4(contractLEntity.getContractNo());
         yunguanSaleSettlementModel.setCREATE_EMP_ID(cwsettlementEntity.getCreatorUserId());
         yunguanSaleSettlementModel.setCREATE_DTM(cwsettlementEntity.getCreatorTime());
-        yunguanSaleSettlementModel.setINVOICE_AMOUNT(cwsettlementEntity.getINVOICE_AMOUNT());
-        yunguanSaleSettlementModel.setINVOICE_CNT(cwsettlementEntity.getINVOICE_CNT());
-        yunguanSaleSettlementModel.setATTRIBUTE11(cwsettlementEntity.getATTRIBUTE11());
-        yunguanSaleSettlementModel.setINVOICE_DATE(cwsettlementEntity.getINVOICE_DATE());
-        yunguanSaleSettlementModel.setINVOICE_TYPE(cwsettlementEntity.getINVOICE_TYPE());
-        yunguanSaleSettlementModel.setINVOICE_NO(cwsettlementEntity.getINVOICE_NO());
+        yunguanSaleSettlementModel.setINVOICE_AMOUNT(cwsettlementEntity.getInvoiceAmount());
+        yunguanSaleSettlementModel.setINVOICE_CNT(cwsettlementEntity.getInvoiceCnt());
+        yunguanSaleSettlementModel.setATTRIBUTE11(cwsettlementEntity.getAttribute11());
+        yunguanSaleSettlementModel.setINVOICE_DATE(cwsettlementEntity.getInvoiceDate());
+        yunguanSaleSettlementModel.setINVOICE_TYPE(cwsettlementEntity.getInvoiceType());
+        yunguanSaleSettlementModel.setINVOICE_NO(cwsettlementEntity.getInvoiceNo());
         yunguanSaleSettlementModel.setINVOICE_CURRENCY("CNY");
         yunguanSaleSettlementModel.setTAX_RATE_CODE("VAT_IN_" + cwsettlementForm.getCwsettlementsummaryList().get(0).getRate());
         yunguanSaleSettlementModel.setTAX_RATE(cwsettlementForm.getCwsettlementsummaryList().get(0).getRate());
         yunguanSaleSettlementModel.setTAX_RATE_CAL(cwsettlementForm.getCwsettlementsummaryList().get(0).getRate());
         yunguanSaleSettlementModel.setEXCHANGE_RATE(1);
         yunguanSaleSettlementModel.setEXCHANGE_DATE(null);
-        yunguanSaleSettlementModel.setGL_DATE(cwsettlementEntity.getGL_DATE());
+        yunguanSaleSettlementModel.setGL_DATE(cwsettlementEntity.getGlDate());
         BigDecimal ATTRIBUTE1 = new BigDecimal("0");
         BigDecimal TAX = new BigDecimal("0");
         for (CwsettlementsummaryModel cwsettlementsummaryModel : cwsettlementForm.getCwsettlementsummaryList()) {
@@ -1114,8 +1114,8 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
         }
         yunguanSaleSettlementModel.setATTRIBUTE1(ATTRIBUTE1.toString());
         yunguanSaleSettlementModel.setTAX(TAX);
-        yunguanSaleSettlementModel.setDESCRIPTION(cwsettlementEntity.getDESCRIPTION());
-        yunguanSaleSettlementModel.setANNEX_CNT(cwsettlementEntity.getANNEX_CNT());
+        yunguanSaleSettlementModel.setDESCRIPTION(cwsettlementEntity.getDescription());
+        yunguanSaleSettlementModel.setANNEX_CNT(cwsettlementEntity.getAnnexCnt());
         yunguanSaleSettlementModel.setERP_FLAG("N");
         yunguanSaleSettlementModel.setERP_USER(cwsettlementEntity.getCreatorUserId());
         yunguanSaleSettlementModel.setERP_DTM(cwsettlementEntity.getCreatorTime());
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementEntity.java
index 684cb6fe..11381bbb 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementEntity.java
@@ -2,6 +2,7 @@ package jnpf.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import java.util.Date;
 import java.math.BigDecimal;
@@ -117,26 +118,24 @@ public class CwsettlementEntity  {
     @TableField(exist = false)
     private String realNameA;
 
-
-
     @TableField("INVOICE_DATE")
-    private Date INVOICE_DATE;
+    private Date invoiceDate;
     @TableField("INVOICE_CNT")
-    private int INVOICE_CNT;
+    private int invoiceCnt;
     @TableField("INVOICE_NO")
-    private String INVOICE_NO;
+    private String invoiceNo;
     @TableField("INVOICE_TYPE")
-    private String INVOICE_TYPE;
-    @JSONField(name = "ATTRIBUTE11")
-    private String ATTRIBUTE11;
-    @JSONField(name = "INVOICE_AMOUNT")
-    private BigDecimal INVOICE_AMOUNT;
+    private String invoiceType;
+    @TableField("ATTRIBUTE11")
+    private String attribute11;
+    @TableField("INVOICE_AMOUNT")
+    private BigDecimal invoiceAmount;
     @TableField("GL_DATE")
-    private Date GL_DATE;
-    @JSONField(name = "DESCRIPTION")
-    private String DESCRIPTION;
+    private Date glDate;
+    @TableField("DESCRIPTION")
+    private String description;
     @TableField("ANNEX_CNT")
-    private int ANNEX_CNT;
+    private int annexCnt;
     @TableField("erp_mark")
     private String erpMark;
     @TableField("erp_massage")
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementsummaryEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementsummaryEntity.java
index 57dc4e4d..8ed118a7 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementsummaryEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementsummaryEntity.java
@@ -82,7 +82,8 @@ public class CwsettlementsummaryEntity  {
     private String lineNo;
     @TableField("DESCRIPTION")
     private String description;
-
+    @TableField("ITEM_NM_INV")
+    private String itemNmInv;
     @TableField("ord_ln")
     private String ordLn;
     @TableField("business_code")
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementForm.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementForm.java
index dd507de0..06523fd4 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementForm.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementForm.java
@@ -1,5 +1,6 @@
 package jnpf.model.cwsettlement;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
@@ -131,6 +132,38 @@ public class CwsettlementForm  {
     /** 备注 **/
     @JsonProperty("remark")
     private String remark;
+    @JsonProperty("bookDate")
     private Date bookDate;
+    @JsonProperty("custTy")
     private String custTy;
+    @JsonProperty("INVOICE_DATE")
+    private Date invoiceDate;
+    @JsonProperty("INVOICE_CNT")
+    private int invoiceCnt;
+    @JsonProperty("INVOICE_NO")
+    private String invoiceNo;
+    @JsonProperty("INVOICE_TYPE")
+    private String invoiceType;
+    @JsonProperty("ATTRIBUTE11")
+    private String attribute11;
+    @JsonProperty("INVOICE_AMOUNT")
+    private BigDecimal invoiceAmount;
+    @JsonProperty("GL_DATE")
+    private Date glDate;
+    @JsonProperty("DESCRIPTION")
+    private String description;
+    @JsonProperty("ANNEX_CNT")
+    private int annexCnt;
+    @JsonProperty("erpMark")
+    private String erpMark;
+    @JsonProperty("erpMassage")
+    private String erpMassage;
+    @JsonProperty("erpTime")
+    private Date erpTime;
+    @JsonProperty("yunguanMark")
+    private String yunguanMark;
+    @JsonProperty("yunguanMassage")
+    private String yunguanMassage;
+    @JsonProperty("yunguanTime")
+    private Date yunguanTime;
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementsummaryModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementsummaryModel.java
index ae9b0efa..9e735fb1 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementsummaryModel.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementsummaryModel.java
@@ -76,4 +76,6 @@ public class CwsettlementsummaryModel  {
     private String warehouseName;
     @JSONField(name = "storageNumber")
     private BigDecimal storageNumber;
+    @JSONField(name = "lineNo")
+    private String lineNo;
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue
index 19cfe405..2fc249ae 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue
@@ -1320,6 +1320,94 @@
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
+
+
+
+          <el-col :span="8">
+            <jnpf-form-tip-item label="发票日期" prop="invoiceDate">
+              <JnpfDatePicker v-model="dataForm.invoiceDate" @change="changeData('startTime',-1)"
+                :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择"
+                :disabled="judgeWrite('settlableAmount')" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
+              </JnpfDatePicker>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="发票张数"
+              prop="invoiceCnt">
+              <JnpfInputNumber v-model="dataForm.invoiceCnt"
+                @change="changeData('invoiceCnt', -1)" placeholder="请输入"
+                :disabled="judgeWrite('settlableAmount')" addonAfter="张" clearable
+                :style='{ "width": "100%" }'>
+              </JnpfInputNumber>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="发票编号"
+              prop="invoiceNo">
+              <JnpfInput v-model="dataForm.invoiceNo"
+                @change="changeData('settlableAmount',-1)" placeholder="请输入"
+                clearable :style='{"width":"100%"}'>
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="发票类型" prop="invoiceType">
+              <JnpfSelect v-model="dataForm.invoiceType" @change="changeData('settlableAmount',-1)"
+                :disabled="judgeWrite('settlableAmount')" optionType="button" direction="horizontal"
+                :options="invoiceTypeOptions" :props="invoiceTypeProps">
+              </JnpfSelect>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="发票编号"
+              prop="attribute11">
+              <JnpfInput v-model="dataForm.attribute11"
+                @change="changeData('attribute11',-1)" placeholder="请输入"
+                clearable :style='{"width":"100%"}'>
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="发票金额"
+              prop="invoiceAmount">
+              <JnpfInput v-model="dataForm.invoiceAmount"
+                @change="changeData('invoiceAmount',-1)" placeholder="请输入"
+                addonAfter="元" clearable :style='{"width":"100%"}'>
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="入账时间" prop="glDate">
+              <JnpfDatePicker v-model="dataForm.glDate" @change="changeData('startTime',-1)"
+                :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择"
+                :disabled="judgeWrite('settlableAmount')" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
+              </JnpfDatePicker>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="摘要"
+              prop="description">
+              <JnpfInput v-model="dataForm.description"
+                @change="changeData('settlableAmount',-1)" placeholder="请输入"
+                clearable :style='{"width":"100%"}'>
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="附件张数"
+              prop="annexCnt">
+              <JnpfInputNumber v-model="dataForm.annexCnt"
+                @change="changeData('annexCnt', -1)" placeholder="请输入"
+                :disabled="judgeWrite('settlableAmount')" addonAfter="张" clearable
+                :style='{ "width": "100%" }'>
+              </JnpfInputNumber>
+            </jnpf-form-tip-item>
+          </el-col>
+
+
+
+
+
           <!-- <el-col :span="8" v-if="judgeShow('applyAmount')">
             <jnpf-form-tip-item label="申请金额" v-if="judgeShow('applyAmount')" prop="applyAmount">
               <JnpfInput v-model="dataForm.applyAmount" @change="changeData('applyAmount',-1)" placeholder="请输入"
@@ -1341,14 +1429,14 @@
               <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">结算汇总</span>
             </div>
           </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <jnpf-form-tip-item label="汇总类型">
               <JnpfSelect v-model="dataForm.summaryType" @change="changeData('summaryType', -1)"
                 placeholder="请选择" :disabled="judgeWrite('remark')" :style='{ "width": "100%" }'
                 :options="summaryTypeOptions" :props="summaryTypeProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
-          </el-col>
+          </el-col> -->
 
           <el-col :span="24" v-if="judgeShow('cwsettlementpaymentreceipt-${html.relationField}')">
             <jnpf-form-tip-item label-width="0">
@@ -1372,6 +1460,32 @@
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
+                <el-table-column label="开票商品名称" v-if="judgeShow('cwsettlementsummary-itemNmInv')" prop="itemNmInv"
+                  align="center" width="200">
+                  <template slot="header">
+                    <span class="required-sign"
+                      v-if="judgeRequired('cwsettlementsummaryList-itemNmInv')">*</span>开票商品名称
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.itemNmInv"
+                      @change="changeData('cwsettlementsummary-itemNmInv',scope.$index)"
+                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                    </JnpfInput>
+                  </template>
+                </el-table-column>
+                <el-table-column label="摘要" v-if="judgeShow('cwsettlementsummary-description')" prop="description"
+                  align="center" width="200">
+                  <template slot="header">
+                    <span class="required-sign"
+                      v-if="judgeRequired('cwsettlementsummaryList-description')">*</span>摘要
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.description"
+                      @change="changeData('cwsettlementsummary-description',scope.$index)"
+                      placeholder="请输入" clearable :style='{"width":"100%"}'>
+                    </JnpfInput>
+                  </template>
+                </el-table-column>
                 <el-table-column label="规格" v-if="judgeShow('cwsettlementsummary-spec')" prop="spec"
                   align="center" width="150">
                   <template slot="header">
@@ -1859,6 +1973,15 @@ export default {
         settlableAmount: 0,
         applyAmount: 0,
         remark: undefined,
+        invoiceDate: undefined,
+        invoiceCnt: undefined,
+        invoiceNo: undefined,
+        invoiceType: undefined,
+        attribute11: undefined,
+        invoiceAmount: undefined,
+        glDate: undefined,
+        description: undefined,
+        annexCnt: undefined,
         cwsettlementsubjectList: [],
         cwsettlementcontractList: [],
         cwsettlementaccountList: [],
@@ -2177,6 +2300,17 @@ export default {
         "label": "fullName",
         "value": "id"
       },
+      invoiceTypeOptions: [{
+        "fullName": "红冲发票",
+        "id": "1"
+      },{
+        "fullName": "标准发票",
+        "id": "2"
+      }],
+      invoiceTypeProps: {
+        "label": "fullName",
+        "value": "id"
+      },
       costBearingMianOptions: [{
         "fullName": "甲方",
         "id": "1"