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

src/api/advice.js

@@ -333,9 +333,12 @@ export function PostInitAdviceTemplate(params) {
   })
 }
 
-export function getPrintInfo(data) {
+export function getPrintInfo(data, advice_type, stop_type) {
+  console.log('data', data)
+  console.log('advice_tuype23232', advice_type)
+  console.log('stop_type', stop_type)
   return request({
-    url: '/api/advicetemplate/getprintinfo',
+    url: '/api/advicetemplate/getprintinfo?advice_type=' + advice_type + '&stop_type=' + stop_type,
     method: 'post',
     data: data
   })

src/api/drug/drug.js

@@ -484,3 +484,10 @@ export function getDamagedByDrugId(params) {
   })
 }
 
+export function getInventoryModeList(params) {
+  return request({
+    url: '/api/drug/getinventorymodelist',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/data/components/consumables.vue

@@ -89,9 +89,9 @@
         </template>
 
       </el-table-column>
-      <el-table-column prop="date" label="耗材种类" width="140" align="center">
+      <el-table-column prop="date" label="耗材类型" width="140" align="center">
         <template slot-scope="scope">
-          {{ getGoodKind(scope.row.good_kind) }}
+          {{ getGoodTypeByID(scope.row.good_type_id) }}
         </template>
       </el-table-column>
       <el-table-column label="耗材编号" width="140" align="center">
@@ -313,6 +313,7 @@
               default_count_unit:"",
               min_unit:"",
               total:"",
+              register_number:"",
             },
             isVisibility: false,
 
@@ -703,10 +704,9 @@
             this.goodInfo.goodInfoDialog.formValue.packing_unit = response.data.data.goodInfo.packing_unit
             this.goodInfo.goodInfoDialog.formValue.packing_price = response.data.data.goodInfo.packing_price
             this.goodInfo.goodInfoDialog.formValue.default_count_unit = response.data.data.goodInfo.default_count_unit
+            this.goodInfo.goodInfoDialog.formValue.register_number = response.data.data.goodInfo.register_number
             this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
 
-
-
           }
         })
       },
@@ -858,6 +858,17 @@
       },
       goodInfoDialogCancle: function() {
         this.$refs.addConsumable.hide()
+      },getGoodTypeByID(id){
+        console.log( id)
+
+        let name = ""
+        for(let i = 0;  i < this.goodInfo.goodInfoDialog.formValue.goodType.length;i++){
+          if(this.goodInfo.goodInfoDialog.formValue.goodType[i].id == id){
+            name = this.goodType[i].type_name
+          }
+        }
+        return name
+
       },
       showInfoDialog: function() {
         this.getAllDealer();
@@ -937,6 +948,8 @@
               this.goodInfo.goodInfoDialog.formValue.goodType.push(response.data.data.goodType[i]);
               this.goodType.push(response.data.data.goodType[i])
             }
+            this.getList();
+
           }
         })
       },
@@ -1015,6 +1028,8 @@
         this.goodInfo.goodInfoDialog.formValue.is_doctor_use = '';
         this.goodInfo.goodInfoDialog.formValue.agent = '';
         this.goodInfo.goodInfoDialog.formValue.good_number = '';
+        this.goodInfo.goodInfoDialog.formValue.register_number = '';
+
 
         this.$refs.addConsumable.show(0)
       },
@@ -1468,12 +1483,12 @@
 
     },
     created() {
-      this.getList();
+      this.getAllGoodType();
       this.getAllDealer();
       this.getAllManufacturer();
-      this.getAllGoodType();
       this.goodInfo.goodInfoDialog.formValue.goodUnit = this.$store.getters.good_unit;
       this.getInitializtion()
+
     }
   }
 </script>

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -639,15 +639,15 @@
             }
           }
           //附加收费
-          for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
-            let obj = {
-              id: month_prescriptions[i].addition[a].item_id,
-              price: month_prescriptions[i].addition[a].price
-
-            }
-            additions_ids.push(obj)
-            addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
-          }
+          // for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
+          //   let obj = {
+          //     id: month_prescriptions[i].addition[a].item_id,
+          //     price: month_prescriptions[i].addition[a].price
+          //
+          //   }
+          //   additions_ids.push(obj)
+          //   addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
+          // }
         }
 
         const obj = {}
@@ -1169,16 +1169,16 @@
                 }
 
                 //附加收费
-                for (let b = 0; b < prescription.addition.length; b++) {
-                  let obj = {
-                    id: prescription.addition[b].id,
-                    item_name: prescription.addition[b].item_name,
-                    price: prescription.addition[b].price,
-                    count: prescription.addition[b].count,
-                    item_id: prescription.addition[b].item_id
-                  }
-                  tempAddition.push(obj)
-                }
+                // for (let b = 0; b < prescription.addition.length; b++) {
+                //   let obj = {
+                //     id: prescription.addition[b].id,
+                //     item_name: prescription.addition[b].item_name,
+                //     price: prescription.addition[b].price,
+                //     count: prescription.addition[b].count,
+                //     item_id: prescription.addition[b].item_id
+                //   }
+                //   tempAddition.push(obj)
+                // }
 
                 var preTime = ''
 
@@ -1545,16 +1545,16 @@
                       }
 
                       //附加收费
