XMLWAN 3 년 전
부모
커밋
4eafc20de0

+ 9 - 3
src/xt_pages/data/components/addDrugs.vue 파일 보기

540
           drug_name: [{ required: true, message: '请填写药品名称', trigger: 'blur' }],
540
           drug_name: [{ required: true, message: '请填写药品名称', trigger: 'blur' }],
541
           drug_alias: [{ required: true, message: '请选择药品类别', trigger: 'change' }],
541
           drug_alias: [{ required: true, message: '请选择药品类别', trigger: 'change' }],
542
           // drug_spec: [{ required: true, message: '请填写药品规格', trigger: 'blur' }],
542
           // drug_spec: [{ required: true, message: '请填写药品规格', trigger: 'blur' }],
543
-          dosage:[{required:true,message:'请输入药品剂量',trigger:'blur'}],
544
-          max_unit: [{ required: true, message: '请填写剂量单位', trigger: 'change' }],
543
+          dose:[{required:true,message:'请输入剂量',trigger:'blur'}],
544
+          dose_unit:[{required:true,message:"请填写剂量",trigger:'blur'}],
545
+          max_unit: [{ required: true, message: '请填写包装单位', trigger: 'change' }],
545
           min_unit: [{ required: true, message: '请填写拆零单位', trigger: 'change' }],
546
           min_unit: [{ required: true, message: '请填写拆零单位', trigger: 'change' }],
546
           unval:[{required:true,message:"请填写拆零",trigger:'change'}],
547
           unval:[{required:true,message:"请填写拆零",trigger:'change'}],
547
           min_number:[{required:true,message:"请填写拆零",trigger:'change'}],
548
           min_number:[{required:true,message:"请填写拆零",trigger:'change'}],
718
         this.form.prescription_mark = ''
719
         this.form.prescription_mark = ''
719
         this.form.record_date = ''
720
         this.form.record_date = ''
720
         this.form.drug_remark = ''
721
         this.form.drug_remark = ''
721
-
722
+        this.form.dose = ''
723
+        this.form.dose_unit = ""
724
+        this.form.min_number= ""
725
+        this.form.min_unit = ""
726
+        this.form.max_unit = ""
727
+        this.form.min_price = ""
722
         this.visible = false
728
         this.visible = false
723
       },
729
       },
724
       getValue: function() {
730
       getValue: function() {

+ 8 - 8
src/xt_pages/stock/Dialog/goodInfoDailog.vue 파일 보기

15
             <el-form-item label="耗材名称 : " prop="good_name" style="width:100%">
15
             <el-form-item label="耗材名称 : " prop="good_name" style="width:100%">
16
               <el-input v-model="form.good_name" placeholder="" maxlength="30"></el-input>
16
               <el-input v-model="form.good_name" placeholder="" maxlength="30"></el-input>
17
             </el-form-item>
17
             </el-form-item>
18
-            <el-form-item label="拼音 : " prop="pinyin" style="width:50%">
18
+            <!-- <el-form-item label="拼音 : " prop="pinyin" style="width:50%">
19
               <el-input v-model="form.pinyin" placeholder="" maxlength="30"></el-input>
19
               <el-input v-model="form.pinyin" placeholder="" maxlength="30"></el-input>
20
             </el-form-item>
20
             </el-form-item>
21
             <el-form-item label="五笔 : " prop="wubi" style="width:50%">
21
             <el-form-item label="五笔 : " prop="wubi" style="width:50%">
22
               <el-input v-model="form.wubi" placeholder="" maxlength="30"></el-input>
22
               <el-input v-model="form.wubi" placeholder="" maxlength="30"></el-input>
23
-            </el-form-item>
23
+            </el-form-item> -->
24
             <el-form-item label="耗材种类 : " prop="good_kind">
24
             <el-form-item label="耗材种类 : " prop="good_kind">
25
               <el-select v-model="form.good_kind" style="width:160px;" placeholder="请选择">
25
               <el-select v-model="form.good_kind" style="width:160px;" placeholder="请选择">
26
                 <el-option
26
                 <el-option
53
             </el-form-item>
53
             </el-form-item>
54
            
54
            
55
            <div style="width:100%;">
55
            <div style="width:100%;">
56
-              <div><span style="color:red;">*</span>单位&规格: <span style="color:#999">例如:0.75 g * 60 粒 / 盒</span></div>
56
+              <div><span style="color:red;">*</span>单位&规格: <span style="color:#999">例如:FX80 * 60盒</span></div>
57
           </div>
57
           </div>
58
           <div style="width:100%;display:flex;align-items:center;">
58
           <div style="width:100%;display:flex;align-items:center;">
59
                <el-form-item label="规格型号 : " prop="specification_name" style="width:200px">
59
                <el-form-item label="规格型号 : " prop="specification_name" style="width:200px">
60
                  <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
60
                  <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
61
                </el-form-item>
61
                </el-form-item>
62
-          
62
+                *
63
                 <el-form-item prop="min_number" class="noMargin">
63
                 <el-form-item prop="min_number" class="noMargin">
64
                   <el-input v-model="form.min_number" :disabled="showMinNumber" style="width:100px" type="number" placeholder="拆零"> </el-input>
64
                   <el-input v-model="form.min_number" :disabled="showMinNumber" style="width:100px" type="number" placeholder="拆零"> </el-input>
65
                 </el-form-item>
65
                 </el-form-item>
66
-                <el-form-item prop="min_unit" class="noMargin">
66
+                <!-- <el-form-item prop="min_unit" class="noMargin">
67
                   <el-select v-model="form.min_unit" style="width:160px;"  placeholder="拆零单位"  @change="changeMinUnit">
67
                   <el-select v-model="form.min_unit" style="width:160px;"  placeholder="拆零单位"  @change="changeMinUnit">
68
                     <el-option
68
                     <el-option
69
                       v-for="(item,index) in getDataConfig('hemodialysis','units')"
69
                       v-for="(item,index) in getDataConfig('hemodialysis','units')"
72
                       :value="item.name">
72
                       :value="item.name">
73
                     </el-option>
73
                     </el-option>
74
                   </el-select>
74
                   </el-select>
75
-              </el-form-item>
76
-              /
75
+              </el-form-item> -->
76
+            
77
               <el-form-item prop="packing_unit" class="noMargin">
77
               <el-form-item prop="packing_unit" class="noMargin">
78
                 <el-select v-model="form.packing_unit" style="width:160px;" placeholder="包装单位" @change="changePackingUnit">
78
                 <el-select v-model="form.packing_unit" style="width:160px;" placeholder="包装单位" @change="changePackingUnit">
79
                   <el-option
79
                   <el-option
511
               packing_unit:"",
511
               packing_unit:"",
512
               packing_price:'',
512
               packing_price:'',
513
               default_count_unit:"",
513
               default_count_unit:"",
514
-            
514
+              min_unit:"",
515
             }
515
             }
