拉取代码

src/api/manage.js

@@ -464,3 +464,11 @@ export function getAutoData(id, params) {
     params: params
   });
 }
+
+export function getAllEquitType(params) {
+  return request({
+    url: "/api/manage/getallequittype",
+    method: "Get",
+    params: params
+  });
+}

src/xt_pages/management/components/PlanForm.vue

@@ -1,11 +1,6 @@
 <template>
   <div id="plan-form">
-    <el-dialog
-      title="新增计划"
-      :visible.sync="dialogVisible"
-      width="55%"
-      center
-    >
+    <el-dialog title="新增计划" :visible.sync="dialogVisible" width="55%" center>
       <el-form ref="form" :model="form">
         <el-row>
           <el-col :span="10">
@@ -14,7 +9,7 @@
                 <el-option
                   v-for="item in this.DeviceType"
                   :key="item.id"
-                  :label="item.equitment_name"
+                  :label="item.unit_type"
                   :value="item.id"
                 ></el-option>
               </el-select>
@@ -22,10 +17,7 @@
           </el-col>
           <el-col :span="10">
             <el-form-item label="消毒时长:">
-              <el-input
-                style="width:135px"
-                v-model="form.disinfec_time"
-              ></el-input>
+              <el-input style="width:135px" v-model="form.disinfec_time"></el-input>
               <span>分钟</span>
             </el-form-item>
           </el-col>
@@ -87,10 +79,7 @@
           </el-col>
           <el-col :span="10">
             <el-form-item label="机表消毒液:">
-              <el-select
-                style="width:135px"
-                v-model="form.machine_disinfectant"
-              >
+              <el-select style="width:135px" v-model="form.machine_disinfectant">
                 <el-option
                   v-for="item in this.disinfectantType"
                   :key="item.id"
@@ -137,9 +126,9 @@
 </template>
 
 <script>
