bug更新

src/api/manage.js

@@ -70,6 +70,7 @@ export function getMachineDetailById(id, params) {
 }
 
 export function UpdateMachineInfo(data) {
+  console.log('data', data)
   return request({
     url: '/api/management/updatemachineinfo',
     method: 'Post',

src/xt_pages/management/components/EditMachineForm.vue

@@ -224,7 +224,7 @@ export default {
       getAllEquimentName().then(response => {
         if (response.data.state === 1) {
           var equit = response.data.data.equit;
-          console.log("equit", equit);
+          //console.log("equit", equit);
           this.DeviceType = equit;
         }
       });
@@ -238,7 +238,7 @@ export default {
   },
   created() {
     this.getAllEquimentName();
-    console.log("planid是什么东西===========================", this.newPlanid);
+   // console.log("planid是什么东西===========================", this.newPlanid);
     this.getEditMachine(this.planid);
   },
   mounted() {

src/xt_pages/management/components/ManageForm.vue

@@ -44,9 +44,9 @@
               <el-select style="width:135px" v-model="form.bed_number">
                 <el-option
                   v-for="item in this.bedNumber"
-                  :key="item.id"
-                  :label="item.number"
-                  :value="item.id"
+                  :key="item.bed_id"
+                  :label="item.bed_number"
+                  :value="item.bed_id"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -319,7 +319,7 @@
 </template>
 
 <script>
-import { getAllSubregion, SaveManageInfo,SaveManageInfoTwo } from '@/api/manage'
+import { getAllSubregion, SaveManageInfo, SaveManageInfoTwo } from '@/api/manage'
 const treatmentmodes = [
   'HD',
   'HDF',
@@ -425,7 +425,7 @@ export default {
       bedShowTwo: false,
       disa: true,
       buttonShow: true,
-      buttonShowTwo: false,
+      buttonShowTwo: false
     }
   },
   methods: {
@@ -449,10 +449,11 @@ export default {
           this.deviceType = zones
           var numbers = response.data.data.numbers
           var devicenumber = response.data.data.devicenumber
-          var device = [{ id: 0, number: '请选择' }]
+          // console.log('devicenumber$', devicenumber)
+          var device = [{ bed_id: 0, bed_number: '请选择' }]
           for (let index = 0; index < devicenumber.length; index++) {
             const item = devicenumber[index]
-            device.push({ id: item.id, number: item.number })
+            device.push({ bed_id: item.bed_id, bed_number: item.bed_number })
           }
           this.bedNumber = device
         }
@@ -551,7 +552,7 @@ export default {
         }
         arr1.push(obj.id)
       })
-      console.log('arrr1', arr1)
+      // console.log('arrr1', arr1)
       this.form.treat_type = arr1
 
       var device_type = this.form.device_type
@@ -594,20 +595,20 @@ export default {
               var addmacher = response.data.data.addmacher
               this.dialogVisible = false
               this.$message.success('保存成功')
-              this.form.bed_number = ""
-              this.form.serial_number = ""
-              this.form.device_name = ""
-              this.form.manufacture_factory = ""
-              this.form.service_manufacturer = ""
-              this.form.use_section = ""
-              this.form.section_number = ""
-              this.form.maintenance_engineer=""
-              this.form.telephone = ""
-              this.form.user_total = ""
-              this.form.remarks = ""
-              this.form.user_year = ""
-              this.form.work_time = ""
-              this.form.unit_type =""
+              this.form.bed_number = ''
+              this.form.serial_number = ''
+              this.form.device_name = ''
+              this.form.manufacture_factory = ''
+              this.form.service_manufacturer = ''
+              this.form.use_section = ''
+              this.form.section_number = ''
+              this.form.maintenance_engineer = ''
+              this.form.telephone = ''
+              this.form.user_total = ''
+              this.form.remarks = ''
+              this.form.user_year = ''
+              this.form.work_time = ''
+              this.form.unit_type = ''
               this.getAllSubregion()
               this.$emit('getAllMachineInfo')
               this.$forceUpdate()
@@ -618,7 +619,7 @@ export default {
         }
       })
     },
-    SaveManageInfoTwo(formName){
+    SaveManageInfoTwo(formName) {
       var device_type = this.form.device_type
       var device_types = parseInt(device_type)
       this.form.device_type = device_types
@@ -640,7 +641,7 @@ export default {
       var revers_mode = this.form.revers_mode
       var revers_modes = parseInt(revers_mode)
       this.form.revers_mode = revers_modes
-       
+
       if (this.form.Disinfection_mode === '') {
         this.form.Disinfection_mode = 0
       }
@@ -648,12 +649,12 @@ export default {
       var disinfecction_modess = parseInt(disinfecction_modes)
       this.form.Disinfection_mode = disinfecction_modess
 
-      this.$refs[formName].validate(valid=>{
-        if(valid){
-          SaveManageInfoTwo(this.form).then(response=>{
-            if(response.data.state === 1){
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          SaveManageInfoTwo(this.form).then(response => {
+            if (response.data.state === 1) {
               var add = response.data.data.addmacher
-              console.log("add",add)
+              console.log('add', add)
               this.dialogVisible = false
               this.$message.success('保存成功')
               this.getAllSubregion()

src/xt_pages/management/components/MultipleForm.vue

@@ -351,7 +351,7 @@ export default {
             numbers.push({ id: item.id, number: item.number })
           }
           this.Numbers = numbers
-          console.log('numbers', number)
+         // console.log('numbers', number)
         }
       })
     },
@@ -407,7 +407,7 @@ export default {
               macher[index].rubbish_reason = ''
             }
           }
-          console.log('macher', macher)
+         // console.log('macher', macher)
           this.tableData = macher
         }
       })

src/xt_pages/management/components/PlanForm.vue

@@ -137,7 +137,7 @@
 </template>
 
 <script>
-import { getAllEquimentName, savePlan, getAllEquitType } from '@/api/manage';
+import { getAllEquimentName, savePlan, getAllEquitType } from '@/api/manage'
 export default {
   name: 'PlanForm',
   props: {
@@ -212,74 +212,74 @@ export default {
       DeviceType: [],
       planid: 0,
       plandata: 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);
+          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
+          // console.log('msg', msg);
+          this.$message.success('保存成功')
+          this.dialogVisible = false
+          this.$emit('getAllPlan')
+          this.$emit('getAllPlanDetail')
           // 如果保存成功通过状态值改变父组键表格的值
-          this.plandata = 1;
-          this.$emit('func', this.plandata);
+          this.plandata = 1
+          this.$emit('func', this.plandata)
         } else {
-          this.$message.error('该消毒计划已存在');
+          this.$message.error('该消毒计划已存在')
         }
-      });
+      })
     },
     getAllEquitType() {
       getAllEquitType().then(response => {
         if (response.data.state === 1) {
           var equitname = response.data.data.equitname
-          console.log('equitname=============', equitname)
+          // console.log('equitname=============', equitname)
           this.DeviceType = equitname
         }
       })
     }
   },
   created() {
-    this.getAllEquimentName();
-    this.getAllEquitType();
+    this.getAllEquimentName()
+    this.getAllEquitType()
   }
-};
+}
 </script>
 
 <style scoped></style>

