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

                             <el-input v-model="form.drug_name" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
                         </el-form-item>
-                      
+
                         <el-form-item label="药品别名 : ">
                             <el-input v-model="form.drug_alias" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
                         </el-form-item>
-                        
+
                         <el-form-item label="药品类别 : " prop="drug_category">
                             <el-select v-model="form.drug_category" style="width:160px;" placeholder="请选择">
                                 <el-option
                         </div>
                         <div style="width:100%;display:flex;align-items:center;margin-left:120px;">
                             <el-form-item prop="dose" class="noMargin">
-                              <el-input v-model="form.dose" type="number" style="width:100px;margin-right:5px;" placeholder="剂量" :disabled="dosageShow"></el-input>  
+                              <el-input v-model="form.dose" type="number" style="width:100px;margin-right:5px;" placeholder="剂量" :disabled="dosageShow"></el-input>
                             </el-form-item>
                             <el-form-item prop="dose_unit" class="noMargin">
                               <el-select v-model="form.dose_unit" style="width:160px;" placeholder="剂量单位" @change="changeMaxUnit">
                             </el-select>
                           </el-form-item>
                         </div>
-                       
-                        
+
+
                         <el-form-item label="药品类型 : " prop="drug_type">
                             <el-select v-model="form.drug_type" style="width:160px;" placeholder="请选择">
                                 <el-option
                             </el-option>
                         </el-select>
                     </el-form-item>
-                  
+
                     <el-form-item label="默认单次用量 : " prop="drug_dose">
                          <el-input v-model="form.drug_dose" style="width:70px;margin-right:5px;" placeholder=""
                                       maxlength="30"></el-input>
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                       
+
                         <el-form-item label="单位换算 : ">
                             <el-input v-model="form.unit_matrixing" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                      
+
 
 
                         <el-form-item label="限制性用药 : ">
                                       maxlength="30"></el-input>
                         </el-form-item>
                         <el-form-item label="生产厂商 : " prop="manufacturer">
-                           
+
                             <el-select v-model="form.manufacturer" style="width:160px;" filterable placeholder="请选择">
                                 <el-option
                                         v-for="(item,index) in manufacturerList"
                         <el-form-item label="药品备注:">
                             <el-input v-model="form.drug_remark" style="width:160px"></el-input>
                         </el-form-item>
-                      
+
                         <el-form-item label="经销商: " style="width:100%">
 
                             <el-select v-model="form.dealer" style="width:100%;" filterable placeholder="请选择">
             <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="label">
                         <el-select v-model="form.label" style="width:160px;" placeholder="请选择">
                             <el-option
           drug_name: [{ required: true, message: '请填写药品名称', trigger: 'blur' }],
           drug_alias: [{ required: true, message: '请选择药品类别', trigger: 'change' }],
           // drug_spec: [{ required: true, message: '请填写药品规格', trigger: 'blur' }],
-          dosage:[{required:true,message:'请输入药品剂量',trigger:'blur'}],
-          max_unit: [{ required: true, message: '请填写剂量单位', trigger: 'change' }],
+          dose:[{required:true,message:'请输入剂量',trigger:'blur'}],
+          dose_unit:[{required:true,message:"请填写剂量",trigger:'blur'}],
+          max_unit: [{ required: true, message: '请填写包装单位', trigger: 'change' }],
           min_unit: [{ required: true, message: '请填写拆零单位', trigger: 'change' }],
           unval:[{required:true,message:"请填写拆零",trigger:'change'}],
           min_number:[{required:true,message:"请填写拆零",trigger:'change'}],
           drug_origin_place: [{ required: true, message: '请填写产地', trigger: 'blur' }],
           drug_dosage_form: [{ required: true, message: '请填写药品剂型', trigger: 'blur' }],
           medical_insurance_level: [{ required: true, message: '请选择医保等级', trigger: 'change' }],
-         
+
           unit_matrixing: [{ required: true, message: '请填写单位换算', trigger: 'blur' }],
           retail_price: [{ required: true, message: '请填写拆零零售价', trigger: 'blur' }],
           last_price: [{ required: true, message: '请填写进货价', trigger: 'blur' }],
           drug_remark: [{ required: true, message: '请填写药品备注' }],
           lmt_used_flag:[{ required: true, message: '请选择是否限制用药' }],
           hosp_appr_flag:[{ required: true, message: '请选择审批标志' }],
-      
+
         },
         page: 1,
         limit: 500,
         type: Number,
         default: 1
       },
