Merge branch 'master' of https://172.16.32.165/lighter/vue-intergration-platform

src/views/data-modify/DeliveryDetailsQuery.vue

@@ -1,15 +1,15 @@
 <template>
-  <el-container>
-    <el-header height="36px" style="margin-top: 8px">
+  <page-layer>
+    <template #header>
       <span style="margin-left: 0">出库日期：</span>
       <el-date-picker
-        v-model="DateRange"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        :shortcuts="shortcuts"
-        style="width: 240px"
+          v-model="DateRange"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :shortcuts="shortcuts"
+          style="width: 240px"
       ></el-date-picker>
       <span>出库单号：</span>
       <el-input style="width: 150px" clearable v-model="queryTerm.drawNo" @blur="queryTerm.drawNo = $event.target.value.trim()"></el-input>
@@ -18,8 +18,8 @@
       <span>入库单号：</span>
       <el-input style="width: 150px" clearable v-model="queryTerm.inDrawNo" @blur="queryTerm.inDrawNo = $event.target.value.trim()"></el-input>
       <el-button style="margin-left: 10px" type="primary" @click="queryChuKuXinXiClick">查询</el-button>
-    </el-header>
-    <el-main>
+    </template>
+    <template #main>
       <el-table :height="tableHeight" :data="chuKuXinXiList" :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }">
         <el-table-column label="序号" prop="outSeri" width="40px"></el-table-column>
         <el-table-column label="药品编码" prop="chargeCode" width="80px"></el-table-column>
@@ -43,12 +43,12 @@
           <el-table-column label="删除">
             <template #default="scope">
               <el-popconfirm
-                confirm-button-text="确认"
-                cancel-button-text="取消"
-                icon="Info"
-                iconColor="red"
-                title="是否删除该数据"
-                @confirm="shanChuChuKuXinXiClick(scope.$index, scope.row)"
+                  confirm-button-text="确认"
+                  cancel-button-text="取消"
+                  icon="Info"
+                  iconColor="red"
+                  title="是否删除该数据"
+                  @confirm="shanChuChuKuXinXiClick(scope.$index, scope.row)"
               >
                 <template #reference>
                   <el-button type="danger">删除</el-button>
@@ -59,111 +59,111 @@
         </el-table-column>
       </el-table>
       <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="queryTerm.currentPage"
-        :page-sizes="[100, 200, 300, 400]"
-        :page-size="queryTerm.pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="queryTerm.total"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="queryTerm.currentPage"
+          :page-sizes="[100, 200, 300, 400]"
+          :page-size="queryTerm.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="queryTerm.total"
       >
       </el-pagination>
-    </el-main>
-    <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>
-  </el-container>
+    </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>
@@ -175,8 +175,10 @@ import { queryChuKuXinXi, queryDeptCode, shanChuChuKuXinXi, xiuGaiChuKuXinXi } f
 import { clone } from '@/utils/clone'
 import { reactive, ref } from '@vue/reactivity'
 import { onMounted } from 'vue'
