修改1

src/views/system/classifyItem/index.vue

@@ -24,17 +24,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="分类类型" prop="classifyType">
-        <el-select v-model="queryParams.classifyType" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item> -->
       <el-form-item label="分类排序" prop="classifySort">
         <el-input
           v-model="queryParams.classifySort"
@@ -65,7 +54,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['classify:info:add']"
+          v-hasPermi="['system:classifyItem:add']"
           >新增</el-button
         >
       </el-col>
@@ -77,7 +66,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['classify:info:edit']"
+          v-hasPermi="['system:classifyItem:edit']"
           >修改</el-button
         >
       </el-col>
@@ -89,7 +78,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['classify:info:remove']"
+          v-hasPermi="['system:classifyItem:remove']"
           >删除</el-button
         >
       </el-col>
@@ -136,7 +125,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['classify:info:edit']"
+            v-hasPermi="['system:classifyItem:edit']"
             >修改</el-button
           >
           <el-button
@@ -144,7 +133,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['classify:info:remove']"
+            v-hasPermi="['system:classifyItem:remove']"
             >删除</el-button
           >
         </template>
@@ -326,17 +315,6 @@ export default {
         classifyPictureUrl: null,
         classifySort: null,
       },
-      //分类所属类型
-      options: [
-        {
-          value: "NURSE_AGNECY",
-          label: "护理机构分类",
-        },
-        {
-          value: "NURSE_ITEM",
-          label: "护理项目分类",
-        },
-      ],
       // 表单参数
       form: {
         nurseClassifyInfoList: [],

src/views/system/stationItem/index.vue

@@ -232,7 +232,6 @@
                 width: 208px;
                 text-align: left;
                 height: 36px;
-                padding-left: -10px;
                 overflow: hidden;
                 text-overflow: ellipsis;
                 white-space: nowrap;
@@ -251,19 +250,41 @@
             maxlength="50"
           />
         </el-form-item>
-        <!-- <el-form-item
+        <el-form-item label="护理项目分类" required>
-          label="提前预约时长"
+          <template>
-          prop="nurseStationItem.advanceAppointDuration"
+            <el-button
-        >
+              type=""
-          <el-input
+              style="
-            v-model="form.nurseStationItem.advanceAppointDuration"
+                width: 208px;
-            placeholder="提前预约时长(单位小时)"
+                text-align: left;
-            oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+0)} if(value.length>5){value=value.slice(0,5)}"
+                height: 36px;
-            type="number"
+                overflow: hidden;
-            min="0"
+                text-overflow: ellipsis;
-          />
+                white-space: nowrap;
-        </el-form-item> -->
+                color: #c0c4cc;
-
+              "
+              @click="clickClassifyshow"
+              v-if="
+                form.nurseStationItem.nurseClassifyName == '请选择护理项目分类'
+              "
+              >{{ form.nurseStationItem.nurseClassifyName }}</el-button
+            >
+            <el-button
+              type=""
+              style="
+                width: 208px;
+                text-align: left;
+                height: 36px;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+              "
+              @click="clickClassifyshow"
+              v-else
+              >{{ form.nurseStationItem.nurseClassifyName }}</el-button
+            >
+          </template>
+        </el-form-item>
         <el-form-item label="排序" prop="nurseStationItem.sort">
           <el-input
             placeholder="请输入排序"
