运单销售支持功能

src/api/emis/emisSalesCommissionRatio.js

@@ -39,3 +39,12 @@ export function getSalesCommissionRatio(id) {
     method: 'get'
   })
 }
+
+// 销售支持列表
+export function getSalesmanSupportList(query) {
+  return request({
+    url: '/emis/salesCommissionRatio/listSimple',
+    method: 'get',
+    params: query
+  })
+}

src/views/emis/EmisBaseTools/SalesSupportPicker.vue

@@ -0,0 +1,111 @@
+<template>
+   <el-select
+      style="width:100%"
+      ref="selectRef"
+      filterable
+      clearable
+      remote
+      v-model="svalue"
+      :placeholder="placeholder"
+      @blur="onBlur"
+      @change="onChange"
+      @focus="onFocus"
+      @visible-change="reverseArrow"
+      :disabled="disabled"
+      >
+        <el-option v-for="item in optionItems" :key="item.salesSupport" :label="item.salesSupport" :value="item.salesSupport" ></el-option>
+    </el-select>
+</template>
+<script>
+  import emitter from 'element-ui/src/mixins/emitter';
+  import { getSalesmanSupportList} from "@/api/emis/emisSalesCommissionRatio";
+
+  export default {
+    name: "SalesSupportPicker",
+    mixins: [emitter],
+    props: {
+      value: {
+        type: [String],
+        required: false
+      },
+      placeholder:{
+        type: [String],
+        required: false
+      },
+      disabled:{
+        type: [Boolean],
+        required: false,
+        default:false,
+      },
+      salesmen:{
+        type: [String],
+        required: false
+      }
+    },
+    data() {
+      return {
+        optionItems: [],
+        svalue: this.value,
+        queryParams:{
+          pageNum: 1,
+          pageSize: 100,
+          salesmen: null,
+        }
+      };
+    },
+    watch: {
+      value(newVal) {
+        this.svalue = newVal;
+      },
+    },
+    created() {
+      // this.queryData();
+    },
+    mounted(){
+      let rulesDom = this.$refs["selectRef"].$el.querySelector(".el-input .el-input__suffix .el-input__suffix-inner .el-input__icon"); // 找到dom
+      rulesDom.classList.add("el-icon-arrow-up"); // 对dom新增class
+    },
+    methods: {
+      onFocus(){
+        this.queryData();
+      },
+      onBlur(val){
+        this.$emit("input", this.svalue);
+        this.dispatch('ElFormItem', 'el.form.blur');
+      },
+      onChange() {
+        if(this.svalue!=null){
+          this.$emit("input", this.svalue);
+
+          this.$emit("change",this.svalue);
+          this.$emit("onChange",this.svalue);
+          this.dispatch('ElFormItem', 'el.form.change', [this.svalue]);
+        }
+      },
+      queryData(val) {
+        this.queryParams.salesmen = this.salesmen;
+        if (this.salesmen) {
+          getSalesmanSupportList(this.queryParams).then(response => {
+            this.optionItems = response.rows;
+            //根据salesSupport去重，去空值
+            this.optionItems = this.optionItems.filter((item, index, arr) => {
+              return item.salesSupport != null && arr.findIndex(t => t.salesSupport === item.salesSupport) === index;
+            });
+          });
+        } else {
+          this.optionItems = [];
+        }
+      },
+      reverseArrow(flag) {
+        let rulesDom = this.$refs["selectRef"].$el.querySelector(
+          ".el-input .el-input__suffix .el-input__suffix-inner .el-input__icon"
+        ); // 找到dom
+        if (flag) {
+          rulesDom.classList.add("is-reverse"); // 对dom新增class
+        } else {
+          rulesDom.classList.remove("is-reverse"); // 对dom新增class
+        }
+      },
+    }
+  };
+</script>

src/views/emis/emisWaybill/batchWaybillRecord.vue

@@ -76,6 +76,7 @@
       <el-table-column :label="$t('清关方式')" align="center" prop="customsClear" min-width="80" />
       <el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
       <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
