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

src/components/patientRegister/PatientRegisterList.vue

@@ -149,31 +149,31 @@
     </div>
     <div style="margin-left: 10px;width:110px;">
       <div class="listBtn">
-        <el-button type="success" class="btnClass" @click="add">人员登记</el-button>
+        <el-button type="" class="btnClass commonbutton" @click="add">人员登记</el-button>
       </div>
       <div class="listBtn">
-        <el-button type="primary" class="btnClass" @click="edit">编辑</el-button>
+        <el-button type="" class="btnClass commonbutton" @click="edit">编辑</el-button>
       </div>
       <div class="listBtn">
-        <el-button type="danger" class="btnClass" @click="del">删除</el-button>
+        <el-button type="" class="btnClass commonbutton" @click="del">删除</el-button>
       </div>
       <div class="listBtn">
-        <el-button type="primary" class="btnClass" @click="openCamera" icon="el-icon-camera">拍照</el-button>
+        <el-button type="" class="btnClass commonbutton" @click="openCamera" icon="el-icon-camera">拍照</el-button>
       </div>
       <div class="listBtn">
-        <el-button type="primary" class="btnClass">健康档案</el-button>
+        <el-button type="" class="btnClass commonbutton">健康档案</el-button>
       </div>
       <div class="listBtn">
-        <el-button type="primary" class="btnClass" @click="btnGroupBatch">调整分组</el-button>
+        <el-button type="" class="btnClass commonbutton" @click="btnGroupBatch">调整分组</el-button>
       </div>
       <div class="listBtn">
-        <el-button type="primary" class="btnClass" @click="asbBatch">调整项目</el-button>
+        <el-button type="" class="btnClass commonbutton" @click="asbBatch">调整项目</el-button>
       </div>
       <div class="listBtn">
-        <el-button type="primary" class="btnClass" @click="guidePrint('0001', false)">指引单打印</el-button>
+        <el-button type="" class="btnClass commonbutton" @click="guidePrint('0001', false)">指引单打印</el-button>
       </div>
       <div class="listBtn">
-        <el-button type="primary" class="btnClass" @click="guidePrint('0001', true)">指引单预览</el-button>
+        <el-button type="" class="btnClass commonbutton" @click="guidePrint('0001', true)" >指引单预览</el-button>
       </div>
     </div>
 

src/components/patientRegister/PatientRegisterRefuseList.vue

@@ -1,14 +1,31 @@
 <template>
   <div style="display: flex">
-    <div :style="'width:' + Math.floor((window.pageWidth - 120 - 86)/2) + 'px;'">
-      <el-table :data="dataList" border 
-        :height="window.pageHeight < 600 ? 310:window.pageHeight-290"
-        row-key="id" size="small" highlight-current-row ref="dataList"
-        @row-click="rowClick">
+    <div
+      :style="'width:' + Math.floor((window.pageWidth - 120 - 86) / 2) + 'px;'"
+    >
+      <el-table
+        :data="dataList"
+        border
+        :height="window.pageHeight < 600 ? 310 : window.pageHeight - 290"
+        row-key="id"
+        size="small"
+        highlight-current-row
+        ref="dataList"
+        @row-click="rowClick"
+      >
         <el-table-column type="index" width="50" label="序号" />
         <el-table-column prop="completeFlag" label="体检进度">
           <template slot-scope="scope">