-import { getAllEquimentName, savePlan } from "@/api/manage";
+import { getAllEquimentName, savePlan, getAllEquitType } from '@/api/manage'
 export default {
-  name: "PlanForm",
+  name: 'PlanForm',
   props: {
     equimentid: Number
   },
@@ -147,8 +136,8 @@ export default {
     return {
       dialogVisible: false,
       form: {
-        device_type: "",
-        disinfec_time: "",
+        device_type: '',
+        disinfec_time: '',
         time: [],
         class_time: [],
         way: 0,
@@ -158,112 +147,120 @@ export default {
       },
       value: [],
       timeType: [
-        { id: 1, name: "周一" },
-        { id: 2, name: "周二" },
-        { id: 3, name: "周三" },
-        { id: 4, name: "周四" },
-        { id: 5, name: "周五" },
-        { id: 6, name: "周六" },
-        { id: 7, name: "周日" }
+        { id: 1, name: '周一' },
+        { id: 2, name: '周二' },
+        { id: 3, name: '周三' },
+        { id: 4, name: '周四' },
+        { id: 5, name: '周五' },
+        { id: 6, name: '周六' },
+        { id: 7, name: '周日' }
       ],
       classType: [
-        { id: 1, name: "上午" },
-        { id: 2, name: "下午" },
-        { id: 3, name: "晚上" }
+        { id: 1, name: '上午' },
+        { id: 2, name: '下午' },
+        { id: 3, name: '晚上' }
       ],
       // 机表消毒方式
       disinfectType: [
-        { id: 0, name: "/" },
-        { id: 1, name: "擦拭" },
-        { id: 2, name: "化学消毒" }
+        { id: 0, name: '/' },
+        { id: 1, name: '擦拭' },
+        { id: 2, name: '化学消毒' }
       ],
       // 基表消毒液
       disinfectantType: [
-        { id: 0, name: "/" },
-        { id: 1, name: "0.22%季铵盐" },
-        { id: 2, name: "500mg/l含氯消毒剂" },
-        { id: 3, name: "1000mg/l含氯消毒剂" },
-        { id: 4, name: "1500mg/l含氯消毒剂" }
+        { id: 0, name: '/' },
+        { id: 1, name: '0.22%季铵盐' },
+        { id: 2, name: '500mg/l含氯消毒剂' },
+        { id: 3, name: '1000mg/l含氯消毒剂' },
+        { id: 4, name: '1500mg/l含氯消毒剂' }
       ],
       // 夜路消毒方式
       sterilizeType: [
-        { id: 0, name: "/" },
-        { id: 1, name: "热化学消毒" },
-        { id: 2, name: "化学消毒 + 除钙" },
-        { id: 3, name: "热化学消毒 + 除钙" },
-        { id: 4, name: "热消毒" },
-        { id: 5, name: "化学消毒" },
-        { id: 6, name: "除钙" },
-        { id: 7, name: "清洗" }
+        { id: 0, name: '/' },
+        { id: 1, name: '热化学消毒' },
+        { id: 2, name: '化学消毒 + 除钙' },
+        { id: 3, name: '热化学消毒 + 除钙' },
+        { id: 4, name: '热消毒' },
+        { id: 5, name: '化学消毒' },
+        { id: 6, name: '除钙' },
+        { id: 7, name: '清洗' }
       ],
       // 夜路消毒液
       fluidPathType: [
-        { id: 0, name: "/" },
-        { id: 1, name: "20%柠檬酸" },
-        { id: 2, name: "25%柠檬酸" },
-        { id: 3, name: "50%柠檬酸" },
-        { id: 4, name: "50%柠檬酸 + 5%次氯酸钠" },
-        { id: 5, name: "20%柠檬酸 + 10%冰醋酸" },
-        { id: 6, name: "0.2%过氧化乙酸" },
-        { id: 7, name: "10%冰醋酸" },
-        { id: 8, name: "50%冰醋酸" },
-        { id: 9, name: "5%次氯酸钠" }
+        { id: 0, name: '/' },
+        { id: 1, name: '20%柠檬酸' },
+        { id: 2, name: '25%柠檬酸' },
+        { id: 3, name: '50%柠檬酸' },
+        { id: 4, name: '50%柠檬酸 + 5%次氯酸钠' },
+        { id: 5, name: '20%柠檬酸 + 10%冰醋酸' },
+        { id: 6, name: '0.2%过氧化乙酸' },
+        { id: 7, name: '10%冰醋酸' },
+        { id: 8, name: '50%冰醋酸' },
+        { id: 9, name: '5%次氯酸钠' }
       ],
       DeviceType: [],
       planid: 0
-    };
+    }
   },
   methods: {
     open: function() {
-      this.dialogVisible = true;
+      this.dialogVisible = true
     },
     getAllEquimentName() {
       getAllEquimentName().then(response => {
         if (response.data.state === 1) {
-          var equit = response.data.data.equit;
-          console.log("equit", equit);
-          this.DeviceType = equit;
+          var equit = response.data.data.equit
+          console.log('equit', equit)
+          // this.DeviceType = equit;
         }
-      });
+      })
     },
     savePlan(formName) {
-      var equimentid = this.equimentid;
-      console.log("equimentid", equimentid);
-      var devicetype = this.form.device_type;
-      var devicetypes = parseInt(devicetype);
-      this.form.device_type = devicetypes;
+      var equimentid = this.equimentid
+      console.log('equimentid', equimentid)
+      var devicetype = this.form.device_type
+      var devicetypes = parseInt(devicetype)
+      this.form.device_type = devicetypes
 
-      var ways = this.form.way;
-      var way = parseInt(ways);
-      this.form.way = way;
+      var ways = this.form.way
+      var way = parseInt(ways)
+      this.form.way = way
 
-      var machinedisinfectant = this.form.machine_disinfectant;
-      var machinedisinfectants = parseInt(machinedisinfectant);
-      this.form.machine_disinfectant = machinedisinfectants;
+      var machinedisinfectant = this.form.machine_disinfectant
+      var machinedisinfectants = parseInt(machinedisinfectant)
+      this.form.machine_disinfectant = machinedisinfectants
 
-      var disinfectantways = this.form.disinfectant_way;
-      var disinfectantway = parseInt(disinfectantways);
-      this.form.disinfectant_way = disinfectantway;
+      var disinfectantways = this.form.disinfectant_way
+      var disinfectantway = parseInt(disinfectantways)
+      this.form.disinfectant_way = disinfectantway
 
-      var disinfectants = this.form.disinfectant;
-      var disinfectant = parseInt(disinfectants);
-      this.form.disinfectant = disinfectant;
+      var disinfectants = this.form.disinfectant
+      var disinfectant = parseInt(disinfectants)
+      this.form.disinfectant = disinfectant
       savePlan(this.form, this.equimentid).then(response => {
         if (response.data.state == 1) {
-          var msg = response.data.data.msg;
-          console.log("msg", msg);
-          this.$message.success("保存成功");
-          this.dialogVisible = false;
-          this.$emit("getAllPlan");
-          this.$emit("getAllPlanDetail");
+          var msg = response.data.data.msg
+          this.$message.success('保存成功')
+          this.dialogVisible = false
+          this.$emit('getAllPlan')
+          this.$emit('getAllPlanDetail')
+        }
+      })
+    },
+    getAllEquitType() {
+      getAllEquitType().then(response => {
+        if (response.data.state === 1) {
+          var addmacher = response.data.data.addmacher
+          this.DeviceType = addmacher
         }
-      });
+      })
     }
   },
   created() {
-    this.getAllEquimentName();
+    this.getAllEquimentName()
+    this.getAllEquitType()
   }