+      <el-table-column :label="$t('销售支持')" align="center" prop="salesSupport" min-width="100" />
 
       <el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="80" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('收件电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
@@ -510,6 +511,7 @@ export default {
                 feeRemark:element['费用备注'],
                 payee: element['回款联系人'],
                 salesmen: element['销售联系人'],
+                salesSupport: element['销售支持'],
                 operateEmployeeCode: element['取件员/操作员'],
                 remark:  element['录单备注'],
                 blMessage:  element['寄件/签收短信'],

src/views/emis/emisWaybill/centerWaybillList.vue

@@ -290,7 +290,9 @@
           <el-form-item label="销售联系人" prop="salesmen" >
             <EmpNamePicker2 :placeholder="$t('销售联系人')" v-model="queryParams.salesmen"  ></EmpNamePicker2>
           </el-form-item>
-
+          <el-form-item label="销售支持" prop="salesSupport" label-width="100px">
+            <EmpNamePicker3 :placeholder="$t('销售支持')" v-model="queryParams.salesSupport"   ></EmpNamePicker3>
+          </el-form-item>
            
 
           <el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
@@ -478,6 +480,7 @@
         </el-table-column>
       <el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
       <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
+      <el-table-column :label="$t('销售支持')" align="center" prop="salesSupport" min-width="100" />
 
       <el-table-column :label="$t('是否问题件')" align="center" prop="blIsQuestion" min-width="80" >
           <template slot-scope="scope">
@@ -628,6 +631,7 @@ import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vu
 
 import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 
 import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
@@ -664,6 +668,7 @@ export default {
     TransLinePicker,TransProductPicker,
     EmpNamePicker1,
     EmpNamePicker2,
+    EmpNamePicker3,
     EmisUserSimplePicker0,
     EmisUserSimplePicker1,
     EmisUserSimplePicker2,

src/views/emis/emisWaybill/dispatchWaybillList.vue

@@ -267,7 +267,9 @@
           <el-form-item label="销售联系人" prop="salesmen" label-width="100px">
             <EmpNamePicker2 :placeholder="$t('销售联系人')" v-model="queryParams.salesmen"  ></EmpNamePicker2>
           </el-form-item>
-
+          <el-form-item label="销售支持" prop="salesSupport" label-width="100px">
+            <EmpNamePicker3 :placeholder="$t('销售支持')" v-model="queryParams.salesSupport"   ></EmpNamePicker3>
+          </el-form-item>
           <el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
               <EmisUserSimplePicker0  :placeholder="$t('操作员')" v-model="queryParams.operateEmployeeCode"></EmisUserSimplePicker0>
               </el-form-item>
@@ -460,6 +462,7 @@
        </el-table-column>
       <el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
       <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
+      <el-table-column :label="$t('销售支持')" align="center" prop="salesSupport" min-width="100" />
 
       <el-table-column :label="$t('是否问题件')" align="center" prop="blIsQuestion" min-width="80" >
           <template slot-scope="scope">
@@ -608,6 +611,7 @@ import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vu
 
 import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 
 import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
@@ -641,6 +645,8 @@ export default {
     TransLinePicker,TransProductPicker,
     EmpNamePicker1,
     EmpNamePicker2,
+    EmpNamePicker3,
+
     EmisUserSimplePicker0,
     EmisUserSimplePicker1,
     EmisUserSimplePicker2,

src/views/emis/emisWaybill/sendWaybillList.vue

@@ -270,7 +270,9 @@
           <el-form-item label="销售联系人" prop="salesmen" label-width="100px">
             <EmpNamePicker2 :placeholder="$t('销售联系人')" v-model="queryParams.salesmen" @onChange="onSalemanChange"  ></EmpNamePicker2>
           </el-form-item>
-
+          <el-form-item label="销售支持" prop="salesSupport" label-width="100px">
+            <EmpNamePicker3 :placeholder="$t('销售支持')" v-model="queryParams.salesSupport"   ></EmpNamePicker3>
+          </el-form-item>
           <el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
               <EmisUserSimplePicker0  :placeholder="$t('操作员')" v-model="queryParams.operateEmployeeCode"></EmisUserSimplePicker0>
               </el-form-item>
@@ -451,7 +453,7 @@
         </el-table-column>
       <el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
       <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
-
+      <el-table-column :label="$t('销售支持')" align="center" prop="salesSupport" min-width="100" />
       <el-table-column :label="$t('是否问题件')" align="center" prop="blIsQuestion" min-width="80" >
           <template slot-scope="scope">
               <el-tag v-if="scope.row.blIsQuestion==1" type="danger">是</el-tag>
@@ -596,6 +598,7 @@ import TransProductMultipleAllPicker from '../EmisBaseTools/TransProductMultiple
 
 import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 
 import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
@@ -639,6 +642,7 @@ export default {
     TransLinePicker,TransProductPicker,
     EmpNamePicker1,
     EmpNamePicker2,
+    EmpNamePicker3,
     EmisUserSimplePicker0,
     EmisUserSimplePicker1,
     EmisUserSimplePicker2,

src/views/emis/emisWaybill/sendWaybillListNew.vue

@@ -277,7 +277,9 @@
     <el-form-item label="销售联系人" prop="salesmen" label-width="100px">
       <EmpNamePicker2 :placeholder="$t('销售联系人')" v-model="queryParams.salesmen" @onChange="onSalemanChange"  ></EmpNamePicker2>
     </el-form-item>
-
+    <el-form-item label="销售支持" prop="salesSupport" label-width="100px">
+      <EmpNamePicker3 :placeholder="$t('销售支持')" v-model="queryParams.salesSupport"   ></EmpNamePicker3>
+    </el-form-item>
     <el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
         <EmisUserSimplePicker0  :placeholder="$t('操作员')" v-model="queryParams.operateEmployeeCode"></EmisUserSimplePicker0>
         </el-form-item>
@@ -456,6 +458,7 @@
         </el-table-column>
       <el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
       <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
+      <el-table-column :label="$t('销售支持')" align="center" prop="salesSupport" min-width="100" />
 
       <el-table-column :label="$t('是否问题件')" align="center" prop="blIsQuestion" min-width="80" >
           <template slot-scope="scope">
@@ -606,7 +609,7 @@ import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vu
 
 import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
-
+import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
@@ -655,6 +658,7 @@ export default {
     TransLinePicker,TransProductPicker,
     EmpNamePicker1,
     EmpNamePicker2,
+    EmpNamePicker3,
     EmisUserSimplePicker0,
     EmisUserSimplePicker1,
     EmisUserSimplePicker2,

src/views/emis/emisWaybill/waybillDetailReadOnly.vue

@@ -35,6 +35,7 @@
             <el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  label="月结客户" >{{ form.custName }}</el-descriptions-item>
             <el-descriptions-item label="回款联系人">{{ form.payee }}</el-descriptions-item>
             <el-descriptions-item label="销售联系人">{{ form.salesmen }}</el-descriptions-item>
+            <el-descriptions-item label="销售支持">{{ form.salesSupport }}</el-descriptions-item>
     </el-descriptions>
 
     <el-descriptions :title="$t('仓库收货信息')" size="small"  :column="4" v-if="form.pickupMethod==1||form.pickupMethod==3">

src/views/emis/emisWaybill/waybillGot.vue

@@ -142,20 +142,25 @@
                         <EmisMonthpayAccountPicker v-model="form.custNo" @onChange="onSelectMonthUser"></EmisMonthpayAccountPicker>
                         </el-form-item>
                       </el-col>
-                      <el-col :span="6">
+                      <el-col :span="5">
                         <el-form-item   :label="$t('回款联系人')"  prop="payee" label-width="85px">
                           <PayeePicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('回款联系人')" v-model="form.payee" :disabled="true" ></PayeePicker>
                           <PayeePicker v-else :placeholder="$t('回款联系人')" v-model="form.payee"  ></PayeePicker>
 
                         </el-form-item>
                       </el-col>
-                      <el-col :span="6">
+                      <el-col :span="5">
                         <el-form-item  :label="$t('销售联系人')"  prop="salesmen" label-width="85px">
                           <SalemanPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  :placeholder="$t('销售联系人')" v-model="form.salesmen" :disabled="true" ></SalemanPicker>
-                          <SalemanPicker v-else  :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></SalemanPicker>
+                          <SalemanPicker v-else  :placeholder="$t('销售联系人')" v-model="form.salesmen"   @change="onSalesmenChange"></SalemanPicker>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="5">
+                        <el-form-item  :label="$t('销售支持')"  prop="salesSupport" label-width="85px">
+                          <SalesSupportPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  :placeholder="$t('销售支持')" v-model="form.salesSupport" :disabled="true" ></SalesSupportPicker>
+                          <SalesSupportPicker v-else  :placeholder="$t('销售支持')" v-model="form.salesSupport"  :salesmen="form.salesmen"></SalesSupportPicker>
                         </el-form-item>
                        </el-col>
-
                     </el-row>
                   </el-col>
 
@@ -631,21 +636,27 @@
                         <EmisMonthpayAccountPicker v-model="form.custNo" @onChange="onSelectMonthUser"></EmisMonthpayAccountPicker>
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="8">
                       <el-form-item   :label="$t('回款联系人')" prop="payee" label-width="85px">
                         <PayeePicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('回款联系人')" v-model="form.payee" :disabled="true" ></PayeePicker>
                         <PayeePicker v-else :placeholder="$t('回款联系人')"    v-model="form.payee"  ></PayeePicker>
 
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="8">
                       <el-form-item :label="$t('销售联系人')" prop="salesmen" label-width="85px">
                         <SalemanPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  :placeholder="$t('销售联系人')" v-model="form.salesmen" :disabled="true" ></SalemanPicker>
                         <SalemanPicker v-else  :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></SalemanPicker>
 
                       </el-form-item>
                     </el-col>
+                    <el-col :span="8">
+                      <el-form-item :label="$t('销售支持')" prop="salesSupport" label-width="85px">
+                        <SalesSupportPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  :placeholder="$t('销售支持')" v-model="form.salesSupport" :disabled="true" ></SalesSupportPicker>
+                        <SalesSupportPicker v-else  :placeholder="$t('销售支持')" v-model="form.salesSupport"  :salesmen="form.salesmen"></SalesSupportPicker>
 
+                      </el-form-item>
+                    </el-col>
                     <el-col :span="24">
                       <el-form-item  :label="$t('计费方式')" prop="calcFeeType" label-width="70px">
                         <el-radio-group v-model="form.calcFeeType" @change="calcBillFee" >
@@ -885,6 +896,7 @@ import WarehouseInNoPicker from '@/views/emis/EmisBaseTools/WarehouseInNoPicker.
 
 import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
 import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
+import SalesSupportPicker from '@/views/emis/EmisBaseTools/SalesSupportPicker.vue';
 import ExchangeRatePanel from '@/views/emis/EmisBaseTools/ExchangeRatePanel.vue';
 
 
@@ -908,6 +920,7 @@ export default {
   // name: "WaybillModify",
 components: {
   SalemanPicker,
+  SalesSupportPicker,
   PayeePicker,
   TanexPrinterPanel,
   feeItemForm,
@@ -1578,6 +1591,7 @@ methods: {
     if(item!=null){
       this.form.payee=item.payee;
       this.form.salesmen=item.salesmen;
+      this.form.salesSupport=item.salesSupport;
       this.form.paymentType= '2';
        // 企业名称
       this.form.sender.enterpriseName=item.enterpriseName;
@@ -2843,6 +2857,10 @@ methods: {
       }
     });
     return true;
+  },
+  // 销售联系人改变事件
+  onSalesmenChange(val) {
+    this.form.salesSupport = null;
   }
 }
 };

src/views/emis/emisWaybill/waybillModify.vue

@@ -142,20 +142,25 @@
                         <EmisMonthpayAccountPicker v-model="form.custNo" @onChange="onSelectMonthUser"></EmisMonthpayAccountPicker>
                         </el-form-item>
                       </el-col>
-                      <el-col :span="6">
+                      <el-col :span="5">
                         <el-form-item   :label="$t('回款联系人')"  prop="payee" label-width="85px">
                           <PayeePicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('回款联系人')" v-model="form.payee" :disabled="true" ></PayeePicker>
                           <PayeePicker v-else :placeholder="$t('回款联系人')" v-model="form.payee"  ></PayeePicker>
 
                         </el-form-item>
                       </el-col>
-                      <el-col :span="6">
+                      <el-col :span="5">
                         <el-form-item  :label="$t('销售联系人')"  prop="salesmen" label-width="85px">
                           <SalemanPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  :placeholder="$t('销售联系人')" v-model="form.salesmen" :disabled="true" ></SalemanPicker>
-                          <SalemanPicker v-else  :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></SalemanPicker>
+                          <SalemanPicker v-else  :placeholder="$t('销售联系人')" v-model="form.salesmen"  @change="onSalesmenChange" ></SalemanPicker>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="5">
+                          <el-form-item  :label="$t('销售支持')"  prop="salesSupport" label-width="85px">
+                            <SalesSupportPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  :placeholder="$t('销售支持')" v-model="form.salesSupport" :disabled="true" ></SalesSupportPicker>
+                            <SalesSupportPicker v-else  :placeholder="$t('销售支持')" v-model="form.salesSupport"  :salesmen="form.salesmen"></SalesSupportPicker>
                           </el-form-item>
                        </el-col>
-
                     </el-row>
                   </el-col>
 
@@ -633,21 +638,27 @@
                         <EmisMonthpayAccountPicker v-model="form.custNo" @onChange="onSelectMonthUser"></EmisMonthpayAccountPicker>
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="8">
                       <el-form-item   :label="$t('回款联系人')" prop="payee" label-width="85px">
                         <PayeePicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('回款联系人')" v-model="form.payee" :disabled="true" ></PayeePicker>
                         <PayeePicker v-else :placeholder="$t('回款联系人')"    v-model="form.payee"  ></PayeePicker>
 
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="8">
                       <el-form-item :label="$t('销售联系人')" prop="salesmen" label-width="85px">
                         <SalemanPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  :placeholder="$t('销售联系人')" v-model="form.salesmen" :disabled="true" ></SalemanPicker>
                         <SalemanPicker v-else  :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></SalemanPicker>
 
                       </el-form-item>
                     </el-col>
+                    <el-col :span="8">
+                        <el-form-item :label="$t('销售支持')" prop="salesSupport" label-width="85px">
+                          <SalesSupportPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  :placeholder="$t('销售支持')" v-model="form.salesSupport" :disabled="true" ></SalesSupportPicker>
+                          <SalesSupportPicker v-else  :placeholder="$t('销售支持')" v-model="form.salesSupport"  :salesmen="form.salesmen"></SalesSupportPicker>
 
+                        </el-form-item>
+                    </el-col>
                     <el-col :span="24">
                       <el-form-item  :label="$t('计费方式')" prop="calcFeeType" label-width="70px">
                         <el-radio-group v-model="form.calcFeeType" @change="calcBillFee" >
@@ -885,6 +896,7 @@ import WarehouseInNoPicker from '@/views/emis/EmisBaseTools/WarehouseInNoPicker.
 
 import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
 import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
+import SalesSupportPicker from '@/views/emis/EmisBaseTools/SalesSupportPicker.vue';
 import ExchangeRatePanel from '@/views/emis/EmisBaseTools/ExchangeRatePanel.vue';
 
 
@@ -905,6 +917,7 @@ export default {
   name: "WaybillModify",
 components: {
   SalemanPicker,
+  SalesSupportPicker,
   PayeePicker,
   TanexPrinterPanel,
   feeItemForm,
@@ -1583,6 +1596,7 @@ methods: {
     if(item!=null){
       this.form.payee=item.payee;
       this.form.salesmen=item.salesmen;
+      this.form.salesSupport=item.salesSupport;
       this.form.paymentType= '2';
        // 企业名称
       this.form.sender.enterpriseName=item.enterpriseName;
@@ -2848,6 +2862,10 @@ methods: {
       }
     });
     return true;
+  },
+  // 销售联系人改变事件
+  onSalesmenChange(val) {
+    this.form.salesSupport = null;
   }
 }
 };

src/views/emis/emisWaybill/waybillRecord.vue

@@ -143,17 +143,23 @@
                         <EmisMonthpayAccountPicker v-model="form.custNo" @onChange="onSelectMonthUser"></EmisMonthpayAccountPicker>
                         </el-form-item>
                       </el-col>
-                      <el-col :span="6">
+                      <el-col :span="5">
                         <el-form-item   :label="$t('回款联系人')"  prop="payee" label-width="85px">
                           <PayeePicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('回款联系人')" v-model="form.payee" :disabled="true" ></PayeePicker>
                           <PayeePicker v-else :placeholder="$t('回款联系人')" v-model="form.payee"  ></PayeePicker>
 
                         </el-form-item>
                       </el-col>
-                      <el-col :span="6">
+                      <el-col :span="5">
                         <el-form-item  :label="$t('销售联系人')"  prop="salesmen" label-width="85px">
                           <SalemanPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  :placeholder="$t('销售联系人')" v-model="form.salesmen" :disabled="true" ></SalemanPicker>
-                          <SalemanPicker v-else  :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></SalemanPicker>
+                          <SalemanPicker v-else  :placeholder="$t('销售联系人')" v-model="form.salesmen"  @change="onSalesmenChange"></SalemanPicker>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="5">
+                        <el-form-item  :label="$t('销售支持')"  prop="salesSupport" label-width="85px">
+                          <SalesSupportPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  :placeholder="$t('销售支持')" v-model="form.salesSupport" :disabled="true" ></SalesSupportPicker>
+                          <SalesSupportPicker v-else  :placeholder="$t('销售支持')" v-model="form.salesSupport"  :salesmen="form.salesmen"></SalesSupportPicker>
                         </el-form-item>
                       </el-col>
                       
@@ -633,20 +639,27 @@
                         <EmisMonthpayAccountPicker v-model="form.custNo" @onChange="onSelectMonthUser"></EmisMonthpayAccountPicker>
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="8">
                       <el-form-item   :label="$t('回款联系人')" prop="payee" label-width="85px">
                         <PayeePicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('回款联系人')" v-model="form.payee" :disabled="true" ></PayeePicker>
                         <PayeePicker v-else :placeholder="$t('回款联系人')"    v-model="form.payee"  ></PayeePicker>
 
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="8">
                       <el-form-item :label="$t('销售联系人')" prop="salesmen" label-width="85px">
                         <SalemanPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  :placeholder="$t('销售联系人')" v-model="form.salesmen" :disabled="true" ></SalemanPicker>
                         <SalemanPicker v-else  :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></SalemanPicker>
 
                       </el-form-item>
                     </el-col>
+                    <el-col :span="8">
+                      <el-form-item :label="$t('销售支持')" prop="salesSupport" label-width="85px">
+                        <SalesSupportPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  :placeholder="$t('销售支持')" v-model="form.salesSupport" :disabled="true" ></SalesSupportPicker>
+                        <SalesSupportPicker v-else  :placeholder="$t('销售支持')" v-model="form.salesSupport"  :salesmen="form.salesmen"></SalesSupportPicker>
+
+                      </el-form-item>
+                    </el-col>
 
                     <el-col :span="24">
                       <el-form-item  :label="$t('计费方式')" prop="calcFeeType" label-width="70px">
@@ -885,6 +898,7 @@ import WarehouseInNoPicker from '@/views/emis/EmisBaseTools/WarehouseInNoPicker.
 
 import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
 import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
+import SalesSupportPicker from '@/views/emis/EmisBaseTools/SalesSupportPicker.vue';
 import ExchangeRatePanel from '@/views/emis/EmisBaseTools/ExchangeRatePanel.vue';
 
 
@@ -905,6 +919,7 @@ export default {
   // name: "WaybillModify",
 components: {
   SalemanPicker,
+  SalesSupportPicker,
   PayeePicker,
   TanexPrinterPanel,
   feeItemForm,
@@ -1198,6 +1213,9 @@ data() {
       salesmen: [
         { required: true, message: "销售联系人不能为空", trigger: ["blur",'change'] }
       ],
+      // salesSupport: [
+      //   { required: true, message: "销售支持不能为空", trigger: ["blur",'change']  }
+      // ],
       takePieceEmployeeCode: [
         { required: true, message: "取件员不能为空", trigger: ["blur",'change']  }
       ],
@@ -1590,6 +1608,7 @@ methods: {
     if(item!=null){
       this.form.payee=item.payee;
       this.form.salesmen=item.salesmen;
+      this.form.salesSupport=item.salesSupport;
       this.form.paymentType= '2';
       // 企业名称
       this.form.sender.enterpriseName=item.enterpriseName;
@@ -2846,6 +2865,10 @@ methods: {
         }
       }
     }
+  },
+  // 销售联系人改变事件
+  onSalesmenChange(val) {
+    this.form.salesSupport = null;
   }
 }
 }

src/views/emis/emisWaybillAjustApply/adjustPanel.vue

@@ -409,6 +409,21 @@
                     </el-col>
                   </el-row>
               </el-col>
+              <el-col :span="24" v-if="applyType&&(applyTypeArr.includes('45'))" >
+                  <el-row :gutter="0" class="md-row">
+                    <el-col :span="3" class="md-title">
+                      <span>销售支持</span>
+                    </el-col>
+                    <el-col :span="7" class="md-value">
+                      <span >{{ billDetail.salesSupport }}</span>
+                    </el-col>
+                    <el-col :span="14">
+                    <el-form-item :label="$t('销售支持')" prop="salesSupport" >
+                      <SalesSupportPicker :placeholder="$t('销售支持')" v-model="form.salesSupport"  :salesmen="form.salesmen"></SalesSupportPicker>
+                    </el-form-item>
+                    </el-col>
+                  </el-row>
+              </el-col>
 
 
 
@@ -1240,6 +1255,7 @@ import WarehouseInNoPicker from '@/views/emis/EmisBaseTools/WarehouseInNoPicker.
 
 import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
 import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
+import SalesSupportPicker from '@/views/emis/EmisBaseTools/SalesSupportPicker.vue';
 
 import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
 import MasterBillCodePicker from '@/views/emis/EmisBaseTools/MasterBillCodePicker.vue';
@@ -1273,6 +1289,7 @@ export default {
   },
   components: {
     SalemanPicker,
+    SalesSupportPicker,
     PayeePicker,
     EmisUserSimplePicker0,
     TransProductCasPicker,