-            <div>{{ ldddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
+            <div>
+              {{
+                ldddw(
+                  dict.completeFlag,
+                  "id",
+                  scope.row.completeFlag,
+                  "displayName"
+                )
+              }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column prop="isLock" label="锁住" width="50">
@@ -18,19 +35,30 @@
         </el-table-column>
         <el-table-column prop="customerOrgParentName" label="单位" width="180">
           <template slot-scope="scope">
-            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}
+            <div>
+              {{
+                scope.row.customerOrgParentName
+                  ? scope.row.customerOrgParentName
+                  : scope.row.customerOrgName
+              }}
             </div>
           </template>
         </el-table-column>
         <el-table-column prop="customerOrgName" label="部门" width="180">
           <template slot-scope="scope">
-            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
+            <div>
+              {{
+                scope.row.customerOrgParentName ? scope.row.customerOrgName : ""
+              }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column prop="patientName" label="姓名" />
         <el-table-column prop="sexId" label="性别">
           <template slot-scope="scope">
-            <div>{{ ldddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
+            <div>
+              {{ ldddw(dict.sex, "id", scope.row.sexId, "displayName") }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column prop="age" label="年龄" />
@@ -39,11 +67,35 @@
         <el-table-column prop="medicalTimes" label="体检次数"></el-table-column>
         <el-table-column label="分组/套餐" width="150">
           <template slot-scope="scope">
-            <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
-              {{ ldddw(dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName") }}
+            <div
+              v-if="
+                scope.row.medicalPackageId !== dict.personOrgId &&
+                scope.row.customerOrgId === dict.personOrgId
+              "
+            >
+              {{
+                ldddw(
+                  dict.medicalPackage,
+                  "id",
+                  scope.row.medicalPackageId,
+                  "displayName"
+                )
+              }}
             </div>
-            <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
-              {{ ldddw(dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName") }}
+            <div
+              v-if="
+                scope.row.medicalPackageId !== dict.personOrgId &&
+                scope.row.customerOrgId !== dict.personOrgId
+              "
+            >
+              {{
+                ldddw(
+                  dict.customerOrgGroupAll,
+                  "id",
+                  scope.row.customerOrgGroupId,
+                  "displayName"
+                )
+              }}
             </div>
           </template>
         </el-table-column>
@@ -71,21 +123,42 @@
         <el-table-column prop="maritalStatusId" label="婚姻状况">
           <template slot-scope="scope">
             <div>
-              {{ ldddw(dict.maritalStatus, "id", scope.row.maritalStatusId, "displayName") }}
+              {{
+                ldddw(
+                  dict.maritalStatus,
+                  "id",
+                  scope.row.maritalStatusId,
+                  "displayName"
+                )
+              }}
             </div>
           </template>
         </el-table-column>
         <el-table-column prop="medicalTypeId" label="体检类别">
           <template slot-scope="scope">
             <div v-if="scope.row.medicalTypeId !== dict.personOrgId">
-              {{ ldddw(dict.medicalType, "id", scope.row.medicalTypeId, "displayName") }}
+              {{
+                ldddw(
+                  dict.medicalType,
+                  "id",
+                  scope.row.medicalTypeId,
+                  "displayName"
+                )
+              }}
             </div>
           </template>
         </el-table-column>
         <el-table-column prop="personnelTypeId" label="人员类别">
           <template slot-scope="scope">
             <div v-if="scope.row.personnelTypeId !== dict.personOrgId">
-              {{ ldddw(dict.personnelType, "id", scope.row.personnelTypeId, "displayName") }}
+              {{
+                ldddw(
+                  dict.personnelType,
+                  "id",
+                  scope.row.personnelTypeId,
+                  "displayName"
+                )
+              }}
             </div>
           </template>
         </el-table-column>
@@ -108,30 +181,57 @@
             <div>{{ scope.row.isUpload == "Y" ? "是" : "否" }}</div>
           </template>
         </el-table-column>
-
       </el-table>
     </div>
-    <div :style="'margin-left: 5px;width:' + Math.floor((window.pageWidth - 120 - 86)/2) + 'px;'">
-      <div style="display: flex; flex-wrap: wrap;height:40px; width: 100%;">
+    <div
+      :style="
+        'margin-left: 5px;width:' +
+        Math.floor((window.pageWidth - 120 - 86) / 2) +
+        'px;'
+      "
+    >
+      <div style="display: flex; flex-wrap: wrap; height: 40px; width: 100%">
         <div class="query">
           <span>条码号</span>
-          <el-input placeholder="条码号" v-model="quick.patientRegisterNo" size="small" style="width: 140px" clearable
-            @input="onQueryByPatientRegisterNo" />
+          <el-input
+            placeholder="条码号"
+            v-model="quick.patientRegisterNo"
+            size="small"
+            style="width: 140px"
+            clearable
+            @input="onQueryByPatientRegisterNo"
+          />
         </div>
         <div class="query">
           <span>档案号</span>
-          <el-input placeholder="档案号" v-model="quick.patientNo" size="small" style="width: 100px" clearable
-            @input="onQueryByPatientNo" />
+          <el-input
+            placeholder="档案号"
+            v-model="quick.patientNo"
+            size="small"
+            style="width: 100px"
+            clearable
+            @input="onQueryByPatientNo"
+          />
         </div>
         <div class="query">
           <span>姓名</span>
-          <el-input placeholder="姓名" v-model="quick.patientName" size="small" style="width: 100px" disabled />
+          <el-input
+            placeholder="姓名"
+            v-model="quick.patientName"
+            size="small"
+            style="width: 100px"
+            disabled
+          />
         </div>
       </div>
-      <el-table :data="doctorCheck.RegisterCheckList"  
-        :height="window.pageHeight < 600 ? 270:window.pageHeight-330"
-        border highlight-current-row
-        size="small" @selection-change="handleSelectionChange">
+      <el-table
+        :data="doctorCheck.RegisterCheckList"
+        :height="window.pageHeight < 600 ? 270 : window.pageHeight - 330"
+        border
+        highlight-current-row
+        size="small"
+        @selection-change="handleSelectionChange"
+      >
         <el-table-column type="selection" width="40" />
         <el-table-column prop="asbitemName" label="组合项目" width="180" />
         <el-table-column label="弃检" width="80">
@@ -140,19 +240,31 @@
           </template>
         </el-table-column>
         <el-table-column prop="lastModifierName" label="操作员" width="100" />
-        <el-table-column prop="lastModificationTime" label="操作时间" width="180" >
+        <el-table-column
+          prop="lastModificationTime"
+          label="操作时间"
+          width="180"
+        >
           <template slot-scope="scope">
-            <div>{{ lmoment(scope.row.lastModificationTime, "yyyy-MM-DD HH:mm:ss") }}</div>
+            <div>
+              {{
+                lmoment(scope.row.lastModificationTime, "yyyy-MM-DD HH:mm:ss")
+              }}
+            </div>
           </template>
         </el-table-column>
       </el-table>
     </div>
-    <div style="margin-left: 10px;width:110px;">
+    <div style="margin-left: 10px; width: 110px">
       <div class="listBtn">
-        <el-button type="success" class="btnClass" @click="resuse('2')">登记弃检</el-button>
+        <el-button type="success" class="btnClass" @click="resuse('2')"
+          >登记弃检</el-button
+        >
       </div>
       <div class="listBtn">
-        <el-button type="primary" class="btnClass" @click="resuse('0')">取消弃检</el-button>
+        <el-button type="primary" class="btnClass" @click="resuse('0')"
+          >取消弃检</el-button
+        >
       </div>
     </div>
   </div>
@@ -174,72 +286,87 @@ export default {
   data() {
     return {
       dataList: [], //列表数据
-      multipleSelection: [], //选中的数据列表      
+      multipleSelection: [], //选中的数据列表
       quick: {
-        id:'',
-        patientRegisterNo: '',
-        patientNo: '',
-        patientName: '',
+        id: "",
+        patientRegisterNo: "",
+        patientNo: "",
+        patientName: "",
       },
-
     };
   },
 
-  created() { },
+  created() {},
 
   //挂载完成
-  mounted() { },
+  mounted() {},
   computed: {
-    ...mapState(["window","dict", "patientRegister", "customerOrg", "doctorCheck"]),
+    ...mapState([
+      "window",
+      "dict",
+      "patientRegister",
+      "customerOrg",
+      "doctorCheck",
+    ]),
   },
   methods: {
     ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
 
     rowClick(row) {
-      objCopy(row, this.quick)
-      this.registerCheckList(row.id)
+      objCopy(row, this.quick);
+      this.registerCheckList(row.id);
     },
 
     //按条码号查个人数据
     onQueryByPatientRegisterNo() {
-      let val = this.quick.patientRegisterNo
-      console.log(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`)
-      getapi(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`)
-        .then((res) => {
-          if (res.code != -1) {
-            if (res.data) {
-              objCopy(res.data, this.quick)
-              this.registerCheckList(res.data.id)
-            } else {
-              this.quick.patientNo = ''
-              this.quick.patientName = ''
-            }
+      let val = this.quick.patientRegisterNo;
+      console.log(
+        `/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`
+      );
+      getapi(
+        `/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`
+      ).then((res) => {
+        if (res.code != -1) {
+          if (res.data) {
+            objCopy(res.data, this.quick);
+            this.registerCheckList(res.data.id);
+          } else {
+            this.quick.patientNo = "";
+            this.quick.patientName = "";
           }
-        });
+        }
+      });
     },
 
     //按条码号查个人数据
     onQueryByPatientNo() {
-      let val = this.quick.patientNo
-      console.log(`/api/app/patient-register/patient-register-or-patient?SType=2&PatientNo=${val}`)
-      getapi(`/api/app/patient-register/patient-register-or-patient?SType=2&PatientNo=${val}`)
-        .then((res) => {
-          if (res.code != -1) {
-            if (res.data) {
-              objCopy(res.data, this.quick)
-              this.registerCheckList(res.data.id)
-            } else {
-              this.quick.patientRegisterNo = ''
-              this.quick.patientName = ''
-            }
+      let val = this.quick.patientNo;
+      console.log(
+        `/api/app/patient-register/patient-register-or-patient?SType=2&PatientNo=${val}`
+      );
+      getapi(
+        `/api/app/patient-register/patient-register-or-patient?SType=2&PatientNo=${val}`
+      ).then((res) => {
+        if (res.code != -1) {
+          if (res.data) {
+            objCopy(res.data, this.quick);
+            this.registerCheckList(res.data.id);
+          } else {
+            this.quick.patientRegisterNo = "";
+            this.quick.patientName = "";
           }
-        });
+        }
+      });
     },
 
     //获取检查组合项目
     registerCheckList(patientRegisterId) {
-      console.log(`/api/app/register-check/register-check-or-asbitem/${patientRegisterId}`)
-      getapi(`/api/app/register-check/register-check-or-asbitem/${patientRegisterId}`)
+      console.log(
+        `/api/app/register-check/register-check-or-asbitem/${patientRegisterId}`
+      );
+      getapi(
+        `/api/app/register-check/register-check-or-asbitem/${patientRegisterId}`
+      )
         .then((res) => {
           console.log("registerCheckList", res.data);
           if (res.code != -1) {
@@ -266,85 +393,98 @@ export default {
         .then((res) => {
           if (res.code != -1) {
             this.$message.success("操作成功");
-            this.registerCheckList(this.quick.id)
+            this.registerCheckList(this.quick.id);
           }
         })
         .catch(() => {
-          this.$message({ type: "error", message: "已取消删除", });
+          this.$message({ type: "error", message: "已取消删除" });
         });
     },
 
     //弃检与恢复判断
     resuseCheck(completeFlag) {
-      let resuseAsb = '',finishAsb = '',chargeAsb='',msg=''
+      let resuseAsb = "",
+        finishAsb = "",
+        chargeAsb = "",
+        msg = "";
       let ret = {
         allowable: true,
-        msg:'',
-      }
-
-      if (!this.multipleSelection || this.multipleSelection.length < 1) return { allowable: false, msg: '请选择组合项目，再进行此操作' }
-      
-      for(let i=0;i<this.multipleSelection.length;i++){
-        if(this.multipleSelection[i].completeFlag == completeFlag){
-          resuseAsb += '，' + this.multipleSelection[i].asbitemName
-          this.multipleSelection.splice(i,1)
-          i--
-          continue
+        msg: "",
+      };
+
+      if (!this.multipleSelection || this.multipleSelection.length < 1)
+        return { allowable: false, msg: "请选择组合项目，再进行此操作" };
+
+      for (let i = 0; i < this.multipleSelection.length; i++) {
+        if (this.multipleSelection[i].completeFlag == completeFlag) {
+          resuseAsb += "，" + this.multipleSelection[i].asbitemName;
+          this.multipleSelection.splice(i, 1);
+          i--;
+          continue;
         }
-        if(this.multipleSelection[i].completeFlag == '1'){
-          finishAsb += '，' + this.multipleSelection[i].asbitemName
-          this.multipleSelection.splice(i,1)
-          i--
-          continue
+        if (this.multipleSelection[i].completeFlag == "1") {
+          finishAsb += "，" + this.multipleSelection[i].asbitemName;
+          this.multipleSelection.splice(i, 1);
+          i--;
+          continue;
         }
-        if(this.multipleSelection[i].isCharge == 'Y'){
-          chargeAsb += '，' + this.multipleSelection[i].asbitemName
-          this.multipleSelection.splice(i,1)
-          i--
-          continue
+        if (this.multipleSelection[i].isCharge == "Y") {
+          chargeAsb += "，" + this.multipleSelection[i].asbitemName;
+          this.multipleSelection.splice(i, 1);
+          i--;
+          continue;
         }
       }
 
-      if(chargeAsb){
-        msg += '\r\n已收费组合项目：【' + chargeAsb.substring(1,chargeAsb.length) + '】'
+      if (chargeAsb) {
+        msg +=
+          "\r\n已收费组合项目：【" +
+          chargeAsb.substring(1, chargeAsb.length) +
+          "】";
       }
-      if(finishAsb){
-        msg += '\r\n已检组合项目：【' + finishAsb.substring(1,finishAsb.length) + '】'
+      if (finishAsb) {
+        msg +=
+          "\r\n已检组合项目：【" +
+          finishAsb.substring(1, finishAsb.length) +
+          "】";
       }
-      if(msg){
-        msg += '\r\n不可执行此操作！'
+      if (msg) {
+        msg += "\r\n不可执行此操作！";
       }
-      if(resuseAsb){
-        msg += '\r\n组合项目：【' + resuseAsb.substring(1,resuseAsb.length) + `】${completeFlag == '2' ? '已登记弃检':'未登记弃检'}无需再执行此操作`
+      if (resuseAsb) {
+        msg +=
+          "\r\n组合项目：【" +
+          resuseAsb.substring(1, resuseAsb.length) +
+          `】${
+            completeFlag == "2" ? "已登记弃检" : "未登记弃检"
+          }无需再执行此操作`;
       }
-      ret.msg = msg
-      if(this.multipleSelection.length < 1) ret.allowable = false
-      
-      return ret
+      ret.msg = msg;
+      if (this.multipleSelection.length < 1) ret.allowable = false;
+
+      return ret;
     },
 
-    //选中人员签到 
+    //选中人员签到
     resuse(completeFlag) {
-      let ret = this.resuseCheck(completeFlag)
-      if(ret.allowable){
-        if(ret.msg) this.$message.warning(ret.msg)
-      }else{
-        this.$message.warning(ret.msg)
-        return
+      let ret = this.resuseCheck(completeFlag);
+      if (ret.allowable) {
+        if (ret.msg) this.$message.warning(ret.msg);
+      } else {
+        this.$message.warning(ret.msg);
+        return;
       }
 
-      let body = []
-      this.multipleSelection.forEach(e => {
+      let body = [];
+      this.multipleSelection.forEach((e) => {
         body.push({
-          registerCheckId:e.id,
+          registerCheckId: e.id,
           completeFlag,
-        })
+        });
       });
 
-      this.resuseCore(body)
-
+      this.resuseCore(body);
     },
-    
 
     ldddw(arrayData, key, value, display) {
       return dddw(arrayData, key, value, display);
@@ -356,51 +496,65 @@ export default {
 
     //查询
     query() {
-      let body = {}
+      let body = {};
 
-      console.log(`this.patientRegister.query`, this.patientRegister.query)
+      console.log(`this.patientRegister.query`, this.patientRegister.query);
       if (this.patientRegister.query.customerOrgFlag) {
         if (this.patientRegister.query.CustomerOrgParentId) {
-          body.customerOrgId = this.patientRegister.query.CustomerOrgParentId
+          body.customerOrgId = this.patientRegister.query.CustomerOrgParentId;
         } else {
-          if (this.patientRegister.query.customerOrgId) body.customerOrgId = this.patientRegister.query.customerOrgId[0]
+          if (this.patientRegister.query.customerOrgId)
+            body.customerOrgId = this.patientRegister.query.customerOrgId[0];
         }
       }
 
-      if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
+      if (this.patientRegister.query.sex)
+        body.sexId = this.patientRegister.query.sex;
 
-      if (this.patientRegister.query.patientName) body.patientName = this.patientRegister.query.patientName
+      if (this.patientRegister.query.patientName)
+        body.patientName = this.patientRegister.query.patientName;
 
-      if (this.patientRegister.query.completeFlag) body.completeFlag = this.patientRegister.query.completeFlag
+      if (this.patientRegister.query.completeFlag)
+        body.completeFlag = this.patientRegister.query.completeFlag;
 
       //StartDate EndDate
-      if (this.patientRegister.query.startDate && this.patientRegister.query.endDate) {
-        body.startDate = moment(this.patientRegister.query.startDate).format("yyyy-MM-DD")
-        body.endDate = moment(this.patientRegister.query.endDate).format("yyyy-MM-DD")
-        if(body.startDate > body.endDate){
-          this.$message.warning("起始日期不能大于截止日期，数据校验不通过！")
-          return
+      if (
+        this.patientRegister.query.startDate &&
+        this.patientRegister.query.endDate
+      ) {
+        body.startDate = moment(this.patientRegister.query.startDate).format(
+          "yyyy-MM-DD"
+        );
+        body.endDate = moment(this.patientRegister.query.endDate).format(
+          "yyyy-MM-DD"
+        );
+        if (body.startDate > body.endDate) {
+          this.$message.warning("起始日期不能大于截止日期，数据校验不通过！");
+          return;
         }
       }
 
+      if (this.patientRegister.query.idCardNo)
+        body = { idNo: this.patientRegister.query.idCardNo };
 
-      if (this.patientRegister.query.idCardNo) body = { idNo: this.patientRegister.query.idCardNo }
-
-      if (this.patientRegister.query.patientNo) body = { patientNo: this.patientRegister.query.patientNo }
+      if (this.patientRegister.query.patientNo)
+        body = { patientNo: this.patientRegister.query.patientNo };
 
-      if (this.patientRegister.query.patientRegisterNo) body = { patientRegisterNo: this.patientRegister.query.patientRegisterNo }
+      if (this.patientRegister.query.patientRegisterNo)
+        body = {
+          patientRegisterNo: this.patientRegister.query.patientRegisterNo,
+        };
 
-
-      console.log('/api/app/patientregister/getlistinfilter', body)
+      console.log("/api/app/patientregister/getlistinfilter", body);
       const loading = this.$loading({
         lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
       });
-      postapi('/api/app/patientregister/getlistinfilter', body)
+      postapi("/api/app/patientregister/getlistinfilter", body)
         .then((res) => {
-          if(res.code != - 1){
+          if (res.code != -1) {
             this.dataList = res.data.items;
           }
           loading.close();
@@ -420,7 +574,6 @@ export default {
         this.query();
       }
     },
-
   },
 };
 </script>
@@ -438,7 +591,7 @@ export default {
   margin-top: 10px;
   text-align: center;
 }
-.btnClass{
-  width:110px;
+.btnClass {
+  width: 110px;
 }
 </style>

src/components/patientRegister/patientRegisterAsbItem.vue

@@ -20,7 +20,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="isCharge" label="收费" width="50" align="center" >
+        <el-table-column prop="isCharge" label="收费" width="50" align="center">
           <template slot-scope="scope">
             <el-checkbox :value="scope.row.isCharge == 'Y'" align="center" />
           </template>

src/components/unitGrouping/unitGroupCategory.vue

@@ -100,12 +100,12 @@
       </div>
       <div class="operatebottom">
         <div>
-          <el-button type="primary" @click="packagerepicion"
+          <el-button type="" @click="packagerepicion" class="commonbutton"
             >复制套餐</el-button
           >
         </div>
         <div style="margin-top: 10px">
-          <el-button type="primary" @click="copygroup">复制分组</el-button>
+          <el-button type="" @click="copygroup" class="commonbutton">复制分组</el-button> 
         </div>
       </div>
     </div>

src/components/unitGrouping/unitGroupingTable.vue

@@ -1,8 +1,8 @@
 <template>
-  <div style="display: flex;height:200px">
+  <div style="display: flex; height: 200px">
     <el-table
       :data="personnelUnit.personnelgrouping"
-      style="width: 100%;"
+      style="width: 100%; margin-top: 20px"
       row-key="id"
       height="200px"
       highlight-current-row
@@ -39,22 +39,36 @@
     <div style="margin-top: 3%; margin-left: 10px">
       <div style="margin-left: 10px; margin-top: 5%">
         <div style="margin-top: 10px">
-          <el-button type="primary" @click="groupaddtion">新增</el-button>
+          <el-button type="" @click="groupaddtion" class="commonbutton"
+            >新增</el-button
+          >
         </div>
         <div style="margin-top: 10px">
-          <el-button type="success" @click="editgroup">编辑</el-button>
+          <el-button type="" @click="editgroup" class="commonbutton"
+            >编辑</el-button
+          >
         </div>
         <div style="margin-top: 10px">
-          <el-button type="danger" @click="deletegroup">删除</el-button>
+          <el-button type="" @click="deletegroup" class="commonbutton"
+            >删除</el-button
+          >
         </div>
         <div style="margin-top: 10px">
-          <el-button type="primary" @click="topping">置顶</el-button>
+          <el-button type="" @click="topping" class="commonbutton"
+            >置顶</el-button
+          >
         </div>
         <div style="margin-top: 10px">
-          <el-button type="primary" @click="bottoming">置低</el-button>
+          <el-button type="" @click="bottoming" class="commonbutton"
+            >置低</el-button
+          >
         </div>
         <div style="margin-top: 10px">
-          <el-button type="primary" @click="sortok" :disabled="isshow"
+          <el-button
+            type=""
+            @click="sortok"
+            :disabled="isshow"
+            class="commonbutton"
             >确定</el-button
           >
         </div>
@@ -200,7 +214,7 @@ export default {
       putapi("/api/app/customerorggroup/updatesortmany", {
         itemList: result,
       }).then((res) => {
-        this.$message.success("操作成功"); 
+        this.$message.success("操作成功");
         this.isshow = true;
         this.getlist();
       });
@@ -368,4 +382,9 @@ export default {
 ::v-deep .el-form-item {
   margin-bottom: 10px;
 }
+::v-deep .el-table__header th {
+  /* font-size: px; */
+  background-color: rgb(245, 245, 245); /* 设置表头背景颜色 */
+  color: rgb(113, 113, 113); /* 设置表头文字颜色 */
+}
 </style>

src/views/basic-dictionary/MedicalConclusionType.vue

@@ -19,7 +19,7 @@
         </el-row>
         <el-table
           :data="tableData"
-          style="width: 100%;margin-top:20px"
+          style="width: 100%; margin-top: 20px"
           row-key="id"
           class="el-table__body-wrapper tbody"
           @row-click="rowick"

src/views/customerOrg/customerOrg.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card style="display: block">
+    <el-card style="display: block;border-radius: 15px" class="elcard">
       <div class="publiccss">体检单位设置</div>
       <!--  标题高度 60px
       <div slot="header">

src/views/customerOrg/customerOrgGroup.vue

@@ -1,13 +1,13 @@
 <template>
   <div style="display: flex">
     <div class="box">
-      <el-card>
-      <div class="publiccss">单位分组</div>
+      <el-card class="elcard" style="border-radius: 15px;">
+        <div class="publiccss">单位分组</div>
         <span>单位</span>
         <el-select
           v-model="value"
           placeholder="请选择"
-          style="margin-left: 20px;margin-top:20px"
+          style="margin-left: 20px; margin-top: 20px"
           @change="secltchang"
         >
           <el-option
@@ -72,6 +72,9 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .el-card__body{
+  height: 800px; 
+}
 .box {
   width: 100%;
 }

src/views/customerOrg/patientRegister.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card>
+    <el-card class="elcard" style="border-radius: 15px">
       <div class="publiccss">体检人员登记</div>
       <div style="display: flex;margin-top:20px">
         <!-- 单位树组件 -->
@@ -32,7 +32,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 PatientRegisterList from "../../components/patientRegister/PatientRegisterList.vue";

src/views/customerOrg/patientRegisterSign.vue

@@ -1,6 +1,6 @@
 <template>
   <div>    
-    <el-card>
+    <el-card class="elcard" style="border-radius: 15px">
       <div class="publiccss">体检人员签到</div>
       <div style="display: flex">
         <!-- 单位树组件 -->
@@ -8,7 +8,7 @@
           (window.pageHeight < 600 ? 410 : window.pageHeight - 190) +
           'px;'
           ">
-          <CustomerOrgTreeAll />
+          <CustomerOrgTreeAll /> 
         </div>
         <div :style="'display:block;width:' +
           (window.pageWidth - 200 - 80) +

src/views/fee-settings/SysParmType.vue

@@ -1,8 +1,7 @@
 <template>
   <div class="box">
     <div style="width: 95%">
-      <el-card >
-     
+      <el-card>
         <!--  11-->
         <el-row>
           <el-col :span="8">
@@ -10,13 +9,13 @@
             <el-select
               v-model="organizationvalue"
               placeholder="请选择"
-              style="margin-left: 15px" 
-              filterable 
-              @change="changvalue" 
+              style="margin-left: 15px"
+              filterable
+              @change="changvalue"
             >
               <el-option
                 v-for="item in organizationdata"
-                :key="item.id" 
+                :key="item.id"
                 :label="item.displayName"
                 :value="item.id"
               >
@@ -158,15 +157,15 @@ export default {
     },
     // getlist() {
     //   getapi("/api/app/sys-parm-type").then((res) => {
-    //     this.tableData = res.data; 
+    //     this.tableData = res.data;
     //     console.log(res);
     //   });
     // },
   },
-}; 
+};
 </script>
 <style scoped>
 .box {
-  display: flex;  
+  display: flex;
 }
 </style>