修改bug

src/api/salaryManagement/primarySchool.js

@@ -17,6 +17,12 @@ export function detail(id) {
     method: 'get'
   })
 }
+export function copyDetail(id) {
+  return request({
+    url: '/api/blade-school/salary/copyMessage?id=' + id,
+    method: 'get'
+  })
+}
 export function itemDetail(current, size, params) {
   return request({
     url: '/api/blade-school/salaryitem/list',

src/views/basicData/facultyManagement/detailsPage.vue

@@ -234,6 +234,83 @@ export default {
               label: "dictValue",
               value: "dictValue"
             },
+            span: 6
+          },
+          {
+            label: "教师类别",
+            prop: "salaryWithdrawalStandardName",
+            type: "select",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=Salary_allocation_standard",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
+            span: 6
+          },
+          {
+            label: "学历",
+            prop: "code",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=marital_status",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
+            label: "职称",
+            prop: "rankType",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=job_title",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
+            label: "职级等级",
+            prop: "rankSalaryName",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=Grade_salary",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
+            label: "学期绩效标准",
+            prop: "termPerformanceSalaryName",
+            type: "select",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=Term_Performance_Pay",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
+            label: "班主任",
+            prop: "doubleTeachers",
+            type: "select",
+            dataType: "string",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=double_teachers",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
             row: true,
             span: 6
           },
@@ -246,6 +323,14 @@ export default {
             span: 6
           },
           {
+            label: "职级拨付标准",
+            prop: "rankWithdrawalStandardName",
+            precision: 2,
+            type: "number",
+            controls: false,
+            span: 6
+          },
+          {
             label: "职级工资",
             prop: "rankWithdrawalStandard",
             precision: 2,
@@ -423,239 +508,94 @@ export default {
             span: 6
           },
           {
-            label: "教师类别",
-            prop: "salaryWithdrawalStandardName",
-            type: "select",
-            dicUrl:
-              "/api/blade-system/dict-biz/dictionary?code=Salary_allocation_standard",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
-            rules: [
-              {
-                required: true,
-                message: "",
-                trigger: "blur"
-              }
-            ],
-            span: 6
-          },
-          {
-            label: "职级拨付标准",
-            prop: "rankWithdrawalStandardName",
-            type: "select",
-            dicUrl:
-              "/api/blade-system/dict-biz/dictionary?code=Level_Allocation_Criteria",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
-            span: 6
-          },
-          {
             label: "履约奖标准",
             prop: "performanceAwardName",
-            type: "select",
-            dicUrl:
-              "/api/blade-system/dict-biz/dictionary?code=Performance_Award_Criteria",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
+            precision: 2,
+            type: "number",
+            controls: false,
             span: 6
           },
           {
             label: "增资标准",
             prop: "capitalIncreaseName",
-            type: "select",
-            dicUrl:
-              "/api/blade-system/dict-biz/dictionary?code=Capital_increase_standard",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
-            span: 6
-          },
-          {
-            label: "学历",
-            prop: "code",
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=marital_status",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
-            span: 6
-          },
-          {
-            label: "职称",
-            prop: "rankType",
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=job_title",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
-            span: 6
-          },
-          {
-            label: "职级等级",
-            prop: "rankSalaryName",
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=Grade_salary",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
+            precision: 2,
+            type: "number",
+            controls: false,
             span: 6
           },
 
           {
             label: "工资基数",
             prop: "salaryBaseName",
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=Wage_base",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
+            precision: 2,
+            type: "number",
+            controls: false,
             span: 6
           },
 
           {
             label: "工作量标准",
             prop: "workloadSalaryName",
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=Workload_Wages",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
+            precision: 2,
+            type: "number",
+            controls: false,
             span: 6
           },
 
           {
             label: "日常考核标准",
             prop: "dailyAssessmentCriteriaName",
-            type: "select",
-            dicUrl:
-              "/api/blade-system/dict-biz/dictionary?code=Daily_Assessment_Criteria",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
-            span: 6
-          },
-
-          {
-            label: "日常考核等级",
-            prop: "dailyAssessmentSalaryName",
-            type: "select",
-            dicUrl:
-              "/api/blade-system/dict-biz/dictionary?code=Daily_assessment_grade_salary",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
-            span: 6
-          },
-
-          {
-            label: "学期绩效标准",
-            prop: "termPerformanceSalaryName",
-            type: "select",
-            dicUrl:
-              "/api/blade-system/dict-biz/dictionary?code=Term_Performance_Pay",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
+            precision: 2,
+            type: "number",
+            controls: false,
             span: 6
           },
           {
             label: "领导干部补贴标准",
             prop: "leadingCadreSubsidyName",
-            type: "select",
-            dicUrl:
-              "/api/blade-system/dict-biz/dictionary?code=Standards_for_subsidies_for_leading_cadres",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
+            precision: 2,
+            type: "number",
+            controls: false,
             span: 6
           },
           {
             label: "领导干部审核补贴标准",
             prop: "assessLeadingCadreSubsidyName",
-            type: "select",
-            dicUrl:
-              "/api/blade-system/dict-biz/dictionary?code=Standards_for_subsidies_for_leading_cadres",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
+            precision: 2,
+            type: "number",
+            controls: false,
             span: 6
           },
           {
             label: "备课组长补贴标准",
             prop: "prepareLessonsName",
-            type: "select",
-            dicUrl:
-              "/api/blade-system/dict-biz/dictionary?code=Standard_for_Leader_of_Lesson_Preparation",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
+            precision: 2,
+            type: "number",
+            controls: false,
             span: 6
           },
           {
             label: "备课组长审核补贴标准",
             prop: "assessPrepareLessonsName",
-            type: "select",
-            dicUrl:
-              "/api/blade-system/dict-biz/dictionary?code=Standard_for_Leader_of_Lesson_Preparation",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
+            precision: 2,
+            type: "number",
+            controls: false,
             span: 6
           },
           {
             label: "教研组长补贴标准",
             prop: "teachingResearchName",
-            type: "select",
-            dicUrl:
-              "/api/blade-system/dict-biz/dictionary?code=Standard_for_Teacher-Leader",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
+            precision: 2,
+            type: "number",
+            controls: false,
             span: 6
           },
           {
             label: "教研组长考核补贴标准",
             prop: "assessTeachingResearchName",
-            type: "select",
-            dicUrl:
-              "/api/blade-system/dict-biz/dictionary?code=Standard_for_Teacher-Leader",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
-            span: 6
-          },
-          {
-            label: "班主任",
-            prop: "doubleTeachers",
-            type: "select",
-            dataType: "string",
-            dicUrl:
-              "/api/blade-system/dict-biz/dictionary?code=double_teachers",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
+            precision: 2,
+            type: "number",
+            controls: false,
             row: true,
             span: 6
           },
@@ -669,6 +609,7 @@ export default {
               label: "dictValue",
               value: "dictValue"
             },
+            row: true,
             span: 6
           },
           {
@@ -796,17 +737,17 @@ export default {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
-          // const num = addAllsalary(
-          //   this.form.salaryWithdrawalStandard,
-          //   this.form.rankWithdrawalStandard,
-          //   this.form.virtualWorkloadSalary
-          // );
-          // const num2 = addAllsalary2(
-          //   this.form.salaryBase,
-          //   this.form.workloadSalary,
-          //   this.form.dailyAssessmentCriteria,
-          //   this.form.termPerformanceSalary
-          // );
+          const num = addAllsalary(
+            this.form.salaryWithdrawalStandard,
+            this.form.rankWithdrawalStandard,
+            this.form.virtualWorkloadSalary
+          );
+          const num2 = addAllsalary2(
+            this.form.salaryBase,
+            this.form.workloadSalary,
+            this.form.dailyAssessmentCriteria,
+            this.form.termPerformanceSalary
+          );
           // if (num != num2) {
           //   return this.$message.error(
           //     "拨付金额" + num + "不等于标准金额" + num2

src/views/basicData/facultyManagement/index.vue

@@ -92,6 +92,9 @@
           >
           </el-date-picker>
         </template>
+        <template slot="schoolAge" slot-scope="{ row }">
+          <span>{{ row.schoolAge | Int }}</span>
+        </template>
       </avue-crud>
       <el-dialog
         title="导入教职工资料"
@@ -149,7 +152,7 @@ export default {
       },
       option: {
         searchShow: true,
-        searchMenuSpan: 8,
+        searchMenuSpan: 24,
         align: "center",
         searchSpan: 8,
         border: true,
@@ -180,7 +183,7 @@ export default {
             },
             search: true,
             overHidden: true,
-            span: 6
+            span: 8
           },
           {
             label: "级部",
@@ -208,7 +211,9 @@ export default {
             label: "身份证",
             prop: "idNumber",
             width: "120",
-            overHidden: true
+            search: true,
+            overHidden: true,
+            span: 8
           },
           {
             label: "性别",
@@ -269,67 +274,133 @@ export default {
             span: 8
           },
           {
+            label: "联系电话",
+            prop: "phone",
+            width: "100",
+            overHidden: true
+          },
+          {
             label: "校龄",
             prop: "schoolAge",
-            width: "80",
+            width: "100",
             overHidden: true
           },
           {
-            label: "是否班主任",
-            prop: "doubleTeachers",
+            label: "班级",
+            prop: "inStaffRoom",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=in_staff_room",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
             width: "100",
             overHidden: true
           },
           {
-            label: "职务",
+            label: "职位",
             prop: "compileCategory",
-            width: "80",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "职工类别",
+            prop: "staffType",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "授课类别",
+            prop: "classType",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "教师类别",
+            prop: "salaryWithdrawalStandardName",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "学历",
+            prop: "code",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "职称",
+            prop: "rankType",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "职级等级",
+            prop: "rankSalaryName",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "学期绩效标准",
+            prop: "termPerformanceSalaryName",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "班主任",
+            prop: "doubleTeachers",
+            width: "100",
             overHidden: true
           },
           {
             label: "工资拨付标准",
             prop: "salaryWithdrawalStandard",
-            width: "120",
+            width: "100",
             overHidden: true
           },
           {
             label: "职级拨付标准",
+            prop: "rankWithdrawalStandardName",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "职级工资",
             prop: "rankWithdrawalStandard",
-            width: "120",
+            width: "100",
             overHidden: true
           },
           {
-            label: "履约奖标准",
+            label: "履约奖",
             prop: "performanceAward",
             width: "100",
             overHidden: true
           },
           {
-            label: "校龄工资标准",
+            label: "校龄工资",
             prop: "schoolAgeSalary",
-            width: "120",
+            width: "100",
             overHidden: true
           },
           {
-            label: "增资标准",
+            label: "增资",
             prop: "capitalIncrease",
-            width: "80",
+            width: "100",
             overHidden: true
           },
           {
-            label: "学历工资标准",
+            label: "学历工资",
             prop: "educationSalary",
             width: "100",
             overHidden: true
           },
           {
-            label: "职级工资",
+            label: "职级等级工资",
             prop: "rankSalary",
             width: "100",
             overHidden: true
           },
           {
-            label: "工资基数",
+            label: "工资基数工资",
             prop: "salaryBase",
             width: "100",
             overHidden: true
@@ -341,7 +412,19 @@ export default {
             overHidden: true
           },
           {
-            label: "日常考核标准",
+            label: "双休日工作量工资标准",
+            prop: "doubleCease",
+            width: "150",
+            overHidden: true
+          },
+          {
+            label: "虚拟工作量工资标准",
+            prop: "virtualWorkloadSalary",
+            width: "150",
+            overHidden: true
+          },
+          {
+            label: "日常考核工资",
             prop: "dailyAssessmentCriteria",
             width: "100",
             overHidden: true
@@ -353,30 +436,135 @@ export default {
             overHidden: true
           },
           {
+            label: "虚拟日常考核标准",
+            prop: "virtualDailyAssessmentCriteria",
+            width: "120",
+            overHidden: true
+          },
+          {
             label: "学期绩效工资",
             prop: "termPerformanceSalary",
             width: "100",
             overHidden: true
           },
           {
+            label: "领导干部补贴工资",
+            prop: "leadingCadreSubsidy",
+            width: "120",
+            overHidden: true
+          },
+          {
+            label: "领导干部考核补贴工资",
+            prop: "assessLeadingCadreSubsidy",
+            width: "150",
+            overHidden: true
+          },
+          {
+            label: "备课组长补贴",
+            prop: "prepareLessons",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "备课组长考核补贴",
+            prop: "assessPrepareLessons",
+            width: "120",
+            overHidden: true
+          },
+          {
+            label: "教研组长补贴",
+            prop: "teachingResearch",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "教研组长审核补贴",
+            prop: "assessTeachingResearch",
+            width: "120",
+            overHidden: true
+          },
+          {
+            label: "班主任补贴标准",
+            prop: "teacherSubsidy",
+            width: "120",
+            overHidden: true
+          },
+          {
+            label: "班主任考核补贴标准",
+            prop: "teacherAssessSubsidy",
+            width: "150",
+            overHidden: true
+          },
+          {
+            label: "履约奖标准",
+            prop: "performanceAwardName",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "增资标准",
+            prop: "capitalIncreaseName",
+            width: "100",
+            overHidden: true
+          },
+
+          {
+            label: "工资基数",
+            prop: "salaryBaseName",
+            width: "100",
+            overHidden: true
+          },
+
+          {
+            label: "工作量标准",
+            prop: "workloadSalaryName",
+            width: "100",
+            overHidden: true
+          },
+
+          {
+            label: "日常考核标准",
+            prop: "dailyAssessmentCriteriaName",
+            width: "100",
+            overHidden: true
+          },
+          {
             label: "领导干部补贴标准",
             prop: "leadingCadreSubsidy",
             width: "120",
             overHidden: true
           },
           {
+            label: "领导干部审核补贴标准",
+            prop: "assessLeadingCadreSubsidyName",
+            width: "150",
+            overHidden: true
+          },
+          {
             label: "备课组长标准",
             prop: "prepareLessons",
             width: "100",
             overHidden: true
           },
           {
+            label: "备课组长审核补贴标准",
+            prop: "assessPrepareLessonsName",
+            width: "150",
+            overHidden: true
+          },
+          {
             label: "教研组长标准",
             prop: "teachingResearch",
             width: "100",
             overHidden: true
           },
           {
+            label: "教研组长考核补贴标准",
+            prop: "assessTeachingResearchName",
+            width: "150",
+            overHidden: true
+          },
+          {
             label: "是否享受公办待遇",
             prop: "enjoyOfficeTreatment",
             width: "120",
@@ -417,15 +605,20 @@ export default {
   components: {
     detailsPage
   },
+  filters: {
+    Int(num) {
+      return Number(num);
+    }
+  },
   created() {
     this.option.height = window.innerHeight - 210;
   },
   methods: {
     searchCriteriaSwitch(type) {
       if (type) {
-        this.option.height = this.option.height - 92;
+        this.option.height = this.option.height - 143;
       } else {
-        this.option.height = this.option.height + 92;
+        this.option.height = this.option.height + 143;
       }
       this.$refs.crud.getTableHeight();
     },
@@ -467,7 +660,31 @@ export default {
       window.open(
         `/api/blade-client/schoolteacher/export/teacher?${
           this.website.tokenHeader
-        }=${getToken()}`
+        }=${getToken()}&inSection=${
+          this.search.inSection ? this.search.inSection : ""
+        }&department=${
+          this.search.department ? this.search.department : ""
+        }&cname=${this.search.cname ? this.search.cname : ""}&Number=${
+          this.search.Number ? this.search.Number : ""
+        }&gender=${this.search.gender ? this.search.gender : ""}&code=${
+          this.search.code ? this.search.code : ""
+        }&dateValidityStart=${
+          this.search.dateValidity&&this.search.dateValidity.length>0 ? this.search.dateValidity[0] : ""
+        }&dateValidityEnd=${
+          this.search.dateValidity&&this.search.dateValidity.length>0 ? this.search.dateValidity[1] : ""
+        }&createTimeStart=${
+          this.search.createTime&&this.search.createTime.length>0? this.search.createTime[0] : ""
+        }&createTimeEnd=${
+          this.search.createTime&&this.search.createTime.length>0 ? this.search.createTime[1] : ""
+        }&schoolAgeSalaryDateStart=${
+          this.search.schoolAgeSalaryDateSerch&&this.search.schoolAgeSalaryDateSerch.length>0
+            ? this.search.schoolAgeSalaryDateSerch[0]
+            : ''
+        }&schoolAgeSalaryDateEnd=${
+          this.search.schoolAgeSalaryDateSerch&&this.search.schoolAgeSalaryDateSerch.length>0
+            ? this.search.schoolAgeSalaryDateSerch[1]
+            : ''
+        }`
       );
     },
     newAdd() {
@@ -501,7 +718,11 @@ export default {
     },
     onLoad(page, params) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, params)
+      getList(
+        page.currentPage,
+        page.pageSize,
+        params
+      )
         .then(res => {
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;

src/views/basicData/salaryConfiguration/index.vue

@@ -274,7 +274,14 @@ export default {
     },
     onLoad(page, params) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, params)
+      this.dataList.forEach(item => {
+        this.$refs.crud.toggleRowExpansion(item, false);
+      });
+      getList(
+        page.currentPage,
+        page.pageSize,
+        params
+      )
         .then(res => {
           if (res.data.data.records) {
             res.data.data.records.forEach(e => {

src/views/exportTrade/customerInquiry/index.vue

@@ -364,12 +364,17 @@ export default {
           orderEndDate: this.search.businesDate[1]
         };
         delete params.businesDate;
+        // delete this.search.businesDate;
       }
       this.loading = true;
       this.dataList.forEach(item => {
         this.$refs.crud.toggleRowExpansion(item, false);
       });
-      getList(page.currentPage, page.pageSize, params)
+      getList(
+        page.currentPage,
+        page.pageSize,
+        params
+      )
         .then(res => {
           if (res.data.data.records) {
             res.data.data.records.forEach(e => {

src/views/exportTrade/invoice/index.vue

@@ -19,6 +19,7 @@
         :summary-method="summaryMethod"
         :cell-style="cellStyle"
         @selection-change="selectionChange"
+        @search-criteria-switch="searchCriteriaSwitch"
       >
         <template slot-scope="{ row }" slot="salesCompany">
           <span>{{ row.salesCompanyName }}</span>
@@ -169,6 +170,7 @@ export default {
     gainUser().then(res => {
       this.findObject(this.option.column, "createUser").dicData = res.data.data;
     });
+    this.option.height = window.innerHeight - 210;
   },
   activated() {
     //当页面已打开并无法重新渲染时，用activated重新激活keepalive组件
@@ -187,6 +189,14 @@ export default {
     }
   },
   methods: {
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 189;
+      } else {
+        this.option.height = this.option.height + 189;
+      }
+      this.$refs.crud.getTableHeight();
+    },
     cellStyle() {
       return "padding:0;height:40px;";
     },
@@ -284,9 +294,6 @@ export default {
         .then(res => {
           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 - 400;
-          }
         })
         .finally(() => {
           this.loading = false;

src/views/exportTrade/receipt/index.vue

@@ -19,6 +19,7 @@
         :summary-method="summaryMethod"
         :cell-style="cellStyle"
         @selection-change="selectionChange"
+        @search-criteria-switch="searchCriteriaSwitch"
       >
         <template slot="menuLeft">
           <el-button
@@ -147,6 +148,7 @@ export default {
   components: { detailPage },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(6), option);
+    this.option.height = window.innerHeight - 210;
     if (this.$route.query.pageType == "Generate") {
       this.newAdd();
     }
@@ -171,6 +173,14 @@ export default {
     }, 100);
   },
   methods: {
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 189;
+      } else {
+        this.option.height = this.option.height + 189;
+      }
+      this.$refs.crud.getTableHeight();
+    },
     cellStyle() {
       return "padding:0;height:40px;";
     },
@@ -268,9 +278,6 @@ export default {
         .then(res => {
           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 - 400;
-          }
         })
         .finally(() => {
           this.loading = false;

src/views/exportTrade/shippingInquiry/index.vue

@@ -16,6 +16,7 @@
         @saveColumn="saveColumn"
         @resetColumn="resetColumn"
         :cell-style="cellStyle"
+        @search-criteria-switch="searchCriteriaSwitch"
       >
         <template slot="menuLeft">
           <el-button type="info" size="small">报表</el-button>
@@ -126,8 +127,17 @@ export default {
     gainUser().then(res => {
       this.findObject(this.option.column, "createUser").dicData = res.data.data;
     });
+    this.option.height = window.innerHeight - 210;
   },
   methods: {
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 92;
+      } else {
+        this.option.height = this.option.height + 92;
+      }
+      this.$refs.crud.getTableHeight();
+    },
     cellStyle() {
       return "padding:0;height:40px;";
     },
@@ -186,9 +196,6 @@ export default {
       getList(page.currentPage, page.pageSize, params).then(res => {
         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 - 300;
-        }
       });
     },
     refreshChange() {

src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="borderless">
+  <div class="borderless" v-loading='allloading'>
     <div class="customer-head">
       <div class="customer-back">
         <el-button
@@ -35,6 +35,14 @@
           </el-dropdown-menu>
         </el-dropdown>
         <el-button
+          type="success"
+          :disabled="!form.id"
+          size="small"
+          @click="copyDoc"
+        >
+          复制新单
+        </el-button>
+        <el-button
           class="el-button--small-yh"
           type="primary"
           :disabled="loadingBtn || detailData.status == 1"
@@ -710,6 +718,7 @@
 import { getToken } from "@/util/auth";
 import {
   detail,
+  copyDetail,
   submit,
   delItem,
   itemAnnex,
@@ -728,6 +737,7 @@ export default {
       crudForm: {},
       excelBox: false,
       loading: false,
+      allloading:false,
       xcelLoading: false,
       loadingBtn: false,
       excelForm: {
@@ -1011,12 +1021,27 @@ export default {
         return "headerCellClass";
       }
     },
+    copyDoc() {
+      this.$emit("copyOrder", this.form.id);
+    },
     getDetail(id) {
-      detail(id).then(res => {
-        this.form = res.data.data;
-        this.getItemDetail();
-        this.getitemAnnex();
-      });
+      if (this.detailData.status == "copy") {
+        this.allloading = true;
+        copyDetail(id)
+          .then(res => {
+            this.form = res.data.data;
+            this.getItemDetail();
+          })
+          .finally(() => {
+            this.allloading = false;
+          });
+      } else {
+        detail(id).then(res => {
+          this.form = res.data.data;
+          this.getItemDetail();
+          this.getitemAnnex();
+        });
+      }
     },
     getItemDetail() {
       const data = {

src/views/salaryManagement/primarySchool/index.vue

@@ -16,9 +16,19 @@
         :table-loading="loading"
         @saveColumn="saveColumn"
         @resetColumn="resetColumn"
+        @selection-change="selectionChange"
         :cell-style="cellStyle"
         @search-criteria-switch="searchCriteriaSwitch"
       >
+        <template slot="menuLeft">
+          <el-button
+            type="success"
+            size="small"
+            @click.stop="copyDoc()"
+            :disabled="selectionList.length != 1"
+            >复制新单</el-button
+          >
+        </template>
         <template slot-scope="{ row }" slot="updateUser">
           <span>{{ row.updateUserName }}</span>
         </template>
@@ -39,6 +49,7 @@
       v-if="!isShow"
       ref="detail"
       @goBack="goBack"
+      @copyOrder="copyOrder"
       :detailData="detailData"
     ></detailPage>
   </div>
@@ -54,6 +65,7 @@ export default {
   },
   data() {
     return {
+      selectionList: [],
       form: {},
       dataList: [],
       loading: false,
@@ -74,6 +86,8 @@ export default {
         editBtn: false,
         delBtn: false,
         menuWidth: 120,
+        tip: false,
+        selection: true,
         searchIcon: true,
         searchIndex: 2,
         addBtnText: "新单",
@@ -185,6 +199,31 @@ export default {
       }
       this.$refs.crud.getTableHeight();
     },
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
+    copyDoc() {
+      this.selectionList.forEach(e => {
+        this.detailData = {
+          id: e.id,
+          status: "copy"
+        };
+        this.isShow = false;
+      });
+    },
+    copyOrder(id) {
+      this.isShow = true;
+      this.detailData = {
+        id: id,
+        status: "copy"
+      };
+      this.$nextTick(() => {
+        this.isShow = false;
+      });
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
     //点击搜索按钮触发
     searchChange(params, done) {
       this.page.currentPage = 1;
@@ -242,6 +281,7 @@ export default {
     },
     goBack() {
       this.detailData = this.$options.data().detailData;
+      this.onLoad(this.page, this.search);
       this.isShow = true;
     }
   }