From 1e972909125be51487d241fe0a7a05d2aaa2d137 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 6 Mar 2025 15:55:17 +0800
Subject: [PATCH] md

---
 .../emisCommissionQuoteForm.vue                    | 14 ++++++++++----
 src/views/emis/emisCommissionQuote/index.vue       | 10 ++++++++--
 src/views/emis/emisWaybill/sendWaybillList.vue     | 10 ++++++++--
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue b/src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue
index c4df1aa1..a177310c 100644
--- a/src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue
+++ b/src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue
@@ -21,10 +21,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="寄件网点" prop="transLineCode">
+            <el-form-item label="寄件网点" prop="sendSiteCode">
               <EmisSiteMutiSelectPicker  v-model="form.sendSiteCode"  ></EmisSiteMutiSelectPicker>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="下一网点" prop="nextSiteCode">
+              <EmisSiteSimplePicker  v-model="form.nextSiteCode"  ></EmisSiteSimplePicker>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="线路" prop="transLineCode">
                 <TransLineMultiplePicker v-model="form.transLineCode"  isInitiated="true"></TransLineMultiplePicker>
@@ -132,7 +137,6 @@
                 </el-select>
             </el-form-item>
             </el-col>
-
           <!-- <el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -235,8 +239,9 @@ import TransLineMultiplePicker from '@/views/emis/EmisBaseTools/TransLineMultipl
 import TransProductMultiplePicker from '@/views/emis/EmisBaseTools/TransProductMultiplePicker.vue';
 
 import EmisSiteMutiSelectPicker from '@/views/emis/EmisBaseTools/EmisSiteMutiSelectPicker.vue';
-
 import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+
+
 import EmisStaffSimpleListPicker from '@/views/emis/EmisBaseTools/EmisStaffSimpleListPicker.vue';
 import { listUser } from "@/api/system/user";
 
@@ -257,7 +262,7 @@ export default {
     }
   },
   components: {
-    EmisSiteMutiSelectPicker,CountryMutiSelectPicker,CountryMutiSelectPicker1,EmisSiteSimplePicker,EcqExpressionPanel,
+    EmisSiteSimplePicker,EmisSiteMutiSelectPicker,CountryMutiSelectPicker,CountryMutiSelectPicker1,EcqExpressionPanel,
     EmisStaffSimpleListPicker,TransLineMultiplePicker,TransProductMultiplePicker
   },
   dicts: ['emis_price_type','emis_fee_type','sys_currency_type',
@@ -419,6 +424,7 @@ export default {
         postType: null,
         transType: null,
         sendSiteCode:null,
+        nextSiteCode:null,
         transTypeIdArr:null,
         blOpen: null,
         empCode: null,
diff --git a/src/views/emis/emisCommissionQuote/index.vue b/src/views/emis/emisCommissionQuote/index.vue
index 7d7ac953..741c63ef 100644
--- a/src/views/emis/emisCommissionQuote/index.vue
+++ b/src/views/emis/emisCommissionQuote/index.vue
@@ -18,7 +18,7 @@
         />
       </el-form-item>
       <el-form-item label="计算类型" prop="calcType">
-        <el-select clearable v-model="queryParams.calcType" clearable placeholder="请选择" style="width:100%">
+        <el-select  v-model="queryParams.calcType" clearable filterable placeholder="请选择" style="width:100%">
              <el-option label="按票计算" :value="1"></el-option>
              <el-option label="重量计算" :value="2"></el-option>
              <el-option label="体积计算" :value="3"></el-option>
@@ -26,7 +26,7 @@
            </el-select>
       </el-form-item>
       <el-form-item label="岗位类型" prop="postType">
-        <el-select v-model="queryParams.postType" placeholder="岗位类型" clearable filterable >
+        <el-select v-model="queryParams.postType" placeholder="岗位类型" clearable filterable  >
                   <el-option
                     v-for="item in dict.type.emis_commission_post"
                     v-bind:key="item.value"
@@ -223,6 +223,12 @@
         </template>
       </el-table-column>
 
+      <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.nextSiteName }}</span>
+        </template>
+      </el-table-column>
+
       <el-table-column :label="$t('岗位类型')" align="center" prop="postType" min-width="100" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.emis_commission_post" :value="scope.row.postType"/>
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index 60e99f7b..0a24e86a 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -254,12 +254,18 @@
           <el-form-item :label="$t('录单员')" prop="registerManCode">
                 <EmisUserSimplePicker1  :placeholder="$t('录单员')" v-model="queryParams.registerManCode"></EmisUserSimplePicker1>
           </el-form-item>
-          <el-form-item   :label="$t('图片上传')" prop="blUploadGoodsPic">
+          <el-form-item :label="$t('图片上传')" prop="blUploadGoodsPic">
               <el-select  clearable v-model="queryParams.params.blUploadGoodsPic" placeholder="">
                   <el-option key="1" label="已上传" value="1"></el-option>
                   <el-option key="0" label="未上传" value="0"></el-option>
               </el-select>
-         </el-form-item>
+          </el-form-item>
+          <el-form-item :label="$t('数据来源')" prop="dataFrom">
+              <el-select  clearable v-model="queryParams.dataFrom" placeholder="">
+                  <el-option key="sapp" label="sapp" value="sapp"></el-option>
+                  <el-option key="oms" label="oms" value="oms"></el-option>
+              </el-select>
+          </el-form-item>
         </el-col>
       </el-row>
     </SearchForm>