界面调整

src/views/core/send/index.vue

@@ -3,7 +3,7 @@
     <div class="main-right-box">
           <div class="main-search-box">
 
-            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="标题" prop="title">
         <el-input maxlength="50" v-model="queryParams.title" placeholder="请输入标题" clearable
           @keyup.enter.native="handleQuery" />
@@ -36,7 +36,7 @@
     </el-row>
           </div>
           <el-table border
-                    height="650"
+                    height="646"
                     size="small"
                     v-loading="loading" :data="sendList">
       <el-table-column label="标题" align="center" prop="title" />

src/views/system/workTimeSet/workTime.vue

@@ -31,6 +31,12 @@
                   ref="orgTree"
                 ></org-tree>
               </el-form-item>
+              <el-form-item label="机构类型" prop="orgType">
+                <el-select style="width: 100%;" v-model="queryParams.orgType" placeholder="请选择机构类型">
+                  <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
+                             :value="`${dict.value}`"></el-option>
+                </el-select>
+              </el-form-item>
               <el-form-item label="日期范围">
                 <DataRangePicker
                   v-model="queryParams.range"
@@ -219,7 +225,7 @@ let sDate = new Date();
 let eDate = new Date();
 export default {
   /**  得先引入字典才能使用 */
-  dicts: ["sys_business_type"],
+  dicts: ["sys_business_type",'sys_org_type'],
   /** 引入基础minxins*/
   components: { DataRangePicker, OrgTree, DialogEdit, DialogAdd,DialogDetail },
   data() {
@@ -255,6 +261,7 @@ export default {
         isEnable: null,
         pageNum: 1,
         pageSize: 10,
+        orgType:null,
         range: [sDate, eDate],
       },
       total: 0,