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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                     highlight-current-row ref="tab"
                     @current-change="handleCurrentChange">
-            <el-table-column align="center" prop="name" label="姓名" wdith='89'>
-              <template slot-scope="scope">{{ scope.$index + 1 }}.{{ scope.row.name }}</template>
+            <el-table-column prop="name" label="姓名" wdith='110'>
+              <template slot-scope="scope">
+                <span>{{ scope.$index + 1 }}.{{ scope.row.name }}</span>
+                <span class="futou" v-if="scope.row.patient_type==4">腹</span>
+                <!-- v-if="scope.row.patient_type==4" -->
+              </template>
             </el-table-column>
-            <el-table-column align="center" prop="name" label="就诊号" width="110">
+            <el-table-column align="center" prop="name" label="就诊号" width="89">
               <template slot-scope="scope">{{ scope.row.number ? scope.row.number : '' }}
               </template>
             </el-table-column>
                     order_number: '',
                     his_patient_id: 0,
                     prescription: response.data.data.list[i].prescription,
-                    first_letter:response.data.data.list[i].first_letter
+                    first_letter:response.data.data.list[i].first_letter,
+                    patient_type:response.data.data.list[i].patient_type
                   }
 
                   this.all_table_data.push(obj)
                         order_number: response.data.data.list[i].his_patient[0].orders[b].order_number,
                         order_id: response.data.data.list[i].his_patient[0].orders[b].id,
                         prescription: response.data.data.list[i].prescription,
-                        first_letter:response.data.data.list[i].first_letter
+                        first_letter:response.data.data.list[i].first_letter,
+                        patient_type:response.data.data.list[i].patient_type
 
                       }
                       this.all_table_data.push(obj)
                       order_number: '',
                       order_id: 0,
                       prescription: response.data.data.list[i].prescription,
-                      first_letter:response.data.data.list[i].first_letter
+                      first_letter:response.data.data.list[i].first_letter,
+                      patient_type:response.data.data.list[i].patient_type
                     }
                     this.all_table_data.push(obj)
 
                         order_number: '',
                         order_id: 0,
                         prescription: response.data.data.list[i].prescription,
-                        first_letter:response.data.data.list[i].first_letter
+                        first_letter:response.data.data.list[i].first_letter,
+                        patient_type:response.data.data.list[i].patient_type
                       }
                       this.all_table_data.push(obj)
                     } else {
                           order_number: response.data.data.list[i].his_patient[b].orders[c].number,
                           order_id: response.data.data.list[i].his_patient[b].orders[c].id,
                           prescription: response.data.data.list[i].prescription,
-                          first_letter:response.data.data.list[i].first_letter
+                          first_letter:response.data.data.list[i].first_letter,
+                          patient_type:response.data.data.list[i].patient_type
                         }
                         this.all_table_data.push(obj)
                       }
           let one_count = 0
           let two_count = 0
           let three_count = 0
-          console.log('vvvvvvvvvvvvv',response.data.data);
+          console.log('vvvvvvvvvvvvv1211',response.data.data);
           for (let i = 0; i < response.data.data.list.length; i++) {
             if (response.data.data.list[i].his_patient.length == 0) { //没挂号
               if (response.data.data.list[i].prescription.length > 0) {
                   his_patient_id: 0,
                   prescription: response.data.data.list[i].prescription,
                   schedle: response.data.data.list[i].schedule,
-                  first_letter:response.data.data.list[i].first_letter
-
+                  first_letter:response.data.data.list[i].first_letter,
+                  patient_type:response.data.data.list[i].patient_type
                 }
 
                 this.all_table_data.push(obj)
                       order_id: response.data.data.list[i].his_patient[0].orders[b].id,
                       prescription: response.data.data.list[i].prescription,
                       schedle: response.data.data.list[i].schedule,
-                      first_letter:response.data.data.list[i].first_letter
-
+                      first_letter:response.data.data.list[i].first_letter,
+                      patient_type:response.data.data.list[i].patient_type
                     }
                     this.all_table_data.push(obj)
 
                     order_id: 0,
                     prescription: response.data.data.list[i].prescription,
                     schedle: response.data.data.list[i].schedule,
-                    first_letter:response.data.data.list[i].first_letter
-
+                    first_letter:response.data.data.list[i].first_letter,
+                    patient_type:response.data.data.list[i].patient_type
                   }
                   this.all_table_data.push(obj)
 
                       order_id: 0,
                       prescription: response.data.data.list[i].prescription,
                       schedle: response.data.data.list[i].schedule,
-                      first_letter:response.data.data.list[i].first_letter
+                      first_letter:response.data.data.list[i].first_letter,
+                      patient_type:response.data.data.list[i].patient_type
                     }
                     this.all_table_data.push(obj)
                   } else {
                         order_id: response.data.data.list[i].his_patient[b].orders[c].id,
                         prescription: response.data.data.list[i].prescription,
                         schedle: response.data.data.list[i].schedule,
-                        first_letter:response.data.data.list[i].first_letter
+                        first_letter:response.data.data.list[i].first_letter,
+                        patient_type:response.data.data.list[i].patient_type
 
                       }
                       this.all_table_data.push(obj)
 
 }
 }
+.futou{
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  border-radius: 50px;
+  background: #38d7d7;
+  color: white;
+  text-align: center;
+  position: absolute;
+  right: 5px;
+}
 </style>
 
 <style lang="scss">

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

                     ref="tab"
           >
             <el-table-column prop="name" label="姓名" width='89'>
