Browse Source

修复部分对话框无法弹出的问题

lighter 2 years ago
parent
commit
3694cb315b

+ 1 - 1
package-lock.json

@@ -16,7 +16,7 @@
         "clipboard": "^2.0.11",
         "dayjs": "^1.10.6",
         "echarts": "^5.2.0",
-        "element-plus": "^2.2.17",
+        "element-plus": "^2.2.6",
         "file-saver": "^2.0.5",
         "jquery": "^3.6.0",
         "js-cookie": "^3.0.0",

+ 115 - 115
src/views/clinic/DoctorInfoManagement.vue

@@ -47,126 +47,126 @@
           :total="totalSize"
           style="margin-top: 5px"
       ></el-pagination>
-    </template>
-  </page-layer>
-  <el-drawer title="" v-model="drawer" size="40%" :with-header="false">
-    <div v-if="edit" :style="editStyle" class="edit-doctor-info">
-      <div>基本信息</div>
-      <div>
-        医生头像:请上传一寸照
-        <el-upload
-            class="upload-demo"
-            ref="upload"
-            :action="apiUrl + '/manageDoctorInfo/uploadPortrait'"
-            :headers="header"
-            :file-list="fileList"
-            :limit="1"
-            :data="{ code: doctor.code }"
-            :on-exceed="fileSizeOutLimit"
-            :before-upload="beforeAvatarUpload"
-            :on-success="uploadSuccess"
-            :on-error="uploadError"
-            :auto-upload="false"
-        >
-          <template #trigger>
-            <el-button type="primary" icon="Picture">选取文件</el-button>
-          </template>
-          <el-button style="margin-left: 10px" type="success" icon="Upload" @click="submitUpload">上传到服务器</el-button>
-          <template #tip>
-            <div class="el-upload__tip">只能上传 jpg/png 文件,且不超过 500kb</div>
-          </template>
-        </el-upload>
-      </div>
-      <div style="margin-top: 130px">
-        <span class="require">*</span>
-        医生编号:<el-input class="w200" v-model="doctor.code" disabled></el-input>
-      </div>
-      <div>
-        <span class="require">*</span>
-        医生姓名:<el-input class="w200" v-model="doctor.name"></el-input>
-      </div>
-      <div>
-        <span class="require">*</span>
-        医生性别:
-        <el-select v-model="doctor.sex" class="w200">
-          <el-option v-for="item in sexCodes" :key="item.code" :label="item.name" :value="item.code"></el-option>
-        </el-select>
-      </div>
-      <div>
-        <span class="require">*</span>
-        所属科室:
-        <el-select v-model="doctor.deptCode" class="w200" clearable filterable>
-          <el-option v-for="item in allMzDepts" :key="item.code" :label="item.name" :value="item.code"></el-option>
-        </el-select>
-      </div>
-      <div>
-        <span class="require">*</span>
-        医生职称:
-        <el-select v-model="doctor.titleCode" class="w200" clearable filterable>
-          <el-option v-for="item in allTitles" :key="item.code" :label="item.name" :value="item.code"></el-option>
-        </el-select>
-      </div>
-      <div style="height: max-content; margin-top: 15px">
-        <span class="require">*</span>
-        医生擅长:
-        <el-input class="w350" style="font-size: 13px" type="textarea" rows="3" maxlength="50" show-word-limit v-model="doctor.specialty"></el-input>
-      </div>
-      <div style="height: max-content; margin-top: 15px">
-        <span>&nbsp;&nbsp;</span>
-        医生介绍:
-        <el-input class="w350" style="font-size: 13px" type="textarea" rows="7" maxlength="150" show-word-limit v-model="doctor.introduction"></el-input>
-      </div>
-      <div style="margin-top: 15px">
-        <span>&nbsp;&nbsp;</span>
-        <el-button type="primary" @click="saveDoctor" icon="Money">保存</el-button>
-        <el-button plain @click="drawer = false" icon="Close">取消</el-button>
-      </div>
-    </div>
-    <div v-else>
-      <div style="height: 80px; width: 100%; background: #36af6b"></div>
-      <div>
-        <div class="inline pl15">
-          <el-avatar src="https://empty" shape="circle" style="width: 88px; height: 120px; margin-top: -60px" @error="avatarError">
-            <img :src="'data:image/png;base64,' + doctor.portrait" />
-          </el-avatar>
-        </div>
-        <div class="inline child-pl15" style="width: calc(100% - 150px)">
-          <div style="margin-top: -30px; font-size: 16px; font-weight: bold; color: white">
-            {{ doctor.name }}
+      <el-drawer title="" v-model="drawer" size="40%" :with-header="false">
+        <div v-if="edit" :style="editStyle" class="edit-doctor-info">
+          <div>基本信息</div>
+          <div>
+            医生头像:请上传一寸照
+            <el-upload
+                class="upload-demo"
+                ref="upload"
+                :action="apiUrl + '/manageDoctorInfo/uploadPortrait'"
+                :headers="header"
+                :file-list="fileList"
+                :limit="1"
+                :data="{ code: doctor.code }"
+                :on-exceed="fileSizeOutLimit"
+                :before-upload="beforeAvatarUpload"
+                :on-success="uploadSuccess"
+                :on-error="uploadError"
+                :auto-upload="false"
+            >
+              <template #trigger>
+                <el-button type="primary" icon="Picture">选取文件</el-button>
+              </template>
+              <el-button style="margin-left: 10px" type="success" icon="Upload" @click="submitUpload">上传到服务器</el-button>
+              <template #tip>
+                <div class="el-upload__tip">只能上传 jpg/png 文件,且不超过 500kb</div>
+              </template>
+            </el-upload>
           </div>
-          <div class="doctor-info">
-            <div>医生编号:{{ doctor.code }}</div>
-            <div>医生性别:{{ doctor.sexName }}</div>
-            <div>所属科室:{{ doctor.deptName }}</div>
-            <div>医生职称:{{ doctor.titleName }}</div>
-            <div class="info-title">医生擅长:</div>
-            <div style="height: max-content">
-              {{ doctor.specialty }}
+          <div style="margin-top: 130px">
+            <span class="require">*</span>
+            医生编号:<el-input class="w200" v-model="doctor.code" disabled></el-input>
+          </div>
+          <div>
+            <span class="require">*</span>
+            医生姓名:<el-input class="w200" v-model="doctor.name"></el-input>
+          </div>
+          <div>
+            <span class="require">*</span>
+            医生性别:
+            <el-select v-model="doctor.sex" class="w200">
+              <el-option v-for="item in sexCodes" :key="item.code" :label="item.name" :value="item.code"></el-option>
+            </el-select>
+          </div>
+          <div>
+            <span class="require">*</span>
+            所属科室:
+            <el-select v-model="doctor.deptCode" class="w200" clearable filterable>
+              <el-option v-for="item in allMzDepts" :key="item.code" :label="item.name" :value="item.code"></el-option>
+            </el-select>
+          </div>
+          <div>
+            <span class="require">*</span>
+            医生职称:
+            <el-select v-model="doctor.titleCode" class="w200" clearable filterable>
+              <el-option v-for="item in allTitles" :key="item.code" :label="item.name" :value="item.code"></el-option>
+            </el-select>
+          </div>
+          <div style="height: max-content; margin-top: 15px">
+            <span class="require">*</span>
+            医生擅长:
+            <el-input class="w350" style="font-size: 13px" type="textarea" rows="3" maxlength="50" show-word-limit v-model="doctor.specialty"></el-input>
+          </div>
+          <div style="height: max-content; margin-top: 15px">
+            <span>&nbsp;&nbsp;</span>
+            医生介绍:
+            <el-input class="w350" style="font-size: 13px" type="textarea" rows="7" maxlength="150" show-word-limit v-model="doctor.introduction"></el-input>
+          </div>
+          <div style="margin-top: 15px">
+            <span>&nbsp;&nbsp;</span>
+            <el-button type="primary" @click="saveDoctor" icon="Money">保存</el-button>
+            <el-button plain @click="drawer = false" icon="Close">取消</el-button>
+          </div>
+        </div>
+        <div v-else>
+          <div style="height: 80px; width: 100%; background: #36af6b"></div>
+          <div>
+            <div class="inline pl15">
+              <el-avatar src="https://empty" shape="circle" style="width: 88px; height: 120px; margin-top: -60px" @error="avatarError">
+                <img :src="'data:image/png;base64,' + doctor.portrait" />
+              </el-avatar>
             </div>
