Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -778,7 +778,9 @@
           { value: 17, label: '健康体检' },
           { value: 18, label: '预防接种' },
           { value: 19, label: '门诊输血' },
-          { value: 91, label: '新冠肺炎门诊' }
+          { value: 91, label: '新冠肺炎门诊' },
+          {value: 1111, label: "精一"},
+          {value: 1112, label: "精二"},
         ],
 
         medical_care_two: [
@@ -791,7 +793,9 @@
           { value: '17', label: '健康体检' },
           { value: '18', label: '预防接种' },
           { value: '19', label: '门诊输血' },
-          { value: '91', label: '新冠肺炎门诊' }
+          { value: '91', label: '新冠肺炎门诊' },
+          {value: '1111', label: "精一"},
+          {value: '1112', label: "精二"},
         ],
 
         register: [
@@ -4087,6 +4091,12 @@
             case 91:
               return '新冠肺炎门诊' + '处方' + index
               break
+            case 1111:
+              return '精一' + '处方' + index
+              break
+            case 1112:
+              return '精二' + '处方' + index
+              break
           }
 
         } else {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -540,6 +540,9 @@
           {value: 18, label: "预防接种"},
           {value: 19, label: "门诊输血"},
           {value: 91, label: "新冠肺炎门诊"},
+          {value: 1111, label: "精一"},
+          {value: 1112, label: "精二"},
+
         ],
 
         isLastOrNextVisible: false,
@@ -2827,12 +2830,16 @@
         })
       },
       selectTeam(row) {
+        console.log(row)
         var arr = []
         for (let i = 0; i < row.length; i++) {
           arr.push(row[i].item_id)
         }
+        console.log(arr)
         var ids = arr.join(',')
+        console.log(ids)
         var strArr = ids.split(',')
+        console.log(strArr)
         var res = []//接收不重复的数据
 
         for (var i = 0; i < strArr.length; i++) {
@@ -2848,6 +2855,7 @@
             res.push(strArr[i])
           }
         }
+        console.log(res)
         var idstr = res.join(',')
         const params = {
           project_id: idstr

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1043,6 +1043,31 @@
             this.$message.error(response.data.msg)
             return false
           } else {
+            //排班
+            for (let i = 0; i < response.data.data.list_two.length; i++) {
+              //未就诊
+              if (response.data.data.list_two[i].prescription.length == 0 && response.data.data.list_two[i].his_patient.id == 0) {
+                let obj = {
+                  name: response.data.data.list_two[i].name,
+                  number: response.data.data.list_two[i].his_patient.number,
+                  id: response.data.data.list_two[i].id,
+                  his_patient_id: response.data.data.list_two[i].his_patient.id
+                }
+                this.un_cure_data.push(obj)
+              }
+
+              //已就诊
+              if (response.data.data.list_two[i].prescription.length > 0 && response.data.data.list_two[i].his_patient.id == 0) {
+                let obj = {
+                  name: response.data.data.list_two[i].name,
+                  number: response.data.data.list_two[i].his_patient.number,
+                  id: response.data.data.list_two[i].id,
+                  his_patient_id: response.data.data.list_two[i].his_patient.id
+                }
+                this.cure_data.push(obj)
+              }
+            }
+
             //挂号
             for (let i = 0; i < response.data.data.list.length; i++) {
               for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
@@ -1070,30 +1095,7 @@
             }
 
 
-            //排班
-            for (let i = 0; i < response.data.data.list_two.length; i++) {
-              //未就诊
-              if (response.data.data.list_two[i].prescription.length == 0 && response.data.data.list_two[i].his_patient.id == 0) {
-                let obj = {
-                  name: response.data.data.list_two[i].name,
-                  number: response.data.data.list_two[i].his_patient.number,
-                  id: response.data.data.list_two[i].id,
-                  his_patient_id: response.data.data.list_two[i].his_patient.id
-                }
-                this.un_cure_data.push(obj)
-              }
 
-              //已就诊
-              if (response.data.data.list_two[i].prescription.length > 0 && response.data.data.list_two[i].his_patient.id == 0) {
-                let obj = {
-                  name: response.data.data.list_two[i].name,
-                  number: response.data.data.list_two[i].his_patient.number,
-                  id: response.data.data.list_two[i].id,
-                  his_patient_id: response.data.data.list_two[i].his_patient.id
-                }
-                this.cure_data.push(obj)
-              }
-            }
 
             this.all_data = this.all_data.concat(this.cure_data)
             this.all_data = this.all_data.concat(this.un_cure_data)