-                      for (let b = 0; b < prescription.addition.length; b++) {
-                        let obj = {
-                          id: prescription.addition[b].id,
-                          item_name: prescription.addition[b].item_name,
-                          price: prescription.addition[b].price,
-                          count: prescription.addition[b].count,
-                          item_id: prescription.addition[b].item_id
-                        }
-                        tempAddition.push(obj)
-                      }
+                      // for (let b = 0; b < prescription.addition.length; b++) {
+                      //   let obj = {
+                      //     id: prescription.addition[b].id,
+                      //     item_name: prescription.addition[b].item_name,
+                      //     price: prescription.addition[b].price,
+                      //     count: prescription.addition[b].count,
+                      //     item_id: prescription.addition[b].item_id
+                      //   }
+                      //   tempAddition.push(obj)
+                      // }
 
                       var preTime = ''
 
@@ -2021,16 +2021,16 @@
                       }
 
                       //附加收费
-                      for (let b = 0; b < prescription.addition.length; b++) {
-                        let obj = {
-                          id: prescription.addition[b].id,
-                          item_name: prescription.addition[b].item_name,
-                          price: prescription.addition[b].price,
-                          count: prescription.addition[b].count,
-                          item_id: prescription.addition[b].item_id
-                        }
-                        tempAddition.push(obj)
-                      }
+                      // for (let b = 0; b < prescription.addition.length; b++) {
+                      //   let obj = {
+                      //     id: prescription.addition[b].id,
+                      //     item_name: prescription.addition[b].item_name,
+                      //     price: prescription.addition[b].price,
+                      //     count: prescription.addition[b].count,
+                      //     item_id: prescription.addition[b].item_id
+                      //   }
+                      //   tempAddition.push(obj)
+                      // }
 
                       var preTime = ''
 
@@ -2477,16 +2477,16 @@
                     }
 
                     //附加收费
-                    for (let b = 0; b < prescription.addition.length; b++) {
-                      let obj = {
-                        id: prescription.addition[b].id,
-                        item_name: prescription.addition[b].item_name,
-                        price: prescription.addition[b].price,
-                        count: prescription.addition[b].count,
-                        item_id: prescription.addition[b].item_id
-                      }
-                      tempAddition.push(obj)
-                    }
+                    // for (let b = 0; b < prescription.addition.length; b++) {
+                    //   let obj = {
+                    //     id: prescription.addition[b].id,
+                    //     item_name: prescription.addition[b].item_name,
+                    //     price: prescription.addition[b].price,
+                    //     count: prescription.addition[b].count,
+                    //     item_id: prescription.addition[b].item_id
+                    //   }
+                    //   tempAddition.push(obj)
+                    // }
 
                     var preTime = ''
 
@@ -2992,16 +2992,16 @@
                       }
 
                       //附加收费
-                      for (let b = 0; b < prescription.addition.length; b++) {
-                        let obj = {
-                          id: prescription.addition[b].id,
-                          item_name: prescription.addition[b].item_name,
-                          price: prescription.addition[b].price,
-                          count: prescription.addition[b].count,
-                          item_id: prescription.addition[b].item_id
-                        }
-                        tempAddition.push(obj)
-                      }
+                      // for (let b = 0; b < prescription.addition.length; b++) {
+                      //   let obj = {
+                      //     id: prescription.addition[b].id,
+                      //     item_name: prescription.addition[b].item_name,
+                      //     price: prescription.addition[b].price,
+                      //     count: prescription.addition[b].count,
+                      //     item_id: prescription.addition[b].item_id
+                      //   }
+                      //   tempAddition.push(obj)
+                      // }
 
                       var preTime = ''
 
@@ -3537,16 +3537,16 @@
                       }
 
                       //附加收费
-                      for (let b = 0; b < prescription.addition.length; b++) {
-                        let obj = {
-                          id: prescription.addition[b].id,
-                          item_name: prescription.addition[b].item_name,
-                          price: prescription.addition[b].price,
-                          count: prescription.addition[b].count,
-                          item_id: prescription.addition[b].item_id
-                        }
-                        tempAddition.push(obj)
-                      }
+                      // for (let b = 0; b < prescription.addition.length; b++) {
+                      //   let obj = {
+                      //     id: prescription.addition[b].id,
+                      //     item_name: prescription.addition[b].item_name,
+                      //     price: prescription.addition[b].price,
+                      //     count: prescription.addition[b].count,
+                      //     item_id: prescription.addition[b].item_id
+                      //   }
+                      //   tempAddition.push(obj)
+                      // }
 
                       var preTime = ''
 

src/xt_pages/hospitalStation/template/printFour.vue

@@ -2,6 +2,9 @@
   <div id='prescriptionPrint'>
     <div v-for="(item,index) in advicePrint" :key="index">
       <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
+          <!--<div class="printTitle">{{orgname}}处方笺</div>-->
+          <!--<div class="printTitle" v-if="prescriptions[0].med_type == '1111'">{{orgname}}第一类精神药品处方笺</div>-->
+          <!--<div class="printTitle" v-if="prescriptions[0].med_type == '1112'">{{orgname}}第二类精神药品处方笺</div>-->
           <div class="printTitle">{{orgname}}处方笺</div>
           <div class="infoTitle">
               <p>姓名：{{item.patient.name?item.patient.name:""}}</p>

src/xt_pages/hospitalStation/template/printOne.vue