516
           this.good_status = []
516
           this.good_status = []
517
           for (let key in tempform) {
517
           for (let key in tempform) {

+ 8 - 6
src/xt_pages/stock/drugs/drugStockInOrderAdd.vue 파일 보기

28
                         style="width: 196px;" type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
28
                         style="width: 196px;" type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
29
                         value-format="yyyy-MM-dd"></el-date-picker>
29
                         value-format="yyyy-MM-dd"></el-date-picker>
30
          <div class="titleOne">制单人:{{this.$store.getters.xt_user.user.user_name}}</div>
30
          <div class="titleOne">制单人:{{this.$store.getters.xt_user.user.user_name}}</div>
31
-         <div class="titleOne">当前进货价合计:</div>
31
+         <!-- <div class="titleOne">当前进货价合计:</div> -->
32
       </div>
32
       </div>
33
      
33
      
34
       <!-- <div class="cell clearfix">
34
       <!-- <div class="cell clearfix">
80
                     v-model="scope.row.drug_name"
80
                     v-model="scope.row.drug_name"
81
                     :fetch-suggestions="querySearchAsync"
81
                     :fetch-suggestions="querySearchAsync"
82
                     :trigger-on-focus="false"
82
                     :trigger-on-focus="false"
83
-                    placeholder="请输入病人名字"
83
+                    placeholder="请输入药品名称"
84
                     @select="handleSelect"
84
                     @select="handleSelect"
85
                     @input="changeDrugName(scope.$index)"
85
                     @input="changeDrugName(scope.$index)"
86
                     style="width:160px;"
86
                     style="width:160px;"
528
         let name = ""
528
         let name = ""
529
         for(let i=0;i<this.recordInfo.recordData.length;i++){
529
         for(let i=0;i<this.recordInfo.recordData.length;i++){
530
            if(drug_id == this.recordInfo.recordData[i].id){
530
            if(drug_id == this.recordInfo.recordData[i].id){
531
-              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
531
+              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
532
            }
532
            }
533
         }
533
         }
534
         return name
534
         return name
549
         tempObj['min_unit'] = ''
549
         tempObj['min_unit'] = ''
550
         tempObj["drug_type"] = ''
550
         tempObj["drug_type"] = ''
551
         tempObj['batch_number'] = ''
551
         tempObj['batch_number'] = ''
552
+        tempObj['dose']= ''
553
+        tempObj['dose_unit']=''
552
         this.recordInfo.recordData.push(tempObj)
554
         this.recordInfo.recordData.push(tempObj)
553
       }, handleDelete: function(index, row) {
555
       }, handleDelete: function(index, row) {
554
         if (this.recordInfo.recordData.length <= 1) {
556
         if (this.recordInfo.recordData.length <= 1) {
594
 
596
 
595
             } else {
597
             } else {
596
               loading.close()
598
               loading.close()
597
-               console.log("3333333",response.data.data.drugs)
599
+             
598
               if (response.data.data.drugs.length <= 0) {
600
               if (response.data.data.drugs.length <= 0) {
599
                 this.$message.error('该厂商或经销商没有药品信息')
601
                 this.$message.error('该厂商或经销商没有药品信息')
600
                 return
602
                 return
681
               'stockIn': this.recordInfo.recordData
683
               'stockIn': this.recordInfo.recordData
682
             }
684
             }
683
             console.log("params2222222",params)
685
             console.log("params2222222",params)
686
+            
684
             postDrugWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
687
             postDrugWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
685
               if (response.data.state == 0) {
688
               if (response.data.state == 0) {
686
                 this.$message.error(response.data.msg)
689
                 this.$message.error(response.data.msg)
732
       },
735
       },
733
 
736
 
734
       changeDrugName(val){
737
       changeDrugName(val){
735
-        console.log("val22222",val)
736
         this.showOne = false
738
         this.showOne = false
737
         this.showTwo = true
739
         this.showTwo = true
738
       },
740
       },
781
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
783
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
782
              this.recordInfo.recordData[i].batch_number = val.number
784
              this.recordInfo.recordData[i].batch_number = val.number
783
              this.recordInfo.recordData[i].max_unit = val.max_unit
785
              this.recordInfo.recordData[i].max_unit = val.max_unit
786
+             this.recordInfo.recordData[i].min_unit = val.min_unit
784
            }
787
            }
785
         }
788
         }
