修改

src/views/manage/manualReview/index.vue

@@ -233,10 +233,16 @@ export default {
             if (this.dischargeTime?.length > 0) {
                 this.queryParams.dischargeTimeStart = this.dischargeTime[0]
                 this.queryParams.dischargeTimeEnd = this.dischargeTime[1]
+            } else {
+                this.queryParams.dischargeTimeStart = null
+                this.queryParams.dischargeTimeEnd = null
             }
             if (this.admissionTime?.length > 0) {
                 this.queryParams.admissionTimeStart = this.admissionTime[0]
                 this.queryParams.admissionTimeEnd = this.admissionTime[1]
+            } else {
+                this.queryParams.admissionTimeStart = null
+                this.queryParams.admissionTimeEnd = null
             }
             this.queryParams.pageNum = 1;
             this.getList();

src/views/manage/materials/index.vue

@@ -472,9 +472,7 @@ export default {
       } else {
         this.queryParams.createTimeStart = null
         this.queryParams.createTimeEnd = null
-
       }
-
       this.getList();
     },
     /** 重置按钮操作 */

src/views/manage/patientInfo/index.vue

@@ -266,10 +266,16 @@ export default {
       if (this.visitDate?.length > 0) {
         this.queryParams.visitDateStart = this.visitDate[0]
         this.queryParams.visitDateEnd = this.visitDate[1]
+      } else {
+        this.queryParams.visitDateStart = null
+        this.queryParams.visitDateEnd = null
       }
       if (this.admissionTime?.length > 0) {
         this.queryParams.admissionTimeStart = this.admissionTime[0]
         this.queryParams.admissionTimeEnd = this.admissionTime[1]
+      } else {
+        this.queryParams.admissionTimeStart = null
+        this.queryParams.admissionTimeEnd = null
       }
       this.queryParams.pageNum = 1;
       this.getList();

src/views/manage/preHospitalized/index.vue

@@ -152,6 +152,7 @@
       <el-table-column label="院区" align="center" prop="campusAgencyName" width='130' />
       <el-table-column label="科室名称" align="center" prop="departmentName" width='130' />
       <el-table-column label="病区名称" align="center" prop="wardName" width='130' />
+      <el-table-column label="预约时间" align="center" prop="appointmentDate" width='130' />
       <!-- <el-table-column label="住院号" align="center" prop="admissionNumber" width='130' /> -->
       <!-- <el-table-column label="门诊号" align="center" prop="outpatientNumber" width='130' /> -->
       <el-table-column label="开证医生" align="center" prop="certificateIssuingDoctorName" />
@@ -195,10 +196,10 @@
           <el-input v-model="form.patientName" placeholder="请输入患者姓名" style="width:200px" />
         </el-form-item>
         <el-form-item label="患者电话" prop="patientPhone">
-          <el-input v-model="form.patientPhone" placeholder="请输入患者电话" style="width:200px" maxlength="11"/>
+          <el-input v-model="form.patientPhone" placeholder="请输入患者电话" style="width:200px" maxlength="11" />
         </el-form-item>
         <el-form-item label="家属电话" prop="familyMemberPhone">
-          <el-input v-model="form.familyMemberPhone" placeholder="请输入家属电话" style="width:200px" maxlength="11"/>
+          <el-input v-model="form.familyMemberPhone" placeholder="请输入家属电话" style="width:200px" maxlength="11" />
         </el-form-item>
         <el-form-item label="出生日期" prop="birthDate">
           <el-date-picker clearable v-model="form.birthDate" style="width:200px" type="date" value-format="yyyy-MM-dd"
@@ -206,7 +207,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="身份证号" prop="cardNo">
-          <el-input v-model="form.cardNo" placeholder="请输入身份证号" style="width:200px" maxlength="18"/>
+          <el-input v-model="form.cardNo" placeholder="请输入身份证号" style="width:200px" maxlength="18" />
         </el-form-item>
         <el-form-item label="性别" prop="sex">
           <el-radio-group v-model="form.sex">
@@ -462,14 +463,17 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        cardNo:[
+        cardNo: [
-        { required: false, message: '', trigger: 'change' },
+          { required: true, message: '身份证号格式有误！', trigger: 'change' },
-        {
+          {
             pattern: /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/,
             message: "身份证号格式有误！",
             trigger: "blur"
           }
         ],
+        hospitalAgencyId: [
+          { required: true, message: '请选择医院', trigger: 'change' }
+        ],
         patientName: [
           { required: true, message: '请输入患者姓名', trigger: 'change' }
         ],
@@ -481,14 +485,13 @@ export default {
             trigger: "blur"
           }
         ],
-        familyMemberPhone:[
+        familyMemberPhone: [
-        { required: false, message: '', trigger: 'change' },
+          { required: false, message: '请输入正确的手机号', trigger: 'change' },
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号",
             trigger: "blur"
           }
-
         ],
         appointmentDate: [
           { required: true, message: '请选择患者预约时间', trigger: 'change' }
@@ -577,6 +580,9 @@ export default {
       if (this.appointmentDate?.length > 0) {
         this.queryParams.appointmentDateStart = this.appointmentDate[0]
         this.queryParams.appointmentDateEnd = this.appointmentDate[1]
+      } else {
+        this.queryParams.appointmentDateStart = null
+        this.queryParams.appointmentDateEnd = null
       }
       this.queryParams.pageNum = 1;
       this.getList();

src/views/manage/project/index.vue

@@ -1,13 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"
-      :model="queryParams"
+      @submit.native.prevent>
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
       <!-- <el-form-item label="所属分组id" prop="groupId">
         <el-input
           v-model="queryParams.groupId"
@@ -25,12 +19,7 @@
         />
       </el-form-item> -->
       <el-form-item label="项目名称" prop="projectName">
-        <el-input
+        <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.projectName"
-          placeholder="请输入项目名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <!-- <el-form-item label="项目编码" prop="projectCode">
         <el-input
@@ -113,54 +102,23 @@
         />
       </el-form-item> -->
       <el-form-item>
-        <el-button
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          type="primary"
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          type="primary"
+          v-hasPermi="['manage:project:add']">新增</el-button>
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['manage:project:add']"
-          >新增</el-button
-        >
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          type="success"
+          v-hasPermi="['manage:project:edit']">修改</el-button>
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['manage:project:edit']"
-          >修改</el-button
-        >
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          type="danger"
+          v-hasPermi="['manage:project:remove']">删除</el-button>
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['manage:project:remove']"
-          >删除</el-button
-        >
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -173,17 +131,10 @@
           >导出</el-button
         >
       </el-col> -->
-      <right-toolbar
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
     </el-row>
 
-    <el-table
+    <el-table v-loading="loading" :data="projectList" @selection-change="handleSelectionChange">
-      v-loading="loading"
-      :data="projectList"
-      @selection-change="handleSelectionChange"
-    >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
       <el-table-column label="所属分组" align="center" prop="groupName" />
@@ -205,86 +156,42 @@
       </el-table-column>
       <el-table-column label="项目指标最大值" align="center" prop="maxValue" />
       <el-table-column label="项目指标最小值" align="center" prop="minValue" />
-      <el-table-column
+      <el-table-column label="项目指标默认值" align="center" prop="defaultValue" />
-        label="项目指标默认值"
-        align="center"
-        prop="defaultValue"
-      />
       <el-table-column label="LIS对照" align="center" prop="lisCompare" />
       <el-table-column label="计量单位" align="center" prop="projectUnit" />
       <el-table-column label="排序" align="center" prop="projectSort" />
       <el-table-column label="备注信息" align="center" prop="projectRemark" />
-      <el-table-column
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-        width="100"
-      >
         <template slot-scope="scope">
-          <el-button
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            size="mini"
+            v-hasPermi="['manage:project:edit']">修改</el-button>
-            type="text"
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            icon="el-icon-edit"
+            v-hasPermi="['manage:project:remove']">删除</el-button>
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['manage:project:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['manage:project:remove']"
-            >删除</el-button
-          >
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      v-show="total > 0"
+      @pagination="getList" />
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改检测项目对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="850px" append-to-body>
-      <el-form
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px" :inline="true">
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="120px"
-        :inline="true"
-      >
         <el-form-item label="所属分组" prop="groupId">
-          <el-button
+          <el-button type="" v-if="form.groupName == '请选择所属分组'" @click="clickinnerVisible()" style="
-            type=""
-            v-if="form.groupName == '请选择所属分组'"
-            @click="clickinnerVisible()"
-            style="
               width: 208px;
               text-align: left;
               height: 36px;
               color: #c0c4cc;
               overflow: hidden;
-            "
+            ">{{ form.groupName }}</el-button>
-            >{{ form.groupName }}</el-button
+          <el-button @click="clickinnerVisible()" type="" v-else style="
-          >
-          <el-button
-            @click="clickinnerVisible()"
-            type=""
-            v-else
-            style="
               width: 208px;
               text-align: left;
               height: 36px;
               padding-left: -10px;
               overflow: hidden;
-            "
+            ">{{ form.groupName }}</el-button>
-            >{{ form.groupName }}</el-button
-          >
           <!-- <el-cascader
             :props="{ checkStrictly: true }"
             :options="treeOptions"
@@ -317,60 +224,28 @@
           <el-input v-model="form.groupName" placeholder="请输入分组名称" />
         </el-form-item> -->
         <el-form-item label="项目名称" prop="projectName">
-          <el-input
+          <el-input v-model="form.projectName" placeholder="请输入项目名称" maxlength="100" />
-            v-model="form.projectName"
-            placeholder="请输入项目名称"
-            maxlength="100"
-          />
         </el-form-item>
         <el-form-item label="项目编码" prop="projectCode">
-          <el-input
+          <el-input v-model="form.projectCode" placeholder="请输入项目编码" onKeyUp="value=value.replace(/[\W]/g,'')" />
-            v-model="form.projectCode"
-            placeholder="请输入项目编码"
-            onKeyUp="value=value.replace(/[\W]/g,'')"
-          />
         </el-form-item>
         <el-form-item label="项目别名" prop="projectAlias">
-          <el-input
+          <el-input v-model="form.projectAlias" placeholder="请输入项目别名" maxlength="100" />
-            v-model="form.projectAlias"
-            placeholder="请输入项目别名"
-            maxlength="100"
-          />
         </el-form-item>
         <el-form-item label="判断模式" prop="judgeMode">
-          <el-select
+          <el-select v-model="form.judgeMode" placeholder="请选择" style="width: 208px">
-            v-model="form.judgeMode"
+            <el-option v-for="item in options" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
-            placeholder="请选择"
-            style="width: 208px"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.dictValue"
-              :label="item.dictLabel"
-              :value="item.dictValue"
-            >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="项目指标默认值" prop="defaultValue">
-          <el-input
+          <el-input v-model="form.defaultValue" placeholder="请输入项目指标默认值" />
-            v-model="form.defaultValue"
-            placeholder="请输入项目指标默认值"
-          />
         </el-form-item>
         <el-form-item label="项目指标最小值" prop="minValue">
-          <el-input
+          <el-input :change="checkPrice()" v-model="form.minValue" placeholder="请输入项目指标最小值" />
-            :change="checkPrice()"
-            v-model="form.minValue"
-            placeholder="请输入项目指标最小值"
-          />
         </el-form-item>
         <el-form-item label="项目指标最大值" prop="maxValue">
-          <el-input
+          <el-input :change="checkPricemax()" v-model="form.maxValue" placeholder="请输入项目指标最大值" />
-            :change="checkPricemax()"
-            v-model="form.maxValue"
-            placeholder="请输入项目指标最大值"
-          />
         </el-form-item>
 
         <!-- <el-form-item label="LIS对照" prop="lisCompare">
@@ -380,19 +255,11 @@
           <el-input v-model="form.projectUnit" placeholder="请输入计量单位" />
         </el-form-item>
         <el-form-item label="排序" prop="projectSort">
-          <el-input-number
+          <el-input-number v-model="form.projectSort" controls-position="right" :min="0" />
-            v-model="form.projectSort"
-            controls-position="right"
-            :min="0"
-          />
           <!-- <el-input v-model="form.projectSort" placeholder="请输入排序" /> -->
         </el-form-item>
         <el-form-item label="备注信息" prop="projectRemark">
-          <el-input
+          <el-input v-model="form.projectRemark" placeholder="请输入备注信息" maxlength="100" />
-            v-model="form.projectRemark"
-            placeholder="请输入备注信息"
-            maxlength="100"
-          />
         </el-form-item>
         <el-form-item label="是否启用" prop="enableStatus">
           <el-radio-group v-model="form.enableStatus" size="small">
@@ -407,82 +274,32 @@
       </div>
     </el-dialog>
     <!-- 分组弹框 -->
-    <el-dialog
+    <el-dialog title="" :visible.sync="innerVisibleshow" width="1000px" append-to-body
-      title=""
+      :before-close="innerVisiblecancel">
-      :visible.sync="innerVisibleshow"
+      <el-form ref="queryForm" :model="informationqueryParams" :rules="rules" label-width="80px" :inline="true">
-      width="1000px"
-      append-to-body
-      :before-close="innerVisiblecancel"
-    >
-      <el-form
-        ref="queryForm"
-        :model="informationqueryParams"
-        :rules="rules"
-        label-width="80px"
-        :inline="true"
-      >
         <el-form-item label="分组名称" prop="groupName" label-width="120">
-          <el-input
+          <el-input v-model="informationqueryParams.groupName" placeholder="请输入分组名称" clearable />
-            v-model="informationqueryParams.groupName"
-            placeholder="请输入分组名称"
-            clearable
-          />
         </el-form-item>
 
         <el-form-item>
-          <el-button
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="informationInfoinfo">搜索</el-button>
-            type="primary"
+          <el-button icon="el-icon-refresh" size="mini" @click="addresetQuerylist">重置</el-button>
-            icon="el-icon-search"
-            size="mini"
-            @click="informationInfoinfo"
-            >搜索</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            size="mini"
-            @click="addresetQuerylist"
-            >重置</el-button
-          >
         </el-form-item>
       </el-form>
 
-      <el-table
+      <el-table :data="infolist" @cell-dblclick="nurseclick" v-loading="loading">
-        :data="infolist"
-        @cell-dblclick="nurseclick"
-        v-loading="loading"
-      >
         <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
-            <el-button
+            <el-button type="primary" style="width: 15px; height: 15px" v-if="form.groupId == scope.row.id" circle
-              type="primary"
+              @click="nurseclick(scope.row)"></el-button>
-              style="width: 15px; height: 15px"
+            <el-button v-else style="width: 15px; height: 15px" circle @click="nurseclick(scope.row)"></el-button>
-              v-if="form.groupId == scope.row.id"
-              circle
-              @click="nurseclick(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="nurseclick(scope.row)"
-            ></el-button>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column property="groupName" label="分组名称" align="center" :show-overflow-tooltip="true">
-          property="groupName"
-          label="分组名称"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
         </el-table-column>
       </el-table>
-      <pagination
+      <pagination v-show="totaldepartment > 0" :total="totaldepartment" :page.sync="informationqueryParams.pageNum"
-        v-show="totaldepartment > 0"
+        :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" />
-        :total="totaldepartment"
-        :page.sync="informationqueryParams.pageNum"
-        :limit.sync="informationqueryParams.pageSize"
-        @pagination="informationInfoinfo"
-      />
     </el-dialog>
   </div>
 </template>
@@ -778,7 +595,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

src/views/manage/signRecord/index.vue

@@ -403,18 +403,30 @@ export default {
       if (this.intentionalTime?.length > 0) {
         this.queryParams.intentionalTimeStart = this.intentionalTime[0]
         this.queryParams.intentionalTimeEnd = this.intentionalTime[1]
+      } else {
+        this.queryParams.intentionalTimeStart = null
+        this.queryParams.intentionalTimeEnd = null
       }
       if (this.signTime?.length > 0) {
         this.queryParams.signTimeStart = this.signTime[0]
         this.queryParams.signTimeEnd = this.signTime[1]
+      } else {
+        this.queryParams.signTimeStart = null
+        this.queryParams.signTimeEnd = null
       }
       if (this.serviceEndTime?.length > 0) {
         this.queryParams.serviceEndTimeStart = this.serviceEndTime[0]
         this.queryParams.serviceEndTimeEnd = this.serviceEndTime[1]
+      } else {
+        this.queryParams.serviceEndTimeStart = null
+        this.queryParams.serviceEndTimeEnd = null
       }
       if (this.submissionTime?.length > 0) {
         this.queryParams.submissionTimeStart = this.submissionTime[0]
         this.queryParams.submissionTimeEnd = this.submissionTime[1]
+      } else {
+        this.queryParams.submissionTimeStart = null
+        this.queryParams.submissionTimeEnd = null
       }
       this.queryParams.pageNum = 1;
       this.getList();

src/views/manage/visitin/index.vue

@@ -473,8 +473,14 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        inHospitalNumber: [
+          { required: true, message: '请输入住院号', trigger: 'change' }
+        ],
+        hospitalAgencyId: [
+          { required: true, message: '请选择医院', trigger: 'change' }
+        ],
         cardNo: [
-          { required: false, message: '', trigger: 'change' },
+          { required: true, message: '身份证号格式有误！', trigger: 'change' },
           {
             pattern: /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/,
             message: "身份证号格式有误！",
@@ -488,7 +494,6 @@ export default {
             message: "请输入正确的手机号",
             trigger: "blur"
           }
-
         ],
         patientName: [
           { required: true, message: '请输入患者姓名', trigger: 'change' }
@@ -611,6 +616,9 @@ export default {
       if (this.admissionTime?.length > 0) {
         this.queryParams.admissionTimeStart = this.admissionTime[0]
         this.queryParams.admissionTimeEnd = this.admissionTime[1]
+      } else {
+        this.queryParams.admissionTimeStart = null
+        this.queryParams.admissionTimeEnd = null
       }
       this.queryParams.pageNum = 1;
       this.getList();

src/views/manage/visitout/index.vue

@@ -533,8 +533,17 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        visitSerialNumber: [
+          { required: true, message: '请输入就诊流水号', trigger: 'change' }
+        ],
+        inHospitalNumber: [
+          { required: true, message: '请输入门诊/住院号', trigger: 'change' }
+        ],
+        hospitalAgencyId: [
+          { required: true, message: '请选择医院', trigger: 'change' }
+        ],
         cardNo: [
-          { required: false, message: '', trigger: 'change' },
+          { required: true, message: '身份证号格式有误！', trigger: 'change' },
           {
             pattern: /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/,
             message: "身份证号格式有误！",
@@ -548,7 +557,6 @@ export default {
             message: "请输入正确的手机号",
             trigger: "blur"
           }
-
         ],
         patientName: [
           { required: true, message: '请输入患者姓名', trigger: 'change' }
@@ -719,6 +727,9 @@ export default {
       if (this.dischargeTime?.length > 0) {
         this.queryParams.dischargeTimeStart = this.dischargeTime[0]
         this.queryParams.dischargeTimeEnd = this.dischargeTime[1]
+      } else {
+        this.queryParams.dischargeTimeStart = null
+        this.queryParams.dischargeTimeEnd = null
       }
       this.queryParams.pageNum = 1;
       this.getList();