1.外出、出差、请假、补卡审批增加是否包含下级单位设置。

2.外出、出差、请假、补卡审批中的申请人可以设置多个身份。
3.但没有审批设置时，按照本机单位/上级单位+上级身份来查询默认审批人。

src/views/base/applicationExamine-detail.vue

@@ -29,10 +29,19 @@
             height="200"
           ></el-select-tree>
         </el-form-item>
+        <el-form-item label="包括下级单位" prop="includeSubordinate">
+          <el-switch 
+            v-model="formModel.includeSubordinate"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+          >
+          </el-switch>
+        </el-form-item>                    
         <el-form-item label="申请者角色" prop="applicationRoleId">
-          <el-select
+          <el-select 
             v-model="formModel.applicationRoleId"
             filterable
+            multiple
             placeholder="请选择"
             style="width: 280px"
           >
@@ -86,15 +95,16 @@
         <el-form-item label="审批等级" prop="level">
           <el-input-number
             v-model="formModel.level"
-            placeholder="请输入备注信息"
+            placeholder="请输入审批等级"
             style="width: 300px"
-            min="1"
+            :min="1"
           ></el-input-number>
+          <span>&nbsp;表示第几轮审批</span>
         </el-form-item>
-        <el-form-item label="请假天数" prop="days">
+        <el-form-item label="请假天数" prop="days" v-if="formModel.type=='2'">
           <el-input-number
             v-model="formModel.days"
-            placeholder="请输入备注信息"
+            placeholder="请输入请假天数"
             style="width: 300px"
           ></el-input-number>
         </el-form-item>
@@ -237,10 +247,17 @@ export default {
           (function () {
             var id = self.formModel.id;
 
+            var submitModel = JSON.parse(JSON.stringify(self.formModel));
+
+            if (submitModel.applicationRoleId != null) {
+              var applicationRoleId = submitModel.applicationRoleId.join(",");
+              submitModel.applicationRoleId = applicationRoleId;
+            }
+
             if (id == null || id.length == 0) {
-              return applicationExamineApi.add(self.formModel);
+              return applicationExamineApi.add(submitModel);
             } else {
-              return applicationExamineApi.update(self.formModel);
+              return applicationExamineApi.update(submitModel);
             }
           })().then(function (response) {
             var jsonData = response.data;
@@ -280,6 +297,12 @@ export default {
         self.loading = false;
 
         if (jsonData.result) {
+          var applicationRoleId = jsonData.data.applicationRoleId;
+
+          if (applicationRoleId != null) {
+            jsonData.data.applicationRoleId = applicationRoleId.split(",");
+          }
+
           self.formModel = jsonData.data;
         } else {
           self.$message.error(jsonData.message + "");

src/views/base/applicationExamine-list.vue

@@ -156,9 +156,17 @@
       <el-table-column
         prop="includeSubordinate"
         label="是否包括下级单位"
-        width="100"
+        width="150"
       >
-      
+        <template slot-scope="{row}">
+            <el-switch 
+                v-model="row.includeSubordinate"
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+                @change="handleUpdate(row)"
+              >
+            </el-switch>
+        </template>
       </el-table-column>
       <el-table-column
         prop="typeName"
@@ -169,8 +177,8 @@
         <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
-      >
+        </template>
+      </el-table-column>
       <el-table-column
         prop="examineCompanyName"
         label="审核人公司"
@@ -466,6 +474,24 @@ export default {
         this.changePage(this.pageIndex);
       }
     },
+    handleUpdate(row){
+        applicationExamineApi.update(row).then((response)=>{
+          var jsonData = response.data;
+
+          if(jsonData.result){
+            this.$message({
+              type: "success",
+              message: "修改成功!",
+            });
+          }
+          else{            
+            this.$message({
+              type: "error",
+              message: "修改失败!" + jsonData.data.message,
+            });
+          }
+        });
+    }
   },
   mounted: function () {
     this.changePage(1);

src/views/base/companyInfo-list.vue

@@ -165,6 +165,11 @@
         label="地区"
         width="90"
       ></el-table-column>
+      <el-table-column
+        prop="typeName"
+        label="单位类别"
+        width="90"
+      ></el-table-column>
       <el-table-column
         prop="remark"
         sort-by="remark_"

src/views/base/personInfo-list.vue

@@ -92,10 +92,11 @@
             >是否包含下级单位</el-checkbox
           >
         </el-form-item>
-        <el-form-item label="角色" prop="roleId">
+        <el-form-item label="身份" prop="roleId">
         <el-select
           v-model="queryModel.roleId"
           filterable
+          clearable
           size="mini"
           placeholder="请选择"
           style="width: 120px"

src/views/base/personRoleInfo-detail.vue

@@ -37,7 +37,7 @@
             <el-option
               v-for="result in personRoleList"
               :key="result.id"
-              :label="result.personRoleName"
+              :label="result.personRoleName + '-' + result.sceneName"
               :value="result.id"
             ></el-option>
           </el-select>

src/views/base/personRoleInfo-list.vue

@@ -136,7 +136,7 @@
           <el-link type="primary" @click="showIconList(row,'default')">默认菜单</el-link>
         </template>
       </el-table-column>
-      <el-table-column prop="remark" label="备注" width="180"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
       <el-table-column label="操作" fixed="right" width="200">
         <template slot-scope="{ row }">
           <el-button size="mini" type="warning" @click="handleEdit(row)"

src/views/sys/dataDictionary-list.vue

@@ -93,7 +93,7 @@
       ></el-table-column>
       <el-table-column prop="name" sort-by="name_" label="名称" sortable="custom" width="180"></el-table-column>
       <el-table-column prop="value" sort-by="value_" label="数值" sortable="custom" width="180"></el-table-column>
-      <el-table-column prop="sortNo" sort-by="sort_no" label="排序号" sortable="custom" width="180"></el-table-column>
+      <el-table-column prop="sortNo" sort-by="sort_no" label="排序号" sortable="custom"></el-table-column>
       <el-table-column label="操作" fixed="right" width="200">
         <template slot-scope="{row}">
           <el-row v-if="row.dataType=='1'">