-            <div class="info-title">医生介绍:</div>
-            <div style="height: max-content">
-              {{ doctor.introduction }}
+            <div class="inline child-pl15" style="width: calc(100% - 150px)">
+              <div style="margin-top: -30px; font-size: 16px; font-weight: bold; color: white">
+                {{ doctor.name }}
+              </div>
+              <div class="doctor-info">
+                <div>医生编号:{{ doctor.code }}</div>
+                <div>医生性别:{{ doctor.sexName }}</div>
+                <div>所属科室:{{ doctor.deptName }}</div>
+                <div>医生职称:{{ doctor.titleName }}</div>
+                <div class="info-title">医生擅长:</div>
+                <div style="height: max-content">
+                  {{ doctor.specialty }}
+                </div>
+                <div class="info-title">医生介绍:</div>
+                <div style="height: max-content">
+                  {{ doctor.introduction }}
+                </div>
+              </div>
             </div>
           </div>
         </div>
-      </div>
-    </div>
-  </el-drawer>
-  <el-dialog title="服务号推荐排序" width="60%" v-model="manageOrderDialog">
-    <el-table :data="recommendDoctors" :height="tableHeight - 200" stripe highlight-current-row>
-      <el-table-column prop="wxHomepageOrder" label="当前排序"></el-table-column>
-      <el-table-column prop="code" label="编号"></el-table-column>
-      <el-table-column prop="name" label="姓名"></el-table-column>
-      <el-table-column prop="sexName" label="性别"></el-table-column>
-      <el-table-column prop="deptName" label="科室"></el-table-column>
-      <el-table-column prop="titleName" label="级别"></el-table-column>
-      <el-table-column label="操作">
-        <template v-slot="scope">
-          <el-button type="primary" plain icon="Edit" @click="modifyOrder(scope.row)">修改排序</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-  </el-dialog>
+      </el-drawer>
+      <el-dialog title="服务号推荐排序" width="60%" v-model="manageOrderDialog">
+        <el-table :data="recommendDoctors" :height="tableHeight - 200" stripe highlight-current-row>
+          <el-table-column prop="wxHomepageOrder" label="当前排序"></el-table-column>
+          <el-table-column prop="code" label="编号"></el-table-column>
+          <el-table-column prop="name" label="姓名"></el-table-column>
+          <el-table-column prop="sexName" label="性别"></el-table-column>
+          <el-table-column prop="deptName" label="科室"></el-table-column>
+          <el-table-column prop="titleName" label="级别"></el-table-column>
+          <el-table-column label="操作">
+            <template v-slot="scope">
+              <el-button type="primary" plain icon="Edit" @click="modifyOrder(scope.row)">修改排序</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-dialog>
+    </template>
+  </page-layer>
 </template>
 
 <script setup name="DoctorInfoManagement">

+ 40 - 40
src/views/clinic/triage/RoomSettings.vue

@@ -24,48 +24,48 @@
           </template>
         </el-table-column>
       </el-table>
+      <el-dialog v-model="editVisible" title="诊室编辑" width="300px">
+        <div id="crtRoom">
+          <div>科室名称:{{ currentRoom.deptName }}</div>
+          <div>诊室名称:{{ currentRoom.roomName }}</div>
+          <div>诊室编号:{{ currentRoom.roomNo }}</div>
+          <div>
+            诊室状态:
+            <el-select v-model="currentRoom.statusFlag">
+              <el-option v-for="item in statuses" :key="item.code" :label="item.name" :value="item.code" :style="statusClass(item.code)">
+                <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
+                <el-divider direction="vertical"></el-divider>
+                <span>{{ item.name }}</span>
+              </el-option>
+            </el-select>
+          </div>
+          <div>
+            坐诊医师:
+            <el-autocomplete @click="currentRoom.doctorName = ''" v-model="currentRoom.doctorName" :fetch-suggestions="fetchDoctors" clearable @select="handleSelectDoctor">
+              <template #default="{ item }">
+                <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
+                <el-divider direction="vertical"></el-divider>
+                <span>{{ item.name }}</span>
+              </template>
+            </el-autocomplete>
+          </div>
+          <div>
+            医师号别:
+            <el-select v-model="currentRoom.reqType" filterable :filter-method="filterReq" @change="handleSelectReq">
+              <el-option v-for="item in reqOptions" :key="item.code" :label="item.name" :value="item.code">
+                <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
+                <el-divider direction="vertical"></el-divider>
+                <span>{{ item.name }}</span>
+              </el-option>
+            </el-select>
+          </div>
+          <div style="margin: 10px 0 0 0; width: 100%; text-align: center">
+            <el-button type="primary" icon="Check" @click="saveRoomChange">保存更改</el-button>
+          </div>
+        </div>
+      </el-dialog>
     </template>
   </page-layer>
-  <el-dialog v-model="editVisible" title="诊室编辑" width="300px">
-    <div id="crtRoom">
-      <div>科室名称:{{ currentRoom.deptName }}</div>
-      <div>诊室名称:{{ currentRoom.roomName }}</div>
-      <div>诊室编号:{{ currentRoom.roomNo }}</div>
-      <div>
-        诊室状态:
-        <el-select v-model="currentRoom.statusFlag">
-          <el-option v-for="item in statuses" :key="item.code" :label="item.name" :value="item.code" :style="statusClass(item.code)">
-            <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
-            <el-divider direction="vertical"></el-divider>
-            <span>{{ item.name }}</span>
-          </el-option>
-        </el-select>
-      </div>
-      <div>
-        坐诊医师:
-        <el-autocomplete @click="currentRoom.doctorName = ''" v-model="currentRoom.doctorName" :fetch-suggestions="fetchDoctors" clearable @select="handleSelectDoctor">
-          <template #default="{ item }">
-            <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
-            <el-divider direction="vertical"></el-divider>
-            <span>{{ item.name }}</span>
-          </template>
-        </el-autocomplete>
-      </div>
-      <div>
-        医师号别:
-        <el-select v-model="currentRoom.reqType" filterable :filter-method="filterReq" @change="handleSelectReq">
-          <el-option v-for="item in reqOptions" :key="item.code" :label="item.name" :value="item.code">
-            <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
-            <el-divider direction="vertical"></el-divider>
-            <span>{{ item.name }}</span>
-          </el-option>
-        </el-select>
-      </div>
-      <div style="margin: 10px 0 0 0; width: 100%; text-align: center">
-        <el-button type="primary" icon="Check" @click="saveRoomChange">保存更改</el-button>
-      </div>
-    </div>
-  </el-dialog>
 </template>
 
 <script>

