Эх сурвалжийг харах

修复安全检查任务搜索框样式

凉纪 2 жил өмнө
parent
commit
9d2e089cdb

+ 4 - 2
src/assets/styles/ruoyi.scss

@@ -279,9 +279,11 @@
    font-size:13px!important;
  }
  .el-input__inner{
-   font-size:13px!important;
+   font-size:12px!important;
+ }
+ input[type=text]::placeholder{
+   font-size: 12px;
  }
-
  .el-button--mini{
    font-size: 13px!important;
  }

+ 17 - 2
src/components/orgTreeSelect/index.vue

@@ -2,10 +2,10 @@
   <!--  弹出框  -->
   <el-popover placement="bottom-start" :disabled="disabled" v-model="visible">
     <!--  tag盒子  -->
-    <div slot="reference" class="tags-box" :class="!disabled|| 'tags-box-disabled'">
+    <div slot="reference" class="tags-box" :class="{'tags-box-disabled':!disabled,'tags-box-mini':size === 'mini'}">
       <span v-show="sNodeList.length > 0" class="tags-num">{{sNodeList.length}}</span>
       <i v-if="sNodeList.length > 0 && !disabled" class="el-icon-circle-close close-icon" @click="clear"></i>
-      <el-tag type="success" v-for="v in sNodeList" :key="v.id">{{ v.shortName }}</el-tag>
+      <el-tag type="success" :size="size==='mini' && 'mini'" v-for="v in sNodeList" :key="v.id">{{ v.shortName }}</el-tag>
     </div>
     <!--  文本框    -->
     <el-input style="width: 100%; margin-bottom: 20px" v-model="queryForm.value" @input="serchTreeHandler"
@@ -61,6 +61,10 @@ export default {
     customRequest: {
       type: Function,
     },
+    size:{
+      type: String,
+      default: 'default',
+    },
     //组件禁用
     disabled: {
       type: Boolean,
@@ -323,6 +327,17 @@ export default {
 .tags-box-disabled{
   cursor: default;
 }
+.tags-box-mini{
+  min-height: 32px;
+  max-height: 32px;
+  line-height: 32px;
+  > span {
+    margin: 0 5px;
+  }
+  >.tags-num{
+    line-height: 38px;
+  }
+}
 .tags-num{
   color:#ccc;
   position: absolute;

+ 28 - 24
src/views/check/task/index.vue

@@ -23,6 +23,7 @@
         >
           <el-form-item label="检查名称" prop="title">
             <el-input
+              style="width: 200px;"
               v-model="queryParams.title"
               placeholder="请输入检查名称"
               clearable
@@ -66,6 +67,7 @@
             prop="planStartTime"
           >
             <el-date-picker
+              style="width: 200px;"
               v-model="queryParams.planStartTime"
               :clearable="timeClearable"
               type="date"
@@ -77,6 +79,7 @@
           </el-form-item>
           <el-form-item label="检查状态" prop="status">
             <el-select
+              style="width: 200px;"
               v-model="queryParams.status"
               placeHolder="请选择"
               clearable
@@ -89,36 +92,37 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-row>
-            <el-form-item label="受检机构" prop="orgName">
-              <!-- <el-input
-                v-model="queryParams.orgName"
-                placeholder="请输入受检机构"
-                clearable
-                @keyup.enter.native="handleQuery"
-                :maxlength="50" @input="inputRestriction"
-              /> -->
+          <el-form-item label="受检机构" prop="orgName">
+            <!-- <el-input
+              v-model="queryParams.orgName"
+              placeholder="请输入受检机构"
+              clearable
+              @keyup.enter.native="handleQuery"
+              :maxlength="50" @input="inputRestriction"
+            /> -->
+            <div style="width: 200px;height: 30px;">
               <org-tree-select
+                size="mini"
                 v-model="queryParams.checkOrgIds"
                 ref="checkorgTreeSelect"
                 :disable="true"
                 @change="getList"
               >
               </org-tree-select>
-            </el-form-item>
-            <el-form-item style="margin-left: 50px">
-              <el-button
-                type="primary"
-                icon="el-icon-search"
-                size="mini"
-                @click="getList"
-                >搜索</el-button
-              >
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-                >重置</el-button
-              >
-            </el-form-item>
-          </el-row>
+            </div>
+          </el-form-item>
+          <el-form-item style="margin-left: 35px">
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="getList"
+            >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置</el-button
+            >
+          </el-form-item>
         </el-form>
         <!--    按纽    -->
         <el-row :gutter="10" class="mb8">
@@ -423,7 +427,7 @@ export default {
     showRegisterBtn(row) {
       let userRoleId = this.roleList.map((r) => r.roleId);
       let taskRoleId = row.roles.map((r) => r.roleId);
- 
+
       return (
         row.status != 3 &&
         ((row.checkOrgId == this.orgId &&

+ 7 - 7
src/views/safetycheck/checkRegister/index.vue

@@ -62,13 +62,13 @@
           </el-form-item>
           <el-row>
             <el-form-item label="受检机构" prop="orgName">
-              <org-tree-select
-                v-model="queryParams.checkOrgIds"
-                ref="checkorgTreeSelect"
-                :disable="true"
-                @change="getList"
-              >
-              </org-tree-select>
+                <org-tree-select
+                  v-model="queryParams.checkOrgIds"
+                  ref="checkorgTreeSelect"
+                  :disable="true"
+                  @change="getList"
+                >
+                </org-tree-select>
             </el-form-item>
             <el-form-item style="margin-left: 50px">
               <el-button