diff --git a/src/views/emis/emisCommissionQuote/ecqExpressionPanel.vue b/src/views/emis/emisCommissionQuote/ecqExpressionPanel.vue
index c288af85..0620d535 100644
--- a/src/views/emis/emisCommissionQuote/ecqExpressionPanel.vue
+++ b/src/views/emis/emisCommissionQuote/ecqExpressionPanel.vue
@@ -125,10 +125,10 @@
 </template>
 
 <script>
-import { listEmisQuoteExpression, getEmisQuoteExpression, delEmisQuoteExpression, addEmisQuoteExpression, updateEmisQuoteExpression } from "@/api/emis/emisQuoteExpression";
+import { listEmisCommissionExpression, getEmisCommissionExpression, delEmisCommissionExpression, addEmisCommissionExpression, updateEmisCommissionExpression } from "@/api/emis/emisCommissionExpression";
 
 export default {
-  name: "emisQuoteExpression",
+  name: "EcqExpressionPanel",
   props:{
     value:{
       type:Array,
@@ -208,7 +208,7 @@ export default {
       let queryParams={
         quoteId:this.quoteId,
       }
-      listEmisQuoteExpression(queryParams).then(response => {
+      listEmisCommissionExpression(queryParams).then(response => {
         this.emisQuoteExpressionList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -321,7 +321,7 @@ export default {
     },
     handleUpdateByQuoteId(row){
       this.loading = true;
-      getEmisQuoteExpression(row.id).then(response => {
+      getEmisCommissionExpression(row.id).then(response => {
         this.form = response.data;
         this.loading = false;
       });
@@ -344,13 +344,13 @@ export default {
     },
     submitFormByQuoteId(){
         if (this.form.id != null) {
-          updateEmisQuoteExpression(this.form).then(response => {
+          updateEmisCommissionExpression(this.form).then(response => {
             // this.$modal.msgSuccess("修改成功");
             // this.$emit("on-changed");
             this.getList();
           });
         } else {
-          addEmisQuoteExpression(this.form).then(response => {
+          addEmisCommissionExpression(this.form).then(response => {
               // this.$modal.msgSuccess("添加成功");
               // this.$emit("on-changed");
               this.getList();
@@ -379,7 +379,7 @@ export default {
     handleDeleteQuoteId(row) {
         const ids = row.id || this.ids;
         this.$modal.confirm('是否确认删除').then(function() {
-          return delEmisQuoteExpression(ids);
+          return delEmisCommissionExpression(ids);
         }).then(() => {
           this.getList();
           // this.$modal.msgSuccess("删除成功");
diff --git a/src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue b/src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue
index 55f67634..2a54342c 100644
--- a/src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue
+++ b/src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue
@@ -8,11 +8,11 @@
                     <el-input v-model="form.quoteName" placeholder="请输入方案名称" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="24">
+                <!-- <el-col :span="24">
                   <el-form-item label="所属国家" prop="country">
                       <CountryPicker :placeholder="$t('所属国家')" v-model="form.country" ></CountryPicker>
                   </el-form-item>
-                </el-col>
+                </el-col> -->
 
               <el-col :span="24">
                   <el-form-item label="开始日期" prop="startDate">
@@ -52,11 +52,11 @@
                     </el-radio-group>
                   </el-form-item>
               </el-col>
-              <el-col :span="24">
+              <!-- <el-col :span="24">
                 <el-form-item label="优先级" prop="priorityLevel">
                   <el-input v-model="form.priorityLevel" placeholder="优先级" style="width:100px" />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col :span="24">
                   <el-form-item label="启用状态" prop="status">
                   <el-radio-group v-model="form.status">
@@ -105,8 +105,13 @@
                         <el-button
                         size="mini"
                         type="primary"
-                        @click="handelSelectSendArea()"
+                        @click="handelSelectStaff"
                       >选择员工</el-button>
+                      <el-button
+                        size="mini"
+                        type="primary"
+                        @click="handelSelectAllStaff"
+                      >全部员工</el-button>
                     </el-col>
                     <el-col :span="24">
                       <el-form-item label="" prop="empName" label-width="0px" style="margin-bottom: 0px;">
@@ -146,14 +151,10 @@
         </el-row>
       </el-form>
 
-<!--
-    <el-dialog :title="titleSendAreaForm" :visible.sync="openSendAreaForm" width="90%"  :destroy-on-close="true" v-dialogDrag append-to-body>
-      <QuoteSendAreaPanel  :useSiteCode="form.useSiteCode" :useSiteName="form.useSite" :feeType="form.feeType" @on-changed="handleSendAreaFormChanged" @on-cancel="cancelSendAreaForm"></QuoteSendAreaPanel>
-    </el-dialog>
+      <el-dialog :title="titleForm" :visible.sync="openForm" width="60%"  :destroy-on-close="true" v-dialogDrag append-to-body>
+        <EmisStaffListPicker  @on-changed="handleStaffFormChanged" @on-cancel="cancelStaffForm"></EmisStaffListPicker>
+      </el-dialog>
 
-    <el-dialog :title="titleDispAreaForm" :visible.sync="openDispAreaForm" width="90%"  :destroy-on-close="true" v-dialogDrag append-to-body>
-      <QuoteDispAreaPanel  :useSiteCode="form.useSiteCode" :useSiteName="form.useSite" :feeType="form.feeType" @on-changed="handleDispAreaFormChanged" @on-cancel="cancelDispAreaForm"></QuoteDispAreaPanel>
-    </el-dialog> -->
 
     <div style="text-align: center;margin-bottom: 10px;">
       <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -165,36 +166,29 @@
 </template>
 
 <script>
-import { listEmisCommissionQuote, getEmisCommissionQuote, delEmisCommissionQuote, addEmisCommissionQuote, updateEmisCommissionQuote } from "@/api/emis/emisCommissionQuote";
+import { getEmisCommissionQuote, addEmisCommissionQuote, updateEmisCommissionQuote } from "@/api/emis/emisCommissionQuote";
 import { mapGetters } from 'vuex'
-import { listEmisQuoteSendArea, getEmisQuoteSendArea, delEmisQuoteSendArea, addEmisQuoteSendArea, updateEmisQuoteSendArea } from "@/api/emis/emisQuoteSendArea";
-import { listEmisQuotePrice, getEmisQuotePrice, delEmisQuotePrice, addEmisQuotePrice, updateEmisQuotePrice } from "@/api/emis/emisQuotePrice";
-import { listEmisQuoteDispArea, getEmisQuoteDispArea, delEmisQuoteDispArea, addEmisQuoteDispArea, updateEmisQuoteDispArea } from "@/api/emis/emisQuoteDispArea";
-import {checkRole} from '@/utils/permission'
 import {addDateTimeByDay,dateToStr} from '@/utils/custom'
 
 import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
-import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
-import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
+import EmisStaffListPicker from '@/views/emis/EmisBaseTools/EmisStaffListPicker.vue';
+
 
 import EcqExpressionPanel from '@/views/emis/emisCommissionQuote/ecqExpressionPanel.vue';
 
 
-import QuoteSendAreaPanel from '@/views/emis/emisQuoteSendArea/sendAreaPanel.vue';
-import QuoteDispAreaPanel from '@/views/emis/emisQuoteDispArea/dispAreaPanel.vue';
 
 export default {
   name: "emisCommissionQuoteForm",
   props:{
     quoteId:{
-        type:Number
+        type:[Number,Array]
     }
   },
   components: {
-    CountryPicker,EmisSiteSimplePicker,TransLinePicker,
-    TransProductPicker,EcqExpressionPanel,
-    QuoteSendAreaPanel,QuoteDispAreaPanel
+    CountryPicker,EmisSiteSimplePicker,EcqExpressionPanel,
+    EmisStaffListPicker
   },
   dicts: ['emis_price_type','emis_fee_type','sys_currency_type','emis_commission_post','emis_biz_shipping_method'],
   data() {
@@ -202,6 +196,8 @@ export default {
       emisCommissionQuoteOptions: [],
       // 遮罩层
       loading: true,
+      titleForm:null,
+      openForm:false,
       // 表单参数
       form: {},
       isCopy:false,
@@ -238,8 +234,25 @@ export default {
           });
         }else{
             this.reset();
+            this.form.blOpen="1";
         }
-        // this.getTreeselect();
+    },
+    handelSelectStaff(){
+      this.titleForm="选择员工";
+      this.openForm=true;
+    },
+    handelSelectAllStaff(){
+        this.form.empCode="-1";
+        this.form.empName="全部";
+    },
+    handleStaffFormChanged(empCodeStr,empNameStr){
+        this.form.empCode=empCodeStr;
+        this.form.empName=empNameStr;
+        this.openForm=false;
+
+    },
+    cancelStaffForm(){
+      this.openForm=false;
     },
     // 取消按钮
     cancel() {
diff --git a/src/views/emis/emisCommissionQuote/index.vue b/src/views/emis/emisCommissionQuote/index.vue
index 9519f349..568e3327 100644
--- a/src/views/emis/emisCommissionQuote/index.vue
+++ b/src/views/emis/emisCommissionQuote/index.vue
@@ -15,24 +15,26 @@
           v-model="queryParams.quoteName"
           :placeholder="$t('方案名称')"
           clearable
-          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="计算类型" prop="calcType">
-        <el-input
-          v-model="queryParams.calcType"
-          :placeholder="$t('计算类型')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select clearable v-model="queryParams.calcType" clearable 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>
+             <el-option label="包裹数" :value="4"></el-option>
+           </el-select>
       </el-form-item>
       <el-form-item label="岗位类型" prop="postType">
-        <el-input
-          v-model="queryParams.postType"
-          :placeholder="$t('岗位类型')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <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"
+                    v-bind:label="item.label"
+                    v-bind:value="item.value"
+                  />
+                </el-select>
+
       </el-form-item>
       <el-form-item label="运输方式" prop="transType">
               <el-select v-model="queryParams.transType" placeholder="运输方式" clearable filterable >
@@ -45,19 +47,16 @@
                 </el-select>
             </el-form-item>
       <el-form-item label="启用状态" prop="blOpen">
-        <el-input
-          v-model="queryParams.blOpen"
-          :placeholder="$t('启用状态')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.blOpen" clearable placeholder="启用状态" >
+            <el-option key="1" label="启用" :value="1"/>
+            <el-option key="0" label="停用" :value="0"/>
+          </el-select>
       </el-form-item>
       <el-form-item label="员工编号" prop="empCode">
         <el-input
           v-model="queryParams.empCode"
           :placeholder="$t('员工编号')"
           clearable
-          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="员工名称" prop="empName">
@@ -65,7 +64,6 @@
           v-model="queryParams.empName"
           :placeholder="$t('员工名称')"
           clearable
-          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="开始日期" prop="startDate">
@@ -110,9 +108,9 @@
                   size="mini"
                   @click="handleAdd"
                   v-hasPermi="['emis:emisCommissionQuote:add']"
-                >新增</el-button>
+                >新增提成方案</el-button>
               </el-col>
-              <!--
+
               <el-col :span="1.5">
                 <el-button
                   type="success"
@@ -123,7 +121,7 @@
                   @click="handleUpdate"
                   v-hasPermi="['emis:emisCommissionQuote:edit']"
                 >修改</el-button>
-              </el-col> -->
+              </el-col>
               <el-col :span="1.5">
                 <el-button
                   type="danger"
@@ -149,75 +147,46 @@
       </div>
 
       <el-table-column type="selection" width="55" align="center" />
-      <!--
-      <el-table-column label="序号" align="center" min-width="60">
-             <template slot-scope="scope">
-                <span v-text="getIndex(scope.$index)"> </span>
-             </template>
-      </el-table-column>
-
-       <el-table-column label="xxx" align="left" prop="xxx" min-width="180">
-        <template slot-scope="scope">
-            <div  class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
-         </template>
-      </el-table-column>
-
-      <el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom"  min-width="80">
-            <template slot-scope="scope">
-              <div v-if="scope.row.settleStatus == 0" style="color:red;">
-                    <span class="el-tag el-tag--info">未结算</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 10" style="color:red;">
-                <span class="el-tag">待确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 11" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 20" >
-                  <span class="el-tag el-tag--warning el-tag--light">待打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 21" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 40" style="color:red;">
-                <span class="el-tag el-tag--danger">已拒绝</span>
-              </div>
-            </template>
-          </el-table-column>
-      -->
-      <!-- :emis_commission_post :emis_biz_shipping_method -->
-
-      <!-- <el-table-column :label="$t('提成方案编码')" align="center" prop="quoteCode" min-width="100" /> -->
       <el-table-column :label="$t('方案名称')" align="center" prop="quoteName" min-width="100" />
-      <el-table-column :label="$t('计算类型')" align="center" prop="calcType" min-width="100" />
-      <el-table-column :label="$t('岗位类型')" align="center" prop="postType" min-width="100" />
-      <el-table-column :label="$t('快递类型')" align="center" prop="transType" min-width="100" />
-      <el-table-column :label="$t('启用状态')" align="center" prop="blOpen" min-width="100" />
-      <el-table-column :label="$t('员工编号')" align="center" prop="empCode" min-width="100" />
-      <el-table-column :label="$t('员工名称')" align="center" prop="empName" min-width="100" />
-      <el-table-column :label="$t('开始日期')" align="center" prop="startDate" min-width="100" />
-      <el-table-column :label="$t('结束日期')" align="center" prop="endDate" min-width="100" />
-      <el-table-column :label="$t('优先级')" align="center" prop="priorityLevel" min-width="100" />
-      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
-      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
+      <el-table-column :label="$t('计算类型')" align="center" prop="calcType" min-width="100" >
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['emis:emisCommissionQuote:edit']"
-          >修改</el-button>
-          <!--
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['emis:emisCommissionQuote:remove']"
-          >删除</el-button> -->
+              <div v-if="scope.row.calcType == 1" style="color:red;">
+                    <span class="el-tag el-tag--info">按票计算</span>
+              </div>
+              <div v-if="scope.row.calcType == 2" style="color:red;">
+                <span class="el-tag">重量计算</span>
+              </div>
+              <div v-if="scope.row.calcType == 3" style="color:green;">
+                  <span class="el-tag el-tag--success el-tag--light">体积计算</span>
+              </div>
+              <div v-if="scope.row.calcType == 4" >
+                  <span class="el-tag el-tag--warning el-tag--light">包裹数</span>
+              </div>
         </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"/>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('快递类型')" align="center" prop="transType" min-width="100" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.emis_biz_shipping_method" :value="scope.row.transType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="启用状态" align="center" prop="blOpen" min-width="100" >
+          <template slot-scope="scope">
+              <el-tag v-if="scope.row.blOpen==1" type="success">启用</el-tag>
+              <el-tag v-if="scope.row.blOpen==0" type="danger">停用</el-tag>
+          </template>
+        </el-table-column>
+      <!-- <el-table-column :label="$t('员工编号')" align="center" prop="empCode" min-width="100" /> -->
+      <el-table-column :label="$t('提成员工范围')" align="center" prop="empName" min-width="150"  :show-overflow-tooltip="true"  />
+      <el-table-column :label="$t('开始日期')" align="center" prop="startDate" min-width="170" />
+      <el-table-column :label="$t('结束日期')" align="center" prop="endDate" min-width="170" />
+      <!-- <el-table-column :label="$t('优先级')" align="center" prop="priorityLevel" min-width="100" /> -->
+      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
+
     </XdTable>
 
     <el-dialog :title="titleForm" :visible.sync="openForm" width="90%" :destroy-on-close="true" v-dialogDrag append-to-body>
@@ -341,9 +310,9 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-       this.currentId= row.quoteId;
+       this.currentId= row.quoteId || this.ids;
        this.openForm = true;
-       this.titleForm = "修改";
+       this.titleForm = "修改提成方案";
     },
     handleView(row) {
        this.quoteId=row.quoteId;