@@ -2,7 +2,11 @@
   <div id='prescriptionPrint'>
     <div v-for="(item,index) in advicePrint" :key="index">
       <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
-          <div class="printTitle">{{orgname}}处方笺</div>
+          <div class="printTitle" v-if="prescriptions[0].med_type == '1111'">{{orgname}}第一类精神药品处方笺</div>
+          <div class="printTitle" v-if="prescriptions[0].med_type == '1112'">{{orgname}}第二类精神药品处方笺</div>
+          <div class="printTitle" v-else>{{orgname}}处方笺</div>
+
+
           <div class="infoTitle">
               <p>姓名：{{item.patient.name?item.patient.name:""}}</p>
               <p>性别：

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -588,8 +588,7 @@
         //   { value: '18', label: '预防接种' },
         //   { value: '19', label: '门诊输血' },
         //   { value: '91', label: '新冠肺炎门诊' },
-        //   { value: '1111', label: '精一' },
-        //   { value: '1112', label: '精二' }
+
         // ],
 
         register: [
@@ -597,6 +596,8 @@
           // { value: 12, label: '门诊挂号' },
           // { value: 13, label: '急诊' },
           { value: 14, label: '门诊特殊病' },
+          { value: '1111', label: '精一' },
+          { value: '1112', label: '精二' }
           // { value: 15, label: '门诊统筹' },
           // { value: 16, label: '门诊慢性病' },
           // { value: 21, label: '普通住院' }
@@ -1948,11 +1949,11 @@
             }
           }
 
-          if (month_prescriptions[i].addition != null) {
-            for (let b = 0; b < month_prescriptions[i].addition.length; b++) {
-              total = parseFloat(total) + parseFloat(month_prescriptions[i].addition[a].price * month_prescriptions[i].addition[b].count)
-            }
-          }
+          // if (month_prescriptions[i].addition != null) {
+          //   for (let b = 0; b < month_prescriptions[i].addition.length; b++) {
+          //     total = parseFloat(total) + parseFloat(month_prescriptions[i].addition[a].price * month_prescriptions[i].addition[b].count)
+          //   }
+          // }
         }
         return total.toFixed(2)
       },
@@ -3044,11 +3045,11 @@
           }
           let project_ids = []
 
-          let additions_ids = []
-          let addition_month_prescriptions = {
-            addition: []
-
-          }
+          // let additions_ids = []
+          // let addition_month_prescriptions = {
+          //   addition: []
+          //
+          // }
           for (let i = 0; i < month_prescriptions.length; i++) {
             if (big_prescriptions[c].med_type == month_prescriptions[i].med_type) {
 
@@ -3075,30 +3076,30 @@
                 }
               }
               //附加收费
-              for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
-                let obj = {
-                  id: month_prescriptions[i].addition[a].item_id,
-                  price: month_prescriptions[i].addition[a].price
-
-                }
-                additions_ids.push(obj)
-                addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
-
-              }
+              // for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
+              //   let obj = {
+              //     id: month_prescriptions[i].addition[a].item_id,
+              //     price: month_prescriptions[i].addition[a].price
+              //
+              //   }
+              //   additions_ids.push(obj)
+              //   addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
+              //
+              // }
               big_prescriptions[c]['drug_ids'] = []
               big_prescriptions[c]['project_ids'] = []
-              big_prescriptions[c]['additions_ids'] = []
+              // big_prescriptions[c]['additions_ids'] = []
               big_prescriptions[c]['drug_month_prescriptions'] = []
               big_prescriptions[c]['project_month_prescriptions'] = []
-              big_prescriptions[c]['addition_month_prescriptions'] = []
+              // big_prescriptions[c]['addition_month_prescriptions'] = []
 
               big_prescriptions[c]['drug_ids'] = drug_ids
               big_prescriptions[c]['project_ids'] = project_ids
-              big_prescriptions[c]['additions_ids'] = additions_ids
+              // big_prescriptions[c]['additions_ids'] = additions_ids
 
               big_prescriptions[c]['drug_month_prescriptions'] = drug_month_prescriptions
               big_prescriptions[c]['project_month_prescriptions'] = project_month_prescriptions
-              big_prescriptions[c]['addition_month_prescriptions'] = addition_month_prescriptions
+              // big_prescriptions[c]['addition_month_prescriptions'] = addition_month_prescriptions
               big_prescriptions[c]['order'] = month_prescriptions[i].order
             }
           }
