Merge branches 'dev' and 'dev' of git.echepei.com:caojunjie/Smart_platform_ui into dev

src/views/dealer/stock/detailsPage.vue

@@ -0,0 +1,154 @@
+<template>
+  <div class="borderless" v-loading="pageLoading">
+    <div class="customer-head">
+      <div class="customer-back">
+        <el-button
+          type="danger"
+          style="border: none;background: none;color: red"
+          icon="el-icon-arrow-left"
+          @click="backToList"
+          >返回列表
+        </el-button>
+      </div>
+    </div>
+    <div class="customer-main">
+      <container-title title="库存账明细"></container-title>
+      <basic-container>
+        <avue-crud :option="option" :data="data"></avue-crud>
+      </basic-container>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "detailsPage",
+  data() {
+    return {
+      option: {
+        searchShow: true,
+        searchMenuSpan: 18,
+        border: true,
+        index: true,
+        addBtn: false,
+        headerAlign: "center",
+        align: "center",
+        menu: false,
+        column: [
+          {
+            label: "日期",
+            prop: "a",
+            search: true,
+            overHidden: true
+          },
+          {
+            label: "摘要",
+            prop: "b",
+            overHidden: true
+          },
+          {
+            label: "入库",
+            prop: "c",
+            overHidden: true,
+            children: [
+              {
+                label: "数量",
+                prop: "c1",
+                overHidden: true
+              },
+              {
+                label: "单价",
+                prop: "c2",
+                overHidden: true
+              },
+              {
+                label: "金额",
+                prop: "c3",
+                overHidden: true
+              }
+            ]
+          },
+          {
+            label: "出库",
+            prop: "d",
+            overHidden: true,
+            children: [
+              {
+                label: "数量",
+                prop: "d1",
+                overHidden: true
+              },
+              {
+                label: "单价",
+                prop: "d2",
+                overHidden: true
+              },
+              {
+                label: "金额",
+                prop: "d3",
+                overHidden: true
+              }
+            ]
+          },
+          {
+            label: "结存",
+            prop: "e",
+            overHidden: true,
+            children: [
+              {
+                label: "数量",
+                prop: "e1",
+                overHidden: true
+              },
+              {
+                label: "金额",
+                prop: "e2",
+                overHidden: true
+              }
+            ]
+          },
+          {
+            label: "业务单号",
+            prop: "f",
+            overHidden: true
+          },
+          {
+            label: "出入单号",
+            prop: "g",
+            overHidden: true
+          },
+          {
+            label: "批号",
+            prop: "h",
+            overHidden: true
+          },
+          {
+            label: "对方单位",
+            prop: "i",
+            overHidden: true
+          },
+          {
+            label: "售价",
+            prop: "j",
+            overHidden: true
+          }
+        ]
+      },
+      data: []
+    };
+  },
+  props: {
+    detailData: {
+      type: Object
+    }
+  },
+  async created() {},
+  methods: {
+    backToList() {
+      this.$emit("goBack");
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped></style>

src/views/dealer/stock/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basic-container v-if="show">
+    <basic-container v-show="show" class="page-crad">
       <avue-crud
         ref="crud"
         :option="option"
@@ -11,31 +11,35 @@
         :table-loading="loading"
         @on-load="onLoad"
         @row-update="rowUpdate"
-        :cell-style="cellStyle">
+        :cell-style="cellStyle"
+      >
         <template slot-scope="scope" slot="lockingQuantity">
-          <span v-if="Number(scope.row.lockingQuantity) > 0" style="color: #409EFF;cursor: pointer" @click.stop="viewCell(scope.row,scope.index)">{{ scope.row.lockingQuantity }}</span>
+          <span
+            v-if="Number(scope.row.lockingQuantity) > 0"
+            style="color: #409EFF;cursor: pointer"
+            @click.stop="viewCell(scope.row, scope.index)"
+            >{{ scope.row.lockingQuantity }}</span
+          >
           <span v-else>{{ scope.row.lockingQuantity }}</span>
         </template>
-        <template slot="storageId" slot-scope="{row, index}">
+        <template slot="storageId" slot-scope="{ row }">
           <span>{{ row.stockName }}</span>
         </template>
         <template slot="storageIdSearch">
           <warehouse-select
             v-model="search.storageId"
-            :configuration="configurationWarehouse"/>
+            :configuration="configurationWarehouse"
+          />
         </template>
-        <template slot-scope="{row,index}" slot="menu">
-          <el-button
-            type="text"
-            size="small"
-            @click="rowCell(row,index)"
-          >{{ row.$cellEdit ? '保存' : '修改' }}
+        <template slot-scope="{ row, index }" slot="menu">
+          <el-button type="text" size="small" @click="editOpen(row, 1)"
+            >查看
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="deletePrice(row,index)"
-          >删除
+          <el-button type="text" size="small" @click="rowCell(row, index)"
+            >{{ row.$cellEdit ? "保存" : "修改" }}
+          </el-button>
+          <el-button type="text" size="small" @click="deletePrice(row, index)"
+            >删除
           </el-button>
         </template>
         <template slot="menuLeft">
@@ -44,14 +48,14 @@
             size="small"
             icon="el-icon-plus"
             @click="excelBox = !excelBox"
-          >导入
+            >导入
           </el-button>
           <el-button
             type="success"
             icon="el-icon-download"
             size="small"
             @click="derivation()"
-          >下载模板
+            >下载模板
           </el-button>
           <el-button
             type="info"
@@ -59,17 +63,28 @@
             size="small"
             :loading="exportLoading"
             @click.stop="statement"
-          >报表打印
+            >报表打印
           </el-button>
         </template>
       </avue-crud>
-      <el-dialog title="导入库存"
-                 append-to-body
-                 :visible.sync="excelBox"
-                 width="555px">
-        <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter"/>
+      <el-dialog
+        title="导入库存"
+        append-to-body
+        :visible.sync="excelBox"
+        width="555px"
+      >
+        <avue-form
+          :option="excelOption"
+          v-model="excelForm"
+          :upload-after="uploadAfter"
+        />
       </el-dialog>
     </basic-container>
+    <detail-page
+      @goBack="goBack"
+      :detailData="detailData"
+      v-if="!show"
+    ></detail-page>
     <report-dialog
       :switchDialog="switchDialog"
       :searchValue="statementData"
@@ -79,23 +94,29 @@
   </div>
 </template>
 <script>
-import option from "./config/mainList.json"
-import {deleteTemplate,customerList,typeSave} from "@/api/basicData/inventoryAccount"
-import {getToken} from "@/util/auth";
+import option from "./config/mainList.json";
+import {
+  deleteTemplate,
+  customerList,
+  typeSave
+} from "@/api/basicData/inventoryAccount";
+import { getToken } from "@/util/auth";
 import { defaultDate } from "@/util/date";
 import reportDialog from "@/components/report-dialog/main";
-
+import detailPage from "./detailsPage";
 export default {
-  components:{
-    reportDialog
+  components: {
+    reportDialog,
+    detailPage
   },
   data() {
     return {
+      detailData: {},
       data: [],
-      search:{},
+      search: {},
       loading: false,
-      exportLoading:false,
-      switchDialog:false,
+      exportLoading: false,
+      switchDialog: false,
       statementData: {},
       excelForm: {},
       excelOption: {
@@ -103,16 +124,16 @@ export default {
         emptyBtn: false,
         column: [
           {
-            label: '导入数据',
-            prop: 'excelFile',
-            type: 'upload',
+            label: "导入数据",
+            prop: "excelFile",
+            type: "upload",
             drag: true,
-            loadText: '导入数据中，请稍等',
+            loadText: "导入数据中，请稍等",
             span: 24,
             propsHttp: {
-              res: 'data'
+              res: "data"
             },
-            tip: '请上传 .xls,.xlsx 标准格式文件',
+            tip: "请上传 .xls,.xlsx 标准格式文件",
             action: "/api/blade-stock/stockgoods/import-price"
           }
         ]
@@ -123,7 +144,7 @@ export default {
         pageSize: 10,
         pagerCount: 5,
         total: 0,
-        pageSizes: [10,50,100,200,300]
+        pageSizes: [10, 50, 100, 200, 300]
       },
       show: true,
       params: {
@@ -136,18 +157,18 @@ export default {
         multiple: false,
         collapseTags: false,
         placeholder: "请点击右边按钮选择",
-        dicData: [],
-      },
-    }
+        dicData: []
+      }
+    };
   },
   created() {
     // this.search.createTime = defaultDate(1)
     let i = 0;
     this.option.column.forEach(item => {
-      if (item.search) i++
-    })
-    if (i % 3 !== 0){
-      const num = 3 - Number(i % 3)
+      if (item.search) i++;
+    });
+    if (i % 3 !== 0) {
+      const num = 3 - Number(i % 3);
       this.option.searchMenuSpan = num * 8;
       this.option.searchMenuPosition = "right";
     }
@@ -162,7 +183,11 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
-        window.open(`/api/blade-stock/stockgoods/export-template?${this.website.tokenHeader}=${getToken()}`);
+        window.open(
+          `/api/blade-stock/stockgoods/export-template?${
+            this.website.tokenHeader
+          }=${getToken()}`
+        );
       });
     },
     uploadAfter(res, done, loading, column) {
@@ -170,76 +195,90 @@ export default {
       this.excelBox = false;
       this.page.currentPage = 1;
       if (res) {
-        this.$message.warning(res)
+        this.$message.warning(res);
       } else {
-        this.$message.success('导入成功')
+        this.$message.success("导入成功");
       }
       this.onLoad(this.page);
-      loading()
+      loading();
       done();
     },
     rowCell(row, index) {
-      this.$refs.crud.rowCell(row, index)
+      this.$refs.crud.rowCell(row, index);
+    },
+    editOpen(row, status) {
+      this.detailData = {
+        id: row.id,
+        status: status
+      };
+      this.show = false;
     },
-    deletePrice(row,index){
-      if (row.id){
+    deletePrice(row, index) {
+      if (row.id) {
         this.$confirm("确定将选择数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
-        }).then(() => {
-          return deleteTemplate(row.id);
-        }).then(() => {
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          this.page.currentPage = 1;
-          this.onLoad(this.page);
         })
+          .then(() => {
+            return deleteTemplate(row.id);
+          })
+          .then(() => {
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.page.currentPage = 1;
+            this.onLoad(this.page);
+          });
       }
     },
     //点击搜索按钮触发
     searchChange(params, done) {
       if (params.createTime) {
-        params.createStartTime = params.createTime[0]+ " " + "00:00:00"
-        params.createEndTime = params.createTime[1]+ " " + "23:59:59"
+        params.createStartTime = params.createTime[0] + " " + "00:00:00";
+        params.createEndTime = params.createTime[1] + " " + "23:59:59";
         delete params.createTime;
       }
       this.page.currentPage = 1;
       this.onLoad(this.page, params);
-      done()
+      done();
     },
     onLoad(page, params = {}) {
       if (this.search.createTime && this.search.createTime.length > 0) {
         params = {
           ...params,
-          createStartTime: this.search.createTime[0]+ " " + "00:00:00",
-          createEndTime: this.search.createTime[1]+ " " + "23:59:59",
-        }
+          createStartTime: this.search.createTime[0] + " " + "00:00:00",
+          createEndTime: this.search.createTime[1] + " " + "23:59:59"
+        };
         delete params.createTime;
       }
       let queryParams = Object.assign({}, params, {
         size: page.pageSize,
-        current: page.currentPage,
-      })
+        current: page.currentPage
+      });
       this.loading = true;
-      customerList(queryParams).then(res => {
-        this.data = res.data.data.records
-        this.page.total = res.data.data.total
-      }).finally(() => {
-        this.loading = false;
-      })
+      customerList(queryParams)
+        .then(res => {
+          this.data = res.data.data.records;
+          this.page.total = res.data.data.total;
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     rowUpdate(form, index, done) {
       typeSave(form).then(res => {
-        this.$message({type: "success", message: form.id ? "修改成功!" : "新增成功!"});
+        this.$message({
+          type: "success",
+          message: form.id ? "修改成功!" : "新增成功!"
+        });
         // this.page.currentPage = 1;
         // this.onLoad(this.page);
         //成功关闭此页面回到列表页
         // this.backToList()
-      })
-      done()
+      });
+      done();
     },
     // 查看
     viewCell(row, index) {
@@ -252,31 +291,54 @@ export default {
           }
         });
       } else {
-        this.params.corpId = row.corpId
-        this.params.itemId = row.goodsId
-        this.$router.$avueRouter.closeTag("/businessManagement/inventoryAccount/detail");
+        this.params.corpId = row.corpId;
+        this.params.itemId = row.goodsId;
+        this.$router.$avueRouter.closeTag(
+          "/businessManagement/inventoryAccount/detail"
+        );
         this.$router.push({
           path: "/businessManagement/inventoryAccount/detail",
           query: {
             corpId: row.corpId,
             itemId: row.goodsId
-          },
+          }
         });
       }
       // this.show = false;
     },
     statement() {
-      this.statementData = {...this.search};
-      if (this.statementData.createTime && this.statementData.createTime.length > 0) {
-        this.statementData.createStartTime = this.statementData.createTime[0]+ " " + "00:00:00"
-        this.statementData.createEndTime = this.statementData.createTime[1]+ " " + "23:59:59"
-        delete this.statementData.createTime
+      this.statementData = { ...this.search };
+      if (
+        this.statementData.createTime &&
+        this.statementData.createTime.length > 0
+      ) {
+        this.statementData.createStartTime =
+          this.statementData.createTime[0] + " " + "00:00:00";
+        this.statementData.createEndTime =
+          this.statementData.createTime[1] + " " + "23:59:59";
+        delete this.statementData.createTime;
       }
       this.switchDialog = !this.switchDialog;
     },
     onClose(val) {
       this.switchDialog = val;
     },
+    goBack() {
+      if (this.$route.query.id) {
+        this.$router.$avueRouter.closeTag(this.$route.fullPath);
+        this.$router.push({
+          path: "/dealer/stock/index"
+        });
+      }
+      this.detailData = this.$options.data().detailData;
+      this.show = true;
+      this.onLoad(this.page, this.search);
+    }
   }
