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

           dose_unit:"",//剂量
           dose:"",//剂量单位
           prescribing_number_unit:"",
+          total:"",
         },
 
         rules: {
         form['drug_remark'] = this.form.drug_remark
         form['hosp_appr_flag'] = this.form.hosp_appr_flag
         form['lmt_used_flag'] = this.form.lmt_used_flag
-
+        form['total'] = this.form.total
         form['min_number'] = this.form.min_number
         form["drug_day"] = this.form.drug_day
         form['dose'] = this.form.dose,

src/xt_pages/data/components/consumables.vue

             :value="item.value">
           </el-option>
         </el-select>
-       
+
       </div>
       <div>
         <el-button type="primary" @click="openForm()">新增</el-button>
               packing_price:'',
               default_count_unit:"",
               min_unit:"",
+              total:"",
             },
             isVisibility: false,
 
                 response.data.data.goodInfo.sort.toString()
             }
 
+            if (response.data.data.goodInfo.total <= 0) {
+              this.goodInfo.goodInfoDialog.formValue.total = ''
+            } else {
+              this.goodInfo.goodInfoDialog.formValue.total =
+                      response.data.data.goodInfo.total
+            }
+
 
             if (response.data.data.goodInfo.is_doctor_use <= 0) {
               this.goodInfo.goodInfoDialog.formValue.is_doctor_use = ''
             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.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
+
+
+
           }
         })
       },

src/xt_pages/data/components/drugs.vue

         <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search"
                    @click="searchAction">搜索
         </el-button>
-      
+
        <label class="title"><span class="name">生产厂商</span> : </label>
         <el-select v-model="manufacturer" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeManufacture">
           <el-option
             :value="item.value">
           </el-option>
         </el-select>
-   
+
 
         <span style="color: #909399;font-size:14px;">备案 : &nbsp;</span>
         <el-select v-model="is_record" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeRecord">
       </div>
       <div>
         <el-button type="primary" @click="openForm(0)">新增</el-button>
-       
+
       </div>
 
     </div>
           lmt_used_flag:'',
           dose_unit:'',
           min_price:'',
-          drug_day:"",//默认开药天数
+          drug_day:"",//默认开药天数,
+          total:"",
         },
         tempFormValue: {
           drug_name: '',//药品名称
           packing_unit:"",//包装单位
           packing_price:"",//包装零售价
           drug_day:"",//默认开药天数
+          total:"",
+
         },
 
         current_id: 0,
           console.log("9999999999999999999",val.min_number)
           val.min_number =  parseInt(val.min_number)
           console.log("min_22222222",val)
-         
+
           editBaseDrugLib(val,untit).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
         } else if (val.id == 0) {
           //新增
           console.log("val2222222",val)
-         
+
           createBaseDrugLib(val).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
            console.log("isHasMinUnit",isHasMinUnit)
           var isHasDosage =  header.includes('*剂量')
           console.log("isHasDosage",isHasDosage)
-        
+
           var isHasMaxUnit= header.includes('*剂量单位');
           console.log("isHasMaxUnit",isHasMaxUnit)
           var isHasPackingUnit = header.includes('*包装单位')
           console.log("isHasDrugOriginPlace",isHasDrugOriginPlace)
           var isHasDrugDosageForm = header.includes('*药品剂型');
           console.log("isHasDrugDosageForm",isHasDrugDosageForm)
-      
+
           var isHasUnitMatrixing= header.includes("*单位换算");
           console.log("isHasUnitMatrixing",isHasUnitMatrixing)
           var isHasRetailPrice = header.includes('*拆零零售价');
                obj['max_unit'] = results[i][key].replace(/\s/g,"")
               }
            }
-          
+
             if (results[i]['*包装单位'] === undefined) {
                 obj['packing_unit'] = ''
               } else {
                obj['delivery_way'] = results[i][key].replace(/\s/g,"")
               }
            }
-          
+
            if (results[i]['默认执行频率'] === undefined) {
                 obj['execution_frequency'] = ''
               } else {
                obj['drug_day'] = results[i][key].replace(/\s/g,"")
               }
            }
-          
+
 
 
             if (results[i]['*药品类型'] === undefined) {
            }
 
 
-          
+
 
             if (results[i]['*单位换算'] === undefined) {
                 obj['unit_matrixing'] = ''
               }
            }
 