-     
+
 
     },
     methods: {
         this.$refs[formName].validate((valid) => {
           console.log(valid)
           if (valid) {
-            console.log(1111,this.getValue())
+            // console.log(1111,this.getValue())
             this.$emit('dialog-comfirm', this.getValue())
           }
         })
         this.form.intro = ''
       },
       show(id, obj) {
-        
+
         this.unitList = []
         var arr =  getDataConfig('hemodialysis','units')
         for(let i=0;i<arr.length;i++){
         }else{
           obj.drug_classify = parseInt(obj.drug_classify)
         }
-       
+
         if(obj.dealer == 0){
            obj.dealer = ""
         }
-        
+
         this.visible = true
         if (id == 0) {
           this.formTitle = '新增'
         this.form.prescription_mark = ''
         this.form.record_date = ''
         this.form.drug_remark = ''
-
+        this.form.dose = ''
+        this.form.dose_unit = ""
+        this.form.min_number= ""
+        this.form.min_unit = ""
+        this.form.max_unit = ""
+        this.form.min_price = ""
         this.visible = false
       },
       getValue: function() {
 
         getManufacturerList(params).then(response => {
           var manufacturerList = response.data.data.manufacturer
-         
+
           this.manufacturerList = manufacturerList
         })
       },
         getInitializtion().then(response=>{
            if(response.data.state ==1){
              var drugCategoryList =  response.data.data.drugCategoryList
-            
+
              this.drugCategoryList = drugCategoryList
              var drugTypeList = response.data.data.drugTypeList
-             
+
               this.drugTypeList = drugTypeList
              var drugDosageFormList =  response.data.data.drugDosageFormList
-            
+
              this.drugDosageFormList = drugDosageFormList
              var medicalInsuranceLevelList =  response.data.data.medicalInsuranceLevelList
-           
+
              this.medicalInsuranceLevelList = medicalInsuranceLevelList
              var drugControlList = response.data.data.drugControlList
-             
+
              this.drugControlList = drugControlList
              var drugClassifyList = response.data.data.drugClassifyList
-           
+
              this.drugClassifyList = drugClassifyList
              var statisticsCategoryList =  response.data.data.statisticsCategoryList
-            
+
              this.statisticsCategoryList = statisticsCategoryList
              var pharmacologyCategoryList = response.data.data.pharmacologyCategoryList
-           
+
              this.pharmacologyCategoryList = pharmacologyCategoryList
            }
         })
           this.dosageShow = true
         }
         if(val !=this.form.min_unit){
-          this.dosageShow = false 
-        } 
+          this.dosageShow = false
+        }
         var arr =  getDataConfig('hemodialysis','units')
         this.unitList = []
         for(let i=0;i<arr.length;i++){
-            
+
           if(this.form.min_unit == arr[i].name){
             this.unitList.push(arr[i])
           }
               this.unitList.push(arr[i])
             }
           }
-          
+
         }
         let ojb = {};
         this.unitList = this.unitList.reduce(function(prevArr, currentItem) {
             ojb[currentItem.name] ? '' : ojb[currentItem.name] = true && prevArr.push(currentItem);
             return prevArr
         }, [])
-               
+
       },
       changeMinUnit(val){
         if(val == this.form.max_unit){
         if(val != this.form.max_unit){
           this.dosageShow = false
         }
-        
+
         // if(this.form.dosage == "" || this.form.max_unit == ""){
         //    this.form.min_number = 1
-        // } 
+        // }
         var arr = getDataConfig('hemodialysis','units')
         this.unitList = []
         for(let i=0;i<arr.length;i++){
           ojb[currentItem.name] ? '' : ojb[currentItem.name] = true && prevArr.push(currentItem);
           return prevArr
         }, [])
-       
+
       }
     }, watch: {
       visible(val) {
        //获取所有经销商
       this.GetAllConfig()
       this.getlist()
-      
-      
-     
+
+
+
     }
   }
 </script>

src/xt_pages/stock/Dialog/goodInfoDailog.vue

             <el-form-item label="耗材名称 : " prop="good_name" style="width:100%">
               <el-input v-model="form.good_name" placeholder="" maxlength="30"></el-input>
             </el-form-item>
-            <el-form-item label="拼音 : " prop="pinyin" style="width:50%">
+            <!-- <el-form-item label="拼音 : " prop="pinyin" style="width:50%">
               <el-input v-model="form.pinyin" placeholder="" maxlength="30"></el-input>
             </el-form-item>
             <el-form-item label="五笔 : " prop="wubi" style="width:50%">
               <el-input v-model="form.wubi" placeholder="" maxlength="30"></el-input>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="耗材种类 : " prop="good_kind">
               <el-select v-model="form.good_kind" style="width:160px;" placeholder="请选择">
                 <el-option
             </el-form-item>
            
            <div style="width:100%;">
-              <div><span style="color:red;">*</span>单位&规格: <span style="color:#999">例如：0.75 g * 60 粒 / 盒</span></div>
+              <div><span style="color:red;">*</span>单位&规格: <span style="color:#999">例如：FX80 * 60盒</span></div>
           </div>
           <div style="width:100%;display:flex;align-items:center;">
                <el-form-item label="规格型号 : " prop="specification_name" style="width:200px">
                  <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
                </el-form-item>
-          
+                *
                 <el-form-item prop="min_number" class="noMargin">
                   <el-input v-model="form.min_number" :disabled="showMinNumber" style="width:100px" type="number" placeholder="拆零"> </el-input>
                 </el-form-item>
