XMLWAN 3 年前
父节点
当前提交
674b97b41c

+ 4 - 1
src/xt_pages/stock/drugs/inventory.vue 查看文件

66
             </el-table-column>
66
             </el-table-column>
67
             <el-table-column prop="name" label="盘点人" align="center">
67
             <el-table-column prop="name" label="盘点人" align="center">
68
                 <template slot-scope="scope">
68
                 <template slot-scope="scope">
69
-                  {{getDoctorName(scope.row.creator)}}
69
+                  {{getDoctorName(scope.row.creater)}}
70
                 </template>
70
                 </template>
71
             </el-table-column>
71
             </el-table-column>
72
             <el-table-column prop="name" label="审核日期" align="center">
72
             <el-table-column prop="name" label="审核日期" align="center">
717
           }
717
           }
718
           console.log("params2332332",params)
718
           console.log("params2332332",params)
719
           getDrugInventoryList(params).then(response=>{
719
           getDrugInventoryList(params).then(response=>{
720
+
720
             if(response.data.state == 1){
721
             if(response.data.state == 1){
721
               this.total =  response.data.data.total
722
               this.total =  response.data.data.total
722
               this.tableList = response.data.data.list
723
               this.tableList = response.data.data.list
724
+              console.log("09999999",this.tableList)
723
               console.log("表格",this.tableList)
725
               console.log("表格",this.tableList)
724
               this.doctorList =  response.data.data.doctorList
726
               this.doctorList =  response.data.data.doctorList
725
               console.log("医生",this.doctorList)
727
               console.log("医生",this.doctorList)
728
+
726
             }
729
             }
727
           })
730
           })
728
         },
731
         },

+ 23 - 18
src/xt_pages/stock/drugs/inventoryDetails.vue 查看文件

36
                 >搜索</el-button
36
                 >搜索</el-button
37
                 >
37
                 >
38
             </div>
38
             </div>
39
-            <div>
39
+            <!-- <div>
40
                 <el-button size="small" type="primary" @click="print">打印</el-button>
40
                 <el-button size="small" type="primary" @click="print">打印</el-button>
41
                 <el-button size="small" type="primary">导出</el-button>
41
                 <el-button size="small" type="primary">导出</el-button>
42
-            </div>
42
+            </div> -->
43
         </div>
43
         </div>
44
         <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
44
         <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
45
-            <el-table-column prop="date" label="药品名称" width="100">
45
+            <el-table-column prop="date" label="药品名称" width="100" align="center">
46
                <template slot-scope="scope">
46
                <template slot-scope="scope">
47
                  {{scope.row.drug_name}}
47
                  {{scope.row.drug_name}}
48
                </template>
48
                </template>
49
             </el-table-column>
49
             </el-table-column>
50
-            <el-table-column  prop="name" label="规格" width="100">
50
+            <el-table-column  prop="name" label="规格" width="100"  align="center">
51
               <template slot-scope="scope">
51
               <template slot-scope="scope">
52
                  {{scope.row.specification_name}}
52
                  {{scope.row.specification_name}}
53
                </template>
53
                </template>
54
             </el-table-column>
54
             </el-table-column>
55
-            <el-table-column prop="name" label="单位" width="100">
55
+            <el-table-column prop="name" label="单位" width="100"  align="center">
56
                 <template slot-scope="scope">
56
                 <template slot-scope="scope">
57
-                  {{scope.row.warehouseing_unit}}
57
+                  {{scope.row.warehousing_unit}}
58
                </template>
58
                </template>
59
             </el-table-column>
59
             </el-table-column>
60
-            <el-table-column prop="name" label="库存数量" width="100">
60
+            <el-table-column prop="name" label="库存数量" width="100"  align="center">
61
                 <template slot-scope="scope">
61
                 <template slot-scope="scope">
62
                   {{scope.row.total}}
62
                   {{scope.row.total}}
63
                 </template> 
63
                 </template> 
64
             </el-table-column>
64
             </el-table-column>
65
-            <el-table-column prop="name" label="进价" width="100">
65
+            <el-table-column prop="name" label="进价" width="100"  align="center">
66
                 <template slot-scope="scope">
