Merge branch 'master' of http://ver.wh613.com:3000/shentun/peisweb

src/router/index.js

@@ -325,7 +325,27 @@ const routes = [
         path: "/registrar",
         name: "登记员工作量",
         component: () => import("../views/workload/registrar.vue"),
-      }
+      },
+      {
+        path: "/doctorstaionworkload",
+        name: "登记员工作量",
+        component: () => import("../views/workload/doctorstaionworkload.vue"),
+      },
+      {
+        path: "/directordoctor",
+        name: "总检医生工作量",
+        component: () => import("../views/workload/directordoctor.vue"),
+      },
+      {
+        path: "/deskwork",
+        name: "总检医生工作量",
+        component: () => import("../views/workload/deskwork.vue"),
+      },
+      {
+        path: "/tollcollector",
+        name: "总检医生工作量",
+        component: () => import("../views/workload/tollcollector.vue"),
+      },
     ],
   },
 ];

src/views/Home.vue

@@ -240,6 +240,27 @@
             </el-dropdown>
           </div>
           <!-- 工作量统计 -->
+          <!-- <div class="physicalexamination" style="margin-left: 15px">
+            <el-dropdown @command="handleCommand">
+              <span class="el-dropdown-link"> 工作量统计 </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="registrar"
+                  >登记员工作量</el-dropdown-item
+                >
+                <el-dropdown-item command="doctorstaionworkload"
+                  >医生站工作量</el-dropdown-item
+                >
+                <el-dropdown-item command="directordoctor"
+                  >总检工作量</el-dropdown-item
+                >
+                <el-dropdown-item command="deskwork"
+                  >科室工作量</el-dropdown-item
+                >
+              </el-dropdown-menu>
+            </el-dropdown>
+          </div> -->
+          <!--  -->
+          <!-- 收费 -->
           <div class="physicalexamination" style="margin-left: 15px">
             <el-dropdown @command="handleCommand">
               <span class="el-dropdown-link"> 工作量统计 </span>
@@ -247,10 +268,32 @@
                 <el-dropdown-item command="registrar"
                   >登记员工作量</el-dropdown-item
                 >
+                <el-dropdown-item command="doctorstaionworkload"
+                  >医生站工作量</el-dropdown-item
+                >
+                <el-dropdown-item command="directordoctor"
+                  >总检工作量</el-dropdown-item
+                >
+                <el-dropdown-item command="deskwork"
+                  >科室工作量</el-dropdown-item
+                >
               </el-dropdown-menu>
             </el-dropdown>
           </div>
           <!--  -->
+           <!-- 收费 -->
+          <div class="physicalexamination" style="margin-left: 15px">
+            <el-dropdown @command="handleCommand">
+              <span class="el-dropdown-link"> 收费 </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="tollcollector"
+                  >收费员报表</el-dropdown-item
+                >
+             
+             
+              </el-dropdown-menu>
+            </el-dropdown>
+          </div>
           <!--  -->
           <div class="btn">
             当前用户{{ user }}

src/views/doctorCheck/positiveresults.vue

@@ -37,16 +37,20 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="3">
+            <el-button type="primary">主要按钮</el-button>
+          </el-col>
         </el-form>
       </el-row>
       <!-- tabl标题 -->
       <h3 class="tabtitle">人员体检结果清单</h3>
       <!-- tab区域 -->
       <el-table :data="tableData" style="width: 100%">
-        <el-table-column prop="date" label="档案号" width=""> </el-table-column>
-        <el-table-column prop="name" label="性别" width=""> </el-table-column>
-        <el-table-column prop="address" label="姓名"> </el-table-column>
-        <el-table-column prop="address1" label="年龄"> </el-table-column>
+        <el-table-column prop="fileno" label="档案号" width="">
+        </el-table-column>
+        <el-table-column prop="sex" label="性别" width=""> </el-table-column>
+        <el-table-column prop="fullname" label="姓名"> </el-table-column>
+        <el-table-column prop="age" label="年龄"> </el-table-column>
       </el-table>
       <!--  -->
     </el-card>
@@ -62,7 +66,7 @@ export default {
         radio: "9",
         diseasesource: "",
       },
