添加审批类型

src/views/base/applicationExamine-detail.vue

@@ -20,7 +20,7 @@
         :rules="ruleValidate"
         :label-width="'130px'"
       >
-      <el-form-item label="申请者公司" prop="applicationCompanyId">
+        <el-form-item label="申请者公司" prop="applicationCompanyId">
           <el-select-tree
             :props="props"
             :options="companyResult"
@@ -30,20 +30,20 @@
           ></el-select-tree>
         </el-form-item>
         <el-form-item label="申请者角色" prop="applicationRoleId">
-        <el-select
-          v-model="formModel.applicationRoleId"
-          filterable
-          placeholder="请选择"
-          style="width: 280px"
-        >
-          <el-option
-            v-for="role in applicationRoleResult"
-            :key="role.id"
-            :label="role.personRoleName"
-            :value="role.id"
-          ></el-option>
-        </el-select>
-      </el-form-item>
+          <el-select
+            v-model="formModel.applicationRoleId"
+            filterable
+            placeholder="请选择"
+            style="width: 280px"
+          >
+            <el-option
+              v-for="role in applicationRoleResult"
+              :key="role.id"
+              :label="role.personRoleName"
+              :value="role.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="审核人公司" prop="examineCompanyId">
           <el-select-tree
             :props="props"
@@ -55,18 +55,48 @@
         </el-form-item>
         <el-form-item label="审核人角色" prop="examineRoleId">
           <el-select
-          v-model="formModel.examineRoleId"
-          filterable
-          placeholder="请选择"
-          style="width: 280px"
-        >
-          <el-option
-            v-for="role in examineRoleResult"
-            :key="role.id"
-            :label="role.personRoleName"
-            :value="role.id"
-          ></el-option>
-        </el-select>
+            v-model="formModel.examineRoleId"
+            filterable
+            placeholder="请选择"
+            style="width: 280px"
+          >
+            <el-option
+              v-for="role in examineRoleResult"
+              :key="role.id"
+              :label="role.personRoleName"
+              :value="role.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审批类型" prop="type">
+          <el-select
+            v-model="formModel.type"
+            filterable
+            placeholder="请选择"
+            style="width: 280px"
+          >
+            <el-option
+              v-for="result in examineTypeResult"
+              :key="result.value"
+              :label="result.name"
+              :value="result.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审批等级" prop="level">
+          <el-input-number
+            v-model="formModel.level"
+            placeholder="请输入备注信息"
+            style="width: 300px"
+            min="1"
+          ></el-input-number>
+        </el-form-item>
+        <el-form-item label="请假天数" prop="days">
+          <el-input-number
+            v-model="formModel.days"
+            placeholder="请输入备注信息"
+            style="width: 300px"
+          ></el-input-number>
         </el-form-item>
         <el-form-item label="备注信息" prop="remark">
           <el-input
@@ -89,12 +119,12 @@
 import Constant from "@/constant";
 import applicationExamineApi from "@/api/base/applicationExamine";
 import companyInfoApi from "@/api/base/companyInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
 import personRoleInfoApi from "@/api/base/personRoleInfo";
 
 import SelectTree from "@/components/SelectTree";
 
 export default {
-  
   components: {
     "el-select-tree": SelectTree,
   },
@@ -115,6 +145,9 @@ export default {
         examineCompanyId: [
           { required: true, message: "审核人公司不能为空", trigger: "blur" },
         ],
+        type: [
+          { required: true, message: "请选择审批类型", trigger: "blur" },
+        ]
       },
       showDialog: true,
       loading: false,
@@ -126,9 +159,10 @@ export default {
         label: "name",
         children: "children",
       },
-      applicationRoleResult:[],
-      examineRoleResult:[],
+      applicationRoleResult: [],
+      examineRoleResult: [],
       companyResult: [],
+      examineTypeResult: [],
     };
   },
   created() {
@@ -141,7 +175,15 @@ export default {
         }
       }
     });
-  },watch: {
+
+    var formData = new FormData();
+    formData.append("catalogName", "审批类型");
+    dataDictionaryApi.findByCatalogName(formData).then((response) => {
+      var jsonData = response.data;
+      this.examineTypeResult = jsonData.data;
+    });
+  },
+  watch: {
     "formModel.applicationCompanyId": function (val, oldval) {
       if (val != null && val != "") {
         var self = this;
@@ -160,7 +202,6 @@ export default {
             }
           }
         });
-
       }
     },
     "formModel.examineCompanyId": function (val, oldval) {
@@ -181,9 +222,8 @@ export default {
             }
           }
         });
-
       }
-    }
+    },
   },
   methods: {
     closeDialog() {

src/views/base/applicationExamine-list.vue

@@ -106,7 +106,7 @@
       <el-table-column
         prop="applicationRoleName"
         label="申请者角色"
-        width="180"
+        width="150"
       ></el-table-column>
       <el-table-column
         prop="examineCompanyName"
@@ -116,14 +116,34 @@
       <el-table-column
         prop="examineRoleName"
         label="审核人角色"
-        width="180"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="typeName"
+        label="审批类型"
+        width="100"
+      ></el-table-column>
+      <el-table-column prop="level" label="审批等级" width="100">
+        <template slot-scope="{ row }">
+          <span v-if="row.level != '' && row.level != null"
+            >lv.{{ row.level }}</span
+          >
+          <span v-else
+            >{{ row.level }}</span
+          >
+        </template></el-table-column
+      >
+      <el-table-column
+        prop="days"
+        label="请假天数"
+        width="100"
       ></el-table-column>
       <el-table-column
         prop="remark"
         label="备注信息"
-        width="180"
+        width="150"
       ></el-table-column>
-      <el-table-column label="操作">
+      <el-table-column label="操作" width="150">
         <template slot-scope="{ row }">
           <el-button size="mini" type="warning" @click="handleEdit(row)"
             >编辑</el-button
@@ -194,7 +214,7 @@ export default {
         label: "name",
         children: "children",
       },
-      companyResult: []
+      companyResult: [],
     };
   },
   created() {
@@ -231,7 +251,10 @@ export default {
         "applicationCompanyId",
         self.queryModel.applicationCompanyId
       );
-      formData.append("applicationSubordinate", self.queryModel.applicationSubordinate);
+      formData.append(
+        "applicationSubordinate",
+        self.queryModel.applicationSubordinate
+      );
       formData.append("examineRoleId", self.queryModel.examineRoleId);
       if (self.queryModel.examineCompanyId == null) {
         self.queryModel.examineCompanyId = "";