+ 94 - 94
src/views/data-modify/DeliveryDetailsQuery.vue

@@ -68,102 +68,102 @@
           :total="queryTerm.total"
       >
       </el-pagination>
+      <el-drawer title="修改出库信息" v-model="chuKuDrawer" size="60%">
+        <div>
+          <el-form label-width="100px">
+            <el-row>
+              <el-col :span="6">
+                <el-form-item label="药品编码:">
+                  <el-input v-model="chuKuXiangXiXinXi.chargeCode" disabled></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="药品名称:">
+                  <el-input v-model="chuKuXiangXiXinXi.chargeCodeName" disabled></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="出库序号:">
+                  <el-input v-model="chuKuXiangXiXinXi.outSeri"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="出库量:">
+                  <el-input v-model="chuKuXiangXiXinXi.outAmt"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="生产批号:">
+                  <el-input v-model="chuKuXiangXiXinXi.manuNo"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="出库单号:">
+                  <el-input v-model="chuKuXiangXiXinXi.drawNo"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="入库单号:">
+                  <el-input v-model="chuKuXiangXiXinXi.inDrawNo"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="药库编码:">
+                  <el-select v-model="chuKuXiangXiXinXi.groupNo" allow-create filterable>
+                    <el-option v-for="item in groupNoList" :key="item.code" :label="item.name" :value="item.code">
+                      <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
+                      <el-divider direction="vertical"></el-divider>
+                      <span>{{ item.name }}</span>
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="接受药房:">
+                  <el-select v-model="chuKuXiangXiXinXi.groupNoOut" allow-create filterable>
+                    <el-option v-for="item in groupNoOutList" :key="item.code" :label="item.name" :value="item.code">
+                      <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
+                      <el-divider direction="vertical"></el-divider>
+                      <span>{{ item.name }}</span>
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="科室:">
+                  <el-select v-model="chuKuXiangXiXinXi.deptCode" allow-create filterable>
+                    <el-option v-for="item in deptCodeList" :key="item.code" :label="item.name" :value="item.code">
+                      <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
+                      <el-divider direction="vertical"></el-divider>
+                      <span>{{ item.name }}</span>
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="入库日期:">
+                  <el-date-picker type="datetime" v-model="chuKuXiangXiXinXi.inDate"></el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="出库日期:">
+                  <el-date-picker type="datetime" v-model="chuKuXiangXiXinXi.outDate"></el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="确认日期:">
+                  <el-date-picker type="datetime" v-model="chuKuXiangXiXinXi.confirmDate"></el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :offset="1" :span="3">
+                <el-button @click="xiuGaiClick" type="success">保存</el-button>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </el-drawer>
     </template>
   </page-layer>
