bugfix

src/views/outpatient/control/shouldDefectNumber.vue

@@ -36,7 +36,7 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button class="sc" @click="funQuery">查询</el-button>
+          <el-button type="primary" class="sc" @click="onSearch">查询</el-button>
         </el-form-item>
         <el-form-item style="margin-right: 0; float: right;">
           <el-button type="primary" plain @click="onReset">重置条件</el-button>
@@ -202,6 +202,10 @@ export default {
       this.paginationData.pageSize = size
       this.funQuery();
     },
+    onSearch() {
+      this.paginationData.currentPage = 1
+      this.funQuery()
+    },
     funQuery() {
       //查询
       let pramse = {

src/views/searchSystem/components/BLSearch.vue

@@ -478,23 +478,7 @@ export default {
         currentPage: 1,
         pageSize: 10,
       },
-      fieldList: [
-        { name: "出院记录", id: "1" },
-        { name: "入院记录", id: "292" },
-        { name: "病程记录", id: "294" },
-        { name: "手术记录", id: "303" },
-        { name: "病历讨论记录", id: "43" },
-        { name: "授权同意类", id: "329" },
-        { name: "评估评分表类", id: "79" },
-        { name: "死亡记录类", id: "288" },
-        { name: "24小时内记录类", id: "18" },
-        { name: "医患沟通类", id: "34" },
-        { name: "医疗常用表格", id: "87" },
-        { name: "医嘱单", id: "49" },
-        { name: "出院科室", id: "AAC11N" },
-        { name: "费用明细", id: "FYMC" },
-        { name: "报告单", id: "2000002" }
-      ],
+      fieldList: [],
       keyList: [],
       Dayoptions: [],
       multipleSelection: [],
@@ -614,8 +598,15 @@ export default {
     },
     selectInfo() {
       this.$axios.post("/selectInfo").then((res) => {
-        // 支付方式 pay
+        //支付方式 pay
         this.departmentList = res.data.department;
+        //出院科室 department
+        this.levelList = res.data.level;
+        //问题属性 level
+        this.coderList = res.data.coder;
+        //编码元  coder
+        this.statusList = res.data.status;
+        this.fieldList = res.data.field;
       });
     },
     funGoto(val) {

src/views/searchSystem/components/CaseHomeSearch.vue

@@ -7,9 +7,7 @@
           <el-radio-button :label="1">高级检索</el-radio-button>
         </el-radio-group>
       </div>
-      <div class="bnh">
-        <!-- <el-input v-if="choice == 0" style="width: 303px" placeholder="全站搜索病案号" suffix-icon="el-icon-search" v-model="inputOn"></el-input> -->
-      </div>
+      <div class="bnh"></div>
       <div class="inputs" v-if="choice == 0">
         <el-row :gutter="20" class="rowsa">
           <el-col :span="4">
@@ -82,25 +80,29 @@
           </el-col>
           <el-col :span="5">
             <div class="grid-content bg-purple">
-              <!-- <el-select
-                v-model="formData0.Coder"
-                class="selects"
-                placeholder="住院医师"
-              >
-                <el-option label="出院科室" value="i出院科室"> </el-option>
-              </el-select> -->
             </div>
           </el-col>
         </el-row>
-        <!-- <div class="fBtn">
-          <el-button class="btn1" @click="reset">重置条件</el-button>
-          <el-button class="btn2" @click="funQuery">检索</el-button>
-        </div> -->
       </div>
       <div class="barBtn" v-else>
         <el-form ref="form" :model="formData1" label-width="100px">
           <el-form-item v-for="(item, index) in formData1.seniorList" :key="index">
             <!-- 下拉框开始 -->
+            <el-select
+              v-if="index != 0"
+              v-model="item.select_type"
+              :class="index != 0 ? 'marginLeft' : ''"
+              class="width100"
+              filterable
+              placeholder=""
+              :disabled="item.lock"
+            >
+              <!-- fieldList -->
+              <el-option label="且" :value="0" />
+              <el-option label="或者" :value="1" />
+              <el-option label="不包含" :value="2" />
+            </el-select>
+            <span v-if="index != 0" class="pind10" />
             <el-select class="width150" filterable v-model="item.key" @change="getOneCleck(item, index)" placeholder="请选择">
               <!-- fieldList -->
               <el-option v-for="(item, index) in fieldList" :label="item.name" :value="item.id" :key="index"></el-option>
@@ -115,7 +117,7 @@
               </el-select>
             </span>
             <span v-else>
-              <el-input class="width150" v-model="item.value" placeholder=""></el-input>
+              <el-input class="width150" v-model="item.value" placeholder="请输入"></el-input>
             </span>
             <!-- 中间选择输入框结束 -->
 
@@ -132,7 +134,6 @@
             <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" @click="funRead">重置</el-button> -->
             </span>
             <!-- 增减重置选项按钮结束 -->
           </el-form-item>
@@ -146,9 +147,6 @@
                 </template>
               </el-input>
             </div>
-            <!-- <el-input class="width300" v-model="formData1.ageday" :min="28" :max="365" type="number" placeholder="<28天" @blur="funBlur">
-              <template slot="append">天</template>
-            </el-input> -->
             <span class="pind" style="color: #ccc">——</span>
             <div class="zkSelect">
               <el-input class="width300" v-model="formData1.ageyear" :min="1" :max="150" type="number" placeholder="1-150岁" @blur="funBlur">
@@ -162,16 +160,13 @@
           </el-form-item>
           <el-form-item label="住院天数">
             <div class="zkSelect">
-              <el-input class="width300" v-model="formData1.hospitalizationon" :min="28" :max="365" type="number" @blur="funBluron">
+              <el-input class="width300" v-model="formData1.hospitalizationon" :min="28" :max="365" type="number" @blur="funBluron" placeholder="请输入">
                 <template slot="append">天</template>
               </el-input>
             </div>
-            <!-- <el-input class="width300" v-model="formData1.ageday" :min="28" :max="365" type="number" placeholder="<28天" @blur="funBlur">
-              <template slot="append">天</template>
-            </el-input> -->
             <span class="pind" style="color: #ccc">——</span>
             <div class="zkSelect">
-              <el-input class="width300" v-model="formData1.hospitalizationin" :min="1" :max="150" type="number" @blur="funBluron">
+              <el-input class="width300" v-model="formData1.hospitalizationin" :min="1" :max="150" type="number" @blur="funBluron" placeholder="请输入">
                 <template slot="append">天</template>
               </el-input>
             </div>
@@ -191,7 +186,6 @@
     <div class="tableBox">
       <div class="flextab" style="margin: 0; margin-bottom: 15px">
         <div class="flextabtitle-box">
-          <!-- <Title :title="'病案列表'" /> -->
           <div class="h-title">
             <span class="blue"></span>
             <span class="text">病案列表</span>
@@ -258,14 +252,9 @@
         <el-table-column prop="ADA01" label="住院总费用"></el-table-column>
         <el-table-column prop="F_D" label="药品总费用"></el-table-column>
         <el-table-column prop="J" label="材料总费用"></el-table-column>
-
-        <!-- <el-table-column prop="address" label="业务操作人"> </el-table-column> -->
         <el-table-column prop="AAC04" label="实际住院(天)"></el-table-column>
-        <!-- <el-table-column prop="ATTEND_GRP_NAME" label="主诊组"></el-table-column> -->
         <el-table-column prop="AEM01C" label="离院方式"></el-table-column>
         <el-table-column prop="AAB06C" label="入院途径"></el-table-column>
-        <!-- <el-table-column prop="ARG_STAY" label="平均住院日"></el-table-column> -->
-        <!-- <el-table-column prop="ARG_F_D" label="平均费用"></el-table-column> -->
         <el-table-column prop="SSPB" label="手术判别"></el-table-column>
         <el-table-column prop="AAB11N" label="入院科室"></el-table-column>
         <el-table-column prop="AAB01" label="入院时间"></el-table-column>
@@ -283,11 +272,6 @@
         :current-page.sync="paginationData.currentPage"
         layout="total, sizes, prev, pager, next, jumper"
       ></el-pagination>
-      <!-- <mPagination style="margin:15px 0px;"
-         v-if="tableData && tableData.length !== 0"
-          :data="paginationData"
-          @SizeChangeEvent="SizeChangeEvent"
-           @pageChangeEvent="pageHasChanged"></mPagination> -->
     </div>
   </div>
 </template>
@@ -297,7 +281,6 @@ import { downloadFile } from '@/httpFile';
 import Title from '@/components/Title';
 import { mapGetters } from 'vuex';
 import mPagination from '@/components/m-pagination';
-// import { json } from 'stream/consumers';
 
 export default {
   name: 'Dashboard',
@@ -349,7 +332,6 @@ export default {
         age_start_type: 2,
         age_end_type: 2,
         ageyear: '',
-        // rangeDate: [],
         endTime: '',
         startTime: '',
         seniorList: [
@@ -358,12 +340,14 @@ export default {
             value: '',
             type: '0',
             selectList: [],
+            select_type: 0,
           },
           {
             key: '',
             value: '',
             type: '0',
             selectList: [],
+            select_type: 0,
           },
         ],
         hospitalizationon: '',
@@ -747,6 +731,7 @@ export default {
         value: '',
         type: '0',
         selectList: [],
+        select_type: 0,
       });
     },
     pageHasChanged() {
@@ -994,4 +979,12 @@ export default {
 .flextab-item > div span.s-2 {
   font-weight: bold;
 }
+
+.marginLeft {
+  margin-left: -110px;
+}
+
+.width100 {
+  width: 100px;
+}
 </style>