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

@@ -14,8 +14,8 @@
         <div class='dialysisPage'>
           <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 " >
             <printOne v-if="org_id != 10088 && org_id != 10510 && org_id != 0" :paramsObj="invoiceParams"></printOne>
-            <printThree v-if="org_id == 10088 " :paramsObj="invoiceParams"></printThree>
-            <printfifteen v-if="org_id == 10510 || org_id == 0" :paramsObj="invoiceParams"></printfifteen>
+            <printThree v-if="org_id == 10088 || org_id == 10510 || org_id == 0" :paramsObj="invoiceParams"></printThree>
+            <!-- <printfifteen v-if="org_id == 10510 || org_id == 0" :paramsObj="invoiceParams"></printfifteen> -->
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
@@ -45,11 +45,13 @@
         <print-ten :paramsObj="invoiceParams"></print-ten>
       </div>
     </div>
+
     <!-- <div class="app-container" v-if="org_id == 10567 ">
       <div class='dialysisPage'>
         <printfourteen :paramsObj="invoiceParams"></printfourteen>
       </div>
     </div> -->
+
     <!-- <div class="app-container" style="padding-top:30px;" v-if="org_id == 10188 || org_id == 0 ">
       <div class='dialysisPage'>
         <printthirteen  :paramsObj="invoiceParams"></printthirteen>
@@ -77,7 +79,7 @@
   import PrintEleven from './invoiceTemplate/printEleven'
   import printtwelve from './invoiceTemplate/printtwelve'
   import printthirteen from './invoiceTemplate/printthirteen'
-  // import printfourteen from './invoiceTemplate/printfourteen'
+  import printfourteen from './invoiceTemplate/printfourteen'
   import printfifteen from './invoiceTemplate/printfifteen'
   export default {
     name: "invoicePrint",
@@ -95,6 +97,7 @@
       PrintTen,
       printtwelve,
       printthirteen,
+      printfourteen,
       printfifteen
     },
     props:{

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>