md

src/api/emis/emisSettleInvoiceRel.js

@@ -9,6 +9,14 @@ export function listEmisSettleInvoiceRel(query) {
   })
 }
 
+export function listHasOpenListBySettleBillNo(query) {
+  return request({
+    url: '/emis/emisSettleInvoiceRel/listHasOpenListBySettleBillNo',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询开票子账单关联表详细
 export function getEmisSettleInvoiceRel(id) {
   return request({

src/api/emis/emisSettlePayRecord.js

@@ -9,6 +9,8 @@ export function listEmisSettlePayRecord(query) {
   })
 }
 
+
+
 // 查询账单收退款记录详细
 export function getEmisSettlePayRecord(id) {
   return request({

src/api/emis/emisSettlePayRel.js

@@ -9,6 +9,14 @@ export function listEmisSettlePayRel(query) {
   })
 }
 
+export function listHasPayBySettleBillNo(query) {
+  return request({
+    url: '/emis/emisSettlePayRel/listHasPayBySettleBillNo',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询支付子账单关联表详细
 export function getEmisSettlePayRel(id) {
   return request({

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

@@ -50,6 +50,10 @@
         <div>
           <PayRecordList :settleBillNo="settleBillNo"> </PayRecordList>
         </div>
+        <div>收款单号列表</div>
+        <div>
+          <PayRecordSubBillRelList :settleBillNo="settleBillNo"> </PayRecordSubBillRelList>
+        </div>
     </div>
     <div style="margin-bottom:20px">
 
@@ -67,14 +71,11 @@
           <InvoiceChRecordListReadOnly :settleBillNo="settleBillNo" > </InvoiceChRecordListReadOnly>
           <!-- <InvoiceRecordList :settleBillNo="settleBillNo"> </InvoiceRecordList> -->
         </div>
-        <!--
-        <div>
         <div>开票单号</div>
-            <div v-if="emisSettleInvoiceRecord!=null">
-              <ApplyInvoiceSubBillRelList :applySeqNo="emisSettleInvoiceRecord.applySeqNo" > </ApplyInvoiceSubBillRelList>
+        <div>
+            <InvoiceSubBillRelList :settleBillNo="settleBillNo" > </InvoiceSubBillRelList>
         </div>
-        </div>
-        -->
+
 
     </div>
 
@@ -94,10 +95,17 @@
 <script>
 import { getInfoBySettleBillNo } from "@/api/emis/emisSettleBill";
 import PayRecordList from '@/views/emis/emisSettlePayRecord/panel/PayRecordList.vue';
+import PayRecordSubBillRelList from '@/views/emis/emisSettlePayRecord/panel/PayRecordSubBillRelList.vue';
+
+
 import InvoiceRecordList from '@/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue';
+import InvoiceSubBillRelList from '@/views/emis/emisSettleInvoiceRel/InvoiceSubBillRelList.vue';
+
 import SubBillList from '@/views/emis/emisSettleSubBill/SubBillList.vue';
 import InvoiceChRecordListReadOnly from '@/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordListReadOnly.vue';
 
+
+
 export default {
   name: "BillDetailPanel",
   props:{
@@ -107,7 +115,10 @@ export default {
   },
   components: {
     PayRecordList,
+    PayRecordSubBillRelList,
     InvoiceRecordList,
+    InvoiceSubBillRelList,
+
     SubBillList,
     InvoiceChRecordListReadOnly
  },

src/views/emis/emisSettleInvoiceRel/ApplyInvoiceSubBillRelList.vue

@@ -84,6 +84,9 @@ export default {
   name: "emisSettleInvoiceRel",
   components: { elDateSimplePicker,emisSettleInvoiceRelForm },
   props:{
+    settleBillNo:{
+        type:String
+    },
     applySeqNo:{
         type:String
     },
@@ -126,6 +129,7 @@ export default {
         pageNum: 1,
         pageSize: 5000,
         applySeqNo: this.applySeqNo,
+        settleBillNo: this.settleBillNo,
         billNo: null,
         money: null,
         delFlag: null,
@@ -142,6 +146,15 @@ export default {
         },
         deep: true
       },
+      "settleBillNo": {
+        handler (newValue, oldValue) {
+          this.queryParams.settleBillNo = this.settleBillNo;
+          if(this.settleBillNo){
+             this.getList();
+          }
+        },
+        deep: true
+      },
   },
   created() {
     this.getList();

src/views/emis/emisSettleInvoiceRel/InvoiceSubBillRelList.vue

@@ -0,0 +1,234 @@
+<template>
+  <div>
+    <el-table  v-loading="loading"
+           border stripe
+           size="small"
+           :data="emisSettleInvoiceRelList"
+           :showSearch.sync="showSearch"
+           :queryParams="queryParams"
+           :total="total"
+           @queryTable="getList"
+           @selection-change="handleSelectionChange"
+           @sort-change="handleSortChange"
+           >
+
+             <!-- max-height="500px" -->
+             <el-table-column  :label="$t('序号')" align="center" width="60">
+                                  <template slot-scope="scope">
+                                      <span > {{scope.$index+1}}</span>
+                                  </template>
+                            </el-table-column>
+                            <el-table-column prop="billNo"  :label="$t('运单号')"  align="center" width="170">
+                              <template slot-scope="scope">
+                                 <span>{{ scope.row.billNo }}</span>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="billFee"  :label="$t('运费')"  align="center" width="100">
+                              <template slot-scope="scope">
+                                {{scope.row.waybillDetail.freight}}
+                              </template>
+                            </el-table-column>
+                            <!-- <el-table-column prop="canApplyFee"  :label="$t('可开票金额')"  align="center" width="100">
+                              <template slot-scope="scope">
+                                {{scope.row.canApplyFee}}
+                              </template>
+                            </el-table-column> -->
+                            <el-table-column prop="money"  :label="$t('开票金额')"  align="center" width="120">
+                              <template slot-scope="scope">
+                                {{ scope.row.money }}
+                              </template>
+                            </el-table-column>
+                            <el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170"    :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.sendName" width="100" :show-overflow-tooltip="true"/>
+                            <el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" width="150"  :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="custName" min-width="80" :show-overflow-tooltip="true">
+                              <template slot-scope="scope">
+                                  <span v-if="scope.row.waybillDetail.paymentType==2 || scope.row.waybillDetail.paymentType==4 || scope.row.waybillDetail.paymentType==5">{{scope.row.waybillDetail.custName}}</span>
+                                  <span v-else></span>
+                                </template>
+                              </el-table-column>
+                            <el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" width="120" :show-overflow-tooltip="true"/>
+                            <el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" width="80"      />
+                            <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" width="120"   />
+                            <el-table-column :label="$t('结算体积')" align="center" prop="waybillDetail.totalVolume" min-width="80"    />
+
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { listHasOpenListBySettleBillNo } from "@/api/emis/emisSettleInvoiceRel";
+
+export default {
+  name: "InvoiceSubBillRelList",
+  components: {  },
+  props:{
+    settleBillNo:{
+        type:String
+    },
+    applySeqNo:{
+        type:String
+    },
+  },
+  dicts: ['emis_payment_type'],
+
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 创建时间搜索
+      dateTimeRange:[],
+      // 总条数
+      total: 0,
+      // 开票子账单关联表表格数据
+      emisSettleInvoiceRelList: [],
+
+      currentId:null,
+      openForm: false,
+      titleForm: "",
+
+      // 弹出展示层
+      id:null,
+      titleView:"",
+      openView: false,
+      // 更新网点时间范围
+      daterangeCreateTime: [],
+      // 更新网点时间范围
+      daterangeUpdateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 5000,
+        applySeqNo: this.applySeqNo,
+        settleBillNo: this.settleBillNo,
+        billNo: null,
+        money: null,
+        delFlag: null,
+      },
+    };
+  },
+  watch: {
+      "applySeqNo": {
+        handler (newValue, oldValue) {
+          this.queryParams.applySeqNo = this.applySeqNo;
+          if(this.applySeqNo){
+             this.getList();
+          }
+        },
+        deep: true
+      },
+      "settleBillNo": {
+        handler (newValue, oldValue) {
+          this.queryParams.settleBillNo = this.settleBillNo;
+          if(this.settleBillNo){
+             this.getList();
+          }
+        },
+        deep: true
+      },
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询开票子账单关联表列表 */
+    getList() {
+      this.loading = true;
+      listHasOpenListBySettleBillNo(this.queryParams).then(response => {
+        this.emisSettleInvoiceRelList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    // 排序 查询字段是表格中字段名字 动态取值排序顺序
+    handleSortChange(column) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.currentId=null;
+      this.openForm= true;
+      this.titleForm = "新增";
+    },
+    handleShowMoreInput(){
+      this.moreInputVisible = !this.moreInputVisible;
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+       this.currentId= row.id;
+       this.openForm = true;
+       this.titleForm = "修改";
+    },
+    handleView(row) {
+       this.id=row.id;
+       this.titleView="查看";
+       this.openView=true;
+    //   this.router.push({ path: '/emis/emisSettleInvoiceRel/viewDetail', query: { id: row.id }})
+    },
+    handleFormChanged(){
+        this.openForm = false;
+        this.getList();
+    },
+    cancelForm(){
+      this.openForm = false;
+    },
+    /** 列索引函数  */
+    getIndex($index) {
+          return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+    },
+    /** 时间搜索响应函数 */
+    dateTimeChange(value){
+        this.dateTimeRange=value;
+    },
+  }
+};
+</script>
+
+<style scoped>
+  .el-divider{
+    margin-top: 0px;
+    background: 0 0;
+    border-top: 1px solid #E6EBF5;
+  }
+  .el-divider__text {
+    color: #0955ee;
+    cursor: pointer;
+  }
+</style>

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

@@ -0,0 +1,187 @@
+<template>
+  <div>
+    <el-table  v-loading="loading"
+           border stripe
+           size="small"
+           :data="emisSettlePayRelList"
+           :showSearch.sync="showSearch"
+           :queryParams="queryParams"
+           :total="total"
+           @queryTable="getList"
+           >
+
+             <el-table-column  :label="$t('序号')" align="center" width="60">
+                                  <template slot-scope="scope">
+                                      <span > {{scope.$index+1}}</span>
+                                  </template>
+                            </el-table-column>
+                            <el-table-column prop="billNo"  :label="$t('运单号')"  align="center" width="170">
+                              <template slot-scope="scope">
+                                 <span>{{ scope.row.billNo }}</span>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="billFee"  :label="$t('运费')"  align="center" width="100">
+                              <template slot-scope="scope">
+                                {{scope.row.waybillDetail.freight}}
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="payMoney"  :label="$t('收款金额')"  align="center" width="120">
+                              <template slot-scope="scope">
+                                {{ scope.row.payMoney }}
+                              </template>
+                            </el-table-column>
+                            <el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170"    :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.sendName" width="100" :show-overflow-tooltip="true"/>
+                            <el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" width="150"  :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="custName" min-width="80" :show-overflow-tooltip="true">
+                              <template slot-scope="scope">
+                                  <span v-if="scope.row.waybillDetail.paymentType==2 || scope.row.waybillDetail.paymentType==4 || scope.row.waybillDetail.paymentType==5">{{scope.row.waybillDetail.custName}}</span>
+                                  <span v-else></span>
+                                </template>
+                              </el-table-column>
+                            <el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" width="120" :show-overflow-tooltip="true"/>
+                            <el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" width="80"      />
+                            <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" width="120"   />
+                            <el-table-column :label="$t('结算体积')" align="center" prop="waybillDetail.totalVolume" min-width="80"    />
+
+    </el-table>
+
+
+
+  </div>
+</template>
+
+<script>
+import { listHasPayBySettleBillNo } from "@/api/emis/emisSettlePayRel";
+
+export default {
+  name: "PayRecordSubBillRelList",
+  components: {  },
+  props:{
+    settleBillNo:{
+        type:String
+    },
+    payId:{
+        type:String
+    },
+  },
+  dicts: ['emis_payment_type'],
+
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 创建时间搜索
+      dateTimeRange:[],
+      // 总条数
+      total: 0,
+      // 开票子账单关联表表格数据
+      emisSettlePayRelList: [],
+
+      currentId:null,
+      openForm: false,
+      titleForm: "",
+
+      // 弹出展示层
+      id:null,
+      titleView:"",
+      openView: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 5000,
+        settleBillNo: this.settleBillNo,
+        payId: this.payId,
+      },
+    };
+  },
+  watch: {
+      "settleBillNo": {
+        handler (newValue, oldValue) {
+          this.queryParams.settleBillNo = this.settleBillNo;
+          if(this.settleBillNo){
+             this.getList();
+          }
+        },
+        deep: true
+      },
+      "payId": {
+        handler (newValue, oldValue) {
+          this.queryParams.payId = this.payId;
+          if(this.payId){
+             this.getList();
+          }
+        },
+        deep: true
+      },
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询开票子账单关联表列表 */
+    getList() {
+      this.loading = true;
+      listHasPayBySettleBillNo(this.queryParams).then(response => {
+        this.emisSettlePayRelList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    // 排序 查询字段是表格中字段名字 动态取值排序顺序
+    handleSortChange(column) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+
+  }
+};
+</script>
+
+<style scoped>
+  .el-divider{
+    margin-top: 0px;
+    background: 0 0;
+    border-top: 1px solid #E6EBF5;
+  }
+  .el-divider__text {
+    color: #0955ee;
+    cursor: pointer;
+  }
+</style>