md

src/api/emis/emisSettleBill.js

@@ -25,6 +25,15 @@ export function confirmSettleBillBySite(id) {
   })
 }
 
+
+// 站点取消确认
+export function cancelConfirmBillBySite(id) {
+  return request({
+    url: '/emis/emisSettleBill/cancelConfirmBillBySite/' + id,
+    method: 'post'
+  })
+}
+
 // 站点确认不开票
 export function confirmNotOpenBillBySite(id) {
   return request({

src/components/ImageUpload/index.vue

@@ -219,21 +219,21 @@ export default {
 }
 
 :deep .el-upload--picture-card {
-    width: 50px!important;
+    width: 60px!important;
-    height: 50px!important;
+    height: 60px!important;
-    line-height:50px!important;
+    line-height:60px!important;
 }
 
 :deep .el-upload-list--picture-card  {
-    width: 50px!important;
+    width: 60px!important;
-    height: 50px!important;
+    height: 60px!important;
-    line-height:50px!important;
+    line-height:60px!important;
 }
 
 :deep .el-upload-list--picture-card .el-upload-list__item {
-    width: 50px!important;
+    width: 60px!important;
-    height: 50px!important;
+    height: 60px!important;
-    line-height:50px!important;
+    line-height:60px!important;
 }
 
 </style>

src/components/XdTextareaInput/index.vue

@@ -69,7 +69,7 @@ export default {
     .clearButton {
       position: absolute;
       border-radius: 5px;
-      right: 3px;
+      right: 10px;
       z-index: 2;
       border: none;
       top: -3px;

src/views/emis/emisSettleBill/index.vue

@@ -19,10 +19,6 @@
             <el-form-item label="账单生成时间" prop="dateTimeRange" label-width="110px">
                   <elDateAdvPicker  placeholder="账单生成时间" v-model="dateTimeRange"  style="z-index:9999;width:300px" ></elDateAdvPicker>
               </el-form-item>
-            <el-form-item label="账单月份" prop="billMonth">
-              <el-date-picker  size="mini" style="width:120px" v-model="queryParams.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
-            </el-form-item>
-
             <el-form-item   :label="$t('核销状态')" prop="chargeStatus">
               <el-select  clearable v-model="queryParams.chargeStatus" placeholder="核销状态" style="width:100%">
                   <el-option key="0" label="未核销" value="0"></el-option>
@@ -196,6 +192,11 @@
                 <el-tag v-if="scope.row.chargeStatus=='1'" type="success">已核销</el-tag>
               </template>
             </el-table-column>
+            <el-table-column :label="$t('月结客户')" align="center" prop="custName" min-width="150" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                  <span  type="normal">{{ scope.row.custName }}</span>
+                </template>
+            </el-table-column>
             <el-table-column :label="$t('总票数')" align="center" prop="sendPieceSum" width="80" />
             <el-table-column :label="$t('总件数')" align="center" prop="pieceNumber" width="80" />
             <el-table-column :label="$t('结算重量')" align="center" prop="feeWeight" width="80" />

src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue

@@ -46,7 +46,7 @@
           <el-tag type="success" v-if="settleBillItem.paymentStatus==1">已收款</el-tag>
           <el-tag type="warning" v-if="settleBillItem.paymentStatus==2">部分收款</el-tag>
         </div>
-        <div>收款明细：总应收:<span style="color:red;font-weight:500;">￥{{ settleBillItem.recMoney }}</span>,￥已收:<span style="color:blue;font-weight:500;">{{ settleBillItem.recedMoney }}</span></div>
+        <div>收款明细：总应收:<span style="color:red;font-weight:500;">￥{{ settleBillItem.recMoney }}</span>,已收:<span style="color:blue;font-weight:500;">￥{{ settleBillItem.recedMoney }}</span></div>
         <div>
           <PayRecordList :settleBillNo="settleBillNo"> </PayRecordList>
         </div>
@@ -54,7 +54,7 @@
     <div style="margin-bottom:20px">
 
       <div style="font-weight:500;margin-bottom:20px">
-          开票状态:
+          开票申请:
           <el-tag type="info" v-if="settleBillItem.openBillStatus==0">未开票</el-tag>
           <el-tag type="success" v-if="settleBillItem.openBillStatus==1">已开票</el-tag>
           <el-tag type="warning" v-if="settleBillItem.openBillStatus==2">部分开票</el-tag>
@@ -62,10 +62,17 @@
         </div>
         <!-- <div>最高可开票金额:<span style="color:red;font-weight:500;">{{ settleBillItem.recMoney }}</span>,已开票:<span style="color:blue;font-weight:500;"></span></div> -->
         <div>
-          <InvoiceRecordList :settleBillNo="settleBillNo"> </InvoiceRecordList>
+          <InvoiceChRecordListReadOnly :settleBillNo="settleBillNo" > </InvoiceChRecordListReadOnly>
-        </div>
+          <!-- <InvoiceRecordList :settleBillNo="settleBillNo"> </InvoiceRecordList> -->
         </div>
 
+        <!-- <div>
+          实际开票
+        </div> -->
+
+    </div>
+
+    <div style="margin-bottom:20px">
       <div style="font-weight:500;margin-bottom:20px">
             子账单列表:
       </div>
@@ -81,6 +88,8 @@ import { getInfoBySettleBillNo } from "@/api/emis/emisSettleBill";
 import PayRecordList from '@/views/emis/emisSettlePayRecord/panel/PayRecordList.vue';
 import InvoiceRecordList from '@/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue';
 import SubBillList from '@/views/emis/emisSettleSubBill/SubBillList.vue';
+import InvoiceChRecordListReadOnly from '@/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordListReadOnly.vue';
+
 export default {
   name: "BillDetailPanel",
   props:{
@@ -91,7 +100,8 @@ export default {
   components: {
     PayRecordList,
     InvoiceRecordList,
-    SubBillList
+    SubBillList,
+    InvoiceChRecordListReadOnly
  },
   dicts: [
   ],

src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue

@@ -238,7 +238,7 @@
 
           </XdTable>
 
-        <el-dialog :title="titleForm" :visible.sync="openForm" width="70%" :destroy-on-close="true" v-dialogDrag append-to-body>
+        <el-dialog :title="titleForm" :visible.sync="openForm" width="70%" :destroy-on-close="true"  v-dialogDrag  append-to-body  :close-on-click-modal="false">
           <PayRecordInput :settleBillNo="currentSettleBillNo" settleType="1"  @on-changed="handleFormChanged" @on-cancel="cancelForm"></PayRecordInput>
         </el-dialog>
 

src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue

@@ -240,7 +240,7 @@
 
           </XdTable>
           <!-- :settleBillObj="currentSettleBillObj" -->
-        <el-dialog :title="titleForm" :visible.sync="openForm" width="70%" :destroy-on-close="true" v-dialogDrag append-to-body>
+        <el-dialog :title="titleForm" :visible.sync="openForm" width="70%" :destroy-on-close="true"  v-dialogDrag  append-to-body  :close-on-click-modal="false">
           <PayRecordInput :settleBillNo="currentSettleBillNo" settleType="2"  @on-changed="handleFormChanged" @on-cancel="cancelForm"></PayRecordInput>
         </el-dialog>
 

src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue

@@ -123,7 +123,7 @@
                >确认账单</el-button>
              </el-col>
 
-             <!-- <el-col :span="1.5" v-if="confirmStatus==1">
+             <el-col :span="1.5" v-if="confirmStatus==1">
                <el-button
                  type="danger"
                  plain
@@ -131,7 +131,7 @@
                  :disabled="multiple"
                  @click="handleCancelConfirmBySite"
                >取消确认</el-button>
-             </el-col> -->
+             </el-col>
              <!-- <el-col :span="1.5"  v-if="activeTab=='waitConfirm'">
                <el-button
                  type="primary"
@@ -196,6 +196,11 @@
                 <el-tag v-if="scope.row.chargeStatus=='1'" type="success">已核销</el-tag>
               </template>
             </el-table-column>
+            <el-table-column :label="$t('月结客户')" align="center" prop="custName" min-width="150" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                  <span  type="normal">{{ scope.row.custName }}</span>
+                </template>
+            </el-table-column>
             <el-table-column :label="$t('总票数')" align="center" prop="sendPieceSum" width="80" />
             <el-table-column :label="$t('总件数')" align="center" prop="pieceNumber" width="80" />
             <el-table-column :label="$t('结算重量')" align="center" prop="feeWeight" width="80" />
@@ -246,7 +251,9 @@
 </template>
 
 <script>
-import { listEmisSettleBill,confirmSettleBillBySite, getEmisSettleBill, delEmisSettleBill, addEmisSettleBill, updateEmisSettleBill } from "@/api/emis/emisSettleBill";
+import { listEmisSettleBill,confirmSettleBillBySite,
+  cancelConfirmBillBySite,
+  getEmisSettleBill, delEmisSettleBill, addEmisSettleBill, updateEmisSettleBill } from "@/api/emis/emisSettleBill";
 import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue';
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 
@@ -411,6 +418,15 @@ export default {
        this.$modal.msgSuccess("操作成功");
      }).catch(() => {});
    },
+   handleCancelConfirmBySite(row) {
+     const ids = row.id || this.ids;
+     this.$modal.confirm('是否取消确认').then(function() {
+       return cancelConfirmBillBySite(ids);
+     }).then(() => {
+       this.getList();
+       this.$modal.msgSuccess("操作成功");
+     }).catch(() => {});
+   },
    handleGenPayCode(row) {
     this.$modal.msgSuccess("暂不支持");
      const ids = row.id || this.ids;

src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue

@@ -216,7 +216,7 @@
 
           </XdTable>
 
-          <el-dialog :title="titleForm" :visible.sync="openForm" width="70%" :destroy-on-close="true" v-dialogDrag append-to-body>
+          <el-dialog :title="titleForm" :visible.sync="openForm" width="70%"  :destroy-on-close="true"  v-dialogDrag  append-to-body  :close-on-click-modal="false">
             <emisSettleInvoiceRecordForm :id="currentId" :billList="selectBillList"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSettleInvoiceRecordForm>
           </el-dialog>
 

src/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordListReadOnly.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <XdTable v-loading="loading"
+    <el-table v-loading="loading"
            border stripe
            size="mini"
 
@@ -33,14 +33,14 @@
           </el-row>
       </div>
 
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
 
       <el-table-column label="序号" align="center" width="60">
             <template slot-scope="scope">
                 <span v-text="getIndex(scope.$index)"> </span>
             </template>
       </el-table-column>
-      <el-table-column :label="$t('流水号')" align="center" prop="reqNo" width="170" :show-overflow-tooltip="true" />
+      <!-- <el-table-column :label="$t('流水号')" align="center" prop="reqNo" width="170" :show-overflow-tooltip="true" /> -->
       <!-- <el-table-column :label="$t('发票申请序号')" align="center" prop="applySeqNo" width="100" /> -->
       <!-- <el-table-column :label="$t('是否电子发票')" align="center" prop="blEcinv" width="100" /> -->
       <!-- <el-table-column :label="$t('申请开票类型')" align="center" prop="invoiceType" width="100" :show-overflow-tooltip="true" /> -->
@@ -111,7 +111,7 @@
       <!-- <el-table-column :label="$t('扩展信息，货物名称')" align="center" prop="extData" width="100" :show-overflow-tooltip="true" /> -->
       <el-table-column :label="$t('开票备注')" align="center" prop="remark" width="100" :show-overflow-tooltip="true" />
 
-    </XdTable>
+    </el-table>
 
 
   </div>
@@ -131,7 +131,11 @@ export default {
     },
     applySeqNo:{
         type:String
-    }
+    },
+    settleBillNo:{
+        type:String
+    },
+
   },
   components: { elDateSimplePicker,emisSettleInvoiceChRecordForm },
   dicts: ['emis_invoice_ch_type'
@@ -172,7 +176,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 20,
+        pageSize: 50,
         reqNo: null,
         applySeqNo: this.applySeqNo,
         blEcinv: null,
@@ -204,11 +208,14 @@ export default {
         opDate: null,
         opSiteCode: null,
         openChId: null,
-        openChStatus: null,
+        openChStatus: '2',
         openChStatusDesc: null,
         openComCode: null,
         extData: null,
         remark: null,
+        params:{
+          settleBillNo:this.settleBillNo
+        }
       },
     };
   },
@@ -222,6 +229,15 @@ export default {
         },
         deep: true
       },
+      "settleBillNo": {
+        handler (newValue, oldValue) {
+          this.queryParams.params.settleBillNo = this.settleBillNo;
+          if(this.settleBillNo){
+             this.getList();
+          }
+        },
+        deep: true
+      },
 
   },
   created() {
@@ -231,7 +247,7 @@ export default {
     /** 查询渠道开票记录表列表 */
     getList() {
       this.loading = true;
-      listEmisSettleInvoiceChRecord(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+      listEmisSettleInvoiceChRecord(this.queryParams).then(response => {
         this.emisSettleInvoiceChRecordList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue

@@ -284,7 +284,7 @@ export default {
                this.$modal.msgSuccess("新增成功");
                let empName=this.$store.getters.empName;
                 let message=empName+" 提交了开票申请,请及时开票！";
-                this.noticeToEmpUser("padmin,88888042,88888047,88888034,88888059",message);
+                this.noticeToEmpUser("padmin,88888042,88888047,88888034,88888059,88888083",message);
 
                this.$emit("on-changed");
             });

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

@@ -16,27 +16,69 @@
            @sort-change="handleSortChange"
            >
 
-      <el-table-column :label="$t('申请序号')" align="center" prop="applySeqNo" min-width="100" />
+           <el-table-column :label="$t('申请时间')" align="center" prop="applyDate" min-width="170" />
-      <el-table-column :label="$t('申请时间')" align="center" prop="applyDate" min-width="100" />
+      <el-table-column :label="$t('账单名称')" align="center" prop="settleBillName" min-width="100" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('账单名称')" align="center" prop="settleBillName" min-width="100" />
+      <el-table-column :label="$t('发票文件')" align="center" prop="filePath" min-width="170" :show-overflow-tooltip="true">
-      <el-table-column :label="$t('申请开票金额')" align="center" prop="applyMoney" min-width="100" />
+      <template slot-scope="scope">
-      <el-table-column :label="$t('开票类型')" align="center" prop="invoiceType" min-width="100" />
+
-      <el-table-column :label="$t('开票名称')" align="center" prop="companyName" min-width="100" />
+                <el-button
-      <el-table-column :label="$t('开票税号')" align="center" prop="companyTaxNo" min-width="100" />
+                  v-if="scope.row.invoiceStatus=='2'"
-      <el-table-column :label="$t('开票电话')" align="center" prop="companyTel" min-width="100" />
+                  type="primary"
-      <el-table-column :label="$t('开票地址')" align="center" prop="companyAddress" min-width="100" />
+                  plain
-      <el-table-column :label="$t('联系人')" align="center" prop="contact" min-width="100" />
+                  icon="el-icon-document-copy"
-      <el-table-column :label="$t('联系电话')" align="center" prop="phone" min-width="100" />
+                  size="mini"
-      <el-table-column :label="$t('税类型')" align="center" prop="realTaxType" min-width="100" />
+                  @click="handleDownPDF(scope.row,$event)"
-      <el-table-column :label="$t('开票上限')" align="center" prop="openMoneyMax" min-width="100" />
+                >复制发票地址</el-button>
-      <el-table-column :label="$t('开票金额')" align="center" prop="openMoney" min-width="100" />
+
-      <el-table-column :label="$t('发票号')" align="center" prop="invoiceNo" min-width="100" />
+
-      <el-table-column :label="$t('开票状态')" align="center" prop="invoiceStatus" min-width="100" />
+
-      <el-table-column :label="$t('开票状态描述')" align="center" prop="invoiceStatusDesc" min-width="100" />
+        </template>
-      <el-table-column :label="$t('纸质发票邮寄地址')" align="center" prop="recieveAddress" min-width="100" />
+      </el-table-column>
-      <el-table-column :label="$t('发票投递邮箱')" align="center" prop="email" min-width="100" />
+      <el-table-column :label="$t('开票状态')" align="center" prop="invoiceStatus" width="100" >
-      <el-table-column :label="$t('发票下载路径')" align="center" prop="filePath" min-width="100" />
+        <template slot-scope="scope">
-      <el-table-column :label="$t('开票企业')" align="center" prop="openComCode" min-width="100" />
+          <el-tag v-if="scope.row.invoiceStatus=='0'" type="info">未开票</el-tag>
+          <el-tag v-if="scope.row.invoiceStatus=='1'" type="warning">开票中</el-tag>
+          <el-tag v-if="scope.row.invoiceStatus=='2'" type="success">已开票</el-tag>
+          <el-tag v-if="scope.row.invoiceStatus=='3'" type="error">开票异常</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('审核状态')" align="center" prop="blAudit" width="100" >
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.blAudit=='0'" type="info">未审核</el-tag>
+          <el-tag v-if="scope.row.blAudit=='1'" type="success">审核通过</el-tag>
+          <el-tag v-if="scope.row.blAudit=='2'" type="error">审核不通过</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" min-width="170" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('申请金额')" align="center" prop="applyMoney" min-width="100" />
+      <el-table-column :label="$t('开票类型')" align="center" prop="invoiceType" min-width="100" >
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.invoiceType=='1'" type="info">增值税电子普通发票</el-tag>
+          <el-tag v-if="scope.row.invoiceType=='2'" type="info">增值税普通发票</el-tag>
+          <el-tag v-if="scope.row.invoiceType=='3'" type="info">增值税专用发票</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('开票抬头')" align="center" prop="companyName" min-width="170"  :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('开票税号')" align="center" prop="companyTaxNo" min-width="170" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('申请序号')" align="center" prop="applySeqNo" min-width="170" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('申请人')" align="center" prop="createByName" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('申请站点')" align="center" prop="createSiteName" min-width="100" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column :label="$t('纸质发票邮寄地址')" align="center" prop="recieveAddress" min-width="100" /> -->
+      <el-table-column :label="$t('邮箱')" align="center" prop="email" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('审核日期')" align="center" prop="auditDate" min-width="170" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('审核人')" align="center" prop="auditManName" min-width="100" />
+      <el-table-column :label="$t('操作人')" align="center" prop="opManName" min-width="100" />
+      <el-table-column :label="$t('操作时间')" align="center" prop="opDate" min-width="100" />
+      <el-table-column :label="$t('操作站点')" align="center" prop="opSiteName" min-width="100" />
+
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
 
     </el-table>
 

src/views/emis/emisSettlePayRecord/index.vue

@@ -227,20 +227,12 @@
       <emisSettlePayRecordForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSettlePayRecordForm>
     </el-dialog>
 
-
-    <!--
-    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
-        <emisSettlePayRecordView :id="id" ></EmisSettlePayRecordView>
-    </el-dialog>
-    -->
-
   </XdPageContainer>
 </template>
 
 <script>
 import { listEmisSettlePayRecord, getEmisSettlePayRecord, delEmisSettlePayRecord, addEmisSettlePayRecord, updateEmisSettlePayRecord } from "@/api/emis/emisSettlePayRecord";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
-// import emisSettlePayRecordView from '@/views/emis/emisSettlePayRecord/emisSettlePayRecordView';
 import emisSettlePayRecordForm from '@/views/emis/emisSettlePayRecord/emisSettlePayRecordForm';
 
 export default {
@@ -334,38 +326,33 @@ export default {
         otherReason: null,
         tradeDate: null,
         remark: null,
+        params:{
+          billCode:null,
+        }
       },
     };
   },
   created() {
+    this.queryOrderType="1";
     this.getList();
   },
   methods: {
     /** 查询账单收退款记录列表 */
     getList() {
+
+        // 按运单查询时的处理
+      if(this.queryOrderType=="1"){
+        this.queryParams.params.billCode=this.queryParams.queryCode;
+        this.queryParams.settleBillNo=null;
+      }
+      else if(this.queryOrderType=="2"){
+        this.queryParams.params.billCode=null;
+        this.queryParams.settleBillNo=this.queryParams.queryCode;
+      }
+
       this.loading = true;
-      this.queryParams.params = {};
+
-      if (null != this.daterangeAuditDate && '' != this.daterangeAuditDate) {
+      listEmisSettlePayRecord(this.addDateRange(this.queryParams, this.dateTimeRange,'createTime')).then(response => {
-        this.queryParams.params["beginAuditDate"] = this.daterangeAuditDate[0];
-        this.queryParams.params["endAuditDate"] = this.daterangeAuditDate[1];
-      }
-      if (null != this.daterangeRefundDate && '' != this.daterangeRefundDate) {
-        this.queryParams.params["beginRefundDate"] = this.daterangeRefundDate[0];
-        this.queryParams.params["endRefundDate"] = this.daterangeRefundDate[1];
-      }
-      if (null != this.daterangeTradeDate && '' != this.daterangeTradeDate) {
-        this.queryParams.params["beginTradeDate"] = this.daterangeTradeDate[0];
-        this.queryParams.params["endTradeDate"] = this.daterangeTradeDate[1];
-      }
-      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
-        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
-        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
-      }
-      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
-        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
-        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
-      }
-      listEmisSettlePayRecord(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
         this.emisSettlePayRecordList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue

@@ -13,6 +13,11 @@
            @sort-change="handleSortChange"
            >
 
+      <el-table-column label="序号" align="center" width="60">
+            <template slot-scope="scope">
+                <span v-text="getIndex(scope.$index)"> </span>
+            </template>
+      </el-table-column>
       <el-table-column :label="$t('交易时间')" align="center" prop="tradeDate" width="170" :show-overflow-tooltip="true" />
       <el-table-column :label="$t('流水号')" align="center" prop="payId" width="170" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('收款来源')" align="center" prop="settleType" width="80" >
@@ -43,7 +48,7 @@
         <template slot-scope="scope">
           <el-tag type="info" v-if="scope.row.payStatus == '0' || scope.row.payStatus==null">未支付</el-tag>
           <el-tag type="warning"  v-if="scope.row.payStatus == '1'">支付中</el-tag>
-          <el-tag type="warning"  v-if="scope.row.payStatus == '2'">支付成功</el-tag>
+          <el-tag type="success"  v-if="scope.row.payStatus == '2'">支付成功</el-tag>
           <el-tag type="error" v-if="scope.row.payStatus == '3'">支付失败 </el-tag>
       </template>
     </el-table-column>

src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue

@@ -162,7 +162,6 @@
           <!-- @sort-change="handleSortChange" -->
           <!-- :default-sort="{prop: 'sendDate', order: 'descending'}" -->
 
-
      <div slot="toolbar">
        <el-row :gutter="10" class="mb8">
              <el-col :span="1.5"  v-if="activeTab=='waitConfirm'">
@@ -205,6 +204,16 @@
                  v-hasPermi="['emis:emisSettleSubBill:cancelConfirmBillBySite']"
                >取消确认</el-button>
              </el-col>
+
+             <el-col :span="1.5">
+               <el-button
+                 type="warning"
+                 plain
+                 icon="el-icon-download"
+                 size="mini"
+                 @click="handleExport"
+               >导出</el-button>
+             </el-col>
        </el-row>
      </div>
 
@@ -239,18 +248,28 @@
 
      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" :sortable="true"  />
      <el-table-column :label="$t('子账单')" align="center" prop="billNo" width="130" :show-overflow-tooltip="true"/>
-
+     <el-table-column :label="$t('快件类型')" align="center" prop="kjlx" width="180" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+            <span>{{ scope.row.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}</span>
+          </template>
+      </el-table-column>
      <el-table-column :label="$t('预警提示')" align="center" prop="waybillDetail.blSpecialQuote" width="150"   :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span v-if="scope.row.blConfirmCenter=='0'" style="color:red;font-weight:500">财务未确认,</span>
             <span v-if="scope.row.blConfirmSite=='0'" style="color:red;font-weight:500">业务未确认</span>
           </template>
       </el-table-column>
-      <el-table-column :label="$t('快件类型')" align="center" prop="kjlx" width="180" :show-overflow-tooltip="true">
+      <el-table-column :label="$t('支付类型')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true"   >
          <template slot-scope="scope">
-            <span>{{ scope.row.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}</span>
+           <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType" />
          </template>
        </el-table-column>
+      <el-table-column  :label="$t('月结客户')" align="center" prop="custName" min-width="150"  :sortable="true"   :show-overflow-tooltip="true">
+       <template slot-scope="scope">
+           <span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custName }}</span>
+         </template>
+     </el-table-column>
+
       <el-table-column :label="$t('特殊报价')" align="center" prop="waybillDetail.blSpecialQuote" width="80"     :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span v-if="scope.row.waybillDetail.blSpecialQuote==1">是</span>
@@ -272,11 +291,6 @@
          </template>
      </el-table-column> -->
 
-     <el-table-column  :label="$t('月结客户')" align="center" prop="custName" min-width="150"  :sortable="true"   :show-overflow-tooltip="true">
-       <template slot-scope="scope">
-           <span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custName }}</span>
-         </template>
-     </el-table-column>
 
 
      <el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="80" :sortable="true"   :show-overflow-tooltip="true"/>
@@ -302,11 +316,7 @@
           </el-table-column>
        <el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80"    />
        <el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true"   />
-       <el-table-column :label="$t('支付类型')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true"   >
+
-         <template slot-scope="scope">
-           <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType" />
-         </template>
-       </el-table-column>
        <el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true"  />
        <el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100"  :sortable="true" />
        <el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="100"   :sortable="true" />
@@ -1135,7 +1145,7 @@ export default {
      }).then(() => {
         let empName=this.$store.getters.empName;
         let message=empName+" 确认了出账明细，请及时出账单！";
-        this.noticeToEmpUser("padmin,88888042,88888047,88888034,88888059",message);
+        this.noticeToEmpUser("padmin,88888042,88888047,88888034,88888059,88888083",message);
 
        this.getList();
        this.$modal.msgSuccess("操作成功");
@@ -1188,50 +1198,108 @@ export default {
    cancelForm(){
      this.openForm = false;
    },
-
   /** 导出按钮操作 */
   handleExport() {
-   //   this.download('emis/emisSettleSubBill/export', {
-   //     ...this.queryParams
-   //   }, `emisSettleSubBill_${new Date().getTime()}.xlsx`)
       const loadingInstance = this.$loading({
             text: '正在导出...'
       })
-       let qParam=this.initQueryParams();
-      qParam.pageNum=1;
-      qParam.pageSize=5000;
 
-      listEmisSettleSubBill(qParam).then(response => {
+      if(this.selectBillList&&this.selectBillList.length>0){
-       this.downloadLoading = false
+        this.exportData(this.selectBillList,loadingInstance);
+      }
+      else{
+          let qExportParam=this.initQueryParams();
+          qExportParam.pageNum=1;
+          qExportParam.pageSize=5000;
+
+          listEmisWaybill(qExportParam).then(response => {
             if (response.code === 200) {
-               const curList = response.rows
+              this.exportData(response.rows,loadingInstance);
+            }
+          });
+      }
+    },
+    exportData(selData,loadingInstance){
+      const curList =selData
       import('@/vendor/Export2Excel').then(excel => {
-                 const tHeader = ['id','分账单号','父账单号','总结算账单号','运单号','出账时间','账单费用','费用币种','结算账单类型','是否已拆单','账单月份','月结编号','客户编码','客户名称','财务确认状态','财务确认日期','财务确认站点','财务确认人','站点确认状态','财务确认备注','站点确认日期','站点确认人','网点确认备注','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建网点','更新网点',];
+        const exportParam=this.$refs.refTable.getExportParam();
-                 const filterVal = ['id','billNo','parentBillNo','settleBillNo','billCode','billDate','billFee','currency','settleType','blSplit','billMonth','custNo','customerCode','customerName','blConfirm','confirmDate','confirmSite','confirmManCode','blSiteConfirm','confirmNote','siteConfirmDate','siteConfirmManCode','siteConfirmNote','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
+        const tHeader = exportParam.header;
-                 const data = this.formatJson(filterVal, curList, response.rows)
+        const filterVal = exportParam.filter;
+        const data = this.formatJson(filterVal, curList, selData)
         excel.export_json_to_excel({
           header: tHeader,
           data,
-                   filename: '结算子账单',
+          filename: '现金账单导出',
           autoWidth: true
         })
         loadingInstance.close()
       })
-       }
-     });
     },
     formatJson(filterVal, jsonData, resData) {
       let index = 0
       return jsonData.map(v => filterVal.map(j => {
+
+        console.log("===>1111===>",v);
+
         if (j === 'index') {
           return ++index
         }
-       if (j === 'status') {
+        if (j === 'kjlx') {
-         var statusStr='xxx'
+          return v['waybillDetail']['sendSiteName']+'--'+v['waybillDetail']['dispatchUnderlingSiteName'];
-         if(v[j] == 10){
-             statusStr='xxx'
         }
-         return statusStr;
+        if (j === 'fjr') {
+          return v['sendName']+'--'+v['receiveName'];
+        }
+        if (j === 'sendMobile') {
+          return "";
+        }
+        if (j === 'paymentStatus') {
+          return this.selectDictLabel(this.dict.type.emis_payment_status,v['waybillDetail']['paymentStatus']);
+        }
+
+        if (j === 'pickupMethod') {
+          return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v[j]);
+        }
+        if (j === 'customsEclaration') {
+          return this.selectDictLabel(this.dict.type.emis_declare_mode,v[j]);
+        }
+        if (j === 'customsClear') {
+          return this.selectDictLabel(this.dict.type.emis_customs_clear,v[j]);
+        }
+        if (j === 'packType') {
+          return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v[j]);
+        }
+
+        if (j === 'dispatchMethod') {
+          if(v[j] == 1){
+            return '派送';
+          }else{
+            return '自提';
+          }
+        }
+        if (j === 'blMessage') {
+          if(v[j] == 1){
+            return '发送';
+          }else{
+            return '不发送';
+          }
+        }
+        if (j === 'blAcceptMessage') {
+          if(v[j] == 1){
+            return '发送';
+          }else{
+            return '不发送';
+          }
+        }
+        if (j === 'blSign') {
+          if(v[j] == 1){
+            return '已签收';
+          }else{
+            return '未签收';
+          }
+        }
+        if (j === 'paymentType') {
+          return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
         }
         return v[j]
       }))

src/views/emis/emisSettleSubBill/SubBillList.vue

@@ -850,7 +850,7 @@ export default {
      }).then(() => {
         let empName=this.$store.getters.empName;
         let message=empName+" 确认了出账明细，请及时出账单！";
-        this.noticeToEmpUser("padmin,88888042,88888047,88888034,88888059",message);
+        this.noticeToEmpUser("padmin,88888042,88888047,88888034,88888059,88888083",message);
 
        this.getList();
        this.$modal.msgSuccess("操作成功");

src/views/emis/emisWaybill/statpanel/ScanDtlListPanel.vue

@@ -34,6 +34,7 @@
             <el-table-column :label="$t('发件扫描次数')" align="center" prop="sendCount" min-width="120" />
             <el-table-column :label="$t('到件扫描次数')" align="center" prop="arrivalCount" min-width="120" />
             <el-table-column :label="$t('派件扫描次数')" align="center" prop="sentCount" min-width="120" />
+            <el-table-column :label="$t('转件扫描次数')" align="center" prop="transferCount" min-width="120" />
             <el-table-column :label="$t('问题件扫描次数')" align="center" prop="issueCount" min-width="120" />
             <el-table-column :label="$t('留仓扫描次数')" align="center" prop="holdCount" min-width="120" />
             <el-table-column :label="$t('签收状态')" align="center" prop="waybillDetail.blSign" width="80" >

src/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm.vue

@@ -226,7 +226,7 @@ export default {
 
                let empName=this.$store.getters.empName;
                let message=empName+" 提交了费用审核,请及时审批,单号:"+this.form.billCode;
-               this.noticeToEmpUser("padmin,88888042,88888047,88888034,88888059",message);
+               this.noticeToEmpUser("padmin,88888042,88888047,88888034,88888059,88888083",message);
 
                this.$emit("on-changed");
            });