-          
+
           if (results[i]['*包装零售价'] === undefined) {
                 obj['packing_price'] = ''
               } else {
 
 
 
-          
+
 
            if (results[i]['*默认单次用量'] === undefined) {
                 obj['drug_dose'] = ''
                 obj['dealer'] = results[i][key].replace(/\s/g,"")
               }
            }
-          
+
            if (results[i]['限制性用药'] === undefined) {
                 obj['lmt_used_flag'] = ''
               } else {
                 obj['lmt_used_flag'] = results[i][key].replace(/\s/g,"")
               }
            }
-           
+
 
 
            if (results[i]['药品别名'] === undefined) {
               }
            }
 
-          
+
              if (results[i]['药品类别'] === undefined) {
                 obj['drug_category'] = ''
               } else {
               }
            }
 
-         
+
 
             if (results[i]['审批标志'] === undefined) {
                 obj['hosp_appr_flag'] = ''
                 obj['limit_remark'] = results[i][key].replace(/\s/g,"")
               }
            }
-           
+
          }
          var newArr = [];
          tableData.push(obj);
           'drugs':tableData
         };
         console.log("params222222222",params)
-        
+
         postDrugInformation(params).then(response=>{
            if(response.data.state == 1){
              var msg =  response.data.data.msg;

src/xt_pages/outpatientCharges/components/registerDialog.vue

                 </div>
             </el-form-item>
 
-            <el-form-item label="挂号类型：" prop="register" :validate-event="is_Name">
+            <el-form-item label="挂号类型：" :validate-event="is_Name">
                 <el-select v-model="form.register" placeholder="请选择" style="width:100%;">
                     <el-option
                             v-for="item in register"
           name: [{ required: true, message: '患者姓名不能为空', trigger: 'blur' }],
           gender: [{ required: true, message: '患者性别不能为空', trigger: 'blur' }],
           id_card: [{ required: true, message: '证件号码不能为空', trigger: 'blur' }],
-          register: [{ required: true, message: '请选择挂号类型', trigger: 'blur' }],
           doctor: [{ required: true, message: '请选择医生', trigger: 'blur' }],
           department: [{ required: true, message: '请填写科室', trigger: 'blur' }],
           age: [{ required: true, message: '患者年龄不能为空', trigger: 'blur' }],

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

                   })
 
                 } else {
-                  that.radio = 1
-                  that.$refs.register.hide();
-                  let params = {
-                    'record_date': that.record_date
-                  };
-                  getChargeHisPatientList(params).then(response => {
-                    if (response.data.state == 0) {
-                      that.$message.error(response.data.msg);
-                      return false
-                    } else {
-
-                      that.loadingone = false;
-                      that.$message({ message: '挂号成功', type: 'success' });
-
-                      that.patientTableData = []
-                      that.all_table_data = []
-                      that.hisPatientDatas = []
-                      let one_count = 0
-                      let two_count = 0
-                      let three_count = 0
-                      for (let i = 0; i < response.data.data.list.length; i++) {
-                        if (response.data.data.list[i].his_patient.length == 0) { //没挂号
-                          if (response.data.data.list[i].prescription.length > 0) {
-                            let obj = {
-                              id: response.data.data.list[i].id,
-                              name: response.data.data.list[i].name,
-                              number: '',
-                              order_status: 0,
-                              order_number: '',
-                              his_patient_id: 0
-                            }
-
-                            that.all_table_data.push(obj)
-                          }
-
-                        } else { //挂号
-                          if (response.data.data.list[i].his_patient.length == 1) {
-                            let obj = {
-                              id: response.data.data.list[i].id,
-                              name: response.data.data.list[i].name,
-                              number: response.data.data.list[i].his_patient[0].number,
-                              order_status: response.data.data.list[i].his_patient[0].order.order_status,
-                              his_patient_id: response.data.data.list[i].his_patient[0].id,
-                              order_number: response.data.data.list[i].his_patient[0].order.number,
-                              order_id: response.data.data.list[i].his_patient[0].order.id
-                            }
-                            that.all_table_data.push(obj)
-
-                          }
-
-                          if (response.data.data.list[i].his_patient.length > 1) {
-                            for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
-                              let obj = {
-                                id: response.data.data.list[i].id,
-                                name: response.data.data.list[i].name,
-                                number: response.data.data.list[i].his_patient[b].number,
-                                order_status: response.data.data.list[i].his_patient[b].order.order_status,
-                                his_patient_id: response.data.data.list[i].his_patient[b].id,
-                                order_number: response.data.data.list[i].his_patient[b].order.number,
-                                order_id: response.data.data.list[i].his_patient[b].order.id
-                              }
-                              that.all_table_data.push(obj)
-
-                            }
-                          }
-                        }
-
-                      }
-
-                      for (let i = 0; i < that.all_table_data.length; i++) {
-                        if (that.all_table_data[i].his_patient_id > 0) {
-                          that.hisPatientDatas.push(this.all_table_data[i])
-                        }
-                      }
-
-                      for (let i = 0; i < that.all_table_data.length; i++) {
-                        if (that.all_table_data[i].order_status == 0 || that.all_table_data[i].order_status == 1 || that.all_table_data[i].order_status == 3) {
-                          one_count = one_count + 1
-                          that.patientTableData.push(that.all_table_data[i])
-                        }
-                        if (that.all_table_data[i].order_status == 2) {
-                          two_count = two_count + 1
-                          that.patientTableData.push(that.all_table_data[i])
-                        }
-                      }
-                      that.cal_one = one_count
-                      that.cal_two = two_count
-                      that.cal_three = three_count
-                      that.current_index = 0
-                      for (let i = 0; i < that.patientTableData.length; i++) {
-                        if (that.patientTableData[i].his_patient_id == that.hisPatientInfo.id) {
-                          that.$refs.tab.setCurrentRow(that.patientTableData[i])
-                          that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order_number, that.patientTableData[i].his_patient_id)
-                        }
-                      }
-                      var his_info = response.data.data.his_info
-                      that.hisPatientInfo = his_info
-                    }
-                  })
+                  this.changeRadio(1)
+                  this.$message({ message: '挂号成功', type: 'success', duration: 5000 })
+                  this.$refs.register.hide()
+                  this.loadingone = false
+                  // that.radio = 1
+                  // that.$refs.register.hide();
+                  // let params = {
+                  //   'record_date': that.record_date
+                  // };
+                  // getChargeHisPatientList(params).then(response => {
+                  //   if (response.data.state == 0) {
+                  //     that.$message.error(response.data.msg);
+                  //     return false
+                  //   } else {
+                  //
+                  //     that.loadingone = false;
+                  //     that.$message({ message: '挂号成功', type: 'success' });
+                  //
+                  //     that.patientTableData = []
+                  //     that.all_table_data = []
+                  //     that.hisPatientDatas = []
+                  //     let one_count = 0
+                  //     let two_count = 0
+                  //     let three_count = 0
+                  //     for (let i = 0; i < response.data.data.list.length; i++) {
+                  //       if (response.data.data.list[i].his_patient.length == 0) { //没挂号
+                  //         if (response.data.data.list[i].prescription.length > 0) {
+                  //           let obj = {
+                  //             id: response.data.data.list[i].id,
+                  //             name: response.data.data.list[i].name,
+                  //             number: '',
+                  //             order_status: 0,
+                  //             order_number: '',
+                  //             his_patient_id: 0
+                  //           }
+                  //
+                  //           that.all_table_data.push(obj)
+                  //         }
+                  //
+                  //       } else { //挂号
+                  //         if (response.data.data.list[i].his_patient.length == 1) {
+                  //           let obj = {
+                  //             id: response.data.data.list[i].id,
+                  //             name: response.data.data.list[i].name,
+                  //             number: response.data.data.list[i].his_patient[0].number,
+                  //             order_status: response.data.data.list[i].his_patient[0].order.order_status,
+                  //             his_patient_id: response.data.data.list[i].his_patient[0].id,
+                  //             order_number: response.data.data.list[i].his_patient[0].order.number,
+                  //             order_id: response.data.data.list[i].his_patient[0].order.id
+                  //           }
+                  //           that.all_table_data.push(obj)
+                  //
+                  //         }
+                  //
+                  //         if (response.data.data.list[i].his_patient.length > 1) {
+                  //           for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
+                  //             let obj = {
+                  //               id: response.data.data.list[i].id,
+                  //               name: response.data.data.list[i].name,
+                  //               number: response.data.data.list[i].his_patient[b].number,
+                  //               order_status: response.data.data.list[i].his_patient[b].order.order_status,
+                  //               his_patient_id: response.data.data.list[i].his_patient[b].id,
+                  //               order_number: response.data.data.list[i].his_patient[b].order.number,
+                  //               order_id: response.data.data.list[i].his_patient[b].order.id
+                  //             }
+                  //             that.all_table_data.push(obj)
+                  //
+                  //           }
+                  //         }
+                  //       }
+                  //
+                  //     }
+                  //
+                  //     for (let i = 0; i < that.all_table_data.length; i++) {
+                  //       if (that.all_table_data[i].his_patient_id > 0) {
+                  //         that.hisPatientDatas.push(this.all_table_data[i])
+                  //       }
+                  //     }
+                  //
+                  //     for (let i = 0; i < that.all_table_data.length; i++) {
+                  //       if (that.all_table_data[i].order_status == 0 || that.all_table_data[i].order_status == 1 || that.all_table_data[i].order_status == 3) {
+                  //         one_count = one_count + 1
+                  //         that.patientTableData.push(that.all_table_data[i])
+                  //       }
+                  //       if (that.all_table_data[i].order_status == 2) {
+                  //         two_count = two_count + 1
+                  //         that.patientTableData.push(that.all_table_data[i])
+                  //       }
+                  //     }
+                  //     that.cal_one = one_count
+                  //     that.cal_two = two_count
+                  //     that.cal_three = three_count
+                  //     that.current_index = 0
+                  //     for (let i = 0; i < that.patientTableData.length; i++) {
+                  //       if (that.patientTableData[i].his_patient_id == that.hisPatientInfo.id) {
+                  //         that.$refs.tab.setCurrentRow(that.patientTableData[i])
+                  //         that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order_number, that.patientTableData[i].his_patient_id)
+                  //       }
+                  //     }
+                  //     var his_info = response.data.data.his_info
+                  //     that.hisPatientInfo = his_info
+                  //   }
+                  // })
                 }
               }
             })
               this.$message({ message: '挂号成功', type: 'success', duration: 5000 })
               this.$refs.register.hide()
               this.loadingone = false
