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-08-12 07:04:46 +08:00
parent b895b19bb2
commit 2451303a6b
10 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/layout/components/TopNotice/index.vue
View File

@ -353,11 +353,11 @@ export default {
}
.el-tabs__header {
padding: 0;
position: relative;
margin: 0px!important;
}
// .el-tabs__header {
// padding: 0;
// position: relative;
// margin: 0px!important;
// }
.xd-notice-actions{
display: flex;

12
src/views/emis/emisSettleBill/SiteMainBillConfirmList.vue
View File

@ -4,10 +4,14 @@
<div class="tab-container">
<el-tabs v-model="activeTab" class="center-tabs" @tab-click="handleTabsClick" @tab-remove="removeTab">
<el-tab-pane label="待确认账单" name="billList" >
<SiteConfimPanel key="SiteConfimPanel1" confirmStatus="0" @onSelect="onSelectBill"> </SiteConfimPanel>
<keep-alive>
<SiteConfimPanel key="SiteConfimPanel1" confirmStatus="0" @onSelect="onSelectBill"> </SiteConfimPanel>
</keep-alive>
</el-tab-pane>
<el-tab-pane label="已确认账单" name="billConfirmedList" >
<SiteConfimPanel2 key="SiteConfimPanel2" confirmStatus="1" @onSelect="onSelectBill"> </SiteConfimPanel2>
<keep-alive>
<SiteHasConfimPanel key="SiteConfimPanel2" confirmStatus="1" @onSelect="onSelectBill"> </SiteHasConfimPanel>
</keep-alive>
</el-tab-pane>
<el-tab-pane v-for="(item, index) in billTabs" :key="index" :name="item.settleBillNo" :label="'账单明细:'+item.settleBillNo" closable >
<SiteConfirmSubBillListPanel :settleBillNo="item.settleBillNo"></SiteConfirmSubBillListPanel>
@ -21,14 +25,14 @@
<script>
import SiteConfimPanel from '@/views/emis/emisSettleBill/panel/SiteConfimPanel.vue';
import SiteConfimPanel2 from '@/views/emis/emisSettleBill/panel/SiteConfimPanel.vue';
import SiteHasConfimPanel from '@/views/emis/emisSettleBill/panel/SiteHasConfimPanel.vue';
import SiteConfirmSubBillListPanel from '@/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue';
export default {
name: "SiteMainBillConfirmList",
components: {
SiteConfimPanel,
SiteConfimPanel2,
SiteHasConfimPanel,
SiteConfirmSubBillListPanel
},
dicts: [

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

@ -394,7 +394,7 @@ export default {
// if(this.$store.getters.ownerSiteCode !='88888'){
// this.queryParams.salesmen=this.$store.getters.empName
// }
listEmisSettleBill(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
listEmisSettleBill(this.addDateRange(this.queryParams, this.dateTimeRange,'createTime')).then(response => {
this.emisSettleBillList = response.rows;
this.total = response.total;
this.loading = false;

2
src/views/emis/emisSettleInvoiceChRecord/index.vue
View File

@ -241,7 +241,7 @@ import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
export default {
name: "emisSettleInvoiceChRecord",
name: "EmisSettleInvoiceChRecord",
components: {
elDateAdvPicker,
emisSettleInvoiceChRecordForm,

2
src/views/emis/emisWaybill/sendWaybillList.vue
View File

@ -313,6 +313,8 @@
总运费:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalFreight:0}}</span>
</div>
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="120" :show-overflow-tooltip="true" >
<template slot-scope="scope">

2
src/views/emis/emisWaybillAjustApply/WaybillAjustApplyList.vue
View File

@ -216,7 +216,7 @@ import AjustApplyTypePicker from '@/views/emis/EmisBaseTools/AjustApplyTypePicke
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
export default {
name: "EmisWaybillAjustApply",
name: "WaybillAjustApplyList",
components: { elDateAdvPicker,emisWaybillAjustApplyForm,AjustApplyTypePicker},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',

2
src/views/emis/emisWaybillAjustApply/WaybillAjustCenterConfirm.vue
View File

@ -249,7 +249,7 @@ import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
export default {
name: "EmisWaybillAjustApply",
name: "WaybillAjustCenterConfirm",
components: {
elDateAdvPicker,
emisWaybillAjustApplyForm,

2
src/views/emis/emisWaybillAjustApply/WaybillAjustDestConfirm.vue
View File

@ -233,7 +233,7 @@ import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
import AjustApplyTypePicker from '@/views/emis/EmisBaseTools/AjustApplyTypePicker.vue';
export default {
name: "EmisWaybillAjustApply",
name: "WaybillAjustDestConfirm",
components: { elDateAdvPicker,emisWaybillAjustApplyForm,AjustApplyTypePicker },
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',

2
src/views/emis/emisWaybillAjustApply/WaybillAjustStatList.vue
View File

@ -228,7 +228,7 @@ import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePick
import AjustApplyTypePicker from '@/views/emis/EmisBaseTools/AjustApplyTypePicker.vue';
export default {
name: "EmisWaybillAjustApply",
name: "WaybillAjustStatList",
components: { elDateAdvPicker,emisWaybillAjustApplyForm,EmisSiteSimplePicker1,AjustApplyTypePicker },
dicts: [
],

23
src/views/emis/emisWaybillAjustType/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="mini" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="mini" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="typeCode">
<el-input
@ -21,7 +21,13 @@
</SearchForm>
<XdTable v-loading="loading"
<XdTable
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border
size="mini"
storageName="emisWaybillAjustType_main"
@ -138,14 +144,7 @@
<emisWaybillAjustTypeForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWaybillAjustTypeForm>
</el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<emisWaybillAjustTypeView :id="id" ></EmisWaybillAjustTypeView>
</el-dialog>
-->
</div>
</XdPageContainer>
</template>
<script>
@ -155,7 +154,7 @@ import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
import emisWaybillAjustTypeForm from '@/views/emis/emisWaybillAjustType/emisWaybillAjustTypeForm';
export default {
name: "emisWaybillAjustType",
name: "EmisWaybillAjustType",
components: { elDateSimplePicker,emisWaybillAjustTypeForm },
dicts: [
],