-  <el-drawer title="修改出库信息" v-model="chuKuDrawer" size="60%">
-    <div>
-      <el-form label-width="100px">
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="药品编码:">
-              <el-input v-model="chuKuXiangXiXinXi.chargeCode" disabled></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="药品名称:">
-              <el-input v-model="chuKuXiangXiXinXi.chargeCodeName" disabled></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="出库序号:">
-              <el-input v-model="chuKuXiangXiXinXi.outSeri"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="出库量:">
-              <el-input v-model="chuKuXiangXiXinXi.outAmt"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="生产批号:">
-              <el-input v-model="chuKuXiangXiXinXi.manuNo"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="出库单号:">
-              <el-input v-model="chuKuXiangXiXinXi.drawNo"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="入库单号:">
-              <el-input v-model="chuKuXiangXiXinXi.inDrawNo"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="药库编码:">
-              <el-select v-model="chuKuXiangXiXinXi.groupNo" allow-create filterable>
-                <el-option v-for="item in groupNoList" :key="item.code" :label="item.name" :value="item.code">
-                  <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
-                  <el-divider direction="vertical"></el-divider>
-                  <span>{{ item.name }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="接受药房:">
-              <el-select v-model="chuKuXiangXiXinXi.groupNoOut" allow-create filterable>
-                <el-option v-for="item in groupNoOutList" :key="item.code" :label="item.name" :value="item.code">
-                  <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
-                  <el-divider direction="vertical"></el-divider>
-                  <span>{{ item.name }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="科室:">
-              <el-select v-model="chuKuXiangXiXinXi.deptCode" allow-create filterable>
-                <el-option v-for="item in deptCodeList" :key="item.code" :label="item.name" :value="item.code">
-                  <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
-                  <el-divider direction="vertical"></el-divider>
-                  <span>{{ item.name }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="入库日期:">
-              <el-date-picker type="datetime" v-model="chuKuXiangXiXinXi.inDate"></el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="出库日期:">
-              <el-date-picker type="datetime" v-model="chuKuXiangXiXinXi.outDate"></el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="确认日期:">
-              <el-date-picker type="datetime" v-model="chuKuXiangXiXinXi.confirmDate"></el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :offset="1" :span="3">
-            <el-button @click="xiuGaiClick" type="success">保存</el-button>
-          </el-col>
-        </el-row>
-      </el-form>
-    </div>
-  </el-drawer>
 </template>
 
 <script>

+ 154 - 155
src/views/dictionary/NationalSiMatch.vue

@@ -74,165 +74,164 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
       ></el-pagination>
-    </template>
-    <el-dialog
-        title="耗材查询"
-        v-model="showSuppliesQueryForm"
-        width="420px">
-      <div style="background: lightblue; color:black; padding: 4px; border-radius: 4px">
-        小提示:每次查询只需填写一项条件。如果填写了多项,程序也只会根据优先级最高的一项来查询。
-        <div style="margin-top: 8px">
-          优先级:国家编码 > 注册证号 > 耗材名称
-        </div>
-      </div>
-      <div style="width: 300px;margin-top: 16px">
-        国家编码:<el-input v-model="currentSupplyRow.nationalCode" placeholder="耗材国家编码 - 精准查询" clearable style="width: 200px"></el-input>
-      </div>
-      <div style="width: 300px;margin-top: 8px">
-        注册证号:<el-input v-model="currentSupplyRow.approvalNumber" placeholder="耗材注册证号 - 精准查询" clearable style="width: 200px"></el-input>
-      </div>
-      <div style="width: 300px;margin-top: 8px">
-        耗材名称:<el-input v-model="currentSupplyRow.fuzzyName" placeholder="耗材名称 - 模糊查询" clearable style="width: 200px"></el-input>
-      </div>
-      <template #footer>
-        <el-button type="info" icon="Close" @click="showSuppliesQueryForm = false">取消</el-button>
-        <el-button type="primary" icon="Search" @click="getNationalItems">查询</el-button>
-      </template>
-    </el-dialog>
-
-    <el-dialog v-model="showNationalList" top="5vh" width="80%">
-      <div class="data-title">HIS数据</div>
-      <el-descriptions :column="4" border>
-        <el-descriptions-item>
-          <template #label> 编码</template>
-          {{ data.row.code }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label> 名称</template>
-          {{ data.row.name }}
-        </el-descriptions-item>
-        <el-descriptions-item v-if="queryParam.type !== 3">
-          <template #label> 大小包装</template>
-          {{ data.row.serial === '01' ? '大包装' : '小包装' }}
-        </el-descriptions-item>
-        <el-descriptions-item v-if="queryParam.type !== 3">
-          <template #label> 剂型</template>
-          {{ data.row.dosage }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template #label> 单位</template>
-          {{ data.row.unit }}
-        </el-descriptions-item>
-        <el-descriptions-item v-if="queryParam.type === 3">
-          <template #label> 标准编码</template>
-          {{ data.row.standardCode }}
-        </el-descriptions-item>
-        <el-descriptions-item v-if="queryParam.type === 3">
-          <template #label> 价格</template>
-          {{ data.row.price }}
-        </el-descriptions-item>
-        <el-descriptions-item v-if="queryParam.type !== 3">
-          <template #label> 规格</template>
-          {{ data.row.specification }}
-        </el-descriptions-item>
-        <el-descriptions-item v-if="queryParam.type === 3">
-          <template #label> 内涵</template>
-          {{ data.row.discription }}
-        </el-descriptions-item>
-        <el-descriptions-item v-if="queryParam.type !== 3">
-          <template #label> 批准文号</template>
-          {{ data.row.approvalNumber }}
-        </el-descriptions-item>
-        <el-descriptions-item v-if="queryParam.type !== 3">
-          <template #label> 生产厂家</template>
-          {{ data.row.factory }}
-        </el-descriptions-item>
-      </el-descriptions>
-      <div class="data-title">国家数据</div>
-      <el-input v-show="queryParam.type === 3" v-model="discription" clearable style="width: 300px">
-        <template #prepend>内涵过滤</template>
-      </el-input>
-      <el-input v-show="queryParam.type === 1 || queryParam.type === 4" v-model="factory" clearable style="width: 300px">
-        <template #prepend>厂家过滤</template>
-      </el-input>
-      <el-divider v-show="queryParam.type === 4" direction="vertical"></el-divider>
-      <el-input v-show="queryParam.type === 4" v-model="certiNo" clearable style="width: 320px">
-        <template #prepend>注册证号过滤</template>
-      </el-input>
-      <el-input v-model="nationalCode" clearable style="width: 320px">
-        <template #prepend>国家代码</template>
-      </el-input>
-      <el-table :data="cptNationalItems" :height="dialogTableHeight" stripe>
-        <el-table-column label="国家代码" prop="nationalCode"></el-table-column>
-        <el-table-column label="国家名称" prop="nationalName"></el-table-column>
-        <el-table-column v-if="queryParam.type === 1" label="剂型" prop="actualDosage"></el-table-column>
-        <el-table-column v-if="queryParam.type === 1" label="规格" prop="specifications"></el-table-column>
-        <el-table-column v-if="queryParam.type === 1" label="包装材质" prop="packingMaterial"></el-table-column>
-        <el-table-column v-if="queryParam.type === 1" label="生产厂家" prop="factory"></el-table-column>
-        <el-table-column v-if="queryParam.type === 1" label="批准文号" prop="approvalNumber"></el-table-column>
-        <el-table-column v-if="queryParam.type === 1" label="药品本位码" prop="drugStandardCode"></el-table-column>
-        <el-table-column v-if="queryParam.type === 3" label="项目内涵" prop="projectConnotation"></el-table-column>
-        <el-table-column v-if="queryParam.type === 3" label="除外内容" prop="exclusions"></el-table-column>
-        <el-table-column v-if="queryParam.type === 3" label="计价单位" prop="valuationUnit"></el-table-column>
-        <el-table-column v-if="queryParam.type === 3" label="项目说明" prop="projectDescription"></el-table-column>
-        <el-table-column v-if="queryParam.type === 4" label="医保通用名" prop="siName"></el-table-column>
-        <el-table-column v-if="queryParam.type === 4" label="材质" prop="material"></el-table-column>
-        <el-table-column v-if="queryParam.type === 4" label="耗材企业" prop="factory"></el-table-column>
-        <el-table-column label="开始时间" prop="startTime"></el-table-column>
-        <el-table-column label="结束时间" prop="endTime"></el-table-column>
-        <el-table-column label="状态">
-          <template #default="scope">
-            <div v-html="filterMatchedCount(scope.row.matchedCount)"></div>
-          </template>
-        </el-table-column>
-        <el-table-column label="匹配">
-          <template #default="scope">
-            <el-button circle icon="Pointer" type="success" @click="doMatch(scope.row)"></el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div style="height: 12px"></div>
-    </el-dialog>
-    <el-drawer v-model="showModifyLocalItem" direction="rtl" title="项目修改">
-      <div style="padding: 20px">
-        <el-input v-model="data.row.name" clearable size="small">
-          <template #prepend>项目名称</template>
+      <el-dialog v-model="showNationalList" width="80%">
+        <div class="data-title">HIS数据</div>
+        <el-descriptions :column="4" border>
+          <el-descriptions-item>
+            <template #label> 编码</template>
+            {{ data.row.code }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template #label> 名称</template>
+            {{ data.row.name }}
+          </el-descriptions-item>
+          <el-descriptions-item v-if="queryParam.type !== 3">
+            <template #label> 大小包装</template>
+            {{ data.row.serial === '01' ? '大包装' : '小包装' }}
+          </el-descriptions-item>
+          <el-descriptions-item v-if="queryParam.type !== 3">
+            <template #label> 剂型</template>
+            {{ data.row.dosage }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template #label> 单位</template>
+            {{ data.row.unit }}
+          </el-descriptions-item>
+          <el-descriptions-item v-if="queryParam.type === 3">
+            <template #label> 标准编码</template>
+            {{ data.row.standardCode }}
+          </el-descriptions-item>
+          <el-descriptions-item v-if="queryParam.type === 3">
+            <template #label> 价格</template>
+            {{ data.row.price }}
+          </el-descriptions-item>
+          <el-descriptions-item v-if="queryParam.type !== 3">
+            <template #label> 规格</template>
+            {{ data.row.specification }}
+          </el-descriptions-item>
+          <el-descriptions-item v-if="queryParam.type === 3">
+            <template #label> 内涵</template>
+            {{ data.row.discription }}
+          </el-descriptions-item>
+          <el-descriptions-item v-if="queryParam.type !== 3">
+            <template #label> 批准文号</template>
+            {{ data.row.approvalNumber }}
+          </el-descriptions-item>
+          <el-descriptions-item v-if="queryParam.type !== 3">
+            <template #label> 生产厂家</template>
+            {{ data.row.factory }}
+          </el-descriptions-item>
+        </el-descriptions>
+        <div class="data-title">国家数据</div>
+        <el-input v-show="queryParam.type === 3" v-model="discription" clearable style="width: 300px">
+          <template #prepend>内涵过滤</template>
         </el-input>
-        <div v-if="queryParam.type === 4">
-          <el-input v-model="data.row.specification" class="mt-12" clearable size="small">
-            <template #prepend>项目规格</template>
-          </el-input>
-          <el-input v-model="data.row.factory" class="mt-12" clearable size="small">
-            <template #prepend>生产厂家</template>
-          </el-input>
+        <el-input v-show="queryParam.type === 1 || queryParam.type === 4" v-model="factory" clearable style="width: 300px">
+          <template #prepend>厂家过滤</template>
+        </el-input>
+        <el-divider v-show="queryParam.type === 4" direction="vertical"></el-divider>
+        <el-input v-show="queryParam.type === 4" v-model="certiNo" clearable style="width: 320px">
+          <template #prepend>注册证号过滤</template>
+        </el-input>
+        <el-input v-model="nationalCode" clearable style="width: 320px">
+          <template #prepend>国家代码</template>
+        </el-input>
+        <el-table :data="cptNationalItems" :height="dialogTableHeight" stripe>
+          <el-table-column label="国家代码" prop="nationalCode"></el-table-column>
+          <el-table-column label="国家名称" prop="nationalName"></el-table-column>
+          <el-table-column v-if="queryParam.type === 1" label="剂型" prop="actualDosage"></el-table-column>
+          <el-table-column v-if="queryParam.type === 1" label="规格" prop="specifications"></el-table-column>
+          <el-table-column v-if="queryParam.type === 1" label="包装材质" prop="packingMaterial"></el-table-column>
+          <el-table-column v-if="queryParam.type === 1" label="生产厂家" prop="factory"></el-table-column>
+          <el-table-column v-if="queryParam.type === 1" label="批准文号" prop="approvalNumber"></el-table-column>
+          <el-table-column v-if="queryParam.type === 1" label="药品本位码" prop="drugStandardCode"></el-table-column>
+          <el-table-column v-if="queryParam.type === 3" label="项目内涵" prop="projectConnotation"></el-table-column>
+          <el-table-column v-if="queryParam.type === 3" label="除外内容" prop="exclusions"></el-table-column>
+          <el-table-column v-if="queryParam.type === 3" label="计价单位" prop="valuationUnit"></el-table-column>
+          <el-table-column v-if="queryParam.type === 3" label="项目说明" prop="projectDescription"></el-table-column>
+          <el-table-column v-if="queryParam.type === 4" label="医保通用名" prop="siName"></el-table-column>
+          <el-table-column v-if="queryParam.type === 4" label="材质" prop="material"></el-table-column>
+          <el-table-column v-if="queryParam.type === 4" label="耗材企业" prop="factory"></el-table-column>
+          <el-table-column label="开始时间" prop="startTime"></el-table-column>
+          <el-table-column label="结束时间" prop="endTime"></el-table-column>
+          <el-table-column label="状态">
+            <template #default="scope">
+              <div v-html="filterMatchedCount(scope.row.matchedCount)"></div>
+            </template>
+          </el-table-column>
+          <el-table-column label="匹配">
+            <template #default="scope">
+              <el-button circle icon="Pointer" type="success" @click="doMatch(scope.row)"></el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="height: 12px"></div>
+      </el-dialog>
+      <el-dialog
+          title="耗材查询"
+          v-model="showSuppliesQueryForm"
+          width="420px">
+        <div style="background: lightblue; color:black; padding: 4px; border-radius: 4px">
+          小提示:每次查询只需填写一项条件。如果填写了多项,程序也只会根据优先级最高的一项来查询。
+          <div style="margin-top: 8px">
+            优先级:国家编码 > 注册证号 > 耗材名称
+          </div>
         </div>
-        <div v-if="queryParam.type === 3">
-          <el-input v-model="data.row.price" class="mt-12" clearable size="small">
-            <template #prepend>项目金额</template>
-          </el-input>
-          <el-input v-model="data.row.unit" class="mt-12" clearable size="small">
-            <template #prepend>项目单位</template>
-          </el-input>
-          <el-input v-model="data.row.standardCode" class="mt-12" clearable size="small">
-            <template #prepend>标准编码</template>
-          </el-input>
-          <div class="m-prepend">项目内涵</div>
-          <el-input v-model="data.row.discription" class="mt-4" clearable rows="3" size="small" type="textarea"></el-input>
+        <div style="width: 300px;margin-top: 16px">
+          国家编码:<el-input v-model="currentSupplyRow.nationalCode" placeholder="耗材国家编码 - 精准查询" clearable style="width: 200px"></el-input>
+        </div>
+        <div style="width: 300px;margin-top: 8px">
+          注册证号:<el-input v-model="currentSupplyRow.approvalNumber" placeholder="耗材注册证号 - 精准查询" clearable style="width: 200px"></el-input>
         </div>
-        <div class="drawer-footer">
-          <el-button icon="Close" size="small" @click="cancelModify">取消</el-button>
-          <el-button icon="Check" size="small" type="primary" @click="confirmModify"> 保存</el-button>
+        <div style="width: 300px;margin-top: 8px">
+          耗材名称:<el-input v-model="currentSupplyRow.fuzzyName" placeholder="耗材名称 - 模糊查询" clearable style="width: 200px"></el-input>
         </div>
-      </div>
-    </el-drawer>
-    <el-dialog v-model="showUploadPrm" title="请填写以下参数" width="20%">
-      <div style="height: 8px"></div>
-      <el-date-picker v-model="uploadPrm.beginDate" format="YYYY-MM-DD" placeholder="开始日期" value-format="YYYY-MM-DD"></el-date-picker>
-      <div style="height: 8px"></div>
-      <el-date-picker v-model="uploadPrm.endDate" format="YYYY-MM-DD" placeholder="结束日期" value-format="YYYY-MM-DD"></el-date-picker>
-      <div style="height: 16px"></div>
-      <el-button icon="Check" type="primary" @click="executeUploadMatch">确定上传</el-button>
-    </el-dialog>
+        <template #footer>
+          <el-button type="info" icon="Close" @click="showSuppliesQueryForm = false">取消</el-button>
+          <el-button type="primary" icon="Search" @click="getNationalItems">查询</el-button>
+        </template>
+      </el-dialog>
+      <el-drawer v-model="showModifyLocalItem" direction="rtl" title="项目修改">
+        <div style="padding: 20px">
+          <el-input v-model="data.row.name" clearable size="small">
+            <template #prepend>项目名称</template>
+          </el-input>
+          <div v-if="queryParam.type === 4">
+            <el-input v-model="data.row.specification" class="mt-12" clearable size="small">
+              <template #prepend>项目规格</template>
+            </el-input>
+            <el-input v-model="data.row.factory" class="mt-12" clearable size="small">
+              <template #prepend>生产厂家</template>
+            </el-input>
+          </div>
+          <div v-if="queryParam.type === 3">
+            <el-input v-model="data.row.price" class="mt-12" clearable size="small">
+              <template #prepend>项目金额</template>
+            </el-input>
+            <el-input v-model="data.row.unit" class="mt-12" clearable size="small">
+              <template #prepend>项目单位</template>
+            </el-input>
+            <el-input v-model="data.row.standardCode" class="mt-12" clearable size="small">
+              <template #prepend>标准编码</template>
+            </el-input>
+            <div class="m-prepend">项目内涵</div>
+            <el-input v-model="data.row.discription" class="mt-4" clearable rows="3" size="small" type="textarea"></el-input>
+          </div>
+          <div class="drawer-footer">
+            <el-button icon="Close" size="small" @click="cancelModify">取消</el-button>
+            <el-button icon="Check" size="small" type="primary" @click="confirmModify"> 保存</el-button>
+          </div>
+        </div>
+      </el-drawer>
+      <el-dialog v-model="showUploadPrm" title="请填写以下参数" width="20%">
+        <div style="height: 8px"></div>
+        <el-date-picker v-model="uploadPrm.beginDate" format="YYYY-MM-DD" placeholder="开始日期" value-format="YYYY-MM-DD"></el-date-picker>
+        <div style="height: 8px"></div>
+        <el-date-picker v-model="uploadPrm.endDate" format="YYYY-MM-DD" placeholder="结束日期" value-format="YYYY-MM-DD"></el-date-picker>
+        <div style="height: 16px"></div>
+        <el-button icon="Check" type="primary" @click="executeUploadMatch">确定上传</el-button>
+      </el-dialog>
+    </template>
   </page-layer>
 </template>
 

+ 28 - 28
src/views/examination/BookableManagement.vue

@@ -51,36 +51,36 @@
           :total="data.totalSize"
           style="margin-top: 5px"
       ></el-pagination>
+      <el-dialog v-model="showEditExamItem" title="检查/检验项目编辑" width="30%" :show-close="false">
+        <div style="height: 8px"></div>
+        <el-input v-model="currentExamItem.code" disabled>
+          <template #prepend>项目编码</template>
+        </el-input>
+        <div style="height: 8px"></div>
+        <el-input v-model="currentExamItem.name" disabled>
+          <template #prepend>项目名称</template>
+        </el-input>
+        <div style="height: 8px"></div>
+        <el-input v-model="currentExamItem.execUnitName" disabled>
+          <template #prepend>执行科室</template>
+        </el-input>
+        <el-divider></el-divider>
+        服务号可预约:
+        <el-radio-group v-model="currentExamItem.wxBookableFlag">
+          <el-radio :label="1">是</el-radio>
+          <el-radio :label="0">否</el-radio>
+        </el-radio-group>
+        <div style="height: 8px"></div>
+        预约提示:
+        <el-input v-model="currentExamItem.bookTip" type="textarea" rows="5"></el-input>
+        <el-divider></el-divider>
+        <div style="width: 100%; text-align: right">
+          <el-button type="info" plain icon="Close" @click="showEditExamItem = false">取消</el-button>
+          <el-button type="primary" icon="Check" @click="saveEditExamItem">保存</el-button>
+        </div>
+      </el-dialog>
     </template>
   </page-layer>
-  <el-dialog v-model="showEditExamItem" title="检查/检验项目编辑" width="30%" :show-close="false">
-    <div style="height: 8px"></div>
-    <el-input v-model="currentExamItem.code" disabled>
-      <template #prepend>项目编码</template>
-    </el-input>
-    <div style="height: 8px"></div>
-    <el-input v-model="currentExamItem.name" disabled>
-      <template #prepend>项目名称</template>
-    </el-input>
-    <div style="height: 8px"></div>
-    <el-input v-model="currentExamItem.execUnitName" disabled>
-      <template #prepend>执行科室</template>
-    </el-input>
-    <el-divider></el-divider>
-    服务号可预约:
-    <el-radio-group v-model="currentExamItem.wxBookableFlag">
-      <el-radio :label="1">是</el-radio>
-      <el-radio :label="0">否</el-radio>
-    </el-radio-group>
-    <div style="height: 8px"></div>
-    预约提示:
-    <el-input v-model="currentExamItem.bookTip" type="textarea" rows="5"></el-input>
-    <el-divider></el-divider>
-    <div style="width: 100%; text-align: right">
-      <el-button type="info" plain icon="Close" @click="showEditExamItem = false">取消</el-button>
-      <el-button type="primary" icon="Check" @click="saveEditExamItem">保存</el-button>
-    </div>
-  </el-dialog>
 </template>
 
 <script>

+ 0 - 1
src/views/hospitalization/zhu-yuan-yi-sheng/Home.vue

@@ -23,7 +23,6 @@
         </keep-alive>
       </router-view>
     </template>
-
   </page-layer>
 </template>
 

+ 122 - 122
src/views/reports/IllegalChargesAnalysis.vue

@@ -105,131 +105,131 @@
           :total="targetData.length"
           style="margin-top: 5px"
       ></el-pagination>
-    </template>
-  </page-layer>
-  <el-dialog v-model="showEditRule" title="模板编辑" width="700px">
-    <div>
-      <el-divider></el-divider>
-      <div class="edit-line-title">基本信息:</div>
-      <el-input v-model="currentTemplate.id" disabled style="width: 560px; margin-bottom: 8px">
-        <template #prepend>模板编码</template>
-      </el-input>
-      <el-input v-model="currentTemplate.label" style="width: 560px">
-        <template #prepend>模板名称</template>
-      </el-input>
-      <div v-show="currentTemplate.type === 1">
-        <div class="edit-line-title">规则属性:</div>
+      <el-dialog v-model="showEditRule" title="模板编辑" width="700px">
         <div>
-          <el-radio v-model="currentTemplate.attribute" :label="1">同时收费</el-radio>
-          <el-radio v-model="currentTemplate.attribute" :label="2">超量收费</el-radio>
+          <el-divider></el-divider>
+          <div class="edit-line-title">基本信息:</div>
+          <el-input v-model="currentTemplate.id" disabled style="width: 560px; margin-bottom: 8px">
+            <template #prepend>模板编码</template>
+          </el-input>
+          <el-input v-model="currentTemplate.label" style="width: 560px">
+            <template #prepend>模板名称</template>
+          </el-input>
+          <div v-show="currentTemplate.type === 1">
+            <div class="edit-line-title">规则属性:</div>
+            <div>
+              <el-radio v-model="currentTemplate.attribute" :label="1">同时收费</el-radio>
+              <el-radio v-model="currentTemplate.attribute" :label="2">超量收费</el-radio>
+            </div>
+            <div class="edit-line-title">
+              规则数据:(&nbsp;<span style="font-weight: 500">检索方式:</span>
+              <el-radio v-model="searchMethod" label="alpha">首拼</el-radio>
+              <el-radio v-model="searchMethod" label="code">编码</el-radio>
+              <el-radio v-model="searchMethod" label="name">名称</el-radio>
+              <el-divider direction="vertical"></el-divider>
+              <el-checkbox v-model="includeDeactivate" style="margin-left: 16px">包含停用内容</el-checkbox>
+              &nbsp;)
+            </div>
+            <el-row :gutter="5">
+              <el-col :span="12">
+                <el-autocomplete v-model="mainCharge" :fetch-suggestions="fetchChargeItem" placeholder="请输入内容" clearable @select="handleSelectMainCharge">
+                  <template #prepend>收费主体</template>
+                  <template #default="{ item }">
+                    <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
+                    <el-divider direction="vertical"></el-divider>
+                    <span>{{ item.name }}</span>
+                  </template>
+                </el-autocomplete>
+                <el-table :data="currentTemplate.mainCharges" height="120">
+                  <el-table-column prop="code" label="收费编码"></el-table-column>
+                  <el-table-column prop="name" label="收费名称"></el-table-column>
+                  <el-table-column label="操作">
+                    <template #default="scope">
+                      <el-button text icon="Delete" @click="removeMainCharge(scope.$index)">删除</el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-col>
+              <el-col :span="12" v-show="currentTemplate.attribute === 1">
+                <el-autocomplete v-model="conflictCharge" :fetch-suggestions="fetchChargeItem" placeholder="请输入内容" clearable @select="handleSelectConflictCharge">
+                  <template #prepend>冲突收费</template>
+                  <template #default="{ item }">
+                    <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
+                    <el-divider direction="vertical"></el-divider>
+                    <span>{{ item.name }}</span>
+                  </template>
+                </el-autocomplete>
+                <el-table :data="currentTemplate.conflictCharges" height="120">
+                  <el-table-column prop="code" label="收费编码"></el-table-column>
+                  <el-table-column prop="name" label="收费名称"></el-table-column>
+                  <el-table-column label="操作">
+                    <template #default="scope">
+                      <el-button text icon="Delete" @click="removeConflictCharge(scope.$index)">删除 </el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-col>
+              <el-col :span="12" v-show="currentTemplate.attribute === 2">
+                <el-input type="number" v-model="currentTemplate.maxChargeNum" style="width: 230px" clearable>
+                  <template #prepend>数量上限(每天)</template>
+                </el-input>
+                <!-- <el-select v-model="currentTemplate.maxChargeUnit" style="width: 60px">
+                  <el-option label="天" value="day"></el-option>
+                  <el-option label="周" value="week"></el-option>
+                  <el-option label="月" value="month"></el-option>
+                </el-select> -->
+              </el-col>
+            </el-row>
+          </div>
         </div>
-        <div class="edit-line-title">
-          规则数据:(&nbsp;<span style="font-weight: 500">检索方式:</span>
-          <el-radio v-model="searchMethod" label="alpha">首拼</el-radio>
-          <el-radio v-model="searchMethod" label="code">编码</el-radio>
-          <el-radio v-model="searchMethod" label="name">名称</el-radio>
-          <el-divider direction="vertical"></el-divider>
-          <el-checkbox v-model="includeDeactivate" style="margin-left: 16px">包含停用内容</el-checkbox>
-          &nbsp;)
+        <div style="width: 100%; text-align: right; margin: 16px 0 8px 0">
+          <el-button type="success" icon="Upload" @click="saveTemplate">保存模板</el-button>
         </div>
-        <el-row :gutter="5">
-          <el-col :span="12">
-            <el-autocomplete v-model="mainCharge" :fetch-suggestions="fetchChargeItem" placeholder="请输入内容" clearable @select="handleSelectMainCharge">
-              <template #prepend>收费主体</template>
-              <template #default="{ item }">
-                <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
-                <el-divider direction="vertical"></el-divider>
-                <span>{{ item.name }}</span>
-              </template>
-            </el-autocomplete>
-            <el-table :data="currentTemplate.mainCharges" height="120">
-              <el-table-column prop="code" label="收费编码"></el-table-column>
-              <el-table-column prop="name" label="收费名称"></el-table-column>
-              <el-table-column label="操作">
-                <template #default="scope">
-                  <el-button text icon="Delete" @click="removeMainCharge(scope.$index)">删除</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-col>
-          <el-col :span="12" v-show="currentTemplate.attribute === 1">
-            <el-autocomplete v-model="conflictCharge" :fetch-suggestions="fetchChargeItem" placeholder="请输入内容" clearable @select="handleSelectConflictCharge">
-              <template #prepend>冲突收费</template>
-              <template #default="{ item }">
-                <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
-                <el-divider direction="vertical"></el-divider>
-                <span>{{ item.name }}</span>
-              </template>
-            </el-autocomplete>
-            <el-table :data="currentTemplate.conflictCharges" height="120">
-              <el-table-column prop="code" label="收费编码"></el-table-column>
-              <el-table-column prop="name" label="收费名称"></el-table-column>
-              <el-table-column label="操作">
-                <template #default="scope">
-                  <el-button text icon="Delete" @click="removeConflictCharge(scope.$index)">删除 </el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-col>
-          <el-col :span="12" v-show="currentTemplate.attribute === 2">
-            <el-input type="number" v-model="currentTemplate.maxChargeNum" style="width: 230px" clearable>
-              <template #prepend>数量上限(每天)</template>
-            </el-input>
-            <!-- <el-select v-model="currentTemplate.maxChargeUnit" style="width: 60px">
-              <el-option label="天" value="day"></el-option>
-              <el-option label="周" value="week"></el-option>
-              <el-option label="月" value="month"></el-option>
-            </el-select> -->
-          </el-col>
-        </el-row>
-      </div>
-    </div>
-    <div style="width: 100%; text-align: right; margin: 16px 0 8px 0">
-      <el-button type="success" icon="Upload" @click="saveTemplate">保存模板</el-button>
-    </div>
-  </el-dialog>
-  <el-dialog v-model="ruYuanJianGeDialog" title="查询入院间隔" width="1200px">
-    <el-button type="primary" icon="Upload" @click="exportExcelHuanZhe">导出Excel</el-button>
-    <el-table
-        :data="huoQuHuanZheShuJu.slice((queryHuanZhe.currentPage - 1) * queryHuanZhe.pageSize, queryHuanZhe.currentPage * queryHuanZhe.pageSize)"
-        stripe
-        :height="treeHeight - 200"
-    >
-      <el-table-column label="姓名" prop="name"></el-table-column>
-      <el-table-column label="住院号" prop="inpatientNo"></el-table-column>
-      <el-table-column label="住院次数" prop="admissTimes"></el-table-column>
-      <el-table-column label="住院科室" prop="deptName"></el-table-column>
-      <el-table-column label="入院日期" width="80" prop="admissDate"></el-table-column>
-      <el-table-column label="出院日期" width="80" prop="disDate"></el-table-column>
-      <el-table-column label="相差天数" prop="differDate"></el-table-column>
-      <el-table-column label="诊断编码" prop="disDiag"></el-table-column>
-      <el-table-column label="主要诊断" prop="disDiagComment"></el-table-column>
-      <el-table-column label="医保类型" prop="medtypeName"></el-table-column>
-    </el-table>
-    <el-pagination
-        @size-change="handleSizeChangeHuanZhe"
-        @current-change="handleCurrentChangeHuanZhe"
-        :current-page="queryHuanZhe.currentPage"
-        :page-sizes="[20, 30, 40, 50, 100]"
-        :page-size="queryHuanZhe.pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="huoQuHuanZheShuJu.length"
-        style="margin-top: 5px"
-    ></el-pagination>
-  </el-dialog>
-  <el-dialog v-model="showOrders" title="医嘱详情" width="60%">
-    <el-table :data="orders" stripe>
-      <el-table-column prop="actOrderNo" label="医嘱号" width="70"></el-table-column>
-      <el-table-column prop="inpatientNo" label="住院号" width="70"></el-table-column>
-      <el-table-column prop="admissTimes" label="住院次数" width="70"></el-table-column>
-      <el-table-column prop="physicianName" label="医生" width="70"></el-table-column>
-      <el-table-column prop="frequCode" label="频率" width="60"></el-table-column>
-      <el-table-column prop="orderCode" label="医嘱码" width="70"></el-table-column>
-      <el-table-column prop="orderName" label="医嘱名称"></el-table-column>
-      <el-table-column prop="startTime" label="开始时间"></el-table-column>
-      <el-table-column prop="endTime" label="结束时间"></el-table-column>
-    </el-table>
-  </el-dialog>
+      </el-dialog>
+      <el-dialog v-model="ruYuanJianGeDialog" title="查询入院间隔" width="1200px">
+        <el-button type="primary" icon="Upload" @click="exportExcelHuanZhe">导出Excel</el-button>
+        <el-table
+            :data="huoQuHuanZheShuJu.slice((queryHuanZhe.currentPage - 1) * queryHuanZhe.pageSize, queryHuanZhe.currentPage * queryHuanZhe.pageSize)"
+            stripe
+            :height="treeHeight - 200"
+        >
+          <el-table-column label="姓名" prop="name"></el-table-column>
+          <el-table-column label="住院号" prop="inpatientNo"></el-table-column>
+          <el-table-column label="住院次数" prop="admissTimes"></el-table-column>
+          <el-table-column label="住院科室" prop="deptName"></el-table-column>
+          <el-table-column label="入院日期" width="80" prop="admissDate"></el-table-column>
+          <el-table-column label="出院日期" width="80" prop="disDate"></el-table-column>
+          <el-table-column label="相差天数" prop="differDate"></el-table-column>
+          <el-table-column label="诊断编码" prop="disDiag"></el-table-column>
+          <el-table-column label="主要诊断" prop="disDiagComment"></el-table-column>
+          <el-table-column label="医保类型" prop="medtypeName"></el-table-column>
+        </el-table>
+        <el-pagination
+            @size-change="handleSizeChangeHuanZhe"
+            @current-change="handleCurrentChangeHuanZhe"
+            :current-page="queryHuanZhe.currentPage"
+            :page-sizes="[20, 30, 40, 50, 100]"
+            :page-size="queryHuanZhe.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="huoQuHuanZheShuJu.length"
+            style="margin-top: 5px"
+        ></el-pagination>
+      </el-dialog>
+      <el-dialog v-model="showOrders" title="医嘱详情" width="60%">
+        <el-table :data="orders" stripe>
+          <el-table-column prop="actOrderNo" label="医嘱号" width="70"></el-table-column>
+          <el-table-column prop="inpatientNo" label="住院号" width="70"></el-table-column>
+          <el-table-column prop="admissTimes" label="住院次数" width="70"></el-table-column>
+          <el-table-column prop="physicianName" label="医生" width="70"></el-table-column>
+          <el-table-column prop="frequCode" label="频率" width="60"></el-table-column>
+          <el-table-column prop="orderCode" label="医嘱码" width="70"></el-table-column>
+          <el-table-column prop="orderName" label="医嘱名称"></el-table-column>
+          <el-table-column prop="startTime" label="开始时间"></el-table-column>
+          <el-table-column prop="endTime" label="结束时间"></el-table-column>
+        </el-table>
+      </el-dialog>
+    </template>
+  </page-layer>
 </template>
 
 <script>

+ 0 - 1
src/views/reports/InfantFeeReport.vue

@@ -34,7 +34,6 @@
         >
         </el-pagination>
       </div>
-
     </template>
   </page-layer>
 </template>

+ 25 - 25
src/views/settings/permissions/UserRoleSettings.vue

@@ -83,33 +83,33 @@
           :total="queryConditions.total"
           style="margin-top: 5px"
       ></el-pagination>
+      <el-dialog title="人员角色" v-model="roleDialog">
+        <div style="padding: 10px 0">
+          <el-tag type="info" size="small">编号:{{ currentUser.code }}</el-tag>
+          <el-tag size="small">姓名:{{ currentUser.name }}</el-tag>
+          <el-tag type="warning" size="small">科室:{{ currentUser.deptName }}</el-tag>
+          <el-tag type="danger" size="small">职称:{{ currentUser.title }}</el-tag>
+        </div>
+        <el-table ref="roleTable" :data="roles" :height="tableHeight / 2" stripe @selection-change="handleSelectRoles">
+          <el-table-column type="selection"></el-table-column>
+          <el-table-column prop="id" label="序号" width="60"></el-table-column>
+          <el-table-column prop="name" label="角色名称"></el-table-column>
+          <el-table-column prop="createDatetime" label="创建时间"></el-table-column>
+          <el-table-column prop="createStaff" label="创建人"></el-table-column>
+        </el-table>
+        <el-footer>
+          <div style="width: 100%; text-align: right; padding-top: 25px">
+            <el-button type="primary" icon="Edit" @click="beforeAddRole">添加角色</el-button>
+            <el-button type="primary" icon="Upload" @click="saveRoles">保存更改</el-button>
+          </div>
+        </el-footer>
+      </el-dialog>
+      <PersonnelInformationEditing :userInfo="userInfo" v-if="editDialog"
+                                   @close="editDialog = false"
+                                   :index="roleIndex"
+                                   @changeTheData="changeTheData"/>
     </template>
   </page-layer>
-  <el-dialog title="人员角色" v-model="roleDialog">
-    <div style="padding: 10px 0">
-      <el-tag type="info" size="small">编号:{{ currentUser.code }}</el-tag>
-      <el-tag size="small">姓名:{{ currentUser.name }}</el-tag>
-      <el-tag type="warning" size="small">科室:{{ currentUser.deptName }}</el-tag>
-      <el-tag type="danger" size="small">职称:{{ currentUser.title }}</el-tag>
-    </div>
-    <el-table ref="roleTable" :data="roles" :height="tableHeight / 2" stripe @selection-change="handleSelectRoles">
-      <el-table-column type="selection"></el-table-column>
-      <el-table-column prop="id" label="序号" width="60"></el-table-column>
-      <el-table-column prop="name" label="角色名称"></el-table-column>
-      <el-table-column prop="createDatetime" label="创建时间"></el-table-column>
-      <el-table-column prop="createStaff" label="创建人"></el-table-column>
-    </el-table>
-    <el-footer>
-      <div style="width: 100%; text-align: right; padding-top: 25px">
-        <el-button type="primary" icon="Edit" @click="beforeAddRole">添加角色</el-button>
-        <el-button type="primary" icon="Upload" @click="saveRoles">保存更改</el-button>
-      </div>
-    </el-footer>
-  </el-dialog>
-  <PersonnelInformationEditing :userInfo="userInfo" v-if="editDialog"
-                               @close="editDialog = false"
-                               :index="roleIndex"
-                               @changeTheData="changeTheData"/>
 </template>
 
 <script setup name="UserRoleSettings">