Merge remote-tracking branch 'origin/master'

src/views/equipment-management/equipment-management/equipment-detail.vue

@@ -708,7 +708,10 @@ export default {
       ],
 
       queryParams: {
-        id: null
+        id: null,
+
+        orderByColumn: 'c.check_start_time',
+        isAsc: ' desc'
       },
       props: { multiple: true },
       cityOptions: regionData,

src/views/medical-record-management/medical-record-management.vue

@@ -41,9 +41,9 @@
             >
               <el-option
                 v-for="item in doctorNameList"
-                :key="item.doctorId"
+                :key="item.ruleId"
                 :label="item.doctorName"
-                :value="item.doctorName"
+                :value="item.ruleId"
               />
             </el-select>
           </el-form-item>
@@ -475,9 +475,9 @@ export default {
     handleExport() {
       if (this.ids.length !== 0) {
         const exportList = {}
-        exportList.medicalId = this.ids
-        console.log('exportList' + exportList.medicalId)
-        console.log('this.ids' + this.ids)
+        exportList.medicalId = this.ids.reverse()
+        console.log('exportListaaaaaaaaaaaaaaaaaaaaaaaaa' + exportList.medicalId)
+        console.log('this.ids' + this.ids.reverse())
         this.download('business/record/export', exportList, `病历管理-${this.exportFormatTime(new Date())}.xlsx`).then(res => {
           this.$refs.table.clearSelection()
           this.ids = []