From 55bc3343190a37de845e7f41fdfe4c2687100cc7 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Tue, 29 Jul 2025 13:32:12 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E9=94=80=E5=94=AE=E6=9C=88=E8=AF=84?=
 =?UTF-8?q?=E7=99=BB=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/emis/salesMonthlyReview.js            |  52 ++++
 .../emis/EmisBaseTools/DepartmentPicker.vue   |  72 +++++
 src/views/emis/EmisBaseTools/PostsPicker.vue  |  25 +-
 .../emis/salesMonthlyReview/editForm.vue      | 176 +++++++++++
 src/views/emis/salesMonthlyReview/index.vue   | 289 ++++++++++++++++++
 5 files changed, 596 insertions(+), 18 deletions(-)
 create mode 100644 src/api/emis/salesMonthlyReview.js
 create mode 100644 src/views/emis/EmisBaseTools/DepartmentPicker.vue
 create mode 100644 src/views/emis/salesMonthlyReview/editForm.vue
 create mode 100644 src/views/emis/salesMonthlyReview/index.vue

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/views/emis/EmisBaseTools/DepartmentPicker.vue b/src/views/emis/EmisBaseTools/DepartmentPicker.vue
new file mode 100644
index 00000000..7aba05f8
--- /dev/null
+++ b/src/views/emis/EmisBaseTools/DepartmentPicker.vue
@@ -0,0 +1,72 @@
+<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) {
+    console.log('newVal---',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/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..f9155c81
--- /dev/null
+++ b/src/views/emis/salesMonthlyReview/index.vue
@@ -0,0 +1,289 @@
+<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" storageName="emisUser_main" :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" width="80">
+      </el-table-column>
+      <el-table-column label="所属部门" align="left" prop="department" :show-overflow-tooltip="true"
+        min-width="80">
+      </el-table-column>
+      <el-table-column label="入职时间" align="left" prop="entryDate" :show-overflow-tooltip="true" min-width="80">
+      </el-table-column>
+      <el-table-column label="岗位" align="center"  prop="position" :show-overflow-tooltip="true"
+        min-width="100" />
+      <el-table-column label="考核月份" align="center" prop="reviewMonth"></el-table-column>  
+      <el-table-column label="考核分数" align="center" prop="score" 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";
+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:null,
+        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>

From e335847635268ddb8483e798a918b92386bdd789 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Tue, 29 Jul 2025 15:17:13 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E9=94=80=E5=94=AE=E6=9C=88=E8=AF=84?=
 =?UTF-8?q?=E7=99=BB=E8=AE=B0=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/tpl/imp_sales_monthly_review.xlsx  | Bin 0 -> 11731 bytes
 src/utils/dateUtils.js                        |  24 +-
 .../emis/EmisBaseTools/DepartmentPicker.vue   |   1 -
 src/views/emis/salesCommissionRatio/index.vue |   2 +-
 .../salesMonthlyReview/draftSubmitReview.vue  | 328 ++++++++++++++++++
 src/views/emis/salesMonthlyReview/index.vue   |   7 +-
 6 files changed, 356 insertions(+), 6 deletions(-)
 create mode 100644 public/static/tpl/imp_sales_monthly_review.xlsx
 create mode 100644 src/views/emis/salesMonthlyReview/draftSubmitReview.vue

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 0000000000000000000000000000000000000000..320aa01a8ff2eca59475284e1a1710eaf93a4a19
GIT binary patch
literal 11731
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
UKt}u<SAztw0QrFi-EVjQ2L{dO1ONa4

literal 0
HcmV?d00001

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
index 7aba05f8..ccee3652 100644
--- a/src/views/emis/EmisBaseTools/DepartmentPicker.vue
+++ b/src/views/emis/EmisBaseTools/DepartmentPicker.vue
@@ -41,7 +41,6 @@ data() {
 },
 watch: {
   value(newVal) {
-    console.log('newVal---',newVal)
     this.svalue = newVal;
   },
   svalue(newVal, oldVal) {
diff --git a/src/views/emis/salesCommissionRatio/index.vue b/src/views/emis/salesCommissionRatio/index.vue
index 2395303f..a03c15e2 100644
--- a/src/views/emis/salesCommissionRatio/index.vue
+++ b/src/views/emis/salesCommissionRatio/index.vue
@@ -22,7 +22,7 @@
     </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">
 
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/index.vue b/src/views/emis/salesMonthlyReview/index.vue
index f9155c81..7a81a0b3 100644
--- a/src/views/emis/salesMonthlyReview/index.vue
+++ b/src/views/emis/salesMonthlyReview/index.vue
@@ -30,7 +30,7 @@
     </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">
 
@@ -93,6 +93,7 @@ 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 },
@@ -126,7 +127,7 @@ export default {
         employeeName:null,
         position:null,
         department:null,
-        reviewMonth:null,
+        reviewMonth:getLastMonthYearMonth(), //默认上个月
         params:{
           scoreRange:null,
         }
@@ -264,7 +265,7 @@ export default {
     },
     getTreeselect() {
       treeselect().then(response => {
-        console.log(response.data)
+        // console.log(response.data)
         this.deptOptions = response.data;
       });
     },

From 4cd2fa887eeb8b8f0e3a464310f8f4ad565db62f Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Tue, 29 Jul 2025 15:22:08 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E9=94=80=E5=94=AE=E6=9C=88=E8=AF=84?=
 =?UTF-8?q?=E7=99=BB=E8=AE=B0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/emis/salesMonthlyReview/index.vue | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/emis/salesMonthlyReview/index.vue b/src/views/emis/salesMonthlyReview/index.vue
index 7a81a0b3..fa98b242 100644
--- a/src/views/emis/salesMonthlyReview/index.vue
+++ b/src/views/emis/salesMonthlyReview/index.vue
@@ -53,17 +53,18 @@
         </el-row>
       </div>
       <el-table-column type="selection" width="50" align="center" />
-      <el-table-column label="员工姓名" align="center" prop="employeeName" width="80">
+      <el-table-column label="员工姓名" align="center" prop="employeeName" sortable >
       </el-table-column>
-      <el-table-column label="所属部门" align="left" prop="department" :show-overflow-tooltip="true"
+      <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" min-width="80">
+      <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"
+      <el-table-column label="岗位" align="center"  prop="position" :show-overflow-tooltip="true" sortable
         min-width="100" />
-      <el-table-column label="考核月份" align="center" prop="reviewMonth"></el-table-column>  
-      <el-table-column label="考核分数" align="center" prop="score" 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>

From 042e758b0b52e20e0bdfc6078341a0cc0d87779d Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Tue, 29 Jul 2025 16:07:55 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A1=E6=8F=90?=
 =?UTF-8?q?=E6=AF=94=E4=BE=8B=E5=BC=80=E5=A7=8B=E7=BB=93=E6=9D=9F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emis/salesCommissionRatio/editForm.vue    | 42 +++++++++++++++----
 src/views/emis/salesCommissionRatio/index.vue | 10 ++++-
 2 files changed, 43 insertions(+), 9 deletions(-)

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 a03c15e2..c2d1fd75 100644
--- a/src/views/emis/salesCommissionRatio/index.vue
+++ b/src/views/emis/salesCommissionRatio/index.vue
@@ -16,7 +16,9 @@
       <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>
@@ -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" />

From abe23c44bd3697fb1ac91e8ae8d0f0e65dd1afc8 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Tue, 29 Jul 2025 17:15:56 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8A=A0=E9=A2=84=E8=AE=A1=E5=85=A5=E4=BB=93=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/emis/emisWaybill/UserOrderList.vue | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

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;

From 7fc5c40c1483c1de3250ef4d4f4d8890321288f3 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Tue, 29 Jul 2025 18:09:52 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E7=8E=B0=E9=87=91=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E9=A2=9D=E5=BA=A6=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/emis/emisCreditSalesmen/index.vue | 69 +++++++++++----------
 1 file changed, 36 insertions(+), 33 deletions(-)

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>