66
                 <template slot-scope="scope">
67
                    {{scope.row.last_price}}
67
                    {{scope.row.last_price}}
68
                 </template> 
68
                 </template> 
69
             </el-table-column>
69
             </el-table-column>
70
-            <el-table-column prop="name" label="零售价" width="100">
70
+            <el-table-column prop="name" label="零售价" width="100"  align="center">
71
                 <template slot-scope="scope">
71
                 <template slot-scope="scope">
72
                   {{scope.row.retail_price}}
72
                   {{scope.row.retail_price}}
73
                 </template> 
73
                 </template> 
74
             </el-table-column>
74
             </el-table-column>
75
-            <el-table-column prop="name"  label="零售总价" width="100">
75
+            <el-table-column prop="name"  label="零售总价" width="100"  align="center">
76
                 <template slot-scope="scope">
76
                 <template slot-scope="scope">
77
                   {{scope.row.count * scope.row.retail_price}}
77
                   {{scope.row.count * scope.row.retail_price}}
78
                 </template> 
78
                 </template> 
79
             </el-table-column>
79
             </el-table-column>
80
-            <el-table-column prop="name" label="产地" width="100">
80
+            <el-table-column prop="name" label="产地" width="100"  align="center">
81
                 <template slot-scope="scope">
81
                 <template slot-scope="scope">
82
                    {{scope.row.drug_origin_place}}
82
                    {{scope.row.drug_origin_place}}
83
                 </template> 
83
                 </template> 
84
             </el-table-column>
84
             </el-table-column>
85
-            <el-table-column prop="name" label="生产厂商" width="100">
85
+            <el-table-column prop="name" label="生产厂商" width="100"  align="center">
86
                 <template slot-scope="scope">
86
                 <template slot-scope="scope">
87
                   {{scope.row.manufacturer}}
87
                   {{scope.row.manufacturer}}
88
                 </template> 
88
                 </template> 
89
             </el-table-column>
89
             </el-table-column>
90
-            <el-table-column prop="name" label="实盘点" width="100">
90
+            <el-table-column prop="name" label="实盘点" width="100"  align="center">
91
                <template slot-scope="scope">
91
                <template slot-scope="scope">
92
                   {{scope.row.count}}
92
                   {{scope.row.count}}
93
                 </template> 
93
                 </template> 
94
             </el-table-column>
94
             </el-table-column>
95
-            <el-table-column  prop="name" label="亏损价格" width="100">
95
+            <el-table-column  prop="name" label="亏损价格" width="100"  align="center">
96
                <template slot-scope="scope">
96
                <template slot-scope="scope">
97
                
97
                
98
                 </template>  
98
                 </template>  
99
             </el-table-column>
99
             </el-table-column>
100
-            <el-table-column prop="name" label="生产日期" width="100">
100
+            <el-table-column prop="name" label="生产日期" width="100"  align="center">
101
                 <template slot-scope="scope">
101
                 <template slot-scope="scope">
102
                   {{getTime(scope.row.product_date)}}
102
                   {{getTime(scope.row.product_date)}}
103
                 </template>  
103
                 </template>  
104
             </el-table-column>
104
             </el-table-column>
105
-            <el-table-column prop="name" label="有效日期" width="100">
105
+            <el-table-column prop="name" label="有效日期" width="100"  align="center">
106
                 <template slot-scope="scope">
106
                 <template slot-scope="scope">
107
                    {{getTime(scope.row.expiry_date)}}
107
                    {{getTime(scope.row.expiry_date)}}
108
                 </template>  
108
                 </template>  
109
             </el-table-column>
109
             </el-table-column>
110
-            <el-table-column
110
+            <!-- <el-table-column
111
             fixed="right"
111
             fixed="right"
112
             width="100"
112
             width="100"
113
             label="操作">
113
             label="操作">
115
                     <el-button type="text" size="small">删除</el-button>
115
                     <el-button type="text" size="small">删除</el-button>
116
                     <el-button type="text" size="small">编辑</el-button>
116
                     <el-button type="text" size="small">编辑</el-button>