-}
+};
 </script>
+<style scoped>
+.page-crad ::v-deep .basic-container__card {
+  height: 94.2vh;
+}
+</style>

src/views/salaryManagement/highSchool/detailsPage.vue

@@ -130,9 +130,6 @@
           <template slot="workloadSalaryLabel">
             <el-tag>工作量工资:</el-tag>
           </template>
-          <template slot="dailyAssessmentSalaryLabel">
-            <el-tag>日常考核工资:</el-tag>
-          </template>
           <template slot="awardSalaryLabel">
             <el-tag>奖励工资:</el-tag>
           </template>
@@ -305,18 +302,6 @@
               @change="salaryAdd(crudForm)"
             />
           </template>
-          <!-- //3.日常考核工资 =日常考核工资-虚拟日常考核标准 -->
-          <template
-            slot="dailyAssessmentSalaryForm"
-            slot-scope="{ column, disabled }"
-          >
-            <el-input
-              :disabled="disabled"
-              :placeholder="'请输入 ' + column.label"
-              v-model="crudForm.dailyAssessmentSalary"
-              @change="salaryAdd(crudForm)"
-            />
-          </template>
           <template slot="pauseNoPayTwoForm" slot-scope="{ column, disabled }">
             <el-input
               :disabled="disabled"
@@ -325,17 +310,6 @@
               @change="salaryAdd(crudForm)"
             />
           </template>
