Merge branch '20210329_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20210329_pad_vue_new_branch

config/prod.env.js

@@ -1,8 +1,8 @@
 "use strict";
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"'
-  // BASE_API: '"https://api.xt.kuyicloud.com"'
+  // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"'
+  BASE_API: '"https://api.xt.kuyicloud.com"'
   //  BASE_API:'"http://localhost:9531"',
   // BASE_API: '"http://api.xt.test.sgjyun.com"'
   // http://api.xt.test.sgjyun.com

src/pages/main/DialysisArea.vue

@@ -1022,12 +1022,21 @@ export default {
       arr5.map(item => {
         item.scheduals.map(it => {
           it.bedNumber = parseInt(it.device_number.number)
+          it.sort = parseInt(it.device_number.sort)
         })
       })
-      arr5.map(item => {
-        item.scheduals.sort(this.compare('bedNumber'))
-      })
+      if (this.$store.getters.user.template_info.org_id != 10346) {
+        arr5.map(item => {
+          item.scheduals.sort(this.compare('bedNumber'))
+        })
+      }
+      if (this.$store.getters.user.template_info.org_id == 10346) {
+        arr5.map(item => {
+          item.scheduals.sort(this.compare('sort'))
+        })
+      }
 
+      console.log('arr5hhhahdhahhhhhh', arr5)
       this.allPatient = arr5
     },
 
@@ -1086,7 +1095,6 @@ export default {
                 arr[i].scheduals.splice(j--, 1)
               }
             } else if (this.$store.getters.user.user.user_type == 3) {
-              console.log('武警机构ID', this.$store.getters.user.template_info.org_id)
               if (this.$store.getters.user.template_info.org_id == 10340) {
                 if ((arr[i].scheduals[j].dialysis_order == null || ((arr[i].scheduals[j] && arr[i].scheduals[j].dialysis_order != null) ? arr[i].scheduals[j].dialysis_order.start_nurse != this.$store.getters.user.admin.id : false)) && ((arr[i].scheduals[j].dobule_check == null) || ((arr[i].scheduals[j].dobule_check != null && (arr[i].scheduals[j].dobule_check.creater != this.$store.getters.user.admin.id)) && ((arr[i].scheduals[j].dobule_check != null && (arr[i].scheduals[j].dobule_check.modifier != this.$store.getters.user.admin.id)))))) {
                   arr[i].scheduals.splice(j--, 1)
@@ -1146,11 +1154,19 @@ export default {
       arr5.map(item => {
         item.scheduals.map(it => {
           it.bedNumber = parseInt(it.device_number.number)
+          it.sort = parseInt(it.device_number.sort)
         })
       })
-      arr5.map(item => {
-        item.scheduals.sort(this.compare('bedNumber'))
-      })
+      if (this.$store.getters.user.template_info.org_id != 10346) {
+        arr5.map(item => {
+          item.scheduals.sort(this.compare('bedNumber'))
+        })
+      }
+      if (this.$store.getters.user.template_info.org_id == 10346) {
+        arr5.map(item => {
+          item.scheduals.sort(this.compare('sort'))
+        })
+      }
       console.log('zoneMapObj', this.zoneMapObj)
       var zones = []
       zones.push({ value: 0, text: '全部分区', zone_name: '全部分区' })
@@ -1335,11 +1351,19 @@ export default {
       arr5.map(item => {
         item.scheduals.map(it => {
           it.bedNumber = parseInt(it.device_number.number)
+          it.sort = parseInt(it.device_number.sort)
         })
       })
-      arr5.map(item => {
-        item.scheduals.sort(this.compare('bedNumber'))
-      })
+      if (this.$store.getters.user.template_info.org_id != 10346) {
+        arr5.map(item => {
+          item.scheduals.sort(this.compare('bedNumber'))
+        })
+      }
+      if (this.$store.getters.user.template_info.org_id == 10346) {
+        arr5.map(item => {
+          item.scheduals.sort(this.compare('sort'))
+        })
+      }
       // console.log('zoneMapObj', this.zoneMapObj)
       // var zones = []
       // zones.push({ value: 0, text: '全部分区' })
@@ -1555,11 +1579,19 @@ export default {
       arr5.map(item => {
         item.scheduals.map(it => {
           it.bedNumber = parseInt(it.device_number.number)
+          it.sort = parseInt(it.device_number.sort)
         })
       })
-      arr5.map(item => {
-        item.scheduals.sort(this.compare('bedNumber'))
-      })
+      if (this.$store.getters.user.template_info.org_id != 10346) {
+        arr5.map(item => {
+          item.scheduals.sort(this.compare('bedNumber'))
+        })
+      }
+      if (this.$store.getters.user.template_info.org_id == 10346) {
+        arr5.map(item => {
+          item.scheduals.sort(this.compare('sort'))
+        })
+      }
 
       this.allPatient = arr5
     }

src/pages/main/PatientBox.vue

@@ -2383,7 +2383,9 @@ export default {
     }
   },
   watch: {
-    is_run: function () {}
+    is_run: function () {
+      console.log('is_run99999239292323', this.is_run)
+    }
   }
 }
 </script>

src/pages/main/WaitingArea.vue

@@ -1184,18 +1184,30 @@ export default {
             }
           }
         }
+
         arr2 = arr
       }