src/xt_pages/management/components/QualityForm.vue

@@ -788,7 +788,7 @@ export default {
       getAllQulityInfo().then(response => {
         if (response.data.state === 1) {
           var cultures = response.data.data.cultures
-          console.log('cultures', cultures)
+         // console.log('cultures', cultures)
 
           for (let index = 0; index < cultures.length; index++) {
             if (cultures[index].specimen === 0) {
@@ -829,7 +829,7 @@ export default {
           }
           this.tableData = cultures
           var dialyste = response.data.data.dialysate
-          console.log('dialyste', dialyste)
+          //console.log('dialyste', dialyste)
           for (let index = 0; index < dialyste.length; index++) {
             if (dialyste[index].specimenb === 0) {
               dialyste[index].specimenb = ''
@@ -869,7 +869,7 @@ export default {
           }
           this.table = dialyste
           var ions = response.data.data.ions
-          console.log('ions', ions)
+          //console.log('ions', ions)
           this.tableDatas = ions
         }
       })
@@ -977,9 +977,9 @@ export default {
         if (response.data.state === 1) {
           var culture = response.data.data.culture
 
-          console.log('禁用', culture)
+          //console.log('禁用', culture)
           var role = response.data.data.role
-          console.log('role', role)
+         // console.log('role', role)
           this.form.id = culture.id
           // eslint-disable-next-line no-undef
           this.form.date = this.getTime(culture.speling_date)
@@ -1097,7 +1097,7 @@ export default {
       EditDialyState(id).then(response => {
         if (response.data.state === 1) {
           var dialysate = response.data.data.dialysate
-          console.log('dialysate', dialysate)
+          //console.log('dialysate', dialysate)
           this.diaForm.id = dialysate.id
           // eslint-disable-next-line no-undef
           this.diaForm.sampling_date = this.getTime(dialysate.sampling_date)
@@ -1145,7 +1145,7 @@ export default {
           UpdateDialyState(this.diaForm).then(response => {
             if (response.data.state === 1) {
               var dialyste = response.data.data.dialysate
-              console.log('dialyste', dialyste)
+              //console.log('dialyste', dialyste)
               this.dialogVisibleTwo = false
               this.$message.success('修改成功')
               this.getAllQulityInfo()
@@ -1214,7 +1214,7 @@ export default {
       EditIon(id).then(response => {
         if (response.data.state === 1) {
           var ion = response.data.data.ion
-          console.log('ion', ion)
+         // console.log('ion', ion)
           // eslint-disable-next-line no-undef
           this.ionForm.dateb = this.getTime(ion.sampling_date)
           this.ionForm.samplerc = ion.samplerc
@@ -1243,7 +1243,7 @@ export default {
           UpdateIon(this.ionForm).then(response => {
             if (response.data.state === 1) {
               var ion = response.data.data.ion
-              console.log('ion', ion)
+             // console.log('ion', ion)
               this.dialogVisibleThree = false
               this.$message.success('修改成功')
               this.getAllQulityInfo()

src/xt_pages/management/components/RemanderForm.vue

@@ -67,7 +67,7 @@ export default {
         // eslint-disable-next-line eqeqeq
         if (response.data.state == 1) {
           var remander = response.data.data.remander
-          console.log('remander=================小夏', remander)
+          //console.log('remander=================小夏', remander)
           this.randerform.run = remander.is_run
         }
       });

src/xt_pages/management/components/RepairForm.vue

@@ -501,7 +501,7 @@ export default {
       getAllRepair(this.limit, this.page).then(response => {
         if (response.data.state === 1) {
           var repair = response.data.data.repair
-          console.log('repair是', repair)
+          // console.log('repair是', repair)
           // eslint-disable-next-line no-unused-vars
           var total = response.data.data.total
           this.total = total
@@ -551,10 +551,10 @@ export default {
       return uParseTime(time, '{y}-{m}-{d} {h}:{i}')
     },
     handleExceed(file) {
-      console.log(file)
+      // console.log(file)
     },
     handlePreview(file) {
-      console.log(file)
+      // console.log(file)
     },
     EditRepair(id) {
       this.dialogVisible = true
@@ -597,8 +597,8 @@ export default {
     beforeUploadFile(file) {
       const isLt2M = file.size / 1024 / 1024 <= 2048
       console.log('filename', file)
-      console.log('视频大小', file.size / 1024 / 1024)
-      console.log('isLt2M是什么', isLt2M)
+      // console.log('视频大小', file.size / 1024 / 1024)
+      // console.log('isLt2M是什么', isLt2M)
 
       if (!isLt2M) {
         this.$message.error('上传视频大小不能超过 2G!')

src/xt_pages/management/components/UserForm.vue

@@ -1198,9 +1198,9 @@ export default {
       EditUser(id, patientid).then(response => {
         if (response.data.state === 1) {
           var device = response.data.data.device
-          console.log('device', device)
+         // console.log('device', device)
           var patients = response.data.data.patients
-          console.log('patients', patients)
+         // console.log('patients', patients)
           // eslint-disable-next-line no-sequences
           this.userform.id = device.id,
           this.userform.spling_date = uParseTime(
@@ -1621,7 +1621,7 @@ export default {
               information[index].clean = ''
             }
           }
-          console.log('消毒时间', information)
+          //console.log('消毒时间', information)
           this.tableData = information
           var total = response.data.data.total
           this.total = total
@@ -1666,7 +1666,7 @@ export default {
       getUserForm(id, this.limit, this.page).then(response => {
         if (response.data.state === 1) {
           var information = response.data.data.information
-          console.log('information====================', information)
+          //console.log('information====================', information)
           // eslint-disable-next-line no-unused-vars
           var addmacher = response.data.data.addmacher
           // console.log('addmacher', addmacher)
@@ -1909,9 +1909,9 @@ export default {
       getBedForm(id).then(response => {
         if (response.data.state === 1) {
           var addmacher = response.data.data.addmacher
-          console.log('addmacher=============', addmacher)
+         // console.log('addmacher=============', addmacher)
           var number = response.data.data.number
-          console.log('number', number)
+          //console.log('number', number)
           this.form.zone = addmacher.zone_id
           this.form.bed = addmacher.bed_id
 
@@ -1956,7 +1956,7 @@ export default {
         // eslint-disable-next-line eqeqeq
         if (response.data.state == 1) {
           var patient = response.data.data.patient
-          console.log('patient', patient)
+         // console.log('patient', patient)
           // eslint-disable-next-line no-undef
           if (patient.is_infectious === 0) {
             this.userform.contagion = ''
@@ -1977,7 +1977,7 @@ export default {
       changeBed(id).then(response => {
         if (response.data.state === 1) {
           var bed = response.data.data.bed
-          console.log('bed', bed)
+         // console.log('bed', bed)
           // eslint-disable-next-line no-sequences
           this.form.bed = '',
           this.bedNumberTwo = bed

src/xt_pages/management/home.vue

@@ -59,9 +59,10 @@
                        prop="date"
                        label="设备名称"
                       width="90"
-                      align="center">
+                      align="center"
+                      >
                       <template slot-scope="scope">
-                          {{scope.row.device_name}}
+                         <div @click="handleIndex(scope.$index)">{{scope.row.device_name}}</div> 
                       </template>
                     </el-table-column>
                      <el-table-column
@@ -70,7 +71,7 @@
                       width="90"
                       align="center">
                       <template slot-scope="scope">
-                         {{scope.row.unit_type}}
+                        <div @click="handleIndex(scope.$index)">{{scope.row.unit_type}}</div> 
                       </template>
                      </el-table-column>
                       <el-table-column
@@ -79,7 +80,7 @@
                        align="center"
                        widwid="90">
                        <template slot-scope="scope">
-                          {{scope.row.bed_number}}
+                          <div @click="handleIndex(scope.$index)">{{scope.row.bed_number}}</div>
                        </template>
                      </el-table-column>
                      </el-table>
@@ -126,7 +127,7 @@
                               <el-col :span="7">
                                   <el-form-item label="机位号:">
                                        <el-select style="width:150px" v-model="form.bed_number" :disabled="disableThree">
-                                          <el-option v-for="item in this.Number" :key="item.id" :label="item.number" :value="item.id"></el-option>
+                                          <el-option v-for="item in this.Number" :key="item.bed_id" :label="item.bed_number" :value="item.bed_id"></el-option>
                                        </el-select>
                                   </el-form-item>
                               </el-col>
@@ -1811,21 +1812,15 @@
                                   <el-form-item label="上传图片:">
                                     <el-upload
                                       :data="uploadFileData"
-                                      class="upload-demo"
                                       action="https://upload.qiniup.com"
                                       :on-success="handleSuccess"
                                       :before-upload="beforeUploadFile"
-                                       multiple
-                                      :on-preview="handlePreview"
-                                       :limit="1"
-                                       :on-exceed="handleExceed"
-                                       :on-remove="handleRemove"
-                                        :before-remove="beforeRemove"
-                                        :file-list="fileList">
+                                       :limit="1">
                                         <el-button size="small" type="primary">上传图片</el-button>
                                       </el-upload>
-
-                                      <img v-if="guaForm.images" :src="guaForm.images" class="avatar">
+                                     <a class="el-upload-list__item-name">
+                                        <i><a href="guaForm.images">{{filename}}</a></i>
+                                     </a>
                                   </el-form-item>
                                </el-col>
                              </el-row>
@@ -2470,6 +2465,7 @@ export default {
           reason: '',
           code_information: ''
         },
+        filename: '',
         qiniuDomain: 'https://images.shengws.com/',
         uploadFileData: { token: '', key: '' },
         tShow: false,
@@ -2499,7 +2495,8 @@ export default {
           { id: 0, name: '请选择' },
           { id: 1, name: '单级反渗' },
           { id: 2, name: '双级反渗' }
-        ]
+        ],
+        tabIndex: ''
       }
     },
     methods: {
@@ -2514,19 +2511,19 @@ export default {
       },
 
       handleClick(tab, event) {
-        console.log(tab, event)
+        // console.log(tab, event)
       },
       handleExceed(file) {
-        console.log(file)
+      //  console.log(file)
       },
       handleRemove(file, fileList) {
 
       },
       beforeRemove(file, fileList) {
-        console.log(file, fileList)
+      //  console.log(file, fileList)
       },
       handlePreview(file) {
-        console.log(file)
+        // console.log(file)
       },
       changetreatmentmode(val) {
         const checkedCount = val.length
@@ -2556,6 +2553,7 @@ export default {
             zone.push({ id: item.id, name: item.name })
           }
           var devicenumber = response.data.data.devicenumber
+          console.log('devicenumber', devicenumber)
           this.bedZone = zone
 
           var zoness = [{ id: 0, name: '请选择' }]
@@ -2567,15 +2565,15 @@ export default {
           var bed = [{ id: 0, number: '请选择' }]
           for (let i = 0; i < numbers.length; i++) {
             const item = numbers[i]
-            console.log(item)
+            // console.log(item)
             bed.push({ id: item.id, number: item.number })
           }
           this.bedNumberTwo = bed
           this.bedZoneTwo = zones
           this.bedZoneThree = zoness
           this.bedNumber = numbers
-
-          this.Number = devicenumber
+  
+          // this.Number = devicenumber
         })
       },
 
@@ -2601,6 +2599,9 @@ export default {
           }
         })
       },
+      handleIndex(index) {
+        this.tabIndex = index
+      },
       handleCurrentChange(val) {
         console.log('val是什么', val)
         this.currentRow = val
@@ -2628,7 +2629,9 @@ export default {
         getMachineDetailById(id).then(response => {
           if (response.data.state === 1) {
             var addmacher = response.data.data.addmacher
-            // console.log('addmacher======', addmacher)
+            var number = response.data.data.number
+           // console.log('number', number)
+            this.Number = number
             if (addmacher.device_type === 1) {
               this.sShow = false
               this.qShow = false
@@ -2729,7 +2732,8 @@ export default {
             this.form.id = addmacher.id
             this.form.serial_number = addmacher.serial_number
             this.form.devicetype = addmacher.device_type
-            this.form.bed_number = addmacher.bed_number
+            this.form.bed_number = addmacher.bed_id
+            console.log('999', this.Number)
             this.form.device_name = addmacher.device_name
             this.form.manufacture_factory = addmacher.manufacture_factory
             this.form.service_manufacturer = addmacher.service_manufacturer
@@ -2851,23 +2855,22 @@ export default {
         var machine_statuss = parseInt(machine_status)
         this.form.machine_status = machine_statuss
 
-        if (this.form.bed_number === '') {
-          this.form.bed_number = 0
-        }
+        // if (this.form.bed_number === '') {
+        //   this.form.bed_number = 0
+        // }
 
         var bed_numbers = this.form.bed_number
         var bed_numberss = parseInt(bed_numbers)
         this.form.bed_number = bed_numberss
-
         this.$refs[formName].validate(valid => {
           UpdateMachineInfo(this.form).then(response => {
+            console.log('form', this.form)
             if (response.data.state === 1) {
               var addmacher = response.data.data.addmacher
-
               this.$message.success('修改成功')
-              this.getAllSubregion()
               this.getAllMachine()
-              this.$refs.singleTable.setCurrentRow(addmacher)
+              this.getAllSubregion()
+              // this.$refs.singleTable.setCurrentRow(addmacher)
               this.$forceUpdate()
             }
           })
@@ -3130,7 +3133,7 @@ export default {
         getAllPlanDetail(unit_type).then(response => {
           if (response.data.state === 1) {
             var plandetail = response.data.data.plandetail
-            console.log('plandetail=====================', plandetail)
+            // console.log('plandetail=====================', plandetail)
             for (let index = 0; index < plandetail.length; index++) {
               if (plandetail[index].time === 1) {
                 plandetail[index].time = '周一'
@@ -3629,8 +3632,8 @@ export default {
         if (this.userform.user_total === '0') {
           this.userform.user_total = 0
         }
-        console.log('上机时间', this.userform.start_time)
-        console.log('下机时间', this.userform.end_time)
+        // console.log('上机时间', this.userform.start_time)
+        // console.log('下机时间', this.userform.end_time)
         this.$refs[formName].validate((valid) => {
           if (valid) {
             SaveInformation(this.equimentid, this.userform).then(response => {
@@ -3940,13 +3943,8 @@ export default {
         }
       },
       beforeUploadFile(file) {
+        this.filename = file.name
         const isLt2M = file.size / 1024 / 1024 <= 2048
-        console.log('视频大小', file.size / 1024 / 1024)
-        console.log('isLt2M是什么', isLt2M)
-        if (!isLt2M) {
-          this.$message.error('上传视频大小不能超过 2G!')
-          return false
-        }
         var date = new Date()
         var ext = getFileExtension(file.name)
         var key = date.getFullYear() + (date.getMonth() + 1) + date.getDate() + date.getHours() + date.getMinutes() + date.getSeconds() + '_o_' + file.uid + '.' + ext
@@ -3966,7 +3964,7 @@ export default {
       },
       handleSuccess(res, file, fileList) {
         this.guaForm.images = this.qiniuDomain + res.url
-        console.log('图片上传成功', this.qiniuDomain + res.url)
+        this.filename = file.name
       },
       // eslint-disable-next-line no-dupe-keys
       getTime(value, temp) {
@@ -4008,7 +4006,7 @@ export default {
             SaveRepair(this.equimentid, this.guaForm).then(response => {
               if (response.data.state === 1) {
                 var repair = response.data.data.repair
-                console.log('reqair', repair)
+                // console.log('reqair', repair)
                 this.$message.success('保存成功')
                 this.$refs.child.getAllRepair()
                 this.guaForm.start_time = ''
@@ -4059,7 +4057,7 @@ export default {
           // eslint-disable-next-line eqeqeq
           if (response.data.state == 1) {
             var patient = response.data.data.patient
-            console.log('patient', patient)
+            // console.log('patient', patient)
             // eslint-disable-next-line no-undef
             if (patient.is_infectious === 0) {
               this.userform.contagion = ''
@@ -4079,7 +4077,6 @@ export default {
         getAllEquitType().then(response => {
           if (response.data.state === 1) {
             var equitname = response.data.data.equitname
-            console.log('区号================', equitname)
             this.DeviceType = equitname
           }
         })
@@ -4110,10 +4107,10 @@ export default {
         getTimeWarning(id).then(response => {
           if (response.data.state === 1) {
             var information = response.data.data.information
-            console.log(this.getTimestamp(this.userform.date))
-            console.log(information.stime)
+            // console.log(this.getTimestamp(this.userform.date))
+            // console.log(information.stime)
             var time = this.getTimestamp(this.userform.date) - information.stime
-            console.log('时间', time)
+            // console.log('时间', time)
             if (time >= 2678400) {
               this.warnShow = true
             }
@@ -4254,4 +4251,14 @@ export default {
     margin-left: 130px;
   }
 
+ .el-upload-list__item-name {
+    color: #606266;
+    display: block;
+    margin-right: 40px;
+    overflow: hidden;
+    padding-left: 4px;
+    text-overflow: ellipsis;
+    transition: color .3s;
+    white-space: nowrap;
+}
 </style>

src/xt_pages/stock/otherSalesReturnOrder.vue

@@ -174,51 +174,51 @@
 </template>
 
 <script>
-import { uParseTime } from "@/utils/tools";
-import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
+import { uParseTime } from '@/utils/tools'
+import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
 import {
   deleteSalesReturn,
   GetAllConfig,
   getSalesReturnList,
   getWarehouseInfoList,
   getWarehouseList
-} from "@/api/stock";
-import BreadCrumb from "../components/bread-crumb";
+} from '@/api/stock'
+import BreadCrumb from '../components/bread-crumb'
 
 export default {
-  name: "salesReturnOrder",
+  name: 'salesReturnOrder',
   components: { BreadCrumb },
   created() {
-    var nowDate = new Date();
-    var nowYear = nowDate.getFullYear();
-    var nowMonth = nowDate.getMonth() + 1;
-    var nowDay = nowDate.getDate();
+    var nowDate = new Date()
+    var nowYear = nowDate.getFullYear()
+    var nowMonth = nowDate.getMonth() + 1
+    var nowDay = nowDate.getDate()
     this.end_time =
       nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
-    nowDate.setMonth(nowDate.getMonth() - 1);
-    nowYear = nowDate.getFullYear();
-    nowMonth = nowDate.getMonth() + 1;
-    nowDay = nowDate.getDate();
+      '-' +
+      (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+      '-' +
+      (nowDay < 10 ? '0' + nowDay : nowDay)
+    nowDate.setMonth(nowDate.getMonth() - 1)
+    nowYear = nowDate.getFullYear()
+    nowMonth = nowDate.getMonth() + 1
+    nowDay = nowDate.getDate()
     this.start_time =
       nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
-    this.GetSalesReturn();
-    this.GetConfigInfo();
-    this.fetchAllAdminUsers();
+      '-' +
+      (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+      '-' +
+      (nowDay < 10 ? '0' + nowDay : nowDay)
+    this.GetSalesReturn()
+    this.GetConfigInfo()
+    this.fetchAllAdminUsers()
   },
   data() {
     return {
-      searchKey: "",
+      searchKey: '',
       crumbs: [
-        { path: false, name: "库存管理" },
-        { path: false, name: "其他退货单" }
+        { path: false, name: '库存管理' },
+        { path: false, name: '其他退货单' }
       ],
       type: 2,
       page: 1,
@@ -229,16 +229,17 @@ export default {
       pageSelect: 0,
       adminUserOptions: [],
       multipleSelection: [],
-      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
-      start_time: "",
+      signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+      start_time: '',
       saleReturnDate: [],
-      end_time: "",
+      end_time: '',
       goodType: [],
       goodInfo: [],
       manufacturer: [],
       selectedTableData: [],
-      dealer: []
-    };
+      dealer: [],
+      startTime: ''
+    }
   },
   methods: {
     search: function() {
@@ -249,25 +250,25 @@ export default {
         end_time: this.end_time,
         type: this.type,
         keywords: this.searchKey
-      };
-      this.saleReturnDate = [];
+      }
+      this.saleReturnDate = []
       getSalesReturnList(Params).then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.total = response.data.data.total;
+          this.total = response.data.data.total
           for (let i = 0; i < response.data.data.list.length; i++) {
-            this.saleReturnDate.push(response.data.data.list[i]);
+            this.saleReturnDate.push(response.data.data.list[i])
           }
         }
-      });
+      })
     },
     AddNewOrder: function() {
       this.$router.push({
-        name: "salesReturnOrderAdd",
+        name: 'salesReturnOrderAdd',
         query: { type: this.type }
-      });
+      })
     },
     GetSalesReturn: function() {
       const Params = {
@@ -276,201 +277,214 @@ export default {
         start_time: this.start_time,
         end_time: this.end_time,
         type: this.type
-      };
-      this.saleReturnDate = [];
+      }
+      this.saleReturnDate = []
       getSalesReturnList(Params).then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.total = response.data.data.total;
+          this.total = response.data.data.total
           for (let i = 0; i < response.data.data.list.length; i++) {
-            this.saleReturnDate.push(response.data.data.list[i]);
+            this.saleReturnDate.push(response.data.data.list[i])
           }
         }
-      });
+      })
     },
     getXuserName(id) {
       if (id <= 0) {
-        return "";
+        return ''
       }
-      var name = "";
+      var name = ''
       if (
         this.adminUserOptions == null ||
-        typeof this.adminUserOptions.length === "undefined"
+        typeof this.adminUserOptions.length === 'undefined'
       ) {
-        return name;
+        return name
       }
-      var leng = this.adminUserOptions.length;
+      var leng = this.adminUserOptions.length
       if (leng == 0) {
-        return name;
+        return name
       }
       for (let index = 0; index < leng; index++) {
         if (this.adminUserOptions[index].id == id) {
-          name = this.adminUserOptions[index].name;
-          break;
+          name = this.adminUserOptions[index].name
+          break
         }
       }
-      return name;
+      return name
     },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-        console.log(response);
+        console.log(response)
         if (response.data.state == 1) {
-          this.adminUserOptions = response.data.data.users;
-          var alen = this.adminUserOptions.length;
+          this.adminUserOptions = response.data.data.users
+          var alen = this.adminUserOptions.length
           for (let index = 0; index < alen; index++) {
             if (this.adminUserOptions[index].user_type == 2) {
               // this.doctorOptions.push(this.adminUserOptions[index]);
             }
           }
         }
-      });
+      })
     },
     handleSelectionChange: function(val) {
-      this.multipleSelection = val;
+      this.multipleSelection = val
     },
     handleSizeChange(val) {
-      this.limit = val;
-      this.GetSalesReturn();
+      this.limit = val
+      this.GetSalesReturn()
     },
     handleCurrentChange(val) {
-      this.page = val;
-      this.GetSalesReturn();
+      this.page = val
+      this.GetSalesReturn()
     },
     startTimeChange(val) {
-      this.GetSalesReturn();
+      this.startTime = this.getTimestamp(val)
+      this.GetSalesReturn()
     },
     endTimeChange(val) {
-      this.GetSalesReturn();
+      var time = this.getTimestamp(val) - this.startTime
+      console.log('开始时间', this.startTime)
+      console.log('结束', this.getTimestamp(val))
+      console.log('时间差', time)
+      if (time < 0) {
+        this.$message.error('结束时间不能小于开始时间')
+        this.end_time = ''
+      } else {
+        this.GetSalesReturn()
+      }
+    },
+    getTimestamp(time) { // 把时间日期转成时间戳
+      return (new Date(time)).getTime() / 1000
     },
     calculate: function(val) {
-      return Math.round(parseFloat(val) * 100) / 100;
+      return Math.round(parseFloat(val) * 100) / 100
     },
     GetConfigInfo: function() {
       GetAllConfig().then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.manufacturer = response.data.data.manufacturer;
-          this.dealer = response.data.data.dealer;
+          this.manufacturer = response.data.data.manufacturer
+          this.dealer = response.data.data.dealer
         }
-      });
+      })
     },
     getManufactuerName: function(manufacturer_id) {
       for (let i = 0; i < this.manufacturer.length; i++) {
         if (this.manufacturer[i].id == manufacturer_id) {
-          return this.manufacturer[i].manufacturer_name;
+          return this.manufacturer[i].manufacturer_name
         }
       }
     },
     getDealerName: function(dealer_id) {
       for (let i = 0; i < this.dealer.length; i++) {
         if (this.dealer[i].id == dealer_id) {
-          return this.dealer[i].dealer_name;
+          return this.dealer[i].dealer_name
         }
       }
     },
     handleEdit: function(index, row) {
       this.$router.push({
-        name: "salesReturnDetail",
+        name: 'salesReturnDetail',
         query: { id: row.id, type: this.type }
-      });
+      })
     },
     handleDelete: function(index, row) {
-      const ids = [];
-      ids.push(row.id);
-      const idStr = ids.join(",");
+      const ids = []
+      ids.push(row.id)
+      const idStr = ids.join(',')
 
       const params = {
         ids: idStr
-      };
+      }
 
-      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确认删除退货单记录?', '删除退货单记录', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
           deleteSalesReturn(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
               this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
                 duration: 2000
-              });
+              })
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.saleReturnDate.length; y++) {
                   if (ids[i] == this.saleReturnDate[y].id) {
-                    this.saleReturnDate.splice(y, 1);
+                    this.saleReturnDate.splice(y, 1)
                   }
                 }
               }
             }
-          });
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     changeAllSelected: function(val) {
       if (val) {
-        this.$refs.multipleTable.toggleAllSelection();
+        this.$refs.multipleTable.toggleAllSelection()
       } else {
-        this.$refs.multipleTable.clearSelection();
+        this.$refs.multipleTable.clearSelection()
       }
     },
     select(selection) {
-      this.selectedTableData = selection;
+      this.selectedTableData = selection
     },
     batchDelete() {
       if (this.selectedTableData.length <= 0) {
-        this.$message.error("请选择要删除的记录");
-        return;
+        this.$message.error('请选择要删除的记录')
+        return
       }
-      const ids = [];
+      const ids = []
       for (let i = 0; i < this.selectedTableData.length; i++) {
-        ids.push(this.selectedTableData[i].id);
+        ids.push(this.selectedTableData[i].id)
       }
-      const idStr = ids.join(",");
+      const idStr = ids.join(',')
       const params = {
         ids: idStr
-      };
-      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      }
+      this.$confirm('确认删除退货单记录?', '删除退货单记录', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
           deleteSalesReturn(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
               this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
                 duration: 2000
-              });
+              })
 
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.saleReturnDate.length; y++) {
                   if (ids[i] == this.saleReturnDate[y].id) {
-                    this.saleReturnDate.splice(y, 1);
+                    this.saleReturnDate.splice(y, 1)
                   }
                 }
               }
             }
-          });
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     }
   }
-};
+}
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>

src/xt_pages/stock/stockInOrder.vue

@@ -174,8 +174,8 @@
 </template>
 
 <script>
-import { uParseTime } from "@/utils/tools";
-import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
+import { uParseTime } from '@/utils/tools'
+import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
 import {
   deleteWarehouseInfo,
   GetAllConfig,
@@ -183,11 +183,11 @@ import {
   GetAllGoodType,
   getWarehouseInfoList,
   getWarehouseList
-} from "@/api/stock";
-import BreadCrumb from "../components/bread-crumb";
+} from '@/api/stock'
+import BreadCrumb from '../components/bread-crumb'
 
 export default {
-  name: "stockIn",
+  name: 'stockIn',
   components: { BreadCrumb },
   created() {
     // var nowDate = new Date();
@@ -220,38 +220,38 @@ export default {
     // const startTime = year + '-' + month + '-' + day
     // this.start_time = startTime
 
-    var nowDate = new Date();
-    var nowYear = nowDate.getFullYear();
-    var nowMonth = nowDate.getMonth() + 1;
-    var nowDay = nowDate.getDate();
+    var nowDate = new Date()
+    var nowYear = nowDate.getFullYear()
+    var nowMonth = nowDate.getMonth() + 1
+    var nowDay = nowDate.getDate()
     this.end_time =
       nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
-    nowDate.setMonth(nowDate.getMonth() - 1);
-    nowYear = nowDate.getFullYear();
-    nowMonth = nowDate.getMonth() + 1;
-    nowDay = nowDate.getDate();
+      '-' +
+      (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+      '-' +
+      (nowDay < 10 ? '0' + nowDay : nowDay)
+    nowDate.setMonth(nowDate.getMonth() - 1)
+    nowYear = nowDate.getFullYear()
+    nowMonth = nowDate.getMonth() + 1
+    nowDay = nowDate.getDate()
     this.start_time =
       nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
+      '-' +
+      (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+      '-' +
+      (nowDay < 10 ? '0' + nowDay : nowDay)
 
-    this.GetWarehouse();
-    this.GetConfigInfo();
-    this.fetchAllAdminUsers();
+    this.GetWarehouse()
+    this.GetConfigInfo()
+    this.fetchAllAdminUsers()
   },
   data() {
     return {
       crumbs: [
-        { path: false, name: "库存管理" },
-        { path: false, name: "入库单" }
+        { path: false, name: '库存管理' },
+        { path: false, name: '入库单' }
       ],
-      searchKey: "",
+      searchKey: '',
       type: 1,
       page: 1,
       limit: 10,
@@ -261,9 +261,9 @@ export default {
       pageSelect: 0,
       adminUserOptions: [],
       multipleSelection: [],
-      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
-      start_time: "",
-      end_time: "",
+      signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+      start_time: '',
+      end_time: '',
       goodType: [],
       goodInfo: [],
       manufacturer: [],
@@ -272,14 +272,15 @@ export default {
       Warehouse: {
         loading: false,
         warehouseDate: [],
-        tableCurrentIndex: ""
+        tableCurrentIndex: ''
       },
 
       WarehouseInfo: {
         loading: false,
         warehouseInfoDate: []
-      }
-    };
+      },
+      startTime: ''
+    }
   },
   methods: {
     search: function() {
@@ -290,21 +291,21 @@ export default {
         end_time: this.end_time,
         type: this.type,
         keywords: this.searchKey
-      };
-      this.Warehouse.warehouseDate = [];
+      }
+      this.Warehouse.warehouseDate = []
       getWarehouseList(Params).then(response => {
         if (response.data.state == 0) {
-          this.Warehouse.loading = false;
-          this.$message.error(response.data.msg);
-          return false;
+          this.Warehouse.loading = false
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.Warehouse.loading = false;
-          this.total = response.data.data.total;
+          this.Warehouse.loading = false
+          this.total = response.data.data.total
           for (let i = 0; i < response.data.data.list.length; i++) {
-            this.Warehouse.warehouseDate.push(response.data.data.list[i]);
+            this.Warehouse.warehouseDate.push(response.data.data.list[i])
           }
         }
-      });
+      })
     },
     GetWarehouse: function() {
       const Params = {
@@ -313,304 +314,313 @@ export default {
         start_time: this.start_time,
         end_time: this.end_time,
         type: this.type
-      };
-      this.Warehouse.warehouseDate = [];
+      }
+      this.Warehouse.warehouseDate = []
       getWarehouseList(Params).then(response => {
         if (response.data.state == 0) {
-          this.Warehouse.loading = false;
-          this.$message.error(response.data.msg);
-          return false;
+          this.Warehouse.loading = false
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.Warehouse.loading = false;
-          this.total = response.data.data.total;
+          this.Warehouse.loading = false
+          this.total = response.data.data.total
           for (let i = 0; i < response.data.data.list.length; i++) {
-            this.Warehouse.warehouseDate.push(response.data.data.list[i]);
+            this.Warehouse.warehouseDate.push(response.data.data.list[i])
           }
         }
-      });
+      })
     },
     tableRowClassName({ row, rowIndex }) {
       // 把每一行的索引放进row
-      row.index = rowIndex;
+      row.index = rowIndex
     },
     onRowClick(row, event, column) {
-      this.WarehouseInfo.warehouseInfoDate = [];
-      this.Warehouse.tableCurrentIndex = row.index;
+      this.WarehouseInfo.warehouseInfoDate = []
+      this.Warehouse.tableCurrentIndex = row.index
       const params = {
         id: row.id
-      };
-      this.WarehouseInfo.loading = true;
+      }
+      this.WarehouseInfo.loading = true
       getWarehouseInfoList(params).then(response => {
         if (response.data.state == 0) {
-          this.WarehouseInfo.loading = false;
-          this.$message.error(response.data.msg);
-          return false;
+          this.WarehouseInfo.loading = false
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.WarehouseInfo.loading = false;
+          this.WarehouseInfo.loading = false
           for (let i = 0; i < response.data.data.info.length; i++) {
             this.WarehouseInfo.warehouseInfoDate.push(
               response.data.data.info[i]
-            );
+            )
           }
         }
-      });
+      })
     },
     getXuserName(id) {
       if (id <= 0) {
-        return "";
+        return ''
       }
-      var name = "";
+      var name = ''
       if (
         this.adminUserOptions == null ||
-        typeof this.adminUserOptions.length === "undefined"
+        typeof this.adminUserOptions.length === 'undefined'
       ) {
-        return name;
+        return name
       }
-      var leng = this.adminUserOptions.length;
+      var leng = this.adminUserOptions.length
       if (leng == 0) {
-        return name;
+        return name
       }
       for (let index = 0; index < leng; index++) {
         if (this.adminUserOptions[index].id == id) {
-          name = this.adminUserOptions[index].name;
-          break;
+          name = this.adminUserOptions[index].name
+          break
         }
       }
-      return name;
+      return name
     },
     fetchAllDoctorAndNurse() {
       fetchAllDoctorAndNurse().then(response => {
         if (response.data.state == 1) {
-          this.doctorOptions = response.data.data.doctors;
+          this.doctorOptions = response.data.data.doctors
         }
-      });
+      })
     },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-        console.log(response);
+        console.log(response)
         if (response.data.state == 1) {
-          this.adminUserOptions = response.data.data.users;
-          var alen = this.adminUserOptions.length;
+          this.adminUserOptions = response.data.data.users
+          var alen = this.adminUserOptions.length
           for (let index = 0; index < alen; index++) {
             if (this.adminUserOptions[index].user_type == 2) {
               // this.doctorOptions.push(this.adminUserOptions[index]);
             }
           }
         }
-      });
+      })
     },
     getSpecificationName: function(id) {
-      let name = "";
+      let name = ''
       for (let i = 0; i < this.goodInfo.length; i++) {
         if (this.goodInfo[i].id == id) {
-          name = this.goodInfo[i].specification_name;
+          name = this.goodInfo[i].specification_name
         }
       }
 
-      return name;
+      return name
     },
     getTypeName: function(id) {
-      let name = "";
+      let name = ''
       for (let i = 0; i < this.goodType.length; i++) {
         if (this.goodType[i].id == id) {
-          name = this.goodType[i].type_name;
+          name = this.goodType[i].type_name
         }
       }
-      return name;
+      return name
     },
     GetAllGoodType: function() {
       GetAllGoodType().then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
           for (let i = 0; i < response.data.data.goodType.length; i++) {
-            this.goodType.push(response.data.data.goodType[i]);
+            this.goodType.push(response.data.data.goodType[i])
           }
         }
-      });
+      })
     },
     GetAllGoodInfo: function() {
       GetAllGoodInfo().then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
           for (let i = 0; i < response.data.data.goodInfo.length; i++) {
-            this.goodInfo.push(response.data.data.goodInfo[i]);
+            this.goodInfo.push(response.data.data.goodInfo[i])
           }
         }
-      });
+      })
     },
     clicks: function() {
-      console.log(this.WarehouseInfo.warehouseInfoDate);
+      console.log(this.WarehouseInfo.warehouseInfoDate)
     },
     handleWarehouse: function() {
-      this.$router.push({ path: "/stock/in/add", query: { type: this.type } });
+      this.$router.push({ path: '/stock/in/add', query: { type: this.type }})
     },
     handleReturnSales: function() {
       // this.$router.push({path:'/patients/create'}
       if (this.multipleSelection.length <= 0) {
-        this.$message.error("请选择退货商品");
-        return;
+        this.$message.error('请选择退货商品')
+        return
       }
 
-      const ids = [];
+      const ids = []
       for (let i = 0; i < this.multipleSelection.length; i++) {
-        ids.push(this.multipleSelection[i].id);
+        ids.push(this.multipleSelection[i].id)
       }
-      this.$router.push({ name: "salesReturn", query: { id: ids.join("&") } });
+      this.$router.push({ name: 'salesReturn', query: { id: ids.join('&') }})
     },
     handleReturnSalesRecord: function() {
-      this.$router.push({ name: "salesReutrnRecord" });
+      this.$router.push({ name: 'salesReutrnRecord' })
     },
     handleWarehouseRecord: function() {
-      this.$router.push({ name: "warehouseRecord" });
+      this.$router.push({ name: 'warehouseRecord' })
     },
     handleSelectionChange: function(val) {
-      this.multipleSelection = val;
+      this.multipleSelection = val
     },
     handleSizeChange(val) {
-      this.limit = val;
-      this.GetWarehouse();
+      this.limit = val
+      this.GetWarehouse()
     },
     handleCurrentChange(val) {
-      this.page = val;
-      this.GetWarehouse();
+      this.page = val
+      this.GetWarehouse()
     },
     startTimeChange(val) {
-      this.GetWarehouse();
+      this.startTime = this.getTimestamp(val)
     },
     endTimeChange(val) {
-      this.GetWarehouse();
+      var time = this.getTimestamp(val) - this.startTime
+      if (time < 0) {
+        this.$message.error('结束时间不能小于开始时间')
+        this.end_time = ''
+      } else {
+        this.GetWarehouse()
+      }
+    },
+    getTimestamp(time) { // 把时间日期转成时间戳
+      return (new Date(time)).getTime() / 1000
     },
     calculate: function(val) {
-      return Math.round(parseFloat(val) * 100) / 100;
+      return Math.round(parseFloat(val) * 100) / 100
     },
     GetConfigInfo: function() {
       GetAllConfig().then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.manufacturer = response.data.data.manufacturer;
-          this.dealer = response.data.data.dealer;
+          this.manufacturer = response.data.data.manufacturer
+          this.dealer = response.data.data.dealer
         }
-      });
+      })
     },
     getManufactuerName: function(manufacturer_id) {
       for (let i = 0; i < this.manufacturer.length; i++) {
         if (this.manufacturer[i].id == manufacturer_id) {
-          return this.manufacturer[i].manufacturer_name;
+          return this.manufacturer[i].manufacturer_name
         }
       }
     },
     getDealerName: function(dealer_id) {
       for (let i = 0; i < this.dealer.length; i++) {
         if (this.dealer[i].id == dealer_id) {
-          return this.dealer[i].dealer_name;
+          return this.dealer[i].dealer_name
         }
       }
     },
     handleEdit: function(index, row) {
       this.$router.push({
-        name: "stockInDetail",
+        name: 'stockInDetail',
         query: { id: row.id, type: this.type }
-      });
+      })
     },
     handleDelete: function(index, row) {
-      const ids = [];
-      ids.push(row.id);
-      const idStr = ids.join(",");
+      const ids = []
+      ids.push(row.id)
+      const idStr = ids.join(',')
 
       const params = {
         ids: idStr
-      };
+      }
 
-      this.$confirm("确认删除入库单记录?", "删除入库单记录", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确认删除入库单记录?', '删除入库单记录', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
           deleteWarehouseInfo(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
               this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
                 duration: 2000
-              });
+              })
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.Warehouse.warehouseDate.length; y++) {
                   if (ids[i] == this.Warehouse.warehouseDate[y].id) {
-                    this.Warehouse.warehouseDate.splice(y, 1);
+                    this.Warehouse.warehouseDate.splice(y, 1)
                   }
                 }
               }
             }
-          });
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     changeAllSelected: function(val) {
       if (val) {
-        this.$refs.multipleTable.toggleAllSelection();
+        this.$refs.multipleTable.toggleAllSelection()
       } else {
-        this.$refs.multipleTable.clearSelection();
+        this.$refs.multipleTable.clearSelection()
       }
     },
     select(selection) {
-      this.selectedTableData = selection;
+      this.selectedTableData = selection
     },
     batchDelete() {
       if (this.selectedTableData.length <= 0) {
-        this.$message.error("请选择要删除的记录");
-        return;
+        this.$message.error('请选择要删除的记录')
+        return
       }
-      const ids = [];
+      const ids = []
       for (let i = 0; i < this.selectedTableData.length; i++) {
-        ids.push(this.selectedTableData[i].id);
+        ids.push(this.selectedTableData[i].id)
       }
-      const idStr = ids.join(",");
+      const idStr = ids.join(',')
       const params = {
         ids: idStr
-      };
-      this.$confirm("确认删除入库单记录?", "删除入库单记录", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      }
+      this.$confirm('确认删除入库单记录?', '删除入库单记录', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
           deleteWarehouseInfo(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
               this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
                 duration: 2000
-              });
+              })
 
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.Warehouse.warehouseDate.length; y++) {
                   if (ids[i] == this.Warehouse.warehouseDate[y].id) {
-                    this.Warehouse.warehouseDate.splice(y, 1);
+                    this.Warehouse.warehouseDate.splice(y, 1)
                   }
                 }
               }
             }
