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

Merge pull request 'develop' (#229) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/229
This commit is contained in:
wuteng 2026-04-09 10:55:56 +08:00
commit 20ef7c4d4d
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/emis/emisWaybill.js
View File

@ -112,6 +112,13 @@ export function getWaybillDetail(billCode) {
params: {billCode: billCode} params: {billCode: billCode}
}) })
} }
export function getWaybillDetailForOrder(billCode) {
return request({
url: '/emis/emisWaybill/getWaybillDetailForOrder',
method: 'get',
params: {billCode: billCode}
})
}
export function getEmisWaybillByBillCode(billCode) { export function getEmisWaybillByBillCode(billCode) {
return request({ return request({

1
src/views/emis/emisCommissionProfit/index.vue
View File

@ -101,6 +101,7 @@
<dict-tag :options="dict.type.emis_commission_post" :value="scope.row.postType"/> <dict-tag :options="dict.type.emis_commission_post" :value="scope.row.postType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" width="120" sortable> </el-table-column>
<el-table-column :label="$t('现金提成')" align="center" prop="money" width="120" sortable> <el-table-column :label="$t('现金提成')" align="center" prop="money" width="120" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="link-type" @click="handleShowDtlList(scope.row,'1,3,6')">{{ scope.row.money }}</div> <div class="link-type" @click="handleShowDtlList(scope.row,'1,3,6')">{{ scope.row.money }}</div>

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

@ -874,7 +874,7 @@
<script> <script>
import { realMatchWaybill,getTotalAvailablePag } from "@/api/emis/emisCommon"; import { realMatchWaybill,getTotalAvailablePag } from "@/api/emis/emisCommon";
import { checkWaybillIsExists,getWaybillDetail,realSubmitOrder,calcWaybillFee,calcSetteldWeight,calcVolumeWeight} from "@/api/emis/emisWaybill"; import { checkWaybillIsExists,getWaybillDetailForOrder,realSubmitOrder,calcWaybillFee,calcSetteldWeight,calcVolumeWeight} from "@/api/emis/emisWaybill";
import { listCustomsLevel } from "@/api/emis/emisCustomsLevel"; import { listCustomsLevel } from "@/api/emis/emisCustomsLevel";
import { listMonthUser,listMonthUserAll } from "@/api/emis/emisCustomerUser"; import { listMonthUser,listMonthUserAll } from "@/api/emis/emisCustomerUser";
import { parseTime } from "@/utils/custom"; import { parseTime } from "@/utils/custom";
@ -1764,7 +1764,7 @@ methods: {
if(this.billCode && this.billCode!=undefined) { if(this.billCode && this.billCode!=undefined) {
this.loading = true; this.loading = true;
// getWaybillDetail(this.billCode).then(response => { // getWaybillDetail(this.billCode).then(response => {
const response = await getWaybillDetail(this.billCode); const response = await getWaybillDetailForOrder(this.billCode);
if(this.$store.getters.ownerSiteCode!='88888'&&this.action!='got'){ if(this.$store.getters.ownerSiteCode!='88888'&&this.action!='got'){
if(this.$store.getters.ownerSiteCode!=response.data.sendSiteCode){ if(this.$store.getters.ownerSiteCode!=response.data.sendSiteCode){
this.$modal.msgError('此单归属不允许修改'); this.$modal.msgError('此单归属不允许修改');
@ -1773,6 +1773,8 @@ methods: {
} }
this.form = response.data; this.form = response.data;
// 处理销售支持
this.form.waybillOther.salesSupport = this.form.salesSupport;
//处理始发网点为空 始发网点等于寄件网点 //处理始发网点为空 始发网点等于寄件网点
if(!this.form.startSiteCode || this.form.startSiteCode.trim()==''){ if(!this.form.startSiteCode || this.form.startSiteCode.trim()==''){
this.form.startSiteCode=this.form.sendSiteCode; this.form.startSiteCode=this.form.sendSiteCode;