+import PageLayer from "@/layout/PageLayer";
 export default {
   name: 'DeliveryDetailsQuery',
+  components: {PageLayer},
   setup() {
     const windowSize = store.state.app.windowSize
     const tableHeight = windowSize.h - 70

src/views/data-modify/QueryOfReceiptDetails.vue

@@ -1,22 +1,22 @@
 <template>
-  <el-container>
-    <el-header height="36px" style="margin-top: 8px">
+  <page-layer>
+    <template #header>
       <span>入库日期：</span>
       <el-date-picker
-        v-model="DateRange"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        format="YYYY-MM-DD"
-        :shortcuts="shortcuts"
-        style="width: 240px"
+          v-model="DateRange"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          format="YYYY-MM-DD"
+          :shortcuts="shortcuts"
+          style="width: 240px"
       ></el-date-picker>
       <span>入库单号：</span>
       <el-input style="width: 150px" clearable v-model="queryTerm.inDocuNo" @blur="inDocuNo = $event.target.value.trim()"></el-input>
       <el-button style="margin-left: 10px" type="primary" @click="queryRuKuXinXiClick">查询</el-button>
-    </el-header>
-    <el-main>
+    </template>
+    <template #main>
       <el-table :height="tableHeight" :data="ruKuXinXiList">
         <el-table-column label="药品编码" prop="chargeCode"></el-table-column>
         <el-table-column label="药品名称" prop="chargeCodeName"></el-table-column>
@@ -38,13 +38,13 @@
         </el-table-column>
       </el-table>
       <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="queryTerm.currentPage"
-        :page-sizes="[100, 200, 300, 400]"
-        :page-size="queryTerm.pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="queryTerm.total"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="queryTerm.currentPage"
+          :page-sizes="[100, 200, 300, 400]"
+          :page-size="queryTerm.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="queryTerm.total"
       >
       </el-pagination>
       <!-- 修改的抽屉 -->
@@ -144,8 +144,8 @@
           </el-option>
         </el-select>
       </el-dialog>
-    </el-main>
-  </el-container>
+    </template>
+  </page-layer>
 </template>
 
 <script>
@@ -156,8 +156,10 @@ import store from '@/store'
 import { ElMessage } from 'element-plus'
 import { queryCode, queryRuKuXinXi, xiuGaiRuKuXinXi } from '@/api/yz-data-mod/in-or-out-of-warehouse'
 import { clone } from '@/utils/clone'
+import PageLayer from "@/layout/PageLayer";
 export default {
   name: 'QueryOfReceiptDetails',
+  components: {PageLayer},
   setup() {
     //
     const windowSize = store.state.app.windowSize

src/views/data-modify/SecondFefund.vue

@@ -1,6 +1,6 @@
 <template>
-  <el-container>
-    <el-header height="36px" style="margin-top: 8px">
+  <page-layer>
+    <template #header>
       <el-input size="small" clearable prefix-icon="Search" v-model="mzTuiFei.patientId" style="width: 300px">
         <template #prepend>门诊号</template>
       </el-input>
@@ -11,16 +11,15 @@
         <template #prepend>收费编码</template>
       </el-input>
       <el-button type="success" style="margin-left: 20px" @click="querySubmit">查询</el-button>
-    </el-header>
-    <el-container>
-      <el-aside>
-        <el-table :data="mzChargeDateilData" :height="tableHeight" @row-click="dianJiDanYuanGe" stripe highlight-current-row>
-          <el-table-column prop="name" label="姓名"></el-table-column>
-          <el-table-column prop="tcName" label="项目名称" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="chargeItemCode" label="编码"></el-table-column>
-          <el-table-column prop="itemNo" label="编码"></el-table-column>
-        </el-table>
-        <el-pagination
+    </template>
+    <template #aside>
+      <el-table :data="mzChargeDateilData" :height="tableHeight" @row-click="dianJiDanYuanGe" stripe highlight-current-row>
+        <el-table-column prop="name" label="姓名"></el-table-column>
+        <el-table-column prop="tcName" label="项目名称" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="chargeItemCode" label="编码"></el-table-column>
+        <el-table-column prop="itemNo" label="编码"></el-table-column>
+      </el-table>
+      <el-pagination
           :pager-count="5"
           small
           :total="mzTuiFei.total"
@@ -28,64 +27,63 @@
           :current-page="mzTuiFei.currentPage"
           :page-size="mzTuiFei.pageSize"
           @current-change="handleCurrentChange"
-        ></el-pagination>
-      </el-aside>
-      <el-main>
-        <div style="margin-right: 20px">
-          <el-descriptions title="基本信息" border :column="4">
-            <template #extra>
-              <el-button type="primary" @click="tuiFeiClick">修改二次退费</el-button>
-            </template>
-            <el-descriptions-item>
-              <template #label> 患者姓名 </template>
-              {{ mzChargeDateil.name }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template #label> 收费编码 </template>
-              {{ mzChargeDateil.chargeItemCode }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template #label> 门诊号 </template>
-              {{ mzChargeDateil.patientId }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template #label> 次数 </template>
-              {{ mzChargeDateil.times }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template #label> 药房确认标志 </template>
-              {{ confirmFlagToString(mzChargeDateil.confirmFlag) }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template #label> 最大退药量 </template>
-              {{ mzChargeDateil.quantity }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template #label> 药品名称 </template>
-              {{ mzChargeDateil.tcName }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template #label> 收据编号 </template>
-              {{ mzChargeDateil.receiptNo }}
-            </el-descriptions-item>
-          </el-descriptions>
-        </div>
-        <el-dialog v-model="tuiFeiDialog" title="退费操作" width="500px">
-          <el-tag>患者姓名：{{ mzChargeDateil.name }} </el-tag>
-          <el-tag type="info">门诊号：{{ mzChargeDateil.patientId }} </el-tag>
-          <el-tag>次数：{{ mzChargeDateil.times }} </el-tag>
-          <el-tag type="info">收费编码：{{ mzChargeDateil.chargeItemCode }} </el-tag>
-          <el-tag>最大退药量：{{ mzChargeDateil.quantity }} </el-tag>
-          <br /><br />
-          <span>选择退费数量 ：</span>
-          <el-select v-model="quantity" placeholder="请选择最大退药量">
-            <el-option v-for="item in mzChargeDateil.quantity" :key="item" :label="item" :value="item"></el-option> </el-select
-          ><br /><br />
-          <el-button type="warning" @click="xiuGaiClick">修改</el-button>
-        </el-dialog>
-      </el-main>
-    </el-container>
-  </el-container>
+      ></el-pagination>
+    </template>
+    <template #main>
+      <div style="margin-right: 20px">
+        <el-descriptions title="基本信息" border :column="4">
+          <template #extra>
+            <el-button type="primary" @click="tuiFeiClick">修改二次退费</el-button>
+          </template>
+          <el-descriptions-item>
+            <template #label> 患者姓名 </template>
+            {{ mzChargeDateil.name }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template #label> 收费编码 </template>
+            {{ mzChargeDateil.chargeItemCode }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template #label> 门诊号 </template>
+            {{ mzChargeDateil.patientId }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template #label> 次数 </template>
+            {{ mzChargeDateil.times }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template #label> 药房确认标志 </template>
+            {{ confirmFlagToString(mzChargeDateil.confirmFlag) }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template #label> 最大退药量 </template>
+            {{ mzChargeDateil.quantity }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template #label> 药品名称 </template>
+            {{ mzChargeDateil.tcName }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template #label> 收据编号 </template>
+            {{ mzChargeDateil.receiptNo }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+      <el-dialog v-model="tuiFeiDialog" title="退费操作" width="500px">
+        <el-tag>患者姓名：{{ mzChargeDateil.name }} </el-tag>
+        <el-tag type="info">门诊号：{{ mzChargeDateil.patientId }} </el-tag>
+        <el-tag>次数：{{ mzChargeDateil.times }} </el-tag>
+        <el-tag type="info">收费编码：{{ mzChargeDateil.chargeItemCode }} </el-tag>
+        <el-tag>最大退药量：{{ mzChargeDateil.quantity }} </el-tag>
+        <br /><br />
+        <span>选择退费数量 ：</span>
+        <el-select v-model="quantity" placeholder="请选择最大退药量">
+          <el-option v-for="item in mzChargeDateil.quantity" :key="item" :label="item" :value="item"></el-option> </el-select
+        ><br /><br />
+        <el-button type="warning" @click="xiuGaiClick">修改</el-button>
+      </el-dialog>
+    </template>
+  </page-layer>
 </template>
 
 <script>
@@ -94,8 +92,10 @@ import { getMzTuiFei, xiuGaiTuiFei } from '@/api/yz-data-mod/second-fefund'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import store from '@/store'
 import { clone } from '@/utils/clone'
+import PageLayer from "@/layout/PageLayer";
 export default {
   name: 'SecondFefund',
+  components: {PageLayer},
   setup() {
     ////////////////////////////// 获取屏幕高度 /////////////////////////////////////////
 

src/views/data-modify/YzActOrderModifyVerify.vue

@@ -1,6 +1,6 @@
 <template>
-  <el-container>
-    <el-header height="36px" style="margin-top: 8px">
+  <page-layer>
+    <template #header>
       <el-input size="small" placeholder="在此输入住院号" @keyup.enter="query" v-model="inpatientNo" clearable prefix-icon="Search" style="width: 300px">
         <template #prepend>住院号</template>
       </el-input>
@@ -12,20 +12,19 @@
       </el-select>
       <el-button type="primary" icon="Search" @click="query">查询</el-button>
       <el-button type="primary" icon="RefreshLeft" @click="query">刷新数据</el-button>
-    </el-header>
-    <el-container>
-      <el-aside>
-        <el-table :height="tableHeight" stripe highlight-current-row :data="cptTable" style="text-align: center" @row-click="clickRow" empty-text="暂无申请">
-          <el-table-column label="住院号" width="60" prop="inpatientNo"> </el-table-column>
-          <el-table-column label="医嘱号" prop="actOrderNo"></el-table-column>
-          <el-table-column label="医嘱名称" show-overflow-tooltip prop="orderName"> </el-table-column>
-          <el-table-column label="审核状态">
-            <template #default="scope">
-              <span v-html="yZauditStatus(scope.row.auditFlag)"></span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-pagination
+    </template>
+    <template #aside>
+      <el-table :height="tableHeight" stripe highlight-current-row :data="cptTable" style="text-align: center" @row-click="clickRow" empty-text="暂无申请">
+        <el-table-column label="住院号" width="60" prop="inpatientNo"> </el-table-column>
+        <el-table-column label="医嘱号" prop="actOrderNo"></el-table-column>
+        <el-table-column label="医嘱名称" show-overflow-tooltip prop="orderName"> </el-table-column>
+        <el-table-column label="审核状态">
+          <template #default="scope">
+            <span v-html="yZauditStatus(scope.row.auditFlag)"></span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
           @current-change="handleCurrentChange"
           :page-size="queryTerm.pageSize"
           :current-page="queryTerm.currentPage"
@@ -34,122 +33,121 @@
           style="background-color: white"
           layout="prev, pager, next,total"
           :total="queryTerm.total"
-        >
-        </el-pagination>
-      </el-aside>
-      <el-main>
-        <el-alert title="申请修改的数据为空，默认不会修改。" type="success" effect="dark" close-text="了解"></el-alert>
-        <el-descriptions border title="原数据">
-          <el-descriptions-item>
-            <template #label>
-              <i class="el-icon-user"></i>
-              患者姓名
-            </template>
-            {{ dataDetails.patientName }}
-          </el-descriptions-item>
-          <el-descriptions-item>
-            <template #label>
-              <i class="el-icon-s-order"></i>
-              住院号
-            </template>
-            {{ dataDetails.inpatientNo }}
-          </el-descriptions-item>
-          <el-descriptions-item>
-            <template #label>
-              <i class="el-icon-s-order"></i>
-              医嘱号
-            </template>
-            {{ dataDetails.actOrderNo }}
-          </el-descriptions-item>
-          <el-descriptions-item>
-            <template #label>
-              <i class="el-icon-s-claim"></i>
-              医嘱名称
-            </template>
-            {{ dataDetails.orderName }}
-          </el-descriptions-item>
-          <el-descriptions-item>
-            <template #label>
-              <i class="el-icon-house"></i>
-              病房
-            </template>
-            {{ dataDetails.wardCode }}
-          </el-descriptions-item>
-          <el-descriptions-item>
-            <template #label>
-              <i class="el-icon-tickets"></i>
-              频次
-            </template>
-            {{ dataDetails.frequCode }}
-          </el-descriptions-item>
-          <el-descriptions-item>
-            <template #label>
-              <i class="el-icon-time"></i>
-              开始时间
-            </template>
-            {{ dataDetails.startTime }}
-          </el-descriptions-item>
-          <el-descriptions-item>
-            <template #label>
-              <i class="el-icon-time"></i>
-              结束时间
-            </template>
-            {{ dataDetails.endTime }}
-          </el-descriptions-item>
-        </el-descriptions>
-        <el-divider></el-divider>
-        <el-descriptions title="申请修改数据" border direction="vertical">
-          <el-descriptions-item>
-            <template #label>
-              <i class="el-icon-user"></i>
-              申请人
-            </template>
-            {{ dataDetails.proposerName }}
-          </el-descriptions-item>
-          <el-descriptions-item>
-            <template #label>
-              <i class="el-icon-time"></i>
-              申请时间
-            </template>
-            {{ dataDetails.proposeTime }}
-          </el-descriptions-item>
-          <el-descriptions-item>
-            <template #label>
-              <i class="el-icon-s-claim"></i>
-              申请备注
-            </template>
-            {{ dataDetails.proposeRemark }}
-          </el-descriptions-item>
-          <el-descriptions-item>
-            <template #label>
-              <i class="el-icon-time"></i>
-              开始时间
-            </template>
-            {{ dataDetails.newStartTime }}
-          </el-descriptions-item>
-          <el-descriptions-item>
-            <template #label>
-              <i class="el-icon-time"></i>
-              结束时间
-            </template>
-            {{ dataDetails.newEndTime }}
-          </el-descriptions-item>
-        </el-descriptions>
-        <br />
-        <el-row v-if="dataDetails.actOrderNo">
-          <el-col :span="2">
-            <el-button type="success" size="small" icon="Check" @click="tongGuo">通过</el-button>
-          </el-col>
-          <el-col :span="2">
-            <el-button type="danger" size="small" icon="Check" @click="boHui">驳回</el-button>
-          </el-col>
-          <el-col :span="2">
-            <el-button type="warning" size="small" icon="RefreshLeft" @click="huiChe">撤回</el-button>
-          </el-col>
-        </el-row>
-      </el-main>
-    </el-container>
-  </el-container>
+      >
+      </el-pagination>
+    </template>
+    <template #main>
+      <el-alert title="申请修改的数据为空，默认不会修改。" type="success" effect="dark" close-text="了解"></el-alert>
+      <el-descriptions border title="原数据">
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-user"></i>
+            患者姓名
+          </template>
+          {{ dataDetails.patientName }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-s-order"></i>
+            住院号
+          </template>
+          {{ dataDetails.inpatientNo }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-s-order"></i>
+            医嘱号
+          </template>
+          {{ dataDetails.actOrderNo }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-s-claim"></i>
+            医嘱名称
+          </template>
+          {{ dataDetails.orderName }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-house"></i>
+            病房
+          </template>
+          {{ dataDetails.wardCode }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-tickets"></i>
+            频次
+          </template>
+          {{ dataDetails.frequCode }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-time"></i>
+            开始时间
+          </template>
+          {{ dataDetails.startTime }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-time"></i>
+            结束时间
+          </template>
+          {{ dataDetails.endTime }}
+        </el-descriptions-item>
+      </el-descriptions>
+      <el-divider></el-divider>
+      <el-descriptions title="申请修改数据" border direction="vertical">
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-user"></i>
+            申请人
+          </template>
+          {{ dataDetails.proposerName }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-time"></i>
+            申请时间
+          </template>
+          {{ dataDetails.proposeTime }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-s-claim"></i>
+            申请备注
+          </template>
+          {{ dataDetails.proposeRemark }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-time"></i>
+            开始时间
+          </template>
+          {{ dataDetails.newStartTime }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-time"></i>
+            结束时间
+          </template>
+          {{ dataDetails.newEndTime }}
+        </el-descriptions-item>
+      </el-descriptions>
+      <br />
+      <el-row v-if="dataDetails.actOrderNo">
+        <el-col :span="2">
+          <el-button type="success" size="small" icon="Check" @click="tongGuo">通过</el-button>
+        </el-col>
+        <el-col :span="2">
+          <el-button type="danger" size="small" icon="Check" @click="boHui">驳回</el-button>
+        </el-col>
+        <el-col :span="2">
+          <el-button type="warning" size="small" icon="RefreshLeft" @click="huiChe">撤回</el-button>
+        </el-col>
+      </el-row>
+    </template>
+  </page-layer>
 </template>
 
 <script>
@@ -160,8 +158,10 @@ import { yZauditStatus } from '@/utils/computed'
 import { chaKanZhuangTai, shenHePanDuan, shenHeXinXi } from '@/api/yz-data-mod/yz-xiugai-shenhe'
 import { computed, onActivated } from 'vue'
 import { ElMessageBox, ElNotification } from 'element-plus'
+import PageLayer from "@/layout/PageLayer";
 export default {
   name: 'YzActOrderModifyVerify',
+  components: {PageLayer},
   setup() {
     const windowSize = store.state.app.windowSize
     const tableHeight = windowSize.h - 70

src/views/data-modify/YzTemperatureModify.vue

@@ -1,25 +1,25 @@
 <template>
-  <el-container>
-    <el-header height="35px" style="margin-top: 10px">
+  <page-layer>
+    <template #header>
       <span>时间：</span>
       <el-date-picker v-model="date" type="datetime" style="width: 170px" placeholder="选择日期时间"> </el-date-picker>
       <span>住院号：</span>
       <el-input v-model="inpatientNo" @blur="inpatientNo = $event.target.value.trim()" clearable placeholder="填写住院号" prefix-icon="Search" style="width: 200px"> </el-input>
       <span>住院次数：</span>
       <el-input
-        placeholder="只能输入数字"
-        v-model="admissTimes"
-        clearable
-        @blur="admissTimes = $event.target.value.trim()"
-        prefix-icon="Search"
-        oninput="value=value.replace(/^\.+|[^\d.]/g,'')"
-        style="width: 200px"
+          placeholder="只能输入数字"
+          v-model="admissTimes"
+          clearable
+          @blur="admissTimes = $event.target.value.trim()"
+          prefix-icon="Search"
+          oninput="value=value.replace(/^\.+|[^\d.]/g,'')"
+          style="width: 200px"
       >
       </el-input>
       <el-button type="primary" icon="Search" @click="query" style="margin-left: 5px">查询</el-button>
       <el-button type="success" @click="xinShouZhiYon = true">新手指引</el-button>
-    </el-header>
-    <el-main>
+    </template>
+    <template #main>
       <div class="dataTable">
         <table>
           <tr>
@@ -145,8 +145,8 @@
         <el-image style="position: absolute; top: 50px; left: 50px; right: 50px; bottom: 50px" :src="huLiJiLvDan"></el-image>
         <el-button style="position: absolute; top: 10px; right: 20px" @click="closeViewer" type="danger">关闭</el-button>
       </div>
-    </el-main>
-  </el-container>
+    </template>
+  </page-layer>
 </template>
 
 <script>
@@ -156,9 +156,11 @@ import { ElMessageBox, ElNotification } from 'element-plus'
 import { getWard, modify, queryYzTemperature } from '@/api/yz-data-mod/yz-temperature-modify'
 import { onMounted } from 'vue'
 import huLiJiLvDan from '@/assets/novice-guide/huLiJiLvDan.png'
+import PageLayer from "@/layout/PageLayer";
 
 export default {
   name: 'YzTemperatureModify',
+  components: {PageLayer},
   setup() {
     const inpatientNo = ref('')
     const date = ref('')

src/views/settings/permissions/RoleMenuSettings.vue

@@ -1,11 +1,11 @@
 <template>
-  <el-container>
-    <el-header height="36px" style="margin-top: 8px">
+  <page-layer>
+    <template #header>
       <el-input style="width: 200px" v-model="searchRoleContent" placeholder="请输入角色名称"></el-input>
       <el-divider direction="vertical"></el-divider>
       <el-button type="primary" icon="Upload" @click="beforeSaveMenus">保存更改</el-button>
-    </el-header>
-    <el-main>
+    </template>
+    <template #main>
       <el-row :gutter="5">
         <el-col :span="16">
           <el-table :data="cptRoles" :height="tableHeight" stripe highlight-current-row @row-click="handleClickRole">
@@ -17,18 +17,18 @@
         </el-col>
         <el-col :span="5">
           <el-tree
-            ref="tree"
-            :data="menus"
-            :props="defaultProps"
-            :style="{ height: tableHeight + 'px', overflowY: 'scroll' }"
-            show-checkbox
-            node-key="id"
-            default-expand-all
+              ref="tree"
+              :data="menus"
+              :props="defaultProps"
+              :style="{ height: tableHeight + 'px', overflowY: 'scroll' }"
+              show-checkbox
+              node-key="id"
+              default-expand-all
           ></el-tree>
         </el-col>
       </el-row>
-    </el-main>
-  </el-container>
+    </template>
+  </page-layer>
 </template>
 
 <script>
@@ -36,10 +36,12 @@ import { computed, onMounted, ref } from 'vue'
 import store from '@/store'
 import { getAllRoles, getAllMenus, getRoleMenus, saveRoleMenus } from '@/api/settings/permission-settings'
 import { ElMessage } from 'element-plus'
+import PageLayer from "@/layout/PageLayer";
 export default {
+  components: {PageLayer},
   setup() {
     const windowSize = store.state.app.windowSize
-    const tableHeight = windowSize.h - 45
+    const tableHeight = windowSize.h - 10
 
     const searchRoleContent = ref('')
     const roles = ref([])

src/views/settings/permissions/UserRoleSettings.vue

@@ -1,116 +1,111 @@
 <template>
-  <el-container>
-    <el-main>
-      <el-row :gutter="5">
-        <el-col :span="4">
-          <div style="height: 10px"></div>
-          <el-input v-model="searchDeptContent" placeholder="请输入科室名称" clearable @clear="queryConditions.deptCode = ''"
-                    prefix-icon="Search"></el-input>
-          <div style="height: 5px"></div>
-          <el-tree
-              :data="depts"
-              :props="defaultProps"
-              default-expand-all
-              :filter-node-method="filterNode"
-              :style="{ height: tableHeight + 'px', overflowY: 'scroll' }"
-              ref="tree"
-              @node-click="handleClickDeptTreeNode"
-          >
-          </el-tree>
-        </el-col>
-        <el-col :span="20">
-          <div style="height: 10px"></div>
-          <el-input v-model="queryConditions.name" style="width: 300px" placeholder="请输入人员姓名或工号" clearable
-                    prefix-icon="Search"></el-input>
-          是否停用:
-          <el-select v-model="queryConditions.whetherToDisable" style="width: 80px">
-            <el-option v-for="item in dropDownSelection" :key="item.code" :value="item.code"
-                       :label="item.name"></el-option>
-          </el-select>
-          是否有医保码:
-          <el-select v-model="queryConditions.isThereAMedicalInsuranceCode" style="width: 80px">
-            <el-option v-for="item in dropDownSelection" :key="item.code" :value="item.code"
-                       :label="item.name"></el-option>
-          </el-select>
-          医保码:
-          <el-input v-model="queryConditions.ybCode" style="width: 120px" clearable></el-input>
-          <el-button icon="Search" type="primary" @click="clickToQuery"> 查询</el-button>
-          <el-button icon="Plus" type="success" @click="addEmployees"> 添加</el-button>
-          <div style="height: 5px"></div>
-          <el-table :data="users" border :height="tableHeight - 40" stripe highlight-current-row>
-            <el-table-column prop="delFlag" label="停用" width="35">
-              <template #default="scope">
-                <span v-if="scope.row.delFlag === '1'">√</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="name" label="姓名"></el-table-column>
-            <el-table-column prop="code" label="编号"></el-table-column>
-            <el-table-column prop="codeRs" label="工号"></el-table-column>
-            <el-table-column prop="deptName" label="科室"></el-table-column>
-            <el-table-column prop="title" label="职称"></el-table-column>
-            <el-table-column prop="position" label="职务"></el-table-column>
-            <el-table-column prop="markName" label="在院标志"></el-table-column>
-            <el-table-column prop="ifcadreName" label="干工标志"></el-table-column>
-            <el-table-column prop="orderYn" label="医生处方权">
-              <template #default="scope">
-                <span v-if="scope.row.orderYn === '1'"> 普通处方权</span>
-                <span v-else-if="scope.row.orderYn === '2'">毒麻药处方权</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="ysjbName" label="病历级别"></el-table-column>
-            <el-table-column prop="ghChargeTypeName" label="挂号号别"></el-table-column>
-            <el-table-column prop="doctorXzYpName" label="限制药品级别" show-overflow-tooltip></el-table-column>
-            <el-table-column prop="loginFlag" label="病区允许就诊">
-              <template #default="scope">
-                <span>{{ scope.row.loginFlag === '1' ? '允许' : '不允许' }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="socialNo" label="身份证"></el-table-column>
-            <el-table-column prop="phoneNo" label="手机号码"></el-table-column>
-            <el-table-column prop="ybCode" label="医保编码"></el-table-column>
-            <el-table-column label="操作" fixed="right">
-              <template v-slot="scope">
-                <el-button type="primary" text @click="clickToEdit(scope.$index, scope.row)">编辑</el-button>
-                <br/>
-                <el-button text size="small" v-if="competence" @click="viewUserRoles(scope.row)">角色</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-          <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page="queryConditions.currentPage"
-              :page-sizes="[30, 50, 75]"
-              :page-size="queryConditions.pageSize"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="queryConditions.total"
-              style="margin-top: 5px"
-          ></el-pagination>
-        </el-col>
-      </el-row>
-      <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>
-    </el-main>
-  </el-container>
+  <page-layer>
+    <template #header>
+      <el-input v-model="queryConditions.name" style="width: 300px" placeholder="请输入人员姓名或工号" clearable
+                prefix-icon="Search"></el-input>
+      是否停用:
+      <el-select v-model="queryConditions.whetherToDisable" style="width: 80px">
+        <el-option v-for="item in dropDownSelection" :key="item.code" :value="item.code"
+                   :label="item.name"></el-option>
+      </el-select>
+      是否有医保码:
+      <el-select v-model="queryConditions.isThereAMedicalInsuranceCode" style="width: 80px">
+        <el-option v-for="item in dropDownSelection" :key="item.code" :value="item.code"
+                   :label="item.name"></el-option>
+      </el-select>
+      医保码:
+      <el-input v-model="queryConditions.ybCode" style="width: 120px" clearable></el-input>
+      <el-button icon="Search" type="primary" @click="clickToQuery"> 查询</el-button>
+      <el-button icon="Plus" type="success" @click="addEmployees"> 添加</el-button>
+    </template>
+    <template #aside>
+      <el-input v-model="searchDeptContent" placeholder="请输入科室名称" clearable @clear="queryConditions.deptCode = ''"
+                prefix-icon="Search"></el-input>
+      <div style="height: 5px"></div>
+      <el-tree
+          :data="depts"
+          :props="defaultProps"
+          default-expand-all
+          :filter-node-method="filterNode"
+          :style="{ height: tableHeight - 20 + 'px', overflowY: 'scroll' }"
+          ref="tree"
+          @node-click="handleClickDeptTreeNode"
+      >
+      </el-tree>
+    </template>
+    <template #main>
+      <el-table :data="users" border :height="tableHeight - 40" stripe highlight-current-row>
+        <el-table-column prop="delFlag" label="停用" width="35">
+          <template #default="scope">
+            <span v-if="scope.row.delFlag === '1'">√</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="name" label="姓名"></el-table-column>
+        <el-table-column prop="code" label="编号"></el-table-column>
+        <el-table-column prop="codeRs" label="工号"></el-table-column>
+        <el-table-column prop="deptName" label="科室"></el-table-column>
+        <el-table-column prop="title" label="职称"></el-table-column>
+        <el-table-column prop="position" label="职务"></el-table-column>
+        <el-table-column prop="markName" label="在院标志"></el-table-column>
+        <el-table-column prop="ifcadreName" label="干工标志"></el-table-column>
+        <el-table-column prop="orderYn" label="医生处方权">
+          <template #default="scope">
+            <span v-if="scope.row.orderYn === '1'"> 普通处方权</span>
+            <span v-else-if="scope.row.orderYn === '2'">毒麻药处方权</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="ysjbName" label="病历级别"></el-table-column>
+        <el-table-column prop="ghChargeTypeName" label="挂号号别"></el-table-column>
+        <el-table-column prop="doctorXzYpName" label="限制药品级别" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="loginFlag" label="病区允许就诊">
+          <template #default="scope">
+            <span>{{ scope.row.loginFlag === '1' ? '允许' : '不允许' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="socialNo" label="身份证"></el-table-column>
+        <el-table-column prop="phoneNo" label="手机号码"></el-table-column>
+        <el-table-column prop="ybCode" label="医保编码"></el-table-column>
+        <el-table-column label="操作" fixed="right">
+          <template v-slot="scope">
+            <el-button type="primary" text @click="clickToEdit(scope.$index, scope.row)">编辑</el-button>
+            <br/>
+            <el-button text size="small" v-if="competence" @click="viewUserRoles(scope.row)">角色</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="queryConditions.currentPage"
+          :page-sizes="[30, 50, 75]"
+          :page-size="queryConditions.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="queryConditions.total"
+          style="margin-top: 5px"
+      ></el-pagination>
+    </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"
@@ -130,9 +125,10 @@ import {
 import {ElMessage, ElMessageBox} from 'element-plus'
 import PersonnelInformationEditing from '@/components/settings/permissions/PersonnelInformationEditing.vue'
 import {needRule} from '@/utils/public'
+import PageLayer from "@/layout/PageLayer";
 
 const windowSize = store.state.app.windowSize
-const tableHeight = windowSize.h - 45
+const tableHeight = windowSize.h - 10
 
 const competence = needRule(1)