修改bug

src/api/salaryManagement/primarySchool.js

@@ -56,3 +56,23 @@ export function delItem(data) {
     }
   })
 }
+// 请核
+export function pleaseCheck(data) {
+  return request({
+    url: '/api/blade-school/salary/checkOrder',
+    method: 'post',
+    data: data
+  })
+}
+//导入记录明细
+export function itemAnnex(current, size, params) {
+  return request({
+    url: '/api/blade-school/salaryaccessory/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size
+    }
+  })
+}

src/util/validate.js

@@ -30,7 +30,6 @@ export function roundNumbers(val) {
 }
 // 折扣
 export function isDiscount(val) {
-  // console.log(val)
   if(Number(val)>=0&&val){
     return Number(val) + '折'
   }else{

src/views/basicData/facultyManagement/detailsPage.vue

@@ -29,7 +29,8 @@
           class="trading-form"
           v-model="form"
           :option="option"
-        />
+        >
+        </avue-form>
       </basic-container>
       <containerTitle title="事业编考试的记录"></containerTitle>
       <basic-container>
@@ -82,7 +83,7 @@ export default {
       dataList: [],
       option: {
         menuBtn: false,
-        labelWidth: 100,
+        labelWidth: 120,
         column: [
           {
             label: "姓名",
@@ -152,7 +153,7 @@ export default {
           {
             label: "校龄开始日期",
             prop: "schoolAgeSalaryDate",
-            type: "date",
+            type: "month",
             valueFormat: "yyyy-MM-dd",
             span: 6
           },
@@ -161,7 +162,7 @@ export default {
             prop: "schoolAge",
             type: "number",
             controls: false,
-            precision:0,
+            precision: 0,
             minRows: 0,
             span: 6
           },
@@ -208,6 +209,138 @@ export default {
             span: 6
           },
           {
+            label: "工资拨付标准",
+            prop: "salaryWithdrawalStandard",
+            type: "number",
+            controls: false,
+            precision: 2,
+            span: 6
+          },
+          {
+            label: "职级拨付标准",
+            prop: "rankWithdrawalStandard",
+            type: "number",
+            controls: false,
+            precision: 2,
+            span: 6
+          },
+          {
+            label: "履约奖标准",
+            prop: "performanceAward",
+            type: "number",
+            controls: false,
+            precision: 2,
+            span: 6
+          },
+          {
+            label: "校龄工资标准",
+            prop: "schoolAgeSalary",
+            type: "number",
+            controls: false,
+            precision: 2,
+            span: 6
+          },
+          {
+            label: "增资标准",
+            prop: "capitalIncrease",
+            type: "number",
+            controls: false,
+            precision: 2,
+            span: 6
+          },
+          {
+            label: "学历工资标准",
+            prop: "educationSalary",
+            type: "number",
+            controls: false,
+            precision: 2,
+            span: 6
+          },
+          {
+            label: "职级工资",
+            prop: "rankSalary",
+            type: "number",
+            controls: false,
+            precision: 2,
+            span: 6
+          },
+          {
+            label: "工资基数",
+            prop: "salaryBase",
+            type: "number",
+            controls: false,
+            precision: 2,
+            span: 6
+          },
+          {
+            label: "工作量工资",
+            prop: "workloadSalary",
+            type: "number",
+            controls: false,
+            precision: 2,
+            span: 6
+          },
+          {
+            label: "日常考核标准",
+            prop: "dailyAssessmentCriteria",
+            type: "number",
+            controls: false,
+            precision: 2,
+            span: 6
+          },
+          {
+            label: "日常考核等级工资",
+            prop: "dailyAssessmentSalary",
+            type: "number",
+            controls: false,
+            precision: 2,
+            span: 6
+          },
+          {
+            label: "学期绩效工资",
+            prop: "termPerformanceSalary",
+            type: "number",
+            controls: false,
+            precision: 2,
+            span: 6
+          },
+          {
+            label: "领导干部补贴标准",
+            prop: "leadingCadreSubsidy",
+            type: "number",
+            controls: false,
+            precision: 2,
+            span: 6
+          },
+          {
+            label: "备课组长标准",
+            prop: "prepareLessons",
+            type: "number",
+            controls: false,
+            precision: 2,
+            span: 6
+          },
+          {
+            label: "教研组长标准",
+            prop: "teachingResearch",
+            type: "number",
+            controls: false,
+            precision: 2,
+            span: 6
+          },
+          {
+            label: "是否享受公办待遇",
+            prop: "enjoyOfficeTreatment",
+            type: "radio",
+            dataType: "string",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=TF_status",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
             label: "备注",
             prop: "remarks",
             type: "textarea",
@@ -224,6 +357,7 @@ export default {
         delBtn: false,
         border: true,
         menuWidth: 120,
+        stripe: true,
         column: [
           {
             label: "考试日期",

src/views/basicData/facultyManagement/index.vue

@@ -44,6 +44,39 @@
             删除
           </el-button>
         </template>
+        <template slot="createTimeSearch">
+          <el-date-picker
+            v-model="search.createTime"
+            type="daterange"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </template>
+        <template slot="dateValiditySearch">
+          <el-date-picker
+            v-model="search.dateValidity"
+            type="daterange"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </template>
+        <template slot="schoolAgeSalaryDateSerchSearch">
+          <el-date-picker
+            v-model="search.schoolAgeSalaryDateSerch"
+            type="daterange"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </template>
       </avue-crud>
       <el-dialog
         title="导入教职工资料"
@@ -109,109 +142,201 @@ export default {
         searchIcon: true,
         searchIndex: 2,
         addBtnText: "新单",
+        stripe: true,
         column: [
           {
             label: "姓名",
-            prop: "cname"
+            prop: "cname",
+            width: "80",
+            search: true,
+            span: 8
           },
           {
             label: "身份证",
-            prop: "idNumber"
+            prop: "idNumber",
+            width: "120"
           },
           {
             label: "性别",
-            prop: "gender"
+            prop: "gender",
+            width: "80",
+            search: true,
+            span: 8
           },
           {
             label: "学历",
-            prop: "code"
+            prop: "code",
+            width: "80",
+            search: true,
+            span: 8
           },
           {
             label: "入职日期",
-            prop: "joiningDate"
+            prop: "joiningDate",
+            width: "100"
           },
           {
-            label: "入职日期开始",
-            prop: "createTimeStart",
-            type: "date",
-            valueFormat: "yyyy-MM-dd",
+            label: "入职日期",
+            prop: "createTime",
             search: true,
             hide: true,
             showColumn: false,
             span: 8
           },
-          {
-            label: "入职日期结束",
-            prop: "createTimeEnd",
-            type: "date",
-            valueFormat: "yyyy-MM-dd",
-            search: true,
-            hide: true,
-            showColumn: false
-          },
+          // {
+          //   label: "入职日期结束",
+          //   prop: "createTimeEnd",
+          //   type: "date",
+          //   valueFormat: "yyyy-MM-dd",
+          //   search: true,
+          //   hide: true,
+          //   showColumn: false
+          // },
           {
             label: "转正日期",
-            prop: "birthdate"
-          },
-          {
-            label: "转正日期开始",
-            prop: "dateValidityStart",
-            type: "date",
-            valueFormat: "yyyy-MM-dd",
-            search: true,
-            hide: true,
-            showColumn: false,
-            span: 8
+            prop: "birthdate",
+            width: "100"
           },
           {
-            label: "转正日期结束",
-            prop: "dateValidityEnd",
-            type: "date",
-            valueFormat: "yyyy-MM-dd",
+            label: "转正日期",
+            prop: "dateValidity",
             search: true,
             hide: true,
             showColumn: false,
             span: 8
           },
+          // {
+          //   label: "转正日期结束",
+          //   prop: "dateValidityEnd",
+          //   type: "date",
+          //   valueFormat: "yyyy-MM-dd",
+          //   search: true,
+          //   hide: true,
+          //   showColumn: false,
+          //   span: 8
+          // },
           {
             label: "校龄日期",
-            prop: "schoolAgeSalaryDate"
-          },
-          {
-            label: "校龄日期开始",
-            prop: "schoolAgeSalaryDateStart",
-            type: "date",
-            valueFormat: "yyyy-MM-dd",
-            search: true,
-            hide: true,
-            showColumn: false,
-            span: 8
+            prop: "schoolAgeSalaryDate",
+            width: "100"
           },
           {
-            label: "校龄日期结束",
-            prop: "schoolAgeSalaryDateEnd",
-            type: "date",
-            valueFormat: "yyyy-MM-dd",
+            label: "校龄日期",
+            prop: "schoolAgeSalaryDateSerch",
             search: true,
             hide: true,
             showColumn: false,
             span: 8
           },
+          // {
+          //   label: "校龄日期结束",
+          //   prop: "schoolAgeSalaryDateEnd",
+          //   type: "date",
+          //   valueFormat: "yyyy-MM-dd",
+          //   search: true,
+          //   hide: true,
+          //   showColumn: false,
+          //   span: 8
+          // },
           {
             label: "校龄",
-            prop: "schoolAge"
+            prop: "schoolAge",
+            width: "80"
           },
           {
             label: "所在部门",
-            prop: "inSection"
+            prop: "inSection",
+            width: "80"
           },
           {
             label: "是否班主任",
-            prop: "doubleTeachers"
+            prop: "doubleTeachers",
+            width: "100"
           },
           {
             label: "职务",
-            prop: "compileCategory"
+            prop: "compileCategory",
+            width: "80"
+          },
+          {
+            label: "工资拨付标准",
+            prop: "salaryWithdrawalStandard",
+            width: "120"
+          },
+          {
+            label: "职级拨付标准",
+            prop: "rankWithdrawalStandard",
+            width: "120"
+          },
+          {
+            label: "履约奖标准",
+            prop: "performanceAward",
+            width: "100"
+          },
+          {
+            label: "校龄工资标准",
+            prop: "schoolAgeSalary",
+            width: "120"
+          },
+          {
+            label: "增资标准",
+            prop: "capitalIncrease",
+            width: "80"
+          },
+          {
+            label: "学历工资标准",
+            prop: "educationSalary",
+            width: "100"
+          },
+          {
+            label: "职级工资",
+            prop: "rankSalary",
+            width: "100"
+          },
+          {
+            label: "工资基数",
+            prop: "salaryBase",
+            width: "100"
+          },
+          {
+            label: "工作量工资",
+            prop: "workloadSalary",
+            width: "100"
+          },
+          {
+            label: "日常考核标准",
+            prop: "dailyAssessmentCriteria",
+            width: "100"
+          },
+          {
+            label: "日常考核等级工资",
+            prop: "dailyAssessmentSalary",
+            width: "120"
+          },
+          {
+            label: "学期绩效工资",
+            prop: "termPerformanceSalary",
+            width: "100"
+          },
+          {
+            label: "领导干部补贴标准",
+            prop: "leadingCadreSubsidy",
+            width: "120"
+          },
+          {
+            label: "备课组长标准",
+            prop: "prepareLessons",
+            width: "100"
+          },
+          {
+            label: "教研组长标准",
+            prop: "teachingResearch",
+            width: "100"
+          },
+          {
+            label: "是否享受公办待遇",
+            prop: "enjoyOfficeTreatment",
+            width: "120"
           }
         ]
       },
@@ -262,6 +387,21 @@ export default {
     //点击搜索按钮触发
     searchChange(params, done) {
       this.page.currentPage = 1;
+      if (params.dateValidity) {
+        params.dateValidityStart = params.dateValidity[0];
+        params.dateValidityEnd = params.dateValidity[1];
+      }
+      if (params.createTime) {
+        params.createTimeStart = params.createTime[0];
+        params.createTimeEnd = params.createTime[1];
+      }
+      if (params.schoolAgeSalaryDateSerch) {
+        params.schoolAgeSalaryDateStart = params.schoolAgeSalaryDateSerch[0];
+        params.schoolAgeSalaryDateEnd = params.schoolAgeSalaryDateSerch[1];
+      }
+      delete params.dateValidity;
+      delete params.createTime;
+      delete params.schoolAgeSalaryDateSerch;
       this.onLoad(this.page, params);
       done();
     },

src/views/exportTrade/customerInquiry/config/customerContact.json

@@ -37,7 +37,8 @@
       "prop": "ename",
       "index": 4,
       "width": 200,
-      "overHidden": true
+      "overHidden": true,
+      "cell": true
     },
     {
       "label": "产品属性",

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -1452,6 +1452,7 @@ export default {
                 item.itemDescription = e.cnameDescription;
                 item.itemType = this.reData.itemType;
                 item.tradeTerms = this.reData.tradeTerms;
+                item.partsDescribe = this.reData.partsDescribe;
                 item.purchaseCost = 0;
                 item.purchaseAmount = 0;
                 item.productPrice = productCal(
@@ -1538,6 +1539,7 @@ export default {
             itemMargin: 0,
             remarks: null,
             exchangeRate: this.form.exchangeRate,
+            partsDescribe: null,
             $cellEdit: true
           });
         });
@@ -1627,6 +1629,7 @@ export default {
             ),
             this.form.exchangeRate
           ),
+          partsDescribe: null,
           remarks: null,
           exchangeRate: this.form.exchangeRate,
           $cellEdit: true
@@ -1734,12 +1737,9 @@ export default {
             }
             this.data.forEach(e => {
               const ename = e.ename ? e.ename : "";
-              const itemDescription = e.itemDescription
-                ? e.itemDescription
-                : "";
+              const itemProp = e.itemProp ? e.itemProp : "";
               const partsDescribe = e.partsDescribe ? e.partsDescribe : "";
-              e.productRemark =
-                ename + "\n" + itemDescription + " " + partsDescribe;
+              e.productRemark = ename + "\n" + itemProp + " " + partsDescribe;
             });
           }
           for (let i = 0; i < orderFeesList.length; i++) {

src/views/exportTrade/salesContract/detailsPage.vue

@@ -664,7 +664,12 @@ import {
 import _ from "lodash";
 import reportDialog from "@/components/report-dialog/main";
 import partDialog from "@/components/part-dialog/main";
-import { micrometerFormat, IntegerFormat } from "@/util/validate";
+import {
+  isDiscount,
+  isPercentage,
+  micrometerFormat,
+  IntegerFormat
+} from "@/util/validate";
 import { contrastObj, contrastList } from "@/util/contrastData";
 import customerDialog from "@/components/customer-dialog/main";
 import priceLibrary from "@/components/price-Library/main";
@@ -1144,6 +1149,15 @@ export default {
     });
   },
   filters: {
+    isDiscount(val) {
+      return isDiscount(val);
+    },
+    isPercentage(val) {
+      return isPercentage(val);
+    },
+    micrometerFormat(val) {
+      return micrometerFormat(val);
+    },
     IntegerFormat(num) {
       return IntegerFormat(num);
     }
@@ -1582,6 +1596,7 @@ export default {
                 item.itemDescription = e.cnameDescription;
                 item.itemType = this.reData.itemType;
                 item.tradeTerms = this.reData.tradeTerms;
+                item.partsDescribe = this.reData.partsDescribe;
                 item.purchaseAmount = 0;
                 item.productPrice = productCal(
                   0,
@@ -1665,6 +1680,7 @@ export default {
             itemMargin: 0,
             remarks: null,
             exchangeRate: this.form.exchangeRate,
+            partsDescribe: null,
             $cellEdit: true
           });
         });
@@ -1752,6 +1768,7 @@ export default {
             ),
             this.form.exchangeRate
           ),
+          partsDescribe: null,
           remarks: null,
           exchangeRate: this.form.exchangeRate,
           $cellEdit: true
@@ -1868,12 +1885,9 @@ export default {
             }
             this.data.forEach(e => {
               const ename = e.ename ? e.ename : "";
-              const itemDescription = e.itemDescription
-                ? e.itemDescription
-                : "";
+              const itemProp = e.itemProp ? e.itemProp : "";
               const partsDescribe = e.partsDescribe ? e.partsDescribe : "";
-              e.productRemark =
-                ename + "\n" + itemDescription + " " + partsDescribe;
+              e.productRemark = ename + "\n" + itemProp + " " + partsDescribe;
             });
           }
           const orderFeesList = this.$refs.feeInfo.submitData();

src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -16,9 +16,24 @@
           size="small"
           v-if="detailData.status == 1"
           class="el-button--small-yh "
+          :disabled="form.status > 0"
           @click.stop="openEdit"
           >编辑
         </el-button>
+        <el-dropdown style="margin-right: 8px;margin-left: 8px;">
+          <el-button type="primary" size="small">
+            审核处理<i class="el-icon-arrow-down el-icon--right"></i>
+          </el-button>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item
+              :disabled="form.status > 0"
+              @click.native="pleaseCheck"
+              >请核数据</el-dropdown-item
+            >
+            <el-dropdown-item disabled>审核进度</el-dropdown-item>
+            <el-dropdown-item disabled>撤销请核</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
         <el-button
           class="el-button--small-yh"
           type="primary"
@@ -470,6 +485,18 @@
               @change="salaryAdd(crudForm)"
             />
           </template>
+
+          <template
+            slot="customWorkloadSalaryForm"
+            slot-scope="{ column, disabled }"
+          >
+            <el-input
+              :disabled="disabled"
+              :placeholder="'请输入 ' + column.label"
+              v-model="crudForm.customWorkloadSalary"
+              @change="salaryAdd(crudForm)"
+            />
+          </template>
           <template slot="workloadSalaryForm" slot-scope="{ column, disabled }">
             <el-input
               :disabled="disabled"
@@ -636,6 +663,30 @@
           </p>
         </el-dialog>
       </basic-container>
+      <containerTitle title="导入附件记录"></containerTitle>
+      <basic-container>
+        <avue-crud
+          :data="annexData"
+          :option="annexOption"
+          :page.sync="annexPage"
+          :table-loading="annexLoading"
+          @current-change="currentannexChange"
+          @size-change="sizeannexChange"
+          @saveColumn="saveannexColumn"
+          @refresh-change="refreshannexChange"
+          :cell-style="cellStyle"
+        >
+          <template slot-scope="{ row, index }" slot="menu">
+            <el-button
+              type="text"
+              size="small"
+              @click.stop="rowDownload(row, index)"
+            >
+              下载
+            </el-button>
+          </template>
+        </avue-crud>
+      </basic-container>
     </div>
   </div>
 </template>
@@ -646,7 +697,9 @@ import {
   detail,
   submit,
   delItem,
-  itemDetail
+  itemAnnex,
+  itemDetail,
+  pleaseCheck
 } from "@/api/salaryManagement/primarySchool";
 import { numCal } from "@/util/calculate";
 import { optionList } from "./js/optionList";
@@ -654,6 +707,7 @@ export default {
   name: "detailsPage",
   data() {
     return {
+      annexLoading: false,
       crudForm: {},
       excelBox: false,
       loading: false,
@@ -740,7 +794,7 @@ export default {
                 trigger: "blur"
               }
             ],
-            span: 4,
+            span: 6,
             change: ({ value }) => {
               if (value) {
                 this.optionList.column.forEach(e => {
@@ -764,7 +818,7 @@ export default {
               label: "dictValue",
               value: "dictKey"
             },
-            span: 4,
+            span: 6,
             rules: [
               {
                 required: true,
@@ -791,20 +845,110 @@ export default {
           {
             label: "人数",
             prop: "personNumber",
-            span: 4,
+            span: 6,
+            disabled: true
+          },
+          {
+            label: "状态",
+            prop: "status",
+            type: "select",
+            span: 6,
+            props: {
+              label: "name",
+              value: "code"
+            },
+            dicData: [
+              {
+                name: "录入",
+                code: 0
+              },
+              {
+                name: "申请审批",
+                code: 1
+              },
+              {
+                name: "审批中",
+                code: 2
+              },
+              {
+                name: "审批通过",
+                code: 3
+              }
+            ],
             disabled: true
           },
           {
             label: "备注",
             prop: "remarks",
             type: "textarea",
-            span: 12,
+            span: 24,
             minRows: 2
           }
         ]
       },
       optionList: optionList,
-      exportUrl: "/api/blade-school/salaryitem/export/template"
+      exportUrl: "/api/blade-school/salaryitem/export/template",
+      annexData: [],
+      annexOption: {
+        align: "center",
+        menuAlign: "center",
+        addBtn: false,
+        border: true,
+        index: true,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        stripe: true,
+        menuWidth: 100,
+        column: [
+          {
+            label: "文件类型",
+            prop: "fileType",
+            overHidden: true
+          },
+          {
+            label: "文件名",
+            prop: "cname",
+            overHidden: true
+          },
+          {
+            label: "创建时间",
+            prop: "createTime",
+            overHidden: true
+          },
+          {
+            label: "创建人",
+            prop: "createName",
+            overHidden: true
+          },
+          {
+            label: "备注",
+            prop: "remarks",
+            overHidden: true
+          }
+        ]
+      },
+      annexPage: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [
+          10,
+          20,
+          30,
+          40,
+          50,
+          100,
+          150,
+          200,
+          250,
+          300,
+          350,
+          400,
+          450,
+          500
+        ]
+      }
     };
   },
   props: {
@@ -819,7 +963,7 @@ export default {
     if (this.detailData.status == 1) {
       this.option.disabled = true;
     }
-    this.optionList.height = window.innerHeight - 400;
+    this.optionList.height = window.innerHeight - 500;
   },
   methods: {
     cellStyle() {
@@ -850,6 +994,7 @@ export default {
       detail(id).then(res => {
         this.form = res.data.data;
         this.getItemDetail();
+        this.getitemAnnex();
       });
     },
     getItemDetail() {
@@ -867,6 +1012,20 @@ export default {
           this.loading = false;
         });
     },
+    getitemAnnex() {
+      const data = {
+        pid: this.form.id
+      };
+      this.annexLoading = true;
+      itemAnnex(this.annexPage.currentPage, this.annexPage.pageSize, data)
+        .then(res => {
+          this.annexData = res.data.data.records;
+          this.annexPage.total = res.data.data.total;
+        })
+        .finally(() => {
+          this.annexLoading = false;
+        });
+    },
     rowSave(row, done, loading) {
       if (!row.cname) {
         loading();
@@ -961,6 +1120,9 @@ export default {
         }
       });
     },
+    rowDownload(row) {
+      window.open(`${row.url}?${this.website.tokenHeader}=${getToken()}`);
+    },
     searchChange(params, done) {
       this.getItemDetail();
       done();
@@ -977,10 +1139,23 @@ export default {
     refreshChange() {
       this.getItemDetail();
     },
+    currentannexChange(val) {
+      this.annexPage.currentPage = val;
+      this.getitemAnnex();
+    },
+    sizeannexChange(val) {
+      this.annexPage.currentPage = 1;
+      this.annexPage.pageSize = val;
+      this.getitemAnnex();
+    },
+    refreshannexChange() {
+      this.getitemAnnex();
+    },
     uploadAfter(res, done, loading, column) {
       this.excelBox = false;
       // this.$message.success("导入成功！");
       this.getItemDetail();
+      this.getitemAnnex();
       done();
     },
     //修改提交触发
@@ -1078,7 +1253,9 @@ export default {
         numCal(row.performanceAward);
       // 2. 工作量工资 = V51(工作量工资)+Y51(暑假pad课课时费)
       row.workloadSalary =
-        numCal(row.momthWorkloadSalary) + numCal(row.vacationOvertimePay);
+        numCal(row.momthWorkloadSalary) +
+        numCal(row.vacationOvertimePay) +
+        numCal(row.customWorkloadSalary);
       // 3. 奖励工资 = AD46(突出贡献奖) 无 +AE46(教学成绩优胜奖)+AF46(教学成绩进步奖) 无 +AG46(荣誉奖) 无 +AH46(领导干部奖励奖)+AI46(下学期教学成绩奖) 下学期绩效 +AJ46(中考奖励) 无
       row.awardSalary =
         numCal(row.winningPrize) +
@@ -1220,6 +1397,30 @@ export default {
         }
       });
     },
+    // 请核
+    pleaseCheck() {
+      this.$confirm("您确定提交此次申请吗？", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        const data = {
+          id: this.form.id,
+          checkType: "xsgz",
+          url: "/salaryManagement/primarySchool/index",
+          pageStatus: "this.$store.getters.domSaleStatus",
+          pageLabel: "小学部",
+          checkFlag: 2
+        };
+        pleaseCheck(data).then(res => {
+          this.$message.success("请核成功");
+          if (this.detailData.status == 1) {
+            this.option.disabled = true;
+          }
+          this.getDetail(this.form.id);
+        });
+      });
+    },
     //返回列表
     backToList() {
       if (this.form.id) {
@@ -1438,6 +1639,55 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
+          case "24":
+            this.exportUrl = "/api/blade-school/salaryitem/export/leadExcel";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/leadExcel";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
+          case "25":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/teamLeaderExcel";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/teamLeaderExcel";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
+          case "26":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/prepareLessonsExcel";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/prepareLessonsExcel";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
+          case "27":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/eomNumberExcel";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/eomNumberExcel";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
+          case "28":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/teachingExcel";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/teachingExcel";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
           default:
             this.findObject(
               this.excelOption.column,
@@ -1461,7 +1711,7 @@ export default {
 </style>
 <style lang="scss" scoped>
 .trading-form ::v-deep .el-form-item {
-  margin-bottom: 0px !important;
+  margin-bottom: 4px !important;
 }
 ::v-deep .el-form-item__error {
   display: none !important;

src/views/salaryManagement/primarySchool/index.vue

@@ -76,7 +76,7 @@ export default {
         searchIcon: true,
         searchIndex: 2,
         addBtnText: "新单",
-        stripe:true,
+        stripe: true,
         column: [
           {
             label: "年",
@@ -136,6 +136,33 @@ export default {
             width: 200
           },
           {
+            label: "状态",
+            prop: "status",
+            type: "select",
+            props: {
+              label: "name",
+              value: "code"
+            },
+            dicData: [
+              {
+                name: "录入",
+                code: 0
+              },
+              {
+                name: "申请审批",
+                code: 1
+              },
+              {
+                name: "审批中",
+                code: 2
+              },
+              {
+                name: "审批通过",
+                code: 3
+              }
+            ]
+          },
+          {
             label: "备注",
             prop: "remarks",
             overHidden: true,

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

@@ -36,7 +36,7 @@ export const optionList = {
   // refreshBtn: false,
   menuWidth: 100,
   // labelWidth:250,
-  stripe:true,
+  stripe: true,
   dialogFullscreen: true,
   column: [{
       label: "学科",
@@ -339,6 +339,17 @@ export const optionList = {
       span: 4
     },
     {
+      label: "自定义工作量工资",
+      prop: "customWorkloadSalary",
+      width: 100,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "工作量工资",
       prop: "workloadSalary",
       width: 100,