-          <template
-            slot="virtualDailyAssessmentCriteriaForm"
-            slot-scope="{ column, disabled }"
-          >
-            <el-input
-              :disabled="disabled"
-              :placeholder="'请输入 ' + column.label"
-              v-model="crudForm.virtualDailyAssessmentCriteria"
-              @change="salaryAdd(crudForm)"
-            />
-          </template>
           <!-- 4.绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5 -->
           <template
             slot="termPerformanceSalaryForm"
@@ -1432,7 +1406,6 @@ export default {
         column.property == "virtualWorkloadSalary" ||
         column.property == "doubleCease" ||
         column.property == "dailyAssessmentCriteria" ||
-        column.property == "virtualDailyAssessmentCriteria" ||
         column.property == "otherCriterion" ||
         column.property == "teacherSubsidy" ||
         column.property == "teacherAssessSubsidy" ||
@@ -1780,11 +1753,6 @@ export default {
           numCal(row.virtualDailyAssessmentCriteria) -
           numCal(row.virtualDoubleCease)
       ).toFixed(2);
-      //3.日常考核工资 =日常考核工资-虚拟日常考核标准
-      row.dailyAssessmentSalary = Number(
-        numCal(row.dailyAssessmentSalary) -
-          numCal(row.virtualDailyAssessmentCriteria)
-      ).toFixed(2);
       // 4.绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5
       row.customizeFour = Number(
         numCal(row.termPerformanceSalary) +

src/views/salaryManagement/highSchool/js/optionList.js

@@ -1171,7 +1171,6 @@ export const optionList = {
       prop: "dailyAssessmentSalary",
       width: 100,
       overHidden: true,
-      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"

src/views/salaryManagement/juniorhighSchool/detailsPage.vue

@@ -130,9 +130,6 @@
           <template slot="workloadSalaryLabel">
             <el-tag>工作量工资:</el-tag>
           </template>
-          <template slot="dailyAssessmentSalaryLabel">
-            <el-tag>日常考核工资:</el-tag>
-          </template>
           <template slot="awardSalaryLabel">
             <el-tag>奖励工资:</el-tag>
           </template>
@@ -305,18 +302,6 @@
               @change="salaryAdd(crudForm)"
             />
           </template>
-          <!-- //3.日常考核工资 =日常考核工资-虚拟日常考核标准 -->
-          <template
-            slot="dailyAssessmentSalaryForm"
-            slot-scope="{ column, disabled }"
-          >
-            <el-input
-              :disabled="disabled"
-              :placeholder="'请输入 ' + column.label"
-              v-model="crudForm.dailyAssessmentSalary"
-              @change="salaryAdd(crudForm)"
-            />
-          </template>
           <template slot="pauseNoPayTwoForm" slot-scope="{ column, disabled }">
             <el-input
               :disabled="disabled"
@@ -325,17 +310,6 @@
               @change="salaryAdd(crudForm)"
             />
           </template>
-          <template
-            slot="virtualDailyAssessmentCriteriaForm"
-            slot-scope="{ column, disabled }"
-          >
-            <el-input
-              :disabled="disabled"
-              :placeholder="'请输入 ' + column.label"
-              v-model="crudForm.virtualDailyAssessmentCriteria"
-              @change="salaryAdd(crudForm)"
-            />
-          </template>
           <!-- 4.绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5 -->
           <template
             slot="termPerformanceSalaryForm"
@@ -1432,7 +1406,6 @@ export default {
         column.property == "virtualWorkloadSalary" ||
         column.property == "doubleCease" ||
         column.property == "dailyAssessmentCriteria" ||
-        column.property == "virtualDailyAssessmentCriteria" ||
         column.property == "otherCriterion" ||
         column.property == "teacherSubsidy" ||
         column.property == "teacherAssessSubsidy" ||
@@ -1780,11 +1753,6 @@ export default {
           numCal(row.virtualDailyAssessmentCriteria) -
           numCal(row.virtualDoubleCease)
       ).toFixed(2);
-      //3.日常考核工资 =日常考核工资-虚拟日常考核标准
-      row.dailyAssessmentSalary = Number(
-        numCal(row.dailyAssessmentSalary) -
-          numCal(row.virtualDailyAssessmentCriteria)
-      ).toFixed(2);
       // 4.绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5
       row.customizeFour = Number(
         numCal(row.termPerformanceSalary) +

src/views/salaryManagement/juniorhighSchool/js/optionList.js

@@ -1171,7 +1171,6 @@ export const optionList = {
       prop: "dailyAssessmentSalary",
       width: 100,
       overHidden: true,
-      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"

src/views/salaryManagement/logisticsDepartment/detailsPage.vue

@@ -130,9 +130,6 @@
           <template slot="workloadSalaryLabel">
             <el-tag>工作量工资:</el-tag>
           </template>
-          <template slot="dailyAssessmentSalaryLabel">
-            <el-tag>日常考核工资:</el-tag>
-          </template>
           <template slot="awardSalaryLabel">
             <el-tag>奖励工资:</el-tag>
           </template>
@@ -305,18 +302,6 @@
               @change="salaryAdd(crudForm)"
             />
           </template>
-          <!-- //3.日常考核工资 =日常考核工资-虚拟日常考核标准 -->
-          <template
-            slot="dailyAssessmentSalaryForm"
-            slot-scope="{ column, disabled }"
-          >
-            <el-input
-              :disabled="disabled"
-              :placeholder="'请输入 ' + column.label"
-              v-model="crudForm.dailyAssessmentSalary"
-              @change="salaryAdd(crudForm)"
-            />
-          </template>
           <template slot="pauseNoPayTwoForm" slot-scope="{ column, disabled }">
             <el-input
               :disabled="disabled"
@@ -325,17 +310,6 @@
               @change="salaryAdd(crudForm)"
             />
           </template>
-          <template
-            slot="virtualDailyAssessmentCriteriaForm"
-            slot-scope="{ column, disabled }"
-          >
-            <el-input
-              :disabled="disabled"
-              :placeholder="'请输入 ' + column.label"
-              v-model="crudForm.virtualDailyAssessmentCriteria"
-              @change="salaryAdd(crudForm)"
-            />
-          </template>
           <!-- 4.绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5 -->
           <template
             slot="termPerformanceSalaryForm"
@@ -1432,7 +1406,6 @@ export default {
         column.property == "virtualWorkloadSalary" ||
         column.property == "doubleCease" ||
         column.property == "dailyAssessmentCriteria" ||
-        column.property == "virtualDailyAssessmentCriteria" ||
         column.property == "otherCriterion" ||
         column.property == "teacherSubsidy" ||
         column.property == "teacherAssessSubsidy" ||
@@ -1780,11 +1753,6 @@ export default {
           numCal(row.virtualDailyAssessmentCriteria) -
           numCal(row.virtualDoubleCease)
       ).toFixed(2);
-      //3.日常考核工资 =日常考核工资-虚拟日常考核标准
-      row.dailyAssessmentSalary = Number(
-        numCal(row.dailyAssessmentSalary) -
-          numCal(row.virtualDailyAssessmentCriteria)
-      ).toFixed(2);
       // 4.绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5
       row.customizeFour = Number(
         numCal(row.termPerformanceSalary) +

src/views/salaryManagement/logisticsDepartment/js/optionList.js

@@ -1171,7 +1171,6 @@ export const optionList = {
       prop: "dailyAssessmentSalary",
       width: 100,
       overHidden: true,
-      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"

src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -130,9 +130,6 @@
           <template slot="workloadSalaryLabel">
             <el-tag>工作量工资:</el-tag>
           </template>
-          <template slot="dailyAssessmentSalaryLabel">
-            <el-tag>日常考核工资:</el-tag>
-          </template>
           <template slot="customizeFourLabel">
             <el-tag>绩效工资:</el-tag>
           </template>
@@ -308,18 +305,6 @@
               @change="salaryAdd(crudForm)"
             />
           </template>
-          <!-- //3.日常考核工资 =日常考核工资-虚拟日常考核标准 -->
-          <template
-            slot="dailyAssessmentSalaryForm"
-            slot-scope="{ column, disabled }"
-          >
-            <el-input
-              :disabled="disabled"
-              :placeholder="'请输入 ' + column.label"
-              v-model="crudForm.dailyAssessmentSalary"
-              @change="salaryAdd(crudForm)"
-            />
-          </template>
           <template slot="pauseNoPayTwoForm" slot-scope="{ column, disabled }">
             <el-input
               :disabled="disabled"
@@ -328,17 +313,6 @@
               @change="salaryAdd(crudForm)"
             />
           </template>
-          <template
-            slot="virtualDailyAssessmentCriteriaForm"
-            slot-scope="{ column, disabled }"
-          >
-            <el-input
-              :disabled="disabled"
-              :placeholder="'请输入 ' + column.label"
-              v-model="crudForm.virtualDailyAssessmentCriteria"
-              @change="salaryAdd(crudForm)"
-            />
-          </template>
           <!-- 4.绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5 -->
           <template
             slot="termPerformanceSalaryForm"
@@ -1445,7 +1419,6 @@ export default {
         column.property == "virtualWorkloadSalary" ||
         column.property == "doubleCease" ||
         column.property == "dailyAssessmentCriteria" ||
-        column.property == "virtualDailyAssessmentCriteria" ||
         column.property == "otherCriterion" ||
         column.property == "teacherSubsidy" ||
         column.property == "teacherAssessSubsidy" ||
@@ -1793,11 +1766,6 @@ export default {
           numCal(row.virtualDailyAssessmentCriteria) -
           numCal(row.virtualDoubleCease)
       ).toFixed(2);
-      //3.日常考核工资 =日常考核工资-虚拟日常考核标准
-      row.dailyAssessmentSalary = Number(
-        numCal(row.dailyAssessmentSalary) -
-          numCal(row.virtualDailyAssessmentCriteria)
-      ).toFixed(2);
       // 4.绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5
       row.customizeFour = Number(
         numCal(row.termPerformanceSalary) +
@@ -2464,168 +2432,168 @@ export default {
       //   this.optionList.column.forEach(el => {
       //     el.disabled = true;
       //   });
-        // this.findObject(
-        //   this.optionList.column,
-        //   "salaryWithdrawalStandard"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "rankWithdrawalStandard"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "performanceAwardName"
-        // ).disabled = false;
-        // this.findObject(this.optionList.column, "schoolAge").disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "capitalIncreaseName"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "salaryStandard"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "salaryBaseName"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "workloadSalaryCritertion"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "virtualWorkloadSalary"
-        // ).disabled = false;
-        // this.findObject(this.optionList.column, "doubleCease").disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "virtualDoubleCease"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "dailyAssessmentCriteria"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "virtualDailyAssessmentCriteria"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "termPerformanceSalaryName"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "leadingCadreSubsidyName"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "assessLeadingCadreSubsidyName"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "prepareLessonsName"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "assessPrepareLessonsName"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "teachingResearchName"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "teachingResearch"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "assessTeachingResearchName"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "teacherSubsidy"
-        // ).disabled = false;
-        // this.findObject(this.optionList.column, "classes").disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "adjustTheBalance"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "payrollCredit"
-        // ).disabled = false;
-        // this.findObject(this.optionList.column, "paid").disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "teacherAssessSubsidy"
-        // ).disabled = false;
-        // this.findObject(this.optionList.column, "wx").disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "maternityLeaveSalary"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "inspectorFines"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "telephoneBill"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "learningPower"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "childbirthAllowance"
-        // ).disabled = false;
-        // this.findObject(this.optionList.column, "androidIt").disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "insuranceUnit"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "insurancePersonage"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "reservedFundsUnit"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "reservedFundsPersonage"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "personageTaxes"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "salaryRemark"
-        // ).disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "pauseNoPayRemark"
-        // ).disabled = false;
-        // this.findObject(this.optionList.column, "remarks").disabled = false;
-        // this.findObject(this.optionList.column, "remarksOne").disabled = false;
-        // this.findObject(this.optionList.column, "discipline").disabled = false;
-        // this.findObject(this.optionList.column, "itemType").disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "positiveTime"
-        // ).disabled = false;
-        // this.findObject(this.optionList.column, "position").disabled = false;
-        // this.findObject(this.optionList.column, "cname").disabled = false;
-        // this.findObject(this.optionList.column, "idNumber").disabled = false;
-        // this.findObject(this.optionList.column, "code").disabled = false;
-        // this.findObject(
-        //   this.optionList.column,
-        //   "enjoyOfficeTreatment"
-        // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "salaryWithdrawalStandard"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "rankWithdrawalStandard"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "performanceAwardName"
+      // ).disabled = false;
+      // this.findObject(this.optionList.column, "schoolAge").disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "capitalIncreaseName"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "salaryStandard"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "salaryBaseName"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "workloadSalaryCritertion"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "virtualWorkloadSalary"
+      // ).disabled = false;
+      // this.findObject(this.optionList.column, "doubleCease").disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "virtualDoubleCease"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "dailyAssessmentCriteria"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "virtualDailyAssessmentCriteria"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "termPerformanceSalaryName"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "leadingCadreSubsidyName"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "assessLeadingCadreSubsidyName"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "prepareLessonsName"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "assessPrepareLessonsName"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "teachingResearchName"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "teachingResearch"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "assessTeachingResearchName"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "teacherSubsidy"
+      // ).disabled = false;
+      // this.findObject(this.optionList.column, "classes").disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "adjustTheBalance"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "payrollCredit"
+      // ).disabled = false;
+      // this.findObject(this.optionList.column, "paid").disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "teacherAssessSubsidy"
+      // ).disabled = false;
+      // this.findObject(this.optionList.column, "wx").disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "maternityLeaveSalary"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "inspectorFines"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "telephoneBill"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "learningPower"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "childbirthAllowance"
+      // ).disabled = false;
+      // this.findObject(this.optionList.column, "androidIt").disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "insuranceUnit"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "insurancePersonage"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "reservedFundsUnit"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "reservedFundsPersonage"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "personageTaxes"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "salaryRemark"
+      // ).disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "pauseNoPayRemark"
+      // ).disabled = false;
+      // this.findObject(this.optionList.column, "remarks").disabled = false;
+      // this.findObject(this.optionList.column, "remarksOne").disabled = false;
+      // this.findObject(this.optionList.column, "discipline").disabled = false;
+      // this.findObject(this.optionList.column, "itemType").disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "positiveTime"
+      // ).disabled = false;
+      // this.findObject(this.optionList.column, "position").disabled = false;
+      // this.findObject(this.optionList.column, "cname").disabled = false;
+      // this.findObject(this.optionList.column, "idNumber").disabled = false;
+      // this.findObject(this.optionList.column, "code").disabled = false;
+      // this.findObject(
+      //   this.optionList.column,
+      //   "enjoyOfficeTreatment"
+      // ).disabled = false;
       // }
       if (localStorage.getItem("roleName") == "XXGZGLY") {
         this.optionList.column.forEach(el => {

src/views/salaryManagement/primarySchool/js/optionList.js

@@ -1171,7 +1171,6 @@ export const optionList = {
       prop: "dailyAssessmentSalary",
       width: 100,
       overHidden: true,
-      disabled: true,
       rules: [{
         validator: validateDecimal,
         trigger: "blur"

src/views/statisticAnalysis/salesDetails/index.vue

@@ -0,0 +1,281 @@
+<template>
+  <div>
+    <basic-container class="page-crad">
+      <avue-crud
+        ref="crud"
+        :option="option"
+        :data="dataList"
+        :page.sync="page"
+        :search.sync="search"
+        :cell-style="cellStyle"
+        @search-change="searchChange"
+        @current-change="currentChange"
+        @size-change="sizeChange"
+        @refresh-change="refreshChange"
+        @on-load="onLoad"
+        :table-loading="loading"
+        :summary-method="summaryMethod"
+        @saveColumn="saveColumn"
+        @resetColumn="resetColumn"
+        @search-criteria-switch="searchCriteriaSwitch"
+      >
+        <template slot="menuLeft">
+          <el-button type="info" size="small" @click="outExport"
+            >导出</el-button
+          >
+        </template>
+        <template slot="corpIdSearch">
+          <crop-select v-model="search.corpId" corpType="KH"></crop-select>
+        </template>
+        <template slot="businesDateSearch">
+          <el-date-picker
+            v-model="search.businesDate"
+            type="daterange"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            :default-time="['00:00:00', '23:59:59']"
+          >
+          </el-date-picker>
+        </template>
+      </avue-crud>
+    </basic-container>
+  </div>
+</template>
+
+<script>
+import { getToken } from "@/util/auth";
+import _ from "lodash";
+export default {
+  name: "index",
+  data() {
+    return {
+      form: {},
+      search: {},
+      dataList: [],
+      loading: false,
+      detailData: {},
+      page: {
+        pageSize: 20,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
+      },
+      option: {
+        searchShow: true,
+        searchMenuSpan: 16,
+        align: "center",
+        searchSpan: 8,
+        border: true,
+        index: true,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        showSummary: true,
+        searchIcon: true,
+        searchIndex: 2,
+        menu: false,
+        column: [
+          {
+            label: "客户名称",
+            prop: "corpId",
+            overHidden: true,
+            width: 100,
+            search: true,
+            formatter: row => {
+              return row.corpsName;
+            }
+          },
+          {
+            label: "品牌",
+            prop: "billType",
+            type: "select",
+            hide: true,
+            showColumn: false,
+            search: true
+          },
+          {
+            label: "日期",
+            prop: "businesDate",
+            type: "date",
+            format: "yyyy-MM-dd",
+            overHidden: true,
+            search: true,
+            width: 100
+          },
+          {
+            label: "业务员",
+            prop: "portOfLoad",
+            overHidden: true,
+            search: true,
+            width: 100
+          },
+          {
+            label: "产品编码",
+            prop: "portOfDestination",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "规格",
+            prop: "transport",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "花纹",
+            prop: "procurementCost",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "数量",
+            prop: "partsCost",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "金额",
+            prop: "purchasePrice",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "单价",
+            prop: "amount",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "回款额",
+            prop: "grossProfit",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "包装费",
+            prop: "grossProfitRate",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "特价金额",
+            prop: "fd",
+            overHidden: true,
+            width: 100
+          }
+        ]
+      }
+    };
+  },
+  filters: {
+    decimalFormat(num) {
+      return num ? Number(num).toFixed(2) : "0.00";
+    }
+  },
+  methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 46;
+      } else {
+        this.option.height = this.option.height + 46;
+      }
+      this.$refs.crud.getTableHeight();
+    },
+    //点击搜索按钮触发
+    searchChange(params, done) {
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.search);
+    },
+    currentChange(val) {
+      this.page.currentPage = val;
+    },
+    sizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pageSize = val;
+    },
+    onLoad(page, params = {}) {
+      // this.loading = true;
+      // getList(
+      //   page.currentPage,
+      //   page.pageSize,
+      //   Object.assign(params, this.search)
+      // )
+      //   .then(res => {
+      //     if (res.data.data.records) {
+      //       res.data.data.records.forEach(e => {
+      //         e.itemLoading = true;
+      //       });
+      //     }
+      //     this.dataList = res.data.data.records ? res.data.data.records : [];
+      //     this.page.total = res.data.data.total;
+      //     if (this.page.total) {
+      //       this.option.height = window.innerHeight - 210;
+      //     }
+      //   })
+      //   .finally(() => {
+      //     this.loading = false;
+      //   });
+    },
+    editOpen(row) {},
+    outExport() {
+      // if (!this.search.billType) {
+      //   return this.$message.error("请选择类别");
+      // }
+      // window.open(
+      //   `/api/blade-purchase-sales/exportOrder/exportProfit?${
+      //     this.website.tokenHeader
+      //   }=${getToken()}&billType=${this.search.billType}`
+      // );
+    },
+    summaryMethod({ columns, data }) {
+      const sums = [];
+      // if (columns.length > 0) {
+      //   columns.forEach((item, index) => {
+      //     sums[0] = "合计";
+      //     if (item.property == "purchasePrice" || item.property == "amount") {
+      //       let amountSum = 0;
+      //       let purchaseAmountSum = 0;
+      //       data.forEach(e => {
+      //         amountSum = _.add(amountSum, Number(e.amount));
+      //         purchaseAmountSum = _.add(
+      //           purchaseAmountSum,
+      //           Number(e.purchasePrice)
+      //         );
+      //       });
+      //       //入库金额总计
+      //       if (item.property == "purchasePrice") {
+      //         sums[index] = micrometerFormat(purchaseAmountSum);
+      //       }
+      //       if (item.property == "amount") {
+      //         sums[index] = micrometerFormat(amountSum);
+      //       }
+      //     }
+      //   });
+      // }
+      return sums;
+    }
+  }
+};
+</script>
+
+<style scoped>
+.page-crad ::v-deep .basic-container__card {
+  height: 94.2vh;
+}
+::v-deep .el-table__expanded-cell[class*="cell"] {
+  padding: 0px;
+}
+.itemTable ::v-deep .el-table {
+  width: 100%;
+}
+</style>

src/views/statisticAnalysis/salesProfit/index.vue

@@ -440,15 +440,33 @@ export default {
       if (columns.length > 0) {
         columns.forEach((item, index) => {
           sums[0] = "合计";
-          if (item.property == "purchasePrice" || item.property == "amount") {
+          if (
+            item.property == "purchasePrice" ||
+            item.property == "amount" ||
+            item.property == "grossProfit" ||
+            item.property == "fd" ||
+            item.property == "fc" ||
+            item.property == "singleTicketMargin"
+          ) {
             let amountSum = 0;
             let purchaseAmountSum = 0;
+            let grossProfitSum = 0;
+            let fdSum = 0;
+            let fcSum = 0;
+            let singleTicketMarginSum = 0;
             data.forEach(e => {
               amountSum = _.add(amountSum, Number(e.amount));
               purchaseAmountSum = _.add(
                 purchaseAmountSum,
                 Number(e.purchasePrice)
               );
+              grossProfitSum = _.add(grossProfitSum, Number(e.grossProfit));
+              fdSum = _.add(fdSum, Number(e.fd));
+              fcSum = _.add(fcSum, Number(e.fc));
+              singleTicketMarginSum = _.add(
+                singleTicketMarginSum,
+                Number(e.singleTicketMargin)
+              );
             });
             //入库金额总计
             if (item.property == "purchasePrice") {
@@ -457,6 +475,18 @@ export default {
             if (item.property == "amount") {
               sums[index] = micrometerFormat(amountSum);
             }
+            if (item.property == "grossProfit") {
+              sums[index] = micrometerFormat(grossProfitSum);
+            }
+            if (item.property == "fd") {
+              sums[index] = micrometerFormat(fdSum);
+            }
+            if (item.property == "fc") {
+              sums[index] = micrometerFormat(fcSum);
+            }
+            if (item.property == "singleTicketMargin") {
+              sums[index] = micrometerFormat(singleTicketMarginSum);
+            }
           }
         });
       }

src/views/statisticAnalysis/salesProfitN/index.vue

@@ -0,0 +1,312 @@
+<template>
+  <div>
+    <basic-container class="page-crad">
+      <avue-crud
+        ref="crud"
+        :option="option"
+        :data="dataList"
+        :page.sync="page"
+        :search.sync="search"
+        :cell-style="cellStyle"
+        @search-change="searchChange"
+        @current-change="currentChange"
+        @size-change="sizeChange"
+        @refresh-change="refreshChange"
+        @on-load="onLoad"
+        :table-loading="loading"
+        :summary-method="summaryMethod"
+        @saveColumn="saveColumn"
+        @resetColumn="resetColumn"
+        @search-criteria-switch="searchCriteriaSwitch"
+      >
+        <template slot="menuLeft">
+          <el-button type="info" size="small" @click="outExport"
+            >导出</el-button
+          >
+        </template>
+        <template slot="corpIdSearch">
+          <crop-select v-model="search.corpId" corpType="KH"></crop-select>
+        </template>
+        <template slot="businesDateSearch">
+          <el-date-picker
+            v-model="search.businesDate"
+            type="daterange"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            :default-time="['00:00:00', '23:59:59']"
+          >
+          </el-date-picker>
+        </template>
+      </avue-crud>
+    </basic-container>
+  </div>
+</template>
+
+<script>
+import { getToken } from "@/util/auth";
+import _ from "lodash";
+export default {
+  name: "index",
+  data() {
+    return {
+      form: {},
+      search: {},
+      dataList: [],
+      loading: false,
+      detailData: {},
+      page: {
+        pageSize: 20,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
+      },
+      option: {
+        searchShow: true,
+        searchMenuSpan: 8,
+        align: "center",
+        searchSpan: 8,
+        border: true,
+        index: true,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        showSummary: true,
+        searchIcon: true,
+        searchIndex: 2,
+        menu: false,
+        column: [
+          {
+            label: "客户名称",
+            prop: "corpId",
+            overHidden: true,
+            width: 100,
+            search: true,
+            formatter: row => {
+              return row.corpsName;
+            }
+          },
+          {
+            label: "品牌",
+            prop: "billType",
+            type: "select",
+            hide: true,
+            showColumn: false,
+            search: true
+          },
+          {
+            label: "省份",
+            prop: "orderNo",
+            overHidden: true,
+            width: 100,
+            search: true
+          },
+          {
+            label: "日期",
+            prop: "businesDate",
+            type: "date",
+            format: "yyyy-MM-dd",
+            overHidden: true,
+            search: true,
+            width: 100
+          },
+          {
+            label: "业务员",
+            prop: "portOfLoad",
+            overHidden: true,
+            search: true,
+            width: 100
+          },
+          {
+            label: "发货数量",
+            prop: "portOfDestination",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "销售金额",
+            prop: "transport",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "特价条数",
+            prop: "procurementCost",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "特价总金额",
+            prop: "partsCost",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "非特价条数",
+            prop: "purchasePrice",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "非特价总金额",
+            prop: "amount",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "17寸以上数量",
+            prop: "grossProfit",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "17寸以上金额",
+            prop: "grossProfitRate",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "采购金额",
+            prop: "fd",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "返利使用额",
+            prop: "fc",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "费用总金额",
+            prop: "singleTicketMargin",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "销售毛利",
+            prop: "singleTicketMargin",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: "销售毛利率",
+            prop: "singleTicketMargin",
+            overHidden: true,
+            width: 100
+          }
+        ]
+      }
+    };
+  },
+  filters: {
+    decimalFormat(num) {
+      return num ? Number(num).toFixed(2) : "0.00";
+    }
+  },
+  methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 46;
+      } else {
+        this.option.height = this.option.height + 46;
+      }
+      this.$refs.crud.getTableHeight();
+    },
+    //点击搜索按钮触发
+    searchChange(params, done) {
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.search);
+    },
+    currentChange(val) {
+      this.page.currentPage = val;
+    },
+    sizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pageSize = val;
+    },
+    onLoad(page, params = {}) {
+      // this.loading = true;
+      // getList(
+      //   page.currentPage,
+      //   page.pageSize,
+      //   Object.assign(params, this.search)
+      // )
+      //   .then(res => {
+      //     if (res.data.data.records) {
+      //       res.data.data.records.forEach(e => {
+      //         e.itemLoading = true;
+      //       });
+      //     }
+      //     this.dataList = res.data.data.records ? res.data.data.records : [];
+      //     this.page.total = res.data.data.total;
+      //     if (this.page.total) {
+      //       this.option.height = window.innerHeight - 210;
+      //     }
+      //   })
+      //   .finally(() => {
+      //     this.loading = false;
+      //   });
+    },
+    editOpen(row) {},
+    outExport() {
+      // if (!this.search.billType) {
+      //   return this.$message.error("请选择类别");
+      // }
+      // window.open(
+      //   `/api/blade-purchase-sales/exportOrder/exportProfit?${
+      //     this.website.tokenHeader
+      //   }=${getToken()}&billType=${this.search.billType}`
+      // );
+    },
+    summaryMethod({ columns, data }) {
+      const sums = [];
+      // if (columns.length > 0) {
+      //   columns.forEach((item, index) => {
+      //     sums[0] = "合计";
+      //     if (item.property == "purchasePrice" || item.property == "amount") {
+      //       let amountSum = 0;
+      //       let purchaseAmountSum = 0;
+      //       data.forEach(e => {
+      //         amountSum = _.add(amountSum, Number(e.amount));
+      //         purchaseAmountSum = _.add(
+      //           purchaseAmountSum,
+      //           Number(e.purchasePrice)
+      //         );
+      //       });
+      //       //入库金额总计
+      //       if (item.property == "purchasePrice") {
+      //         sums[index] = micrometerFormat(purchaseAmountSum);
+      //       }
+      //       if (item.property == "amount") {
+      //         sums[index] = micrometerFormat(amountSum);
+      //       }
+      //     }
+      //   });
+      // }
+      return sums;
+    }
+  }
+};
+</script>
+
+<style scoped>
+.page-crad ::v-deep .basic-container__card {
+  height: 94.2vh;
+}
+::v-deep .el-table__expanded-cell[class*="cell"] {
+  padding: 0px;
+}
+.itemTable ::v-deep .el-table {
+  width: 100%;
+}
+</style>

src/views/wel/home/tongjiSchool.vue

@@ -616,7 +616,13 @@ export default {
           }
         },
         legend: {
-          data: ["工资", "人数", "工资增加率", "人数增长率"]
+          data: ["工资", "人数", "工资增加率", "人数增长率"],
+          selected: {
+            工资: true,
+            人数: true,
+            工资增加率: false,
+            人数增长率: false
+          }
         },
         xAxis: {
           type: "category",
@@ -773,7 +779,13 @@ export default {
           }
         },
         legend: {
-          data: ["工资", "人数", "工资增加率", "人数增长率"]
+          data: ["工资", "人数", "工资增加率", "人数增长率"],
+          selected: {
+            工资: true,
+            人数: true,
+            工资增加率: false,
+            人数增长率: false
+          }
         },
         xAxis: {
           type: "category",