aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-07-07 09:36:03 +08:00
parent 5e39140780
commit d41d69dd74
9 changed files with 92 additions and 793 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -97,6 +97,7 @@
"vue-i18n": "^8.28.2",
"vue-meta": "2.4.0",
"vue-okr-tree": "^1.0.17",
"vue-pdf-embed": "1",
"vue-print-nb": "^1.7.5",
"vue-property-decorator": "^9.1.2",
"vue-resize-sensor": "^2.0.0",

58
src/api/emis/emisSettleSubBill.js
View File

@ -48,10 +48,66 @@ export function cancelConfirmBillByCenter(id,note) {
return request({
url: '/emis/emisSettleSubBill/cancelConfirmBillByCenter/' + id,
method: 'post',
data: {centerConfirmNote: note}
data: {confirmNote: note}
})
}
// 中心确认不出账
export function confirmNoBillByCenter(id,note) {
return request({
url: '/emis/emisSettleSubBill/confirmNoBillByCenter/' + id,
method: 'post',
data: {confirmNote: note}
})
}
// 中心设置账单异常
export function setBillErrorByCenter(id,note) {
return request({
url: '/emis/emisSettleSubBill/setBillErrorByCenter/' + id,
method: 'post',
data: {confirmNote: note}
})
}
// -------------------------------------------
// 站点确认
export function confirmBillBySite(id) {
return request({
url: '/emis/emisSettleSubBill/confirmBillBySite/' + id,
method: 'post'
})
}
// 站点取消确认
export function cancelConfirmBillBySite(id,note) {
return request({
url: '/emis/emisSettleSubBill/cancelConfirmBillBySite/' + id,
method: 'post',
data: {siteConfirmNote: note}
})
}
// 站点确认不出账
export function confirmNoBillBySite(id,note) {
return request({
url: '/emis/emisSettleSubBill/confirmNoBillBySite/' + id,
method: 'post',
data: {siteConfirmNote: note}
})
}
// 站点设置账单异常
export function setBillErrorBySite(id,note) {
return request({
url: '/emis/emisSettleSubBill/setBillErrorBySite/' + id,
method: 'post',
data: {siteConfirmNote: note}
})
}
// 删除结算子账单
export function delEmisSettleSubBill(id) {
return request({

13
src/components/FileUpload/index.vue
View File

@ -29,7 +29,8 @@
<transition-group v-if="isNeedUpload" class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
<li :key="file.url" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
<el-link :href="`${file.url}`" :underline="false" target="_blank">
<span class="el-icon-document"> {{ getFileName(file.name) }} </span>
<!-- <span class="el-icon-document"> {{ getFileName(file.name) }} </span> -->
<span class="el-icon-document"> {{ file.name }} </span>
</el-link>
<div class="ele-upload-list__item-content-action">
<el-link :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>
@ -154,7 +155,6 @@ export default {
return false;
}
}
// 如果不需要上传则拦截
if(!this.isNeedUpload){
let that=this;
@ -184,7 +184,6 @@ export default {
// }
// that.$emit("onUploaded", fileName);
// this.fileList.push(fileItem);
}
this.$modal.loading("正在上传文件，请稍候...");
this.number++;
@ -204,16 +203,12 @@ export default {
this.uploadList.push({ name: res.fileName, url:res.url });
console.log("==1111==>", this.uploadList);
if (this.uploadList.length === this.number) {
this.fileList = this.fileList.concat(this.uploadList);
console.log("==2222==>", this.uploadList);
this.uploadList = [];
this.number = 0;
this.$emit("input", this.listToString(this.fileList));
console.log("==this.listToString(this.fileList)==>", this.listToString(this.fileList));
this.$emit("input", this.listToString(this.fileList), this.filesSize);
this.$modal.closeLoading();
}
},

1
src/components/ImageUpload/index.vue
View File

@ -129,6 +129,7 @@ export default {
// 上传成功回调
handleUploadSuccess(res) {
// this.uploadList.push({ name: res.fileName, url: res.fileName });
// this.uploadList.push({ name: res.fileName, url: res.url });
this.uploadList.push({ name: res.fileName, url: res.url });
if (this.uploadList.length === this.number) {
this.fileList = this.fileList.concat(this.uploadList);

4
src/components/PdfViewer/viewer.vue
View File

@ -42,6 +42,7 @@
<!-- <el-scrollbar>
<div style="min-height:600px;margin: 0 auto;overflow: auto;"> -->
<div class="pdf-wrapper">
<!-- <vue-pdf-embed :source="loadPdfUrl" /> -->
<pdf
:src="currentPdfUrl"
:page="page"
@ -62,9 +63,10 @@ import printJS from 'print-js'
// npm i pdfjs-dist@2.5.207
// npm i vue-pdf@4.2.0
import pdf from 'xd-vue-pdf'
import VuePdfEmbed from 'vue-pdf-embed/dist/vue2-pdf-embed'
import PdfUtils from '@/utils/pdfUtils.js';
export default {
components: { pdf },
components: { pdf,VuePdfEmbed },
props: {
pdfList:{
type: Array,

775
src/views/emis/emisSettleSubBill/settleSubBillConfirmList.vue
View File

@ -1,775 +0,0 @@
<template>
<div class="app-container">
<!-- <SearchForm :model="queryParams" ref="queryForm" size="mini" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="billNo">
<el-input
v-model="queryParams.billNo"
:placeholder="$t('分账单号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="parentBillNo">
<el-input
v-model="queryParams.parentBillNo"
:placeholder="$t('父账单号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="settleBillNo">
<el-input
v-model="queryParams.settleBillNo"
:placeholder="$t('总结算账单号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="billCode">
<el-input
v-model="queryParams.billCode"
:placeholder="$t('运单号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="billDate">
<el-date-picker clearable
v-model="queryParams.billDate"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
:placeholder="$t('出账时间')">
</el-date-picker>
</el-form-item>
<el-form-item label="" prop="billFee">
<el-input
v-model="queryParams.billFee"
:placeholder="$t('账单费用')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="currency">
<el-input
v-model="queryParams.currency"
:placeholder="$t('费用币种')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="settleType">
<el-input
v-model="queryParams.settleType"
:placeholder="$t('结算账单类型')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="blSplit">
<el-input
v-model="queryParams.blSplit"
:placeholder="$t('是否已拆单')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="billMonth">
<el-input
v-model="queryParams.billMonth"
:placeholder="$t('账单月份')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="custNo">
<el-input
v-model="queryParams.custNo"
:placeholder="$t('月结编号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="customerCode">
<el-input
v-model="queryParams.customerCode"
:placeholder="$t('客户编码')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="customerName">
<el-input
v-model="queryParams.customerName"
:placeholder="$t('客户名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="blConfirm">
<el-input
v-model="queryParams.blConfirm"
:placeholder="$t('财务确认状态')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="confirmDate">
<el-input
v-model="queryParams.confirmDate"
:placeholder="$t('财务确认日期')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="confirmSite">
<el-input
v-model="queryParams.confirmSite"
:placeholder="$t('财务确认站点')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="confirmManCode">
<el-input
v-model="queryParams.confirmManCode"
:placeholder="$t('财务确认人')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="blSiteConfirm">
<el-input
v-model="queryParams.blSiteConfirm"
:placeholder="$t('站点确认状态')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="confirmNote">
<el-input
v-model="queryParams.confirmNote"
:placeholder="$t('财务确认备注')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="siteConfirmDate">
<el-input
v-model="queryParams.siteConfirmDate"
:placeholder="$t('站点确认日期')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="siteConfirmManCode">
<el-input
v-model="queryParams.siteConfirmManCode"
:placeholder="$t('站点确认人')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="siteConfirmNote">
<el-input
v-model="queryParams.siteConfirmNote"
:placeholder="$t('网点确认备注')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="delFlag">
<el-input
v-model="queryParams.delFlag"
:placeholder="$t('删除标志（0代表存在')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</SearchForm> -->
<SearchForm slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm" size="mini" :maxShow="9" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<!-- :span="6" -->
<el-col :span="9">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="24">
<el-form-item label="" prop="billCode">
<div slot="label">
<el-radio-group class="query-label" v-model="queryOrderType">
<el-radio :key="1" label="1">运单号</el-radio>
<!-- <el-radio :key="0" label="0">订单号</el-radio> -->
</el-radio-group>
</div>
<XdTextareaInput
v-model="queryParams.billCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="4"
/>
<!-- @keyup.enter.native="handleQuery" -->
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="查询时间范围" prop="">
<div slot="label">
<el-radio-group class="query-label" v-model="queryOrderDateType">
<el-radio :key="1" label="1">发货时间</el-radio>
</el-radio-group>
</div>
<elDateAdvPicker v-model="dateRange" ></elDateAdvPicker>
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="5">
<el-form-item label="寄件网点" prop="productType">
<EmisSiteSimplePicker1 v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode!='88888'" ></EmisSiteSimplePicker1>
</el-form-item>
<el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
<EmisSiteSimplePicker2 v-model="queryParams.dispatchUnderlingSiteCode" ></EmisSiteSimplePicker2>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
</el-form-item>
<el-form-item label="付款方式" prop="paymentType" >
<el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_payment_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('回款联系人')" prop="payee">
<PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee" ></PayeePicker>
</el-form-item>
<el-form-item :label="$t('销售联系人')" prop="salesmen">
<SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen" ></SalemanPicker>
</el-form-item>
<el-form-item label="寄件公司" prop="sendCompany">
<el-input
v-model="queryParams.sendCompany"
:placeholder="$t('寄件公司')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="收件公司" prop="receiveCompany">
<el-input
v-model="queryParams.receiveCompany"
:placeholder="$t('收件公司')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
</el-row>
</SearchForm>
<el-tabs v-model="activeTab" class="center-tabs" @tab-click="handleClick">
<el-tab-pane label="待确认" name="waitConfirm" />
<el-tab-pane label="已确认" name="hasConfirm" />
<!-- <el-tab-pane label="确认不出账" name="confirmNotBill" /> -->
</el-tabs>
<!-- 区域管理 -->
<div v-show="activeTab==='waitConfirm'">
</div>
<div v-show="activeTab==='hasConfirm'">
</div>
<!-- <div v-show="activeTab==='confirmNotBill'">
</div> -->
<XdTable v-loading="loading"
border stripe
size="mini"
ref="refTable"
row-key="id"
storageName="settleSubBillConfirmList_main"
:data="emisSettleSubBillList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
:total="total"
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
:disabled="multiple"
@click="handleConfirmByCenter"
v-hasPermi="['emis:emisSettleSubBill:confirmBillByCenter']"
>批量确认</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
:disabled="single"
@click="handleConfirmNoBillByCenter"
v-hasPermi="['emis:emisSettleSubBill:confirmNoBillByCenter']"
>确认不出账</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
:disabled="single"
@click="handleSetBillErrorByCenter"
v-hasPermi="['emis:emisSettleSubBill:setBillErrorByCenter']"
>置账单异常</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
size="mini"
:disabled="multiple"
@click="handleCancelConfirmByCenter"
v-hasPermi="['emis:emisSettleSubBill:cancelConfirmBillByCente']"
>取消确认</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
:disabled="single"
@click="handleSplit"
v-hasPermi="['emis:emisSettleSubBill:splitSubBill']"
>拆分子账单</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['emis:emisSettleSubBill:export']"
>导出</el-button>
</el-col>
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" />
<el-table-column :label="$t('子账单号')" align="center" prop="billNo" min-width="130" />
<el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirm" min-width="120" >
<template slot-scope="scope">
<span v-if="scope.row.blConfirm=='0'" >未确认</span>
<el-tag v-if="scope.row.blConfirm=='1'" type="success">已确认</el-tag>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('确认人')" align="center" prop="confirmManName" min-width="100" /> -->
<el-table-column :label="$t('确认人')" align="center" prop="confirmManCode" min-width="100" />
<!-- <el-table-column :label="$t('业务确认状态')" align="center" prop="blSiteConfirm" min-width="120" >
<template slot-scope="scope">
<span v-if="scope.row.blSiteConfirm=='0'" >未确认</span>
<span v-if="scope.row.blSiteConfirm=='1'" >已确认</span>
</template>
</el-table-column> -->
<el-table-column :label="$t('结算类型')" align="center" prop="settleType" min-width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.settleType=='1'" type="normal">现金</el-tag>
<el-tag v-if="scope.row.settleType=='2'" type="success">月结</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('月结客户')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.settleType=='2'" type="normal">{{ scope.row.customerName }}</span>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('月结编号')" align="center" prop="custNo" min-width="100" /> -->
<el-table-column :label="$t('账单费用')" align="center" prop="billFee" min-width="100" />
<el-table-column :label="$t('费用币种')" align="center" prop="currency" min-width="100" />
<el-table-column :label="$t('出账时间')" align="center" prop="billDate" min-width="170" />
<el-table-column :label="$t('账单月份')" align="center" prop="billMonth" min-width="100" />
<!-- <el-table-column :label="$t('站点确认人')" align="center" prop="siteConfirmManCode" min-width="100" /> -->
<!-- <el-table-column :label="$t('父账单号')" align="center" prop="parentBillNo" min-width="100" /> -->
<!-- <el-table-column :label="$t('总结算账单号')" align="center" prop="settleBillNo" min-width="100" /> -->
<!-- <el-table-column :label="$t('是否已拆单')" align="center" prop="blSplit" min-width="100" />
<el-table-column :label="$t('客户编码')" align="center" prop="customerCode" min-width="100" />
<el-table-column :label="$t('财务确认日期')" align="center" prop="confirmDate" min-width="100" />
<el-table-column :label="$t('财务确认站点')" align="center" prop="confirmSite" min-width="100" />
<el-table-column :label="$t('财务确认人')" align="center" prop="confirmManCode" min-width="100" />
<el-table-column :label="$t('财务确认备注')" align="center" prop="confirmNote" min-width="100" />
<el-table-column :label="$t('站点确认日期')" align="center" prop="siteConfirmDate" min-width="100" />
<el-table-column :label="$t('网点确认备注')" align="center" prop="siteConfirmNote" min-width="100" /> -->
</XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisSettleSubBillForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSettleSubBillForm>
</el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<emisSettleSubBillView :id="id" ></EmisSettleSubBillView>
</el-dialog>
-->
</div>
</template>
<script>
import { listEmisSettleSubBill, getEmisSettleSubBill, delEmisSettleSubBill, confirmBillByCenter, cancelConfirmBillByCenter } from "@/api/emis/emisSettleSubBill";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
// import emisSettleSubBillView from '@/views/emis/emisSettleSubBill/emisSettleSubBillView';
import emisSettleSubBillForm from '@/views/emis/emisSettleSubBill/emisSettleSubBillForm';
// import emisWaybillView from '@/views/emis/emisWaybill/emisWaybillView';
import emisWaybillForm from '@/views/emis/emisWaybill/emisWaybillForm';
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import CountryPicker2 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import ProvincePicker2 from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue';
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
export default {
name: "emisSettleSubBill",
components: {
elDateSimplePicker,emisSettleSubBillForm,
EmisMonthpayAccountPicker,
elDateAdvPicker,emisWaybillForm,
CountryPicker1,
CountryPicker2,ProvincePicker2,
TransLinePicker,TransProductPicker,
PayeePicker,
SalemanPicker,
EmisUserSimplePicker0,
EmisUserSimplePicker1,
EmisUserSimplePicker2,
EmisSiteSimplePicker1,
EmisSiteSimplePicker2,
ProblemTypePicker,
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
],
data() {
return {
activeTab: "waitConfirm",
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 创建时间搜索
dateTimeRange:[],
// 总条数
total: 0,
// 结算子账单表格数据
emisSettleSubBillList: [],
currentId:null,
openForm: false,
titleForm: "",
// 弹出展示层
id:null,
titleView:"",
openView: false,
// 更新网点时间范围
daterangeBillDate: [],
// 更新网点时间范围
daterangeCreateTime: [],
// 更新网点时间范围
daterangeUpdateTime: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
billNo: null,
parentBillNo: null,
settleBillNo: null,
billCode: null,
billDate: null,
billFee: null,
currency: null,
settleType: null,
blSplit: null,
billMonth: null,
custNo: null,
customerCode: null,
customerName: null,
blConfirm: null,
confirmDate: null,
confirmSite: null,
confirmManCode: null,
blSiteConfirm: null,
confirmNote: null,
siteConfirmDate: null,
siteConfirmManCode: null,
siteConfirmNote: null,
delFlag: null,
},
};
},
created() {
this.queryParams.blConfirm='0';
this.getList();
},
methods: {
handleClick(tab, event) {
console.log(tab, event);
if (tab.name == 'waitConfirm') {
this.queryParams.blConfirm='0';
this.getList();
}
else if (tab.name == 'hasConfirm') {
this.queryParams.blConfirm='1';
this.getList();
}
},
/** 查询结算子账单列表 */
getList() {
this.loading = true;
this.queryParams.params = {};
if (null != this.daterangeBillDate && '' != this.daterangeBillDate) {
this.queryParams.params["beginBillDate"] = this.daterangeBillDate[0];
this.queryParams.params["endBillDate"] = this.daterangeBillDate[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];
}
listEmisSettleSubBill(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
this.emisSettleSubBillList = 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 = "修改";
},
handleConfirmByCenter(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认').then(function() {
return confirmBillByCenter(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("操作成功");
}).catch(() => {});
},
handleCancelConfirmByCenter(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否取消确认').then(function() {
return cancelConfirmBillByCenter(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("操作成功");
}).catch(() => {});
},
handleConfirmNoBillByCenter(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认不出账').then(function() {
return confirmNoBillByCenter(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("操作成功");
}).catch(() => {});
},
handleSetBillErrorByCenter(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否设置账单异常').then(function() {
return setBillErrorByCenter(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("操作成功");
}).catch(() => {});
},
handleView(row) {
this.id=row.id;
this.titleView="查看";
this.openView=true;
// this.router.push({ path: '/emis/emisSettleSubBill/viewDetail', query: { id: row.id }})
},
handleFormChanged(){
this.openForm = false;
this.getList();
},
cancelForm(){
this.openForm = false;
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除').then(function() {
return delEmisSettleSubBill(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
// this.download('emis/emisSettleSubBill/export', {
// ...this.queryParams
// }, `emisSettleSubBill_${new Date().getTime()}.xlsx`)
const loadingInstance = this.$loading({
text: '正在导出...'
})
var qParam = {...this.queryParams};
qParam.pageNum=1;
qParam.pageSize=5000;
listEmisSettleSubBill(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
this.downloadLoading = false
if (response.code === 200) {
const curList = response.rows
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['id','分账单号','父账单号','总结算账单号','运单号','出账时间','账单费用','费用币种','结算账单类型','是否已拆单','账单月份','月结编号','客户编码','客户名称','财务确认状态','财务确认日期','财务确认站点','财务确认人','站点确认状态','财务确认备注','站点确认日期','站点确认人','网点确认备注','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建网点','更新网点',];
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 data = this.formatJson(filterVal, curList, response.rows)
excel.export_json_to_excel({
header: tHeader,
data,
filename: '结算子账单',
autoWidth: true
})
loadingInstance.close()
})
}
});
},
formatJson(filterVal, jsonData, resData) {
let index = 0
return jsonData.map(v => filterVal.map(j => {
if (j === 'index') {
return ++index
}
if (j === 'status') {
var statusStr='xxx'
if(v[j] == 10){
statusStr='xxx'
}
return statusStr;
}
return v[j]
}))
},
/** 列索引函数 */
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>

17
src/views/emis/emisWaybill/waybillModify.vue
View File

@ -868,7 +868,7 @@ data() {
{ required: true, message: "收货省不能为空", trigger: ["blur",'change'] }
],
company: [
{ required: true, message: "发件公司不能为空", trigger: ["blur",'change'] }
{ required: true, message: "收货公司不能为空", trigger: ["blur",'change'] }
],
// city: [
// { required: true, message: "市不能为空", trigger: "blur" }
@ -894,7 +894,7 @@ data() {
{ required: true, message: "寄件省不能为空", trigger: ["blur",'change'] }
],
company: [
{ required: true, message: "发件公司不能为空", trigger: ["blur",'change'] }
{ required: true, message: "寄件公司不能为空", trigger: ["blur",'change'] }
],
// city: [
@ -2014,7 +2014,7 @@ methods: {
newItem.cargoQty=1;
this.form.cargoList.splice(index+1, 0, newItem);
// this.form.cargoList.push(newItem);
handleCargoQtyChange();
this.handleCargoQtyChange();
},
showLocalTime(){
@ -2107,8 +2107,17 @@ methods: {
text-align: center;
}
// .el-input-number--mini {
// width: 100%;
// line-height: 26px;
// }
.el-input-number {
width: 100%!important;
}
.el-input-number.is-without-controls .el-input__inner {
height: 28px;
height: 28px;
line-height: 28px;
border: none;
background: #ffffcd;

15
src/views/emis/emisWaybill/waybillRecord.vue
View File

@ -868,7 +868,7 @@ data() {
{ required: true, message: "收货省不能为空", trigger: ["blur",'change'] }
],
company: [
{ required: true, message: "发件公司不能为空", trigger: ["blur",'change'] }
{ required: true, message: "收货公司不能为空", trigger: ["blur",'change'] }
],
// city: [
// { required: true, message: "市不能为空", trigger: "blur" }
@ -894,7 +894,7 @@ data() {
{ required: true, message: "寄件省不能为空", trigger: ["blur",'change'] }
],
company: [
{ required: true, message: "发件公司不能为空", trigger: ["blur",'change'] }
{ required: true, message: "寄件公司不能为空", trigger: ["blur",'change'] }
],
// city: [
@ -2107,8 +2107,17 @@ methods: {
text-align: center;
}
// .el-input-number--mini {
// width: 100%;
// line-height: 26px;
// }
.el-input-number {
width: 100%!important;
}
.el-input-number.is-without-controls .el-input__inner {
height: 28px;
height: 28px;
line-height: 28px;
border: none;
background: #ffffcd;

1
src/views/system/updater/printerUpdater.vue
View File

@ -61,6 +61,7 @@ export default {
methods: {
initData() {
this.reset();
/*
{ http://doc.xdadan.com/download/2024/06/10/d585b4c1ad5fc36b7e17320f5dfa603b.zip }
*/