数据

src/xt_pages/data/components/addDrugs.vue

@@ -540,8 +540,9 @@
           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'}],
@@ -718,7 +719,12 @@
         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() {

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -15,12 +15,12 @@
             <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
@@ -53,17 +53,17 @@
             </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')"
@@ -72,8 +72,8 @@
                       :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
@@ -511,7 +511,7 @@
               packing_unit:"",
               packing_price:'',
               default_count_unit:"",
-            
+              min_unit:"",
             }
           this.good_status = []
           for (let key in tempform) {

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -28,7 +28,7 @@
                         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">
@@ -80,7 +80,7 @@
                     v-model="scope.row.drug_name"
                     :fetch-suggestions="querySearchAsync"
                     :trigger-on-focus="false"
-                    placeholder="请输入病人名字"
+                    placeholder="请输入药品名称"
                     @select="handleSelect"
                     @input="changeDrugName(scope.$index)"
                     style="width:160px;"
@@ -528,7 +528,7 @@
         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
@@ -549,6 +549,8 @@
         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) {
@@ -594,7 +596,7 @@
 
             } else {
               loading.close()
-               console.log("3333333",response.data.data.drugs)
+             
               if (response.data.data.drugs.length <= 0) {
                 this.$message.error('该厂商或经销商没有药品信息')
                 return
@@ -681,6 +683,7 @@
               '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)
@@ -732,7 +735,6 @@
       },
 
       changeDrugName(val){
-        console.log("val22222",val)
         this.showOne = false
         this.showTwo = true
       },
@@ -781,6 +783,7 @@
              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)
@@ -808,7 +811,6 @@
       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

@@ -121,7 +121,7 @@
                     v-model="scope.row.drug_name"
                     :fetch-suggestions="querySearchAsync"
                     :trigger-on-focus="false"
-                    placeholder="请输入病人名字"
+                    placeholder="请输入药品名称"
                     @select="handleSelect"
                     @input="changeDrugName(scope.$index)"
                     style="width:160px;"
@@ -636,7 +636,7 @@ export default {
             stockIn: this.recordInfo.recordData
           };
           console.log("params22222222222",params)
-         
+        
           EditDrugWarehouse(
             params,
             this.warehousing_time,
@@ -765,6 +765,7 @@ export default {
       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
@@ -773,6 +774,7 @@ export default {
              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

@@ -117,7 +117,7 @@
                     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

@@ -69,7 +69,7 @@
                     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

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