-          });
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     }
   }
-};
+}
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>

src/xt_pages/user/patients.vue

@@ -13,7 +13,7 @@
 
     <div class="cell clearfix">
       <label class="title"><span class="name">日期查询</span> : </label>
-      <el-date-picker size="small" clearable v-model="listQuery.start_time"   prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
+      <el-date-picker size="small" clearable v-model="listQuery.start_time"   prefix-icon="el-icon-date" @change="changeTimeOne" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
       <span class="cellLine"> - </span>
       <el-date-picker size="small" clearable v-model="listQuery.end_time"   prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>
     </div>
@@ -367,7 +367,8 @@ export default {
         gender: '',
         idcardno: '',
         phone: '',
-        healthcareno: ''
+        healthcareno: '',
+        startTime:'',
       }
     },
     created() {
@@ -381,6 +382,7 @@ export default {
         this.searchKey = keyword
       }
     },
+    
 
     methods: {
       EditLapseto() {
@@ -472,8 +474,20 @@ export default {
         this.listQuery.source = source
         this.getList()
       },
-      changeTime() {
-        this.getList()
+      changeTimeOne(val) {
+        this.startTime = this.getTimestamp(val)
+      },
+      changeTime(val) {
+        var time = this.getTimestamp(val) - this.startTime
+        if (time < 0) {
+          this.$message.error('结束时间不能小于开始时间')
+          this.listQuery.end_time = ''
+        } else {
+          this.getList()
+        }
+      },
+      getTimestamp(time) { // 把时间日期转成时间戳
+        return (new Date(time)).getTime() / 1000
       },
       search() {
         this.listQuery.keywords = this.searchKey

src/xt_pages/workforce/components/tableData.vue

@@ -1570,4 +1570,8 @@
 .el-table td{
   border-color: #d0d3da;
 }
+
+.el-table__body tr.current-row>td {
+    background-color: rgb(236, 245, 255);
+}
 </style>

src/xt_pages/workforce/components/template_schedule_selector_dialog.vue

@@ -1,105 +1,143 @@
 <template>
-    <el-dialog title="选择患者" width="40%" :visible.sync="visible" :before-close="_close">
-        <el-form :model="form" label-width="80px">
-            <el-form-item label="患者">
-                <el-select v-model="form.patient_id" placeholder="选择患者" filterable clearable>
-                    <el-option v-for="patient in patients" :key="patient.id" :value="patient.id" :label="patient.name">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="透析模式">
-                <el-select v-model="form.treat_mode" placeholder="选择透析模式" clearable>
-                    <el-option v-for="mode in treatment_modes" :key="mode.id" :value="mode.id" :label="mode.name">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-            <el-button  @click="cancelScheduleAction">取消排班</el-button>
-            <el-button type="primary" @click="saveAction">保 存</el-button>
-        </div>
-    </el-dialog>
+  <el-dialog
+    title="选择患者"
+    width="40%"
+    :visible.sync="visible"
+    :before-close="_close"
+  >
+    <el-form :model="form" label-width="80px" :rules="rules">
+      <el-form-item label="患者" required prop="patient_id">
+        <el-select
+          v-model="form.patient_id"
+          placeholder="选择患者"
+          filterable
+          clearable
+        >
+          <el-option
+            v-for="patient in patients"
+            :key="patient.id"
+            :value="patient.id"
+            :label="patient.name"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="透析模式" required prop="treat_mode">
+        <el-select
+          v-model="form.treat_mode"
+          placeholder="选择透析模式"
+          clearable
+        >
+          <el-option
+            v-for="mode in treatment_modes"
+            :key="mode.id"
+            :value="mode.id"
+            :label="mode.name"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="cancelScheduleAction">取消排班</el-button>
+      <el-button type="primary" @click="saveAction">保 存</el-button>
+    </div>
+  </el-dialog>
 </template>
 
 <script>
 export default {
-    name: "ScheduleSelectorDialog",
-    data() {
-        return {
-            visible: false,
-            form: {
-                patient_id: '',
-                treat_mode: '',
-                weekday: 1,
-                time_type: 1, 
-                device_number_id: 0,
-            },
-            treatment_modes: {},
-        }
-    },
-    props: {
-        patients: {
-            type: Array,
-            default: function() {
-                return []
-            }
-        },
+  name: "ScheduleSelectorDialog",
+  data() {
+    return {
+      visible: false,
+      form: {
+        patient_id: "",
+        treat_mode: "",
+        weekday: 1,
+        time_type: 1,
+        device_number_id: 0
+      },
+      treatment_modes: {},
+      rules: {
+        patient_id: [{ required: true, message: "请选择患者" }],
+        treat_mode: [{ required: true, message: "请选择透析模式" }]
+      }
+    };
+  },
+  props: {
+    patients: {
+      type: Array,
+      default: function() {
+        return [];
+      }
+    }
+  },
+  created() {
+    this.treatment_modes = this.$store.getters.treatment_mode;
+  },
+  methods: {
+    _close: function(done) {
+      this.clear();
+      done();
     },
-    created() {
-        this.treatment_modes = this.$store.getters.treatment_mode
+    clear: function() {
+      this.form.patient_id = "";
+      this.form.treat_mode = "";
+      this.form.weekday = 1;
+      this.form.time_type = 1;
+      this.form.device_number_id = 0;
     },
-    methods: {
-        _close: function(done) {
-            this.clear()
-            done()
-        },
-        clear: function() {
-            this.form.patient_id = ""
-            this.form.treat_mode = ""
-            this.form.weekday = 1
-            this.form.time_type = 1
-            this.form.device_number_id = 0
-        },
-        show(weekday, time_type, device_number_id) {
-            this.clear()
+    show(weekday, time_type, device_number_id) {
+      this.clear();
 
-            this.form.weekday = weekday
-            this.form.time_type = time_type
-            this.form.device_number_id = device_number_id
-            this.visible = true
-        },
-        showWith(patient_id, treat_mode, weekday, time_type, device_number_id) {
-            this.clear()
+      this.form.weekday = weekday;
+      this.form.time_type = time_type;
+      this.form.device_number_id = device_number_id;
+      this.visible = true;
+    },
+    showWith(patient_id, treat_mode, weekday, time_type, device_number_id) {
+      this.clear();
 
-            this.form.patient_id = patient_id
-            this.form.treat_mode = treat_mode
-            this.form.weekday = weekday
-            this.form.time_type = time_type
-            this.form.device_number_id = device_number_id
-            this.visible = true
-        },
-        hide() {
-            this.clear()
-            this.visible = false
-        },
-        saveAction: function() {
-            if (this.form.patient_id <= 0) {
-                this.$message.error("请选择患者", 1500)
-                return
-            }
-            if (this.form.treat_mode <= 0) {
-                this.$message.error("请选择透析模式", 1500)
-                return
-            }
-            this.$emit("did_selected", this.form.patient_id, this.form.treat_mode, this.form.weekday, this.form.time_type, this.form.device_number_id)
-        },
-        cancelScheduleAction: function() {
-            this.$emit("did_cancel", this.form.weekday, this.form.time_type, this.form.device_number_id)
-        }
+      this.form.patient_id = patient_id;
+      this.form.treat_mode = treat_mode;
+      this.form.weekday = weekday;
+      this.form.time_type = time_type;
+      this.form.device_number_id = device_number_id;
+      this.visible = true;
+    },
+    hide() {
+      this.clear();
+      this.visible = false;
+    },
+    saveAction: function() {
+      if (this.form.patient_id <= 0) {
+        this.$message.error("请选择患者", 1500);
+        return;
+      }
+      if (this.form.treat_mode <= 0) {
+        this.$message.error("请选择透析模式", 1500);
+        return;
+      }
+      this.$emit(
+        "did_selected",
+        this.form.patient_id,
+        this.form.treat_mode,
+        this.form.weekday,
+        this.form.time_type,
+        this.form.device_number_id
+      );
+    },
+    cancelScheduleAction: function() {
+      this.$emit(
+        "did_cancel",
+        this.form.weekday,
+        this.form.time_type,
+        this.form.device_number_id
+      );
     }
-}
+  }
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>