修改

src/views/manage/components/RehabilitationPlanandRecords.vue

@@ -252,9 +252,7 @@ export default {
             getList(this.query).then(res => {
                 this.itemindex = index
                 this.loading.close();
-                if (res.data.length > 0) {
+                this.categorylist = res.data
-                    this.categorylist = res.data
-                }
             })
         },
     }

src/views/manage/projectdevice/index.vue

@@ -1,28 +1,11 @@
 <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"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
       <el-form-item label="患者姓名" prop="patientName">
-        <el-input
+        <el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.patientName"
-          placeholder="请输入患者姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="身份证号" prop="cardNo">
-        <el-input
+        <el-input v-model="queryParams.cardNo" placeholder="请输入身份证号" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.cardNo"
-          placeholder="请输入身份证号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <!-- <el-form-item label="设备名称" prop="deviceName">
         <el-input
@@ -33,78 +16,33 @@
         />
       </el-form-item> -->
       <el-form-item label="设备类型" prop="deviceType">
-        <el-select
+        <el-select v-model="queryParams.deviceType" placeholder="请选择" style="width: 208px">
-          v-model="queryParams.deviceType"
+          <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="deviceCode">
-        <el-input
+        <el-input v-model="queryParams.deviceCode" placeholder="请输入设备编码" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.deviceCode"
-          placeholder="请输入设备编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </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:projectdevice:add']">新增</el-button>
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['manage:projectdevice: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:projectdevice:edit']">修改</el-button>
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['manage:projectdevice: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:projectdevice:remove']">删除</el-button>
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['manage:projectdevice:remove']"
-          >删除</el-button
-        >
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -117,17 +55,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="projectdeviceList" @selection-change="handleSelectionChange">
-      v-loading="loading"
-      :data="projectdeviceList"
-      @selection-change="handleSelectionChange"
-    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="患者姓名" align="center" prop="patientName" />
       <el-table-column label="身份证号" align="center" prop="cardNo" />
@@ -144,124 +75,59 @@
       <el-table-column label="设备编码" align="center" prop="deviceCode" />
       <!-- <el-table-column label="设备状态" align="center" prop="deviceStatus" /> -->
       <!-- <el-table-column label="备注信息" align="center" prop="deviceRemark" /> -->
-      <el-table-column
+      <el-table-column label="设备绑定时间" align="center" prop="deviceBindTime">
-        label="设备绑定时间"
-        align="center"
-        prop="deviceBindTime"
-      >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.deviceBindTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column
+      <el-table-column label="设备IP地址" align="center" prop="deviceIp" :show-overflow-tooltip="true" />
-        label="设备IP地址"
-        align="center"
-        prop="deviceIp"
-        :show-overflow-tooltip="true"
-      />
       <el-table-column label="设备端口" align="center" prop="devicePort" />
-      <el-table-column
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
         <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:projectdevice: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:projectdevice:remove']">解绑</el-button>
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['manage:projectdevice:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['manage:projectdevice: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="900px" 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="patientId">
           <!-- <el-form-item label="所属分组" prop="groupId"> -->
-          <el-button
+          <el-button type="" v-if="form.patientName == '请选择患者'" @click="clickinnerVisible()" style="
-            type=""
-            v-if="form.patientName == '请选择患者'"
-            @click="clickinnerVisible()"
-            style="
               width: 208px;
               text-align: left;
               height: 36px;
               color: #c0c4cc;
               overflow: hidden;
-            "
+            ">{{ form.patientName }}</el-button>
-            >{{ form.patientName }}</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.patientName }}</el-button>
-            >{{ form.patientName }}</el-button
-          >
         </el-form-item>
         <el-form-item label="身份证号" prop="cardNo">
-          <el-input
+          <el-input v-model="form.cardNo" placeholder="请输入身份证号" maxlength="18" />
-            v-model="form.cardNo"
-            placeholder="请输入身份证号"
-            maxlength="18"
-          />
         </el-form-item>
         <el-form-item label="设备名称" prop="deviceName" maxlength="300">
           <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
         </el-form-item>
         <el-form-item label="设备编码" prop="deviceCode">
-          <el-input
+          <el-input v-model="form.deviceCode" placeholder="请输入设备编码" onKeyUp="value=value.replace(/[\W]/g,'')" />
-            v-model="form.deviceCode"
-            placeholder="请输入设备编码"
-            onKeyUp="value=value.replace(/[\W]/g,'')"
-          />
         </el-form-item>
         <el-form-item label="设备类型" prop="deviceType">
-          <el-select
+          <el-select v-model="form.deviceType" placeholder="请选择" style="width: 208px">
-            v-model="form.deviceType"
+            <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>
@@ -270,7 +136,7 @@
           <el-input v-model="form.deviceIp" placeholder="请输入设备IP地址" />
         </el-form-item>
         <el-form-item label="设备端口" prop="devicePort">
-          <el-input v-model="form.devicePort" placeholder="请输入设备端口" />
+          <el-input v-model="form.devicePort" placeholder="请输入设备端口" type="number" />
         </el-form-item>
         <el-form-item label="备注信息" prop="deviceRemark">
           <el-input v-model="form.deviceRemark" placeholder="请输入备注信息" />
@@ -282,74 +148,30 @@
       </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="patientName" label-width="120">
-          <el-input
+          <el-input v-model="informationqueryParams.patientName" placeholder="请输入患者名称" clearable />
-            v-model="informationqueryParams.patientName"
-            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.patientId == 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.patientId == 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 property="patientName" label="患者名称" align="center">
         </el-table-column>
-        <el-table-column
+        <el-table-column property="patientPhone" label="患者手机号" align="center">
-          property="patientPhone"
-          label="患者手机号"
-          align="center"
-        >
         </el-table-column>
         <el-table-column property="sex" label="患者性别" align="center">
           <template slot-scope="scope">
@@ -357,22 +179,12 @@
             {{ scope.row.sex == "MALE" ? "男" : "" }}
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column property="cardNo" label="患者身份证号" align="center" :show-overflow-tooltip="true">
-          property="cardNo"
-          label="患者身份证号"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
         </el-table-column>
         patientPhone
       </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>
@@ -626,7 +438,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("解绑成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {