소스 검색

清注释

mainqaq 3 년 전
부모
커밋
bfa2640ba9

+ 1 - 1
src/xt_pages/role/components/AdminRoleInfoForm.vue 파일 보기

43
       <el-form-item label="职位 : ">
43
       <el-form-item label="职位 : ">
44
         <el-input v-model="form.user_title_name" placeholder="输入职位"></el-input>
44
         <el-input v-model="form.user_title_name" placeholder="输入职位"></el-input>
45
       </el-form-item>
45
       </el-form-item>
46
-      
46
+
47
       <el-form-item label="介绍 : ">
47
       <el-form-item label="介绍 : ">
48
         <Tinymce :height="400" menubar ref="editor" v-model="form.intro" :show_upload_img="false"/>
48
         <Tinymce :height="400" menubar ref="editor" v-model="form.intro" :show_upload_img="false"/>
49
       </el-form-item>
49
       </el-form-item>

+ 38 - 38
src/xt_pages/stock/drugs/drugStockOutOrder.vue 파일 보기

60
         </div>
60
         </div>
61
       </div>
61
       </div>
62
 
62
 
63
-      
63
+
64
 
64
 
65
       <div class="cell clearfix">
65
       <div class="cell clearfix">
66
         <el-checkbox
66
         <el-checkbox
135
 
135
 
136
         <el-table-column label="操作" align="center" width="240">
136
         <el-table-column label="操作" align="center" width="240">
137
           <template slot-scope="scope">
137
           <template slot-scope="scope">
138
-           
139
-         
138
+
139
+
140
             <el-tooltip
140
             <el-tooltip
141
               class="item"
141
               class="item"
142
               effect="dark"
142
               effect="dark"
261
           </el-table-column>
261
           </el-table-column>
262
           <el-table-column label="批准文号" align="center">
262
           <el-table-column label="批准文号" align="center">
263
             <template slot-scope="scope">
263
             <template slot-scope="scope">
264
-             <span v-if="scope.row.number!=''">{{scope.row.number}}</span> 
264
+             <span v-if="scope.row.number!=''">{{scope.row.number}}</span>
265
              <span v-if="scope.row.number == '0'"></span>
265
              <span v-if="scope.row.number == '0'"></span>
266
             </template>
266
             </template>
267
           </el-table-column>
267
           </el-table-column>
323
               <span>{{scope.row.ctime | parseTime('{y}-{m}-{d} {h}:{i}')}} </span>
323
               <span>{{scope.row.ctime | parseTime('{y}-{m}-{d} {h}:{i}')}} </span>
324
             </template>
324
             </template>
325
           </el-table-column>
325
           </el-table-column>
326
-      
326
+
327
         </el-table>
327
         </el-table>
328
       </span>
328
       </span>
329
       <span slot="footer" class="dialog-footer">
329
       <span slot="footer" class="dialog-footer">
538
           for (let i = 0; i < response.data.data.list.length; i++) {
538
           for (let i = 0; i < response.data.data.list.length; i++) {
539
             this.warehouseOutDate.push(response.data.data.list[i]);
539
             this.warehouseOutDate.push(response.data.data.list[i]);
540
           }
540
           }
541
-         
541
+
542
         }
542
         }
543
       });
543
       });
544
     },
544
     },
627
     },
627
     },
628
 
628
 
629
     handleEdit: function(index, row) {
629
     handleEdit: function(index, row) {
630
-   
630
+
631
       this.$router.push({path:"/drug/out/drugstockoutorderedit?id="+row.id+"&type="+this.type+"&is_sys="+row.is_sys})
631
       this.$router.push({path:"/drug/out/drugstockoutorderedit?id="+row.id+"&type="+this.type+"&is_sys="+row.is_sys})
632
     },
632
     },
633
     handleSearch(val){
633
     handleSearch(val){
634
-      
634
+
635
        this.getInitializtion()
635
        this.getInitializtion()
636
        this.getSinleOrderDetail(val.id,val.warehouse_out_time,val.is_sys)
636
        this.getSinleOrderDetail(val.id,val.warehouse_out_time,val.is_sys)
637
        this.list = []
637
        this.list = []
688
       }
688
       }
689
     },
689
     },
690
     select(selection) {
690
     select(selection) {
691
-     
691
+
692
       var ids= []
692
       var ids= []
693
       for(let i=0;i<selection.length;i++){
693
       for(let i=0;i<selection.length;i++){
694
          ids.push(selection[i].id)
694
          ids.push(selection[i].id)
699
     },
699
     },
700
     batchDelete() {
700
     batchDelete() {
701
       console.log("232322323",this.selectedTableData)
701
       console.log("232322323",this.selectedTableData)
702
-      
702
+
703
       if (this.selectedTableData.length <= 0) {
703
       if (this.selectedTableData.length <= 0) {
704
         this.$message.error("请选择要删除的记录");
704
         this.$message.error("请选择要删除的记录");
705
         return;
705
         return;
718
       }
718
       }
719
       if(idsOne.length > 0){
719
       if(idsOne.length > 0){
720
         this.$message.error("采购出库数据不能删除!")
720
         this.$message.error("采购出库数据不能删除!")
721
-        return 
721
+        return
722
       }
722
       }
723
       const idStr = ids.join(",");
723
       const idStr = ids.join(",");
724
       const params = {
724
       const params = {
755
     },
755
     },
756
 
756
 
757
     jump(id){
757
     jump(id){
758
-    
758
+
759
       this.GetOrderDetailTwo(id)
759
       this.GetOrderDetailTwo(id)
760
       this.userList=[]
760
       this.userList=[]
761
       this.dialogVisibleTwo = true
761
       this.dialogVisibleTwo = true
779
               this.userList.push(obj)
779
               this.userList.push(obj)
780
               total = total + response.data.data.list[i].count
780
               total = total + response.data.data.list[i].count
781
             }
781
             }
782
-           
782
+
783
             this.userList.push({
783
             this.userList.push({
784
               is_total: 1,
784
               is_total: 1,
785
               total: total,
785
               total: total,
786
             })
786
             })
787
 
787
 
788
-            
788
+
789
           }
789
           }
790
         })
790
         })
791
       },
791
       },
845
            var list =   response.data.data.list
845
            var list =   response.data.data.list
846
            this.list = list
846
            this.list = list
847
            var drugConfig =  response.data.data.drugConfig
847
            var drugConfig =  response.data.data.drugConfig
848
-         
848
+
849
            this.drugConfig = drugConfig
849
            this.drugConfig = drugConfig
850
            var drugList = response.data.data.drugList
850
            var drugList = response.data.data.drugList
851
            this.drugList = drugList
851
            this.drugList = drugList
855
       })
855
       })
856
     },
856
     },
857
     getDrugCount(id){
857
     getDrugCount(id){
858
-      
859
-      var count = 0 
858
+
859
+      var count = 0
860
       for(let i=0;i<this.list.length;i++){
860
       for(let i=0;i<this.list.length;i++){
861
          if(this.list[i].drug_id == id){
861
          if(this.list[i].drug_id == id){
862
             count = this.list[i].Total
862
             count = this.list[i].Total
897
      for(let i=0;i<this.drugTypeList.length;i++){
897
      for(let i=0;i<this.drugTypeList.length;i++){
898
        if(id == this.drugTypeList[i].value){
898
        if(id == this.drugTypeList[i].value){
899
            name = this.drugTypeList[i].name
899
            name = this.drugTypeList[i].name
900
-       } 
900
+       }
901
      }
901
      }
902
      return name
902
      return name
903
    },
903
    },
924
          id:id,
924
          id:id,
925
          start_time:start_time,
925
          start_time:start_time,
926
        }
926
        }
927
-      console.log("is_sys22222",is_sys) 
927
+      console.log("is_sys22222",is_sys)
928
      getSinleOrderDetail(params).then(response=>{
928
      getSinleOrderDetail(params).then(response=>{
929
         if(response.data.state == 1){
929
         if(response.data.state == 1){
930
           this.tableShow = true
930
           this.tableShow = true
931
           this.tableList = []
931
           this.tableList = []
932
           var list =  response.data.data.list
932
           var list =  response.data.data.list
933
-         
933
+
934
          this.manufacturerList = response.data.data.manufacturerList
934
          this.manufacturerList = response.data.data.manufacturerList
935
          this.dealerList = response.data.data.dealerList
935
          this.dealerList = response.data.data.dealerList
936
          var drugFlowList = response.data.data.drugFlowList
936
          var drugFlowList = response.data.data.drugFlowList
940
                   drugFlowList[i].count = drugFlowList[i].count * drugFlowList[i].XtBaseDrug.min_number
940
                   drugFlowList[i].count = drugFlowList[i].count * drugFlowList[i].XtBaseDrug.min_number
941
               }
941
               }
942
               if(drugFlowList[i].count_unit == drugFlowList[i].XtBaseDrug.min_unit){
942
               if(drugFlowList[i].count_unit == drugFlowList[i].XtBaseDrug.min_unit){
943
-                  drugFlowList[i].count = drugFlowList[i].count 
943
+                  drugFlowList[i].count = drugFlowList[i].count
944
               }
944
               }
945
 
945
 
946
            }
946
            }
954
                   flowlist[i].count = flowlist[i].count * list[i].min_number
954
                   flowlist[i].count = flowlist[i].count * list[i].min_number
955
               }
955
               }
956
               if(flowlist[i].count_unit == flowlist[i].min_unit){
956
               if(flowlist[i].count_unit == flowlist[i].min_unit){
957
-                  flowlist[i].count = flowlist[i].count 
957
+                  flowlist[i].count = flowlist[i].count
958
               }
958
               }
959
             }
959
             }
960
             this.drugFlowList = flowlist
960
             this.drugFlowList = flowlist
985
     //  console.log("使用明细",params)
985
     //  console.log("使用明细",params)
986
      getAutoDrugDetail(params).then(response=>{
986
      getAutoDrugDetail(params).then(response=>{
987
        if(response.data.state == 1){
987
        if(response.data.state == 1){
988
-        
988
+
989
         this.userList = response.data.data.list
989
         this.userList = response.data.data.list
990
         console.log("自动出库数据",this.userList)
990
         console.log("自动出库数据",this.userList)
991
         if(val.is_sys == 1){
991
         if(val.is_sys == 1){
992
-        
992
+
993
           this.drugDialogVisible = true
993
           this.drugDialogVisible = true
994
         }
994
         }
995
         if(val.is_sys == 0){
995
         if(val.is_sys == 0){
996
-         
996
+
997
           this.drugDialogVisibleTwo = true
997
           this.drugDialogVisibleTwo = true
998
         }
998
         }
999
          var userListOne = response.data.data.outList
999
          var userListOne = response.data.data.outList
1019
           start_time:this.start_time,
1019
           start_time:this.start_time,
1020
           end_time:this.end_time,
1020
           end_time:this.end_time,
1021
          }
1021
          }
1022
-       
1022
+
1023
         getDrugCountList(params).then(response=>{
1023
         getDrugCountList(params).then(response=>{
1024
           if(response.data.state == 1){
1024
           if(response.data.state == 1){
1025
             var countlist =  response.data.data.countList
1025
             var countlist =  response.data.data.countList
1045
           }
1045
           }
1046
         })
1046
         })
1047
       },
1047
       },
1048
-    
1048
+
1049
       getCount(drug_id,min_number,max_unit,min_unit){
1049
       getCount(drug_id,min_number,max_unit,min_unit){
1050
         var count= 0
1050
         var count= 0
1051
         var str = ""
1051
         var str = ""
1082
               min_str =  total%min_number + min_unit
1082
               min_str =  total%min_number + min_unit
1083
             }
1083
             }
1084
          }
1084
          }
1085
-        
1085
+
1086
         if (total < min_number){
1086
         if (total < min_number){
1087
             str = ""
1087
             str = ""
1088
             min_str = total + min_unit
1088
             min_str = total + min_unit
1089
         }
1089
         }
1090
-       
1090
+
1091
          return str + min_str
1091
          return str + min_str
1092
       },
1092
       },
1093
       getTotalCountOne(id,min_number,max_unit,min_unit){
1093
       getTotalCountOne(id,min_number,max_unit,min_unit){
1112
             min_str =  total%min_number + min_unit
1112
             min_str =  total%min_number + min_unit
1113
           }
1113
           }
1114
         }
1114
         }
1115
-        return str + min_str 
1115
+        return str + min_str
1116
       },
1116
       },
1117
 
1117
 
1118
       getAllPrice(drug_id,price,min_price){
1118
       getAllPrice(drug_id,price,min_price){
1131
             }
1131
             }
1132
            }
1132
            }
1133
          }
1133
          }
1134
-         strprice = str * price 
1135
-         minstrprice = min_str * min_price 
1136
-       
1134
+         strprice = str * price
1135
+         minstrprice = min_str * min_price
1136
+
1137
          total_price = strprice + minstrprice
1137
          total_price = strprice + minstrprice
1138
          return  total_price
1138
          return  total_price
1139
       },
1139
       },
1149
         }
1149
         }
1150
         return arr.join(",")
1150
         return arr.join(",")
1151
       },
1151
       },
1152
-    
1152
+
1153
       getExportOutOrderDrugList(){
1153
       getExportOutOrderDrugList(){
1154
 
1154
 
1155
          var params = {
1155
          var params = {
1194
                 this.exportList[i].dealer = this.dealerList[z].dealer_name
1194
                 this.exportList[i].dealer = this.dealerList[z].dealer_name
1195
             }
1195
             }
1196
           }
1196
           }
1197
-         
1197
+
1198
         }
1198
         }
1199
-      
1199
+
1200
        import('@/vendor/Export2Excel').then(excel => {
1200
        import('@/vendor/Export2Excel').then(excel => {
1201
         for(let i=0;i<this.exportList.length;i++){
1201
         for(let i=0;i<this.exportList.length;i++){
1202
           for(let j=0;j<this.drugTypeList.length;j++){
1202
           for(let j=0;j<this.drugTypeList.length;j++){
1209
         const filterVal = ['drug_name','drug_type','unit','batch_number', 'count','price','retail_price','total_price','manufacturer','product_date','expiry_date','dealer','number','remark']
1209
         const filterVal = ['drug_name','drug_type','unit','batch_number', 'count','price','retail_price','total_price','manufacturer','product_date','expiry_date','dealer','number','remark']
1210
 
1210
 
1211
         // console.log("table",this.exportList)
1211
         // console.log("table",this.exportList)
1212
-         
1212
+
1213
         const data = this.formatJson(filterVal, this.exportList)
1213
         const data = this.formatJson(filterVal, this.exportList)
1214
         excel.export_json_to_excel({
1214
         excel.export_json_to_excel({
1215
           header: tHeader,
1215
           header: tHeader,
1231
           }
1231
           }
1232
         }
1232
         }
1233
         all_price = total * price
1233
         all_price = total * price
1234
-      
1234
+
1235
         return  all_price
1235
         return  all_price
1236
       },
1236
       },
1237
   }
1237
   }

+ 24 - 24
src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue 파일 보기

130
                   </el-select>
130
                   </el-select>
131
                 </div>
131
                 </div>
132
               </el-form-item>
132
               </el-form-item>
133
-              
133
+
134
             </template>
134
             </template>
135
           </el-table-column>
135
           </el-table-column>
136
          <el-table-column width="120" align="center">
136
          <el-table-column width="120" align="center">
138
               <span>出货价<span style="color: red">*</span></span>
138
               <span>出货价<span style="color: red">*</span></span>
139
             </template>
139
             </template>
140
             <template slot-scope="scope">
140
             <template slot-scope="scope">
141
-            
141
+
142
               <el-form-item
142
               <el-form-item
143
                 :prop="'recordData.' + scope.$index + '.price'"
143
                 :prop="'recordData.' + scope.$index + '.price'"
144
                 :rules="tableRules.price"
144
                 :rules="tableRules.price"
380
         this.propForm.goods = [];
380
         this.propForm.goods = [];
381
 
381
 
382
         this.propForm.goodType = [];
382
         this.propForm.goodType = [];
383
-      }, 
383
+      },
384
       GetConfigInfo: function() {
384
       GetConfigInfo: function() {
385
         const loading = this.$loading({
385
         const loading = this.$loading({
386
           lock: true,
386
           lock: true,
419
         return name;
419
         return name;
420
       },
420
       },
421
       specificationName: function(drug_id) {
421
       specificationName: function(drug_id) {
422
-      
422
+
423
         let name = "";
423
         let name = "";
424
         for (let i = 0; i < this.goodInfo.length; i++) {
424
         for (let i = 0; i < this.goodInfo.length; i++) {
425
           if (this.goodInfo[i].id == drug_id) {
425
           if (this.goodInfo[i].id == drug_id) {
432
         if(row.supply_cancel_out_id >0){
432
         if(row.supply_cancel_out_id >0){
433
          this.$message.error("采购出库数据不能新增!")
433
          this.$message.error("采购出库数据不能新增!")
434
          return
434
          return
435
-        } 
435
+        }
436
         this.unitShow = false
436
         this.unitShow = false
437
         if(this.drug_show == true){
437
         if(this.drug_show == true){
438
           this.$message.error("自动出库数据不能编辑")
438
           this.$message.error("自动出库数据不能编辑")
458
          this.$message.error("采购出库数据不能删除!")
458
          this.$message.error("采购出库数据不能删除!")
459
          return
459
          return
460
         }
460
         }
461
-       
461
+
462
         if(this.drug_show == true){
462
         if(this.drug_show == true){
463
           this.$message.error("采购出库数据不能编辑")
463
           this.$message.error("采购出库数据不能编辑")
464
           return
464
           return
487
           }).catch(() => {
487
           }).catch(() => {
488
           })
488
           })
489
         }
489
         }
490
-      }, 
490
+      },
491
       // getTime(val, temp) {
491
       // getTime(val, temp) {
492
       //   if (val != 0) {
492
       //   if (val != 0) {
493
       //     return uParseTime(val, temp)
493
       //     return uParseTime(val, temp)
555
 
555
 
556
       back() {
556
       back() {
557
         this.$router.go(-1)
557
         this.$router.go(-1)
558
-      }, 
558
+      },
559
       submit() {
559
       submit() {
560
         this.$refs['tableForm'].validate((valid) => {
560
         this.$refs['tableForm'].validate((valid) => {
561
           if (valid) {
561
           if (valid) {
581
                     this.recordInfo.recordData[i].dealer = this.dealerList[z].id
581
                     this.recordInfo.recordData[i].dealer = this.dealerList[z].id
582
                  }
582
                  }
583
                }
583
                }
584
-               
584
+
585
                for(let y=0;y<this.numberList.length;y++){
585
                for(let y=0;y<this.numberList.length;y++){
586
                   if(this.recordInfo.recordData[i].batch_number == this.numberList[y].id){
586
                   if(this.recordInfo.recordData[i].batch_number == this.numberList[y].id){
587
                      this.recordInfo.recordData[i].batch_number = this.numberList[y].batch_number
587
                      this.recordInfo.recordData[i].batch_number = this.numberList[y].batch_number
603
               'stockOut': this.recordInfo.recordData
603
               'stockOut': this.recordInfo.recordData
604
             }
604
             }
605
             console.log("param23322323233222323",params)
605
             console.log("param23322323233222323",params)
606
-           
606
+
607
             editDrugWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
607
             editDrugWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
608
               if (response.data.state == 0) {
608
               if (response.data.state == 0) {
609
                 this.$message.error(response.data.msg)
609
                 this.$message.error(response.data.msg)
618
                 var min_unit =  response.data.data.min_unit
618
                 var min_unit =  response.data.data.min_unit
619
                 var max_unit =  response.data.data.max_unit
619
                 var max_unit =  response.data.data.max_unit
620
                 var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
620
                 var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
621
-               loading.close()  
621
+               loading.close()
622
               if(msg == 1){
622
               if(msg == 1){
623
                 this.$message.error(str + "库存不足,请入库")
623
                 this.$message.error(str + "库存不足,请入库")
624
                 loading.close()
624
                 loading.close()
634
             return false
634
             return false
635
           }
635
           }
636
         })
636
         })
637
-      }, 
637
+      },
638
       GetOrderDetail: function(order_id) {
638
       GetOrderDetail: function(order_id) {
639
         const params = {
639
         const params = {
640
           'id': order_id
640
           'id': order_id
644
             this.$message.error(response.data.msg)
644
             this.$message.error(response.data.msg)
645
             return false
645
             return false
646
           } else {
646
           } else {
647
-            
647
+
648
 
648
 
649
             var manulist = response.data.data.manulist
649
             var manulist = response.data.data.manulist
650
             this.manufacturerList = manulist
650
             this.manufacturerList = manulist
658
               }else{
658
               }else{
659
                 response.data.data.list[i].number = response.data.data.list[i].number
659
                 response.data.data.list[i].number = response.data.data.list[i].number
660
               }
660
               }
661
-              
661
+
662
               if(response.data.data.list[i].manufacturer == "0" || response.data.data.list[i].manufacturer == 0){
662
               if(response.data.data.list[i].manufacturer == "0" || response.data.data.list[i].manufacturer == 0){
663
                 response.data.data.list[i].manufacturer = ""
663
                 response.data.data.list[i].manufacturer = ""
664
               }else{
664
               }else{
665
                 response.data.data.list[i].manufacturer = response.data.data.list[i].drug.manufacturer
665
                 response.data.data.list[i].manufacturer = response.data.data.list[i].drug.manufacturer
666
               }
666
               }
667
-              
667
+
668
               response.data.data.list[i].price = response.data.data.list[i].price.toString()
668
               response.data.data.list[i].price = response.data.data.list[i].price.toString()
669
               response.data.data.list[i].retail_price = response.data.data.list[i].price.toString()
669
               response.data.data.list[i].retail_price = response.data.data.list[i].price.toString()
670
               response.data.data.list[i].count = response.data.data.list[i].count.toString()
670
               response.data.data.list[i].count = response.data.data.list[i].count.toString()
673
               }else{
673
               }else{
674
                 response.data.data.list[i].dealer = response.data.data.list[i].dealer
674
                 response.data.data.list[i].dealer = response.data.data.list[i].dealer
675
               }
675
               }
676
-             
676
+
677
               response.data.data.list[i].product_date = this.getTime(response.data.data.list[i].product_date,"{y}-{h}-{d}")
677
               response.data.data.list[i].product_date = this.getTime(response.data.data.list[i].product_date,"{y}-{h}-{d}")
678
               response.data.data.list[i].expiry_date = this.getTime(response.data.data.list[i].expiry_date,"{y}-{h}-{d}")
678
               response.data.data.list[i].expiry_date = this.getTime(response.data.data.list[i].expiry_date,"{y}-{h}-{d}")
679
               this.recordInfo.recordData.push(response.data.data.list[i])
679
               this.recordInfo.recordData.push(response.data.data.list[i])
693
 
693
 
694
             this.warehouseOut = response.data.data.info
694
             this.warehouseOut = response.data.data.info
695
             this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
695
             this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
696
-          
696
+
697
 
697
 
698
           }
698
           }
699
 
699
 
729
         postSearchDrugList(key).then(response => {
729
         postSearchDrugList(key).then(response => {
730
           if (response.data.state == 1) {
730
           if (response.data.state == 1) {
731
             searchArray = response.data.data.list;
731
             searchArray = response.data.data.list;
732
-            
732
+
733
              var list = response.data.data.list
733
              var list = response.data.data.list
734
-            
734
+
735
 
735
 
736
              this.drugList = list
736
              this.drugList = list
737
              var manufacturerList = response.data.data.manufacturerList
737
              var manufacturerList = response.data.data.manufacturerList
738
              this.manufacturerList = manufacturerList
738
              this.manufacturerList = manufacturerList
739
              for(let i=0;i<this.drugList.length;i++){
739
              for(let i=0;i<this.drugList.length;i++){
740
-             
740
+
741
                 for(let j=0;j<this.manufacturerList.length;j++){
741
                 for(let j=0;j<this.manufacturerList.length;j++){
742
                   if(this.drugList[i].manufacturer == this.manufacturerList[j].id){
742
                   if(this.drugList[i].manufacturer == this.manufacturerList[j].id){
743
                      this.drugList[i].manufacturer = this.manufacturerList[j].manufacturer_name
743
                      this.drugList[i].manufacturer = this.manufacturerList[j].manufacturer_name
744
                   }
744
                   }
745
                 }
745
                 }
746
              }
746
              }
747
-           
747
+
748
              cb(this.drugList)
748
              cb(this.drugList)
749
           } else {
749
           } else {
750
             cb([])
750
             cb([])
784
              }
784
              }
785
            }
785
            }
786
         }
786
         }
787
- 
787
+
788
       },
788
       },
789
       getDictionaryDataConfig(module, filed_name) {
789
       getDictionaryDataConfig(module, filed_name) {
790
         return getDictionaryDataConfig(module, filed_name)
790
         return getDictionaryDataConfig(module, filed_name)
799
         getDrugBatchNumber(params).then(response=>{
799
         getDrugBatchNumber(params).then(response=>{
800
            if(response.data.state == 1){
800
            if(response.data.state == 1){
801
              var list = response.data.data.list
801
              var list = response.data.data.list
802
-           
802
+
803
              this.numberList = list
803
              this.numberList = list
804
            }
804
            }
805
         })
805
         })
806
       }
806
       }
807
     },
807
     },
808
     created() {
808
     created() {
809
-      this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
809
+      this.drugTypeList = getDictionaryDataConfig('system','drug_type')
810
       this.GetConfigInfo()
810
       this.GetConfigInfo()
811
       this.propForm.goodUnit = this.$store.getters.good_unit
811
       this.propForm.goodUnit = this.$store.getters.good_unit
812
       const order_id = this.$route.query.id
812
       const order_id = this.$route.query.id

+ 14 - 17
src/xt_pages/supply/components/addGoodOrder.vue 파일 보기

76
           <el-button size="small" type="primary" @click="checkGoodOrder" v-if="is_check == 2" >审核</el-button>
76
           <el-button size="small" type="primary" @click="checkGoodOrder" v-if="is_check == 2" >审核</el-button>
77
           <el-button size="small" type="primary" @click="MofyGoodOrder" v-if="is_check == 1">反审核</el-button>
77
           <el-button size="small" type="primary" @click="MofyGoodOrder" v-if="is_check == 1">反审核</el-button>
78
           <el-button size="small" type="primary" @click="toClick" v-if="is_check == 1" >生成采购退货单</el-button>
78
           <el-button size="small" type="primary" @click="toClick" v-if="is_check == 1" >生成采购退货单</el-button>
79
-          <el-button size="small" type="primary" @click="toPrint" v-show="showSix" >打印</el-button>
80
         </div>
79
         </div>
81
       </div>
80
       </div>
82
 
81
 
562
       warese_out_id: 0,
561
       warese_out_id: 0,
563
       return_remark: "",
562
       return_remark: "",
564
       is_warehouse:0,
563
       is_warehouse:0,
565
-      tableDataList:[],
566
-      showSix:false,
564
+      tableDataList:[]
567
     };
565
     };
568
   },
566
   },
569
    watch: {
567
    watch: {
715
           this.recordInfo.tableList[i].supply_type = val.supply_type;
713
           this.recordInfo.tableList[i].supply_type = val.supply_type;
716
           this.recordInfo.tableList[i].supply_specification_name = val.supply_specification_name;
714
           this.recordInfo.tableList[i].supply_specification_name = val.supply_specification_name;
717
           this.recordInfo.tableList[i].supply_total = val.supply_total;
715
           this.recordInfo.tableList[i].supply_total = val.supply_total;
718
-          this.recordInfo.tableList[i].min_price = val.min_price  
716
+          this.recordInfo.tableList[i].min_price = val.min_price
719
           if (val.supply_count == NaN) {
717
           if (val.supply_count == NaN) {
720
             this.recordInfo.tableList[i].supply_count = "";
718
             this.recordInfo.tableList[i].supply_count = "";
721
           } else {
719
           } else {
801
           min_str = (total % min_number) + min_unit;
799
           min_str = (total % min_number) + min_unit;
802
         }
800
         }
803
       }
801
       }
804
-     
802
+
805
       return max_str + min_str;
803
       return max_str + min_str;
806
-    
804
+
807
     },
805
     },
808
     getTotalStockCount(arr) {
806
     getTotalStockCount(arr) {
809
       var total_count = 0;
807
       var total_count = 0;
815
       }else{
813
       }else{
816
         return ""
814
         return ""
817
       }
815
       }
818
-     
816
+
819
     },
817
     },
820
 
818
 
821
     calculate: function (val) {
819
     calculate: function (val) {
855
       }
853
       }
856
       this.discount_amount = discount_amount;
854
       this.discount_amount = discount_amount;
857
       if(this.payment > 0) this.count_payment()
855
       if(this.payment > 0) this.count_payment()
858
-      
856
+
859
     },
857
     },
860
     count_discount() {
858
     count_discount() {
861
       this.rate_of_concession = (
859
       this.rate_of_concession = (
958
           this.tableDataList = []
956
           this.tableDataList = []
959
           this.tableDataList = orderInfo
957
           this.tableDataList = orderInfo
960
           console.log("changed23323232233232",this.tableDataList)
958
           console.log("changed23323232233232",this.tableDataList)
961
-         
959
+
962
         }
960
         }
963
       });
961
       });
964
     },
962
     },
1014
               this.number = ""
1012
               this.number = ""
1015
              }
1013
              }
1016
           }
1014
           }
1017
-          
1015
+
1018
           var params = {
1016
           var params = {
1019
             stockIn: this.recordInfo.tableList,
1017
             stockIn: this.recordInfo.tableList,
1020
             return_remake: this.return_remark,
1018
             return_remake: this.return_remark,
1026
               this.$message.success("保存成功!");
1024
               this.$message.success("保存成功!");
1027
               this.showOne = false;
1025
               this.showOne = false;
1028
               this.showTwo = true;
1026
               this.showTwo = true;
1029
-              this.showSix = true
1030
               var orderInfo = response.data.data.list;
1027
               var orderInfo = response.data.data.list;
1031
               var warehouseOut = response.data.data.warehouseOut;
1028
               var warehouseOut = response.data.data.warehouseOut;
1032
               this.is_check = 2
1029
               this.is_check = 2
1174
           var purcaseOrder = response.data.data.purcaseOrder;
1171
           var purcaseOrder = response.data.data.purcaseOrder;
1175
           var goodOrder = response.data.data.goodOrder;
1172
           var goodOrder = response.data.data.goodOrder;
1176
           var drugList = response.data.data.drugList;
1173
           var drugList = response.data.data.drugList;
1177
-     
1174
+
1178
           var is_warehouse = 0;
1175
           var is_warehouse = 0;
1179
           for (let i = 0; i < purcaseOrder.length; i++) {
1176
           for (let i = 0; i < purcaseOrder.length; i++) {
1180
             for (let j = 0; j < drugList.length; j++) {
1177
             for (let j = 0; j < drugList.length; j++) {
1289
             this.is_check = 2
1286
             this.is_check = 2
1290
             this.disabled = false
1287
             this.disabled = false
1291
             this.Reviewed = false
1288
             this.Reviewed = false
1292
-           
1289
+
1293
           }
1290
           }
1294
           if (msg == 2) {
1291
           if (msg == 2) {
1295
             var cancelList = response.data.data.cancelList
1292
             var cancelList = response.data.data.cancelList
1377
                   }
1374
                   }
1378
                 }
1375
                 }
1379
               }
1376
               }
1380
-            
1377
+
1381
               console.log("arr233232233232",arr)
1378
               console.log("arr233232233232",arr)
1382
              if (arr.length == 0) {
1379
              if (arr.length == 0) {
1383
                 //未入库
1380
                 //未入库
1384
                 var is_warehouse = 2;
1381
                 var is_warehouse = 2;
1385
                 this.ModefySupplyWarehousing(is_warehouse, this.id);
1382
                 this.ModefySupplyWarehousing(is_warehouse, this.id);
1386
-                
1383
+
1387
               }
1384
               }
1388
               if (arr.length > 0) {
1385
               if (arr.length > 0) {
1389
                 //部分入库
1386
                 //部分入库
1454
                }
1451
                }
1455
             }
1452
             }
1456
 
1453
 
1457
-          
1454
+
1458
 
1455
 
1459
             let objInfo = {};
1456
             let objInfo = {};
1460
             if(cancelOrderList.length >0){
1457
             if(cancelOrderList.length >0){
1469
                 }
1466
                 }
1470
               });
1467
               });
1471
               let newArr = Object.values(objInfo)
1468
               let newArr = Object.values(objInfo)
1472
-            
1469
+
1473
               for (let i = 0; i < cancelOrderList.length; i++) {
1470
               for (let i = 0; i < cancelOrderList.length; i++) {
1474
                 for (let j = 0; j < newArr.length; j++) {
1471
                 for (let j = 0; j < newArr.length; j++) {
1475
                   if (cancelOrderList[i].project_id == newArr[j].project_id) {
1472
                   if (cancelOrderList[i].project_id == newArr[j].project_id) {

+ 30 - 30
src/xt_pages/supply/components/addGoodReturn.vue 파일 보기

42
             value-format="yyyy-MM-dd"
42
             value-format="yyyy-MM-dd"
43
             :disabled="disabled"
43
             :disabled="disabled"
44
           ></el-date-picker>
44
           ></el-date-picker>
45
-         
45
+
46
           <span>单据编码:{{ number }}</span>
46
           <span>单据编码:{{ number }}</span>
47
         </div>
47
         </div>
48
         <div>
48
         <div>
68
             >打印</el-button
68
             >打印</el-button
69
           >
69
           >
70
           <el-button size="small" type="primary" v-if="is_check == 2" @click="checkReturnOrder">审核</el-button>
70
           <el-button size="small" type="primary" v-if="is_check == 2" @click="checkReturnOrder">审核</el-button>
71
-          <el-button size="small" type="primary" v-if="is_check == 1" @click="modefyReturnOrder">反审核</el-button> 
71
+          <el-button size="small" type="primary" v-if="is_check == 1" @click="modefyReturnOrder">反审核</el-button>
72
         </div>
72
         </div>
73
       </div>
73
       </div>
74
 
74
 
398
         ></span>
398
         ></span>
399
       </div>
399
       </div>
400
     </div>
400
     </div>
401
-    
401
+
402
   </div>
402
   </div>
403
 </template>
403
 </template>
404
 
404
 
616
             for (let j = 0; j < goodList[i].unitList.length; j++) {
616
             for (let j = 0; j < goodList[i].unitList.length; j++) {
617
               goodList[i].unitList[0].name = goodList[i].packing_unit;
617
               goodList[i].unitList[0].name = goodList[i].packing_unit;
618
             }
618
             }
619
-        
619
+
620
             goodList[i].sum_count = this.getTotalStockCountTwo(
620
             goodList[i].sum_count = this.getTotalStockCountTwo(
621
               goodList[i].good_warehouse_info
621
               goodList[i].good_warehouse_info
622
             );
622
             );
727
           total += parseInt(arr[i].stock_max_number+ arr[i].stock_min_number);
727
           total += parseInt(arr[i].stock_max_number+ arr[i].stock_min_number);
728
         }
728
         }
729
       }
729
       }
730
-    
730
+
731
       if (total < min_number) {
731
       if (total < min_number) {
732
         min_str = total + min_unit;
732
         min_str = total + min_unit;
733
       }
733
       }
765
       }else{
765
       }else{
766
         return ""
766
         return ""
767
       }
767
       }
768
-      
768
+
769
     },
769
     },
770
     getTotalStockCountTwo(arr) {
770
     getTotalStockCountTwo(arr) {
771
       var total_count = 0;
771
       var total_count = 0;
773
         total_count += arr[i].stock_count;
773
         total_count += arr[i].stock_count;
774
       }
774
       }
775
       return total_count
775
       return total_count
776
-    
776
+
777
     },
777
     },
778
     calculate: function (val) {
778
     calculate: function (val) {
779
       if (isNaN(val)) {
779
       if (isNaN(val)) {
802
       }else{
802
       }else{
803
         return ""
803
         return ""
804
       }
804
       }
805
-     
805
+
806
     },
806
     },
807
     addressChange() {
807
     addressChange() {
808
       var discount_amount = 0;
808
       var discount_amount = 0;
813
         ).toFixed(2);
813
         ).toFixed(2);
814
       }
814
       }
815
       this.discount_amount = discount_amount;
815
       this.discount_amount = discount_amount;
816
-     
816
+
817
     },
817
     },
818
     count_discount() {
818
     count_discount() {
819
       this.rate_of_concession = (
819
       this.rate_of_concession = (
859
           this.supplier_name = out.supplier_id;
859
           this.supplier_name = out.supplier_id;
860
           this.rate_of_concession = out.rate_of_concession;
860
           this.rate_of_concession = out.rate_of_concession;
861
           this.discount_amount = out.discount_amount;
861
           this.discount_amount = out.discount_amount;
862
-      
862
+
863
           this.start_time = this.getTimes(out.document_date);
863
           this.start_time = this.getTimes(out.document_date);
864
           var orderInfo = response.data.data.list;
864
           var orderInfo = response.data.data.list;
865
           console.log("orderINFO233232232332", orderInfo);
865
           console.log("orderINFO233232232332", orderInfo);
882
             }
882
             }
883
             orderInfo[i].id = orderInfo[i].id;
883
             orderInfo[i].id = orderInfo[i].id;
884
             orderInfo[i].supply_count = orderInfo[i].supply_count;
884
             orderInfo[i].supply_count = orderInfo[i].supply_count;
885
-            
885
+
886
             orderInfo[i].supply_price = orderInfo[i].price;
886
             orderInfo[i].supply_price = orderInfo[i].price;
887
             orderInfo[i].supply_remake = orderInfo[i].remark;
887
             orderInfo[i].supply_remake = orderInfo[i].remark;
888
             orderInfo[i].type = orderInfo[i].is_source;
888
             orderInfo[i].type = orderInfo[i].is_source;
897
             orderInfo[i].warehousing_id = orderInfo[i].warehousing_id
897
             orderInfo[i].warehousing_id = orderInfo[i].warehousing_id
898
             orderInfo[i].warehouse_info_id = orderInfo[i].warehouse_info_id
898
             orderInfo[i].warehouse_info_id = orderInfo[i].warehouse_info_id
899
             orderInfo[i].deposit_rate = ""
899
             orderInfo[i].deposit_rate = ""
900
-           
900
+
901
             if (orderInfo[i].is_source == 1) {
901
             if (orderInfo[i].is_source == 1) {
902
               for (let j = 0; j < drugList.length; j++) {
902
               for (let j = 0; j < drugList.length; j++) {
903
                 if (orderInfo[i].project_id == drugList[j].id) {
903
                 if (orderInfo[i].project_id == drugList[j].id) {
924
                   orderInfo[i].max_unit =drugList[j].max_unit
924
                   orderInfo[i].max_unit =drugList[j].max_unit
925
                   orderInfo[i].min_unit =drugList[j].min_unit
925
                   orderInfo[i].min_unit =drugList[j].min_unit
926
                 }
926
                 }
927
-               
927
+
928
               }
928
               }
929
               orderInfo[i].count = orderInfo[i].count + orderInfo[i].supply_unit
929
               orderInfo[i].count = orderInfo[i].count + orderInfo[i].supply_unit
930
             }
930
             }
961
       var warehouse_out_id = this.$route.query.id
961
       var warehouse_out_id = this.$route.query.id
962
       this.$refs["tableForm"].validate((valid)=>{
962
       this.$refs["tableForm"].validate((valid)=>{
963
         if(valid){
963
         if(valid){
964
-        
965
-        
964
+
965
+
966
           for(let i=0;i<this.recordInfo.tableList.length;i++){
966
           for(let i=0;i<this.recordInfo.tableList.length;i++){
967
             if(this.recordInfo.tableList[i].count == ""){
967
             if(this.recordInfo.tableList[i].count == ""){
968
               this.$message.error(this.recordInfo.tableList[i].name+"无可退库数量,保存失败!")
968
               this.$message.error(this.recordInfo.tableList[i].name+"无可退库数量,保存失败!")
989
               }
989
               }
990
 
990
 
991
             }
991
             }
992
-          } 
992
+          }
993
            //判断是否在采购单数据中做了删除,如果长度相等则代表没有删除,如果不等则代表做了删除或者新增
993
            //判断是否在采购单数据中做了删除,如果长度相等则代表没有删除,如果不等则代表做了删除或者新增
994
            if(this.recordInfo.tableList.length < this.tableDataList.length){
994
            if(this.recordInfo.tableList.length < this.tableDataList.length){
995
              warehouse_out_id = 0
995
              warehouse_out_id = 0
1007
             return_marke:this.return_remark,
1007
             return_marke:this.return_remark,
1008
            }
1008
            }
1009
            console.log("2323323232",params)
1009
            console.log("2323323232",params)
1010
-          
1010
+
1011
            saveGoodReturnOrder(params,warehouse_out_id,this.start_time,this.rate_of_concession,this.discount_amount,this.arrearage,this.payment,this.supplier_name).then(response=>{
1011
            saveGoodReturnOrder(params,warehouse_out_id,this.start_time,this.rate_of_concession,this.discount_amount,this.arrearage,this.payment,this.supplier_name).then(response=>{
1012
              if(response.data.state == 1){
1012
              if(response.data.state == 1){
1013
                 this.loading = false
1013
                 this.loading = false
1036
                 }else{
1036
                 }else{
1037
                   this.payment = out.payment
1037
                   this.payment = out.payment
1038
                 }
1038
                 }
1039
-               
1039
+
1040
                 if(out.arrearage == 0){
1040
                 if(out.arrearage == 0){
1041
                    this.arrearage = ""
1041
                    this.arrearage = ""
1042
                 }else{
1042
                 }else{
1043
                   this.arrearage = out.arrearage
1043
                   this.arrearage = out.arrearage
1044
                 }
1044
                 }
1045
-               
1045
+
1046
                 this.start_time = this.getTimes(out.document_date)
1046
                 this.start_time = this.getTimes(out.document_date)
1047
                 var orderInfo = response.data.data.list
1047
                 var orderInfo = response.data.data.list
1048
-                
1048
+
1049
                 for(let i=0;i< orderInfo.length;i++){
1049
                 for(let i=0;i< orderInfo.length;i++){
1050
                   orderInfo[i].name = orderInfo[i].name
1050
                   orderInfo[i].name = orderInfo[i].name
1051
                   orderInfo[i].id = orderInfo[i].id
1051
                   orderInfo[i].id = orderInfo[i].id
1078
                             orderInfo[i].unitList[0].name = this.drugList[j].max_unit
1078
                             orderInfo[i].unitList[0].name = this.drugList[j].max_unit
1079
                            }
1079
                            }
1080
 
1080
 
1081
-                          
1081
+
1082
 
1082
 
1083
                         }
1083
                         }
1084
                      }
1084
                      }
1097
                 this.recordInfo.tableList = orderInfo
1097
                 this.recordInfo.tableList = orderInfo
1098
              }
1098
              }
1099
            })
1099
            })