-                <el-form-item prop="min_unit" class="noMargin">
+                <!-- <el-form-item prop="min_unit" class="noMargin">
                   <el-select v-model="form.min_unit" style="width:160px;"  placeholder="拆零单位"  @change="changeMinUnit">
                     <el-option
                       v-for="(item,index) in getDataConfig('hemodialysis','units')"
                       :value="item.name">
                     </el-option>
                   </el-select>
-              </el-form-item>
-              /
+              </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
               packing_unit:"",
               packing_price:'',
               default_count_unit:"",
-            
+              min_unit:"",
             }
           this.good_status = []
           for (let key in tempform) {

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

                         style="width: 196px;" type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd"></el-date-picker>
          <div class="titleOne">制单人:{{this.$store.getters.xt_user.user.user_name}}</div>
-         <div class="titleOne">当前进货价合计:</div>
+         <!-- <div class="titleOne">当前进货价合计:</div> -->
       </div>
      
       <!-- <div class="cell clearfix">
                     v-model="scope.row.drug_name"
                     :fetch-suggestions="querySearchAsync"
                     :trigger-on-focus="false"
-                    placeholder="请输入病人名字"
+                    placeholder="请输入药品名称"
                     @select="handleSelect"
                     @input="changeDrugName(scope.$index)"
                     style="width:160px;"
         let name = ""
         for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(drug_id == this.recordInfo.recordData[i].id){
-              name = this.recordInfo.recordData[i].dosage + this.recordInfo.recordData[i].max_unit + "*" + this.recordInfo.recordData[i].min_number + this.recordInfo.recordData[i].min_unit + "/"+this.recordInfo.recordData[i].packing_unit
+              name = this.recordInfo.recordData[i].dose + this.recordInfo.recordData[i].dose_unit + "*" + this.recordInfo.recordData[i].min_number + this.recordInfo.recordData[i].min_unit + "/"+this.recordInfo.recordData[i].max_unit
            }
         }
         return name
         tempObj['min_unit'] = ''
         tempObj["drug_type"] = ''
         tempObj['batch_number'] = ''
+        tempObj['dose']= ''
+        tempObj['dose_unit']=''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {
 
             } else {
               loading.close()
-               console.log("3333333",response.data.data.drugs)
+             
               if (response.data.data.drugs.length <= 0) {
                 this.$message.error('该厂商或经销商没有药品信息')
                 return
               'stockIn': this.recordInfo.recordData
             }
             console.log("params2222222",params)
+            
             postDrugWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
       },
 
       changeDrugName(val){
-        console.log("val22222",val)
         this.showOne = false
         this.showTwo = true
       },
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
              this.recordInfo.recordData[i].batch_number = val.number
              this.recordInfo.recordData[i].max_unit = val.max_unit
+             this.recordInfo.recordData[i].min_unit = val.min_unit
            }
         }
         console.log("333333",this.recordInfo.recordData)
       tempObj['dosage'] = ''
       tempObj['max_unit'] = ''
       tempObj['min_unit'] = '',
-      tempObj['packing_unit'] = '',
       tempObj['lot_number'] = ''
       tempObj['product_date'] = ''
       tempObj['expiry_date'] = ''

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

                     v-model="scope.row.drug_name"
                     :fetch-suggestions="querySearchAsync"
                     :trigger-on-focus="false"
-                    placeholder="请输入病人名字"
+                    placeholder="请输入药品名称"
                     @select="handleSelect"
                     @input="changeDrugName(scope.$index)"
                     style="width:160px;"
             stockIn: this.recordInfo.recordData
           };
           console.log("params22222222222",params)
-         
+        
           EditDrugWarehouse(
             params,
             this.warehousing_time,
       handleSelect(val){
         for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(i == this.currentIndex){
+             this.recordInfo.recordData[i].drug_id = val.id
              this.recordInfo.recordData[i].lot_number = ""
              this.recordInfo.recordData[i].drug_name = val.drug_name
              this.recordInfo.recordData[i].drug_type = val.drug_type
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
              this.recordInfo.recordData[i].batch_number = val.number
              this.recordInfo.recordData[i].max_unit = val.max_unit
+             this.recordInfo.recordData[i].min_unit = val.min_unit
            }
         }
       },

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

                     v-model="scope.row.drug_name"
                     :fetch-suggestions="querySearchAsync"
                     :trigger-on-focus="false"
-                    placeholder="请输入病人名字"
+                    placeholder="请输入药品名称"
                     @select="handleSelect"
                     style="width:160px;"
                   >

src/xt_pages/stock/stockInOrderAdd.vue

                     v-model="scope.row.good_name"
                     :fetch-suggestions="querySearchAsync"
                     :trigger-on-focus="false"
-                    placeholder="请输入病人名字"
+                    placeholder="请输入耗材名称"
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
                     style="width:160px;"

src/xt_pages/stock/stockOutOrderAdd.vue

                     v-model="scope.row.good_name"
                     :fetch-suggestions="querySearchAsync"
                     :trigger-on-focus="false"
-                    placeholder="请输入病人名字"
+                    placeholder="请输入耗材名称"
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
                     style="width:150px;"