@@ -3109,11 +3110,11 @@
         for (let y = 0; y < big_prescriptions.length; y++) {
           let drug_ids = this.unique_two(big_prescriptions[y].drug_ids)
           let project_ids = this.unique_two(big_prescriptions[y].project_ids)
-          let additions_ids = this.unique_two(big_prescriptions[y].additions_ids)
+          // let additions_ids = this.unique_two(big_prescriptions[y].additions_ids)
 
           let drugs = []
           let projects = []
-          let additions = []
+          // let additions = []
 
           for (let i = 0; i < drug_ids.length; i++) {
             let obj = {}
@@ -3176,30 +3177,30 @@
             projects.push(obj)
           }
 
-          for (let i = 0; i < additions_ids.length; i++) {
-            let obj = {}
-            let count = 0
-            if (big_prescriptions[y].addition_month_prescriptions.addition) {
-              for (let a = 0; a < big_prescriptions[y].addition_month_prescriptions.addition.length; a++) {
-                if (additions_ids[i].price == big_prescriptions[y].addition_month_prescriptions.addition[a].price && additions_ids[i].id == big_prescriptions[y].addition_month_prescriptions.addition[a].item_id) {
-                  obj['item_name'] = big_prescriptions[y].addition_month_prescriptions.addition[a].item_name
-                  obj['id'] = big_prescriptions[y].addition_month_prescriptions.addition[a].id
-                  obj['item_id'] = big_prescriptions[y].addition_month_prescriptions.addition[a].item_id
-                  count = count + big_prescriptions[y].addition_month_prescriptions.addition[a].count
-                  obj['price'] = parseFloat(big_prescriptions[y].addition_month_prescriptions.addition[a].price)
-                }
-              }
-              obj['count'] = count
-              additions.push(obj)
-            }
-          }
+          // for (let i = 0; i < additions_ids.length; i++) {
+          //   let obj = {}
+          //   let count = 0
+          //   if (big_prescriptions[y].addition_month_prescriptions.addition) {
+          //     for (let a = 0; a < big_prescriptions[y].addition_month_prescriptions.addition.length; a++) {
+          //       if (additions_ids[i].price == big_prescriptions[y].addition_month_prescriptions.addition[a].price && additions_ids[i].id == big_prescriptions[y].addition_month_prescriptions.addition[a].item_id) {
+          //         obj['item_name'] = big_prescriptions[y].addition_month_prescriptions.addition[a].item_name
+          //         obj['id'] = big_prescriptions[y].addition_month_prescriptions.addition[a].id
+          //         obj['item_id'] = big_prescriptions[y].addition_month_prescriptions.addition[a].item_id
+          //         count = count + big_prescriptions[y].addition_month_prescriptions.addition[a].count
+          //         obj['price'] = parseFloat(big_prescriptions[y].addition_month_prescriptions.addition[a].price)
+          //       }
+          //     }
+          //     obj['count'] = count
+          //     additions.push(obj)
+          //   }
+          // }
 
           let p1 = {
             name: this.getPName(big_prescriptions[y].med_type, 1),
             advices: drugs,
             project: [],
             type: 1,
-            addition: additions,
+            // addition: additions,
             order: big_prescriptions[y].order
           }
           let p2 = {
@@ -3207,7 +3208,7 @@
             type: 2,
             project: projects,
             advices: [],
-            addition: [],
+            // addition: [],
             order: big_prescriptions[y].order
 
           }
@@ -3257,7 +3258,12 @@
             break
           case 21:
             return '普通住院' + '处方' + index
-
+            break
+          case 1111:
+            return '精一' + '处方' + index
+            break
+          case 1112:
+            return '精二' + '处方' + index
             break
         }
       }, unique_four(array) {
@@ -3480,16 +3486,16 @@
                       tempProject.push(obj)
                     }
 
-                    for (let b = 0; b < prescription.addition.length; b++) {
-                      const obj = {
-                        id: prescription.addition[b].id,
-                        item_name: prescription.addition[b].item_name,
-                        price: prescription.addition[b].price,
-                        count: prescription.addition[b].count,
-                        item_id: prescription.addition[b].item_id
-                      }
-                      tempAddition.push(obj)
-                    }
+                    // for (let b = 0; b < prescription.addition.length; b++) {
+                    //   const obj = {
+                    //     id: prescription.addition[b].id,
+                    //     item_name: prescription.addition[b].item_name,
+                    //     price: prescription.addition[b].price,
+                    //     count: prescription.addition[b].count,
+                    //     item_id: prescription.addition[b].item_id
+                    //   }
+                    //   tempAddition.push(obj)
+                    // }
                     const index = i + 1
                     console.log('~~~~~~~~')
                     console.log(prescription.order)

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -532,12 +532,10 @@
         end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
         register: [
           { value: 11, label: '普通门诊' },
-          // { value: 12, label: '门诊挂号' },
-          // { value: 13, label: '急诊' },
-          { value: 14, label: '门诊特殊病' }
-          // { value: 15, label: '门诊统筹' },
-          // { value: 16, label: '门诊慢性病' },
-          // { value: 21, label: '普通住院' }
+          { value: 14, label: '门诊特殊病' },
+          { value: 1111, label: '精一' },
+          { value: 1112, label: '精二' }
+
 
         ],
         medical_care: [
@@ -710,16 +708,16 @@
             }
           }
           //附加收费
-          for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
-            let obj = {
-              id: month_prescriptions[i].addition[a].item_id,
-              price: month_prescriptions[i].addition[a].price
-
-            }
-            additions_ids.push(obj)
-            addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
-
-          }
+          // for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
+          //   let obj = {
+          //     id: month_prescriptions[i].addition[a].item_id,
+          //     price: month_prescriptions[i].addition[a].price
+          //
+          //   }
+          //   additions_ids.push(obj)
+          //   addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
+          //
+          // }
 
         }
 
@@ -1127,16 +1125,16 @@
                   }
 
                   //附加收费
