Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/schedualPatient.vue

@@ -220,8 +220,9 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
             var filtedSchedules = []
             for (let s_i = 0; s_i < originSchedules.length; s_i++) {
               const schedule = originSchedules[s_i]
+              console.log("schedule.patient",schedule.patient)
               if(schedule.patient!=null){
-                if (schedule.patient.name.indexOf(search_keyword) != -1) {
+                if ((schedule.patient.name.indexOf(search_keyword) != -1) || (schedule.patient.first_letter.indexOf(search_keyword) != -1)) {
                 filtedSchedules.push(schedule)
                 // break
                }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -737,6 +737,7 @@ export default {
   },
   methods: {
     getzuobiao(){
+
       if(this.org_id == 10206){
         var that = this
         axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/querystockgood', {
@@ -3305,21 +3306,21 @@ export default {
        }
       }
 
-      // if(this.org_id == 10206){
-      //   if (row.zuobiao_stock_num <= 0) {
-      //     if (selection) {
-      //       selection.forEach(row => {
-      //         if (row.zuobiao_stock_num <= 0) {
-      //           this.$refs.multipleTable.toggleRowSelection(row)
-      //         }
-      //       })
-      //     } else {
-      //       this.$refs.multipleTable.clearSelection()
-      //     }
-      //     this.$message.error(row.drug_name + '库存不足')
-      //     return
-      //   }
-      // }
+      if(this.org_id == 10206){
+        if (row.zuobiao_stock_num <= 0) {
+          if (selection) {
+            selection.forEach(row => {
+              if (row.zuobiao_stock_num <= 0) {
+                this.$refs.multipleTable.toggleRowSelection(row)
+              }
+            })
+          } else {
+            this.$refs.multipleTable.clearSelection()
+          }
+          this.$message.error(row.drug_name + '库存不足')
+          return
+        }
+      }
 
 
 
@@ -3633,21 +3634,21 @@ export default {
         }
        }
 
-      // if ( this.org_id == 10206) {
-      //   if (row.type == 3) {
-      //     if (selection) {
-      //       selection.forEach(row => {
-      //         if (row.zuobiao_stock_num <= 0) {
-      //           this.$refs.tables.toggleRowSelection(row)
-      //         }
-      //       })
-      //     } else {
-      //       this.$refs.tables.clearSelection()
-      //     }
-      //     this.$message.error(row.project_name + '库存不足')
-      //     return
-      //   }
-      // }
+      if ( this.org_id == 10206) {
+        if (row.type == 3) {
+          if (selection) {
+            selection.forEach(row => {
+              if (row.zuobiao_stock_num <= 0) {
+                this.$refs.tables.toggleRowSelection(row)
+              }
+            })
+          } else {
+            this.$refs.tables.clearSelection()
+          }
+          this.$message.error(row.project_name + '库存不足')
+          return
+        }
+      }
       this.teamList = selection
     },
     getlist() {
@@ -3733,6 +3734,8 @@ export default {
                   console.log( this.zuobiao_project[i].lsqty)
                   console.log( this.tabProject[b].zuobiao_stock_num)
                   this.tabProject[b].zuobiao_stock_num = this.zuobiao_project[i].lsqty
+                  this.tabProject[b].price = this.zuobiao_project[i].price
+
                 }
               }
             }
@@ -3830,11 +3833,11 @@ export default {
                   this.$message.error(project[i].good_info.good_name + '库存不足')
                 }
 
-                // if (project[i].good_info.zuobiao_stock_num <= 0 && this.org_id == 10206) {
-                //   num++
-                //   this.$refs.tabProjectTeam.toggleRowSelection(row)
-                //   this.$message.error(project[i].good_info.good_name + '库存不足')
-                // }
+                if (project[i].good_info.zuobiao_stock_num <= 0 && this.org_id == 10206) {
+                  num++
+                  this.$refs.tabProjectTeam.toggleRowSelection(row)
+                  this.$message.error(project[i].good_info.good_name + '库存不足')
+                }
 
                 if (num > 0) {
                   this.$refs.tabProjectTeam.clearSelection()

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -120,6 +120,13 @@
             </template>
           </el-table-column>
 
+
+          <el-table-column align="center" prop="drug_way_count" width="100" label="给药途径次数" >
+            <template slot-scope="scope">
+              <el-input :disabled="prescription.is_medicine_status"  v-model="scope.row.drug_way_count" :title="scope.row.drug_way_count" placeholder=""></el-input>
+            </template>
+          </el-table-column>
+
             <el-table-column align="center" prop="remark" width="50" label="备注">
                 <template slot-scope="scope">
                     <el-input :disabled="prescription.is_medicine_status"  v-model="scope.row.remark" :title="scope.row.remark" placeholder=""></el-input>

src/xt_pages/sign/index.vue

@@ -287,7 +287,7 @@ export default {
         if (response.data.data.patientlist != null) {
           var patientlist = response.data.data.patientlist
           this.weigh_list.id = patientlist.id
-          this.weigh_list.dry_weight = patientlist.dry_weight
+          this.weigh_list.dry_weight = patientlist.dry_weight?response.data.data.dryWeight.dry_weight:0
           if (this.weigh_list.dry_weight === 0) {
             this.weigh_list.dry_weight = ''
           }

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -354,7 +354,7 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    <span v-if="org_id!=0 && org_id!=0">
+                    <span v-if="org_id!=0 && org_id!=10480">
                       <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}} </span>
                     <span v-if="is_sys == 0">
                       <span v-if="scope.row.child.length == 1">{{item.retail_price}}</span>