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

src/util/validate.js

@@ -270,6 +270,9 @@ export function validatenumord(num, type) {
   } else if (type == 2) {
     regName = /[^\d.]/g;
     if (!regName.test(num)) return false;
+  }else if(type==3){
+    regName=/[^(-?\d.)]/g;
+    if (!regName.test(num)) return false;
   }
   return true;
 }

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -137,6 +137,7 @@
               type="date"
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd 00:00:00"
+              :disabled="detailData.status == 1"
               @change="businesDateChange"
             >
             </el-date-picker>

src/views/exportTrade/salesContract/detailsPage.vue

@@ -167,6 +167,7 @@
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd 00:00:00"
               @change="businesDateChange"
+              :disabled="detailData.status == 1"
             >
             </el-date-picker>
           </template>

src/views/salaryManagement/highSchool/detailsPage.vue

@@ -129,6 +129,9 @@
           <template slot="workloadSalaryLabel">
             <el-tag>工作量工资:</el-tag>
           </template>
+          <template slot="dailyAssessmentSalaryLabel">
+            <el-tag>日常考核工资:</el-tag>
+          </template>
           <template slot="awardSalaryLabel">
             <el-tag>奖励工资:</el-tag>
           </template>
@@ -279,6 +282,51 @@
               @change="salaryAdd(crudForm)"
             />
           </template>
+          <template
+            slot="virtualDailyAssessmentCriteriaForm"
+            slot-scope="{ column, disabled }"
+          >
+            <el-input
+              :disabled="disabled"
+              :placeholder="'请输入 ' + column.label"
+              v-model="crudForm.virtualDailyAssessmentCriteria"
+              @change="salaryAdd(crudForm)"
+            />
+          </template>
+          <template
+            slot="virtualDoubleCeaseForm"
+            slot-scope="{ column, disabled }"
+          >
+            <el-input
+              :disabled="disabled"
+              :placeholder="'请输入 ' + column.label"
+              v-model="crudForm.virtualDoubleCease"
+              @change="salaryAdd(crudForm)"
+            />
+          </template>
+          <!-- //3.日常考核工资 =日常考核工资-虚拟日常考核标准 -->
+          <template
+            slot="dailyAssessmentSalaryForm"
+            slot-scope="{ column, disabled }"
+          >
+            <el-input
+              :disabled="disabled"
+              :placeholder="'请输入 ' + column.label"
+              v-model="crudForm.dailyAssessmentSalary"
+              @change="salaryAdd(crudForm)"
+            />
+          </template>
+          <template
+            slot="virtualDailyAssessmentCriteriaForm"
+            slot-scope="{ column, disabled }"
+          >
+            <el-input
+              :disabled="disabled"
+              :placeholder="'请输入 ' + column.label"
+              v-model="crudForm.virtualDailyAssessmentCriteria"
+              @change="salaryAdd(crudForm)"
+            />
+          </template>
           <!-- 4.绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5 -->
           <template
             slot="termPerformanceSalaryForm"
