Przeglądaj źródła

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

张保健 1 rok temu
rodzic
commit
bb3011359c

+ 2 - 2
config/prod.env.js Wyświetl plik

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

+ 45 - 13
src/pages/main/DialysisArea.vue Wyświetl plik

@@ -1022,12 +1022,21 @@ export default {
1022 1022
       arr5.map(item => {
1023 1023
         item.scheduals.map(it => {
1024 1024
           it.bedNumber = parseInt(it.device_number.number)
1025
+          it.sort = parseInt(it.device_number.sort)
1025 1026
         })
1026 1027
       })
1027
-      arr5.map(item => {
1028
-        item.scheduals.sort(this.compare('bedNumber'))
1029
-      })
1028
+      if (this.$store.getters.user.template_info.org_id != 10346) {
1029
+        arr5.map(item => {
1030
+          item.scheduals.sort(this.compare('bedNumber'))
1031
+        })
1032
+      }
1033
+      if (this.$store.getters.user.template_info.org_id == 10346) {
1034
+        arr5.map(item => {
1035
+          item.scheduals.sort(this.compare('sort'))
1036
+        })
1037
+      }
1030 1038
 
1039
+      console.log('arr5hhhahdhahhhhhh', arr5)
1031 1040
       this.allPatient = arr5
1032 1041
     },
1033 1042
 
@@ -1086,7 +1095,6 @@ export default {
1086 1095
                 arr[i].scheduals.splice(j--, 1)
1087 1096
               }
1088 1097
             } else if (this.$store.getters.user.user.user_type == 3) {
1089
-              console.log('武警机构ID', this.$store.getters.user.template_info.org_id)
1090 1098
               if (this.$store.getters.user.template_info.org_id == 10340) {
1091 1099
                 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)))))) {
1092 1100
                   arr[i].scheduals.splice(j--, 1)
@@ -1146,11 +1154,19 @@ export default {
1146 1154
       arr5.map(item => {
1147 1155
         item.scheduals.map(it => {
1148 1156
           it.bedNumber = parseInt(it.device_number.number)
1157
+          it.sort = parseInt(it.device_number.sort)
1149 1158
         })
1150 1159
       })
1151
-      arr5.map(item => {
1152
-        item.scheduals.sort(this.compare('bedNumber'))
1153
-      })
1160
+      if (this.$store.getters.user.template_info.org_id != 10346) {
1161
+        arr5.map(item => {
1162
+          item.scheduals.sort(this.compare('bedNumber'))
1163
+        })
1164
+      }
1165
+      if (this.$store.getters.user.template_info.org_id == 10346) {
1166
+        arr5.map(item => {
1167
+          item.scheduals.sort(this.compare('sort'))
1168
+        })
1169
+      }
1154 1170
       console.log('zoneMapObj', this.zoneMapObj)
1155 1171
       var zones = []
1156 1172
       zones.push({ value: 0, text: '全部分区', zone_name: '全部分区' })
@@ -1335,11 +1351,19 @@ export default {
1335 1351
       arr5.map(item => {
1336 1352
         item.scheduals.map(it => {
1337 1353
           it.bedNumber = parseInt(it.device_number.number)
1354
+          it.sort = parseInt(it.device_number.sort)
1338 1355
         })
1339 1356
       })
1340
-      arr5.map(item => {
1341
-        item.scheduals.sort(this.compare('bedNumber'))
1342
-      })
1357
+      if (this.$store.getters.user.template_info.org_id != 10346) {
1358
+        arr5.map(item => {
1359
+          item.scheduals.sort(this.compare('bedNumber'))
1360
+        })
1361
+      }
1362
+      if (this.$store.getters.user.template_info.org_id == 10346) {
1363
+        arr5.map(item => {
1364
+          item.scheduals.sort(this.compare('sort'))
1365
+        })
1366
+      }
1343 1367
       // console.log('zoneMapObj', this.zoneMapObj)
1344 1368
       // var zones = []
1345 1369
       // zones.push({ value: 0, text: '全部分区' })
@@ -1555,11 +1579,19 @@ export default {
1555 1579
       arr5.map(item => {
1556 1580
         item.scheduals.map(it => {
1557 1581
           it.bedNumber = parseInt(it.device_number.number)
1582
+          it.sort = parseInt(it.device_number.sort)
1558 1583
         })
1559 1584
       })
1560
-      arr5.map(item => {
1561
-        item.scheduals.sort(this.compare('bedNumber'))
1562
-      })
1585
+      if (this.$store.getters.user.template_info.org_id != 10346) {
1586
+        arr5.map(item => {
1587
+          item.scheduals.sort(this.compare('bedNumber'))
1588
+        })
1589
+      }
1590
+      if (this.$store.getters.user.template_info.org_id == 10346) {
1591
+        arr5.map(item => {
1592
+          item.scheduals.sort(this.compare('sort'))
1593
+        })
1594
+      }
1563 1595
 
1564 1596
       this.allPatient = arr5
1565 1597
     }

+ 3 - 1
src/pages/main/PatientBox.vue Wyświetl plik

@@ -2383,7 +2383,9 @@ export default {
2383 2383
     }
2384 2384
   },
2385 2385
   watch: {
2386
-    is_run: function () {}
2386
+    is_run: function () {
2387
+      console.log('is_run99999239292323', this.is_run)
2388
+    }
2387 2389
   }
2388 2390
 }
2389 2391
 </script>

+ 50 - 9
src/pages/main/WaitingArea.vue Wyświetl plik

@@ -1184,18 +1184,30 @@ export default {
1184 1184
             }
1185 1185
           }
