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-11-05 07:36:43 +08:00
parent cba130f162
commit 404110e236
13 changed files with 214 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/layout/components/Navbar.vue
View File

@ -26,6 +26,14 @@
<div class="right-menu">
<!-- 在线客服 -->
<div class="right-menu-item hover-effect" style="padding: 0 20px;" @click="showOnlineKefu">
<span class="kf-agent" title="在线客服">
<img src="" alt="" style="display: none;">
</span>
</div>
<!-- 消息通知 -->
<div class="right-menu-item hover-effect" style="padding: 0 20px;">
<top-notice/>
@ -92,11 +100,11 @@
<div >
<!-- 在线客服 -->
<div style="position:fixed; top:50px;right:0px;cursor:pointer" @click="showOnlineKefu">
<!-- <div style="position:fixed; top:50px;right:0px;cursor:pointer" @click="showOnlineKefu">
<span class="kf-agent" title="在线客服">
<img src="" alt="" style="display: none;">
</span>
</div>
</div> -->
<el-dialog title="在线客服" :visible.sync="openOnlineKefu" width="80%" class="kf-panel" append-to-body>
<div style="padding:0px;height:500px">
@ -257,7 +265,7 @@ export default {
if(res.code==200){
this.rlKefuURL="https://ykf.7moor.com?token="+res.data;
}else{
this.$modal.msgError("token fail");
// this.$modal.msgError("token fail");
}
}).catch(error => {
this.$modal.msgError(error);

24
src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue
View File

@ -20,14 +20,24 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="线路" prop="transLineCode">
<TransLinePicker v-model="form.transLineCode" isInitiated="true"></TransLinePicker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="产品类型" prop="prodCode">
<TransProductMultiplePicker placeholder="产品类型" v-model="form.prodCode" :transLineCode="form.transLineCode"></TransProductMultiplePicker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="起始国" prop="fromCountry">
<CountryPicker :placeholder="$t('起始国')" v-model="form.fromCountry" ></CountryPicker>
<CountryMutiSelectPicker :placeholder="$t('起始国')" v-model="form.fromCountry" ></CountryMutiSelectPicker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="目的国" prop="country">
<CountryPicker1 :placeholder="$t('起始国')" v-model="form.country" ></CountryPicker1>
<CountryMutiSelectPicker1 :placeholder="$t('起始国')" v-model="form.country" ></CountryMutiSelectPicker1>
</el-form-item>
</el-col>
<el-col :span="24">
@ -186,9 +196,11 @@ import { getEmisCommissionQuote, addEmisCommissionQuote, updateEmisCommissionQuo
import { mapGetters } from 'vuex'
import {addDateTimeByDay,dateToStr} from '@/utils/custom'
import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import CountryMutiSelectPicker from '@/views/emis/EmisBaseTools/CountryMutiSelectPicker.vue';
import CountryMutiSelectPicker1 from '@/views/emis/EmisBaseTools/CountryMutiSelectPicker.vue';
import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
import TransProductMultiplePicker from '@/views/emis/EmisBaseTools/TransProductMultiplePicker.vue';
import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import EmisStaffListPicker from '@/views/emis/EmisBaseTools/EmisStaffListPicker.vue';
@ -206,8 +218,8 @@ export default {
}
},
components: {
CountryPicker,CountryPicker1,EmisSiteSimplePicker,EcqExpressionPanel,
EmisStaffListPicker
CountryMutiSelectPicker,CountryMutiSelectPicker1,EmisSiteSimplePicker,EcqExpressionPanel,
EmisStaffListPicker,TransLinePicker,TransProductMultiplePicker
},
dicts: ['emis_price_type','emis_fee_type','sys_currency_type',
'emis_commission_post','emis_biz_shipping_method','emis_commission_fee_type'],

13
src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
View File

@ -44,12 +44,6 @@
<el-option key="2" label="部分开票" value="2"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item :label="$t('确认状态')" prop="blConfirmSite">
<el-select clearable v-model="queryParams.blConfirmSite" placeholder="确认状态">
<el-option key="0" label="业务未确认" value="0"></el-option>
<el-option key="1" label="业务已确认" value="1"></el-option>
</el-select>
</el-form-item> -->
<el-form-item :label="$t('收款状态')" prop="paymentStatus">
<el-select clearable v-model="queryParams.paymentStatus" placeholder="收款状态" style="width:100%">
<el-option key="0" label="未收款" value="0"></el-option>
@ -57,6 +51,13 @@
<el-option key="2" label="部分收款" value="2"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item :label="$t('确认状态')" prop="blConfirmSite">
<el-select clearable v-model="queryParams.blConfirmSite" placeholder="确认状态">
<el-option key="0" label="业务未确认" value="0"></el-option>
<el-option key="1" label="业务已确认" value="1"></el-option>
</el-select>
</el-form-item> -->
<!-- <el-form-item label="账单生成时间" prop="sendDate" label-width="110px">
<elDateSimplePicker placeholder="" v-model="dateTimeRange" style="z-index:9999;width:300px" ></elDateSimplePicker>
</el-form-item> -->

15
src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue
View File

@ -173,6 +173,21 @@
</template>
</el-table-column>
<el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
<el-tag v-if="scope.row.paymentStatus=='1'" type="success">已收款</el-tag>
<el-tag v-if="scope.row.paymentStatus=='2'" type="warning">部分收款</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('开票状态')" align="center" prop="openBillStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.openBillStatus=='0'" type="error">未开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='1'" type="success">已开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='2'" type="warning">部分开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='3'" type="warning">不开票</el-tag>
</template>
</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"/>

17
src/views/emis/emisSettleBill/panel/SubBillListPanel.vue
View File

@ -241,6 +241,23 @@
<span v-else>{{scope.row.waybillDetail.freight}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
<el-tag v-if="scope.row.paymentStatus=='1'" type="success">已收款</el-tag>
<el-tag v-if="scope.row.paymentStatus=='2'" type="warning">部分收款</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('开票状态')" align="center" prop="openBillStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.openBillStatus=='0'" type="error">未开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='1'" type="success">已开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='2'" type="warning">部分开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='3'" type="warning">不开票</el-tag>
</template>
</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.remark" min-width="80" :show-overflow-tooltip="true" />

4
src/views/emis/emisSettleInvoiceRecord/panel/InvoiceDetailPanel.vue
View File

@ -23,7 +23,9 @@
<el-tag v-if="emisSettleInvoiceRecord.invoiceType=='3'" type="info">增值税专用发票</el-tag>
<el-tag v-if="emisSettleInvoiceRecord.invoiceType=='9'" type="info">其它手工发票</el-tag>
</el-descriptions-item>
<el-descriptions-item label="开票金额" span="3">{{ emisSettleInvoiceRecord.applyMoney }}</el-descriptions-item>
<el-descriptions-item label="开票金额" span="1">{{ emisSettleInvoiceRecord.applyMoney }}</el-descriptions-item>
<el-descriptions-item label="加开税点" :span="1">{{ emisSettleInvoiceRecord.addTaxRate }}</el-descriptions-item>
<el-descriptions-item label="加开金额" :span="1"><span v-if="emisSettleInvoiceRecord.addOpenMoney&&emisSettleInvoiceRecord.addOpenMoney>0">￥{{ emisSettleInvoiceRecord.addOpenMoney }}</span></el-descriptions-item>
<el-descriptions-item label="开票状态" span="4">
<el-tag v-if="emisSettleInvoiceRecord.invoiceStatus=='0'" type="info">未开票</el-tag>

35
src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
View File

@ -58,6 +58,21 @@
<el-option key="3" label="账单异常" value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('开票状态')" prop="openBillStatus">
<el-select clearable v-model="queryParams.openBillStatus" placeholder="开票状态" style="width:100%">
<el-option key="1" label="已开票" value="1"></el-option>
<el-option key="0" label="未开票" value="0"></el-option>
<el-option key="3" label="不开票" value="3"></el-option>
<el-option key="2" label="部分开票" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('收款状态')" prop="paymentStatus">
<el-select clearable v-model="queryParams.paymentStatus" placeholder="收款状态" style="width:100%">
<el-option key="0" label="未收款" value="0"></el-option>
<el-option key="1" label="已收款" value="1"></el-option>
<el-option key="2" label="部分收款" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否定制账单" prop="blMerge">
<el-select clearable v-model="queryParams.blMerge" placeholder="">
<el-option key="1" label="是" value="1"></el-option>
@ -313,7 +328,23 @@
<span style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">{{scope.row.waybillDetail.freight}}</span>
<span v-else>{{scope.row.waybillDetail.freight}}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
<el-tag v-if="scope.row.paymentStatus=='1'" type="success">已收款</el-tag>
<el-tag v-if="scope.row.paymentStatus=='2'" type="warning">部分收款</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('开票状态')" align="center" prop="openBillStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.openBillStatus=='0'" type="error">未开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='1'" type="success">已开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='2'" type="warning">部分开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='3'" type="warning">不开票</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('是否特殊报价')" align="center" prop="blSpecialQuote" min-width="120" >
<template slot-scope="scope">
<span v-if="scope.row.waybillDetail.blSpecialQuote=='0'" >否</span>
@ -548,6 +579,8 @@ export default {
custNo: null,
customerCode: null,
customerName: null,
openBillStatus: null,
paymentStatus: null,
payee: null,
salesmen: null,
blSpecialQuote: null,

35
src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
View File

@ -64,6 +64,23 @@
<el-option key="3" label="账单异常" value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('开票状态')" prop="openBillStatus">
<el-select clearable v-model="queryParams.openBillStatus" placeholder="开票状态" style="width:100%">
<el-option key="1" label="已开票" value="1"></el-option>
<el-option key="0" label="未开票" value="0"></el-option>
<el-option key="3" label="不开票" value="3"></el-option>
<el-option key="2" label="部分开票" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('收款状态')" prop="paymentStatus">
<el-select clearable v-model="queryParams.paymentStatus" placeholder="收款状态" style="width:100%">
<el-option key="0" label="未收款" value="0"></el-option>
<el-option key="1" label="已收款" value="1"></el-option>
<el-option key="2" label="部分收款" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否定制账单" prop="blMerge">
<el-select clearable v-model="queryParams.blMerge" placeholder="">
<el-option key="1" label="是" value="1"></el-option>
@ -337,6 +354,22 @@
</template>
</el-table-column>
<el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
<el-tag v-if="scope.row.paymentStatus=='1'" type="success">已收款</el-tag>
<el-tag v-if="scope.row.paymentStatus=='2'" type="warning">部分收款</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('开票状态')" align="center" prop="openBillStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.openBillStatus=='0'" type="error">未开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='1'" type="success">已开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='2'" type="warning">部分开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='3'" type="warning">不开票</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('是否特殊报价')" align="center" prop="blSpecialQuote" min-width="120" >
<template slot-scope="scope">
<span v-if="scope.row.waybillDetail.blSpecialQuote=='0'" >否</span>
@ -568,6 +601,8 @@ export default {
custNo: null,
customerCode: null,
customerName: null,
openBillStatus: null,
paymentStatus: null,
payee: null,
salesmen: null,
blSpecialQuote: null,

34
src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
View File

@ -65,6 +65,21 @@
<el-option key="3" label="财务置账单异常" value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('开票状态')" prop="openBillStatus">
<el-select clearable v-model="queryParams.openBillStatus" placeholder="开票状态" style="width:100%">
<el-option key="1" label="已开票" value="1"></el-option>
<el-option key="0" label="未开票" value="0"></el-option>
<el-option key="3" label="不开票" value="3"></el-option>
<el-option key="2" label="部分开票" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('收款状态')" prop="paymentStatus">
<el-select clearable v-model="queryParams.paymentStatus" placeholder="收款状态" style="width:100%">
<el-option key="0" label="未收款" value="0"></el-option>
<el-option key="1" label="已收款" value="1"></el-option>
<el-option key="2" label="部分收款" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否定制账单" prop="blMerge">
<el-select clearable v-model="queryParams.blMerge" placeholder="">
<el-option key="1" label="是" value="1"></el-option>
@ -325,7 +340,22 @@
<span style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">{{scope.row.waybillDetail.freight}}</span>
<span v-else>{{scope.row.waybillDetail.freight}}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
<el-tag v-if="scope.row.paymentStatus=='1'" type="success">已收款</el-tag>
<el-tag v-if="scope.row.paymentStatus=='2'" type="warning">部分收款</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('开票状态')" align="center" prop="openBillStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.openBillStatus=='0'" type="error">未开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='1'" type="success">已开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='2'" type="warning">部分开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='3'" type="warning">不开票</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('是否特殊报价')" align="center" prop="blSpecialQuote" min-width="120" >
<template slot-scope="scope">
<span v-if="scope.row.waybillDetail.blSpecialQuote=='0'" >否</span>
@ -554,6 +584,8 @@ export default {
custNo: null,
customerCode: null,
customerName: null,
openBillStatus: null,
paymentStatus: null,
payee: null,
salesmen: null,
blSpecialQuote: null,

4
src/views/emis/emisSettleSubBill/SubBillMonthSumList.vue
View File

@ -31,6 +31,8 @@
</el-select>
</el-form-item>
<el-form-item label="是否定制账单" prop="blMerge">
<el-select clearable v-model="queryParams.blMerge" placeholder="">
<el-option key="1" label="是" value="1"></el-option>
@ -239,6 +241,8 @@ export default {
custNo: null,
customerCode: null,
customerName: null,
openBillStatus: null,
paymentStatus: null,
payee: null,
salesmen: null,
blSpecialQuote: null,

32
src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
View File

@ -31,6 +31,21 @@
<el-option key="2" label="月结" value="2"></el-option>
</el-select>
</el-form-item> -->
<el-form-item :label="$t('开票状态')" prop="openBillStatus">
<el-select clearable v-model="queryParams.openBillStatus" placeholder="开票状态" style="width:100%">
<el-option key="1" label="已开票" value="1"></el-option>
<el-option key="0" label="未开票" value="0"></el-option>
<el-option key="3" label="不开票" value="3"></el-option>
<el-option key="2" label="部分开票" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('收款状态')" prop="paymentStatus">
<el-select clearable v-model="queryParams.paymentStatus" placeholder="收款状态" style="width:100%">
<el-option key="0" label="未收款" value="0"></el-option>
<el-option key="1" label="已收款" value="1"></el-option>
<el-option key="2" label="部分收款" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="特殊报价" prop="params.blSpecialQuote">
<el-select clearable v-model="queryParams.params.blSpecialQuote" placeholder="是否特殊报价">
<el-option key="1" label="是" value="1"></el-option>
@ -282,6 +297,21 @@
<span v-else>{{scope.row.waybillDetail.freight}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
<el-tag v-if="scope.row.paymentStatus=='1'" type="success">已收款</el-tag>
<el-tag v-if="scope.row.paymentStatus=='2'" type="warning">部分收款</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('开票状态')" align="center" prop="openBillStatus" width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.openBillStatus=='0'" type="error">未开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='1'" type="success">已开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='2'" type="warning">部分开票</el-tag>
<el-tag v-if="scope.row.openBillStatus=='3'" type="warning">不开票</el-tag>
</template>
</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" >
@ -494,6 +524,8 @@ export default {
custName: null,
customerCode: null,
customerName: null,
openBillStatus: null,
paymentStatus: null,
payee: null,
salesmen: null,
blSpecialQuote: null,

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

@ -221,7 +221,7 @@
</el-col>
<el-col :span="12">
<el-form-item :label="$t('寄件电话')" prop="sender.phone">
<el-input v-model="form.sender.phone" placeholder="" />
<el-input v-model="form.sender.phone" placeholder="" maxlength="30"/>
</el-form-item>
</el-col>
<el-col :span="24">
@ -286,7 +286,7 @@
<el-col :span="12">
<el-form-item :label="$t('收件电话')" prop="reciever.phone">
<el-input v-model="form.reciever.phone" placeholder="" />
<el-input v-model="form.reciever.phone" placeholder="" maxlength="30"/>
</el-form-item>
</el-col>
<el-col :span="24">
@ -1474,7 +1474,7 @@ methods: {
this.form.printTypeCheckList=[0,1,5]
this.form.destinationCountry=this.form.reciever.country;
if(this.form.packType!=null&&this.form.packType!=''){
if(this.form.packType&&this.form.packType!=''){
this.form.packType=this.form.packType.split(",");
}

6
src/views/emis/emisWaybillAjustApply/adjustPanel.vue
View File

@ -1412,12 +1412,10 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let newList = this.form.feeItems.filter(item => item.feeCode !== row.feeCode);
console.log("======>newList===>",newList)
this.form.feeItems=newList;
// 删除后重新计算费用
this.handleCalcFeeItem();
}).catch(() => {
})