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-28 21:39:36 +08:00
parent 8a6106f1c8
commit 96c74edb03
7 changed files with 131 additions and 2114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/views/emis/emisSettleBill/panel/MoneyPanel.vue
View File

@ -13,14 +13,7 @@
<!-- <el-form-item :label="$t('收款网点')" prop="siteCode">
<EmisSiteSimplePicker1 v-model="queryParams.siteCode" ></EmisSiteSimplePicker1>
</el-form-item> -->
<el-form-item :label="$t('开票状态')" prop="openBillStatus">
<el-select clearable v-model="queryParams.openBillStatus" placeholder="">
<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="">
<el-option key="0" label="未收款" value="0"></el-option>
@ -28,6 +21,23 @@
<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="">
<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-option key="3" label="不开票" value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('核销状态')" prop="chargeStatus">
<el-select clearable v-model="queryParams.chargeStatus" 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>
@ -126,6 +136,44 @@
<el-tag v-if="scope.row.paymentStatus=='2'" type="warning">部分收款</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('开票状态')" align="center" prop="paymentStatus" min-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="paymentStatus" min-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" min-width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.openBillStatus=='0'" type="info">未开票</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=='2'" type="warning">不开票</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('核销状态')" align="center" prop="chargeStatus" min-width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.chargeStatus=='0'" type="warning">未核销</el-tag>
<el-tag v-if="scope.row.chargeStatus=='1'" type="success">已核销</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('回款联系人')" align="center" prop="payee" width="100" />
<el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" width="100" />
<!-- <el-table-column :label="$t('理赔金额')" align="center" prop="satisfyMoney" min-width="100" /> -->

44
src/views/emis/emisSettleBill/panel/MonthPanel.vue
View File

@ -13,19 +13,30 @@
<!-- <el-form-item :label="$t('收款网点')" prop="siteCode">
<EmisSiteSimplePicker1 v-model="queryParams.siteCode" ></EmisSiteSimplePicker1>
</el-form-item> -->
<el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" min-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-form-item :label="$t('开票状态')" prop="openBillStatus">
<el-select clearable v-model="queryParams.openBillStatus" placeholder="">
<el-option key="1" label="已开票" value="1"></el-option>
<el-option key="0" label="未开票" value="0"></el-option>
<el-option key="0" label="未开票" value="0"></el-option>
<el-option key="1" label="已开票" value="1"></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="">
<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-form-item :label="$t('核销状态')" prop="chargeStatus">
<el-select clearable v-model="queryParams.chargeStatus" 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">
@ -123,6 +134,25 @@
<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" min-width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.openBillStatus=='0'" type="info">未开票</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=='2'" type="warning">不开票</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('核销状态')" align="center" prop="chargeStatus" min-width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.chargeStatus=='0'" type="warning">未核销</el-tag>
<el-tag v-if="scope.row.chargeStatus=='1'" type="success">已核销</el-tag>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('理赔金额')" align="center" prop="satisfyMoney" min-width="100" /> -->
<!-- <el-table-column :label="$t('允许金额')" align="center" prop="allowanceMoney" min-width="100" /> -->
<!-- <el-table-column :label="$t('抵扣金额')" align="center" prop="deductionMoney" min-width="100" /> -->

2086
src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
View File

File diff suppressed because it is too large Load Diff

13
src/views/emis/emisWaybill/orderList.vue
View File

@ -155,6 +155,9 @@
border
size="mini"
storageName="orderList_main"
ref="refTable"
:data="emisWaybillList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
@ -287,7 +290,9 @@
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_order_status" :value="scope.row.orderStatus"/>
</template>
</el-table-column> -
</el-table-column>
<el-table-column :label="$t('进仓单')" align="center" prop="intoWarehouseBillCode" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
@ -494,7 +499,7 @@ import waybillDetailReadOnly from '@/views/emis/emisWaybill/waybillDetailReadOnl
export default {
name: "WaybillIsPrinted",
components: { elDateAdvPicker,CountryPicker0,CountryPicker1 ,EmisSiteSimplePicker1,waybillDetailReadOnly},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
dicts: ['emis_order_status','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'
],
@ -746,7 +751,7 @@ export default {
this.selectionList.forEach(item=>{
this.download('emis/emisWaybill/exportWarehouseInTpl', {
orderSn:item.orderSn
}, `${new Date().getTime()}.docx`)
}, `${item.intoWarehouseBillCode}.pdf`)
});
}
@ -799,7 +804,7 @@ export default {
// 跳转到开单界面
if(this.selectionList&&this.selectionList.length>0){
let billCode=this.selectionList[0].billCode;
this.$router.push({ path: '/d24/waybillManagement/WaybillRecord', query: { action: "modify",billCode: billCode,addFrom:"userOrder"}})
this.$router.push({ path: '/d24/waybillManagement/WaybillRecord', query: { action: "add",billCode: billCode,addFrom:"userOrder"}})
}
},