1186 1186
         }
1187
+
1187 1188
         arr2 = arr
1188 1189
       }
1190
+      console.log('机构ID', this.$store.getters.user.template_info.org_id)
1191
+      if (this.$store.getters.user.template_info.org_id == 10346) {
1192
+        console.log('进来23323223233223')
1193
+        arr2.map(item => {
1194
+          item.scheduals.map(it => {
1195
+            it.sort = parseInt(it.device_number.sort)
1196
+          })
1197
+        })
1198
+        arr2.map(item => {
1199
+          item.scheduals.sort(this.compareOne('sort'))
1200
+        })
1201
+      }
1202
+      console.log('机构ID', this.$store.getters.user.template_info.org_id)
1189 1203
       console.log('this.zone_selected', this.zone_selected)
1190
-      console.log('arr2', arr2)
1204
+      console.log('热爱生活', arr2)
1191 1205
       let arr3 = []
1192 1206
       if (this.zone_selected == 0) {
1193 1207
         arr3 = JSON.parse(JSON.stringify(arr2))
1194 1208
       } else {
1195 1209
         let arr = JSON.parse(JSON.stringify(arr2))
1196
-        console.log('灭国2332332323', arr)
1197
-        console.log('this.zone_options[this.zone_selected].text', this.zone_options[this.zone_selected].text)
1198
-        console.log('this.zone_options[this.zone_selected].zone_name', this.zone_options[this.zone_selected].zone_name)
1210
+
1199 1211
         for (let i = 0; i < arr.length; i++) {
1200 1212
           if (this.zone_options[this.zone_selected].zone_name != arr[i].zone_name) {
1201 1213
             // 删除元素后改变i的值
@@ -1231,10 +1243,17 @@ export default {
1231 1243
         })
1232 1244
         arr4[0].scheduals.map(item => {
1233 1245
           item.created_time = item.assessment_before_dislysis.created_time
1246
+          item.sort = item.device_number.sort
1234 1247
         })
1235
-        arr4[0].scheduals.sort(this.compare('created_time'))
1248
+        if (this.$store.getters.user.template_info.org_id != 10346) {
1249
+          arr4[0].scheduals.sort(this.compare('created_time'))
1250
+        }
1251
+
1252
+        if (this.$store.getters.user.template_info.org_id == 10346) {
1253
+          arr4[0].scheduals.sort(this.compareOne('sort'))
1254
+        }
1236 1255
         this.allPatient = arr4
1237
-        // console.log('arr4', arr4)
1256
+        console.log('arr4', arr4)
1238 1257
       } else {
1239 1258
         this.allPatient = arr4
1240 1259
       }
@@ -1405,8 +1424,15 @@ export default {
1405 1424
         })
1406 1425
         arr4[0].scheduals.map(item => {
1407 1426
           item.created_time = item.assessment_before_dislysis.created_time
1427
+          item.sort = item.device_number.sort
1408 1428
         })
1409
-        arr4[0].scheduals.sort(this.compare('created_time'))
1429
+        if (this.$store.getters.user.template_info.org_id != 10346) {
1430
+          arr4[0].scheduals.sort(this.compare('created_time'))
1431
+        }
1432
+
1433
+        if (this.$store.getters.user.template_info.org_id == 10346) {
1434
+          arr4[0].scheduals.sort(this.compareOne('sort'))
1435
+        }
1410 1436
         this.allPatient = arr4
1411 1437
         console.log('arr4', arr4)
1412 1438
       } else {
@@ -1432,6 +1458,13 @@ export default {
1432 1458
         return value2 - value1
1433 1459
       }
1434 1460
     },
1461
+    compareOne (property) {
1462
+      return function (a, b) {
1463
+        var value1 = a[property]
1464
+        var value2 = b[property]
1465
+        return value1 - value2
1466
+      }
1467
+    },
1435 1468
     searchVal (searchValue) {
1436 1469
       var search_keyword = searchValue
1437 1470
       if (searchValue.length > 0) {
@@ -1540,10 +1573,18 @@ export default {
1540 1573
         })
1541 1574
         arr4[0].scheduals.map(item => {
1542 1575
           item.created_time = item.assessment_before_dislysis.created_time
1576
+          item.sort = item.device_number.sort
1543 1577
         })
1544
-        arr4[0].scheduals.sort(this.compare('created_time'))
1578
+
1579
+        if (this.$store.getters.user.template_info.org_id != 10346) {
1580
+          arr4[0].scheduals.sort(this.compare('created_time'))
1581
+        }
1582
+
1583
+        if (this.$store.getters.user.template_info.org_id == 10346) {
1584
+          arr4[0].scheduals.sort(this.compareOne('sort'))
1585
+        }
1545 1586
         this.allPatient = arr4
1546
-        // console.log('arr4', arr4)
1587
+        console.log('arr4', arr4)
1547 1588
       } else {
1548 1589
         this.allPatient = arr4
1549 1590
       }

+ 2 - 2
src/pages/patientManagement/patientManagement.vue Wyświetl plik

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