From f50909db5b62c727fc9f6765e2a7fd9c2351fe45 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Thu, 9 Apr 2026 09:54:52 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=20=20=E6=8F=90=E6=88=90=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/emis/emisCommissionProfit/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/emis/emisCommissionProfit/index.vue b/src/views/emis/emisCommissionProfit/index.vue
index 83be54b0..9c45569e 100644
--- a/src/views/emis/emisCommissionProfit/index.vue
+++ b/src/views/emis/emisCommissionProfit/index.vue
@@ -100,7 +100,8 @@
         <template slot-scope="scope">
           <dict-tag :options="dict.type.emis_commission_post" :value="scope.row.postType"/>
         </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>
         <template slot-scope="scope">
           <div  class="link-type" @click="handleShowDtlList(scope.row,'1,3,6')">{{ scope.row.money }}</div>

From 1555c4e87bd2f45ad536d47a93bddf971055e6a6 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Thu, 9 Apr 2026 10:19:50 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8E=A5=E5=8D=95=E6=8D=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E9=94=80=E5=94=AE=E6=94=AF=E6=8C=81=E5=8F=96?=
 =?UTF-8?q?=E5=80=BC=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/emis/emisWaybill/waybillGot.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/emis/emisWaybill/waybillGot.vue b/src/views/emis/emisWaybill/waybillGot.vue
index 141290dd..bb4692c2 100644
--- a/src/views/emis/emisWaybill/waybillGot.vue
+++ b/src/views/emis/emisWaybill/waybillGot.vue
@@ -874,7 +874,7 @@
 
 <script>
 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 { listMonthUser,listMonthUserAll } from "@/api/emis/emisCustomerUser";
 import { parseTime } from "@/utils/custom";
@@ -1764,7 +1764,7 @@ methods: {
       if(this.billCode && this.billCode!=undefined) {
         this.loading = true;
         // 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!=response.data.sendSiteCode){
               this.$modal.msgError('此单归属不允许修改');
@@ -1773,6 +1773,8 @@ methods: {
           }
 
           this.form = response.data;
+          // 处理销售支持
+          this.form.waybillOther.salesSupport = this.form.salesSupport;
           //处理始发网点为空 始发网点等于寄件网点
           if(!this.form.startSiteCode || this.form.startSiteCode.trim()==''){
             this.form.startSiteCode=this.form.sendSiteCode;

From 5cf5da07a48eb91cb3777e72be4bbe43d7e7c455 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Thu, 9 Apr 2026 10:28:06 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8E=A5=E5=8D=95=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=94=A8=E5=BE=97=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/emis/emisWaybill.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/api/emis/emisWaybill.js b/src/api/emis/emisWaybill.js
index 1e3ccf8f..4f0500c8 100644
--- a/src/api/emis/emisWaybill.js
+++ b/src/api/emis/emisWaybill.js
@@ -112,6 +112,13 @@ export function getWaybillDetail(billCode) {
     params: {billCode: billCode}
   })
 }
+export function getWaybillDetailForOrder(billCode) {
+  return request({
+    url: '/emis/emisWaybill/getWaybillDetailForOrder',
+    method: 'get',
+    params: {billCode: billCode}
+  })
+}
 
 export function getEmisWaybillByBillCode(billCode) {
   return request({