1
src/views/emis/emisWaybill/orderRecord.vue
View File

@ -902,6 +902,7 @@ data() {
deep: true
},
},
activated(){
},

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

@ -806,6 +806,7 @@ export default {
params:{
expireNotSign:null,
problemQueryType:null,
queryTabType:"1"
}
},
};

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

@ -29,6 +29,12 @@
</div>
</el-form-item>
</el-col>
<!-- <el-col :span="8" v-if="action=='add' && addFrom=='userOrder'">
<el-form-item :label="$t('寄件网点')" prop="sendSiteCode">
<EmisSiteSimplePicker v-if="$store.getters.ownerSiteCode== '88888'" v-model="form.sendSiteCode" @onChange="onSendSiteSelect" ></EmisSiteSimplePicker>
<el-input v-else v-model="form.sendSiteName" placeholder="" disabled />
</el-form-item>
</el-col> -->
<!-- 运单录入 end -->
@ -154,9 +160,10 @@
</el-col>
</el-row>
<div v-if="action=='add' || action=='preAdd'" style="position: absolute;right: 80px;top: 60px;z-index: 100;">
<div v-if="totalAvailablePag.mainHasCnt>0" style="display:inline-flex;font-size: 15px;font-weight: 700;">
<!-- v-if="action=='add' || action=='preAdd'" -->
<div style="position: absolute;right: 80px;top: 60px;z-index: 100;">
<!-- -->
<div style="display:inline-flex;font-size: 15px;font-weight: 700;">
<div style="width:230px">
<el-form-item prop="sendSiteCode">
@ -165,16 +172,17 @@
<el-input v-else v-model="form.sendSiteName" placeholder="" disabled />
</el-form-item>
</div>
<div style="margin-left: 12px;">
<div style="margin-left: 12px;" v-if="totalAvailablePag.mainHasCnt>0">
{{ $t('主单剩余') }}:<span>{{ totalAvailablePag.mainHasCnt }}</span>
</div>
<div>
<div v-if="totalAvailablePag.mainHasCnt>0">
{{ $t('子单剩余') }}:<span>{{ totalAvailablePag.subHasCnt }}</span>
</div>
<div v-else @click="handleApplyPag" style="font-size: 15px;font-weight: 700;color:red;cursor: pointer;">{{ $t('主单余量') }}:0，{{ $t('请立即') }}【<span style="color:blue">{{ $t('申购') }}</span>】</div>
</div>
<div v-else >
<div @click="handleApplyPag" style="font-size: 15px;font-weight: 700;color:red;cursor: pointer;">{{ $t('主单余量') }}:0，{{ $t('请立即') }}【<span style="color:blue">{{ $t('申购') }}</span>】</div>
</div>
<!-- <div >
<div v-if="totalAvailablePag.mainHasCnt>0" style="font-size: 15px;font-weight: 700;color:red;cursor: pointer;">{{ $t('主单余量') }}:0，{{ $t('请立即') }}【<span style="color:blue">{{ $t('申购') }}</span>】</div>
</div> -->
</div>
</div>
@ -1033,6 +1041,13 @@ computed: {
// immediate: false,
// deep: true
// },
$route () {
if(this.$route.query.addFrom=="userOrder"){
this.action="add";
this.billCode=this.$route.query.billCode;
this.initData();
}
}
},
@ -1395,6 +1410,8 @@ methods: {
}
if(this.addFrom=="userOrder"){
// 获取可用运单数
this.initGetTotalAvailablePag(this.form.sendSiteCode);
this.startTimer();
}
@ -1425,7 +1442,7 @@ methods: {
this.isNeedSave=true;
this.form.printTypeCheckList=[0,1,5],
// 获取可用运单数
// 获取可用运单数
this.initGetTotalAvailablePag(this.form.sendSiteCode);
this.handleInitGenGoods();
@ -1634,6 +1651,7 @@ methods: {
realSubmitOrder(postForm).then(response => {
this.$modal.msgSuccess("下单成功");
this.addFrom=null;
// 新开单才需要打印
if(this.action == "add"){
// 做揽收扫描记录