提交统计

src/views/InventoryManagement/inventoryAccount/index.vue

@@ -63,9 +63,7 @@ export default {
   data() {
     return {
       key: 0,
-      search: {
-        isIssue:3,
-      },
+      search: {},
       data: [],
       total: [],
       query: {},
@@ -221,7 +219,6 @@ export default {
           index: 19,
           hide: true,
           showColumn: false,
-          searchValue: 3,
           dicData: [{
             label: "在库",
             value: 3

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

@@ -78,9 +78,17 @@
       "cell": true
     },
     {
+      "label": "计价单位",
+      "prop": "unit",
+      "index": 9,
+      "width": 120,
+      "overHidden":true,
+      "cell": true
+    },
+    {
       "label": "供应商",
       "prop": "corpName",
-      "index": 9,
+      "index": 10,
       "width": 120,
       "overHidden":true,
       "cell": true
@@ -88,7 +96,7 @@
     {
       "label": "供应商地址",
       "prop": "corpAddress",
-      "index": 10,
+      "index": 11,
       "minWidth": 120,
       "overHidden":true,
       "cell": true

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

@@ -1915,8 +1915,75 @@ export const optionList = {
       }],
       index: 105,
       span: 4
-    },
-    {
+    },{
+      label: "出勤类型",
+      prop: "attendanceType",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      index: 106,
+      span: 4
+    },{
+      label: "应出勤天数",
+      prop: "requiredAttendanceDays",
+      width: 100,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 107,
+      span: 4
+    },{
+      label: "实际出勤天数",
+      prop: "actualAttendanceDays",
+      width: 100,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 108,
+      span: 4
+    },{
+      label: "事假",
+      prop: "matterLeave",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 109,
+      span: 4
+    },{
+      label: "病假",
+      prop: "sickLeave",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 110,
+      span: 4
+    },{
+      label: "旷工",
+      prop: "absenteeism",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 111,
+      span: 4
+    },{
       label: "督查",
       prop: "inspectorFines",
       width: 80,
@@ -1925,7 +1992,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 106,
+      index: 112,
       span: 4
     },
     {
@@ -1937,7 +2004,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 107,
+      index: 113,
       span: 4
     },
     {
@@ -1949,7 +2016,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 108,
+      index: 114,
       span: 4
     },
     {
@@ -1961,7 +2028,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 109,
+      index: 115,
       span: 4
     },
     {
@@ -1973,7 +2040,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 110,
+      index: 116,
       span: 4
     },
     {
@@ -1985,7 +2052,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 111,
+      index: 117,
       span: 4
     },
     {
@@ -1997,7 +2064,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 112,
+      index: 118,
       span: 4
     },
     {
@@ -2009,7 +2076,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 113,
+      index: 119,
       span: 4
     },
     {
@@ -2021,7 +2088,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 114,
+      index: 120,
       span: 4
     },
     {
@@ -2033,7 +2100,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 115,
+      index: 121,
       span: 4
     },
     {
@@ -2045,7 +2112,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 116,
+      index: 122,
       span: 4
     },
     {
@@ -2057,7 +2124,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 117,
+      index: 123,
       span: 4
     },
     {
@@ -2069,7 +2136,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 118,
+      index: 124,
       span: 4
     },
     {
@@ -2081,7 +2148,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 119,
+      index: 125,
       span: 4
     },
     {
@@ -2093,7 +2160,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 120,
+      index: 126,
       span: 4
     },
     {
@@ -2105,7 +2172,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 121,
+      index: 127,
       span: 4
     },
     {
@@ -2118,7 +2185,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 122,
+      index: 128,
       span: 4
     },
     {
@@ -2130,7 +2197,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 123,
+      index: 129,
       span: 4
     },
     {
@@ -2142,7 +2209,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 124,
+      index: 130,
       span: 4
     },
     {
@@ -2154,7 +2221,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 125,
+      index: 131,
       span: 4
     },
     {
@@ -2166,7 +2233,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 126,
+      index: 132,
       span: 4
     },
     {
@@ -2179,7 +2246,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 127,
+      index: 133,
       span: 4
     },
     {
@@ -2191,7 +2258,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 128,
+      index: 134,
       span: 4
     },
     {
@@ -2204,7 +2271,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 129,
+      index: 135,
       span: 4
     },
     {
@@ -2216,7 +2283,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 130,
+      index: 136,
       span: 4
     },
     {
@@ -2224,7 +2291,7 @@ export const optionList = {
       prop: "enjoyOfficeTreatment",
       width: 200,
       overHidden: true,
-      index: 131,
+      index: 137,
       span: 4
     },
     {
@@ -2232,7 +2299,7 @@ export const optionList = {
       prop: "salaryRemark",
       width: 80,
       overHidden: true,
-      index: 132,
+      index: 138,
       span: 4
     },
     {
@@ -2240,7 +2307,7 @@ export const optionList = {
       prop: "pauseNoPayRemark",
       width: 80,
       overHidden: true,
-      index: 133,
+      index: 139,
       span: 4
     },
     {
@@ -2248,7 +2315,7 @@ export const optionList = {
       prop: "remarks",
       width: 80,
       overHidden: true,
-      index: 134,
+      index: 140,
       span: 4
     },
     {
@@ -2256,7 +2323,7 @@ export const optionList = {
       prop: "remarksOne",
       width: 80,
       overHidden: true,
-      index: 135,
+      index: 141,
       span: 4
     }
   ]

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

@@ -1914,8 +1914,75 @@ export const optionList = {
       }],
       index: 105,
       span: 4
-    },
-    {
+    },{
+      label: "出勤类型",
+      prop: "attendanceType",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      index: 106,
+      span: 4
+    },{
+      label: "应出勤天数",
+      prop: "requiredAttendanceDays",
+      width: 100,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 107,
+      span: 4
+    },{
+      label: "实际出勤天数",
+      prop: "actualAttendanceDays",
+      width: 100,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 108,
+      span: 4
+    },{
+      label: "事假",
+      prop: "matterLeave",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 109,
+      span: 4
+    },{
+      label: "病假",
+      prop: "sickLeave",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 110,
+      span: 4
+    },{
+      label: "旷工",
+      prop: "absenteeism",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 111,
+      span: 4
+    },{
       label: "督查",
       prop: "inspectorFines",
       width: 80,
@@ -1924,7 +1991,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 106,
+      index: 112,
       span: 4
     },
     {
@@ -1936,7 +2003,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 107,
+      index: 113,
       span: 4
     },
     {
@@ -1948,7 +2015,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 108,
+      index: 114,
       span: 4
     },
     {
@@ -1960,7 +2027,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 109,
+      index: 115,
       span: 4
     },
     {
@@ -1972,7 +2039,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 110,
+      index: 116,
       span: 4
     },
     {
@@ -1984,7 +2051,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 111,
+      index: 117,
       span: 4
     },
     {
@@ -1996,7 +2063,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 112,
+      index: 118,
       span: 4
     },
     {
@@ -2008,7 +2075,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 113,
+      index: 119,
       span: 4
     },
     {
@@ -2020,7 +2087,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 114,
+      index: 120,
       span: 4
     },
     {
@@ -2032,7 +2099,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 115,
+      index: 121,
       span: 4
     },
     {
@@ -2044,7 +2111,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 116,
+      index: 122,
       span: 4
     },
     {
@@ -2056,7 +2123,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 117,
+      index: 123,
       span: 4
     },
     {
@@ -2068,7 +2135,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 118,
+      index: 124,
       span: 4
     },
     {
@@ -2080,7 +2147,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 119,
+      index: 125,
       span: 4
     },
     {
@@ -2092,7 +2159,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 120,
+      index: 126,
       span: 4
     },
     {
@@ -2104,7 +2171,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 121,
+      index: 127,
       span: 4
     },
     {
@@ -2117,7 +2184,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 122,
+      index: 128,
       span: 4
     },
     {
@@ -2129,7 +2196,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 123,
+      index: 129,
       span: 4
     },
     {
@@ -2141,7 +2208,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 124,
+      index: 130,
       span: 4
     },
     {
@@ -2153,7 +2220,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 125,
+      index: 131,
       span: 4
     },
     {
@@ -2165,7 +2232,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 126,
+      index: 132,
       span: 4
     },
     {
@@ -2178,7 +2245,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 127,
+      index: 133,
       span: 4
     },
     {
@@ -2190,7 +2257,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 128,
+      index: 134,
       span: 4
     },
     {
@@ -2203,7 +2270,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 129,
+      index: 135,
       span: 4
     },
     {
@@ -2215,7 +2282,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 130,
+      index: 136,
       span: 4
     },
     {
@@ -2223,7 +2290,7 @@ export const optionList = {
       prop: "enjoyOfficeTreatment",
       width: 200,
       overHidden: true,
-      index: 131,
+      index: 137,
       span: 4
     },
     {
@@ -2231,7 +2298,7 @@ export const optionList = {
       prop: "salaryRemark",
       width: 80,
       overHidden: true,
-      index: 132,
+      index: 138,
       span: 4
     },
     {
@@ -2239,7 +2306,7 @@ export const optionList = {
       prop: "pauseNoPayRemark",
       width: 80,
       overHidden: true,
-      index: 133,
+      index: 139,
       span: 4
     },
     {
@@ -2247,7 +2314,7 @@ export const optionList = {
       prop: "remarks",
       width: 80,
       overHidden: true,
-      index: 134,
+      index: 140,
       span: 4
     },
     {
@@ -2255,7 +2322,7 @@ export const optionList = {
       prop: "remarksOne",
       width: 80,
       overHidden: true,
-      index: 135,
+      index: 141,
       span: 4
     }
   ]

src/views/salaryManagement/kindergarten/js/optionList.js

@@ -1914,8 +1914,75 @@ export const optionList = {
       }],
       index: 105,
       span: 4
-    },
-    {
+    },{
+      label: "出勤类型",
+      prop: "attendanceType",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      index: 106,
+      span: 4
+    },{
+      label: "应出勤天数",
+      prop: "requiredAttendanceDays",
+      width: 100,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 107,
+      span: 4
+    },{
+      label: "实际出勤天数",
+      prop: "actualAttendanceDays",
+      width: 100,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 108,
+      span: 4
+    },{
+      label: "事假",
+      prop: "matterLeave",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 109,
+      span: 4
+    },{
+      label: "病假",
+      prop: "sickLeave",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 110,
+      span: 4
+    },{
+      label: "旷工",
+      prop: "absenteeism",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 111,
+      span: 4
+    },{
       label: "督查",
       prop: "inspectorFines",
       width: 80,
@@ -1924,7 +1991,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 106,
+      index: 112,
       span: 4
     },
     {
@@ -1936,7 +2003,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 107,
+      index: 113,
       span: 4
     },
     {
@@ -1948,7 +2015,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 108,
+      index: 114,
       span: 4
     },
     {
@@ -1960,7 +2027,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 109,
+      index: 115,
       span: 4
     },
     {
@@ -1972,7 +2039,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 110,
+      index: 116,
       span: 4
     },
     {
@@ -1984,7 +2051,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 111,
+      index: 117,
       span: 4
     },
     {
@@ -1996,7 +2063,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 112,
+      index: 118,
       span: 4
     },
     {
@@ -2008,7 +2075,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 113,
+      index: 119,
       span: 4
     },
     {
@@ -2020,7 +2087,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 114,
+      index: 120,
       span: 4
     },
     {
@@ -2032,7 +2099,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 115,
+      index: 121,
       span: 4
     },
     {
@@ -2044,7 +2111,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 116,
+      index: 122,
       span: 4
     },
     {
@@ -2056,7 +2123,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 117,
+      index: 123,
       span: 4
     },
     {
@@ -2068,7 +2135,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 118,
+      index: 124,
       span: 4
     },
     {
@@ -2080,7 +2147,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 119,
+      index: 125,
       span: 4
     },
     {
@@ -2092,7 +2159,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 120,
+      index: 126,
       span: 4
     },
     {
@@ -2104,7 +2171,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 121,
+      index: 127,
       span: 4
     },
     {
@@ -2117,7 +2184,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 122,
+      index: 128,
       span: 4
     },
     {
@@ -2129,7 +2196,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 123,
+      index: 129,
       span: 4
     },
     {
@@ -2141,7 +2208,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 124,
+      index: 130,
       span: 4
     },
     {
@@ -2153,7 +2220,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 125,
+      index: 131,
       span: 4
     },
     {
@@ -2165,7 +2232,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 126,
+      index: 132,
       span: 4
     },
     {
@@ -2178,7 +2245,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 127,
+      index: 133,
       span: 4
     },
     {
@@ -2190,7 +2257,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 128,
+      index: 134,
       span: 4
     },
     {
@@ -2203,7 +2270,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 129,
+      index: 135,
       span: 4
     },
     {
@@ -2215,7 +2282,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 130,
+      index: 136,
       span: 4
     },
     {
@@ -2223,7 +2290,7 @@ export const optionList = {
       prop: "enjoyOfficeTreatment",
       width: 200,
       overHidden: true,
-      index: 131,
+      index: 137,
       span: 4
     },
     {
@@ -2231,7 +2298,7 @@ export const optionList = {
       prop: "salaryRemark",
       width: 80,
       overHidden: true,
-      index: 132,
+      index: 138,
       span: 4
     },
     {
@@ -2239,7 +2306,7 @@ export const optionList = {
       prop: "pauseNoPayRemark",
       width: 80,
       overHidden: true,
-      index: 133,
+      index: 139,
       span: 4
     },
     {
@@ -2247,7 +2314,7 @@ export const optionList = {
       prop: "remarks",
       width: 80,
       overHidden: true,
-      index: 134,
+      index: 140,
       span: 4
     },
     {
@@ -2255,7 +2322,7 @@ export const optionList = {
       prop: "remarksOne",
       width: 80,
       overHidden: true,
-      index: 135,
+      index: 141,
       span: 4
     }
   ]

src/views/salaryManagement/kindergartenLogistics/js/optionList.js

@@ -1914,8 +1914,75 @@ export const optionList = {
       }],
       index: 105,
       span: 4
-    },
-    {
+    },{
+      label: "出勤类型",
+      prop: "attendanceType",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      index: 106,
+      span: 4
+    },{
+      label: "应出勤天数",
+      prop: "requiredAttendanceDays",
+      width: 100,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 107,
+      span: 4
+    },{
+      label: "实际出勤天数",
+      prop: "actualAttendanceDays",
+      width: 100,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 108,
+      span: 4
+    },{
+      label: "事假",
+      prop: "matterLeave",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 109,
+      span: 4
+    },{
+      label: "病假",
+      prop: "sickLeave",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 110,
+      span: 4
+    },{
+      label: "旷工",
+      prop: "absenteeism",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 111,
+      span: 4
+    },{
       label: "督查",
       prop: "inspectorFines",
       width: 80,
@@ -1924,7 +1991,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 106,
+      index: 112,
       span: 4
     },
     {
@@ -1936,7 +2003,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 107,
+      index: 113,
       span: 4
     },
     {
@@ -1948,7 +2015,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 108,
+      index: 114,
       span: 4
     },
     {
@@ -1960,7 +2027,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 109,
+      index: 115,
       span: 4
     },
     {
@@ -1972,7 +2039,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 110,
+      index: 116,
       span: 4
     },
     {
@@ -1984,7 +2051,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 111,
+      index: 117,
       span: 4
     },
     {
@@ -1996,7 +2063,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 112,
+      index: 118,
       span: 4
     },
     {
@@ -2008,7 +2075,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 113,
+      index: 119,
       span: 4
     },
     {
@@ -2020,7 +2087,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 114,
+      index: 120,
       span: 4
     },
     {
@@ -2032,7 +2099,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 115,
+      index: 121,
       span: 4
     },
     {
@@ -2044,7 +2111,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 116,
+      index: 122,
       span: 4
     },
     {
@@ -2056,7 +2123,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 117,
+      index: 123,
       span: 4
     },
     {
@@ -2068,7 +2135,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 118,
+      index: 124,
       span: 4
     },
     {
@@ -2080,7 +2147,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 119,
+      index: 125,
       span: 4
     },
     {
@@ -2092,7 +2159,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 120,
+      index: 126,
       span: 4
     },
     {
@@ -2104,7 +2171,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 121,
+      index: 127,
       span: 4
     },
     {
@@ -2117,7 +2184,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 122,
+      index: 128,
       span: 4
     },
     {
@@ -2129,7 +2196,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 123,
+      index: 129,
       span: 4
     },
     {
@@ -2141,7 +2208,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 124,
+      index: 130,
       span: 4
     },
     {
@@ -2153,7 +2220,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 125,
+      index: 131,
       span: 4
     },
     {
@@ -2165,7 +2232,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 126,
+      index: 132,
       span: 4
     },
     {
@@ -2178,7 +2245,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 127,
+      index: 133,
       span: 4
     },
     {
@@ -2190,7 +2257,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 128,
+      index: 134,
       span: 4
     },
     {
@@ -2203,7 +2270,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 129,
+      index: 135,
       span: 4
     },
     {
@@ -2215,7 +2282,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 130,
+      index: 136,
       span: 4
     },
     {
@@ -2223,7 +2290,7 @@ export const optionList = {
       prop: "enjoyOfficeTreatment",
       width: 200,
       overHidden: true,
-      index: 131,
+      index: 137,
       span: 4
     },
     {
@@ -2231,7 +2298,7 @@ export const optionList = {
       prop: "salaryRemark",
       width: 80,
       overHidden: true,
-      index: 132,
+      index: 138,
       span: 4
     },
     {
@@ -2239,7 +2306,7 @@ export const optionList = {
       prop: "pauseNoPayRemark",
       width: 80,
       overHidden: true,
-      index: 133,
+      index: 139,
       span: 4
     },
     {
@@ -2247,7 +2314,7 @@ export const optionList = {
       prop: "remarks",
       width: 80,
       overHidden: true,
-      index: 134,
+      index: 140,
       span: 4
     },
     {
@@ -2255,7 +2322,7 @@ export const optionList = {
       prop: "remarksOne",
       width: 80,
       overHidden: true,
-      index: 135,
+      index: 141,
       span: 4
     }
   ]

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

@@ -1914,8 +1914,75 @@ export const optionList = {
       }],
       index: 105,
       span: 4
-    },
-    {
+    },{
+      label: "出勤类型",
+      prop: "attendanceType",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      index: 106,
+      span: 4
+    },{
+      label: "应出勤天数",
+      prop: "requiredAttendanceDays",
+      width: 100,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 107,
+      span: 4
+    },{
+      label: "实际出勤天数",
+      prop: "actualAttendanceDays",
+      width: 100,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 108,
+      span: 4
+    },{
+      label: "事假",
+      prop: "matterLeave",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 109,
+      span: 4
+    },{
+      label: "病假",
+      prop: "sickLeave",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 110,
+      span: 4
+    },{
+      label: "旷工",
+      prop: "absenteeism",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 111,
+      span: 4
+    },{
       label: "督查",
       prop: "inspectorFines",
       width: 80,
@@ -1924,7 +1991,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 106,
+      index: 112,
       span: 4
     },
     {
@@ -1936,7 +2003,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 107,
+      index: 113,
       span: 4
     },
     {
@@ -1948,7 +2015,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 108,
+      index: 114,
       span: 4
     },
     {
@@ -1960,7 +2027,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 109,
+      index: 115,
       span: 4
     },
     {
@@ -1972,7 +2039,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 110,
+      index: 116,
       span: 4
     },
     {
@@ -1984,7 +2051,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 111,
+      index: 117,
       span: 4
     },
     {
@@ -1996,7 +2063,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 112,
+      index: 118,
       span: 4
     },
     {
@@ -2008,7 +2075,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 113,
+      index: 119,
       span: 4
     },
     {
@@ -2020,7 +2087,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 114,
+      index: 120,
       span: 4
     },
     {
@@ -2032,7 +2099,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 115,
+      index: 121,
       span: 4
     },
     {
@@ -2044,7 +2111,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 116,
+      index: 122,
       span: 4
     },
     {
@@ -2056,7 +2123,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 117,
+      index: 123,
       span: 4
     },
     {
@@ -2068,7 +2135,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 118,
+      index: 124,
       span: 4
     },
     {
@@ -2080,7 +2147,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 119,
+      index: 125,
       span: 4
     },
     {
@@ -2092,7 +2159,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 120,
+      index: 126,
       span: 4
     },
     {
@@ -2104,7 +2171,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 121,
+      index: 127,
       span: 4
     },
     {
@@ -2117,7 +2184,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 122,
+      index: 128,
       span: 4
     },
     {
@@ -2129,7 +2196,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 123,
+      index: 129,
       span: 4
     },
     {
@@ -2141,7 +2208,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 124,
+      index: 130,
       span: 4
     },
     {
@@ -2153,7 +2220,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 125,
+      index: 131,
       span: 4
     },
     {
@@ -2165,7 +2232,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 126,
+      index: 132,
       span: 4
     },
     {
@@ -2178,7 +2245,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 127,
+      index: 133,
       span: 4
     },
     {
@@ -2190,7 +2257,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 128,
+      index: 134,
       span: 4
     },
     {
@@ -2203,7 +2270,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 129,
+      index: 135,
       span: 4
     },
     {
@@ -2215,7 +2282,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 130,
+      index: 136,
       span: 4
     },
     {
@@ -2223,7 +2290,7 @@ export const optionList = {
       prop: "enjoyOfficeTreatment",
       width: 200,
       overHidden: true,
-      index: 131,
+      index: 137,
       span: 4
     },
     {
@@ -2231,7 +2298,7 @@ export const optionList = {
       prop: "salaryRemark",
       width: 80,
       overHidden: true,
-      index: 132,
+      index: 138,
       span: 4
     },
     {
@@ -2239,7 +2306,7 @@ export const optionList = {
       prop: "pauseNoPayRemark",
       width: 80,
       overHidden: true,
-      index: 133,
+      index: 139,
       span: 4
     },
     {
@@ -2247,7 +2314,7 @@ export const optionList = {
       prop: "remarks",
       width: 80,
       overHidden: true,
-      index: 134,
+      index: 140,
       span: 4
     },
     {
@@ -2255,7 +2322,7 @@ export const optionList = {
       prop: "remarksOne",
       width: 80,
       overHidden: true,
-      index: 135,
+      index: 141,
       span: 4
     }
   ]

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

@@ -1902,8 +1902,7 @@ export const optionList = {
       }],
       index: 104,
       span: 4
-    },
-    {
+    },{
       label: "出勤",
       prop: "attendance",
       width: 80,
@@ -1914,8 +1913,75 @@ export const optionList = {
       }],
       index: 105,
       span: 4
-    },
-    {
+    },{
+      label: "出勤类型",
+      prop: "attendanceType",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      index: 106,
+      span: 4
+    },{
+      label: "应出勤天数",
+      prop: "requiredAttendanceDays",
+      width: 100,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 107,
+      span: 4
+    },{
+      label: "实际出勤天数",
+      prop: "actualAttendanceDays",
+      width: 100,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 108,
+      span: 4
+    },{
+      label: "事假",
+      prop: "matterLeave",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 109,
+      span: 4
+    },{
+      label: "病假",
+      prop: "sickLeave",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 110,
+      span: 4
+    },{
+      label: "旷工",
+      prop: "absenteeism",
+      width: 80,
+      overHidden: true,
+      disabled: true,
+      rules: [{
+        validator: validateDecimal,
+        trigger: "blur"
+      }],
+      index: 111,
+      span: 4
+    },{
       label: "督查",
       prop: "inspectorFines",
       width: 80,
@@ -1924,7 +1990,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 106,
+      index: 112,
       span: 4
     },
     {
@@ -1936,7 +2002,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 107,
+      index: 113,
       span: 4
     },
     {
@@ -1948,7 +2014,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 108,
+      index: 114,
       span: 4
     },
     {
@@ -1960,7 +2026,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 109,
+      index: 115,
       span: 4
     },
     {
@@ -1972,7 +2038,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 110,
+      index: 116,
       span: 4
     },
     {
@@ -1984,7 +2050,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 111,
+      index: 117,
       span: 4
     },
     {
@@ -1996,7 +2062,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 112,
+      index: 118,
       span: 4
     },
     {
@@ -2008,7 +2074,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 113,
+      index: 119,
       span: 4
     },
     {
@@ -2020,7 +2086,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 114,
+      index: 120,
       span: 4
     },
     {
@@ -2032,7 +2098,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 115,
+      index: 121,
       span: 4
     },
     {
@@ -2044,7 +2110,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 116,
+      index: 122,
       span: 4
     },
     {
@@ -2056,7 +2122,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 117,
+      index: 123,
       span: 4
     },
     {
@@ -2068,7 +2134,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 118,
+      index: 124,
       span: 4
     },
     {
@@ -2080,7 +2146,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 119,
+      index: 125,
       span: 4
     },
     {
@@ -2092,7 +2158,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 120,
+      index: 126,
       span: 4
     },
     {
@@ -2104,7 +2170,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 121,
+      index: 127,
       span: 4
     },
     {
@@ -2117,7 +2183,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 122,
+      index: 128,
       span: 4
     },
     {
@@ -2129,7 +2195,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 123,
+      index: 129,
       span: 4
     },
     {
@@ -2141,7 +2207,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 124,
+      index: 130,
       span: 4
     },
     {
@@ -2153,7 +2219,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 125,
+      index: 131,
       span: 4
     },
     {
@@ -2165,7 +2231,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 126,
+      index: 132,
       span: 4
     },
     {
@@ -2178,7 +2244,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 127,
+      index: 133,
       span: 4
     },
     {
@@ -2190,7 +2256,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 128,
+      index: 134,
       span: 4
     },
     {
@@ -2203,7 +2269,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 129,
+      index: 135,
       span: 4
     },
     {
@@ -2215,7 +2281,7 @@ export const optionList = {
         validator: validateDecimal,
         trigger: "blur"
       }],
-      index: 130,
+      index: 136,
       span: 4
     },
     {
@@ -2223,7 +2289,7 @@ export const optionList = {
       prop: "enjoyOfficeTreatment",
       width: 200,
       overHidden: true,
-      index: 131,
+      index: 137,
       span: 4
     },
     {
@@ -2231,7 +2297,7 @@ export const optionList = {
       prop: "salaryRemark",
       width: 80,
       overHidden: true,
-      index: 132,
+      index: 138,
       span: 4
     },
     {
@@ -2239,7 +2305,7 @@ export const optionList = {
       prop: "pauseNoPayRemark",
       width: 80,
       overHidden: true,
-      index: 133,
+      index: 139,
       span: 4
     },
     {
@@ -2247,7 +2313,7 @@ export const optionList = {
       prop: "remarks",
       width: 80,
       overHidden: true,
-      index: 134,
+      index: 140,
       span: 4
     },
     {
@@ -2255,7 +2321,7 @@ export const optionList = {
       prop: "remarksOne",
       width: 80,
       overHidden: true,
-      index: 135,
+      index: 141,
       span: 4
     }
   ]

vue.config.js

@@ -32,10 +32,10 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.3.64:1080',
-        target: 'http://192.168.1.120:1080',
+        // target: 'http://192.168.1.120:1080',
         // target: 'http://124.222.119.174:1080',
         // 打包地址
-        // target: 'http://121.37.83.47:10004',//服务器ip
+        target: 'http://121.37.83.47:10004',//服务器ip
         // target: 'http://trade.tubaosoft.com:10004',//服务器域名
         ws: true,
         pathRewrite: {