This commit is contained in:
linfso 2025-02-17 15:35:10 +08:00
parent a1865d6e40
commit 784659d7c4
11 changed files with 52 additions and 28 deletions

View File

@ -55,7 +55,7 @@
<el-date-picker size="mini" style="width:100%" v-model="queryParams.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
</el-form-item>
<el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" ></EmisMonthpayAccountPicker>
<AllMonthpayAccountPicker v-model="queryParams.custNo" ></AllMonthpayAccountPicker>
</el-form-item>
<el-form-item :label="$t('回款联系人')" prop="payee" label-width="100px">
<PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee" ></PayeePicker>
@ -266,6 +266,7 @@ import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
export default {
name: "EmisSettleBillQuery",
@ -274,7 +275,7 @@ export default {
type:[String,Number]
}
},
components: { MergeBillForm,elDateAdvPicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker },
components: { MergeBillForm,elDateAdvPicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker,AllMonthpayAccountPicker },
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'

View File

@ -59,7 +59,7 @@
<el-date-picker size="mini" style="width:100%" v-model="queryParams.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
</el-form-item>
<el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" ></EmisMonthpayAccountPicker>
<AllMonthpayAccountPicker v-model="queryParams.custNo" ></AllMonthpayAccountPicker>
</el-form-item>
<el-form-item :label="$t('回款联系人')" prop="payee" label-width="100px">
<PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee" ></PayeePicker>
@ -214,6 +214,7 @@
import { listEmisSettleBill,chargeByCenter,unChargeByCenter } from "@/api/emis/emisSettleBill";
import PayRecordInput from '@/views/emis/emisSettlePayRecord/panel/PayRecordInput.vue';
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
@ -222,7 +223,7 @@ import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
export default {
name: "ChargeBillMonthPanel",
components: { PayRecordInput,elDateAdvPicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker },
components: { PayRecordInput,elDateAdvPicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker,AllMonthpayAccountPicker },
dicts: [
],
data() {

View File

@ -60,7 +60,7 @@
<el-date-picker size="mini" style="width:100%" v-model="queryParams.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
</el-form-item>
<el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" ></EmisMonthpayAccountPicker>
<AllMonthpayAccountPicker v-model="queryParams.custNo" ></AllMonthpayAccountPicker>
</el-form-item>
<el-form-item :label="$t('回款联系人')" prop="payee" label-width="100px">
<PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee" ></PayeePicker>
@ -226,11 +226,12 @@ import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
export default {
name: "MoneyPanel",
components: { MergeBillForm,elDateAdvPicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker },
components: { MergeBillForm,elDateAdvPicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker,AllMonthpayAccountPicker },
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'

View File

@ -66,7 +66,8 @@
<el-date-picker size="mini" style="width:100%" v-model="queryParams.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
</el-form-item>
<el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" ></EmisMonthpayAccountPicker>
<AllMonthpayAccountPicker v-model="queryParams.custNo" ></AllMonthpayAccountPicker>
<!-- <EmisMonthpayAccountPicker v-model="queryParams.custNo" ></EmisMonthpayAccountPicker> -->
</el-form-item>
<el-form-item :label="$t('回款联系人')" prop="payee" label-width="100px">
<PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee" ></PayeePicker>
@ -265,6 +266,8 @@ import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
@ -279,7 +282,7 @@ export default {
type:[String,Number]
}
},
components: {PayQrCode, MergeBillForm,elDateAdvPicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker },
components: {PayQrCode, MergeBillForm,elDateAdvPicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker,AllMonthpayAccountPicker },
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'

View File

@ -49,7 +49,7 @@
<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="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" ></EmisMonthpayAccountPicker>
<AllMonthpayAccountPicker v-model="queryParams.custNo" ></AllMonthpayAccountPicker>
</el-form-item>
<el-form-item :label="$t('回款联系人')" prop="payee" label-width="100px">
<PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee" ></PayeePicker>
@ -233,6 +233,7 @@ import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import emisSettleInvoiceRecordForm from '@/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm';
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
export default {
name: "SiteConfimPanel",
@ -241,7 +242,7 @@ export default {
type:[String,Number]
}
},
components: { MergeBillForm,elDateSimplePicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker,emisSettleInvoiceRecordForm },
components: { MergeBillForm,elDateSimplePicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker,emisSettleInvoiceRecordForm,AllMonthpayAccountPicker },
dicts: [
],
data() {

View File

@ -79,7 +79,9 @@
<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="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" ></EmisMonthpayAccountPicker>
<AllMonthpayAccountPicker v-model="queryParams.custNo" ></AllMonthpayAccountPicker>
<!-- <EmisMonthpayAccountPicker v-model="queryParams.custNo" ></EmisMonthpayAccountPicker> -->
</el-form-item>
<el-form-item :label="$t('回款联系人')" prop="payee" label-width="100px">
<PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee" ></PayeePicker>
@ -307,6 +309,7 @@ import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import PayRecordInputByInvoice from '@/views/emis/emisSettlePayRecord/panel/PayRecordInputByInvoice.vue';
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
export default {
name: "EmisSettleInvoiceChRecord",
@ -314,7 +317,8 @@ export default {
elDateAdvPicker,
emisSettleInvoiceChRecordForm,
PayeePicker,SalemanPicker,EmisMonthpayAccountPicker,
PayRecordInputByInvoice
PayRecordInputByInvoice,
AllMonthpayAccountPicker
},
dicts: ['emis_invoice_ch_type'
],

View File

@ -109,7 +109,9 @@
</el-form-item>
<el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo"></EmisMonthpayAccountPicker>
<AllMonthpayAccountPicker v-model="queryParams.custNo"></AllMonthpayAccountPicker>
<!-- <EmisMonthpayAccountPicker v-model="queryParams.custNo"></EmisMonthpayAccountPicker> -->
</el-form-item>
<el-form-item label="付款方式" prop="params.paymentType" >
<el-select clearable v-model="queryParams.params.paymentType" placeholder="请选择">
@ -491,6 +493,7 @@ import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePick
import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue';
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
import BillFeeListPanel from '@/views/emis/emisSettleSubBill/panel/BillFeeListPanel.vue';
@ -520,7 +523,8 @@ export default {
ProblemTypePicker,
TraceWaybillDetailView,
MergeBillForm
MergeBillForm,
AllMonthpayAccountPicker
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',

View File

@ -107,7 +107,8 @@
</el-form-item>
<el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
<AllMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></AllMonthpayAccountPicker>
<!-- <EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker> -->
</el-form-item>
<el-form-item label="付款方式" prop="params.paymentType" >
<el-select clearable v-model="queryParams.params.paymentType" placeholder="请选择">
@ -493,6 +494,7 @@ import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePick
import ProblemTypeMultiplePicker from '@/views/emis/EmisBaseTools/ProblemTypeMultiplePicker.vue';
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
@ -521,7 +523,8 @@ export default {
ProblemTypeMultiplePicker,
TraceWaybillDetailView,
MergeBillForm
MergeBillForm,
AllMonthpayAccountPicker
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',

View File

@ -10,7 +10,8 @@
>
<el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo"></EmisMonthpayAccountPicker>
<AllMonthpayAccountPicker v-model="queryParams.custNo" ></AllMonthpayAccountPicker>
<!-- <EmisMonthpayAccountPicker v-model="queryParams.custNo"></EmisMonthpayAccountPicker> -->
</el-form-item>
<el-form-item label="业务确认状态" prop="blConfirmSite">
@ -128,6 +129,7 @@ import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePick
import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue';
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
import BillFeeListPanel from '@/views/emis/emisSettleSubBill/panel/BillFeeListPanel.vue';
@ -158,7 +160,8 @@ export default {
ProblemTypePicker,
TraceWaybillDetailView,
MergeBillForm
MergeBillForm,
AllMonthpayAccountPicker
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',

View File

@ -65,7 +65,8 @@
</el-form-item>
<el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
<AllMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></AllMonthpayAccountPicker>
<!-- <EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker> -->
</el-form-item>
<el-form-item label="付款方式" prop="params.paymentType" >
<el-select clearable v-model="queryParams.params.paymentType" placeholder="请选择">
@ -412,6 +413,7 @@ import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePick
import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue';
import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
@ -441,7 +443,8 @@ export default {
TraceWaybillDetailView,
MergeBillForm,
BillFeeListPanel
BillFeeListPanel,
AllMonthpayAccountPicker
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',

View File

@ -453,15 +453,15 @@ export default {
airBilllNo: [
{ required: true, message: "航空单号不能为空", trigger: ["blur","change"] },
],
airTime: [
{ required: true, message: "起飞时间不能为空", trigger: ["blur","change"] },
],
shipNo: [
{ required: true, message: "船次号不能为空", trigger: ["blur","change"] },
],
shipTime: [
{ required: true, message: "开船时间不能为空", trigger: ["blur","change"] },
etd: [
{ required: true, message: "发出日期不能为空", trigger: ["blur","change"] },
],
// shipNo: [
// { required: true, message: "船次号不能为空", trigger: ["blur","change"] },
// ],
// shipTime: [
// { required: true, message: "开船时间不能为空", trigger: ["blur","change"] },
// ],
carNo: [
{ required: true, message: "车牌号不能为空", trigger: ["blur","change"] },
],