yuwandanmian пре 1 година
родитељ
комит
e630b8feac

+ 5 - 0
src/styles/custom.scss

@@ -14,4 +14,9 @@
   background: #f1f6ff;
   color: #13171e;
   border-bottom: 0px;
+}
+
+// 搜索button
+.long-btn {
+  width: 240px;
 }

+ 5 - 5
src/views/data/query/adviceSearch.vue

@@ -13,7 +13,6 @@
               <el-option label="或者" :value="1" />
               <el-option label="不包含" :value="2" />
             </el-select>
-            <span v-if="index != 0" class="pind10" />
             <el-select v-model="item.key" class="width150" filterable placeholder="请选择" @change="funSelect(index)">
               <!-- fieldList -->
               <el-option v-for="(item, index) in fieldList" :key="index" :label="item.name" :value="item.id" />
@@ -135,8 +134,8 @@
             <span class="pind10" />
             <!-- 增减重置选项按钮开始 -->
             <span>
-              <el-button v-if="index != 0" :disabled="formData1.seniorList.length == 1" type="primary" icon="el-icon-minus" @click="funDel(index)" />
-              <el-button v-if="index == formData1.seniorList.length - 1" type="primary" icon="el-icon-plus" @click="funAdd" />
+              <el-button :disabled="formData1.seniorList.length == 1" type="primary" icon="el-icon-minus" @click="funDel(index)" />
+              <el-button type="primary" icon="el-icon-plus" @click="funAdd" />
             </span>
             <!-- 增减重置选项按钮结束 -->
           </el-form-item>
@@ -201,8 +200,8 @@
         </el-form>
       </div>
       <div class="fBtn" style="position: relative">
-        <el-button style="position: absolute; right: 270px" @click="reset">重置条件</el-button>
-        <el-button type="primary" @click="seachFunQuery">检索</el-button>
+        <el-button style="position: absolute; right: 0px" @click="reset">重置条件</el-button>
+        <el-button type="primary" class="long-btn" @click="seachFunQuery">检索</el-button>
       </div>
     </div>
     <div class="tableBox">
@@ -754,6 +753,7 @@ export default {
     font-size: 24px;
     font-weight: bold;
     margin-top: 10px;
+    margin-bottom: 20px;
   }
   .selects {
     width: 100%;

+ 3 - 3
src/views/data/query/index.vue

@@ -126,8 +126,8 @@
             <span class="pind10"></span>
             <!-- 增减重置选项按钮开始 -->
             <span>
-              <el-button :disabled="formData1.seniorList.length == 1" type="primary" icon="el-icon-minus" @click="funDel(index)"></el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="funAdd" v-if="index == 0"></el-button>
+              <el-button type="primary" icon="el-icon-minus" @click="funDel(index)"></el-button>
+              <el-button type="primary" icon="el-icon-plus" @click="funAdd"></el-button>
             </span>
             <!-- 增减重置选项按钮结束 -->
           </el-form-item>
@@ -174,7 +174,7 @@
       </div>
       <div class="fBtn" style="position: relative">
         <el-button style="position: absolute; right: 30px" @click="reset">重置条件</el-button>
-        <el-button type="primary" @click="funQuery(1)">检索</el-button>
+        <el-button type="primary" class="long-btn" @click="funQuery(1)">检索</el-button>
       </div>
     </div>
     <div class="tableBox">

+ 9 - 15
src/views/outpatient/case/index.vue

@@ -7,7 +7,6 @@
         <el-form-item label="" v-for="(item, index) of form.field" :key="index">
           <!-- 关系 -->
           <el-select
-              v-if="index != 0"
               v-model="item.select_type"
               filterable
               placeholder=""
@@ -41,14 +40,12 @@
           <el-input v-else v-model="item.value" :disabled="item.lock" placeholder="请输入" style="width: 237px;" />
           <span class="btn-group" :class="{'btn-group1': form.field.length !== 1 && index == form.field.length - 1, 'btn-group2': index != form.field.length - 1 && searchNum, 'btn-group3': index == form.field.length - 1 && searchNum  }">
             <el-button
-              v-if="index != 0 && !item.lock"
-              :disabled="form.field.length == 1"
+              :disabled="form.field.length == 1 || item.lock"
               type="primary"
               icon="el-icon-minus"
               @click="funDel(index)"
             />
             <el-button
-              v-if="index == form.field.length - 1"
               type="primary"
               icon="el-icon-plus"
               @click="funAdd"
@@ -95,12 +92,11 @@
             placeholder="结束日期"
           />
         </el-form-item>
-        
-        <el-form-item label="" style="text-align: center;">
-          <el-button type="primary" style="width: 360px;" @click="onSearch(0)">检索</el-button>
-          <el-button @click="onReset" style="position: absolute; right: -90px;">重置</el-button>
-        </el-form-item>
       </el-form>
+      <div style="text-align: center; position: relative; margin-bottom: 30px;">
+        <el-button type="primary" class="long-btn" @click="onSearch(0)">检索</el-button>
+        <el-button @click="onReset" style="position: absolute; right: 0px;">重置</el-button>
+      </div>
       <!-- 列表部分 -->
       <div class="table_wrapper">
         <div class="table_header">
@@ -216,7 +212,7 @@ import { dateFormat } from '@/utils/index'
           end_time: '',
           field: [
             {
-              select_type: '',
+              select_type: 0,
               key: 'BLNR_TXT',
               value: '',
               lock: false
@@ -304,7 +300,7 @@ import { dateFormat } from '@/utils/index'
           end_time: '',
           field: [
             {
-              select_type: '',
+              select_type: 0,
               key: 'BLNR_TXT',
               value: '',
               lock: false
@@ -318,9 +314,6 @@ import { dateFormat } from '@/utils/index'
       },
       funDel(i) {
         const index = i;
-        if (index == 0) {
-          return;
-        }
         const list = this.form.field;
         list.splice(index, 1);
         this.form.field = list;
@@ -358,7 +351,7 @@ import { dateFormat } from '@/utils/index'
 }
 .btn-group {
   position: absolute;
-  right: -78px;
+  right: -144px;
   &.btn-group1 {
     right: -144px;
   }
@@ -382,6 +375,7 @@ import { dateFormat } from '@/utils/index'
       font-weight: 600;
       padding-top: 20px;
       padding-bottom: 20px;
+      margin-bottom: 20px;
     }
   }
   .search_wrapper {

+ 3 - 3
src/views/search/components/ProfessionSearch.vue

@@ -29,8 +29,8 @@
               <el-input v-model="item.value" placeholder="请输入"></el-input>
             </el-col>
             <el-col :span="4">
-              <el-button type="primary" icon="el-icon-plus" circle size="mini" style="margin-left: 16px; margin-top: 5px;" @click="onPlus"></el-button>
-              <el-button type="primary" icon="el-icon-minus" circle size="mini" v-if="index" @click="onMinus(index)"></el-button>
+              <el-button type="primary" icon="el-icon-minus" :disabled="formInline2.field.length === 1" @click="onMinus(index)" style="margin-left: 16px;"></el-button>
+              <el-button type="primary" icon="el-icon-plus" @click="onPlus"></el-button>
             </el-col>
           </el-row>
         </div>
@@ -334,7 +334,7 @@ export default {
   margin: 20px;
   .search-box {
     .row-box {
-      width: 800px;
+      width: 830px;
       margin: 0 auto 16px;
     }
   }