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

src/xt_pages/data/components/consumables.vue

         </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">
               default_count_unit:"",
               min_unit:"",
               total:"",
+              register_number:"",
             },
             isVisibility: false,
 
             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)
 
-
-
           }
         })
       },
       },
       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();
               this.goodInfo.goodInfoDialog.formValue.goodType.push(response.data.data.goodType[i]);
               this.goodType.push(response.data.data.goodType[i])
             }
+            this.getList();
+
           }
         })
       },
         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)
       },
 
     },
     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/template/printFour.vue

   <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

   <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

         //   { value: '18', label: '预防接种' },
         //   { value: '19', label: '门诊输血' },
         //   { value: '91', label: '新冠肺炎门诊' },
-        //   { value: '1111', label: '精一' },
-        //   { value: '1112', label: '精二' }
+
         // ],
 
         register: [
           // { value: 12, label: '门诊挂号' },
           // { value: 13, label: '急诊' },
           { value: 14, label: '门诊特殊病' },
+          { value: '1111', label: '精一' },
+          { value: '1112', label: '精二' }
           // { value: 15, label: '门诊统筹' },
           // { value: 16, label: '门诊慢性病' },
           // { value: 21, label: '普通住院' }
             }
           }
 
-          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)
       },
           }
           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) {
 
                 }
               }
               //附加收费
-              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
             }
           }
         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 = {}
             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 = {
             type: 2,
             project: projects,
             advices: [],
-            addition: [],
+            // addition: [],
             order: big_prescriptions[y].order
 
           }
             break
           case 21:
             return '普通住院' + '处方' + index
-
+            break
+          case 1111:
+            return '精一' + '处方' + index
+            break
+          case 1112:
+            return '精二' + '处方' + index
             break
         }
       }, unique_four(array) {
                       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

         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: [
             }
           }
           //附加收费
-          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])
+          //
+          // }
 
         }
 
                   }
 
                   //附加收费
-                  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 = {
                   }
 
                   //附加收费
-                  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

             }
           }
           //附加收费
-          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 = {}
             }
             this.drugs = drugs
             console.log("五一劳动节2332323322332",this.drugs)
-          
+
             this.allDrugs = response.data.data.drugs
             this.advices_template = response.data.data.advices_template
 
                 }
 
                 //附加收费
-                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 = ''
 
                       }
 
                       //附加收费
-                      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 = ''
 
                       }
 
                       //附加收费
-                      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 = ''
 
                     }
 
                     //附加收费
-                    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 = ''
 
                       }
 
                       //附加收费
-                      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 = ''
 
                       }
 
                       //附加收费
-                      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 = ''
 
       // 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

   <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/stock/Dialog/goodInfoDailog.vue

               </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>
            </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>
           default_count_unit:"",
           min_unit:"",
           total:"",
+          register_number:"",
         },
 
         rules: {
         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) {