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

2 years ago · 4eb075c5e8
8 changed files with 89 additions and 50 deletions
--- a/src/views/checkStatus/index.vue
+++ b/src/views/checkStatus/index.vue
@ -1,7 +1,8 @@
 <template>
  <div>
    <el-card>      
-      <div :style="'display: block; width:' + (window.pageWidth - 80) + 'px;'">
+      <div class="publiccss">组合项目检查状态</div>
+      <div :style="'display: block; width:' + (window.pageWidth - 80) + 'px;margin-top:20px'">
        <div style="display: flex; flex-wrap: wrap; height:80px;">
          <Query />
        </div>        
--- a/src/views/customerOrg/patientRegisterRecover.vue
+++ b/src/views/customerOrg/patientRegisterRecover.vue
@ -1,7 +1,7 @@
 <template>
  <div>
    <el-card>
-      <div class="publiccss">体检表回收</div>
+      <div class="publiccss">回收表格查询</div>
      <div style="display: flex;margin-top:20px">
        <!-- 单位树组件 -->
        <div :style="CustomerOrgTreeStyle">
@ -23,7 +23,6 @@
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { tcdate } from "../../utlis/proFunc";
-
 import CustomerOrgTreeAll from "../../components/patientRegister/customerOrgTreeAll.vue";
 import PatientRegisterQuery from "../../components/patientRegister/patientRegisterQuery.vue";
 import PatientRegisterRecoverList from "../../components/patientRegister/PatientRegisterRecoverList.vue";
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@ -1,6 +1,7 @@
 <template>
  <div>
    <el-card style="display: block; ">
+      <div class="publiccss">体检医生诊台</div>
      <div style="display: flex;">
        <div :style="'width:' + (window.pageWidth - 120 - 70) + 'px;'">
          <div>
--- a/src/views/doctorCheck/sumDoctorCheck.vue
+++ b/src/views/doctorCheck/sumDoctorCheck.vue
@ -1,40 +1,47 @@
 <template>
  <div>
-    <el-card style="display: block; ">
-      <div style="display: flex;">
+    <el-card style="display: block">
+      <div class="publiccss">总检医生诊台</div>
+      <div style="display: flex">
        <div :style="'width:' + (window.pageWidth - 120 - 70) + 'px;'">
          <div>
-            <PatientRegisterBase/>
+            <PatientRegisterBase />
          </div>
-          <div :style="'height:' + (window.pageHeight < 600 ? 380:window.pageHeight-220) + 'px;'" >
+          <div
+            :style="
+              'height:' +
+              (window.pageHeight < 600 ? 380 : window.pageHeight - 220) +
+              'px;'
+            "
+          >
            <el-tabs style="margin-left: 10px" v-model="tabChoosed">
              <el-tab-pane label="综述建议" name="1">
                <div>
-                  <SumSug/>
-                  <SumPREdit/>
-                  <SumAsbItemStatus :patientRegisterId="sumDoctorCheck.sumPREdit.id" />
+                  <SumSug />
+                  <SumPREdit />
+                  <SumAsbItemStatus
+                    :patientRegisterId="sumDoctorCheck.sumPREdit.id"
+                  />
                </div>
              </el-tab-pane>
              <el-tab-pane label="明细结果" name="2">
-                  <CheckDetails/>
-              </el-tab-pane>
-              <el-tab-pane label="危急值" name="3">
-                  
+                <CheckDetails />
              </el-tab-pane>
+              <el-tab-pane label="危急值" name="3"> </el-tab-pane>
              <el-tab-pane label="项目对比" name="4">
-                  <SumItemsType/>
+                <SumItemsType />
              </el-tab-pane>
              <el-tab-pane label="横向对比" name="5">
-                <SumItems/>
+                <SumItems />
              </el-tab-pane>
              <el-tab-pane label="历次综述" name="6">
-                  <SumHistory/>
+                <SumHistory />
              </el-tab-pane>
-          </el-tabs>
-        </div>
+            </el-tabs>
+          </div>
        </div>
-        <div style="width:120px;">
-          <ButtonList/>
+        <div style="width: 120px">
+          <ButtonList />
        </div>
      </div>
    </el-card>
@ -45,7 +52,6 @@ import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { tcdate } from "../../utlis/proFunc";

-
 import PatientRegisterBase from "../../components/doctorCheck/PatientRegisterBase.vue";
 import ButtonList from "../../components/sumDoctorCheck/ButtonList.vue";
 import SumSug from "../../components/sumDoctorCheck/SumSug.vue";