-      tableData: [],
+      tableData: [{ fileno: "档案", sex: "未知", fullname: "张三", age: "20" }],
       customerorgdata: [], //单位需要的数组
       diseasesourcedata: [
         {

src/views/doctorCheck/unitphysicalexamination.vue

@@ -53,6 +53,9 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="3">
+            <el-button type="primary">查询</el-button>
+          </el-col>
         </el-form>
       </el-row>
       <!--  -->

src/views/fee-settings/diseaseStatistics.vue

@@ -42,16 +42,19 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="3">
+            <el-button type="primary">查询</el-button>
+          </el-col>
         </el-form>
       </el-row>
       <!-- tab区域 -->
       <h3 class="tabtitle">疾病人数统计</h3>
       <el-table :data="tableData" style="width: 100%">
-        <el-table-column prop="date" label="疾病" width="180">
+        <el-table-column prop="disease" label="疾病" width="180">
         </el-table-column>
-        <el-table-column prop="name" label="人数" width="180">
+        <el-table-column prop="numberofpeople" label="人数" width="180">
         </el-table-column>
-        <el-table-column prop="address" label="占总检人数百分比">
+        <el-table-column prop="shareintotal" label="占总检人数百分比">
         </el-table-column>
       </el-table>
       <!--  -->
@@ -67,7 +70,13 @@ export default {
         unit: "",
         diagnosis: "",
       },
-      tableData: [],
+      tableData: [
+        {
+          disease: "是,否",
+          numberofpeople: "20",
+          shareintotal: "30",
+        },
+      ],
       customerorgdata: [],
       diagnosisdata: [],
     };

src/views/workload/deskwork.vue

@@ -0,0 +1,102 @@
+<template>
+  <div class="box">
+    <el-card>
+      <el-form :model="form">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="登记员">
+              <el-select v-model="form.username" placeholder="请选择">
+                <el-option
+                  v-for="item in registrardata"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="登记日期">
+              <el-date-picker
+                v-model="form.registrationdate"
+                type="daterange"
+                range-separator="--"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <el-button type="primary" size="">查询</el-button>
+          </el-col>
+        </el-row>
+        <!-- d登记标题 -->
+        <h3 class="tabtile">科室工作量统计</h3>
+      </el-form>
+      <div>
+        <el-table :data="tableData" style="width: 100%">
+          <el-table-column prop="time" label="时间" width="180">
+          </el-table-column>
+          <el-table-column
+            prop="physicalexamination"
+            label="体检科室"
+            width="180"
+          >
+          </el-table-column>
+          <el-table-column prop="asbitem" label="组合项目" width="180">
+          </el-table-column>
+          <el-table-column prop="persontime" label="人次"> </el-table-column>
+        </el-table>
+        <!-- 时间 <span style="margin-left: 20px">xxx</span>
+
+        至
+        <span style="margin-left: 20px">xxx</span>
+      </div>
+      <div>
+        <span>体检科室</span>xxx
+        <span>组合项目</span>xxx
+        <span>人次</span>xxx -->
+      </div>
+    </el-card>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      tableData: [
+        {
+          time: "2023-8-8",
+          physicalexamination: "内科",
+          asbitem: "脂肪代谢",
+          persontime: "3",
+        },
+      ],
+      form: {
+        username: "",
+        registrationdate: "",
+      },
+      registrardata: [
+        {
+          value: "1",
+          label: "张三",
+        },
+        {
+          value: "2",
+          label: "测试",
+        },
+      ],
+    };
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+<style scoped>
+.tabtile {
+  text-align: center;
+  margin-top: 20px;
+}
+</style>

src/views/workload/directordoctor.vue

@@ -0,0 +1,91 @@
+<template>
+  <div class="box">
+    <el-card>
+      <el-form :model="form">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="登记员">
+              <el-select v-model="form.username" placeholder="请选择">
+                <el-option
+                  v-for="item in registrardata"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="登记日期">
+              <el-date-picker
+                v-model="form.registrationdate"
+                type="daterange"
+                range-separator="--"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- d登记标题 -->
+        <h3 class="tabtile">总检医生工作量统计</h3>
+      </el-form>
+      <div>
+        <el-table :data="tableData" style="width: 100%">
+          <el-table-column prop="time" label="时间" width="180">
+          </el-table-column>
+          <el-table-column prop="chiefexaminer" label="总检医生" width="180">
+          </el-table-column>
+          <el-table-column prop="shareintotal" label="占总检人数百分比"> </el-table-column>
+        </el-table>
+        <!-- 时间<span style="margin-left: 20px">xxx</span>
+        至
+        <span style="margin-left: 20px">xxx</span>
+      </div>
+      <div>
+        总检医生<span style="margin-left: 20px">xxx</span> 人数<span>xxx</span>
+        <span style="margin-left: 20px">占总检人数百分比</span>
+        <span style="margin-left: 10px">xxx</span> -->
+      </div>
+    </el-card>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      tableData: [
+        {
+          time: "2023-8-9",
+          chiefexaminer: "医生",
+          shareintotal: "51%",
+        },
+      ],
+      form: {
+        username: "",
+        registrationdate: "",
+      },
+      registrardata: [
+        {
+          value: "1",
+          label: "张三",
+        },
+        {
+          value: "2",
+          label: "测试",
+        },
+      ],
+    };
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+<style scoped>
+.tabtile {
+  text-align: center;
+  margin-top: 20px;
+}
+</style>

src/views/workload/doctorstaionworkload.vue

