md

src/views/emis/EmisBaseTools/TaxInput.vue

@@ -131,6 +131,16 @@ import { debounce } from 'throttle-debounce'
             "taxRate": "0.00",
             "withTaxFlag": "1"
           },
+          {
+            "goodsName": "国际货物运输代理费",
+            "goodsCode": "30408020102",
+            "specType": "次",
+            "unit": "次",
+            "price": "1",
+            "num": "1",
+            "taxRate": "0.00",
+            "withTaxFlag": "1"
+          },
           {
             "goodsName": "国际货运代理服务费",
             "goodsCode": "30408020102",

src/views/emis/emisSettleBill/EmisSettleBillQuery.vue

@@ -218,6 +218,12 @@
             <el-table-column :label="$t('回款联系人')" align="center" prop="payee" width="100" />
             <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" width="100" />
 
+
+            <el-table-column :label="$t('账期(天)')" align="center" prop="creditPeriod" min-width="100" />
+            <el-table-column :label="$t('账单日')" align="center" prop="settleDay" min-width="100" />
+            <el-table-column :label="$t('最后回款日')" align="center" prop="paymentDueDate" min-width="170" />
+
+
             <el-table-column :label="$t('账单生成时间')" align="center" prop="createTime" width="170" :show-overflow-tooltip="true"/>
 
             <el-table-column :label="$t('业务确认状态')" align="center" prop="blConfirmSite" min-width="120" >

src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue

@@ -425,6 +425,17 @@ export default {
       this.queryParams.isAsc = column.order;
       this.getList();
     },
+    calcInvoiceNum(row) {
+      let qParam = {
+        pageNum:1,
+        pageSize:3,
+        applySeqNo: row.applySeqNo,
+        openChStatus:'2'
+      }
+      listEmisSettleInvoiceChRecord(qParam).then(response => {
+        row.invoiceChNum = response.total;
+      });
+    },
     handleDownPDF(row) {
       let qParam = {
         pageNum:1,

src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue

@@ -138,20 +138,28 @@
       <el-table-column :label="$t('账单名称')" align="center" prop="settleBillName" min-width="100" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('发票文件')" align="center" prop="filePath" min-width="170" :show-overflow-tooltip="true">
       <template slot-scope="scope">
-
+            <div v-if="scope.row.invoiceStatus=='2'">
                 <el-button
-                  v-if="scope.row.invoiceStatus=='2'"
+                  v-if="scope.row.invoiceChNum&&scope.row.invoiceChNum>1"
+                  type="primary"
+                  plain
+                  icon="el-icon-document-copy"
+                  size="mini"
+                  @click="handleDownPDF(scope.row,$event)"
+                >复制发票地址(存在多张发票)</el-button>
+                <el-button
+                  v-else
                   type="primary"
                   plain
                   icon="el-icon-document-copy"
                   size="mini"
                   @click="handleDownPDF(scope.row,$event)"
                 >复制发票地址</el-button>
-
+            </div>
-
 
         </template>
       </el-table-column>
+
       <el-table-column :label="$t('开票状态')" align="center" prop="invoiceStatus" width="100" >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.invoiceStatus=='0'" type="info">未开票</el-tag>
@@ -284,10 +292,6 @@ export default {
         pageNum: 1,
         pageSize: 20,
 
-
-
-
-
         applySeqNo: null,
         applyDate: null,
         applyManCode: null,
@@ -342,7 +346,6 @@ export default {
     },
     /** 查询开票记录表列表 */
     getList() {
-
        // 按运单查询时的处理
        if(this.queryOrderType=="1"){
         this.queryParams.params.billCode=this.queryParams.queryCode;
@@ -360,6 +363,11 @@ export default {
         this.emisSettleInvoiceRecordList = response.rows;
         this.total = response.total;
         this.loading = false;
+
+        this.emisSettleInvoiceRecordList.forEach(item=>{
+            this.calcInvoiceNum(item);
+        });
+
       });
     },
 
@@ -402,6 +410,17 @@ export default {
        this.titleForm = "修改";
     },
 
+    calcInvoiceNum(row) {
+      let qParam = {
+        pageNum:1,
+        pageSize:3,
+        applySeqNo: row.applySeqNo,
+        openChStatus:'2'
+      }
+      listEmisSettleInvoiceChRecord(qParam).then(response => {
+        row.invoiceChNum = response.total;
+      });
+    },
     handleDownPDF(row) {
       let qParam = {
         pageNum:1,

src/views/system/sysDataAuditRecord/index.vue

@@ -92,7 +92,12 @@
       <!-- <el-table-column :label="$t('修改表名')" align="center" prop="tableName" min-width="100" /> -->
       <el-table-column :label="$t('修改表名')" align="center" prop="tableComment" min-width="100" />
       <el-table-column :label="$t('修改时间')" align="center" prop="createTime" min-width="170" />
-      <el-table-column :label="$t('操作类型')" align="center" prop="operationType" min-width="100" />
+      <el-table-column :label="$t('操作类型')" align="center" prop="operationType" min-width="100" >
+      <template slot-scope="scope">
+                <div v-if="scope.row.operationType==1" >修改</div>
+                <div  v-if="scope.row.operationType==2" >删除</div>
+            </template>
+        </el-table-column>
       <!-- <el-table-column :label="$t('修改字段')" align="center" prop="fieldName" min-width="100" /> -->
       <el-table-column :label="$t('修改字段')" align="center" prop="fieldComment" min-width="100" />
       <el-table-column :label="$t('修改前值')" align="center" prop="oldValue" min-width="100" />