-              <template slot-scope="scope">{{ scope.row.name }}</template>
+              <template slot-scope="scope">
+                <span>{{ scope.row.name }}</span>
+                <span class="futou" v-if="scope.row.patient_type==4">腹</span>
+                <!--  v-if="scope.row.patient_type==1" -->
+              </template>
             </el-table-column>
             <el-table-column prop="name" label="就诊号" width="110">
               <template slot-scope="scope">{{ scope.row.number ? scope.row.number : '' }}
                     ref="tab"
           >
             <el-table-column prop="name" label="姓名" width='89'>
-              <template slot-scope="scope">{{ scope.row.name }}</template>
+              <template slot-scope="scope">
+                <span>{{ scope.row.name }}</span>
+                <span class="futou" v-if="scope.row.patient_type==4">腹</span>
+              </template>
             </el-table-column>
             <el-table-column prop="name" label="就诊号" width="110">
               <template slot-scope="scope">{{ scope.row.number ? scope.row.number : '' }}
                     ref="tab"
           >
             <el-table-column prop="name" label="姓名" width='89'>
-              <template slot-scope="scope">{{ scope.row.name }}</template>
+              <template slot-scope="scope">
+                <span>{{ scope.row.name }}</span>
+                <span class="futou" v-if="scope.row.patient_type==4">腹</span>
+              </template>
             </el-table-column>
             <el-table-column prop="name" label="就诊号" width="110">
               <template slot-scope="scope">{{ scope.row.number ? scope.row.number : '' }}
           return false
         } else {
           //挂号
+          console.log('response.data.data',response.data.data);
+          
           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++) {
               //未就诊
                   name: response.data.data.list[i].his_patient[b].name,
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
-                  his_patient_id: response.data.data.list[i].his_patient[b].id
+                  his_patient_id: response.data.data.list[i].his_patient[b].id,
+                  // patient_type:
                 }
                 this.un_cure_data.push(obj)
               }
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
                   his_patient_id: response.data.data.list[i].his_patient[b].id,
-                  first_letter: response.data.data.list[i].first_letter
+                  first_letter: response.data.data.list[i].first_letter,
+                  patient_type: response.data.data.list[i].patient_type
                 }
                 this.un_cure_data.push(obj)
                 console.log('vvvvv', this.un_cure_data)
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
                   his_patient_id: response.data.data.list[i].his_patient[b].id,
-                  first_letter: response.data.data.list[i].first_letter
+                  first_letter: response.data.data.list[i].first_letter,
+                  patient_type: response.data.data.list[i].patient_type
                 }
                 this.cure_data.push(obj)
               }
                 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,
-                first_letter: response.data.data.list_two[i].first_letter
+                first_letter: response.data.data.list_two[i].first_letter,
+                patient_type: response.data.data.list_two[i].patient_type
               }
               this.un_cure_data.push(obj)
               // console.log('aaaaa',this.un_cure_data);
                 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,
-                first_letter: response.data.data.list_two[i].first_letter
+                first_letter: response.data.data.list_two[i].first_letter,
+                patient_type: response.data.data.list_two[i].patient_type
               }
               this.cure_data.push(obj)
             }
           this.$message.error(response.data.msg)
           return false
         } else {
-          console.log('getSchedulePatientList', response.data.data.list_two)
+          console.log('getSchedulePatientList', response.data.data)
           //排班
           for (let i = 0; i < response.data.data.list_two.length; i++) {
             //未就诊
                 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,
-                first_letter: response.data.data.list_two[i].first_letter
+                first_letter: response.data.data.list_two[i].first_letter,
+                patient_type: response.data.data.list_two[i].patient_type
               }
               // console.log('6666',obj);
               this.un_cure_data.push(obj)
                 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,
-                first_letter: response.data.data.list_two[i].first_letter
+                first_letter: response.data.data.list_two[i].first_letter,
+                patient_type: response.data.data.list_two[i].patient_type
               }
               this.cure_data.push(obj)
             }
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
                   his_patient_id: response.data.data.list[i].his_patient[b].id,
-                  first_letter: response.data.data.list[i].first_letter
+                  first_letter: response.data.data.list[i].first_letter,
+                  patient_type: response.data.data.list[i].patient_type
                 }
                 // console.log('8888',obj);
                 this.un_cure_data.push(obj)
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
                   his_patient_id: response.data.data.list[i].his_patient[b].id,
-                  first_letter: response.data.data.list[i].first_letter
+                  first_letter: response.data.data.list[i].first_letter,
+                  patient_type: response.data.data.list[i].patient_type
                 }
                 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)
-
+          
+          
           this.cure_data_two = this.cure_data
           this.un_cure_data_two = this.un_cure_data
           this.all_data_two = this.all_data
             this.oldCurrentRow = this.un_cure_data[0]
             this.getPatientInfo(this.un_cure_data[0])
           }
+          console.log('1111111this.all_data',this.cure_data);
         }
       })
     },
   display: flex;
   justify-content: space-between;
 }
+.futou{
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  border-radius: 50px;
+  background: #38d7d7;
+  color: white;
+  text-align: center;
+  position: absolute;
+  right: 5px;
+}
 </style>
 
 <style lang="scss">