@@ -0,0 +1,94 @@
+<template>
+  <div class="box">
+    <el-card>
+      <el-form :model="form">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="登记员">
+              <el-select v-model="form.username" placeholder="请选择">
+                <el-option
+                  v-for="item in registrardata"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="登记日期">
+              <el-date-picker
+                v-model="form.registrationdate"
+                type="daterange"
+                range-separator="--"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <el-button type="primary">查询</el-button>
+          </el-col>
+        </el-row>
+        <!-- d登记标题 -->
+        <h3 class="tabtile">医生工作量统计</h3>
+      </el-form>
+      <div>
+        <!-- 时间 <span style="margin-left: 20px">xxx</span>
+
+        至
+        <span style="margin-left: 20px">xxx</span> -->
+        <el-table :data="tableData" style="width: 100%">
+          <el-table-column prop="time" label="时间" width="180">
+          </el-table-column>
+          <el-table-column prop="chiefexaminer" label="总检医生" width="180">
+          </el-table-column>
+          <el-table-column prop="numberofpeople" label="人数" width="180">
+          </el-table-column>
+          <el-table-column prop="generalinspection" label="占总检总人数">
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-card>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      tableData: [
+        {
+          time: "203-8-9",
+          chiefexaminer: "测试",
+          numberofpeople: "85",
+          generalinspection: "13",
+        },
+      ],
+      form: {
+        username: "",
+        registrationdate: "",
+      },
+      registrardata: [
+        {
+          value: "1",
+          label: "张三",
+        },
+        {
+          value: "2",
+          label: "测试",
+        },
+      ],
+    };
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+<style scoped>
+.tabtile {
+  text-align: center;
+  margin-top: 20px;
+}
+</style>

src/views/workload/registrar.vue

@@ -28,16 +28,31 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="3">
+            <el-button type="primary">查询</el-button>
+          </el-col>
         </el-row>
         <!-- d登记标题 -->
         <h3 class="tabtile">登记员工作量统计</h3>
       </el-form>
       <div>
-        登记员<span style="margin-left: 20px">xxx</span>
+        <!-- 登记员<span style="margin-left: 20px">xxx</span>
         人数
         <span style="margin-left: 20px">xxx</span>
         站登记总人数百分比
-          <span style="margin-left: 20px">xxx</span>
+        <span style="margin-left: 20px">xxx</span> -->
+        <el-table :data="tableData" style="width: 100%">
+          <el-table-column prop="registrar" label="登记员" width="180">
+          </el-table-column>
+          <el-table-column
+            prop="totalofpeople"
+            label="站登记总人数百分比"
+            width="180"
+          >
+          </el-table-column>
+          <el-table-column prop="numberofpeople" label="人数">
+          </el-table-column>
+        </el-table>
       </div>
     </el-card>
   </div>
@@ -46,6 +61,13 @@
 export default {
   data() {
     return {
+      tableData: [
+        {
+          registrar: "张三",
+          totalofpeople: "33%",
+          numberofpeople: "10",
+        },
+      ],
       form: {
         username: "",
         registrationdate: "",

src/views/workload/tollcollector.vue

@@ -0,0 +1,125 @@
+<template>
+  <div class="box">
+    <el-card>
+      <el-form :model="form">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="登记员">
+              <el-select v-model="form.username" placeholder="请选择">
+                <el-option
+                  v-for="item in registrardata"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="登记日期">
+              <el-date-picker
+                v-model="form.registrationdate"
+                type="daterange"
+                range-separator="--"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="报表格式">
+              <el-select v-model="form.reportform" placeholder="请选择">
+                <el-option
+                  v-for="item in reportform"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <el-button type="primary">查询</el-button>
+          </el-col>
+        </el-row>
+        <!-- d登记标题 -->
+        <h3 class="tabtile">收费员支付方式统计报表</h3>
+      </el-form>
+      <div>
+        <el-table :data="tableData" style="width: 100%">
+          <el-table-column prop="tollcollector" label="收费员" width="180">
+          </el-table-column>
+          <el-table-column prop="paymentmethod" label="支付方式" width="180">
+          </el-table-column>
+          <el-table-column prop="paidinamount" label="实收金额" width="180">
+          </el-table-column>
+          <el-table-column prop="refundamount" label="退费金额" width="180">
+          </el-table-column>
+          <el-table-column prop="amountto" label="合计"> </el-table-column>
+        </el-table>
+        <!-- 登记员<span style="margin-left: 20px">xxx</span>
+        人数
+        <span style="margin-left: 20px">xxx</span>
+        站登记总人数百分比
+        <span style="margin-left: 20px">xxx</span> -->
+      </div>
+    </el-card>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      tableData: [
+        {
+          tollcollector: "张三",
+          paymentmethod: "支付宝",
+          paidinamount: "55",
+          refundamount: "32",
+          amountto: "70",
+        },
+      ],
+      form: {
+        username: "",
+        registrationdate: "",
+        reportform: "",
+      },
+      reportform: [
+        {
+          value: "1",
+          label: "支付方式",
+        },
+        {
+          value: "2",
+          label: "发票项目",
+        },
+        {
+          value: "3",
+          label: "组合项目",
+        },
+      ],
+      registrardata: [
+        {
+          value: "1",
+          label: "张三",
+        },
+        {
+          value: "2",
+          label: "测试",
+        },
+      ],
+    };
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+<style scoped>
+.tabtile {
+  text-align: center;
+  margin-top: 20px;
+}
+</style>