1100
-          
1100
+
1101
         }
1101
         }
1102
       })
1102
       })
1103
     },
1103
     },
1111
       var warehouse_out_id = this.id;
1111
       var warehouse_out_id = this.id;
1112
       this.$refs["tableForm"].validate((valid)=>{
1112
       this.$refs["tableForm"].validate((valid)=>{
1113
         if(valid){
1113
         if(valid){
1114
-         
1115
-        
1114
+
1115
+
1116
           for(let i=0;i<this.recordInfo.tableList.length;i++){
1116
           for(let i=0;i<this.recordInfo.tableList.length;i++){
1117
             if(this.recordInfo.tableList[i].count == ""){
1117
             if(this.recordInfo.tableList[i].count == ""){
1118
               this.$message.error(this.recordInfo.tableList[i].name+"无可退库数量,保存失败!")
1118
               this.$message.error(this.recordInfo.tableList[i].name+"无可退库数量,保存失败!")
1159
      console.log("审核2322323232323",params)
1159
      console.log("审核2322323232323",params)
1160
      checkReturnOrder(params).then(response=>{
1160
      checkReturnOrder(params).then(response=>{
1161
        if(response.data.state == 1){
1161
        if(response.data.state == 1){
1162
-      
1162
+
1163
         var msg = response.data.data.msg
1163
         var msg = response.data.data.msg
1164
         if(msg == 1){
1164
         if(msg == 1){
1165
           this.loading = false
1165
           this.loading = false
1187
               var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
1187
               var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
1188
               this.$message.error(str + "库存不足,审核失败!")
1188
               this.$message.error(str + "库存不足,审核失败!")
1189
           }
1189
           }
1190
-       
1190
+
1191
        }
1191
        }
1192
      })
1192
      })
1193
     },
1193
     },
1211
     getSupplyCount(supply_count,sum_count,supply_unit,type,min_number,max_unit,min_unit,index){
1211
     getSupplyCount(supply_count,sum_count,supply_unit,type,min_number,max_unit,min_unit,index){
1212
      console.log("val23322323",supply_count,sum_count,supply_unit,type,min_number,max_unit,min_unit)
1212
      console.log("val23322323",supply_count,sum_count,supply_unit,type,min_number,max_unit,min_unit)
1213
       var total_count = 0
1213
       var total_count = 0
1214
-      
1214
+
1215
       if(type == 1){
1215
       if(type == 1){
1216
        if(supply_unit == max_unit){
1216
        if(supply_unit == max_unit){
1217
           total_count = supply_count * min_number
1217
           total_count = supply_count * min_number
1236
           }
1236
           }
1237
          }
1237
          }
1238
       }
1238
       }
1239
-       
1239
+
1240
       if(type == 2){
1240
       if(type == 2){
1241
          if(supply_count > sum_count){
1241
          if(supply_count > sum_count){
1242
           this.$message.error("数量不能大于可退数量!")
1242
           this.$message.error("数量不能大于可退数量!")
1253
           }
1253
           }
1254
          }
1254
          }
1255
       }
1255
       }
1256
-    
1256
+
1257
     },
1257
     },
1258
     toPrint() {
1258
     toPrint() {
1259
       this.$router.push({ path: "/good/return/print?&id=" + this.id });
1259
       this.$router.push({ path: "/good/return/print?&id=" + this.id });
1292
     tempObj["max_unit"] = ""
1292
     tempObj["max_unit"] = ""
1293
     tempObj["min_unit"] = ""
1293
     tempObj["min_unit"] = ""
1294
     this.recordInfo.tableList.push(tempObj);
1294
     this.recordInfo.tableList.push(tempObj);
1295
-   
1295
+
1296
     this.getInitOrder();
1296
     this.getInitOrder();
1297
     if(parseInt(this.$route.query.id) > 0){
1297
     if(parseInt(this.$route.query.id) > 0){
1298
 
1298
 

+ 24 - 57
src/xt_pages/supply/components/addPurchaseOrder.vue 파일 보기

76
             @click="checkPurchaseOrder"
76
             @click="checkPurchaseOrder"
77
             v-show="showOne">审核
77
             v-show="showOne">审核
78
          </el-button>
78
          </el-button>
79
-        
79
+
80
         <el-button
80
         <el-button
81
             size="small"
81
             size="small"
82
             type="primary"
82
             type="primary"
89
             @click="checkReturnOrder"
89
             @click="checkReturnOrder"
90
             v-if="is_check == 1">反审核
90
             v-if="is_check == 1">反审核
91
          </el-button>
91
          </el-button>
92
-         
92
+
93
           <el-button
93
           <el-button
94
             size="small"
94
             size="small"
95
             type="primary"
95
             type="primary"
449
       is_check: 2,
449
       is_check: 2,
450
     };
450
     };
451
   },
451
   },
452
-
453
-  watch: {
454
-    total_price: function (newval, oldval) {
455
-      if(this.rate_of_concession != ""){
456
-        this.addressChange()
457
-      }
458
-    }
459
-  },
460
-
461
   methods: {
452
   methods: {
462
     getInitOrder() {
453
     getInitOrder() {
463
       getInitOrder().then((response) => {
454
       getInitOrder().then((response) => {
807
       for (let i = 0; i < arr.length; i++) {
798
       for (let i = 0; i < arr.length; i++) {
808
         total_count += arr[i].stock_count;
799
         total_count += arr[i].stock_count;
809
       }
800
       }
810
-      if(total_count > 0){
811
-        return total_count;
812
-      }else{
813
-        return ""
814
-      }
815
-    
801
+      return total_count;
816
     },
802
     },
817
     calculate: function (val) {
803
     calculate: function (val) {
818
       if (isNaN(val)) {
804
       if (isNaN(val)) {
888
         }
874
         }
889
       });
875
       });
890
     },
876
     },
891
-  
877
+    getAllPrice() {
878
+      var total_price = 0;
879
+      for (let i = 0; i < this.recordInfo.tableList.length; i++) {
880
+        total_price +=
881
+          this.recordInfo.tableList[i].supply_price *
882
+          this.recordInfo.tableList[i].supply_count;
883
+      }
884
+      this.total_price = total_price;
885
+      this.discount_amount = (this.total_price * this.rate_of_concession * 0.01).toFixed(2);
886
+      return total_price.toFixed(2);
887
+    },
892
     count_discount() {
888
     count_discount() {
893
       this.rate_of_concession = (
889
       this.rate_of_concession = (
894
         this.discount_amount /
890
         this.discount_amount /
924
     getDataConfig(module, filed_name) {
920
     getDataConfig(module, filed_name) {
925
       return getDataConfig(module, filed_name);
921
       return getDataConfig(module, filed_name);
926
     },
922
     },
927
-
928
-     getAllPrice() {
929
-      var total_price = 0;
930
-      for (let i = 0; i < this.recordInfo.tableList.length; i++) {
931
-        total_price +=
932
-          this.recordInfo.tableList[i].supply_price *
933
-          this.recordInfo.tableList[i].supply_count;
934
-      }
935
-      this.total_price = total_price;
936
-      // this.discount_amount = (this.total_price * this.rate_of_concession * 0.01).toFixed(2);
937
-      return total_price.toFixed(2);
938
-    },
939
-     addressChange() {
923
+    addressChange() {
940
       var discount_amount = 0;
924
       var discount_amount = 0;
941
       if (this.rate_of_concession > 0) {
925
       if (this.rate_of_concession > 0) {
942
         discount_amount = (
926
         discount_amount = (
945
         ).toFixed(2);
929
         ).toFixed(2);
946
       }
930
       }
947
       this.discount_amount = discount_amount;
931
       this.discount_amount = discount_amount;
948
-     
949
     },
932
     },
950
     checkReturnOrder() {
933
     checkReturnOrder() {
951
       var id = this.id;
934
       var id = this.id;
955
           this.disabled = false;
938
           this.disabled = false;
956
           this.showOne = true;
939
           this.showOne = true;
957
           this.is_check = 2;
940
           this.is_check = 2;
958
-          this.Reviewed = false
959
           this.$message.success("反审核成功!");
941
           this.$message.success("反审核成功!");
960
         }
942
         }
961
       });
943
       });
971
           var purcaseOrder = response.data.data.purcaseOrder;
953
           var purcaseOrder = response.data.data.purcaseOrder;
972
 
954
 
973
           var goodOrder = response.data.data.goodOrder;
955
           var goodOrder = response.data.data.goodOrder;
974
-         
956
+
975
           var drugList = response.data.data.drugList;
957
           var drugList = response.data.data.drugList;
976
-      
958
+
977
           var ids = "";
959
           var ids = "";
978
           // 如果采购单没有数据,则代表改订单第一次生成采购订单数据
960
           // 如果采购单没有数据,则代表改订单第一次生成采购订单数据
979
           if (goodOrder.length == 0) {
961
           if (goodOrder.length == 0) {
1020
                 }
1002
                 }
1021
               }
1003
               }
1022
             }
1004
             }
1023
-     
1005
+
1024
 
1006
 
1025
             for (let i = 0; i < newArr.length; i++) {
1007
             for (let i = 0; i < newArr.length; i++) {
1026
               for (let j = 0; j < newArr[i].child.length; j++) {
1008
               for (let j = 0; j < newArr[i].child.length; j++) {
1081
               }
1063
               }
1082
             }
1064
             }
1083
            }
1065
            }
