diff --git a/public/static/tpl/imp_sales_monthly_review.xlsx b/public/static/tpl/imp_sales_monthly_review.xlsx
new file mode 100644
index 00000000..320aa01a
Binary files /dev/null and b/public/static/tpl/imp_sales_monthly_review.xlsx differ
diff --git a/src/api/emis/salesMonthlyReview.js b/src/api/emis/salesMonthlyReview.js
new file mode 100644
index 00000000..5479a15f
--- /dev/null
+++ b/src/api/emis/salesMonthlyReview.js
@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+//新增
+export function addSalesMonthlyReview(data) {
+  return request({
+    url: '/emis/salesMonthlyReview',
+    method: 'post',
+    data
+  })
+}
+
+//查询
+export function listSalesMonthlyReview(data) {
+  return request({
+    url: '/emis/salesMonthlyReview/list',
+    method: 'get',
+    params: data
+  })
+}
+//修改
+export function updateSalesMonthlyReview(data) {
+  return request({
+    url: '/emis/salesMonthlyReview',
+    method: 'put',
+    data
+  })
+}
+
+//根据id查询
+export function getSalesMonthlyReview(id) {
+  return request({
+    url: '/emis/salesMonthlyReview/' + id,
+    method: 'get'
+  })
+}
+
+//删除
+export function deleteSalesMonthlyReview(ids) {
+  return request({
+    url: '/emis/salesMonthlyReview/' + ids,
+    method: 'delete'
+  })
+}
+
+//草稿新增
+export function addSalesMonthlyReviewDraft(data) {
+  return request({
+    url: '/emis/salesMonthlyReview/draftSubmitReview',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/utils/dateUtils.js b/src/utils/dateUtils.js
index bd850af9..fb209643 100644
--- a/src/utils/dateUtils.js
+++ b/src/utils/dateUtils.js
@@ -76,4 +76,26 @@ export function excelDateToJSDate(excelDate) {
     const minutes = String(date.getMinutes()).padStart(2, '0');
     const seconds = String(date.getSeconds()).padStart(2, '0');
     return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-  }
\ No newline at end of file
+  }
+  /**
+   * 获取上个月的年月 格式 yyyy-mm
+   */
+export function getLastMonthYearMonth() {
+  const today = new Date();
+  const year = today.getFullYear();
+  const month = today.getMonth();
+
+  // 计算上一个月的年月
+  let lastMonth, lastYear;
+  if (month === 0) {
+    // 如果是1月，上一个月是去年12月
+    lastMonth = 11;
+    lastYear = year - 1;
+  } else {
+    lastMonth = month - 1;
+    lastYear = year;
+  }
+
+  // 格式化为 YYYY-MM
+  return `${lastYear}-${String(lastMonth + 1).padStart(2, "0")}`;
+}
\ No newline at end of file
diff --git a/src/views/emis/EmisBaseTools/DepartmentPicker.vue b/src/views/emis/EmisBaseTools/DepartmentPicker.vue
new file mode 100644
index 00000000..ccee3652
--- /dev/null
+++ b/src/views/emis/EmisBaseTools/DepartmentPicker.vue
@@ -0,0 +1,71 @@
+<template>
+  <el-select
+  style="width:100%"
+  filterable
+  clearable
+  v-model="svalue"
+  :placeholder="placeholder"
+  @change="onChange">
+  <el-option v-for="item in optionItems" :key="item.name" :label="item.name" :value="item.name" />
+</el-select>
+
+</template>
+<script>
+import { listPost } from "@/api/system/post";
+
+export default {
+name: "PostsPicker",
+props: {
+  value: {
+    // type: [Array],
+    type:String,
+    required: false
+  },
+  placeholder:{
+    type: String,
+    required: false
+  },
+  isInitiated:{
+    type: [Boolean,String],
+    required: false,
+    default:false
+  }
+},
+data() {
+  return {
+    optionItems: [{"name":"销售一组"},{"name":"销售二组"}
+    ,{"name":"销售三组"},{"name":"销售四组"},{"name":"销售五组"}
+    ,{"name":"宁波站点"},{"name":"上海站点"},{"name":"柯桥站点"},{"name":"杭州站点"}],
+    svalue: this.value,
+  };
+},
+watch: {
+  value(newVal) {
+    this.svalue = newVal;
+  },
+  svalue(newVal, oldVal) {
+    this.$emit("input", this.svalue);
+  }
+},
+created() {
+  // this.queryData();
+},
+methods: {
+  onChange() {
+    this.$emit("input", this.svalue);
+    this.$emit("onChange");
+  },
+  queryData() {
+
+    let queryParams = {
+      pageNum: 1,
+      pageSize: 3000,
+    };
+    listPost(queryParams).then(response => {
+      this.optionItems = response.rows;
+    });
+  },
+
+}
+};
+</script>
diff --git a/src/views/emis/EmisBaseTools/PostsPicker.vue b/src/views/emis/EmisBaseTools/PostsPicker.vue
index e65cca40..bb00ed8f 100644
--- a/src/views/emis/EmisBaseTools/PostsPicker.vue
+++ b/src/views/emis/EmisBaseTools/PostsPicker.vue
@@ -1,23 +1,13 @@
 <template>
-  <!-- <el-select
+  <el-select
   style="width:100%"
   filterable
   clearable
-  multiple
   v-model="svalue"
   :placeholder="placeholder"
   @change="onChange">
-  <el-option v-for="item in optionItems" :key="item.postCode" :label="item.postName" :value="item.postCode" />
-</el-select> -->
-
-
-<el-checkbox-group v-model="svalue" @change="getCheckAll">
-  <el-checkbox
-    v-for="item in optionItems"
-    :key="item.postId"
-    :label="item.postName"
-  ></el-checkbox>
-</el-checkbox-group>
+  <el-option v-for="item in optionItems" :key="item.postName" :label="item.postName" :value="item.postName" />
+</el-select>
 
 </template>
 <script>
@@ -27,7 +17,8 @@ export default {
 name: "PostsPicker",
 props: {
   value: {
-    type: [Array],
+    // type: [Array],
+    type:String,
     required: false
   },
   placeholder:{
@@ -42,7 +33,7 @@ props: {
 },
 data() {
   return {
-    optionItems: [],
+    optionItems: [{"postName":"收派员"},{"postName":"销售顾问"},{"postName":"销售主管"},{"postName":"销售支持"},{"postName":"销售经理"},],
     svalue: this.value,
   };
 },
@@ -55,7 +46,7 @@ watch: {
   }
 },
 created() {
-  this.queryData();
+  // this.queryData();
 },
 methods: {
   onChange() {
@@ -63,7 +54,6 @@ methods: {
     this.$emit("onChange");
   },
   queryData() {
-
     let queryParams = {
       pageNum: 1,
       pageSize: 3000,
@@ -72,7 +62,6 @@ methods: {
       this.optionItems = response.rows;
     });
   },
-
 }
 };
 </script>
diff --git a/src/views/emis/emisCreditSalesmen/index.vue b/src/views/emis/emisCreditSalesmen/index.vue
index 6bd8d829..e665fdcf 100644
--- a/src/views/emis/emisCreditSalesmen/index.vue
+++ b/src/views/emis/emisCreditSalesmen/index.vue
@@ -1,41 +1,44 @@
 <template>
   <XdPageContainer class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+      <div slot="pageHeader"  class="tab-container">
+        <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
-      <el-form-item :label="$t('员工姓名')" prop="salesmen">
-        <EmpNamePicker1 :placeholder="$t('员工姓名')" v-model="queryParams.salesmen"  ></EmpNamePicker1>
-      </el-form-item>
+          <el-form-item :label="$t('员工姓名')" prop="salesmen">
+            <EmpNamePicker1 :placeholder="$t('员工姓名')" v-model="queryParams.salesmen"  ></EmpNamePicker1>
+          </el-form-item>
 
-      <el-form-item label="运输方式" prop="transType">
-        <el-select v-model="queryParams.transType" placeholder="运输方式" clearable filterable>
-                  <el-option
-                    v-for="item in dict.type.emis_biz_shipping_method"
-                    v-bind:key="item.value"
-                    v-bind:label="item.label"
-                    v-bind:value="item.value"
-                  />
+          <el-form-item label="运输方式" prop="transType">
+            <el-select v-model="queryParams.transType" placeholder="运输方式" clearable filterable>
+                      <el-option
+                        v-for="item in dict.type.emis_biz_shipping_method"
+                        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="curMoney">
+            <NumberRangePicker style="width:200px" v-model="queryParams.params.curMoneyRange"> </NumberRangePicker>
+          </el-form-item>
+
+          <el-form-item label="启用状态" prop="blOpen">
+                <el-select v-model="queryParams.blOpen"  filterable placeholder="启用状态" @change="handleQuery">
+                  <el-option key="1" label="启用" :value="1" />
+                  <el-option key="0" label="停用" :value="0" />
                 </el-select>
-      </el-form-item>
+          </el-form-item>
 
-      <el-form-item label="剩余余额" prop="curMoney">
-        <NumberRangePicker style="width:200px" v-model="queryParams.params.curMoneyRange"> </NumberRangePicker>
-      </el-form-item>
-
-      <el-form-item label="启用状态" prop="blOpen">
-            <el-select v-model="queryParams.blOpen"  filterable placeholder="启用状态" @change="handleQuery">
-              <el-option key="1" label="启用" :value="1" />
-              <el-option key="0" label="停用" :value="0" />
-            </el-select>
-      </el-form-item>
-
-      <el-form-item label="剩余比率(%)" prop="curMoneyRate">
-        <NumberRangePicker style="width:200px" v-model="queryParams.params.curMoneyRateRange"> </NumberRangePicker>
-      </el-form-item>
-
-    </SearchForm>
+          <el-form-item label="剩余比率(%)" prop="curMoneyRate">
+            <NumberRangePicker style="width:200px" v-model="queryParams.params.curMoneyRateRange"> </NumberRangePicker>
+          </el-form-item>
 
+        </SearchForm>
+      </div>
     <XdTable v-loading="loading"
-
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
            ref="refTable"
            storageName="emisCreditSalesmenList_main_250426"
 
@@ -133,8 +136,8 @@
           <dict-tag :options="dict.type.emis_biz_shipping_method" :value="scope.row.transType"/>
         </template>
       </el-table-column>
-      <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="startDate" min-width="170" sortable/>
+      <el-table-column :label="$t('结束日期')" align="center" prop="endDate" min-width="170" sortable/>
       <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
 
       <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
@@ -142,7 +145,7 @@
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
       <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170" sortable/>
 
 
     </XdTable>
diff --git a/src/views/emis/emisWaybill/UserOrderList.vue b/src/views/emis/emisWaybill/UserOrderList.vue
index 32506239..1ef799df 100644
--- a/src/views/emis/emisWaybill/UserOrderList.vue
+++ b/src/views/emis/emisWaybill/UserOrderList.vue
@@ -160,6 +160,11 @@
                           <el-option key="oms" label="oms" value="oms"></el-option>
                       </el-select>
                   </el-form-item>
+                  <el-col :span="24">
+                    <el-form-item label="预计入仓时间" prop="beginPickRange" label-width="100px" >
+                      <elDateAdvPicker1 clearable v-model="beginPickRange" ></elDateAdvPicker1>
+                    </el-form-item>
+                  </el-col>
               </el-col>
             </el-row>
         </SearchForm>
@@ -524,6 +529,7 @@ import { listEmisOrder,cancelOrder,assignTakeMan,assignSendSite, getEmisWaybill,
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 // import emisWaybillView from '@/views/emis/emisWaybill/emisWaybillView';
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
+import elDateAdvPicker1 from "@/components/DatePickerAdv/elDateAdvPicker.vue";
 import CountryPicker0 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import waybillDetailReadOnly from '@/views/emis/emisWaybill/waybillDetailReadOnly.vue';
@@ -558,7 +564,8 @@ export default {
     EmpNamePicker1,
     TransLinePicker,
     TransProductPicker,
-    TraceWaybillDetailView
+    TraceWaybillDetailView,
+    elDateAdvPicker1
   },
   dicts: ['emis_order_status','emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
         'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
@@ -580,6 +587,7 @@ export default {
       showSearch: true,
       // 创建时间搜索
       dateTimeRange:[],
+      beginPickRange:[],
       // 总条数
       total: 0,
       // 运单列表表格数据
@@ -826,8 +834,9 @@ export default {
         this.queryParams.orderSn= null;
         this.queryParams.intoWarehouseBillCode=this.queryParams.queryKey;
       }
-
-      listEmisOrder(this.addDateRange(this.queryParams, this.dateTimeRange,"orderDate")).then(response => {
+      let qParam = this.addDateRange(this.queryParams, this.dateTimeRange,"orderDate");
+      qParam = this.addDateRange(qParam, this.beginPickRange,"PickStartDate");
+      listEmisOrder(qParam).then(response => {
         this.emisWaybillList = response.rows;
         this.total = response.total;
         this.loading = false;
diff --git a/src/views/emis/salesCommissionRatio/editForm.vue b/src/views/emis/salesCommissionRatio/editForm.vue
index bb7cf25d..7cbd0a30 100644
--- a/src/views/emis/salesCommissionRatio/editForm.vue
+++ b/src/views/emis/salesCommissionRatio/editForm.vue
@@ -33,10 +33,35 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item label="开始时间" prop="startDate">
+            <el-date-picker
+              style="width: 100%;"
+              v-model="form.startDate"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择开始时间"
+            />
+          </el-form-item>
+        </el-col> 
+        <el-col :span="12">
+          <el-form-item label="结束时间" prop="endDate">
+            <el-date-picker
+              style="width: 100%;"
+              v-model="form.endDate"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择结束时间"
+            />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
           <el-form-item label="启用状态" prop="status">
             <!-- 选项水平显示 -->
             <el-radio v-model="form.status" label="1">启用</el-radio>
-            <el-radio v-model="form.status" label="2">停用</el-radio>
+            <el-radio v-model="form.status" label="0">未启用</el-radio>
+            <el-radio v-model="form.status" label="2">启用已过期</el-radio>
+            <el-radio v-model="form.status" label="3">启用未过期</el-radio>
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -91,12 +116,12 @@ export default {
         salesmenRatio: [
           { required: true, message: "销售联系人占比不能为空", trigger: ["change", "blur"] }
         ],
-        salesSupport: [
-          { required: true, message: "销售支持不能为空", trigger: ["change", "blur"] }
-        ],
-        salesSupportRatio: [
-          { required: true, message: "销售支持占比不能为空", trigger: ["change", "blur"] }
-        ],
+        // salesSupport: [
+        //   { required: true, message: "销售支持不能为空", trigger: ["change", "blur"] }
+        // ],
+        // salesSupportRatio: [
+        //   { required: true, message: "销售支持占比不能为空", trigger: ["change", "blur"] }
+        // ],
       }
     };
   },
@@ -136,6 +161,9 @@ export default {
         salesmenRatio: null,
         salesSupport: null,
         salesSupportRatio: null,
+        status: null,
+        startDate: null,
+        endDate: null,
         createTime: null,
         updateBy: null,
         updateTime: null,
diff --git a/src/views/emis/salesCommissionRatio/index.vue b/src/views/emis/salesCommissionRatio/index.vue
index 2395303f..c2d1fd75 100644
--- a/src/views/emis/salesCommissionRatio/index.vue
+++ b/src/views/emis/salesCommissionRatio/index.vue
@@ -16,13 +16,15 @@
       <el-form-item label="启用状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择" clearable>
           <el-option label="启用" value="1"></el-option>
-          <el-option label="停用" value="0"></el-option>
+          <el-option label="未启用" value="0"></el-option>
+          <el-option label="启用已过期" value="2"></el-option>
+          <el-option label="启用未过期" value="3"></el-option>
         </el-select>
       </el-form-item>
     </SearchForm>
 
     <XdTable slot="pageContent" slot-scope="slotProps" :height="(slotProps.contentHeight) + 'px'" ref="refTable"
-      v-loading="loading" border size="mini" :data="list" storageName="emisUser_main" :showSearch.sync="showSearch"
+      v-loading="loading" border size="mini" :data="list" :showSearch.sync="showSearch"
       :total="total" highlight-current-row @queryTable="getList" :queryParams="queryParams"
       @selection-change="handleSelectionChange" @sort-change="handleSortChange">
 
@@ -72,9 +74,13 @@
       <el-table-column label="启用状态" align="center" prop="status" min-width="100">
         <template slot-scope="scope">
           <span v-if="scope.row.status == '1'">启用</span>
-          <span v-else>停用</span>
+          <span v-else-if="scope.row.status == '0'">未启用</span>
+          <span v-else-if="scope.row.status == '2'">启用已过期</span>
+          <span v-else>启用未过期</span>
         </template>
       </el-table-column>
+      <el-table-column label="开始时间" align="center" prop="startDate" width="170" />
+      <el-table-column label="结束时间" align="center" prop="endDate" width="170" />
       <el-table-column label="备注" align="center" prop="remark" min-width="100" tooltip>
       </el-table-column>
       <el-table-column label="创建人" align="center" prop="createByName" width="80" :show-overflow-tooltip="true" />
diff --git a/src/views/emis/salesMonthlyReview/draftSubmitReview.vue b/src/views/emis/salesMonthlyReview/draftSubmitReview.vue
new file mode 100644
index 00000000..e6d34d6f
--- /dev/null
+++ b/src/views/emis/salesMonthlyReview/draftSubmitReview.vue
@@ -0,0 +1,328 @@
+<template>
+    <XdPageContainer class="app-container">
+        <div slot="pageHeader"></div>
+        <XdTable slot="pageContent" slot-scope="slotProps" :height="(slotProps.contentHeight) + 'px'"
+            storageName="batchWaybillRecord_main" ref="multipleTable" :row-class-name="tableRowClassName"
+            v-loading="loading" border size="mini" :data="emisQuotePriceList" :showSearch.sync="showSearch"
+            :queryParams="queryParams" :total="total" @queryTable="getList" @selection-change="handleSelectionChange"
+            @sort-change="handleSortChange">
+
+            <div slot="toolbar">
+                <el-row :gutter="10" class="mb8">
+                    <el-col :span="1.5">
+                        <el-button plain class="filter-item" size="mini" type="primary" icon="el-icon-upload2"
+                            @click="handleBatchImport">选择文件</el-button>
+                        <el-link type="primary" style="line-height: 28px;font-size:13px;color:blue"
+                            href="/static/tpl/imp_sales_monthly_review.xlsx">下载导入Excel模板</el-link>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="primary" plain size="mini" @click="handleRealUploadAll">批量新增</el-button>
+                    </el-col>
+                    <el-col :span="1.5">
+                        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                            @click="handleDelete">删除</el-button>
+                    </el-col>
+                </el-row>
+            </div>
+
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column :label="$t('状态')" align="center" prop="uploadStatus" min-width="80"
+                :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                    <el-tag v-if="scope.row.uploadStatus == 1" type="success">下单成功</el-tag>
+                    <el-tag v-if="scope.row.uploadStatus == 0" type="info">待下单</el-tag>
+                    <el-tag v-if="scope.row.uploadStatus == -1" type="danger">下单异常</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column :label="$t('异常信息')" align="center" prop="errorInfo" min-width="300"
+                :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                    <span v-if="scope.row.uploadStatus == -1" style="color:red">{{ scope.row.errorInfo }}</span>
+                    <span v-if="scope.row.uploadStatus == 1">下单成功</span>
+                    <span v-if="scope.row.uploadStatus == 0">待下单</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="员工姓名" align="center" prop="employeeName" width="100">
+            </el-table-column>
+            <el-table-column label="所属部门" align="center" prop="department" width="100" />
+            <el-table-column label="入职日期" align="center" prop="entryDate" width="100" />
+            <el-table-column label="岗位" align="center" prop="position" width="100" />
+            <el-table-column label="考核月份" align="center" prop="reviewMonth" width="100" />
+            <el-table-column label="考核分数" align="center" prop="score" width="100" />
+            <el-table-column label="备注" align="center" prop="remark" width="100">
+            </el-table-column>
+        </XdTable>
+
+        <el-dialog title="上传文件" :visible.sync="openUploadForm" width="50%" v-dialogDrag :destroy-on-close="true"
+            :close-on-click-modal="false" append-to-body>
+            <el-row :gutter="0">
+                <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
+                    <el-col :span="24">
+                        <el-form-item label="选择文件" prop="uploadFile">
+                            <el-upload action="" name="file"
+                                accept="application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                                :show-file-list="true" :limit="1" :file-list="fileList" :tooltip="fileName"
+                                :on-change="fileChange" :before-upload="beforeUpload">
+                                <el-button slot="trigger" plain class="filter-item" size="mini"
+                                    type="primary">选择文件</el-button>
+                                <el-link type="primary" style="line-height: 28px;font-size:13px;color:blue"
+                                    href="/static/tpl/imp_trans_quote.xls">下载导入Excel模板</el-link>
+                                <div v-if="uploadExcelDataInfo != ''"
+                                    style="color: black;font-size: 12px;font-weight: 800;">{{
+                                    fileName }} {{ uploadExcelDataInfo }}</div>
+                            </el-upload>
+                            <el-alert title="注意" type="info" description="仅允许导入“xls”或“xlsx”格式文件！" close-text="知道了">
+                            </el-alert>
+                        </el-form-item>
+                    </el-col>
+
+                </el-form>
+            </el-row>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="batchImpDataForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+    </XdPageContainer>
+</template>
+
+<script>
+import { addSalesMonthlyReviewDraft } from "@/api/emis/salesMonthlyReview";
+import { timeDiffTime, excelDateToJSDate } from '@/utils/dateUtils'
+import XLSX from 'xlsx'
+
+export default {
+    name: "BatchWaybillRecord",
+    data() {
+        return {
+            resetRefreshId: null,
+            // 遮罩层
+            loading: false,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+
+            // 总条数
+            total: 0,
+            // 报价列表表格数据
+            emisQuotePriceList: [],
+            tmpDataList: [],
+            selectionList: [],
+            selectionIndexList: [],
+            form: {},
+            rules: {},
+
+            openUploadForm: false,
+            uploadMsg: "",
+            uploadExcelDataInfo: "",
+            fileName: "",
+            fileList: [],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 20
+            },
+        };
+    },
+    methods: {
+        getUUID() {
+            return Math.random().toString(36).substring(3, 10);
+        },
+        handleBatchImport() {
+            this.resetRefreshId = "importForm-" + this.getUUID();
+
+            this.openUploadForm = true;
+            this.fileList = [];
+            this.uploadExcelDataInfo = "";
+            this.fileName = "";
+
+        },
+        calcDeliveryTime(startData, endDate) {
+            return timeDiffTime(startData, endDate)
+        },
+        //标红table指定行
+        tableRowClassName(row, index) {
+            row.row.index = row.rowIndex;
+            if (row.uploadStatus == '1') {
+                return 'success-row';
+            }
+            else if (row.uploadStatus == '-1') {
+                return 'warning-row';
+            }
+            return '';
+        },
+        /** 查询报价列表 */
+        getList() {
+            this.loading = true;
+        },
+        fileChange(file, fileList) {
+            this.fileList = fileList;
+        },
+        beforeUpload(file) {
+            this.fileName = file.name;
+            this.form.batchName = file.name;
+            this.readerData(file)
+            return false
+        },
+        readerData(rawFile) {
+            return new Promise((resolve, reject) => {
+                const reader = new FileReader()
+                reader.onload = e => {
+                    const data = e.target.result
+                    const workbook = XLSX.read(data, { type: 'array' })
+                    const firstSheetName = workbook.SheetNames[0] // firstSheetName
+                    // if (!excelTypes.includes(firstSheetName)) {
+                    //   reject('无法识别当前Excel模板')
+                    //   this.$modal.msgError('无法识别当前Excel模板')
+                    //   return
+                    // }
+                    const worksheet = workbook.Sheets[firstSheetName]
+                    // const header = this.getHeaderRow(worksheet) // 标题
+                    const results = XLSX.utils.sheet_to_json(worksheet)
+                    this.batchImportData(results);
+
+                    resolve()
+                }
+                reader.readAsArrayBuffer(rawFile)
+            })
+        },
+        getHeaderRow(sheet) {
+            const headers = []
+            const range = XLSX.utils.decode_range(sheet['!ref'])
+            let C
+            const R = range.s.r
+            /* start in the first row */
+            for (C = range.s.c; C <= range.e.c; ++C) { /* walk every column in the range */
+                const cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })]
+                /* find the cell in the first row */
+                let hdr = 'UNKNOWN ' + C // <-- replace with your desired default
+                if (cell && cell.t) hdr = XLSX.utils.format_cell(cell)
+                headers.push(hdr)
+            }
+            return headers
+        },
+        async batchImportData(results) {
+            const _index = 1
+            let loadingInstance = this.$loading({
+                text: '正在解析 ' + _index + ' 数据...'
+            })
+            this.emisQuotePriceList = [];
+            this.tmpDataList = [];
+            // 组装提交的数据
+            for (let index = 0; index < results.length; index++) {
+                const element = results[index]
+                let data = {
+                    employeeName: element['员工姓名'],
+                    department: element['所属部门'],
+                    entryDate: element['入职日期'],
+                    position: element['岗位'],
+                    reviewMonth: element['考评月份'],
+                    score: element['考核分数'],
+                    remark: element['备注'],
+                    uploadStatus: 0,
+                    errorInfo: ''
+                }
+                //转时间格式
+                if (data.entryDate) {
+                    data.entryDate = excelDateToJSDate(data.entryDate)
+                }
+                this.tmpDataList.push(data);
+            }
+            this.uploadExcelDataInfo = "总共 " + this.tmpDataList.length + " 条数据。";
+            loadingInstance.close()
+
+        },
+        handleRealUploadAll() {
+            if (this.ids && this.ids.length > 0) {
+                this.$confirm("确认下单吗?", "提示", {
+                    cancelButtonText: "取消",
+                    confirmButtonText: "确认",
+                    type: "warning",
+                    distinguishCancelAndClose: true,
+                    closeOnClickModal: false
+                }).then(async () => {
+
+                    if (this.selectionList && this.selectionList.length > 0) {
+                        for (let i = 0; i < this.selectionList.length; i++) {
+                            let orderItem = this.selectionList[i];
+                            let res = await addSalesMonthlyReviewDraft({ ...orderItem })
+
+                            let rstData = res.data;
+                            if (rstData.result == 'success') {
+                                orderItem.uploadStatus = 1;
+                                orderItem.errorInfo = "下单成功";
+                            }
+                            else {
+                                orderItem.uploadStatus = -1;
+                                orderItem.errorInfo = rstData.msg;
+                            }
+
+                        }
+                        this.$modal.msgSuccess("上传成功");
+
+                    }
+                });
+
+            }
+        },
+        batchImpDataForm() {
+            // 判断是否有数据
+            if (this.tmpDataList.length == 0) {
+                this.$modal.msgError('表格中没有数据');
+                return;
+            }
+
+            this.emisQuotePriceList = this.emisQuotePriceList.concat(this.tmpDataList);
+
+            this.tmpDataList = [];
+
+            this.openUploadForm = false;
+
+
+
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+
+            this.selectionList = selection;
+            this.ids = selection.map(item => item.id)
+            this.single = selection.length !== 1
+            this.multiple = !selection.length
+        },
+        // 排序 查询字段是表格中字段名字 动态取值排序顺序
+        handleSortChange(column) {
+            this.queryParams.orderByColumn = column.prop;
+            this.queryParams.isAsc = column.order;
+            this.getList();
+        },
+
+        cancel() {
+            this.openUploadForm = false;
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const ids = row.id || this.ids;
+            let that = this;
+            this.$modal.confirm('是否确认删除').then(function () {
+                that.selectionList.forEach((item, index) => {
+                    that.emisQuotePriceList.forEach((v, i) => {
+                        if (item.index === v.index) {
+                            that.emisQuotePriceList.splice(i, 1)
+                        }
+                    })
+                })
+                that.$refs.multipleTable.clearSelection();
+            }).then(() => {
+                this.$modal.msgSuccess("删除成功");
+            }).catch(() => { });
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/emis/salesMonthlyReview/editForm.vue b/src/views/emis/salesMonthlyReview/editForm.vue
new file mode 100644
index 00000000..895dd1f2
--- /dev/null
+++ b/src/views/emis/salesMonthlyReview/editForm.vue
@@ -0,0 +1,176 @@
+<template>
+  <div>
+    <el-form ref="form" size="mini" :model="form" :rules="rules" label-width="120px">
+      <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+        <el-col :span="12">
+          <el-form-item label="员工姓名" prop="employeeName">
+            <EmpNamePicker v-model="form.employeeName" placeholder="请选择员工姓名" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="所属部门" prop="department">
+            <DepartmentPicker v-model="form.department" placeholder="请选择部门" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="岗位" prop="position">
+            <PostsPicker v-model="form.position" placeholder="请选择岗位" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="入职日期" prop="entryDate">
+            <el-date-picker
+            style="width: 100%;"
+            v-model="form.entryDate"
+            type="date"
+            placeholder="选择入职日期"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+          />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="考评月份" prop="reviewMonth">
+            <el-date-picker
+            style="width: 100%;"
+            v-model="form.reviewMonth"
+            type="month"
+            placeholder="选择考评月份"
+            format="yyyy-MM"
+            value-format="yyyy-MM"
+          />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="考核分数" prop="score">
+            <el-input type="number" v-model="form.score" placeholder="" maxlength="30" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input type="textarea" v-model="form.remark" placeholder="" maxlength="30" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <div style="text-align: center;margin-bottom: 10px;">
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="cancel">取 消</el-button>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import { addSalesMonthlyReview, getSalesMonthlyReview, updateSalesMonthlyReview } from "@/api/emis/salesMonthlyReview";
+import EmpNamePicker from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import DepartmentPicker from "@/views/emis/EmisBaseTools/DepartmentPicker.vue";
+import PostsPicker from "@/views/emis/EmisBaseTools/PostsPicker.vue";
+
+export default {
+  name: "SalesMonthlyReviewForm",
+  props: {
+    id: {
+      type: Number
+    }
+  },
+  components: {  EmpNamePicker,DepartmentPicker,PostsPicker},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 默认密码
+      initPassword: undefined,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        employeeName: [
+          { required: true, message: "员工姓名不能为空", trigger: ["change", "blur"] }
+        ],
+        department: [
+          { required: true, message: "所属部门不能为空", trigger: ["change", "blur"] }
+        ],
+        position: [
+          { required: true, message: "岗位不能为空", trigger: ["change", "blur"] }
+        ],
+        entryDate: [
+          { required: true, message: "入职日期不能为空", trigger: ["change", "blur"] }
+        ],
+        reviewMonth: [
+          { required: true, message: "考评月份不能为空", trigger: ["change", "blur"] }
+        ],
+        score: [
+          { required: true, message: "考核分数不能为空", trigger: ["change", "blur"] }
+        ],
+      }
+    };
+  },
+  watch: {
+    "id": {
+      handler(newValue, oldValue) {
+        this.id = newValue;
+        this.initData();
+      },
+      deep: true
+    }
+  },
+  created() {
+    this.initData();
+  },
+
+  methods: {
+    initData() {
+      this.reset();
+      if (this.id !== null) {
+        getSalesMonthlyReview(this.id).then(response => {
+          this.form = response.data;
+        });
+      }
+    },
+    // 取消按钮
+    cancel() {
+      this.reset();
+      this.$emit("on-cancel");
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        salesExecutive: null,
+        salesExecutiveRatio: null,
+        salesmen: null,
+        salesmenRatio: null,
+        salesSupport: null,
+        salesSupportRatio: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null,
+      };
+      this.resetForm("form");
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.form.userName = this.form.empCode;
+          this.form.nickName = this.form.empName;
+          if (this.form.id != null) {
+            updateSalesMonthlyReview(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.$emit("on-changed");
+            });
+          } else {
+            addSalesMonthlyReview(this.form).then(response => {
+              this.$modal.msgSuccess("添加成功");
+              this.$emit("on-changed");
+            });
+          }
+        }
+      });
+    }
+  }
+};
+</script>
+<style scoped></style>
diff --git a/src/views/emis/salesMonthlyReview/index.vue b/src/views/emis/salesMonthlyReview/index.vue
new file mode 100644
index 00000000..fa98b242
--- /dev/null
+++ b/src/views/emis/salesMonthlyReview/index.vue
@@ -0,0 +1,291 @@
+<template>
+  <XdPageContainer class="app-container">
+    <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="mini" :maxShow="20" label-width="80px"
+      v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+      <el-form-item label="员工姓名" prop="employeeName">
+        <!-- <el-input v-model="queryParams.employeeName" placeholder="请输入员工姓名" /> -->
+         <emp-name-picker v-model="queryParams.employeeName" placeholder="请输入员工姓名" style="width:100%" />
+      </el-form-item>
+      <el-form-item label="分数范围" prop="scoreRange">
+          <number-range-picker style="width:200px" v-model="queryParams.params.scoreRange" :min="0" :max="100" :step="1"></number-range-picker>
+      </el-form-item>
+      <el-form-item label="所属部门" prop="department">
+            <!-- <treeselect class="myTree"  v-model="queryParams.department" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" style="width:100%" /> -->
+            <department-picker v-model="queryParams.department" placeholder="请选择归属部门" style="width:100%" />
+      </el-form-item>
+      <el-form-item label="岗位类型" prop="position">
+         <PostsPicker v-model="queryParams.position" placeholder="请选择岗位" style="width:100%" />
+      </el-form-item>
+      <el-form-item label="考评月份" prop="reviewMonth">
+          <el-date-picker
+          value-format="yyyy-MM"
+          style="width: 100%;"
+          v-model="queryParams.reviewMonth"
+          type="month"
+          placeholder="请选择考评月份"
+        >
+        </el-date-picker>
+      </el-form-item>
+
+    </SearchForm>
+
+    <XdTable slot="pageContent" slot-scope="slotProps" :height="(slotProps.contentHeight) + 'px'" ref="refTable"
+      v-loading="loading" border size="mini" :data="list" :showSearch.sync="showSearch"
+      :total="total" highlight-current-row @queryTable="getList" :queryParams="queryParams"
+      @selection-change="handleSelectionChange" @sort-change="handleSortChange">
+
+      <div slot="toolbar">
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
+              @click="handleUpdate">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="el-icon-delete" size="mini" @click="handleDelete">删除</el-button>
+          </el-col>
+
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+          </el-col>
+        </el-row>
+      </div>
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column label="员工姓名" align="center" prop="employeeName" sortable >
+      </el-table-column>
+      <el-table-column label="所属部门" align="left" prop="department" :show-overflow-tooltip="true" sortable
+        min-width="80">
+      </el-table-column>
+      <el-table-column label="入职时间" align="left" prop="entryDate" :show-overflow-tooltip="true" sortable>
+      </el-table-column>
+      <el-table-column label="岗位" align="center"  prop="position" :show-overflow-tooltip="true" sortable
+        min-width="100" />
+      <el-table-column label="考核月份" align="center" prop="reviewMonth" sortable>
+      </el-table-column>  
+      <el-table-column label="考核分数" align="center" prop="score" sortable min-width="100">
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" min-width="100" tooltip>
+      </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createByName" width="80" :show-overflow-tooltip="true" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="170" />
+      <el-table-column label="创建网点" align="center" prop="createSiteName" width="80" :show-overflow-tooltip="true" />
+      <el-table-column label="修改人" align="center" prop="updateByName" width="80" :show-overflow-tooltip="true" />
+      <el-table-column label="修改网点" align="center" prop="updateSiteName" width="80" :show-overflow-tooltip="true" />
+      <el-table-column label="修改时间" align="center" prop="updateTime" width="170" />
+    </XdTable>
+
+    <el-dialog :title="titleForm" :visible.sync="openForm" width="40%" :destroy-on-close="true" v-dialogDrag
+      append-to-body>
+      <SalesMonthlyReviewForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm">
+      </SalesMonthlyReviewForm>
+    </el-dialog>
+  </XdPageContainer>
+</template>
+
+<script>
+import { listSalesMonthlyReview, deleteSalesMonthlyReview } from "@/api/emis/salesMonthlyReview";
+import SalesMonthlyReviewForm from '@/views/emis/salesMonthlyReview/editForm';
+import { treeselect } from "@/api/system/dept";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import PostsPicker from "@/views/emis/EmisBaseTools/PostsPicker.vue";
+import NumberRangePicker from '@/components/NumberRange/NumberRangePicker';
+import EmpNamePicker from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import DepartmentPicker from "@/views/emis/EmisBaseTools/DepartmentPicker.vue";
+import { getLastMonthYearMonth } from "@/utils/dateUtils";
+export default {
+  name: "SalesMonthlyReview",
+  components: { SalesMonthlyReviewForm,Treeselect,PostsPicker,NumberRangePicker,EmpNamePicker,DepartmentPicker },
+  data() {
+    return {
+      tableHeight: 200,
+      // 遮罩层
+      loading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      list: null,
+      // 弹出层标题
+      title: "",
+      currentId: null,
+      openForm: false,
+      titleForm: "",
+      selectionList: null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        employeeName:null,
+        position:null,
+        department:null,
+        reviewMonth:getLastMonthYearMonth(), //默认上个月
+        params:{
+          scoreRange:null,
+        }
+      },
+      // 部门树选项
+      deptOptions: [],
+    };
+  },
+  watch: {
+  },
+  created() {
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      let qParam = { ...this.queryParams }
+      if (qParam.params.scoreRange && qParam.params.scoreRange.length > 0) {
+        qParam = this.addDateRange(qParam, qParam.params.scoreRange, 'Score')
+      }
+      listSalesMonthlyReview(qParam).then(response => {
+        this.list = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      }
+      );
+    },
+    handleSortChange(column) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    handleFormChanged() {
+      this.openForm = false;
+      this.getList();
+    },
+    cancelForm() {
+      this.openForm = false;
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+      this.selectionList = selection;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.currentId = null;
+      this.openForm = true;
+      this.titleForm = "添加销售月评登记";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      console.log('ids', this.ids)
+      this.currentId = row.id || this.ids[0];
+      this.openForm = true;
+      this.titleForm = "修改销售月评登记";
+    },
+
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('注意：确认是否删除？').then(function () {
+        deleteSalesMonthlyReview(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const loadingInstance = this.$loading({
+        text: '正在导出...'
+      })
+
+      if (this.selectionList && this.selectionList.length > 0) {
+        this.exportData(this.selectionList, loadingInstance);
+      }
+      else {
+        let qExportParam = { ...this.queryParams };
+        qExportParam.pageNum = 1;
+        qExportParam.pageSize = 20000;
+        qExportParam = this.addDateRange(qExportParam,qExportParam.params.scoreRange,'Score');
+
+        listSalesMonthlyReview(qExportParam).then(response => {
+          if (response.code === 200) {
+            this.exportData(response.rows, loadingInstance);
+          }
+        });
+      }
+    },
+    exportData(selData, loadingInstance) {
+      const curList = selData
+      import('@/vendor/Export2Excel').then(excel => {
+        const exportParam = this.$refs.refTable.getExportParam();
+        const tHeader = exportParam.header;
+        const filterVal = exportParam.filter;
+        const data = this.formatJson(filterVal, curList, selData)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '销售月评登记表',
+          autoWidth: true
+        })
+        loadingInstance.close()
+      })
+    },
+    formatJson(filterVal, jsonData, resData) {
+      return jsonData.map(v => filterVal.map(j => {
+
+        if (j === 'status') {
+          if (v[j] == 1) {
+            return '启用';
+          } else {
+            return '停用';
+          }
+        }
+        return v[j]
+      }))
+    },
+    getTreeselect() {
+      treeselect().then(response => {
+        // console.log(response.data)
+        this.deptOptions = response.data;
+      });
+    },
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+// .myTree {
+//   display: inline-block;
+//   width: 200px !important;
+//    ::v-deep .vue-treeselect__control {
+//     height: 28px !important;
+//     border-radius:0px!important;
+//     .vue-treeselect__value-container .vue-treeselect__placeholder{
+//       line-height: 28px!important; //上下居中
+//       font-size: 12px!important;
+//       font-weight: 600!important;
+//     }
+//   }
+// }
+</style>