-                  for (let b = 0; b < prescription.addition.length; b++) {
-                    let obj = {
-                      id: prescription.addition[b].id,
-                      item_name: prescription.addition[b].item_name,
-                      price: prescription.addition[b].price,
-                      count: prescription.addition[b].count,
-                      item_id: prescription.addition[b].item_id
-                    }
-                    tempAddition.push(obj)
-                  }
+                  // for (let b = 0; b < prescription.addition.length; b++) {
+                  //   let obj = {
+                  //     id: prescription.addition[b].id,
+                  //     item_name: prescription.addition[b].item_name,
+                  //     price: prescription.addition[b].price,
+                  //     count: prescription.addition[b].count,
+                  //     item_id: prescription.addition[b].item_id
+                  //   }
+                  //   tempAddition.push(obj)
+                  // }
 
                   let index = i + 1
                   let obj = {
@@ -1248,16 +1246,16 @@
                   }
 
                   //附加收费
-                  for (let b = 0; b < prescription.addition.length; b++) {
-                    let obj = {
-                      id: prescription.addition[b].id,
-                      item_name: prescription.addition[b].item_name,
-                      price: prescription.addition[b].price,
-                      count: prescription.addition[b].count,
-                      item_id: prescription.addition[b].item_id
-                    }
-                    tempAddition.push(obj)
-                  }
+                  // for (let b = 0; b < prescription.addition.length; b++) {
+                  //   let obj = {
+                  //     id: prescription.addition[b].id,
+                  //     item_name: prescription.addition[b].item_name,
+                  //     price: prescription.addition[b].price,
+                  //     count: prescription.addition[b].count,
+                  //     item_id: prescription.addition[b].item_id
+                  //   }
+                  //   tempAddition.push(obj)
+                  // }
 
                   let index = i + 1
                   let obj = {

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -879,15 +879,15 @@
             }
           }
           //附加收费
-          for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
-            let obj = {
-              id: month_prescriptions[i].addition[a].item_id,
-              price: month_prescriptions[i].addition[a].price
-
-            }
-            additions_ids.push(obj)
-            addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
-          }
+          // for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
+          //   let obj = {
+          //     id: month_prescriptions[i].addition[a].item_id,
+          //     price: month_prescriptions[i].addition[a].price
+          //
+          //   }
+          //   additions_ids.push(obj)
+          //   addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
+          // }
         }
 
         const obj = {}
@@ -1193,7 +1193,7 @@
             }
             this.drugs = drugs
             console.log("五一劳动节2332323322332",this.drugs)
-          
+
             this.allDrugs = response.data.data.drugs
             this.advices_template = response.data.data.advices_template
 
@@ -1470,16 +1470,16 @@
                 }
 
                 //附加收费
-                for (let b = 0; b < prescription.addition.length; b++) {
-                  let obj = {
-                    id: prescription.addition[b].id,
-                    item_name: prescription.addition[b].item_name,
-                    price: prescription.addition[b].price,
-                    count: prescription.addition[b].count,
-                    item_id: prescription.addition[b].item_id
-                  }
-                  tempAddition.push(obj)
-                }
+                // for (let b = 0; b < prescription.addition.length; b++) {
+                //   let obj = {
+                //     id: prescription.addition[b].id,
+                //     item_name: prescription.addition[b].item_name,
+                //     price: prescription.addition[b].price,
+                //     count: prescription.addition[b].count,
+                //     item_id: prescription.addition[b].item_id
+                //   }
+                //   tempAddition.push(obj)
+                // }
 
                 var preTime = ''
 
@@ -1867,16 +1867,16 @@
                       }
 
                       //附加收费
-                      for (let b = 0; b < prescription.addition.length; b++) {
-                        let obj = {
-                          id: prescription.addition[b].id,
-                          item_name: prescription.addition[b].item_name,
-                          price: prescription.addition[b].price,
-                          count: prescription.addition[b].count,
-                          item_id: prescription.addition[b].item_id
-                        }
-                        tempAddition.push(obj)
-                      }
+                      // for (let b = 0; b < prescription.addition.length; b++) {
+                      //   let obj = {
+                      //     id: prescription.addition[b].id,
+                      //     item_name: prescription.addition[b].item_name,
+                      //     price: prescription.addition[b].price,
+                      //     count: prescription.addition[b].count,
+                      //     item_id: prescription.addition[b].item_id
+                      //   }
+                      //   tempAddition.push(obj)
+                      // }
 
                       var preTime = ''
 
@@ -2366,16 +2366,16 @@
                       }
 
                       //附加收费
-                      for (let b = 0; b < prescription.addition.length; b++) {
-                        let obj = {
-                          id: prescription.addition[b].id,
-                          item_name: prescription.addition[b].item_name,
-                          price: prescription.addition[b].price,
-                          count: prescription.addition[b].count,
-                          item_id: prescription.addition[b].item_id
-                        }
-                        tempAddition.push(obj)
-                      }
+                      // for (let b = 0; b < prescription.addition.length; b++) {
+                      //   let obj = {
+                      //     id: prescription.addition[b].id,
+                      //     item_name: prescription.addition[b].item_name,
+                      //     price: prescription.addition[b].price,
+                      //     count: prescription.addition[b].count,
+                      //     item_id: prescription.addition[b].item_id
+                      //   }
+                      //   tempAddition.push(obj)
+                      // }
 
                       var preTime = ''
 
@@ -2844,16 +2844,16 @@
                     }
 
                     //附加收费