1084
-     
1066
+
1085
           }
1067
           }
1086
         }
1068
         }
1087
       });
1069
       });
1143
   transform: translateX(-50%);
1125
   transform: translateX(-50%);
1144
   top: 30%;
1126
   top: 30%;
1145
 }
1127
 }
1146
-/deep/ .el-table--scrollable-x .el-table__body-wrapper {
1147
-  overflow: auto;
1148
-}
1149
-/deep/ .gutter {
1150
-  width: 15px !important;
1151
-  display: inline-block !important;
1152
-}
1153
-/deep/ .el-table__fixed-right-patch {
1154
-  width: 15px !important;
1155
-}
1156
 
1128
 
1157
-/deep/ .el-table__fixed-right {
1158
-  bottom: 0 !important;
1159
-  left: auto;
1160
-  right: 0;
1161
-}
1162
 /deep/ .el-table__body-wrapper::-webkit-scrollbar {
1129
 /deep/ .el-table__body-wrapper::-webkit-scrollbar {
1163
-  width: 15px !important;
1164
-  height: 15px !important;
1130
+  width: 10px;
1131
+  height: 10px;
1165
 }
1132
 }
1166
 </style>
1133
 </style>
1167
 
1134
 
1188
 .el-table::before {
1155
 .el-table::before {
1189
   background-color: #d0d3da;
1156
   background-color: #d0d3da;
1190
 }
1157
 }
1191
-/* .el-table__fixed-right {
1158
+.el-table__fixed-right {
1192
   width: 150px;
1159
   width: 150px;
1193
   bottom: 20px;
1160
   bottom: 20px;
1194
   height: 100%;
1161
   height: 100%;
1195
-} */
1196
-</style>
1162
+}
1163
+</style>

+ 27 - 27
src/xt_pages/user/doctorAdvice.vue 파일 보기

160
         </el-table-column>
160
         </el-table-column>
161
 
161
 
162
162
163
-        
163
+
164
         <el-table-column
164
         <el-table-column
165
           label="开嘱时间"
165
           label="开嘱时间"
166
           width="180"
166
           width="180"
168
           align="center"
168
           align="center"
169
         >
169
         >
170
           <template slot-scope="scope">
170
           <template slot-scope="scope">
171
-            <span v-if="org_id == 10215">{{ scope.row.start_time | parseTime("{y}-{m}-{d} {h}:{i}") }} </span> 
172
-            <span v-else>{{ scope.row.start_time | parseTime("{y}-{m}-{d} {h}:{i}") }} </span> 
171
+            <span v-if="org_id == 10215">{{ scope.row.start_time | parseTime("{y}-{m}-{d} {h}:{i}") }} </span>
172
+            <span v-else>{{ scope.row.start_time | parseTime("{y}-{m}-{d} {h}:{i}") }} </span>
173
           </template>
173
           </template>
174
         </el-table-column>
174
         </el-table-column>
175
         <el-table-column
175
         <el-table-column
968
             <el-col :span="14">
968
             <el-col :span="14">
969
               <el-form-item label="药品规格 :" prop="advice_desc">
969
               <el-form-item label="药品规格 :" prop="advice_desc">
970
                 <el-col :span="6">
970
                 <el-col :span="6">
971
-               
971
+
972
                 <el-autocomplete
972
                 <el-autocomplete
973
                   style="width:100px;"
973
                   style="width:100px;"
974
                   class="inline-input"
974
                   class="inline-input"
1049
                     >
1049
                     >
1050
                     </el-option>
1050
                     </el-option>
1051
                   </el-select>
1051
                   </el-select>
1052
-                
1052
+
1053
                 </el-col>
1053
                 </el-col>
1054
               </el-form-item>
1054
               </el-form-item>
1055
             </el-col>
1055
             </el-col>
1518
             </li>
1518
             </li>
1519
             <li v-if="currentPatient.user_org_id!=10090">
1519
             <li v-if="currentPatient.user_org_id!=10090">
1520
               <span class="name">科别:</span>
1520
               <span class="name">科别:</span>
1521
-             
1521
+
1522
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
1522
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
1523
             </li>
1523
             </li>
1524
             <li>
1524
             <li>
1650
             </li>
1650
             </li>
1651
             <li v-if="currentPatient.user_org_id!=10090">
1651
             <li v-if="currentPatient.user_org_id!=10090">
1652
               <span class="name" style="width:30px;">科:</span>
1652
               <span class="name" style="width:30px;">科:</span>
1653
-             
1653
+
1654
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
1654
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
1655
             </li>
1655
             </li>
1656
             <li v-if="currentPatient.user_org_id!=10090">
1656
             <li v-if="currentPatient.user_org_id!=10090">
1657
               <span class="name" style="width:30px;">区:</span>
1657
               <span class="name" style="width:30px;">区:</span>
1658
-             
1658
+
1659
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
1659
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
1660
             </li>
1660
             </li>
