修改学校和贸易

src/components/fee-info/config/feeInfo.json

@@ -18,6 +18,7 @@
   "dialogWidth": "60%",
   "tree": true,
   "dialogClickModal": false,
+  "indexSlot":true,
   "column": [
     {
       "label": "结算单位",

src/components/fee-info/main.vue

@@ -69,8 +69,20 @@
             >删 除</el-button
           >
         </template>
+        <template slot="headerSerial">
+          <el-button
+            type="primary"
+            icon="el-icon-plus"
+            size="mini"
+            @click.stop="addRow"
+            :disabled="disabled"
+            circle
+          ></el-button>
+        </template>
         <template slot="corpId" slot-scope="{ row, index }">
-          <span v-if="row.$cellEdit&&!inCropId" 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"
@@ -383,7 +395,7 @@ export default {
     },
     IntegerFormat(num) {
       return IntegerFormat(num);
-    },
+    }
   },
   async created() {
     this.feeOption = await this.getColumnData(
@@ -414,6 +426,9 @@ export default {
     ApplyPayment
   },
   watch: {
+    disabled:function(){
+       this.$refs.feeCrud.refreshTable()
+    },
     orderFeesList(newVla, oldVal) {
       if (newVla !== oldVal) {
         this.allData = newVla;
@@ -529,7 +544,6 @@ export default {
       });
     },
     getCorpData(row) {
-      console.log(row);
       this.feeData[row.index].corpName = row.cname;
     },
     countChange(row) {
@@ -597,6 +611,9 @@ export default {
         this.$refs.feeCrud.rowCellAdd(params);
       }
     },
+    addRow(){
+     this.rowAdd()
+    },
     onLoad(page) {
       this.loading = true;
       let data = {

src/views/basicData/facultyManagement/detailsPage.vue

@@ -165,7 +165,7 @@ export default {
             span: 6
           },
           {
-            label: "校龄开始日期",
+            label: "校龄开始时间",
             prop: "schoolAgeSalaryDate",
             type: "month",
             valueFormat: "yyyy-MM-dd",
@@ -221,7 +221,7 @@ export default {
             span: 6
           },
           {
-            label: "职位",
+            label: "岗位",
             prop: "compileCategory",
             type: "select",
             dicUrl:
@@ -233,7 +233,7 @@ export default {
             span: 6
           },
           {
-            label: "职工类别",
+            label: "教师类别",
             prop: "staffType",
             type: "select",
             dicUrl: "/api/blade-system/dict-biz/dictionary?code=staff_type",
@@ -255,7 +255,7 @@ export default {
             span: 6
           },
           {
-            label: "教师类别",
+            label: "类别",
             prop: "salaryWithdrawalStandardName",
             type: "select",
             dicUrl:
@@ -440,7 +440,7 @@ export default {
             span: 6
           },
           {
-            label: "班主任补贴标准",
+            label: "班主任津贴标准",
             prop: "teacherSubsidy",
             precision: 2,
             type: "number",
@@ -448,7 +448,7 @@ export default {
             span: 6
           },
           {
-            label: "班主任考核补贴标准",
+            label: "班主任考核津贴标准",
             prop: "teacherAssessSubsidy",
             precision: 2,
             type: "number",
@@ -537,14 +537,6 @@ export default {
             span: 6
           },
           {
-            label: "日常考核等级工资",
-            prop: "dailyAssessmentSalary",
-            precision: 2,
-            type: "number",
-            controls: false,
-            span: 6
-          },
-          {
             label: "工作量工资",
             prop: "workloadSalary",
             precision: 2,
@@ -625,7 +617,7 @@ export default {
             span: 6
           },
           {
-            label: "教研组长审核补贴",
+            label: "教研组长考核补贴",
             prop: "assessTeachingResearch",
             precision: 2,
             type: "number",

src/views/basicData/facultyManagement/index.vue

@@ -117,6 +117,7 @@
           v-model="excelForm"
           table-loading="excelLoading"
           :upload-after="uploadAfter"
+          class="schoolupload"
         >
           <template slot="excelTemplate">
             <el-button type="primary" @click="derivation">
@@ -326,13 +327,13 @@ export default {
             overHidden: true
           },
           {
-            label: "职位",
+            label: "岗位",
             prop: "compileCategory",
             width: "100",
             overHidden: true
           },
           {
-            label: "职工类别",
+            label: "教师类别",
             prop: "staffType",
             width: "100",
             overHidden: true
@@ -344,7 +345,7 @@ export default {
             overHidden: true
           },
           {
-            label: "教师类别",
+            label: "类别",
             prop: "salaryWithdrawalStandardName",
             width: "100",
             overHidden: true
@@ -368,6 +369,18 @@ export default {
             overHidden: true
           },
           {
+            label: "日常考核等级",
+            prop: "dailyGrade",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "学期绩效等级",
+            prop: "performanceGrade",
+            width: "100",
+            overHidden: true
+          },
+          {
             label: "学期绩效标准",
             prop: "termPerformanceSalaryName",
             width: "100",
@@ -422,12 +435,6 @@ export default {
             overHidden: true
           },
           {
-            label: "职级等级工资",
-            prop: "rankSalary",
-            width: "100",
-            overHidden: true
-          },
-          {
             label: "工资基数标准",
             prop: "salaryBase",
             width: "100",
@@ -440,6 +447,12 @@ export default {
             overHidden: true
           },
           {
+            label: "虚拟工作量工资标准",
+            prop: "virtualWorkloadSalary",
+            width: "150",
+            overHidden: true
+          },
+          {
             label: "工作量工资",
             prop: "workloadSalary",
             width: "100",
@@ -452,9 +465,10 @@ export default {
             overHidden: true
           },
           {
-            label: "虚拟工作量工资标准",
-            prop: "virtualWorkloadSalary",
-            width: "150",
+            label: "虚拟双休日工作量工资标准",
+            prop: "virtualDoubleCease",
+            type: "number",
+            width: "170",
             overHidden: true
           },
           {
@@ -464,12 +478,6 @@ export default {
             overHidden: true
           },
           {
-            label: "日常考核等级工资",
-            prop: "dailyAssessmentSalary",
-            width: "120",
-            overHidden: true
-          },
-          {
             label: "虚拟日常考核标准",
             prop: "virtualDailyAssessmentCriteria",
             width: "120",
@@ -512,19 +520,19 @@ export default {
             overHidden: true
           },
           {
-            label: "教研组长审核补贴",
+            label: "教研组长考核补贴",
             prop: "assessTeachingResearch",
             width: "120",
             overHidden: true
           },
           {
-            label: "班主任补贴标准",
+            label: "班主任津贴标准",
             prop: "teacherSubsidy",
             width: "120",
             overHidden: true
           },
           {
-            label: "班主任考核补贴标准",
+            label: "班主任考核津贴标准",
             prop: "teacherAssessSubsidy",
             width: "150",
             overHidden: true
@@ -541,7 +549,12 @@ export default {
             width: "100",
             overHidden: true
           },
-
+          {
+            label: "职级工资",
+            prop: "rankSalary",
+            width: "100",
+            overHidden: true
+          },
           {
             label: "工资基数",
             prop: "salaryBaseName",
@@ -573,6 +586,12 @@ export default {
             overHidden: true
           },
           {
+            label: "备课组长补贴标准",
+            prop: "prepareLessonsName",
+            width: "120",
+            overHidden: true
+          },
+          {
             label: "备课组长考核补贴标准",
             prop: "assessPrepareLessonsName",
             width: "150",
@@ -745,6 +764,7 @@ export default {
       this.show = false;
     },
     uploadAfter(res, done, loading) {
+      this.excelBox = false;
       this.onLoad(this.page, this.search);
       done();
     },
@@ -826,8 +846,11 @@ export default {
 };
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .page-crad ::v-deep .basic-container__card {
   height: 94.2vh;
 }
+.schoolupload ::v-deep .el-upload-list {
+  display: none !important;
+}
 </style>

src/views/basicData/salaryConfiguration/detailsPage.vue

@@ -136,7 +136,7 @@
                 @change="parameterChange(row, index)"
                 clearable
                 :disabled="detailData.status == 1"
-                v-else-if="form.resultType == '职位'"
+                v-else-if="form.resultType == '岗位'"
               >
                 <el-option
                   v-for="item in jobLevelList"
@@ -260,7 +260,7 @@ export default {
             // }
           },
           {
-            label: "教师类别",
+            label: "类别",
             prop: "salaryWithdrawalStandardName",
             type: "select",
             dicUrl:
@@ -285,7 +285,7 @@ export default {
             span: 6
           },
           {
-            label: "职位",
+            label: "岗位",
             prop: "compileCategory",
             type: "select",
             dicUrl:

src/views/basicData/salaryConfiguration/index.vue

@@ -183,7 +183,7 @@ export default {
             search: true
           },
           {
-            label: "职位",
+            label: "岗位",
             prop: "compileCategory",
             type: "select",
             dicUrl:

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -1830,9 +1830,9 @@ export default {
             });
           }
           for (let i = 0; i < orderFeesList.length; i++) {
-            if (orderFeesList[i].corpId == null) {
-              return this.$message.error(`请输入第${i + 1}行的结算中心`);
-            }
+            // if (orderFeesList[i].corpId == null) {
+            //   return this.$message.error(`请输入第${i + 1}行的结算中心`);
+            // }
             if (orderFeesList[i].price == 0) {
               return this.$message.error(`请正确输入第${i + 1}行的销售价`);
             }

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

@@ -62,7 +62,7 @@ export const optionList = {
       span: 4
     },
     {
-      label: "职务",
+      label: "岗位",
       prop: "position",
       width: 100,
       overHidden: true,
@@ -89,6 +89,19 @@ export const optionList = {
       span: 4
     },
     {
+      label: "学历",
+      prop: "code",
+      type: "select",
+      dicUrl: "/api/blade-system/dict-biz/dictionary?code=marital_status",
+      props: {
+        label: "dictValue",
+        value: "dictValue"
+      },
+      width: 100,
+      overHidden: true,
+      span: 4
+    },
+    {
       label: "工资拨付标准",
       prop: "salaryWithdrawalStandard",
       width: 100,
@@ -757,7 +770,7 @@ export const optionList = {
       span: 4
     },
     {
-      label: "班主任补贴标准",
+      label: "班主任津贴标准",
       prop: "teacherSubsidy",
       width: 140,
       overHidden: true,
@@ -768,7 +781,7 @@ export const optionList = {
       span: 4
     },
     {
-      label: "班主任考核补贴标准",
+      label: "班主任考核津贴标准",
       prop: "teacherAssessSubsidy",
       width: 160,
       overHidden: true,

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

@@ -62,7 +62,7 @@ export const optionList = {
       span: 4
     },
     {
-      label: "职务",
+      label: "岗位",
       prop: "position",
       width: 100,
       overHidden: true,
@@ -89,6 +89,19 @@ export const optionList = {
       span: 4
     },
     {
+      label: "学历",
+      prop: "code",
+      type: "select",
+      dicUrl: "/api/blade-system/dict-biz/dictionary?code=marital_status",
+      props: {
+        label: "dictValue",
+        value: "dictValue"
+      },
+      width: 100,
+      overHidden: true,
+      span: 4
+    },
+    {
       label: "工资拨付标准",
       prop: "salaryWithdrawalStandard",
       width: 100,
@@ -757,7 +770,7 @@ export const optionList = {
       span: 4
     },
     {
-      label: "班主任补贴标准",
+      label: "班主任津贴标准",
       prop: "teacherSubsidy",
       width: 140,
       overHidden: true,
@@ -768,7 +781,7 @@ export const optionList = {
       span: 4
     },
     {
-      label: "班主任考核补贴标准",
+      label: "班主任考核津贴标准",
       prop: "teacherAssessSubsidy",
       width: 160,
       overHidden: true,

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

@@ -62,7 +62,7 @@ export const optionList = {
       span: 4
     },
     {
-      label: "职务",
+      label: "岗位",
       prop: "position",
       width: 100,
       overHidden: true,
@@ -89,6 +89,19 @@ export const optionList = {
       span: 4
     },
     {
+      label: "学历",
+      prop: "code",
+      type: "select",
+      dicUrl: "/api/blade-system/dict-biz/dictionary?code=marital_status",
+      props: {
+        label: "dictValue",
+        value: "dictValue"
+      },
+      width: 100,
+      overHidden: true,
+      span: 4
+    },
+    {
       label: "工资拨付标准",
       prop: "salaryWithdrawalStandard",
       width: 100,
@@ -757,7 +770,7 @@ export const optionList = {
       span: 4
     },
     {
-      label: "班主任补贴标准",
+      label: "班主任津贴标准",
       prop: "teacherSubsidy",
       width: 140,
       overHidden: true,
@@ -768,7 +781,7 @@ export const optionList = {
       span: 4
     },
     {
-      label: "班主任考核补贴标准",
+      label: "班主任考核津贴标准",
       prop: "teacherAssessSubsidy",
       width: 160,
       overHidden: true,

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

@@ -62,7 +62,7 @@ export const optionList = {
       span: 4
     },
     {
-      label: "职务",
+      label: "岗位",
       prop: "position",
       width: 100,
       overHidden: true,
@@ -89,6 +89,19 @@ export const optionList = {
       span: 4
     },
     {
+      label: "学历",
+      prop: "code",
+      type: "select",
+      dicUrl: "/api/blade-system/dict-biz/dictionary?code=marital_status",
+      props: {
+        label: "dictValue",
+        value: "dictValue"
+      },
+      width: 100,
+      overHidden: true,
+      span: 4
+    },
+    {
       label: "工资拨付标准",
       prop: "salaryWithdrawalStandard",
       width: 100,
@@ -757,7 +770,7 @@ export const optionList = {
       span: 4
     },
     {
-      label: "班主任补贴标准",
+      label: "班主任津贴标准",
       prop: "teacherSubsidy",
       width: 140,
       overHidden: true,
@@ -768,7 +781,7 @@ export const optionList = {
       span: 4
     },
     {
-      label: "班主任考核补贴标准",
+      label: "班主任考核津贴标准",
       prop: "teacherAssessSubsidy",
       width: 160,
       overHidden: true,