-              var his_info = response.data.data.his_info
-              this.hisPatientInfo = his_info
             }
           })
         }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">
-                                                {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}} / {{
-                                                scope.row.total * (scope.row.dose / scope.row.min_number)}}
-                                                {{(scope.row.total * (scope.row.dose /
-                                                scope.row.min_number))?scope.row.max_unit:''}}
+                                                {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}}
+                                                <!--/ {{-->
+                                                <!--scope.row.total * (scope.row.dose / scope.row.min_number)}}-->
+                                                <!--{{(scope.row.total * (scope.row.dose /-->
+                                                <!--scope.row.min_number))?scope.row.max_unit:''}}-->
                                             </template>
                                         </el-table-column>
                                         <el-table-column label="单价" width="40">
             this.doctorValue = hisPatientInfo.doctor
             this.departmentValue = hisPatientInfo.department
           } else {
-            if (admin_info.user_type == 2 || admin_info.user_type == 1) {
+            if (admin_info.user_type == 2) {
               this.doctorValue = admin_info.admin_user_id
               if (admin_info.department_id == 0) {
                 if (this.department.length > 0) {
                 this.prescriptions[i].project[b].price = this.prescriptions[i].project[b].price.toString()
                 this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()
                 this.prescriptions[i].project[b].delivery_way = this.prescriptions[i].project[b].delivery_way.toString()
+                this.prescriptions[i].project[b].single_dose = this.prescriptions[i].project[b].single_dose.toString()
 
               }
 
                   advice_id: 0,
                   id: temp3[b].id,
                   drug_name: temp3[b].advice_name,
-                  single_dose: temp3[b].single_dose,
+                  single_dose: temp3[b].single_dose.toString(),
                   delivery_way: temp3[b].delivery_way,
                   execution_frequency: temp3[b].execution_frequency,
                   retail_price: temp3[b].drug.retail_price.toString(),
                   remark: '',
-                  day: 1,
+                  day: "1",
                   prescribing_number: temp3[b].prescribing_number,
                   single_dose_unit: temp3[b].drug.min_unit,
                   prescribing_number_unit: temp3[b].drug.max_unit,
                   project_id: temp2[b].id,
                   project_name: temp2[b].project_name,
                   statistical_classification: temp2[b].statistical_classification,
-                  single_dose: temp2[b].single_dose,
+                  single_dose: temp2[b].single_dose.toString(),
                   delivery_way: temp2[b].delivery_way,
                   execution_frequency: temp2[b].execution_frequency,
-                  number_days: temp2[b].number_days,
+                  number_days: temp2[b].number_days.toString(),
                   total: temp2[b].total,
                   price: temp2[b].price,
                   remark: '',

src/xt_pages/stock/Dialog/goodInfoDailog.vue

                 </el-option>
               </el-select>
             </el-form-item>
-           
+
            <div style="width:100%;">
               <div><span style="color:red;">*</span>单位&规格: <span style="color:#999">例如：FX80 * 60盒</span></div>
           </div>
                     </el-option>
                   </el-select>
               </el-form-item> -->
-            
+
               <el-form-item prop="packing_unit" class="noMargin">
                 <el-select v-model="form.packing_unit" style="width:160px;" placeholder="包装单位" @change="changePackingUnit">
                   <el-option
                 </el-select>
               </el-form-item>
             </div>
-                       
+
             <el-form-item label="生产厂商 : " prop="manufacturer" style="width:100%">
-             
+
                <el-select v-model="form.manufacturer" style="width:100%;" filterable placeholder="请选择">
                   <el-option
                     v-for="(item,index) in form.manufacturers"
             <el-form-item label="拆零零售价 : " prop="retail_price">
               <el-input v-model="form.retail_price" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
-         
+
             <el-form-item label="进货价 : " prop="buy_price">
               <el-input v-model="form.buy_price" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
                 </el-option>
               </el-select>
             </el-form-item>
-          
+
             <el-form-item label="状态 : " prop="good_status">
               <el-checkbox-group v-model="good_status">
                 <el-checkbox label="停用">停用</el-checkbox>
               </el-select>
             </el-form-item>
 
-          
+
 
             <el-form-item label="特殊医用材料标志:">
               <el-select v-model="form.special_medical " style="width:160px;" placeholder="请选择">
               </el-select>
             </el-form-item>
 
-            
+
 
            <el-form-item label="经销商 : " style="width:100%">
-             
+
                <el-select v-model="form.dealer" style="width:100%;" filterable placeholder="请选择">
                   <el-option
                     v-for="(item,index) in dealer"
       <el-tab-pane label="扩展数据" name="second">
         <el-form :model="form" label-width="120px"
                  style="display: flex;flex-wrap: wrap;justify-content: space-between;">
-         
+
           <el-form-item label="标签:" prop="sign">
             <el-select v-model="form.sign" style="width:160px;" placeholder="请选择">
               <el-option
           <el-form-item label="代理商:" prop="agent">
             <el-input v-model="form.agent" style="width:160px;" placeholder="" maxlength="30"></el-input>
           </el-form-item>
-         
+
           <el-form-item label="耗材编号:" prop="good_number">
             <el-input v-model="form.good_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
           </el-form-item>
           packing_price:'',
           default_count_unit:"",
           min_unit:"",
+          total:"",
         },
 
         rules: {
           if(form.packing_unit == arr[j].name){
               this.unitList.push(arr[j])
             }
-          } 
+          }
           console.log("列表222",this.unitList)
         }
-       
+
         this.visible = true
         this.good_status =[]
         this.getlist()
               packing_price:'',
               default_count_unit:"",
               min_unit:"",
+              total:"",
             }
           this.good_status = []
           for (let key in tempform) {
           });
       },
       getValue: function() {
-        
+
         const form = {}
         form['specification_name'] = this.form.specification_name
         form['good_unit'] = this.form.good_unit
         form["packing_unit"]= this.form.packing_unit
         form["packing_price"] = this.form.packing_price
         form["default_count_unit"] = this.form.default_count_unit
+        form["total"] = this.form.total
+
         return form
       }, changeSelected: function(val) {
         console.log(val)
              page:this.page,
              limit:this.limit
           }
-        
+
         getManufacturerList(params).then(response=>{
            var manufacturerList =   response.data.data.manufacturer
-         
+
            this.manufacturerList = manufacturerList
         })
       },
           return false;
         } else {
           this.dealer = response.data.data.dealer;
-          
+
         }
        });
       },
            this.unitList.push(arr[i])
           }
         }
-        
+
       },
       changePackingUnit(val){
         if(this.form.min_unit == val){
       visible(val) {
         this.form = this.formValue
         this.good_unit = this.formValue.good_unit
-      
+
         if (this.isCreated == 1) {
           this.good_unit = ''
         }