@ -66,7 +72,6 @@ export default {
    SumItemsType,
    SumItems,
    SumHistory,
-
  },
  data() {
    return {
@ -82,7 +87,13 @@ export default {
  },

  computed: {
-    ...mapState(["window","dict", "patientRegister", "customerOrg","sumDoctorCheck"]),
+    ...mapState([
+      "window",
+      "dict",
+      "patientRegister",
+      "customerOrg",
+      "sumDoctorCheck",
+    ]),
  },

  methods: {
--- a/src/views/report/chargeAsbitem.vue
+++ b/src/views/report/chargeAsbitem.vue
@ -1,7 +1,8 @@
 <template>
  <div>
    <el-card>
-      <div style="display: flex">
+      <div class="publiccss">人员费用组合项目</div>
+      <div style="display: flex;margin-top:20px">
        <div :style="'display: block; width:' + (window.pageWidth - 120 - 70) + 'px;'">
          <div style="display: flex; flex-wrap: wrap; height:80px;">
            <div class="query">
--- a/src/views/report/report.vue
+++ b/src/views/report/report.vue
@ -1,20 +1,35 @@
 <template>
  <div>
    <el-card>
-      <div style="display: flex;">
-        <div :style="'display: block; width:' + (window.pageWidth - 120 - 70) + 'px;'">          
-          <PatientRegisterQueryNobtn orgEnable="Y"/>
-          <div style="display: flex;">
-            <div :style="'width:' + (window.pageWidth - 120 - 70)*3/4 + 'px;'">
+      <div class="publiccss">体检报告</div>
+      <div style="display: flex; margin-top: 20px">
+        <div
+          :style="
+            'display: block; width:' + (window.pageWidth - 120 - 70) + 'px;'
+          "
+        >
+          <PatientRegisterQueryNobtn orgEnable="Y" />
+          <div style="display: flex">
+            <div
+              :style="
+                'width:' + ((window.pageWidth - 120 - 70) * 3) / 4 + 'px;'
+              "
+            >
              <PatientRegisterListNobtn />
            </div>
-            <div :style="'margin-left: 2px;width:' + (window.pageWidth - 120 - 70 - 8)/4 + 'px;'">
+            <div
+              :style="
+                'margin-left: 2px;width:' +
+                (window.pageWidth - 120 - 70 - 8) / 4 +
+                'px;'
+              "
+            >
              <RegisterCheckStatus />
            </div>
          </div>
          <SumAsbItemStatus />
        </div>
-        <div style=" margin-left: 10px;width:110px;">
+        <div style="margin-left: 10px; width: 110px">
          <BtnReport />
        </div>
      </div>
@ -25,7 +40,13 @@
 import moment from "moment";
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { tcdate,dddw, objCopy, arrayReduce, arrayExistObj } from "@/utlis/proFunc";
+import {
+  tcdate,
+  dddw,
+  objCopy,
+  arrayReduce,
+  arrayExistObj,
+} from "@/utlis/proFunc";

 import PatientRegisterQueryNobtn from "../../components/report/PatientRegisterQueryNobtn.vue";
 import PatientRegisterListNobtn from "../../components/report/PatientRegisterListNobtn.vue";
@ -42,9 +63,7 @@ export default {
    BtnReport,
  },
  data() {
-    return {
-      
-    };
+    return {};
  },

  created() {
@ -52,9 +71,9 @@ export default {
  },

  //挂载完成
-  mounted() { },
+  mounted() {},
  computed: {
-    ...mapState(["window", "dict","patientRegister"]),
+    ...mapState(["window", "dict", "patientRegister"]),
  },
  methods: {
    //数据初始化
@ -173,7 +192,6 @@ export default {
        this.query();
      }
    },
-
  },
 };
 </script>
--- a/src/views/report/unCheckAsbitem.vue
+++ b/src/views/report/unCheckAsbitem.vue
@ -1,7 +1,8 @@
 <template>
  <div>
    <el-card>
-      <div style="display: flex">
+      <div class="publiccss">人员未检组合项目</div>
+      <div style="display: flex;margin-top:20px">
        <div :style="'display: block; width:' + (window.pageWidth - 120 - 70) + 'px;'">
          <div style="display: flex; flex-wrap: wrap; height:80px;">
            <div class="query">
--- a/src/views/user-list/OrganizationUnits.vue
+++ b/src/views/user-list/OrganizationUnits.vue
@ -113,8 +113,12 @@
        <el-row>
          <el-col :span="8" style="line-height: 40px">
            是否为体检中心
-            <el-radio v-model="form.isPeis" label="Y">是</el-radio>
-            <el-radio v-model="form.isPeis" label="N">否</el-radio>
+            <el-radio-group v-model="form.isPeis">
+              <el-radio label="Y">是</el-radio>
+              <el-radio label="N">否</el-radio>
+            </el-radio-group>
+            <!-- <el-radio v-model="form.isPeis" label="Y">是</el-radio>
+            <el-radio v-model="form.isPeis" label="N">否</el-radio> -->
          </el-col>
          <el-col :span="12">
            <el-form :model="form">
@ -219,9 +223,11 @@ export default {
        putapi(
          `/api/app/organization-units?Id=${this.form.id}&DisplayName=${this.form.displayName}&IsPeis=${this.form.isPeis}`
        ).then((res) => {
-          this.$message.success("编辑成功");
-          this.dialogVisible = false;
-          this.getonorganization();
+          if (res.code == 0) {
+            this.$message.success("编辑成功");
+            this.dialogVisible = false;
+            this.getonorganization();
+          }
        });
      } else if (this.title == 3) {
        postapi("/api/app/organization-units/creatre", {
@ -275,11 +281,11 @@ export default {
    },
    //新增组织组织
    append(node, data) {
+      this.form.displayName = "";
      this.title = 3;
      if (this.title == 3) {
        this.dialogVisible = true;
        this.form.parentId = data.id;
-        // this.form.displayName = "";
        console.log(this.form.parentId);
        console.log(this.form);
      }
@ -335,9 +341,10 @@ export default {
    },
    //编辑组织
    rena(node, data) {
-      console.log(data);
+      console.log(data, "data");
      this.dialogVisible = true;
      this.title = 2;
+      console.log(this.form.isPeis);
      // this.selecttable.push(data);
      this.showcheckbox = true;
      this.form = data;