786
         console.log("333333",this.recordInfo.recordData)
789
         console.log("333333",this.recordInfo.recordData)
808
       tempObj['dosage'] = ''
811
       tempObj['dosage'] = ''
809
       tempObj['max_unit'] = ''
812
       tempObj['max_unit'] = ''
810
       tempObj['min_unit'] = '',
813
       tempObj['min_unit'] = '',
811
-      tempObj['packing_unit'] = '',
812
       tempObj['lot_number'] = ''
814
       tempObj['lot_number'] = ''
813
       tempObj['product_date'] = ''
815
       tempObj['product_date'] = ''
814
       tempObj['expiry_date'] = ''
816
       tempObj['expiry_date'] = ''

+ 4 - 2
src/xt_pages/stock/drugs/drugStockInOrderEdit.vue 파일 보기

121
                     v-model="scope.row.drug_name"
121
                     v-model="scope.row.drug_name"
122
                     :fetch-suggestions="querySearchAsync"
122
                     :fetch-suggestions="querySearchAsync"
123
                     :trigger-on-focus="false"
123
                     :trigger-on-focus="false"
124
-                    placeholder="请输入病人名字"
124
+                    placeholder="请输入药品名称"
125
                     @select="handleSelect"
125
                     @select="handleSelect"
126
                     @input="changeDrugName(scope.$index)"
126
                     @input="changeDrugName(scope.$index)"
127
                     style="width:160px;"
127
                     style="width:160px;"
636
             stockIn: this.recordInfo.recordData
636
             stockIn: this.recordInfo.recordData
637
           };
637
           };
638
           console.log("params22222222222",params)
638
           console.log("params22222222222",params)
639
-         
639
+        
640
           EditDrugWarehouse(
640
           EditDrugWarehouse(
641
             params,
641
             params,
642
             this.warehousing_time,
642
             this.warehousing_time,
765
       handleSelect(val){
765
       handleSelect(val){
766
         for(let i=0;i<this.recordInfo.recordData.length;i++){
766
         for(let i=0;i<this.recordInfo.recordData.length;i++){
767
            if(i == this.currentIndex){
767
            if(i == this.currentIndex){
768
+             this.recordInfo.recordData[i].drug_id = val.id
768
              this.recordInfo.recordData[i].lot_number = ""
769
              this.recordInfo.recordData[i].lot_number = ""
769
              this.recordInfo.recordData[i].drug_name = val.drug_name
770
              this.recordInfo.recordData[i].drug_name = val.drug_name
770
              this.recordInfo.recordData[i].drug_type = val.drug_type
771
              this.recordInfo.recordData[i].drug_type = val.drug_type
773
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
774
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
774
              this.recordInfo.recordData[i].batch_number = val.number
775
              this.recordInfo.recordData[i].batch_number = val.number
775
              this.recordInfo.recordData[i].max_unit = val.max_unit
776
              this.recordInfo.recordData[i].max_unit = val.max_unit
777
+             this.recordInfo.recordData[i].min_unit = val.min_unit
776
            }
778
            }
777
         }
779
         }
778
       },
780
       },

+ 1 - 1
src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue 파일 보기

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

+ 1 - 1
src/xt_pages/stock/stockInOrderAdd.vue 파일 보기

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

+ 1 - 1
src/xt_pages/stock/stockOutOrderAdd.vue 파일 보기

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