+      console.log('机构ID', this.$store.getters.user.template_info.org_id)
+      if (this.$store.getters.user.template_info.org_id == 10346) {
+        console.log('进来23323223233223')
+        arr2.map(item => {
+          item.scheduals.map(it => {
+            it.sort = parseInt(it.device_number.sort)
+          })
+        })
+        arr2.map(item => {
+          item.scheduals.sort(this.compareOne('sort'))
+        })
+      }
+      console.log('机构ID', this.$store.getters.user.template_info.org_id)
       console.log('this.zone_selected', this.zone_selected)
-      console.log('arr2', arr2)
+      console.log('热爱生活', arr2)
       let arr3 = []
       if (this.zone_selected == 0) {
         arr3 = JSON.parse(JSON.stringify(arr2))
       } else {
         let arr = JSON.parse(JSON.stringify(arr2))
-        console.log('灭国2332332323', arr)
-        console.log('this.zone_options[this.zone_selected].text', this.zone_options[this.zone_selected].text)
-        console.log('this.zone_options[this.zone_selected].zone_name', this.zone_options[this.zone_selected].zone_name)
+
         for (let i = 0; i < arr.length; i++) {
           if (this.zone_options[this.zone_selected].zone_name != arr[i].zone_name) {
             // 删除元素后改变i的值
@@ -1231,10 +1243,17 @@ export default {
         })
         arr4[0].scheduals.map(item => {
           item.created_time = item.assessment_before_dislysis.created_time
+          item.sort = item.device_number.sort
         })
-        arr4[0].scheduals.sort(this.compare('created_time'))
+        if (this.$store.getters.user.template_info.org_id != 10346) {
+          arr4[0].scheduals.sort(this.compare('created_time'))
+        }
+
+        if (this.$store.getters.user.template_info.org_id == 10346) {
+          arr4[0].scheduals.sort(this.compareOne('sort'))
+        }
         this.allPatient = arr4
-        // console.log('arr4', arr4)
+        console.log('arr4', arr4)
       } else {
         this.allPatient = arr4
       }
@@ -1405,8 +1424,15 @@ export default {
         })
         arr4[0].scheduals.map(item => {
           item.created_time = item.assessment_before_dislysis.created_time
+          item.sort = item.device_number.sort
         })
-        arr4[0].scheduals.sort(this.compare('created_time'))
+        if (this.$store.getters.user.template_info.org_id != 10346) {
+          arr4[0].scheduals.sort(this.compare('created_time'))
+        }
+
+        if (this.$store.getters.user.template_info.org_id == 10346) {
+          arr4[0].scheduals.sort(this.compareOne('sort'))
+        }
         this.allPatient = arr4
         console.log('arr4', arr4)
       } else {
@@ -1432,6 +1458,13 @@ export default {
         return value2 - value1
       }
     },
+    compareOne (property) {
+      return function (a, b) {
+        var value1 = a[property]
+        var value2 = b[property]
+        return value1 - value2
+      }
+    },
     searchVal (searchValue) {
       var search_keyword = searchValue
       if (searchValue.length > 0) {
@@ -1540,10 +1573,18 @@ export default {
         })
         arr4[0].scheduals.map(item => {
           item.created_time = item.assessment_before_dislysis.created_time
+          item.sort = item.device_number.sort
         })
-        arr4[0].scheduals.sort(this.compare('created_time'))
+
+        if (this.$store.getters.user.template_info.org_id != 10346) {
+          arr4[0].scheduals.sort(this.compare('created_time'))
+        }
+
+        if (this.$store.getters.user.template_info.org_id == 10346) {
+          arr4[0].scheduals.sort(this.compareOne('sort'))
+        }
         this.allPatient = arr4
-        // console.log('arr4', arr4)
+        console.log('arr4', arr4)
       } else {
         this.allPatient = arr4
       }

src/pages/patientManagement/patientManagement.vue

@@ -10,9 +10,9 @@
         </div>
       </div>
 
-     <!-- <div class="searchBox" style="margin-left:10px">
+     <div class="searchBox" style="margin-left:10px">
         <el-button type="primary" size="small" @click="commit">脚本</el-button>
-      </div> -->
+      </div>
 
       <div class="searchBox">
         <van-search