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/chargeDetailManagement.vue

 
               } else {
                 that.radio = 1
+                that.getPatientList()
+
                 that.$message({ message: '撤销成功', type: 'success', duration: 5000 })
               }
 
 
               } else {
                 that.radio = 2
+                that.getPatientList()
                 that.$message({ message: '上传成功', type: 'success', duration: 5000 })
               }
             }
             case 1:
               this.all_table_data = response.data.data.list
               this.patientTableData = response.data.data.list
-              this.$refs.tab.setCurrentRow(this.patientTableData[0])
-              this.getPatientInformation(this.patientTableData[0].id)
+              if (this.hisPatientInfo&&this.hisPatientInfo.id > 0){
+                for(let i = 0; i < this.patientTableData.length;i++){
+                  if(this.hisPatientInfo.id == this.patientTableData[i].id){
+                    this.$refs.tab.setCurrentRow(this.patientTableData[i])
+                  }
+                }
+              }else{
+                this.$refs.tab.setCurrentRow(this.patientTableData[0])
+                this.getPatientInformation(this.patientTableData[0].id)
+              }
               break
             case 2:
               this.all_table_data = response.data.data.list_two
               this.patientTableData = response.data.data.list_two
               this.upload_list = response.data.data.upload_list
               this.all_upload_list = response.data.data.upload_list
+              if (this.hisPatientInfo && this.hisPatientInfo.id > 0){
+                for(let i = 0; i < this.upload_list.length;i++){
+                  if(this.hisPatientInfo.id == this.upload_list[i].his_patient.id){
+                    this.$refs.tab.setCurrentRow(this.upload_list[i])
+                    this.getPatientInformation(this.upload_list[0].id)
 
-              this.$refs.tab.setCurrentRow(this.upload_list[0])
-              console.log(this.upload_list[0].id)
-              this.getPatientInformationtwo(this.upload_list[0].id)
+                  }
+                }
+              }else{
+                this.$refs.tab.setCurrentRow(this.upload_list[0])
+                this.getPatientInformation(this.upload_list[0].id)
+              }
               break
           }
         }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

                                       </template>
                                     </el-table-column>
 
-                                      <el-table-column label="库存" width="60" v-if="org_id != 10206">
+                                      <el-table-column label="库存" width="60" v-if="org_id != 10206 && org_id != 0">
                                           <template slot-scope="scope">
                                              <!-- <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id ==9956 || org_id == 10188 || org_id == 10191 || org_id == 10278 || org_id == 10217 || org_id ==10210 || org_id ==record_date ||org_id ==10340">
                                              <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
                                       </el-table-column>
 
 <!--                                    //针对对接坐标系统的，使用坐标的库存数据-->
-                                    <el-table-column label="库存" width="60" v-if="org_id == 10206">
+                                    <el-table-column label="库存" width="60" v-if="org_id == 10206 || org_id == 0">
                                       <template slot-scope="scope">
                                         <span>{{scope.row.zuobiao_stock_num}}</span>
                                       </template>
                                             :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                                             highlight-current-row>
                                       <el-table-column type="selection" width="40" align="center"></el-table-column>
-                                      <el-table-column prop="name" label="名称" v-if="org_id != 10206">
+                                      <el-table-column prop="name" label="名称" v-if="org_id != 10206 && org_id != 0">
                                           <template slot-scope="scope">{{ scope.row.project_name }}</template>
                                       </el-table-column>
-                                    <el-table-column prop="name" label="名称" v-if="org_id == 10206">
+                                    <el-table-column prop="name" label="名称" v-if="org_id == 10206 || org_id == 0">
                                       <template slot-scope="scope">{{ scope.row.project_name }}{{scope.row.number}}</template>
                                     </el-table-column>
                                       <el-table-column label="规格" width="60">
   },
   data() {
     return {
+      drugs:[],
       zuobiao_project:[],
       start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
       end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
       form: {
         name: ''
       },
-      drugs: [],
+
       allDrugs: [],
       advices_template: [],
       additions: [],
     getzuobiao(){
       if(this.org_id == 10206){
         var that = this
-        axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/querystock', {
+        axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/querystockgood', {
 
         })
           .then(function(response) {
       if(this.org_id == 10206 || this.org_id == 0){
         this.departmentValue = 263
         this.state1 = 677
-        this.diagnose.push(716)
+        if (this.diagnose.length == 0){
+          this.diagnose.push(716)
+        }
       }
 
     },

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

 
           this.additions = response.data.data.additions
 
+
+
           //针对普爱医院获取药品和耗材相关库存数据
           if(this.org_id == 10206){
             var that = this
-            axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/querystock', {
+            axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/querystockdrug', {
 
             })
               .then(function(response) {
 
                   } else {
                     that.zuobiao_drug  = response.data.data.drug
+                    console.log("坐标～～坐标")
+                    console.log(that.zuobiao_drug)
+                    console.log(response.data.data.drug)
+                    console.log("坐标～～坐标")
+
                     // that.zuobiao_project  = response.data.data.project
                     //跟坐标数据进行匹配，如果bbx01相等的话则，替换库存数量
                       for (let i = 0; i < that.zuobiao_drug.length; i++) {
                         for (let b = 0; b < that.drugs.length; b++) {
                           if (that.zuobiao_drug[i].bby01 == that.drugs[b].bby01){
                             that.drugs[b]["zuobiao_stock_num"] = that.zuobiao_drug[i].sysl
+                            that.drugs[b].min_price = that.zuobiao_drug[i].price
+
+
                           }
+
                         }
                       }
+                    console.log("坐标～～坐标")
+                    console.log(that.drugs)
+                    console.log("坐标～～坐标")
+
 
                   }
                 }
                   med_type: '',
                   is_medicine_status:false,
                 }
-                if(this.org_id != 10206) {
                   if (prescription.med_type == 0 || prescription.med_type == '') {
 
                     obj.med_type = ''
                     if (this.org_id != 10206 ) {
                       obj.med_type = 14
                     } else {
-
-                      obj.med_type = ""
+                      obj.med_type = 1
                     }
                   }
-                }
+
                 this.prescriptions.push(obj)
               }