@@ -420,6 +441,88 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 护理项目分类 -->
+    <el-dialog
+      title="选择护理项目分类"
+      :visible.sync="Classifyshow"
+      width="1100px"
+      append-to-body
+      :before-close="cancelClassifyshow"
+    >
+      <el-form :model="classifyquery" label-width="150px" :inline="true">
+        <el-form-item label="护理项目分类编码" prop="classifyCode">
+          <el-input
+            v-model="classifyquery.classifyCode"
+            placeholder="请输入护理项目分类编码"
+          />
+        </el-form-item>
+        <el-form-item label="护理项目分类名称" prop="classifyName">
+          <el-input
+            v-model="classifyquery.classifyName"
+            placeholder="请输入护理项目分类名称"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="classifylistInfo"
+            >搜索</el-button
+          >
+          <el-button
+            icon="el-icon-refresh"
+            size="mini"
+            @click="classifylistcancel"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="loading"
+        :data="classifylist"
+        @cell-dblclick="choiceclassify"
+      >
+        <el-table-column label="请选择" width="70" align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              style="width: 15px; height: 15px"
+              circle
+              @click="choiceclassify(scope.row)"
+              v-if="form.nurseStationItem.nurseClassifyId == scope.row.id"
+            ></el-button>
+
+            <el-button
+              style="width: 15px; height: 15px"
+              circle
+              v-else
+              @click="choiceclassify(scope.row)"
+            >
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          property="classifyCode"
+          label="护理项目分类编码"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="classifyName"
+          label="护理项目分类名称"
+          align="center"
+        >
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="classifytotal > 0"
+        :total="classifytotal"
+        :page.sync="classifyquery.pageNum"
+        :limit.sync="classifyquery.pageSize"
+        @pagination="classifylistInfo"
+      />
+    </el-dialog>
     <!-- 护理站 -->
     <el-dialog
       title="选择护理站"
@@ -667,7 +770,7 @@
 <script>
 import { listStationConsumable } from "@/api/system/stationConsumable";
 import stationAcatar from "../stationAvatar/index.vue";
-
+import { listInfo } from "@/api/system/classifyItem.js";
 import {
   list,
   getNurseItem,
@@ -705,6 +808,7 @@ export default {
       loading: true,
       stationConsumableshow: false,
       nurseStationshow: false,
+      Classifyshow: false,
       // 选中数组
       ids: [],
       idd: 99999999,
@@ -764,6 +868,8 @@ export default {
           itemPictureUrl: "",
           sort: "",
           nurseStationName: "请选择所属护理站",
+          nurseClassifyName: "请选择护理项目分类",
+          nurseClassifyId: "",
         },
       },
       idd: 1,
@@ -795,14 +901,56 @@ export default {
           { required: true, message: "请选择护理类型", trigger: "blur" },
         ],
       },
+      classifyquery: {
+        pageNum: 1,
+        pageSize: 10,
+        classifyCode: null,
+        classifyName: null,
+      },
+      classifylist: [],
+      classifytotal: 0,
     };
   },
   created() {
     this.info();
     this.infos();
     // this.getList();
+    this.classifylistInfo();
   },
   methods: {
+    //// //护理项目list
+    //打开遮罩层
+    clickClassifyshow() {
+      this.Classifyshow = true;
+      this.classifylistcancel();
+    },
+    //关闭遮罩层
+    cancelClassifyshow() {
+      this.Classifyshow = false;
+    },
+    //选中
+    choiceclassify(e) {
+      this.form.nurseStationItem.nurseClassifyId = e.id;
+      this.form.nurseStationItem.nurseClassifyName = e.classifyName;
+      this.Classifyshow = false;
+    },
+    //重置
+    classifylistcancel() {
+      this.classifyquery = {
+        pageNum: 1,
+        pageSize: 10,
+        classifyCode: null,
+        classifyName: null,
+      };
+      this.classifylistInfo();
+    },
+    //搜索
+    classifylistInfo() {
+      listInfo(this.classifyquery).then((res) => {
+        this.classifylist = res.rows;
+        this.classifytotal = res.total;
+      });
+    },
     imgs(item) {
       this.imgsurl.pictureUrlList.push(item);
     },
@@ -1001,6 +1149,8 @@ export default {
           itemPictureUrl: null,
           sort: null,
           nurseStationName: "请选择所属护理站",
+          nurseClassifyName: "请选择护理项目分类",
+          nurseClassifyId: "",
         },
         nurseStationItemConsumables: [
           // {