-                    for (let b = 0; b < prescription.addition.length; b++) {
-                      let obj = {
-                        id: prescription.addition[b].id,
-                        item_name: prescription.addition[b].item_name,
-                        price: prescription.addition[b].price,
-                        count: prescription.addition[b].count,
-                        item_id: prescription.addition[b].item_id
-                      }
-                      tempAddition.push(obj)
-                    }
+                    // for (let b = 0; b < prescription.addition.length; b++) {
+                    //   let obj = {
+                    //     id: prescription.addition[b].id,
+                    //     item_name: prescription.addition[b].item_name,
+                    //     price: prescription.addition[b].price,
+                    //     count: prescription.addition[b].count,
+                    //     item_id: prescription.addition[b].item_id
+                    //   }
+                    //   tempAddition.push(obj)
+                    // }
 
                     var preTime = ''
 
@@ -3382,16 +3382,16 @@
                       }
 
                       //附加收费
-                      for (let b = 0; b < prescription.addition.length; b++) {
-                        let obj = {
-                          id: prescription.addition[b].id,
-                          item_name: prescription.addition[b].item_name,
-                          price: prescription.addition[b].price,
-                          count: prescription.addition[b].count,
-                          item_id: prescription.addition[b].item_id
-                        }
-                        tempAddition.push(obj)
-                      }
+                      // for (let b = 0; b < prescription.addition.length; b++) {
+                      //   let obj = {
+                      //     id: prescription.addition[b].id,
+                      //     item_name: prescription.addition[b].item_name,
+                      //     price: prescription.addition[b].price,
+                      //     count: prescription.addition[b].count,
+                      //     item_id: prescription.addition[b].item_id
+                      //   }
+                      //   tempAddition.push(obj)
+                      // }
 
                       var preTime = ''
 
@@ -3950,16 +3950,16 @@
                       }
 
                       //附加收费
-                      for (let b = 0; b < prescription.addition.length; b++) {
-                        let obj = {
-                          id: prescription.addition[b].id,
-                          item_name: prescription.addition[b].item_name,
-                          price: prescription.addition[b].price,
-                          count: prescription.addition[b].count,
-                          item_id: prescription.addition[b].item_id
-                        }
-                        tempAddition.push(obj)
-                      }
+                      // for (let b = 0; b < prescription.addition.length; b++) {
+                      //   let obj = {
+                      //     id: prescription.addition[b].id,
+                      //     item_name: prescription.addition[b].item_name,
+                      //     price: prescription.addition[b].price,
+                      //     count: prescription.addition[b].count,
+                      //     item_id: prescription.addition[b].item_id
+                      //   }
+                      //   tempAddition.push(obj)
+                      // }
 
                       var preTime = ''
 
@@ -4623,8 +4623,8 @@
       // this.other_sick = this.getDictionaryDataConfig('system', 'other_sick_history')
       let tableHeight = document.body.clientHeight - 263
       this.tableHeight = tableHeight