-};
+}
 </script>
 
 <style scoped></style>

src/xt_pages/management/home.vue

@@ -1847,7 +1847,7 @@
                 <el-option
                   v-for="item in this.DeviceType"
                   :key="item.id"
-                  :label="item.equitment_name"
+                  :label="item.unit_type"
                   :value="item.id"
                 ></el-option>
               </el-select>
@@ -1966,7 +1966,7 @@
   import { getAllSubregion, getAllMachine, getMachineDetailById,
     UpdateMachineInfo, getAllPlan, getAllPlanDetail, DeletePlans,
     getAllEquimentName, EditPlanDetail, UpdatePlanInfo, SaveInformation, getPatientInfo,
-    ChangeClass, getAllOrganization, getUserRegister, SaveQualityControl, getOrgName, SaveRepair, SaveBacteria, SaveLincomycin,getAutoData } from '@/api/manage'
+    ChangeClass, getAllOrganization, getUserRegister, SaveQualityControl, getOrgName, SaveRepair, SaveBacteria, SaveLincomycin,getAutoData,getAllEquitType } from '@/api/manage'
   import { uParseTime } from '@/utils/tools'
   import { getToken } from '@/api/qiniu'
   import PlanForm from './components/PlanForm'
@@ -3219,15 +3219,15 @@ export default {
             return false
           })
       },
-      getAllEquimentName() {
-        getAllEquimentName().then(response => {
-          if (response.data.state === 1) {
-            var equit = response.data.data.equit
-            console.log('equit', equit)
-            this.DeviceType = equit
-          }
-        })
-      },
+      // getAllEquimentName() {
+      //   getAllEquimentName().then(response => {
+      //     if (response.data.state === 1) {
+      //       var equit = response.data.data.equit
+      //       console.log('equit', equit)
+      //       this.DeviceType = equit
+      //     }
+      //   })
+      // },
       clickQuery() {
         this.$refs.multipleform.open()
       },
@@ -3862,7 +3862,15 @@ export default {
       },
       handleSelect(id){
         console.log(id)
-      }
+      },
+     getAllEquitType() {
+      getAllEquitType().then(response => {
+        if (response.data.state === 1) {
+          var addmacher = response.data.data.addmacher;
+          this.DeviceType = addmacher;
+        }
+      });
+    }
     },
     created() {
       this.getAllSubregion()
@@ -3875,6 +3883,7 @@ export default {
       this.getAllEquimentName()
       this.getAllOrganization()
       this.getOrgName()
+      this.getAllEquitType()
     },
   }
 </script>