117
                 </template>
117
                 </template>
118
-            </el-table-column>
118
+            </el-table-column> -->
119
         </el-table>
119
         </el-table>
120
         <el-pagination
120
         <el-pagination
121
             @size-change="handleSizeChange"
121
             @size-change="handleSizeChange"
133
 </template>
133
 </template>
134
 
134
 
135
 <script>
135
 <script>
136
+import { uParseTime } from '@/utils/tools'
136
 import { getInventoryDetailList } from "@/api/drug/drug"
137
 import { getInventoryDetailList } from "@/api/drug/drug"
137
 export default {
138
 export default {
138
     name: "inventory",
139
     name: "inventory",
184
           })   
185
           })   
185
         },
186
         },
186
          getTime(val) {
187
          getTime(val) {
188
+          console.log("val3233232322323",val)
189
+         if(val == undefined){
190
+           return  ""
191
+         }
187
          if(val < 0){
192
          if(val < 0){
188
             return ""
193
             return ""
189
           }
194
           }

+ 2 - 1
src/xt_pages/workforce/next_remind_print.vue 查看文件

64
                  <span v-if="org_id!=9987">
64
                  <span v-if="org_id!=9987">
65
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''"> 
65
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''"> 
66
                         <span v-if="org_id!=10131">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
66
                         <span v-if="org_id!=10131">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
67
-                        <span v-if="org_id==10131">{{getDialysisDialyszerPerfusionOne(main_collection.prescription.patient_id)}}</span> 
67
+                        <!-- <span v-if="org_id==10131">{{getDialysisDialyszerPerfusionOne(main_collection.prescription.patient_id)}}</span>  -->
68
+                         <span v-if="org_id==10131 || org_id==9671">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
68
                      </span>
69
                      </span>
69
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span> 
70
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span> 
70
                   </span>
71
                   </span>

+ 7 - 3
src/xt_pages/workforce/remind_print.vue 查看文件

61
                 </td>
61
                 </td>
62
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus ==1">
62
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus ==1">
63
                   <span v-if="org_id!=9987">
63
                   <span v-if="org_id!=9987">
64
-                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''"> 
65
-                       <span v-if="org_id!=10131">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
66
-                       <span v-if="org_id==10131">{{getDialysisDialyszerPerfusionOne(main_collection.prescription.patient_id)}}</span> 
64
+                     <span > 
65
+                       <span v-if="org_id!=10131 && main_collection.prescription.dialyzer_perfusion_apparatus!=''">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
66
+                       <!-- <span v-if="org_id==10131 || org_id==9671">{{getDialysisDialyszerPerfusionOne(main_collection.prescription.patient_id)}}</span>  -->
67
+                       <span v-if="org_id==10131 || org_id==9671">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
67
                       </span>
68
                       </span>
68
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span> 
69
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span> 
69
                   </span>
70
                   </span>
137
     created() {
138
     created() {
138
       this.getPrintList()
139
       this.getPrintList()
139
       this.org_id = this.$store.getters.xt_user.org.id
140
       this.org_id = this.$store.getters.xt_user.org.id
141
+      console.log("org_id23322323",this.org_id)
140
     //  this.currentDate = this.getCurrentDate()
142
     //  this.currentDate = this.getCurrentDate()
141
       this.modeOptions = this.$store.getters.treatment_mode
143
       this.modeOptions = this.$store.getters.treatment_mode
142
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
144
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
152
        getScheduleList(params).then(response=>{
154
        getScheduleList(params).then(response=>{
153
          if(response.data.state ==1){
155
          if(response.data.state ==1){
154
            var list = response.data.data.list
156
            var list = response.data.data.list
157
+           console.log("list2323323",list)
155
            for(let i=0;i<list.length;i++){
158
            for(let i=0;i<list.length;i++){
156
               list[i].sort = list[i].number.sort
159
               list[i].sort = list[i].number.sort
157
            }
160
            }
393
             }
396
             }
394
           }
397
           }
395
         }
398
         }
399
+        console.log("name232333223",name)
396
        return name
400
        return name
397
      }
401
      }
398
     },
402
     },