-      this.org_id = this.$store.getters.xt_user.template_info.org_id 
-     
+      this.org_id = this.$store.getters.xt_user.template_info.org_id
+
     },
 
     mounted() {

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -2,7 +2,10 @@
   <div id='prescriptionPrint'>
     <div v-for="(item,index) in advicePrint" :key="index">
       <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
-          <div class="printTitle">{{orgname}}处方笺</div>
+          <div class="printTitle" v-if="prescriptions[0].med_type == '1111'">{{orgname}}第一类精神处方笺</div>
+          <div class="printTitle"  v-if="prescriptions[0].med_type == '1112'">{{orgname}}第二类精神处方笺</div>
+          <div class="printTitle" v-if="prescriptions[0].med_type != '1111' && prescriptions[0].med_type != '1112'">{{orgname}}处方笺</div>
+          <!--<div class="printTitle">{{orgname}}处方笺</div>-->
           <div class="infoTitle">
               <p>姓名：{{item.patient.name?item.patient.name:""}}</p>
               <p>性别：

src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue

@@ -469,10 +469,11 @@ export default {
          this.DialysisData[i].index = i+1
          this.DialysisData[i].dialysis_mode = this.getModeIdCount(this.DialysisData[i].patient_id)
          this.DialysisData[i].age = this.getAge(this.DialysisData[i].id_card_no)
+         this.DialysisData[i].total_count = this.getDialysisCount(this.DialysisData[i].patient_id)
        }
        import('@/vendor/Export2Excel').then(excel => {
         const tHeader = ['序号','姓名', '年龄', '透析号','透析模式','透析总次数']
-        const filterVal = ['index','name', 'age', 'dialysis_no','dialysis_mode','total_dialysis']
+        const filterVal = ['index','name', 'age', 'dialysis_no','dialysis_mode','total_count']
         
         const data = this.formatJson(filterVal, this.DialysisData)
        

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -45,8 +45,8 @@
               </el-select>
             </el-form-item>
 
-           
-        
+
+
             <el-form-item label="规格型号 : " prop="specification_name">
               <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
             </el-form-item>
@@ -191,6 +191,12 @@
            </el-form-item>
 
 
+            <el-form-item label="注册编码:" >
+              <el-input v-model="form.register_number" style="width:180px"></el-input>
+            </el-form-item>
+
+
+
             <el-form-item label="备注 : " prop="name" style="width:100%;">
               <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
             </el-form-item>
@@ -359,6 +365,7 @@
           default_count_unit:"",
           min_unit:"",
           total:"",
+          register_number:"",
         },
 
         rules: {
@@ -576,6 +583,8 @@
         form["packing_price"] = this.form.packing_price
         form["default_count_unit"] = this.form.default_count_unit
         form["total"] = this.form.total
+        form["register_number"] = this.form.register_number
+
 
         return form
       }, changeSelected: function(val) {

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -18,6 +18,9 @@
                 >搜索</el-button
                 >
             </div>
+            <div>
+               <el-button size="small" type="primary" @click="print">盘点模版打印</el-button>
+            </div>
             <!-- <div>
                 <el-button size="small" type="primary" @click="print">打印</el-button>
                 <el-button size="small" type="primary">导出</el-button>
@@ -122,8 +125,7 @@ export default {
           this.getlist()
         },
         print(){
-            this.$router.push({path:'/stock/drugs/inventoryPrint'})
-            
+            this.$router.push({path:'/stock/drugs/inventoryPrint'}) 
         },
         handleSizeChange(val){
          this.limit = val

src/xt_pages/stock/drugs/inventoryPrint.vue

@@ -10,40 +10,34 @@
         </div>
         <div class="app-container" style="background-color: white;">
             <div id="print_content">
-                <div class="printTitle">库存盘点核单数</div>
-                <div style="float:right;">调价日期：</div>
+               
                 <table class="printTable" border="1">
                     <tr>
                         <td>序号</td>
-                        <td>药品名称</td>
+                        <td>名称</td>
                         <td>规格</td>
+                        <td>批号</td>
+                        <td>生产日期</td>
+                        <td>有效日期</td>
+                        <td>生产企业</td>
+                        <td>国药准字</td>
                         <td>单位</td>
-                        <td>零售价</td>
-                        <td>当前库存</td>
-                        <td>盘点数</td>
-                        <td>亏损金额</td>
+                        <td>库存量</td>
                     </tr>
                     <tr v-for="(item,index) in tableData" :key="index">
                         <td>{{index+1}}</td>
                         <td>{{item.drug_name}}</td>
-                        <td>{{item.warehouseing_unit}}</td>
-                        <td>{{item.retail_price}}</td>
-                        <td>{{item.total}}</td>
-                        <td>{{item.count}}</td>
-                        <td></td>       
+                        <td>{{item.specification_name}}</td>
+                        <td>{{item.batch_number}}</td>
+                        <td>{{getTime(item.product_date)}}</td>
+                        <td>{{getTime(item.product_date)}}</td>
+                        <td>{{getManufacturerName(item.manufacturer)}}</td>
+                        <td>{{item.number}}</td>
+                        <td>{{item.max_unit}}</td>  
+                        <td></td>     
                     </tr>
                 </table>
-                <div style="margin-top:10px;">
-                    <span>合计：库存金额</span>
-                    <span>    库存盘点金额：亏损总计</span>
-                </div>
-                <div style="display:flex;float:right;margin-top:10px;border-top:1px solid #000;padding-top:10px;width:100%;">
-                    <div style="width:80px;">审批：</div><div style="width:100px;"></div>
-                    <div style="width:100px;">药材主任：</div><div style="width:60px;"></div>
-                    <div style="width:50px;">会计：</div><div style="width:100px;"></div>
-                    <div style="width:50px;">审核：</div><div style="width:100px;"></div>
-                    <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
-                </div>
+              
             </div>
         </div>
     </div>
@@ -53,7 +47,7 @@
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 const moment = require('moment');
 import { uParseTime } from '@/utils/tools'
-import { getDrugInventoryPrintList } from "@/api/drug/drug"
+import { getInventoryModeList } from "@/api/drug/drug"
 export default {
     components:{
         BreadCrumb
@@ -66,7 +60,8 @@ export default {
             { path: false, name: '药品盘点打印' },
           ],
           ids:"",
-          tableData:[]
+          tableData:[],
+          manufacturerList:[],
         }
     },
     methods:{
@@ -80,22 +75,42 @@ export default {
             scanStyles: false
             })
         },
-        getDrugInventoryPrintList(ids){
-             var params = {
-                 ids:ids,
+        getlist(){
+          getInventoryModeList().then(response=>{
+             if(response.data.state == 1){
+               var list = response.data.data.list
+               console.log("list23232323",list)
+               this.manufacturerList = response.data.data.manufacturerList
+               for(let i=0;i<list.length;i++){
+                 list[i].specification_name = ""
+                 list[i].specification_name = list[i].dose +list[i].dose_unit+"*"+list[i].min_number+ list[i].min_unit+"/"+list[i].max_unit
+               }
+               this.tableData = list
              }
-          console.log("parasm2232",params)
-          getDrugInventoryPrintList(params).then(response=>{
-              if(response.data.state == 1){
-                 this.tableData = response.data.data.list
-              }
-          })    
+          })
+        },
+     getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
+      getManufacturerName(id){
+        var name = ""
+        for(let i=0;i<this.manufacturerList.length;i++){
+          if(id == this.manufacturerList[i].id){
+             name = this.manufacturerList[i].manufacturer_name
+          }
+          return name
         }
-
-    },
+      }
+     },
     created(){
-      this.ids = this.$route.query.ids
-      this.getDrugInventoryPrintList(this.ids)
+      this.getlist()
     }
 }
 </script>

src/xt_pages/stock/inventoryPrint.vue

@@ -33,7 +33,7 @@
                         <td>{{getTime(item.expiry_date)}}</td>
                         <td>{{getManufacturerName(item.manufacturer)}}</td>
                         <td>{{item.remark}}</td>
-                        <td>{{item.warehousing_unit}}</td>
+                        <td>{{item.packing_unit}}</td>
                         <td></td>
                     </tr>
                 </table>

src/xt_pages/user/doctorAdvice.vue

@@ -4355,7 +4355,9 @@ export default {
     },
     // 获取勾选中的行
     getPrintInfo(ids) {
-      getPrintInfo({ ids: ids}).then(response => {
+      console.log("23332332323232",this.adviceType,"33333333",this.stopType)
+     
+      getPrintInfo({ids:ids},this.adviceType,this.stopType).then(response => {
         if (response.data.state === 1) {
           var doctoradvice = response.data.data.doctoradvice;
           console.log("doctoradvice", doctoradvice);

src/xt_pages/user/patients.vue

@@ -1336,6 +1336,7 @@
         return new Date(time).getTime() / 1000
       },
       search() {
+        this.listQuery.limit = 700
         this.listQuery.keywords = this.searchKey
         this.getList()
       },

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -148,10 +148,10 @@
           <span v-if="org_id!=9987" >
              <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus!=''">
                 <span v-if="org_id!=10131&& org_id !=10215">{{ scope.row.dialysissolution.dialyzer_perfusion_apparatus }}</span>
-                <span v-if="org_id==10131 || org_id == 10215">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id,scope.row.mode_id,scope.row.solution)  }}</span>
+                <span v-if="org_id==10131 || org_id == 10215">{{scope.row.dialysissolution.dialyzer_perfusion_apparatus}}</span>
               
               </span>
-             <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus =='' && scope.row.dialysissolution.length>0 ">{{ getDialysisDialyszerPerfusion(scope.row.patient_id) }}</span>
+             <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus =='' && scope.row.dialysissolution.length>0 ">{{ scope.row.dialysissolution.dialysis_dialyszers}}</span>
           </span>
           {{scope.row.dialysissolution.dialysis_dialyszers}}
          <span v-if="scope.row.dialysissolution.dialysis_dialyszers!='' && scope.row.dialysissolution.dialysis_irrigation!=''">/</span>

src/xt_pages/workforce/components/tableWeeks.vue

@@ -224,9 +224,9 @@
                 <span>{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
           </span>
 
-          <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus==''&& scope.row.dialysissolution.id > 0 ">{{getDialysisDialyszerPerfusion(scope.row.patient_id)}}</span>
+          <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus==''&& scope.row.dialysissolution.id > 0 ">{{scope.row.dialysissolution.dialysis_dialyszers}}</span>
           </span>
-                    <span v-if="org_id==10131 || org_id == 10215 || org_id == 10233">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id,scope.row.mode_id,scope.row.solution)}}</span>
+                    <span v-if="org_id==10131 || org_id == 10215 || org_id == 10233">{{scope.row.dialysissolution.dialyzer_perfusion_apparatus}}</span>
                     {{scope.row.prescription.dialysis_dialyszers}}
                     <span v-if="scope.row.prescription.dialysis_dialyszers!='' && scope.row.prescription.dialysis_irrigation!=''">/</span>
                     <span v-if="scope.row.prescription.dialysis_irrigation!=''">{{scope.row.prescription.dialysis_irrigation}}</span>

src/xt_pages/workforce/next_remind_print.vue

@@ -64,9 +64,9 @@
                  <span v-if="org_id!=9987">
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''">
                         <span v-if="org_id!=10131 && org_id!=10215">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
-                         <span v-if="org_id==10131 || org_id==9671 || org_id == 10215">{{getDialysisDialyszerPerfusionOne(main_collection.patient_id,main_collection.mode_id,main_collection.solution)  }}</span>
+                         <span v-if="org_id==10131 || org_id==9671 || org_id == 10215">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus }}</span>
                      </span>
-                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span>
+                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{main_collection.dialysissolution.dialysis_dialyszers}}</span>
                   </span>
                   {{main_collection.prescription.dialysis_dialyszers}}
                   <span v-if="main_collection.prescription.dialysis_dialyszers!='' && main_collection.prescription.dialysis_irrigation!=''">/</span>

src/xt_pages/workforce/remind_print.vue

@@ -65,9 +65,9 @@
                      <span > 
                        <span v-if="org_id!=10131 && org_id!=10215 && org_id!=10233 && main_collection.prescription.dialyzer_perfusion_apparatus!=''">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
                      
-                       <span v-if="org_id==10131 || org_id==9671 || org_id == 10215 || org_id == 10233">{{getDialysisDialyszerPerfusionOne(main_collection.patient_id,main_collection.mode_id,main_collection.solution)}}</span>
+                       <span v-if="org_id==10131 || org_id==9671 || org_id == 10215 || org_id == 10233">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
                       </span>
-                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span> 
+                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span> 
                   </span>
                     {{main_collection.prescription.dialysis_dialyszers}}
                   <span v-if="main_collection.prescription.dialysis_dialyszers!=''&& main_collection.prescription.dialysis_irrigation!='' ">/</span>