Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/api/manage.js

@@ -658,3 +658,19 @@ export function DeleteMode(id, params) {
     params: params
   });
 }
+
+export function selectChange(id, params) {
+  return request({
+    url: '/api/manage/selectchange?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function selectBed(id, params) {
+  return request({
+    url: '/api/manage/selectbed?id=' + id,
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/management/components/UserForm.vue

@@ -23,7 +23,7 @@
           style="width:145px"
         ></el-date-picker>
       </el-col>
-       <el-col :span="4">
+      <el-col :span="4">
         <span class="machineClass">分区:</span>
         <el-select style="width:90px" v-model="form.zone" @change="changeBed">
           <el-option
@@ -61,7 +61,7 @@
       <el-col :span="3">
         <el-button size="small" @click="BatchDelete">批量删除</el-button>
       </el-col>
-       <el-col :span="6" class="a">
+      <el-col :span="6" class="a">
         <el-button @click="printCard">打印</el-button>
       </el-col>
     </el-row>
@@ -272,7 +272,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="分区2:">
+            <el-form-item label="分区:">
               <el-select v-model="userform.zone" placeholder="请选择" class="a">
                 <el-option
                   v-for="item in zones"
@@ -2240,7 +2240,7 @@ export default {
 .machineClass {
   font-size: 14px;
 }
-.c{
-  margin-bottom:10px;
+.c {
+  margin-bottom: 10px;
 }
 </style>

src/xt_pages/management/home.vue

@@ -958,12 +958,13 @@
                                   </el-col>
                                   <el-col :span="8">
                                      <el-form-item label="分区:" required prop="zone">
-                                         <el-select v-model="userform.zone" placeholder="请选择" class="a">
+                                         <el-select v-model="userform.zone" placeholder="请选择" class="a"  @change="selectChange">
                                            <el-option
                                             v-for="item in bedZoneThree"
                                            :key="item.id"
                                            :label="item.name"
-                                           :value="item.id">
+                                           :value="item.id"
+                                           >
                                           </el-option>
                                         </el-select>
                                      </el-form-item>
@@ -972,7 +973,7 @@
                                 <el-row>
                                     <el-col :span="8">
                                         <el-form-item label="机位号:" required prop="bed_number">
-                                        <el-select style="width:150px" v-model="userform.bed_number">
+                                        <el-select style="width:150px" v-model="userform.bed_number" @change="selectBed">
                                           <el-option v-for="item in this.bedNumberTwo" :key="item.id" :label="item.number" :value="item.id"></el-option>
                                         </el-select>
                                      </el-form-item>
@@ -2051,7 +2052,7 @@
   import { getAllSubregion, getAllMachine, getMachineDetailById,
     UpdateMachineInfo, getAllPlan, getAllPlanDetail, DeletePlans,
     getAllEquimentName, EditPlanDetail, UpdatePlanInfo, SaveInformation, getPatientInfo,
-    ChangeClass, getAllOrganization, getUserRegister, SaveQualityControl, getOrgName, SaveRepair, SaveBacteria, SaveLincomycin, getAutoData, getAllEquitType, UpdateMacheineTwo, getTotalNumber, getTimeWarning, getAllpatient, UpdateMachineInfoTwo, getPatientDetail, openDelete, getAllMode } from '@/api/manage'
+    ChangeClass, getAllOrganization, getUserRegister, SaveQualityControl, getOrgName, SaveRepair, SaveBacteria, SaveLincomycin, getAutoData, getAllEquitType, UpdateMacheineTwo, getTotalNumber, getTimeWarning, getAllpatient, UpdateMachineInfoTwo, getPatientDetail, openDelete, getAllMode, selectChange, selectBed } from '@/api/manage'
   import { uParseTime } from '@/utils/tools'
   import { getToken } from '@/api/qiniu'
   import PlanForm from './components/PlanForm'
@@ -4243,6 +4244,23 @@ export default {
           var mode = response.data.data.mode
           this.deviceMode = mode
         })
+      },
+      selectChange(id) {
+        selectChange(id).then(response => {
+          if (response.data.state === 1) {
+            this.userform.bed_number = ''
+            var change = response.data.data.change
+            this.bedNumberTwo = change
+            // console.log('change', change)
+          }
+        })
+      },
+      selectBed(id) {
+        selectBed(id).then(response => {
+          if (response.data.state === 1) {
+            var zone = response.data.data.zone
+          }
+        })
       }
     },
     created() {

src/xt_pages/mode/index.vue

@@ -194,8 +194,11 @@ export default {
       ).then(() => {
         DeleteMode(id, index).then(response => {
           if (response.data.state === 1) {
+            // eslint-disable-next-line no-unused-vars
             var msg = response.data.data.msg;
             this.tableData.splice(index, 1);
+          } else {
+            this.$message.error("该型号已绑定设备,不能删除");
           }
         });
       });

src/xt_pages/user/doctorAdvice.vue

@@ -128,7 +128,6 @@
         fit
         highlight-current-row
         @select="selectAdvice"
-        @selection-change="changeAdvice"
         style="width: 100%;margin-top: 10px;"
         :cell-class-name="adviceNameShow"
       >
@@ -3170,11 +3169,12 @@ export default {
       });
     },
     changeAdvice(selection) {
-      if (this.adviceType == 3) {
-        this.lstableData = selection;
-      } else if (this.adviceType == 1) {
-        this.cqtableData = this.adviceTableData;
-      }
+      console.log("溶剂", selection);
+      // if (this.adviceType == 3) {
+      //   this.lstableData = selection
+      // } else if (this.adviceType == 1) {
+      //   this.cqtableData.push = selection
+      // }
     },
     groupClassName({ row, rowIndex }) {
       row.index = rowIndex;
@@ -3190,6 +3190,13 @@ export default {
       this.groupSelectRow = row;
     },
     selectAdvice(selection, row) {
+      console.log("row", row);
+      console.log("selection");
+      if (this.adviceType == 3) {
+        this.lstableData = selection;
+      } else if (this.adviceType == 1) {
+        this.cqtableData = selection;
+      }
       if (this.adviceType != 3) {
 
         this.lstableData = [];