Browse Source

Merge remote-tracking branch 'origin/dev' into dev

lichao 3 years ago
parent
commit
5dc5e6f63a

+ 8 - 0
src/api/basicData/facultyManagement.js

@@ -54,4 +54,12 @@ export function calculate(id) {
       id:id
     }
   })
+}
+//重新计算
+export function allcalculate(data) {
+  return request({
+    url: '/api/blade-client/schoolteacher/calculateList',
+    method: 'post',
+    data:data
+  })
 }

+ 8 - 0
src/api/salaryManagement/primarySchool.js

@@ -90,3 +90,11 @@ export const calculate = (data) => {
     data: data
   })
 }
+//重新导入工资标准
+export const calculate2 = (query) => {
+  return request({
+    url: '/api/blade-school/salaryitem/criterion',
+    method: 'get',
+    params:query
+  })
+}

+ 17 - 4
src/components/crop-select/main.vue

@@ -171,8 +171,17 @@ export default {
     event: "balabala"
   },
   async created() {
-    console.log(this.gysType,this.corpType,this.gysType=='CK'&&this.corpType=='GYS')
-    this.tableOption = await this.getColumnData(this.getColumnName(51), this.gysType=='CK'&&this.corpType=='GYS'?option2:option);
+    if (this.gysType == "CK" && this.corpType == "GYS") {
+      this.tableOption = await this.getColumnData(
+        this.getColumnName(99),
+        option2
+      );
+    } else {
+      this.tableOption = await this.getColumnData(
+        this.getColumnName(51),
+        option
+      );
+    }
     let userObj = JSON.parse(localStorage.getItem("saber-userInfo")).content;
     this.title = getCustomerName(this.corpType);
     allCropList({
@@ -298,8 +307,12 @@ export default {
       }
     },
     async resetColumn() {
-      this.option = this.gysType=='CK'&&this.corpType=='GYS'?option2:option;
-      const inSave = await this.delColumnData(this.getColumnName(51), this.gysType=='CK'&&this.corpType=='GYS'?option2:option);
+      this.option =
+        this.gysType == "CK" && this.corpType == "GYS" ? option2 : option;
+      const inSave = await this.delColumnData(
+        this.getColumnName(51),
+        this.gysType == "CK" && this.corpType == "GYS" ? option2 : option
+      );
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;

+ 193 - 167
src/components/fee-info/main.vue

@@ -14,7 +14,7 @@
       >
         <template slot="menuLeft">
           <el-tabs v-model="activeName" @tab-click="tabHandle">
-            <el-tab-pane label="应收"  name="first" :key="'first'">
+            <el-tab-pane label="应收" name="first" :key="'first'">
             </el-tab-pane>
             <el-tab-pane label="应付" name="second" :key="'second'">
             </el-tab-pane>
@@ -33,17 +33,23 @@
             size="small"
             @click.stop="billingDetails('收费')"
             :loading="buttonLoading"
-            :disabled="(financeDisabled && disabled) || selectionList.length == 0"
+            :disabled="
+              (financeDisabled && disabled) || selectionList.length == 0
+            "
             v-if="selectTab === 1"
-          >生成账单</el-button>
+            >生成账单</el-button
+          >
           <el-button
             type="warning"
             size="small"
             @click.stop="billingDetails('申请')"
             :loading="buttonLoading"
-            :disabled="(financeDisabled && disabled) || selectionList.length == 0"
+            :disabled="
+              (financeDisabled && disabled) || selectionList.length == 0
+            "
             v-if="selectTab === 2"
-          >申请付费</el-button>
+            >申请付费</el-button
+          >
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button
@@ -64,7 +70,7 @@
           >
         </template>
         <template slot="corpId" slot-scope="{ row, index }">
-          <span v-if="row.$cellEdit" class="required_fields">*</span>
+          <span v-if="row.$cellEdit&&!inCropId" class="required_fields">*</span>
           <crop-select
             ref="corp"
             style="width: 90% !important;display: inline-block"
@@ -76,12 +82,12 @@
           ></crop-select>
           <span v-else>{{ row.corpName }}</span>
         </template>
-        <template slot="feeName" slot-scope="{ row}">
+        <template slot="feeName" slot-scope="{ row }">
           <span v-if="row.$cellEdit" class="required_fields">*</span>
           <breakdown-select
             v-if="row.$cellEdit"
             v-model="row.itemId"
-            @selectValue="(value) => selectValue(value,row)"
+            @selectValue="value => selectValue(value, row)"
             :configuration="breakConfiguration"
           >
           </breakdown-select>
@@ -98,7 +104,7 @@
             clearable
           >
             <el-option
-              v-for="(item,index) in billNoList"
+              v-for="(item, index) in billNoList"
               :key="index"
               :label="item"
               :value="item"
@@ -249,7 +255,10 @@ import { isPercentage, micrometerFormat, IntegerFormat } from "@/util/validate";
 import cropDialog from "@/components/crop-dialog/main";
 import _ from "lodash";
 import ApplyPayment from "../finance/applyPayment";
-import {applyLoan,paymentApply} from "@/api/financialManagement/paymentRequest";
+import {
+  applyLoan,
+  paymentApply
+} from "@/api/financialManagement/paymentRequest";
 import { contrastList } from "@/util/contrastData";
 import { allCropList } from "@/api/basicData/customerInformation";
 import { getCustomerCode, getCustomerName } from "@/enums/management-type";
@@ -261,7 +270,7 @@ export default {
       option: option,
       feeOption: {},
       feeDialog: false,
-      buttonLoading:false,
+      buttonLoading: false,
       treeOption: {
         nodeKey: "id",
         lazy: true,
@@ -302,26 +311,26 @@ export default {
       selectionList: [],
       reData: null,
       currencyList: [],
-      unitList:[],
-      breakConfiguration:{
-        multipleChoices:false,
-        multiple:false,
-        disabled:false,
-        searchShow:true,
-        collapseTags:false,
-        clearable:true,
-        placeholder:'请点击右边按钮选择',
-        dicData:[]
+      unitList: [],
+      breakConfiguration: {
+        multipleChoices: false,
+        multiple: false,
+        disabled: false,
+        searchShow: true,
+        collapseTags: false,
+        clearable: true,
+        placeholder: "请点击右边按钮选择",
+        dicData: []
       },
-      allData:[],
-      data_one:[],
-      data_two:[],
-      selectTab:1,
-      activeName:"first",
-      enableName:"first",
-      tab1:true,
-      tab2:false,
-      corpList: [],
+      allData: [],
+      data_one: [],
+      data_two: [],
+      selectTab: 1,
+      activeName: "first",
+      enableName: "first",
+      tab1: true,
+      tab2: false,
+      corpList: []
     };
   },
   props: {
@@ -337,7 +346,7 @@ export default {
     billUrl: {
       type: String
     },
-    optionType:{
+    optionType: {
       type: String
     },
     itemType: {
@@ -345,18 +354,22 @@ export default {
     },
     srcType: {
       type: Number,
-      default: 2,
+      default: 2
     },
     corpId: {
       type: String
     },
-    billNoList:{
-      type:Array
+    billNoList: {
+      type: Array
     },
     financeDisabled: {
       type: Boolean,
       default: true
     },
+    inCropId: {
+      type: Boolean,
+      default: false
+    }
   },
   filters: {
     isPercentage(val) {
@@ -370,26 +383,26 @@ export default {
     },
     IntegerFormat(num) {
       return IntegerFormat(num);
-    },
+    }
   },
   async created() {
     this.feeOption = await this.getColumnData(
       this.getColumnName(33),
       feeOption
     );
-    if(this.$store.getters.userInfo.tenant_id === '888390'){
-      this.feeOption.column.forEach(item =>{
-        if(item.prop === 'billNo'){
-          item.hide = false
+    if (this.$store.getters.userInfo.tenant_id === "888390") {
+      this.feeOption.column.forEach(item => {
+        if (item.prop === "billNo") {
+          item.hide = false;
         }
-      })
+      });
     }
     this.getWorkDicts("currency").then(res => {
       this.currencyList = res.data.data;
     });
-    this.getWorkDicts("unit").then(res =>{
-      this.unitList = res.data.data
-    })
+    this.getWorkDicts("unit").then(res => {
+      this.unitList = res.data.data;
+    });
     allCropList({
       corpType: getCustomerCode("KG")
     }).then(res => {
@@ -401,46 +414,46 @@ export default {
     ApplyPayment
   },
   watch: {
-    'orderFeesList'(newVla,oldVal){
-      if(newVla !==  oldVal){
-        this.allData = newVla
-        this.data_one = newVla.filter(item => item.feesType === 1)  //应收
-        this.data_two = newVla.filter(item => item.feesType === 2)  //应付
+    orderFeesList(newVla, oldVal) {
+      if (newVla !== oldVal) {
+        this.allData = newVla;
+        this.data_one = newVla.filter(item => item.feesType === 1); //应收
+        this.data_two = newVla.filter(item => item.feesType === 2); //应付
         if (this.selectTab === 1) {
-          this.feeData = this.data_one
+          this.feeData = this.data_one;
         } else {
-          this.feeData = this.data_two
+          this.feeData = this.data_two;
         }
       }
     },
-    'activeName'(newVla,oldVal){
-      if(newVla !== oldVal){
-        if(newVla === "first"){
+    activeName(newVla, oldVal) {
+      if (newVla !== oldVal) {
+        if (newVla === "first") {
           this.tab1 = true;
           this.tab2 = false;
 
-          this.data_two = this.feeData
+          this.data_two = this.feeData;
 
-          this.selectTab = 1
-          this.feeData = this.data_one
-        }else{
+          this.selectTab = 1;
+          this.feeData = this.data_one;
+        } else {
           this.tab1 = false;
           this.tab2 = true;
 
-          this.data_one = this.feeData
+          this.data_one = this.feeData;
 
-          this.selectTab = 2
-          this.feeData = this.data_two
+          this.selectTab = 2;
+          this.feeData = this.data_two;
         }
       }
-    },
+    }
   },
   methods: {
     //选择费用
-    selectValue(value,row){
-      this.$set(row,"feeName",value.cname)
-      this.$set(row,"ename",value.ename)
-      this.currencyChange(row)
+    selectValue(value, row) {
+      this.$set(row, "feeName", value.cname);
+      this.$set(row, "ename", value.ename);
+      this.currencyChange(row);
     },
     //选择应收应付
     // handleClick(tab){
@@ -470,26 +483,26 @@ export default {
         itemId: null,
         corpId: row.id,
         corpName: row.name,
-        ename:null,
+        ename: null,
         feeName: null,
         price: null,
         unit: null,
         quantity: null,
         amount: null,
-        currency:'CNY',
+        currency: "CNY",
         exchangeRate: 1,
         remarks: null,
         $cellEdit: true,
-        feesType:this.selectTab
+        feesType: this.selectTab
       });
     },
     //带出汇率
-    currencyChange(row){
-      this.currencyList.forEach(item =>{
-        if(item.dictValue === row.currency){
-          this.$set(row,"exchangeRate",item.remark)
+    currencyChange(row) {
+      this.currencyList.forEach(item => {
+        if (item.dictValue === row.currency) {
+          this.$set(row, "exchangeRate", item.remark);
         }
-      })
+      });
     },
     rowDel(row, index) {
       this.$confirm("确定删除数据?", {
@@ -516,7 +529,7 @@ export default {
       });
     },
     getCorpData(row) {
-      console.log(row)
+      console.log(row);
       this.feeData[row.index].corpName = row.cname;
     },
     countChange(row) {
@@ -565,17 +578,24 @@ export default {
     },
     //新增
     rowAdd() {
-      if (!this.corpId) return this.$message.error('请选择往来单位')
-      if(this.$store.getters.userInfo.tenant_id === '888390'){
-        this.$emit("getBillNo")
-      }
-      let corpName = this.corpList.find(item => this.corpId == item.id).cname
-      const params = {
-        feesType:this.selectTab,
-        corpId: this.corpId,
-        corpName: corpName
+      if (this.inCropId) {
+        const params = {
+          feesType: this.selectTab
+        };
+        this.$refs.feeCrud.rowCellAdd(params);
+      } else {
+        if (!this.corpId) return this.$message.error("请选择往来单位");
+        if (this.$store.getters.userInfo.tenant_id === "888390") {
+          this.$emit("getBillNo");
+        }
+        let corpName = this.corpList.find(item => this.corpId == item.id).cname;
+        const params = {
+          feesType: this.selectTab,
+          corpId: this.corpId,
+          corpName: corpName
+        };
+        this.$refs.feeCrud.rowCellAdd(params);
       }
-      this.$refs.feeCrud.rowCellAdd(params);
     },
     onLoad(page) {
       this.loading = true;
@@ -646,110 +666,116 @@ export default {
             quantity: 0,
             amount: 0,
             remarks: null,
-            $cellEdit: true,
+            $cellEdit: true
           });
         });
       }
       this.feeDialog = false;
     },
     submitData() {
-      let list = []
+      let list = [];
       //保存时  将所出的tab页数据赋值到相应 data上
-      if(this.selectTab === 1){
-        this.data_one =  this.feeData
-      }else{
-        this.data_two =  this.feeData
+      if (this.selectTab === 1) {
+        this.data_one = this.feeData;
+      } else {
+        this.data_two = this.feeData;
       }
-      list.push(...this.data_one,...this.data_two)
-      return list
+      list.push(...this.data_one, ...this.data_two);
+      return list;
     },
 
-    billingDetails(type){
+    billingDetails(type) {
       //查看是否改动过数据
-      this.$emit("beforeFinance",this.submitData(),(params)=>{
-        if(params.valid){
-          for(let i=0;i<this.selectionList.length;i++){
-            if(this.selectionList[i].corpId != this.selectionList[0].corpId){
-              return this.$message.error('批量操作结算单位必须一致')
+      this.$emit("beforeFinance", this.submitData(), params => {
+        if (params.valid) {
+          for (let i = 0; i < this.selectionList.length; i++) {
+            if (this.selectionList[i].corpId != this.selectionList[0].corpId) {
+              return this.$message.error("批量操作结算单位必须一致");
             }
-            if(this.selectionList[i].isCheck == 1){
-              return this.$message.error("选中的数据已"+type+",请勿重复操作!")
+            if (this.selectionList[i].isCheck == 1) {
+              return this.$message.error(
+                "选中的数据已" + type + ",请勿重复操作!"
+              );
             }
           }
 
-          this.selectionList.map(item =>{
+          this.selectionList.map(item => {
             // item.url = this.billUrl
-            item.srcOrderno = params.srcOrderno
-            item.srcParentId = params.parentId
-            item.corpsName = item.corpName
-            item.srcFeesId = item.id
-            item.costType = item.itemId
-            item.itemType = this.itemType
-            item.optionType = this.optionType
-            item.srcType = this.srcType   //费用明细申请
-            item.tradeType = this.optionType
-          })
+            item.srcOrderno = params.srcOrderno;
+            item.srcParentId = params.parentId;
+            item.corpsName = item.corpName;
+            item.srcFeesId = item.id;
+            item.costType = item.itemId;
+            item.itemType = this.itemType;
+            item.optionType = this.optionType;
+            item.srcType = this.srcType; //费用明细申请
+            item.tradeType = this.optionType;
+          });
           let data = {
             billType: type,
-            itemsList : this.selectionList,
-          }
-          if(type === '申请'){
+            itemsList: this.selectionList
+          };
+          if (type === "申请") {
             this.$confirm("您确定申请付费吗?", "提示", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",
-              type: "warning",
-            }).then(()=>{
-              this.buttonLoading = true
+              type: "warning"
+            }).then(() => {
+              this.buttonLoading = true;
 
-              data.checkType = 'ffsq'
-              data.url = '/financialManagement/paymentRequest/index'
-              data.pageStatus = 'this.$store.getters.pqStatus'
-              data.pageLabel = '付费申请'
+              data.checkType = "ffsq";
+              data.url = "/financialManagement/paymentRequest/index";
+              data.pageStatus = "this.$store.getters.pqStatus";
+              data.pageLabel = "付费申请";
 
-              applyLoan(data).then(res=>{
-                if(res.data.success){
-                  this.$message.success("操作成功!")
-                  this.$emit("afterFinance")
-                  //跳转付费申请页面
-                  // if(this.$store.getters.pqStatus){
-                  //   this.$alert("无法自动跳转,因为付费申请页面已存在!", "温馨提示", {
-                  //     confirmButtonText: "确定",
-                  //     type: 'warning',
-                  //     callback: action => {
-                  //     }
-                  //   });
-                  // }else{
-                  //   //关闭一下存在的列表页  跳转
-                  //   this.$router.$avueRouter.closeTag('/financialManagement/paymentRequest/index');
-                  //   this.$router.push({
-                  //     path: "/financialManagement/paymentRequest/index",
-                  //     query: {params: res.data.data.id},
-                  //   });
-                  // }
-                }
-              }).finally(()=>{
-                this.buttonLoading = false
-              })
-            })
-          }else{
+              applyLoan(data)
+                .then(res => {
+                  if (res.data.success) {
+                    this.$message.success("操作成功!");
+                    this.$emit("afterFinance");
+                    //跳转付费申请页面
+                    // if(this.$store.getters.pqStatus){
+                    //   this.$alert("无法自动跳转,因为付费申请页面已存在!", "温馨提示", {
+                    //     confirmButtonText: "确定",
+                    //     type: 'warning',
+                    //     callback: action => {
+                    //     }
+                    //   });
+                    // }else{
+                    //   //关闭一下存在的列表页  跳转
+                    //   this.$router.$avueRouter.closeTag('/financialManagement/paymentRequest/index');
+                    //   this.$router.push({
+                    //     path: "/financialManagement/paymentRequest/index",
+                    //     query: {params: res.data.data.id},
+                    //   });
+                    // }
+                  }
+                })
+                .finally(() => {
+                  this.buttonLoading = false;
+                });
+            });
+          } else {
             this.$confirm("您确定生成账单吗?", "提示", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",
-              type: "warning",
-            }).then(()=>{
-              this.buttonLoading = true
-              paymentApply(data).then(res=>{
-                if(res.data.success){
-                  this.$message.success("操作成功!")
-                  this.$emit("afterFinance")
-                }
-              }).finally(()=>{
-                this.buttonLoading = false
-              })
-            })
+              type: "warning"
+            }).then(() => {
+              this.buttonLoading = true;
+              paymentApply(data)
+                .then(res => {
+                  if (res.data.success) {
+                    this.$message.success("操作成功!");
+                    this.$emit("afterFinance");
+                  }
+                })
+                .finally(() => {
+                  this.buttonLoading = false;
+                });
+            });
           }
         }
-      })
+      });
     },
     summaryMethod({ columns, data }) {
       const sums = [];
@@ -802,15 +828,15 @@ export default {
     tabHandle(data) {
       // if (data.name == this.enableName) return
       // this.enableName = data.name
-    },
-  },
+    }
+  }
 };
 </script>
 
 <style lang="scss" scoped>
-  .required_fields{
-    color: #F56C6C;
-    display:inline-block;
-    width: 7%
-  }
+.required_fields {
+  color: #f56c6c;
+  display: inline-block;
+  width: 7%;
+}
 </style>

+ 16 - 2
src/enums/column-name.js

@@ -348,13 +348,27 @@ const columnName = [{
   {
     code: 95,
     name: '事务入库商品明细'
-  },{
+  },
+  {
     code: 96,
     name: '事务入库商品弹窗'
-  },{
+  },
+  {
     code: 97,
     name: '事务入库列表'
   },
+  {
+    code: 98,
+    name: '客户下拉'
+  },
+  {
+    code: 99,
+    name: '供应商下拉'
+  },
+  {
+    code: 100,
+    name: '公司下拉'
+  },
 ]
 export const getColumnName = (key) => {
   for (let index = 0; index < columnName.length; index++) {

+ 27 - 2
src/views/basicData/facultyManagement/index.vue

@@ -41,6 +41,14 @@
             >导出
           </el-button>
           <el-button
+            type="info"
+            size="small"
+            icon="el-icon-refresh-right"
+            @click.stop="calculate()"
+            :disabled="selectionList.length == 0"
+            >重新计算
+          </el-button>
+          <el-button
             type="success"
             size="small"
             @click.stop="copyDoc()"
@@ -133,7 +141,7 @@
 <script>
 import detailsPage from "./detailsPage";
 import { getToken } from "@/util/auth";
-import { getList, remove } from "@/api/basicData/facultyManagement";
+import { getList, remove,allcalculate } from "@/api/basicData/facultyManagement";
 export default {
   name: "index",
   data() {
@@ -648,7 +656,7 @@ export default {
         params.schoolAgeSalaryDateStart = params.schoolAgeSalaryDateSerch[0];
         params.schoolAgeSalaryDateEnd = params.schoolAgeSalaryDateSerch[1];
       }
-      this.search=this.deepClone(params)
+      this.search = this.deepClone(params);
       delete params.dateValidity;
       delete params.createTime;
       delete params.schoolAgeSalaryDateSerch;
@@ -699,6 +707,23 @@ export default {
         }`
       );
     },
+    calculate() {
+      const ids=[]
+      this.selectionList.forEach(e=>{
+        ids.push(e.id)
+      })
+      this.loading = true;
+      allcalculate({idList:ids})
+        .then(res => {
+          if (res.data.code == "200") {
+            this.$message.success('计算成功')
+            this.onLoad(this.page, this.search);
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
     newAdd() {
       this.show = false;
     },

+ 13 - 4
src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -242,7 +242,7 @@
               size="small"
               @click.stop="newDetails"
               :disabled="detailData.status == 1"
-              >录入明细</el-button
+              >批量录入</el-button
             >
             <el-button
               type="primary"
@@ -377,7 +377,7 @@
               :false-label="0"
             />
           </template>
-          <template slot="corpId" slot-scope="{row}">
+          <template slot="corpId" slot-scope="{ row }">
             <span>{{ row.corpName }}</span>
           </template>
           <template slot="purchaseCost" slot-scope="{ row }">
@@ -477,7 +477,7 @@
         optionType="CK"
         itemType="报价"
         @beforeFinance="beforeFinance"
-        :corpId="form.corpId"
+        :inCropId="true"
       />
       <containerTitle title="合同附件"></containerTitle>
       <c-upload
@@ -970,11 +970,11 @@ export default {
       this.getColumnName(1),
       tableOption
     );
+    // console.log(JSON.stringify('(<el-button type="primary" icon="el-icon-circle-plus" circle size="small" onClick={() => this.$refs.crudBox.rowCellAdd()}></el-button>)'))
     this.goodsOption = await this.getColumnData(
       this.getColumnName(26),
       goodsOption
     );
-
     if (this.detailData.status == 1) {
       this.option.disabled = true;
     }
@@ -1039,6 +1039,9 @@ export default {
     }
   },
   methods: {
+    text() {
+      console.log("111");
+    },
     cellStyle() {
       return "padding:0;height:40px;";
     },
@@ -1689,6 +1692,12 @@ export default {
       }
       this.dialogVisible = !this.dialogVisible;
     },
+    rowAdd() {
+      if (!this.form.corpId) {
+        return this.$message.error("请选择客户名称");
+      }
+      this.data.push({ $cellEdit: true });
+    },
     getDetail(id) {
       this.loading = true;
       this.showBut = false;

+ 0 - 1
src/views/exportTrade/invoice/config/customerContact.json

@@ -2,7 +2,6 @@
   "searchShow": true,
   "searchMenuSpan": 6,
   "border": true,
-  "index": true,
   "viewBtn": false,
   "editBtn": false,
   "addBtn": false,

+ 1 - 1
src/views/exportTrade/invoice/detailsPage.vue

@@ -97,7 +97,7 @@
               size="small"
               @click.stop="newDetails"
               :disabled="detailData.status == 1"
-              >录入明细</el-button
+              >批量录入</el-button
             >
             <el-button
               type="info"

+ 10 - 2
src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -183,8 +183,16 @@
               :false-label="0"
             />
           </template>
-          <template slot="corpId" slot-scope="{row}">
-            <span>{{ row.corpName }}</span>
+          <template slot="corpId" slot-scope="{ row, index }">
+            <crop-select
+              v-show="row.$cellEdit"
+              v-model="row.corpId"
+              :cropIndex="index"
+              @getCorpData="rowCorpData"
+              gysType="CK"
+              corpType="GYS"
+            ></crop-select>
+            <span v-show="!row.$cellEdit">{{ row.corpName }}</span>
           </template>
           <template slot="purchaseAmount" slot-scope="{ row }">
             <span>{{ row.purchaseAmount | micrometerFormat }}</span>

+ 47 - 16
src/views/salaryManagement/highSchool/detailsPage.vue

@@ -97,10 +97,7 @@
               :disabled="detailData.status == 1"
               >导入
             </el-button>
-            <el-button
-              type="primary"
-              size="small"
-              @click.stop="openExport()"
+            <el-button type="primary" size="small" @click.stop="openExport()"
               >导出
             </el-button>
             <el-button
@@ -111,6 +108,13 @@
               >重新计算
             </el-button>
             <el-button
+              type="primary"
+              size="small"
+              @click.stop="calculate2()"
+              :disabled="detailData.status == 1"
+              >导入工资标准
+            </el-button>
+            <el-button
               type="info"
               icon="el-icon-printer"
               size="small"
@@ -952,7 +956,8 @@ import {
   itemAnnex,
   itemDetail,
   pleaseCheck,
-  calculate
+  calculate,
+  calculate2
 } from "@/api/salaryManagement/primarySchool";
 import { numCal } from "@/util/calculate";
 import { optionList, auditOption } from "./js/optionList";
@@ -1276,17 +1281,28 @@ export default {
         column.property == "doubleCease" ||
         column.property == "dailyAssessmentCriteria" ||
         column.property == "virtualDailyAssessmentCriteria" ||
-        column.property == "termPerformanceSalaryName"||
-        column.property == "salaryWithdrawalStandard"||
-        column.property == "rankWithdrawalStandard"||
-        column.property == "rankStandard"||
-        column.property == "salaryBaseName"||
-        column.property == "workloadSalaryCritertion"||
-        column.property == "virtualWorkloadSalary"||
-        column.property == "doubleCease"||
-        column.property == "dailyAssessmentCriteria"||
-        column.property == "virtualDailyAssessmentCriteria"||
-        column.property == "otherCriterion"
+        column.property == "termPerformanceSalaryName" ||
+        column.property == "salaryWithdrawalStandard" ||
+        column.property == "rankWithdrawalStandard" ||
+        column.property == "rankStandard" ||
+        column.property == "salaryBaseName" ||
+        column.property == "workloadSalaryCritertion" ||
+        column.property == "virtualWorkloadSalary" ||
+        column.property == "doubleCease" ||
+        column.property == "dailyAssessmentCriteria" ||
+        column.property == "virtualDailyAssessmentCriteria" ||
+        column.property == "otherCriterion" ||
+        column.property == "teacherSubsidy" ||
+        column.property == "teacherAssessSubsidy" ||
+        column.property == "performanceAwardName" ||
+        column.property == "capitalIncreaseName" ||
+        column.property == "leadingCadreSubsidyName" ||
+        column.property == "assessLeadingCadreSubsidyName" ||
+        column.property == "prepareLessonsName" ||
+        column.property == "assessPrepareLessonsName" ||
+        column.property == "teachingResearchName" ||
+        column.property == "assessTeachingResearchName" ||
+        column.property == "virtualDoubleCease"
       ) {
         return "headerCellClass2";
       }
@@ -1555,6 +1571,21 @@ export default {
           this.loading = false;
         });
     },
+    calculate2() {
+      if (!this.form.id) {
+        return this.$message.error("请先保存数据");
+      }
+      this.loading = true;
+      calculate2({ pid: this.form.id })
+        .then(res => {
+          if (res.data.code == "200") {
+            this.getItemDetail();
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
     importExcel() {
       if (!this.form.id) {
         return this.$message.error("请先保存数据");

+ 121 - 0
src/views/salaryManagement/highSchool/js/optionList.js

@@ -112,6 +112,17 @@ export const optionList = {
       span: 4
     },
     {
+      label: "履约奖标准",
+      prop: "performanceAwardName",
+      width: 100,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "履约奖",
       prop: "performanceAward",
       width: 100,
@@ -134,6 +145,17 @@ export const optionList = {
       span: 4
     },
     {
+      label: "增资标准",
+      prop: "capitalIncreaseName",
+      width: 100,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "增资",
       prop: "capitalIncrease",
       width: 100,
@@ -229,6 +251,17 @@ export const optionList = {
       span: 4
     },
     {
+      label: "虚拟双休日工作量工资标准",
+      prop: "virtualDoubleCease",
+      width: 170,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "双休日工作量工资标准",
       prop: "doubleCease",
       width: 150,
@@ -570,6 +603,28 @@ export const optionList = {
       span: 4
     },
     {
+      label: "领导干部补贴标准",
+      prop: "leadingCadreSubsidyName",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "领导干部考核补贴标准",
+      prop: "assessLeadingCadreSubsidyName",
+      width: 150,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "领导干部补贴",
       prop: "leadingCadreSubsidy",
       width: 100,
@@ -581,6 +636,28 @@ export const optionList = {
       span: 4
     },
     {
+      label: "备课组长补贴标准",
+      prop: "prepareLessonsName",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "备课组长考核补贴标准",
+      prop: "assessPrepareLessonsName",
+      width: 150,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "备课组长",
       prop: "prepareLessons",
       width: 100,
@@ -592,6 +669,28 @@ export const optionList = {
       span: 4
     },
     {
+      label: "教研组长补贴标准",
+      prop: "teachingResearchName",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "教研组长考核补贴标准",
+      prop: "assessTeachingResearchName",
+      width: 150,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "教研组长",
       prop: "teachingResearch",
       width: 100,
@@ -614,6 +713,28 @@ export const optionList = {
       span: 4
     },
     {
+      label: "班主任补贴标准",
+      prop: "teacherSubsidy",
+      width: 140,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "班主任考核补贴标准",
+      prop: "teacherAssessSubsidy",
+      width: 160,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "班主任费",
       prop: "classTeacherFee",
       width: 100,

+ 47 - 16
src/views/salaryManagement/juniorhighSchool/detailsPage.vue

@@ -97,10 +97,7 @@
               :disabled="detailData.status == 1"
               >导入
             </el-button>
-            <el-button
-              type="primary"
-              size="small"
-              @click.stop="openExport()"
+            <el-button type="primary" size="small" @click.stop="openExport()"
               >导出
             </el-button>
             <el-button
@@ -111,6 +108,13 @@
               >重新计算
             </el-button>
             <el-button
+              type="primary"
+              size="small"
+              @click.stop="calculate2()"
+              :disabled="detailData.status == 1"
+              >导入工资标准
+            </el-button>
+            <el-button
               type="info"
               icon="el-icon-printer"
               size="small"
@@ -952,7 +956,8 @@ import {
   itemAnnex,
   itemDetail,
   pleaseCheck,
-  calculate
+  calculate,
+  calculate2
 } from "@/api/salaryManagement/primarySchool";
 import { numCal } from "@/util/calculate";
 import { optionList, auditOption } from "./js/optionList";
@@ -1276,17 +1281,28 @@ export default {
         column.property == "doubleCease" ||
         column.property == "dailyAssessmentCriteria" ||
         column.property == "virtualDailyAssessmentCriteria" ||
-        column.property == "termPerformanceSalaryName"||
-        column.property == "salaryWithdrawalStandard"||
-        column.property == "rankWithdrawalStandard"||
-        column.property == "rankStandard"||
-        column.property == "salaryBaseName"||
-        column.property == "workloadSalaryCritertion"||
-        column.property == "virtualWorkloadSalary"||
-        column.property == "doubleCease"||
-        column.property == "dailyAssessmentCriteria"||
-        column.property == "virtualDailyAssessmentCriteria"||
-        column.property == "otherCriterion"
+        column.property == "termPerformanceSalaryName" ||
+        column.property == "salaryWithdrawalStandard" ||
+        column.property == "rankWithdrawalStandard" ||
+        column.property == "rankStandard" ||
+        column.property == "salaryBaseName" ||
+        column.property == "workloadSalaryCritertion" ||
+        column.property == "virtualWorkloadSalary" ||
+        column.property == "doubleCease" ||
+        column.property == "dailyAssessmentCriteria" ||
+        column.property == "virtualDailyAssessmentCriteria" ||
+        column.property == "otherCriterion" ||
+        column.property == "teacherSubsidy" ||
+        column.property == "teacherAssessSubsidy" ||
+        column.property == "performanceAwardName" ||
+        column.property == "capitalIncreaseName" ||
+        column.property == "leadingCadreSubsidyName" ||
+        column.property == "assessLeadingCadreSubsidyName" ||
+        column.property == "prepareLessonsName" ||
+        column.property == "assessPrepareLessonsName" ||
+        column.property == "teachingResearchName" ||
+        column.property == "assessTeachingResearchName" ||
+        column.property == "virtualDoubleCease"
       ) {
         return "headerCellClass2";
       }
@@ -1555,6 +1571,21 @@ export default {
           this.loading = false;
         });
     },
+    calculate2() {
+      if (!this.form.id) {
+        return this.$message.error("请先保存数据");
+      }
+      this.loading = true;
+      calculate2({ pid: this.form.id })
+        .then(res => {
+          if (res.data.code == "200") {
+            this.getItemDetail();
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
     importExcel() {
       if (!this.form.id) {
         return this.$message.error("请先保存数据");

+ 121 - 0
src/views/salaryManagement/juniorhighSchool/js/optionList.js

@@ -112,6 +112,17 @@ export const optionList = {
       span: 4
     },
     {
+      label: "履约奖标准",
+      prop: "performanceAwardName",
+      width: 100,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "履约奖",
       prop: "performanceAward",
       width: 100,
@@ -134,6 +145,17 @@ export const optionList = {
       span: 4
     },
     {
+      label: "增资标准",
+      prop: "capitalIncreaseName",
+      width: 100,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "增资",
       prop: "capitalIncrease",
       width: 100,
@@ -229,6 +251,17 @@ export const optionList = {
       span: 4
     },
     {
+      label: "虚拟双休日工作量工资标准",
+      prop: "virtualDoubleCease",
+      width: 170,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "双休日工作量工资标准",
       prop: "doubleCease",
       width: 150,
@@ -570,6 +603,28 @@ export const optionList = {
       span: 4
     },
     {
+      label: "领导干部补贴标准",
+      prop: "leadingCadreSubsidyName",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "领导干部考核补贴标准",
+      prop: "assessLeadingCadreSubsidyName",
+      width: 150,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "领导干部补贴",
       prop: "leadingCadreSubsidy",
       width: 100,
@@ -581,6 +636,28 @@ export const optionList = {
       span: 4
     },
     {
+      label: "备课组长补贴标准",
+      prop: "prepareLessonsName",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "备课组长考核补贴标准",
+      prop: "assessPrepareLessonsName",
+      width: 150,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "备课组长",
       prop: "prepareLessons",
       width: 100,
@@ -592,6 +669,28 @@ export const optionList = {
       span: 4
     },
     {
+      label: "教研组长补贴标准",
+      prop: "teachingResearchName",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "教研组长考核补贴标准",
+      prop: "assessTeachingResearchName",
+      width: 150,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "教研组长",
       prop: "teachingResearch",
       width: 100,
@@ -614,6 +713,28 @@ export const optionList = {
       span: 4
     },
     {
+      label: "班主任补贴标准",
+      prop: "teacherSubsidy",
+      width: 140,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "班主任考核补贴标准",
+      prop: "teacherAssessSubsidy",
+      width: 160,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "班主任费",
       prop: "classTeacherFee",
       width: 100,

+ 47 - 16
src/views/salaryManagement/logisticsDepartment/detailsPage.vue

@@ -97,10 +97,7 @@
               :disabled="detailData.status == 1"
               >导入
             </el-button>
-            <el-button
-              type="primary"
-              size="small"
-              @click.stop="openExport()"
+            <el-button type="primary" size="small" @click.stop="openExport()"
               >导出
             </el-button>
             <el-button
@@ -111,6 +108,13 @@
               >重新计算
             </el-button>
             <el-button
+              type="primary"
+              size="small"
+              @click.stop="calculate2()"
+              :disabled="detailData.status == 1"
+              >导入工资标准
+            </el-button>
+            <el-button
               type="info"
               icon="el-icon-printer"
               size="small"
@@ -952,7 +956,8 @@ import {
   itemAnnex,
   itemDetail,
   pleaseCheck,
-  calculate
+  calculate,
+  calculate2
 } from "@/api/salaryManagement/primarySchool";
 import { numCal } from "@/util/calculate";
 import { optionList, auditOption } from "./js/optionList";
@@ -1276,17 +1281,28 @@ export default {
         column.property == "doubleCease" ||
         column.property == "dailyAssessmentCriteria" ||
         column.property == "virtualDailyAssessmentCriteria" ||
-        column.property == "termPerformanceSalaryName"||
-        column.property == "salaryWithdrawalStandard"||
-        column.property == "rankWithdrawalStandard"||
-        column.property == "rankStandard"||
-        column.property == "salaryBaseName"||
-        column.property == "workloadSalaryCritertion"||
-        column.property == "virtualWorkloadSalary"||
-        column.property == "doubleCease"||
-        column.property == "dailyAssessmentCriteria"||
-        column.property == "virtualDailyAssessmentCriteria"||
-        column.property == "otherCriterion"
+        column.property == "termPerformanceSalaryName" ||
+        column.property == "salaryWithdrawalStandard" ||
+        column.property == "rankWithdrawalStandard" ||
+        column.property == "rankStandard" ||
+        column.property == "salaryBaseName" ||
+        column.property == "workloadSalaryCritertion" ||
+        column.property == "virtualWorkloadSalary" ||
+        column.property == "doubleCease" ||
+        column.property == "dailyAssessmentCriteria" ||
+        column.property == "virtualDailyAssessmentCriteria" ||
+        column.property == "otherCriterion" ||
+        column.property == "teacherSubsidy" ||
+        column.property == "teacherAssessSubsidy" ||
+        column.property == "performanceAwardName" ||
+        column.property == "capitalIncreaseName" ||
+        column.property == "leadingCadreSubsidyName" ||
+        column.property == "assessLeadingCadreSubsidyName" ||
+        column.property == "prepareLessonsName" ||
+        column.property == "assessPrepareLessonsName" ||
+        column.property == "teachingResearchName" ||
+        column.property == "assessTeachingResearchName" ||
+        column.property == "virtualDoubleCease"
       ) {
         return "headerCellClass2";
       }
@@ -1555,6 +1571,21 @@ export default {
           this.loading = false;
         });
     },
+    calculate2() {
+      if (!this.form.id) {
+        return this.$message.error("请先保存数据");
+      }
+      this.loading = true;
+      calculate2({ pid: this.form.id })
+        .then(res => {
+          if (res.data.code == "200") {
+            this.getItemDetail();
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
     importExcel() {
       if (!this.form.id) {
         return this.$message.error("请先保存数据");

+ 121 - 0
src/views/salaryManagement/logisticsDepartment/js/optionList.js

@@ -112,6 +112,17 @@ export const optionList = {
       span: 4
     },
     {
+      label: "履约奖标准",
+      prop: "performanceAwardName",
+      width: 100,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "履约奖",
       prop: "performanceAward",
       width: 100,
@@ -134,6 +145,17 @@ export const optionList = {
       span: 4
     },
     {
+      label: "增资标准",
+      prop: "capitalIncreaseName",
+      width: 100,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "增资",
       prop: "capitalIncrease",
       width: 100,
@@ -229,6 +251,17 @@ export const optionList = {
       span: 4
     },
     {
+      label: "虚拟双休日工作量工资标准",
+      prop: "virtualDoubleCease",
+      width: 170,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "双休日工作量工资标准",
       prop: "doubleCease",
       width: 150,
@@ -570,6 +603,28 @@ export const optionList = {
       span: 4
     },
     {
+      label: "领导干部补贴标准",
+      prop: "leadingCadreSubsidyName",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "领导干部考核补贴标准",
+      prop: "assessLeadingCadreSubsidyName",
+      width: 150,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "领导干部补贴",
       prop: "leadingCadreSubsidy",
       width: 100,
@@ -581,6 +636,28 @@ export const optionList = {
       span: 4
     },
     {
+      label: "备课组长补贴标准",
+      prop: "prepareLessonsName",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "备课组长考核补贴标准",
+      prop: "assessPrepareLessonsName",
+      width: 150,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "备课组长",
       prop: "prepareLessons",
       width: 100,
@@ -592,6 +669,28 @@ export const optionList = {
       span: 4
     },
     {
+      label: "教研组长补贴标准",
+      prop: "teachingResearchName",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "教研组长考核补贴标准",
+      prop: "assessTeachingResearchName",
+      width: 150,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "教研组长",
       prop: "teachingResearch",
       width: 100,
@@ -614,6 +713,28 @@ export const optionList = {
       span: 4
     },
     {
+      label: "班主任补贴标准",
+      prop: "teacherSubsidy",
+      width: 140,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "班主任考核补贴标准",
+      prop: "teacherAssessSubsidy",
+      width: 160,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "班主任费",
       prop: "classTeacherFee",
       width: 100,

+ 47 - 17
src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -97,10 +97,7 @@
               :disabled="detailData.status == 1"
               >导入
             </el-button>
-            <el-button
-              type="primary"
-              size="small"
-              @click.stop="openExport()"
+            <el-button type="primary" size="small" @click.stop="openExport()"
               >导出
             </el-button>
             <el-button
@@ -111,6 +108,13 @@
               >重新计算
             </el-button>
             <el-button
+              type="primary"
+              size="small"
+              @click.stop="calculate2()"
+              :disabled="detailData.status == 1"
+              >导入工资标准
+            </el-button>
+            <el-button
               type="info"
               icon="el-icon-printer"
               size="small"
@@ -952,7 +956,8 @@ import {
   itemAnnex,
   itemDetail,
   pleaseCheck,
-  calculate
+  calculate,
+  calculate2
 } from "@/api/salaryManagement/primarySchool";
 import { numCal } from "@/util/calculate";
 import { optionList, auditOption } from "./js/optionList";
@@ -1276,21 +1281,31 @@ export default {
         column.property == "doubleCease" ||
         column.property == "dailyAssessmentCriteria" ||
         column.property == "virtualDailyAssessmentCriteria" ||
-        column.property == "termPerformanceSalaryName"||
-        column.property == "salaryWithdrawalStandard"||
-        column.property == "rankWithdrawalStandard"||
-        column.property == "rankStandard"||
-        column.property == "salaryBaseName"||
-        column.property == "workloadSalaryCritertion"||
-        column.property == "virtualWorkloadSalary"||
-        column.property == "doubleCease"||
-        column.property == "dailyAssessmentCriteria"||
-        column.property == "virtualDailyAssessmentCriteria"||
-        column.property == "otherCriterion"
+        column.property == "termPerformanceSalaryName" ||
+        column.property == "salaryWithdrawalStandard" ||
+        column.property == "rankWithdrawalStandard" ||
+        column.property == "rankStandard" ||
+        column.property == "salaryBaseName" ||
+        column.property == "workloadSalaryCritertion" ||
+        column.property == "virtualWorkloadSalary" ||
+        column.property == "doubleCease" ||
+        column.property == "dailyAssessmentCriteria" ||
+        column.property == "virtualDailyAssessmentCriteria" ||
+        column.property == "otherCriterion" ||
+        column.property == "teacherSubsidy" ||
+        column.property == "teacherAssessSubsidy" ||
+        column.property == "performanceAwardName" ||
+        column.property == "capitalIncreaseName" ||
+        column.property == "leadingCadreSubsidyName" ||
+        column.property == "assessLeadingCadreSubsidyName" ||
+        column.property == "prepareLessonsName" ||
+        column.property == "assessPrepareLessonsName" ||
+        column.property == "teachingResearchName" ||
+        column.property == "assessTeachingResearchName" ||
+        column.property == "virtualDoubleCease"
       ) {
         return "headerCellClass2";
       }
-      
     },
     copyDoc() {
       this.$emit("copyOrder", this.form.id);
@@ -1556,6 +1571,21 @@ export default {
           this.loading = false;
         });
     },
+    calculate2(){
+      if (!this.form.id) {
+        return this.$message.error("请先保存数据");
+      }
+      this.loading = true;
+      calculate2({ pid: this.form.id })
+        .then(res => {
+          if (res.data.code == "200") {
+            this.getItemDetail();
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
     importExcel() {
       if (!this.form.id) {
         return this.$message.error("请先保存数据");

+ 121 - 0
src/views/salaryManagement/primarySchool/js/optionList.js

@@ -112,6 +112,17 @@ export const optionList = {
       span: 4
     },
     {
+      label: "履约奖标准",
+      prop: "performanceAwardName",
+      width: 100,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "履约奖",
       prop: "performanceAward",
       width: 100,
@@ -134,6 +145,17 @@ export const optionList = {
       span: 4
     },
     {
+      label: "增资标准",
+      prop: "capitalIncreaseName",
+      width: 100,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "增资",
       prop: "capitalIncrease",
       width: 100,
@@ -229,6 +251,17 @@ export const optionList = {
       span: 4
     },
     {
+      label: "虚拟双休日工作量工资标准",
+      prop: "virtualDoubleCease",
+      width: 170,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "双休日工作量工资标准",
       prop: "doubleCease",
       width: 150,
@@ -570,6 +603,28 @@ export const optionList = {
       span: 4
     },
     {
+      label: "领导干部补贴标准",
+      prop: "leadingCadreSubsidyName",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "领导干部考核补贴标准",
+      prop: "assessLeadingCadreSubsidyName",
+      width: 150,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "领导干部补贴",
       prop: "leadingCadreSubsidy",
       width: 100,
@@ -581,6 +636,28 @@ export const optionList = {
       span: 4
     },
     {
+      label: "备课组长补贴标准",
+      prop: "prepareLessonsName",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "备课组长考核补贴标准",
+      prop: "assessPrepareLessonsName",
+      width: 150,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "备课组长",
       prop: "prepareLessons",
       width: 100,
@@ -592,6 +669,28 @@ export const optionList = {
       span: 4
     },
     {
+      label: "教研组长补贴标准",
+      prop: "teachingResearchName",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "教研组长考核补贴标准",
+      prop: "assessTeachingResearchName",
+      width: 150,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "教研组长",
       prop: "teachingResearch",
       width: 100,
@@ -614,6 +713,28 @@ export const optionList = {
       span: 4
     },
     {
+      label: "班主任补贴标准",
+      prop: "teacherSubsidy",
+      width: 140,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "班主任考核补贴标准",
+      prop: "teacherAssessSubsidy",
+      width: 160,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "班主任费",
       prop: "classTeacherFee",
       width: 100,