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

src/api/basicData/customerInformation.js

@@ -37,9 +37,7 @@ export function deleteDetails(data) {
   return request({
     url: '/api/blade-client/corpsdesc/update',
     method: 'post',
-    data: {
-      id: data
-    }
+    data: data
   })
 }
 //客户联系人列表删除

src/components/crop-select/main.vue

@@ -114,7 +114,6 @@
 
 <script>
 import option from "./configuration/mainList.json";
-import option2 from "./configuration/mainList2.json";
 import {
   customerList,
   allCropList,
@@ -171,17 +170,7 @@ export default {
     event: "balabala"
   },
   async created() {
-    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
-      );
-    }
+    this.tableOption = await this.getColumnData(this.getColumnName(51), option);
     let userObj = JSON.parse(localStorage.getItem("saber-userInfo")).content;
     this.title = getCustomerName(this.corpType);
     allCropList({
@@ -307,12 +296,8 @@ 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 = option;
+      const inSave = await this.delColumnData(this.getColumnName(51), option);
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;

src/views/basicData/customerInformation/index.vue

@@ -275,7 +275,11 @@ export default {
         type: "warning"
       })
         .then(() => {
-          return deleteDetails(row.id);
+          return deleteDetails({
+            id:row.id,
+            corpsTypeId:row.corpsTypeId,
+            corpType:'KH'
+          });
         })
         .then(() => {
           this.$message({

src/views/basicData/customerManagement/companyMaterial/index.vue

@@ -272,7 +272,11 @@ export default {
         type: "warning"
       })
         .then(() => {
-          return deleteDetails(row.id);
+          return deleteDetails({
+            id:row.id,
+            corpsTypeId:row.corpsTypeId,
+            corpType:'GS'
+          });
         })
         .then(() => {
           this.$message({

src/views/basicData/customerManagement/supplierMaterial/index.vue

@@ -276,7 +276,11 @@ export default {
         type: "warning"
       })
         .then(() => {
-          return deleteDetails(row.id);
+          return deleteDetails({
+            id:row.id,
+            corpsTypeId:row.corpsTypeId,
+            corpType:'GYS'
+          });
         })
         .then(() => {
           this.$message({

src/views/basicData/factoryInformation/factoryInformation/index.vue

@@ -275,7 +275,11 @@ export default {
         type: "warning"
       })
         .then(() => {
-          return deleteDetails(row.id);
+          return deleteDetails({
+            id:row.id,
+            corpsTypeId:row.corpsTypeId,
+            corpType:'GC'
+          });
         })
         .then(() => {
           this.$message({

src/views/basicData/facultyManagement/detailsPage.vue

@@ -46,6 +46,10 @@
           v-loading="loading"
         >
         </avue-form>
+        <div style="font-size:12px;margin-left:60px">
+          <span style="color:red;font-weight: 600;">备注：</span
+          >工资基数标准=工资拨付标准-职级拨付标准-工作量工资标准+虚拟工作量工资标准-双休日工作量标准+虚拟双休日工作量标准-日常考核工资标准+虚拟日常考核工资标准-学期绩效工资标准
+        </div>
       </basic-container>
       <containerTitle title="事业编考试的记录"></containerTitle>
       <basic-container>
@@ -317,8 +321,8 @@ export default {
             span: 6
           },
           {
-            label: "工资基数标准",
-            prop: "salaryBase",
+            label: "工资拨付标准",
+            prop: "salaryWithdrawalStandard",
             precision: 2,
             type: "number",
             controls: false,
@@ -333,8 +337,8 @@ export default {
             span: 6
           },
           {
-            label: "工资拨付标准",
-            prop: "salaryWithdrawalStandard",
+            label: "工资基数标准",
+            prop: "salaryBase",
             precision: 2,
             type: "number",
             controls: false,
@@ -356,15 +360,6 @@ export default {
             controls: false,
             span: 6
           },
-
-          {
-            label: "日常考核标准",
-            prop: "dailyAssessmentCriteriaName",
-            precision: 2,
-            type: "number",
-            controls: false,
-            span: 6
-          },
           {
             label: "双休日工作量工资标准",
             prop: "doubleCease",
@@ -382,15 +377,15 @@ export default {
             span: 6
           },
           {
-            label: "学期绩效标准",
-            prop: "termPerformanceSalaryName",
+            label: "日常考核工资标准",
+            prop: "dailyAssessmentCriteriaName",
+            precision: 2,
             type: "number",
             controls: false,
-            precision: 2,
             span: 6
           },
           {
-            label: "虚拟日常考核标准",
+            label: "虚拟日常考核工资标准",
             prop: "virtualDailyAssessmentCriteria",
             precision: 2,
             type: "number",
@@ -398,6 +393,14 @@ export default {
             span: 6
           },
           {
+            label: "学期绩效工资标准",
+            prop: "termPerformanceSalaryName",
+            type: "number",
+            controls: false,
+            precision: 2,
+            span: 6
+          },
+          {
             label: "班主任补贴标准",
             prop: "teacherSubsidy",
             precision: 2,
@@ -479,24 +482,24 @@ export default {
             span: 6
           },
           {
-            label: "工资基数",
-            prop: "salaryBaseName",
+            label: "职级工资",
+            prop: "rankSalary",
             precision: 2,
             type: "number",
             controls: false,
             span: 6
           },
           {
-            label: "职级工资",
-            prop: "rankWithdrawalStandard",
+            label: "工资基数",
+            prop: "salaryBaseName",
             precision: 2,
             type: "number",
             controls: false,
             span: 6
           },
           {
-            label: "职级等级工资",
-            prop: "rankSalary",
+            label: "日常考核等级工资",
+            prop: "dailyAssessmentSalary",
             precision: 2,
             type: "number",
             controls: false,
@@ -510,7 +513,6 @@ export default {
             controls: false,
             span: 6
           },
-
           {
             label: "日常考核工资",
             prop: "dailyAssessmentCriteria",
@@ -520,14 +522,6 @@ export default {
             span: 6
           },
           {
-            label: "日常考核等级工资",
-            prop: "dailyAssessmentSalary",
-            precision: 2,
-            type: "number",
-            controls: false,
-            span: 6
-          },
-          {
             label: "学期绩效工资",
             prop: "termPerformanceSalary",
             precision: 2,

src/views/basicData/facultyManagement/index.vue

@@ -141,7 +141,11 @@
 <script>
 import detailsPage from "./detailsPage";
 import { getToken } from "@/util/auth";
-import { getList, remove,allcalculate } from "@/api/basicData/facultyManagement";
+import {
+  getList,
+  remove,
+  allcalculate
+} from "@/api/basicData/facultyManagement";
 export default {
   name: "index",
   data() {
@@ -415,6 +419,12 @@ export default {
             overHidden: true
           },
           {
+            label: "工作量工资标准",
+            prop: "workloadSalaryName",
+            width: "120",
+            overHidden: true
+          },
+          {
             label: "工作量工资",
             prop: "workloadSalary",
             width: "100",
@@ -523,14 +533,6 @@ export default {
             width: "100",
             overHidden: true
           },
-
-          {
-            label: "工作量工资标准",
-            prop: "workloadSalaryName",
-            width: "100",
-            overHidden: true
-          },
-
           {
             label: "日常考核标准",
             prop: "dailyAssessmentCriteriaName",
@@ -708,15 +710,15 @@ export default {
       );
     },
     calculate() {
-      const ids=[]
-      this.selectionList.forEach(e=>{
-        ids.push(e.id)
-      })
+      const ids = [];
+      this.selectionList.forEach(e => {
+        ids.push(e.id);
+      });
       this.loading = true;
-      allcalculate({idList:ids})
+      allcalculate({ idList: ids })
         .then(res => {
           if (res.data.code == "200") {
-            this.$message.success('计算成功')
+            this.$message.success("计算成功");
             this.onLoad(this.page, this.search);
           }
         })

src/views/basicData/fleetInformation/index.vue

@@ -275,7 +275,11 @@ export default {
         type: "warning"
       })
         .then(() => {
-          return deleteDetails(row.id);
+          return deleteDetails({
+            id:row.id,
+            corpsTypeId:row.corpsTypeId,
+            corpType:'CD'
+          });
         })
         .then(() => {
           this.$message({

src/views/basicData/salaryConfiguration/detailsPage.vue

@@ -54,6 +54,25 @@
               </el-option>
             </el-select>
           </template>
+          <template slot="normType">
+            <el-select
+              size="small"
+              v-model="form.normType"
+              placeholder="请选择"
+              clearable
+              :filterable="true"
+              :disabled="detailData.status == 1"
+              @change="normTypeChange"
+            >
+              <el-option
+                v-for="item in normTypeList"
+                :key="item.id"
+                :label="item.dictValue"
+                :value="item.dictValue"
+              >
+              </el-option>
+            </el-select>
+          </template>
         </avue-form>
       </basic-container>
       <containerTitle title="基础明细"></containerTitle>
@@ -222,11 +241,7 @@ export default {
             label: "标准类别",
             prop: "normType",
             type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=norm_type",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
+            // dicUrl: "/api/blade-system/dict-biz/dictionary?code=norm_type",
             rules: [
               {
                 required: true,
@@ -234,8 +249,14 @@ export default {
                 trigger: "blur"
               }
             ],
-            filterable: true,
             span: 6
+            // change: ({ value, column }) => {
+            //   if (value == "工资拨付标准") {
+            //     this.tableOption = tableOption2;
+            //   } else {
+            //     this.tableOption = tableOption;
+            //   }
+            // }
           },
           {
             label: "教师类别",
@@ -290,7 +311,7 @@ export default {
           }
         ]
       },
-      tableOption: {
+      tableOption:{
         align: "center",
         addBtn: false,
         refreshBtn: false,
@@ -303,7 +324,8 @@ export default {
           {
             label: "分类明细",
             prop: "parameter",
-            overHidden: true
+            overHidden: true,
+            index: 1
           },
           {
             label: "工资标准",
@@ -315,6 +337,90 @@ export default {
             cell: true
           },
           {
+            label: "工作量工资标准",
+            prop: "workloadSalaryName",
+            precision: 2,
+            type: "number",
+            controls: false,
+            overHidden: true,
+            cell: true,
+            hide: true,
+            showColumn: false,
+            width: 120
+          },
+          {
+            label: "虚拟工作量工资标准",
+            prop: "virtualWorkloadSalary",
+            precision: 2,
+            type: "number",
+            controls: false,
+            overHidden: true,
+            cell: true,
+            hide: true,
+            showColumn: false,
+            width: 140
+          },
+          {
+            label: "双休日工作量工资标准",
+            prop: "doubleCease",
+            precision: 2,
+            type: "number",
+            controls: false,
+            overHidden: true,
+            cell: true,
+            hide: true,
+            showColumn: false,
+            width: 160
+          },
+          {
+            label: "日常考核工资标准",
+            prop: "dailyAssessmentCriteriaName",
+            precision: 2,
+            type: "number",
+            controls: false,
+            overHidden: true,
+            cell: true,
+            hide: true,
+            showColumn: false,
+            width: 120
+          },
+          {
+            label: "虚拟双休日工作量工资标准",
+            prop: "virtualDoubleCease",
+            precision: 2,
+            type: "number",
+            controls: false,
+            overHidden: true,
+            cell: true,
+            hide: true,
+            showColumn: false,
+            width: 170
+          },
+          {
+            label: "虚拟日常考核标准",
+            prop: "virtualDailyAssessmentCriteria",
+            precision: 2,
+            type: "number",
+            controls: false,
+            overHidden: true,
+            cell: true,
+            hide: true,
+            showColumn: false,
+            width: 120
+          },
+          {
+            label: "学期绩效工资标准",
+            prop: "termPerformanceSalaryName",
+            precision: 2,
+            type: "number",
+            controls: false,
+            overHidden: true,
+            cell: true,
+            hide: true,
+            showColumn: false,
+            width: 120
+          },
+          {
             label: "备注",
             prop: "remarks",
             overHidden: true,
@@ -323,10 +429,11 @@ export default {
         ]
       },
       resultList: [],
+      normTypeList: [],
       jobTitleList: [],
       jobLevelList: [],
       occupationalLevelList: [],
-      maritalList:[]
+      maritalList: []
     };
   },
   props: {
@@ -344,6 +451,9 @@ export default {
     this.getWorkDicts("result_type").then(res => {
       this.resultList = res.data.data;
     });
+    this.getWorkDicts("norm_type").then(res => {
+      this.normTypeList = res.data.data;
+    });
     this.getWorkDicts("job_title").then(res => {
       this.jobTitleList = res.data.data;
     });
@@ -390,6 +500,7 @@ export default {
           }
           this.form = res.data.data;
           this.dataList = res.data.data.schoolConfigItems;
+          this.normTypeChange(this.form.normType);
         })
         .finally(() => {
           // this.loading = false;
@@ -433,6 +544,23 @@ export default {
         }
       });
     },
+    normTypeChange(row) {
+      if (row == "工资拨付标准") {
+        this.tableOption.column.forEach(e => {
+          if (e.hide == true) {
+            e.hide = false;
+            e.showColumn = true;
+          }
+        });
+      } else {
+        this.tableOption.column.forEach(e => {
+          if (e.hide == false) {
+            e.hide = true;
+            e.showColumn = false;
+          }
+        });
+      }
+    },
     parameterChange(row, index) {
       if (
         this.dataList.filter(value => value.parameter == row.parameter).length >

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

@@ -11,6 +11,7 @@
   "menuWidth": 120,
   "refreshBtn": false,
   "showSummary": true,
+  "indexSlot":true,
   "column": [{
       "label": "产品类别",
       "prop": "priceCategory",

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -235,6 +235,16 @@
           @resetColumn="resetColumn"
           :cell-style="cellStyle"
         >
+          <template slot="headerSerial">
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              size="mini"
+              @click.stop="addRow"
+              :disabled="detailData.status == 1"
+              circle
+            ></el-button>
+          </template>
           <template slot="menuLeft">
             <el-button
               type="primary"
@@ -1076,6 +1086,9 @@ export default {
         });
       }
     },
+    addRow(){
+      this.data.push({$cellEdit:true})
+    },
     corpAttnChange() {
       this.corpsattns.forEach(e => {
         if (this.form.corpId == e.pid) {
@@ -2029,6 +2042,7 @@ export default {
             if (res.data.code == 200) {
               this.detailData.status = 2;
               this.option = this.$options.data().option;
+              this.$refs.crud.refreshTable()
             }
           });
         }

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

@@ -10,6 +10,8 @@
   "refreshBtn": false,
   "delBtn":false,
   "showSummary": true,
+  "index": true,
+  "indexSlot":true,
   "addBtnText": "新增明细",
   "column": [
     {

src/views/exportTrade/invoice/detailsPage.vue

@@ -90,6 +90,16 @@
           :summary-method="summaryMethod"
           :cell-style="cellStyle"
         >
+          <template slot="headerSerial">
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              size="mini"
+              @click.stop="addRow"
+              :disabled="detailData.status == 1"
+              circle
+            ></el-button>
+          </template>
           <template slot="menuLeft">
             <el-button
               type="primary"
@@ -662,6 +672,9 @@ export default {
       }
       this.dialogVisible = false;
     },
+    addRow() {
+      this.data.push({ $cellEdit: true });
+    },
     closeGoods() {
       this.selectionList = [];
       this.treeDeptId = "";
@@ -999,6 +1012,7 @@ export default {
             if (res.data.code == 200) {
               this.detailData.status = 2;
               this.option = this.$options.data().option;
+              this.$refs.crud.refreshTable();
             }
           });
         }
@@ -1011,8 +1025,8 @@ export default {
       );
       if (inSave) {
         this.$nextTick(() => {
-          this.$refs.crud.doLayout()
-        })
+          this.$refs.crud.doLayout();
+        });
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
@@ -1026,8 +1040,8 @@ export default {
       );
       if (inSave) {
         this.$nextTick(() => {
-          this.$refs.crud.doLayout()
-        })
+          this.$refs.crud.doLayout();
+        });
         this.$message.success("重置成功");
         //关闭窗口
         setTimeout(() => {
@@ -1042,8 +1056,8 @@ export default {
       );
       if (inSave) {
         this.$nextTick(() => {
-          this.$refs.goodsCrud.doLayout()
-        })
+          this.$refs.goodsCrud.doLayout();
+        });
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
@@ -1057,8 +1071,8 @@ export default {
       );
       if (inSave) {
         this.$nextTick(() => {
-          this.$refs.goodsCrud.doLayout()
-        })
+          this.$refs.goodsCrud.doLayout();
+        });
         this.$message.success("重置成功");
         //关闭窗口
         setTimeout(() => {

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

@@ -12,6 +12,7 @@
   "refreshBtn": false,
   "showSummary": true,
   "selection": true,
+  "indexSlot":true,
   "tip": false,
   "column": [{
       "label": "产品类别",

src/views/exportTrade/salesContract/detailsPage.vue

@@ -275,6 +275,16 @@
             :summary-method="summaryMethod"
             :cell-style="cellStyle"
           >
+            <template slot="headerSerial">
+              <el-button
+                type="primary"
+                icon="el-icon-plus"
+                size="mini"
+                @click.stop="addRow"
+                :disabled="detailData.status == 1"
+                circle
+              ></el-button>
+            </template>
             <template slot="cname" slot-scope="{ row, index }">
               <span v-if="row.$cellEdit" style="display:flex">
                 <el-select
@@ -459,7 +469,7 @@
                 size="small"
                 @click.stop="newDetails"
                 :disabled="detailData.status == 1"
-                >录入明细</el-button
+                >批量录入</el-button
               >
               <el-button
                 type="primary"
@@ -1833,6 +1843,9 @@ export default {
         });
       });
     },
+    addRow() {
+      this.data.push({ $cellEdit: true });
+    },
     //商品明细导入
     newDetails() {
       if (!this.form.corpId) {
@@ -2228,6 +2241,7 @@ export default {
             if (res.data.code == 200) {
               this.detailData.status = 2;
               this.option = this.$options.data().option;
+              this.$refs.crud.refreshTable();
             }
           });
         }

src/views/salaryManagement/highSchool/detailsPage.vue

@@ -1067,8 +1067,8 @@ export default {
             change: ({ value }) => {
               if (value) {
                 this.optionList.column.forEach(e => {
-                  if (e.prop == "yearUpPerformance") {
-                    e.label = value + "年上学期绩效";
+                  if (e.prop == "monthHour") {
+                    e.label = value + "月份工作量";
                   }
                   if (e.prop == "yearDownPerformance") {
                     e.label = value + "年下学期绩效";
@@ -1572,19 +1572,20 @@ export default {
         });
     },
     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;
-        });
+      return this.$message.error("正在开发中");
+      // 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) {
@@ -2101,6 +2102,16 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
+          case "29":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/doubleWorkloadExcel";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/doubleWorkloadExcel";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
           default:
             this.findObject(
               this.excelOption.column,

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

@@ -273,7 +273,7 @@ export const optionList = {
       span: 4
     },
     {
-      label: "月份课时",
+      label: "月份工作量",
       prop: "monthHour",
       width: 100,
       overHidden: true,
@@ -284,6 +284,17 @@ export const optionList = {
       span: 4
     },
     {
+      label: "课时费",
+      prop: "monthPrice",
+      width: 100,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "月工作量工资",
       prop: "momthWorkloadSalary",
       width: 120,
@@ -295,6 +306,39 @@ export const optionList = {
       span: 4
     },
     {
+      label: "双休日工作量",
+      prop: "doubleHour",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "双休日课时费",
+      prop: "doublePrice",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "双休日工作量工资",
+      prop: "doubleMoney",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "自定义",
       prop: "custom",
       width: 100,
@@ -1494,9 +1538,8 @@ export const auditOption = {
   align: "center",
   index: true,
   viewBtn: false,
-  menu:false,
-  column: [
-    {
+  menu: false,
+  column: [{
       label: "姓名",
       prop: "cname",
       width: 100,

src/views/salaryManagement/juniorhighSchool/detailsPage.vue

@@ -1067,8 +1067,8 @@ export default {
             change: ({ value }) => {
               if (value) {
                 this.optionList.column.forEach(e => {
-                  if (e.prop == "yearUpPerformance") {
-                    e.label = value + "年上学期绩效";
+                  if (e.prop == "monthHour") {
+                    e.label = value + "月份工作量";
                   }
                   if (e.prop == "yearDownPerformance") {
                     e.label = value + "年下学期绩效";
@@ -1572,19 +1572,20 @@ export default {
         });
     },
     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;
-        });
+      return this.$message.error("正在开发中");
+      // 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) {
@@ -2101,6 +2102,16 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
+          case "29":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/doubleWorkloadExcel";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/doubleWorkloadExcel";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
           default:
             this.findObject(
               this.excelOption.column,

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

@@ -273,7 +273,7 @@ export const optionList = {
       span: 4
     },
     {
-      label: "月份课时",
+      label: "月份工作量",
       prop: "monthHour",
       width: 100,
       overHidden: true,
@@ -284,6 +284,17 @@ export const optionList = {
       span: 4
     },
     {
+      label: "课时费",
+      prop: "monthPrice",
+      width: 100,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "月工作量工资",
       prop: "momthWorkloadSalary",
       width: 120,
@@ -295,6 +306,39 @@ export const optionList = {
       span: 4
     },
     {
+      label: "双休日工作量",
+      prop: "doubleHour",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "双休日课时费",
+      prop: "doublePrice",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "双休日工作量工资",
+      prop: "doubleMoney",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "自定义",
       prop: "custom",
       width: 100,
@@ -1494,9 +1538,8 @@ export const auditOption = {
   align: "center",
   index: true,
   viewBtn: false,
-  menu:false,
-  column: [
-    {
+  menu: false,
+  column: [{
       label: "姓名",
       prop: "cname",
       width: 100,

src/views/salaryManagement/logisticsDepartment/detailsPage.vue

@@ -1099,7 +1099,7 @@ export default {
               if (value) {
                 this.optionList.column.forEach(e => {
                   if (e.prop == "monthHour") {
-                    e.label = value + "月份课时";
+                    e.label = value + "月份工作量";
                   }
                   if (e.prop == "momthWorkloadSalary") {
                     e.label = value + "月工作量工资";
@@ -1572,19 +1572,20 @@ export default {
         });
     },
     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;
-        });
+      return this.$message.error("正在开发中");
+      // 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) {
@@ -2101,6 +2102,16 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
+          case "29":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/doubleWorkloadExcel";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/doubleWorkloadExcel";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
           default:
             this.findObject(
               this.excelOption.column,

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

@@ -273,7 +273,7 @@ export const optionList = {
       span: 4
     },
     {
-      label: "月份课时",
+      label: "月份工作量",
       prop: "monthHour",
       width: 100,
       overHidden: true,
@@ -284,6 +284,17 @@ export const optionList = {
       span: 4
     },
     {
+      label: "课时费",
+      prop: "monthPrice",
+      width: 100,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "月工作量工资",
       prop: "momthWorkloadSalary",
       width: 120,
@@ -295,6 +306,39 @@ export const optionList = {
       span: 4
     },
     {
+      label: "双休日工作量",
+      prop: "doubleHour",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "双休日课时费",
+      prop: "doublePrice",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "双休日工作量工资",
+      prop: "doubleMoney",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "自定义",
       prop: "custom",
       width: 100,
@@ -1494,9 +1538,8 @@ export const auditOption = {
   align: "center",
   index: true,
   viewBtn: false,
-  menu:false,
-  column: [
-    {
+  menu: false,
+  column: [{
       label: "姓名",
       prop: "cname",
       width: 100,

src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -1099,7 +1099,7 @@ export default {
               if (value) {
                 this.optionList.column.forEach(e => {
                   if (e.prop == "monthHour") {
-                    e.label = value + "月份课时";
+                    e.label = value + "月份工作量";
                   }
                   if (e.prop == "momthWorkloadSalary") {
                     e.label = value + "月工作量工资";
@@ -1571,20 +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;
-        });
+    calculate2() {
+      return this.$message.error("正在开发中");
+      // 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) {
@@ -2101,6 +2102,16 @@ export default {
               "excelFile"
             ).disabled = false;
             break;
+          case "29":
+            this.exportUrl =
+              "/api/blade-school/salaryitem/export/doubleWorkloadExcel";
+            this.findObject(this.excelOption.column, "excelFile").action =
+              "/api/blade-school/salaryitem/import/doubleWorkloadExcel";
+            this.findObject(
+              this.excelOption.column,
+              "excelFile"
+            ).disabled = false;
+            break;
           default:
             this.findObject(
               this.excelOption.column,

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

@@ -273,7 +273,7 @@ export const optionList = {
       span: 4
     },
     {
-      label: "月份课时",
+      label: "月份工作量",
       prop: "monthHour",
       width: 100,
       overHidden: true,
@@ -284,6 +284,17 @@ export const optionList = {
       span: 4
     },
     {
+      label: "课时费",
+      prop: "monthPrice",
+      width: 100,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "月工作量工资",
       prop: "momthWorkloadSalary",
       width: 120,
@@ -295,6 +306,39 @@ export const optionList = {
       span: 4
     },
     {
+      label: "双休日工作量",
+      prop: "doubleHour",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "双休日课时费",
+      prop: "doublePrice",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
+      label: "双休日工作量工资",
+      prop: "doubleMoney",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "自定义",
       prop: "custom",
       width: 100,
@@ -1494,9 +1538,8 @@ export const auditOption = {
   align: "center",
   index: true,
   viewBtn: false,
-  menu:false,
-  column: [
-    {
+  menu: false,
+  column: [{
       label: "姓名",
       prop: "cname",
       width: 100,