@@ -1689,7 +1737,13 @@ export default {
         numCal(row.customFour) +
         numCal(row.customFive) +
         numCal(row.customSix) +
-        numCal(row.customSeven);
+        numCal(row.customSeven) -
+        numCal(row.virtualDailyAssessmentCriteria) -
+        numCal(row.virtualDoubleCease);
+      //3.日常考核工资 =日常考核工资-虚拟日常考核标准
+      row.dailyAssessmentSalary =
+        numCal(row.dailyAssessmentSalary) -
+        numCal(row.virtualDailyAssessmentCriteria);
       // 4.绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5
       row.customizeFour =
         numCal(row.termPerformanceSalary) +

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

@@ -4,7 +4,7 @@ import {
 } from "@/util/validate";
 const validateDecimal = (rule, value, callback) => {
   if (value != "") {
-    if (validatenumord(value, 1)) {
+    if (validatenumord(value, 3)) {
       callback(new Error("请输入数字"));
     } else {
       callback();
@@ -35,7 +35,7 @@ export const optionList = {
   delBtn: false,
   // refreshBtn: false,
   menuWidth: 100,
-  // labelWidth:250,
+  labelWidth:100,
   stripe: true,
   dialogFullscreen: true,
   column: [{
@@ -286,6 +286,27 @@ export const optionList = {
       span: 4
     },
     {
+      label: "双休日工作量工资标准",
+      prop: "doubleCease",
+      width: 150,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },    {
+      label: "虚拟双休日工作量工资标准",
+      prop: "virtualDoubleCease",
+      width: 170,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "月份工作量",
       prop: "monthHour",
       width: 100,
@@ -462,6 +483,17 @@ export const optionList = {
       span: 4
     },
     {
+      label: "虚拟日常考核标准",
+      prop: "virtualDailyAssessmentCriteria",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "日常考核工资",
       prop: "dailyAssessmentSalary",
       width: 100,

src/views/salaryManagement/juniorhighSchool/detailsPage.vue

@@ -129,6 +129,9 @@
           <template slot="workloadSalaryLabel">
             <el-tag>工作量工资:</el-tag>
           </template>
+          <template slot="dailyAssessmentSalaryLabel">
+            <el-tag>日常考核工资:</el-tag>
+          </template>
           <template slot="awardSalaryLabel">
             <el-tag>奖励工资:</el-tag>
           </template>
@@ -279,6 +282,51 @@
               @change="salaryAdd(crudForm)"
             />
           </template>
+          <template
+            slot="virtualDailyAssessmentCriteriaForm"
+            slot-scope="{ column, disabled }"
+          >
+            <el-input
+              :disabled="disabled"
+              :placeholder="'请输入 ' + column.label"
+              v-model="crudForm.virtualDailyAssessmentCriteria"
+              @change="salaryAdd(crudForm)"
+            />
+          </template>
+          <template
+            slot="virtualDoubleCeaseForm"
+            slot-scope="{ column, disabled }"
+          >
+            <el-input
+              :disabled="disabled"
+              :placeholder="'请输入 ' + column.label"
+              v-model="crudForm.virtualDoubleCease"
+              @change="salaryAdd(crudForm)"
+            />
+          </template>
+          <!-- //3.日常考核工资 =日常考核工资-虚拟日常考核标准 -->
+          <template
+            slot="dailyAssessmentSalaryForm"
+            slot-scope="{ column, disabled }"
+          >
+            <el-input
+              :disabled="disabled"
+              :placeholder="'请输入 ' + column.label"
+              v-model="crudForm.dailyAssessmentSalary"
+              @change="salaryAdd(crudForm)"
+            />
+          </template>
+          <template
+            slot="virtualDailyAssessmentCriteriaForm"
+            slot-scope="{ column, disabled }"
+          >
+            <el-input
+              :disabled="disabled"
+              :placeholder="'请输入 ' + column.label"
+              v-model="crudForm.virtualDailyAssessmentCriteria"
+              @change="salaryAdd(crudForm)"
+            />
+          </template>
           <!-- 4.绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5 -->
           <template
             slot="termPerformanceSalaryForm"
@@ -1689,7 +1737,13 @@ export default {
         numCal(row.customFour) +
         numCal(row.customFive) +
         numCal(row.customSix) +
-        numCal(row.customSeven);
+        numCal(row.customSeven) -
+        numCal(row.virtualDailyAssessmentCriteria) -
+        numCal(row.virtualDoubleCease);
+      //3.日常考核工资 =日常考核工资-虚拟日常考核标准
+      row.dailyAssessmentSalary =
+        numCal(row.dailyAssessmentSalary) -
+        numCal(row.virtualDailyAssessmentCriteria);
       // 4.绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5
       row.customizeFour =
         numCal(row.termPerformanceSalary) +

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

@@ -4,7 +4,7 @@ import {
 } from "@/util/validate";
 const validateDecimal = (rule, value, callback) => {
   if (value != "") {
-    if (validatenumord(value, 1)) {
+    if (validatenumord(value, 3)) {
       callback(new Error("请输入数字"));
     } else {
       callback();
@@ -35,7 +35,7 @@ export const optionList = {
   delBtn: false,
   // refreshBtn: false,
   menuWidth: 100,
-  // labelWidth:250,
+  labelWidth:100,
   stripe: true,
   dialogFullscreen: true,
   column: [{
@@ -286,6 +286,27 @@ export const optionList = {
       span: 4
     },
     {
+      label: "双休日工作量工资标准",
+      prop: "doubleCease",
+      width: 150,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },    {
+      label: "虚拟双休日工作量工资标准",
+      prop: "virtualDoubleCease",
+      width: 170,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "月份工作量",
       prop: "monthHour",
       width: 100,
@@ -462,6 +483,17 @@ export const optionList = {
       span: 4
     },
     {
+      label: "虚拟日常考核标准",
+      prop: "virtualDailyAssessmentCriteria",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "日常考核工资",
       prop: "dailyAssessmentSalary",
       width: 100,

src/views/salaryManagement/logisticsDepartment/detailsPage.vue

@@ -129,6 +129,9 @@
           <template slot="workloadSalaryLabel">
             <el-tag>工作量工资:</el-tag>
           </template>
+          <template slot="dailyAssessmentSalaryLabel">
+            <el-tag>日常考核工资:</el-tag>
+          </template>
           <template slot="awardSalaryLabel">
             <el-tag>奖励工资:</el-tag>
           </template>
@@ -279,6 +282,51 @@
               @change="salaryAdd(crudForm)"
             />
           </template>
+          <template
+            slot="virtualDailyAssessmentCriteriaForm"
+            slot-scope="{ column, disabled }"
+          >
+            <el-input
+              :disabled="disabled"
+              :placeholder="'请输入 ' + column.label"
+              v-model="crudForm.virtualDailyAssessmentCriteria"
+              @change="salaryAdd(crudForm)"
+            />
+          </template>
+          <template
+            slot="virtualDoubleCeaseForm"
+            slot-scope="{ column, disabled }"
+          >
+            <el-input
+              :disabled="disabled"
+              :placeholder="'请输入 ' + column.label"
+              v-model="crudForm.virtualDoubleCease"
+              @change="salaryAdd(crudForm)"
+            />
+          </template>
+          <!-- //3.日常考核工资 =日常考核工资-虚拟日常考核标准 -->
+          <template
+            slot="dailyAssessmentSalaryForm"
+            slot-scope="{ column, disabled }"
+          >
+            <el-input
+              :disabled="disabled"
+              :placeholder="'请输入 ' + column.label"
+              v-model="crudForm.dailyAssessmentSalary"
+              @change="salaryAdd(crudForm)"
+            />
+          </template>
+          <template
+            slot="virtualDailyAssessmentCriteriaForm"
+            slot-scope="{ column, disabled }"
+          >
+            <el-input
+              :disabled="disabled"
+              :placeholder="'请输入 ' + column.label"
+              v-model="crudForm.virtualDailyAssessmentCriteria"
+              @change="salaryAdd(crudForm)"
+            />
+          </template>
           <!-- 4.绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5 -->
           <template
             slot="termPerformanceSalaryForm"
@@ -1689,7 +1737,13 @@ export default {
         numCal(row.customFour) +
         numCal(row.customFive) +
         numCal(row.customSix) +
-        numCal(row.customSeven);
+        numCal(row.customSeven) -
+        numCal(row.virtualDailyAssessmentCriteria) -
+        numCal(row.virtualDoubleCease);
+      //3.日常考核工资 =日常考核工资-虚拟日常考核标准
+      row.dailyAssessmentSalary =
+        numCal(row.dailyAssessmentSalary) -
+        numCal(row.virtualDailyAssessmentCriteria);
       // 4.绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5
       row.customizeFour =
         numCal(row.termPerformanceSalary) +

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

@@ -4,7 +4,7 @@ import {
 } from "@/util/validate";
 const validateDecimal = (rule, value, callback) => {
   if (value != "") {
-    if (validatenumord(value, 1)) {
+    if (validatenumord(value, 3)) {
       callback(new Error("请输入数字"));
     } else {
       callback();
@@ -35,7 +35,7 @@ export const optionList = {
   delBtn: false,
   // refreshBtn: false,
   menuWidth: 100,
-  // labelWidth:250,
+  labelWidth:100,
   stripe: true,
   dialogFullscreen: true,
   column: [{
@@ -286,6 +286,27 @@ export const optionList = {
       span: 4
     },
     {
+      label: "双休日工作量工资标准",
+      prop: "doubleCease",
+      width: 150,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },    {
+      label: "虚拟双休日工作量工资标准",
+      prop: "virtualDoubleCease",
+      width: 170,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "月份工作量",
       prop: "monthHour",
       width: 100,
@@ -462,6 +483,17 @@ export const optionList = {
       span: 4
     },
     {
+      label: "虚拟日常考核标准",
+      prop: "virtualDailyAssessmentCriteria",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "日常考核工资",
       prop: "dailyAssessmentSalary",
       width: 100,

src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -129,6 +129,9 @@
           <template slot="workloadSalaryLabel">
             <el-tag>工作量工资:</el-tag>
           </template>
+          <template slot="dailyAssessmentSalaryLabel">
+            <el-tag>日常考核工资:</el-tag>
+          </template>
           <template slot="customizeFourLabel">
             <el-tag>绩效工资:</el-tag>
           </template>
@@ -282,6 +285,51 @@
               @change="salaryAdd(crudForm)"
             />
           </template>
+          <template
+            slot="virtualDailyAssessmentCriteriaForm"
+            slot-scope="{ column, disabled }"
+          >
+            <el-input
+              :disabled="disabled"
+              :placeholder="'请输入 ' + column.label"
+              v-model="crudForm.virtualDailyAssessmentCriteria"
+              @change="salaryAdd(crudForm)"
+            />
+          </template>
+          <template
+            slot="virtualDoubleCeaseForm"
+            slot-scope="{ column, disabled }"
+          >
+            <el-input
+              :disabled="disabled"
+              :placeholder="'请输入 ' + column.label"
+              v-model="crudForm.virtualDoubleCease"
+              @change="salaryAdd(crudForm)"
+            />
+          </template>
+          <!-- //3.日常考核工资 =日常考核工资-虚拟日常考核标准 -->
+          <template
+            slot="dailyAssessmentSalaryForm"
+            slot-scope="{ column, disabled }"
+          >
+            <el-input
+              :disabled="disabled"
+              :placeholder="'请输入 ' + column.label"
+              v-model="crudForm.dailyAssessmentSalary"
+              @change="salaryAdd(crudForm)"
+            />
+          </template>
+          <template
+            slot="virtualDailyAssessmentCriteriaForm"
+            slot-scope="{ column, disabled }"
+          >
+            <el-input
+              :disabled="disabled"
+              :placeholder="'请输入 ' + column.label"
+              v-model="crudForm.virtualDailyAssessmentCriteria"
+              @change="salaryAdd(crudForm)"
+            />
+          </template>
           <!-- 4.绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5 -->
           <template
             slot="termPerformanceSalaryForm"
@@ -1684,7 +1732,7 @@ export default {
         numCal(row.rankSalary) +
         numCal(row.salaryBase) +
         numCal(row.performanceAward);
-      //2. 工作量工资 = 月份工作量工资+代课工作量工资+双休日工作量工资+工作量工资1+…+工作量工资5
+      //2. 工作量工资 = 月份工作量工资+代课工作量工资+双休日工作量工资+工作量工资1+…+工作量工资5-虚拟工作量工资标准-虚拟双休日工作量工资标准
       row.workloadSalary =
         numCal(row.momthWorkloadSalary) +
         numCal(row.customTwo) +
@@ -1693,7 +1741,13 @@ export default {
         numCal(row.customFour) +
         numCal(row.customFive) +
         numCal(row.customSix) +
-        numCal(row.customSeven);
+        numCal(row.customSeven) -
+        numCal(row.virtualDailyAssessmentCriteria) -
+        numCal(row.virtualDoubleCease);
+      //3.日常考核工资 =日常考核工资-虚拟日常考核标准
+      row.dailyAssessmentSalary =
+        numCal(row.dailyAssessmentSalary) -
+        numCal(row.virtualDailyAssessmentCriteria);
       // 4.绩效工资=学期绩效工资+学期绩效工资1+..+学期绩效工资5
       row.customizeFour =
         numCal(row.termPerformanceSalary) +

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

@@ -4,7 +4,7 @@ import {
 } from "@/util/validate";
 const validateDecimal = (rule, value, callback) => {
   if (value != "") {
-    if (validatenumord(value, 1)) {
+    if (validatenumord(value, 3)) {
       callback(new Error("请输入数字"));
     } else {
       callback();
@@ -35,7 +35,7 @@ export const optionList = {
   delBtn: false,
   // refreshBtn: false,
   menuWidth: 100,
-  // labelWidth:250,
+  labelWidth:100,
   stripe: true,
   dialogFullscreen: true,
   column: [{
@@ -286,6 +286,27 @@ export const optionList = {
       span: 4
     },
     {
+      label: "双休日工作量工资标准",
+      prop: "doubleCease",
+      width: 150,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },    {
+      label: "虚拟双休日工作量工资标准",
+      prop: "virtualDoubleCease",
+      width: 170,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "月份工作量",
       prop: "monthHour",
       width: 100,
@@ -462,6 +483,17 @@ export const optionList = {
       span: 4
     },
     {
+      label: "虚拟日常考核标准",
+      prop: "virtualDailyAssessmentCriteria",
+      width: 120,
+      overHidden: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      span: 4
+    },
+    {
       label: "日常考核工资",
       prop: "dailyAssessmentSalary",
       width: 100,