1661
             <li v-if="currentPatient.user_org_id!=10090">
1661
             <li v-if="currentPatient.user_org_id!=10090">
1662
               <span class="name" style="width:30px;">房:</span>
1662
               <span class="name" style="width:30px;">房:</span>
1663
-              
1663
+
1664
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
1664
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
1665
             </li>
1665
             </li>
1666
             <li v-if="currentPatient.user_org_id!=10090">
1666
             <li v-if="currentPatient.user_org_id!=10090">
2223
           }
2223
           }
2224
 
2224
 
2225
           console.log("2323223",this.adviceForm)
2225
           console.log("2323223",this.adviceForm)
2226
-        
2226
+
2227
           EditNewDoctorAdvice(
2227
           EditNewDoctorAdvice(
2228
             this.patientID,
2228
             this.patientID,
2229
             this.adviceForm.id,
2229
             this.adviceForm.id,
2277
       });
2277
       });
2278
     },
2278
     },
2279
     submitgroupAdvice(formName) {
2279
     submitgroupAdvice(formName) {
2280
-     
2280
+
2281
       this.addLoading = true;
2281
       this.addLoading = true;
2282
       this.$refs[formName].validate(valid => {
2282
       this.$refs[formName].validate(valid => {
2283
         if (valid) {
2283
         if (valid) {
2290
             remark: this.groupForm.remark,
2290
             remark: this.groupForm.remark,
2291
             parent_id: this.groupForm.parent_id,
2291
             parent_id: this.groupForm.parent_id,
2292
           };
2292
           };
2293
-        
2294
-         
2293
+
2294
+
2295
           var adviceNames = [];
2295
           var adviceNames = [];
2296
           for (const index in this.groupForm.adviceNames) {
2296
           for (const index in this.groupForm.adviceNames) {
2297
             this.groupForm.adviceNames[
2297
             this.groupForm.adviceNames[
2312
             mode = "1-3"
2312
             mode = "1-3"
2313
           }
2313
           }
2314
         console.log("长期医嘱3333",submitForm)
2314
         console.log("长期医嘱3333",submitForm)
2315
-       
2315
+
2316
         if(this.private_drug_config != null&&this.private_drug_config.drug_start == 1){
2316
         if(this.private_drug_config != null&&this.private_drug_config.drug_start == 1){
2317
               for(let index=0;index<submitForm.adviceNames.length;index++){
2317
               for(let index=0;index<submitForm.adviceNames.length;index++){
2318
                   for(let i=0;i<this.medicals.length;i++){
2318
                   for(let i=0;i<this.medicals.length;i++){
2324
               }
2324
               }
2325
           }
2325
           }
2326
           console.log("模板数据",submitForm)
2326
           console.log("模板数据",submitForm)
2327
-        
2327
+
2328
           CreateNewGroupAdvice(this.patientID, 0, submitForm, mode).then(
2328
           CreateNewGroupAdvice(this.patientID, 0, submitForm, mode).then(
2329
             response => {
2329
             response => {
2330
               if (response.data.state == 0) {
2330
               if (response.data.state == 0) {
2417
               this.adviceForm.advice_name = arr[0]
2417
               this.adviceForm.advice_name = arr[0]
2418
           }
2418
           }
2419
           console.log("222222",this.adviceForm)
2419
           console.log("222222",this.adviceForm)
2420
-         
2420
+
2421
           CreateNewDoctorAdvice(this.patientID, this.adviceForm, mode).then(
2421
           CreateNewDoctorAdvice(this.patientID, this.adviceForm, mode).then(
2422
             response => {
2422
             response => {
2423
               if (response.data.state == 0) {
2423
               if (response.data.state == 0) {
3028
           row_key: this.rowKey,
3028
           row_key: this.rowKey,
3029
           table: []
3029
           table: []
3030
         };
3030
         };
3031
-      
3031
+
3032
         if (item.id in childMap) {
3032
         if (item.id in childMap) {
3033
           for (const key in childMap[item.id]) {
3033
           for (const key in childMap[item.id]) {
3034
             this.rowKey++;
3034
             this.rowKey++;
3068
     },
3068
     },
3069
 
3069
 
3070
     openEdit(index, row) {
3070
     openEdit(index, row) {
3071
-      
3071
+
3072
       this.currentIndex = index;
3072
       this.currentIndex = index;
3073
       (this.dialogTitle = "修改医嘱"), (this.isEdit = true);
3073
       (this.dialogTitle = "修改医嘱"), (this.isEdit = true);
3074
 
3074
 
4038
       });
4038
       });
4039
     },
4039
     },
4040
     submitNameForm(formName) {
4040
     submitNameForm(formName) {
4041
-       
4041
+
4042
        if(this.src_type == ""){
4042
        if(this.src_type == ""){
4043
           this.nameForm.way = 0
4043
           this.nameForm.way = 0
4044
           this.nameForm.drug_id = 0
4044
           this.nameForm.drug_id = 0
4049
           this.nameForm.advice_name = arr[0]
4049
           this.nameForm.advice_name = arr[0]
4050
        }
4050
        }
4051
       console.log("医嘱2222",this.nameForm)
4051
       console.log("医嘱2222",this.nameForm)
4052
-     
4052
+
4053
       var _this = this;
4053
       var _this = this;
4054
       this.$refs[formName].validate(valid => {
4054
       this.$refs[formName].validate(valid => {
4055
         if (valid) {
4055
         if (valid) {
4355
     // 获取勾选中的行
4355
     // 获取勾选中的行
4356
     getPrintInfo(ids) {
4356
     getPrintInfo(ids) {
4357
       console.log("23332332323232",this.adviceType,"33333333",this.stopType)
4357
       console.log("23332332323232",this.adviceType,"33333333",this.stopType)
4358
-     
4358
+
4359
       getPrintInfo({ids:ids},this.adviceType,this.stopType).then(response => {
4359
       getPrintInfo({ids:ids},this.adviceType,this.stopType).then(response => {
4360
         if (response.data.state === 1) {
4360
         if (response.data.state === 1) {
4361
           var doctoradvice = response.data.data.doctoradvice;
4361
           var doctoradvice = response.data.data.doctoradvice;
4362
           console.log("doctoradvice", doctoradvice);
4362
           console.log("doctoradvice", doctoradvice);
4363
-         
4363
+
4364
           this.dataAdvice = doctoradvice;
4364
           this.dataAdvice = doctoradvice;
4365
           if (this.adviceType === 3 || this.adviceType === 2 || this.adviceType == 4) {
4365
           if (this.adviceType === 3 || this.adviceType === 2 || this.adviceType == 4) {
4366
-           
4366
+
4367
             this.lstableData = this.dataAdvice;
4367
             this.lstableData = this.dataAdvice;
4368
-            
4368
+
4369
           } else if (this.adviceType === 1) {
4369
           } else if (this.adviceType === 1) {
4370
             this.cqtableData = doctoradvice;
4370
             this.cqtableData = doctoradvice;
4371
           }
4371
           }
4503
             this.private_drug_config = response.data.data.private_drug_config
4503
             this.private_drug_config = response.data.data.private_drug_config
4504
             console.log("medicals",medicalList)
4504
             console.log("medicals",medicalList)
4505
             this.medicals = medicalList
4505
             this.medicals = medicalList
4506
-          
4506
+
4507
       })
4507
       })
4508
     },
4508
     },
4509
     changeDrugNameTwo(name){
4509
     changeDrugNameTwo(name){
4514
         if (this.all_drug[i].drug_name == name) {
4514
         if (this.all_drug[i].drug_name == name) {
4515
             this.drugSpec = this.all_drug[i].drug_specs
4515
             this.drugSpec = this.all_drug[i].drug_specs
4516
           }
4516
           }
4517
-       }   
4517
+       }
4518
     },
4518
     },
4519
    changeDrugDescTwo(name){
4519
    changeDrugDescTwo(name){
4520
       this.current_drug_spec = name
4520
       this.current_drug_spec = name
4611
 
4611
 
4612
       handleSelect1(val){
4612
       handleSelect1(val){
4613
         this.drug_id = val.drug_id
4613
         this.drug_id = val.drug_id
4614
-        
4614
+
4615
       },
4615
       },
4616
       handleSelect(val){
4616
       handleSelect(val){
4617
         this.src_type = 1
4617
         this.src_type = 1