XMLWAN 2 лет назад
Родитель
Сommit
fe70ba9912

+ 2 - 11
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue Просмотреть файл

@@ -1153,17 +1153,11 @@
1153 1153
                             class="advice-name"
1154 1154
                             style="padding-left:7px;"
1155 1155
                           >
1156
-                          <!-- <span v-if="advice.parent_id > 0">-.-.-></span> -->
1157
-                            
1158
-                            <!-- <span>{{ advice[0].advice_name }}</span> -->
1159
-                             <span>{{ advice[advice_index].parent_id }}</span>
1160
-                            <!-- <span>{{advice[0].children[0].advice_name}}</span> -->
1161
-
1156
+                            <span v-if="advice[0].parent_id > 0">---></span>
1157
+                            <span>{{ advice[0].advice_name }}</span>
1162 1158
                             <span v-if=" advice[advice_index] && advice[0].advice_desc != undefined">
1163 1159
                                ({{ advice[0].advice_desc}}{{ advice[0].drug_spec_unit }} )
1164 1160
                             </span>
1165
-
1166
-
1167 1161
                             <span v-if="advice[0].prescribing_number"
1168 1162
                               >&nbsp;&nbsp; {{ advice[0].prescribing_number
1169 1163
                               }}{{ advice[0].prescribing_number_unit }}</span
@@ -1179,7 +1173,6 @@
1179 1173
                               "
1180 1174
                               >{{ advice[0].delivery_way }}</span
1181 1175
                             >
1182
-                            
1183 1176
                             <span
1184 1177
                               v-if="
1185 1178
                                 advice[0].parent_id == 0 &&
@@ -1197,8 +1190,6 @@
1197 1190
                               >({{ advice[0].remark }})</span
1198 1191
                             >
1199 1192
                           </td>
1200
-
1201
-
1202 1193
                           <td height="35px">
1203 1194
                             <span
1204 1195
                               v-if="

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderFortyEight.vue Просмотреть файл

@@ -990,7 +990,7 @@
990 990
             </td>
991 991
             <td style="min-width: 80px">
992 992
               置换量
993
-              <br />L
993
+              <br />ml
994 994
             </td>
995 995
             <td style="min-width: 80px">
996 996
               血压

+ 118 - 197
src/xt_pages/hospitalStation/components/deskPrescription.vue Просмотреть файл

@@ -286,25 +286,18 @@
286 286
                     </el-table-column>
287 287
                     <el-table-column label="库存" width="60">
288 288
                       <template slot-scope="scope">
289
-                        <!-- <span
290
-                          v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10188 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278">
291
-                          <span
292
-                              v-if="scope.row.count/scope.row.min_number>0">{{ Math.floor(scope.row.count / scope.row.min_number) }}{{ scope.row.max_unit }}</span>
293
-                          <span
294
-                              v-if="scope.row.count%scope.row.min_number>0"> {{ scope.row.count % scope.row.min_number }}{{ scope.row.min_unit }}</span>
295
-                        </span>
296
-                        <span v-else> {{ scope.row.total }}{{ scope.row.total ? scope.row.min_unit : '' }}</span> -->
297
-
298
-                          <span v-if="scope.row.sum_count/scope.row.min_number>0">{{ Math.floor(scope.row.sum_count / scope.row.min_number) }}{{ scope.row.max_unit }}</span>
299
-                          <span v-if="scope.row.sum_count%scope.row.min_number>0"> {{ scope.row.sum_count % scope.row.min_number }}{{ scope.row.min_unit }}</span>
300
-
289
+                                          <span
290
+                                              v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10188 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278 || org_id == 10217">
291
+                                              <span
292
+                                                  v-if="scope.row.count/scope.row.min_number>0">{{ Math.floor(scope.row.count / scope.row.min_number) }}{{ scope.row.max_unit }}</span>
293
+                                              <span
294
+                                                  v-if="scope.row.count%scope.row.min_number>0"> {{ scope.row.count % scope.row.min_number }}{{ scope.row.min_unit }}</span>
295
+                                            </span>
296
+                        <span v-else> {{ scope.row.total }}{{ scope.row.total ? scope.row.min_unit : '' }}</span>
301 297
                       </template>
302 298
                     </el-table-column>
303 299
                     <el-table-column label="单价" width="40">
304
-                      <template slot-scope="scope">
305
-                        <span v-if="scope.row.batch_retai_price >0">{{scope.row.batch_retai_price}}</span>
306
-                        <span v-else>{{ scope.row.min_price }}</span>
307
-                      </template>
300
+                      <template slot-scope="scope">{{ scope.row.min_price }}</template>
308 301
                     </el-table-column>
309 302
                   </el-table>
310 303
                   <!-- <div>{{3*(2/3)}}</div> -->
@@ -392,12 +385,11 @@
392 385
                     </el-table-column>
393 386
                     <el-table-column label="库存" width="40">
394 387
                       <template slot-scope="scope">
395
-                        <!-- <span
396
-                            v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278">
397
-                            {{ scope.row.stock_count }}
398
-                        </span>
399
-                        <span v-else> {{ scope.row.total }}</span> -->
400
-                        <span>{{scope.row.sum_count}}</span>
388
+                                                <span
389
+                                                    v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278 || org_id == 10217">
390
+                                                    {{ scope.row.stock_count }}
391
+                                                </span>
392
+                        <span v-else> {{ scope.row.total }}</span>
401 393
                       </template>
402 394
                     </el-table-column>
403 395
                     <el-table-column label="单价" width="40">
@@ -2684,7 +2676,6 @@ export default {
2684 2676
       this.$refs.additionalCharges.show()
2685 2677
     },
2686 2678
     selectDrugs(selection, row) {
2687
-    if (row.sum_count <= 0) {
2688 2679
       if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217) {
2689 2680
         if (row.count <= 0) {
2690 2681
           if (selection) {
@@ -2699,33 +2690,19 @@ export default {
2699 2690
           this.$message.error(row.drug_name + '库存不足')
2700 2691
           return
2701 2692
         }
2702
-      // if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278) {
2703
-      //   if (row.count <= 0) {
2704
-      //     if (selection) {
2705
-      //       selection.forEach(row => {
2706
-      //         if (row.count <= 0) {
2707
-      //           this.$refs.multipleTable.toggleRowSelection(row)
2708
-      //         }
2709
-      //       })
2710
-      //     } else {
2711
-      //       this.$refs.multipleTable.clearSelection()
2712
-      //     }
2713
-      //     this.$message.error(row.drug_name + '库存不足')
2714
-      //     return
2715
-      //   }
2716
-      // } else {
2717
-      //   if (row.total <= 0) {
2718
-      //     if (selection) {
2719
-      //       selection.forEach(row => {
2720
-      //         if (row.total <= 0) {
2721
-      //           this.$refs.multipleTable.toggleRowSelection(row)
2722
-      //         }
2723
-      //       })
2724
-      //     } else {
2725
-      //       this.$refs.multipleTable.clearSelection()
2726
-      //     }
2727
-      //     this.$message.error(row.drug_name + '库存不足')
2728
-      //     return
2693
+      } else {
2694
+        if (row.total <= 0) {
2695
+          if (selection) {
2696
+            selection.forEach(row => {
2697
+              if (row.total <= 0) {
2698
+                this.$refs.multipleTable.toggleRowSelection(row)
2699
+              }
2700
+            })
2701
+          } else {
2702
+            this.$refs.multipleTable.clearSelection()
2703
+          }
2704
+          this.$message.error(row.drug_name + '库存不足')
2705
+          return
2729 2706
         }
2730 2707
       }
2731 2708
       this.curDrugs = selection
@@ -2985,166 +2962,110 @@ export default {
2985 2962
       this.teamList = row
2986 2963
     },
2987 2964
     selectChange(selection, row) {
2988
-       if(row.type == 3){
2989
-         if(row.sum_count <=0){
2990
-          if(selection){
2965
+      console.log('row', row)
2966
+      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 10188  || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217) {
2967
+        if (row.stock_count <= 0) {
2968
+          if (row.type == 3) {
2969
+            if (selection) {
2991 2970
               selection.forEach(row => {
2992
-                if (row.sum_count <= 0) {
2971
+                if (row.stock_count <= 0) {
2993 2972
                   this.$refs.tables.toggleRowSelection(row)
2994
-                }else{
2995
-                  this.$refs.tables.clearSelection()
2996 2973
                 }
2997
-                this.$message.error(row.project_name + '库存不足')
2998
-                return
2999 2974
               })
2975
+            } else {
2976
+              this.$refs.tables.clearSelection()
2977
+            }
2978
+            this.$message.error(row.project_name + '库存不足')
2979
+            return
2980
+          }
2981
+        }
2982
+      } else {
2983
+        if (row.total <= 0) {
2984
+          if (row.type == 3) {
2985
+            if (selection) {
2986
+              selection.forEach(row => {
2987
+                if (row.total <= 0) {
2988
+                  this.$refs.tables.toggleRowSelection(row)
2989
+                }
2990
+              })
2991
+            } else {
2992
+              this.$refs.tables.clearSelection()
2993
+            }
2994
+            this.$message.error(row.project_name + '库存不足')
2995
+            return
3000 2996
           }
3001 2997
         }
3002
-       }
3003
-      
3004
-        // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278){
3005
-        //    if (row.stock_count <= 0) {
3006
-        //     if (row.type == 3) {
3007
-        //       if (selection) {
3008
-        //         selection.forEach(row => {
3009
-        //           if (row.stock_count <= 0) {
3010
-        //             this.$refs.tables.toggleRowSelection(row)
3011
-        //           }
3012
-        //         })
3013
-        //       } else {
3014
-        //         this.$refs.tables.clearSelection()
3015
-        //       }
3016
-        //       this.$message.error(row.project_name + '库存不足')
3017
-        //       return
3018
-        //     }
3019
-        //   }
3020
-        // }else{
3021
-        //    if (row.total <= 0) {
3022
-        //     if (row.type == 3) {
3023
-        //       if (selection) {
3024
-        //         selection.forEach(row => {
3025
-        //           if (row.total <= 0) {
3026
-        //             this.$refs.tables.toggleRowSelection(row)
3027
-        //           }
3028
-        //         })
3029
-        //       } else {
3030
-        //         this.$refs.tables.clearSelection()
3031
-        //       }
3032
-        //       this.$message.error(row.project_name + '库存不足')
3033
-        //       return
3034
-        //     }
3035
-        //   }
3036
-        // console.log('row', row)
3037
-        // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217){
3038
-        //    if (row.stock_count <= 0) {
3039
-        //     if (row.type == 3) {
3040
-        //       if (selection) {
3041
-        //         selection.forEach(row => {
3042
-        //           if (row.stock_count <= 0) {
3043
-        //             this.$refs.tables.toggleRowSelection(row)
3044
-        //           }
3045
-        //         })
3046
-        //       } else {
3047
-        //         this.$refs.tables.clearSelection()
3048
-        //       }
3049
-        //       this.$message.error(row.project_name + '库存不足')
3050
-        //       return
3051
-        //     }
3052
-        //   }
3053
-        // }else{
3054
-        //    if (row.total <= 0) {
3055
-        //     if (row.type == 3) {
3056
-        //       if (selection) {
3057
-        //         selection.forEach(row => {
3058
-        //           if (row.total <= 0) {
3059
-        //             this.$refs.tables.toggleRowSelection(row)
3060
-        //           }
3061
-        //         })
3062
-        //       } else {
3063
-        //         this.$refs.tables.clearSelection()
3064
-        //       }
3065
-        //       this.$message.error(row.project_name + '库存不足')
3066
-        //       return
3067
-        //     }
3068
-        //   }
3069
-        // }
3070
-        this.teamList.push(row)
3071
-      },
3072
-      getlist() {
3073
-        this.tabProject = []
3074
-        getHisProject().then(response => {
3075
-          if (response.data.state == 1) {
3076
-            var project = response.data.data.project
3077
-            console.log("项目列表",project)
3078
-            for (let i = 0; i < project.length; i++) {
3079
-              let obj = {
3080
-                id: project[i].id,
3081
-                project_name: project[i].project_name,
3082
-                statistical_classification: '',
3083
-                single_dose: project[i].single_dose,
3084
-                delivery_way: project[i].delivery_way,
3085
-                execution_frequency: project[i].execution_frequency,
3086
-                number_days: project[i].number_days,
3087
-                price: project[i].price,
3088
-                medical_code: project[i].medical_code,
3089
-                cus_total: 1,
3090
-                unit: project[i].unit,
3091
-                type: 2,
3092
-                total: project[i].total,
3093
-                is_special_diseases: project[i].disease_directory,
3094
-                project: project[i],
3095
-                stock_count:0,
3096
-                sum_count:0,
3097
-                batch_retai_price:0,
3098
-              }
3099 2998
 
3100
-              this.tabProject.push(obj)
2999
+      }
3000
+      this.teamList.push(row)
3001
+    },
3002
+    getlist() {
3003
+      this.tabProject = []
3004
+      getHisProject().then(response => {
3005
+        if (response.data.state == 1) {
3006
+          var project = response.data.data.project
3007
+          for (let i = 0; i < project.length; i++) {
3008
+            let obj = {
3009
+              id: project[i].id,
3010
+              project_name: project[i].project_name,
3011
+              statistical_classification: '',
3012
+              single_dose: project[i].single_dose,
3013
+              delivery_way: project[i].delivery_way,
3014
+              execution_frequency: project[i].execution_frequency,
3015
+              number_days: project[i].number_days,
3016
+              price: project[i].price,
3017
+              medical_code: project[i].medical_code,
3018
+              cus_total: 1,
3019
+              unit: project[i].unit,
3020
+              type: 2,
3021
+              total: project[i].total,
3022
+              is_special_diseases: project[i].disease_directory,
3023
+              project: project[i],
3024
+              stock_count: 0
3101 3025
             }
3102 3026
 
3103
-            var good_info = response.data.data.good_info
3104
-            console.log("good_info2323232323232323",good_info)
3027
+            this.tabProject.push(obj)
3028
+          }
3105 3029
 
3106
-            for (let i = 0; i < good_info.length; i++) {
3107
-               good_info[i].stock_count = 0
3030
+          var good_info = response.data.data.good_info
3108 3031
 
3109
-               if(good_info[i].batch_retai_price > 0){
3110
-                  good_info[i].packing_price = 0
3111
-                  good_info[i].packing_price = good_info[i].batch_retai_price
3112
-               }
3113
-              if(good_info[i].good_stock_in&&good_info[i].good_stock_in.length >0 ){
3114
-                for(let j=0;j<good_info[i].good_stock_in.length;j++){
3115
-                   good_info[i].stock_count += good_info[i].good_stock_in[j].stock_count
3116
-                }
3117
-              }
3118
-               console.log("耗材列表2323232322332",good_info)
3119
-              let obj = {
3120
-                id: good_info[i].id,
3121
-                project_name: good_info[i].good_name,
3122
-                statistical_classification: '',
3123
-                single_dose: good_info[i].specification_name,
3124
-                delivery_way: '',
3125
-                execution_frequency: '',
3126
-                number_days: 1,
3127
-                cus_total: 1,
3128
-                price: good_info[i].packing_price,
3129
-                medical_code: good_info[i].medical_insurance_number,
3130
-                unit: this.getGoodUnit(good_info[i].good_unit),
3131
-                type: 3,
3132
-                total: good_info[i].total,
3133
-                is_special_diseases: good_info[i].is_special_diseases,
3134
-                good_info: good_info[i],
3135
-                stock_count:good_info[i].stock_count,
3136
-                sum_count:good_info[i].sum_count,
3137
-                batch_retai_price:good_info[i].batch_retai_price
3032
+          for (let i = 0; i < good_info.length; i++) {
3033
+            good_info[i].stock_count = 0
3034
+            if (good_info[i].good_stock_in&&good_info[i].good_stock_in.length > 0) {
3035
+              for (let j = 0; j < good_info[i].good_stock_in.length; j++) {
3036
+                good_info[i].stock_count += good_info[i].good_stock_in[j].stock_count
3138 3037
               }
3139
-              this.tabProject.push(obj)
3140 3038
             }
3141
-
3142
-            console.log("猎豹33323232323223323223233223",this.tabProject)
3143
-            this.allProject = this.tabProject
3039
+            let obj = {
3040
+              id: good_info[i].id,
3041
+              project_name: good_info[i].good_name,
3042
+              statistical_classification: '',
3043
+              single_dose: good_info[i].specification_name,
3044
+              delivery_way: '',
3045
+              execution_frequency: '',
3046
+              number_days: 1,
3047
+              cus_total: 1,
3048
+              price: good_info[i].packing_price,
3049
+              medical_code: good_info[i].medical_insurance_number,
3050
+              unit: this.getGoodUnit(good_info[i].good_unit),
3051
+              type: 3,
3052
+              total: good_info[i].total,
3053
+              is_special_diseases: good_info[i].is_special_diseases,
3054
+              good_info: good_info[i],
3055
+              stock_count: good_info[i].stock_count
3056
+            }
3057
+            this.tabProject.push(obj)
3144 3058
           }
3145
-        })
3146
-      }, 
3147
-      deepClone(source) {
3059
+
3060
+          this.allProject = this.tabProject
3061
+
3062
+
3063
+
3064
+
3065
+        }
3066
+      })
3067
+
3068
+    }, deepClone(source) {
3148 3069
       if (!source && typeof source !== 'object') {
3149 3070
         throw new Error('error arguments', 'shallowClone')
3150 3071
       }
@@ -3177,7 +3098,7 @@ export default {
3177 3098
       })
3178 3099
     },
3179 3100
     selectTeam(row) {
3180
-      console.log("时间233232322322333232",row)
3101
+      console.log(row)
3181 3102
       // var arr = []
3182 3103
       // for (let i = 0; i < row.length; i++) {
3183 3104
       //   arr.push(row[i].item_id)

+ 8 - 8
src/xt_pages/hospitalStation/doctorDesk.vue Просмотреть файл

@@ -993,14 +993,14 @@
993 993
             return false
994 994
           } else {
995 995
             var drugs = response.data.data.drugs
996
-            // for(let i=0;i<drugs.length;i++){
997
-            //     drugs[i].count = 0
998
-            //   if(drugs[i].stock_in.length > 0){
999
-            //      for(let j=0;j<drugs[i].stock_in.length;j++){
1000
-            //         drugs[i].count += (drugs[i].stock_in[j].stock_max_number * drugs[i].min_number + drugs[i].stock_in[j].stock_min_number)
1001
-            //      }
1002
-            //   }
1003
-            // }
996
+            for(let i=0;i<drugs.length;i++){
997
+                drugs[i].count = 0
998
+              if(drugs[i].stock_in.length > 0){
999
+                 for(let j=0;j<drugs[i].stock_in.length;j++){
1000
+                    drugs[i].count += (drugs[i].stock_in[j].stock_max_number * drugs[i].min_number + drugs[i].stock_in[j].stock_min_number)
1001
+                 }
1002
+              }
1003
+            }
1004 1004
             
1005 1005
             this.drugs = drugs
1006 1006
             console.log("所有药品信息",this.drugs)

+ 2 - 2
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue Просмотреть файл

@@ -85,7 +85,7 @@
85 85
 
86 86
 
87 87
           <div>
88
-           <el-button size="small"
88
+           <!-- <el-button size="small"
89 89
                       @click="openZb(1)"
90 90
                       type="primary">登记
91 91
           </el-button>
@@ -98,7 +98,7 @@
98 98
             <el-button   size="small"
99 99
                        @click="openZb(3)"
100 100
                        type="primary">撤销记账
101
-           </el-button>
101
+           </el-button> -->
102 102
 
103 103
 
104 104
             <el-button v-loading="loadingone" size="small"

+ 37 - 146
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Просмотреть файл

@@ -286,22 +286,16 @@
286 286
                                         </el-table-column>
287 287
                                         <el-table-column label="库存" width="60">
288 288
                                             <template slot-scope="scope">
289
-                                              <!-- <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id ==9956 || org_id == 10188 || org_id == 10191 || org_id == 10278">
290 289
                                               <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id ==9956 || org_id == 10188 || org_id == 10191 || org_id == 10278 || org_id == 10217">
291 290
                                                <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
292 291
                                                <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
293 292
                                               </span>
294
-                                              <span v-else> {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}}</span> -->
295
-                                                <span v-if="scope.row.sum_count/scope.row.min_number>0">{{ Math.floor(scope.row.sum_count / scope.row.min_number) }}{{ scope.row.max_unit }}</span>
296
-                                                <span v-if="scope.row.sum_count%scope.row.min_number>0"> {{ scope.row.sum_count % scope.row.min_number }}{{ scope.row.min_unit }}</span>
293
+                                              <span v-else> {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}}</span>
297 294
 
298 295
                                             </template>
299 296
                                         </el-table-column>
300 297
                                         <el-table-column label="单价" width="40">
301
-                                            <template slot-scope="scope">
302
-                                              <span v-if="scope.row.batch_retai_price >0">{{scope.row.batch_retai_price}}</span>
303
-                                              <span v-else>{{ scope.row.min_price }}</span>
304
-                                           </template>
298
+                                            <template slot-scope="scope">{{ scope.row.min_price }}</template>
305 299
                                         </el-table-column>
306 300
                                     </el-table>
307 301
                                     <!-- <div>{{3*(2/3)}}</div> -->
@@ -389,18 +383,14 @@
389 383
                                         </el-table-column>
390 384
                                         <el-table-column label="库存" width="40">
391 385
                                             <template slot-scope="scope">
392
-                                              <!-- <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10188 || org_id == 10191 || org_id == 10278">
393 386
                                               <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10188 || org_id == 10191 || org_id == 10278 || org_id == 10217">
394 387
                                                    {{scope.row.stock_count}}
395 388
                                               </span>
396
-                                              <span v-else> {{ scope.row.total }}</span> -->
397
-                                              {{scope.row.sum_count}}
389
+                                              <span v-else> {{ scope.row.total }}</span>
398 390
                                             </template>
399 391
                                         </el-table-column>
400 392
                                         <el-table-column label="单价" width="40">
401
-                                            <template slot-scope="scope">
402
-                                              {{ scope.row.price }}
403
-                                            </template>
393
+                                            <template slot-scope="scope">{{ scope.row.price }}</template>
404 394
                                         </el-table-column>
405 395
                                     </el-table>
406 396
                                 </div>
@@ -2677,48 +2667,6 @@
2677 2667
         this.$refs.additionalCharges.show()
2678 2668
       },
2679 2669
       selectDrugs(selection, row) {
2680
-      if (row.sum_count <= 0) {
2681
-          if (selection) {
2682
-            selection.forEach(row => {
2683
-              if (row.count <= 0) {
2684
-                this.$refs.multipleTable.toggleRowSelection(row)
2685
-              }
2686
-            })
2687
-          } else {
2688
-            this.$refs.multipleTable.clearSelection()
2689
-          }
2690
-          this.$message.error(row.drug_name + '库存不足')
2691
-          return
2692
-       }
2693
-        // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278){
2694
-        //     if (row.count <= 0) {
2695
-        //       if (selection) {
2696
-        //         selection.forEach(row => {
2697
-        //           if (row.count <= 0) {
2698
-        //             this.$refs.multipleTable.toggleRowSelection(row)
2699
-        //           }
2700
-        //         })
2701
-        //       } else {
2702
-        //         this.$refs.multipleTable.clearSelection()
2703
-        //       }
2704
-        //       this.$message.error(row.drug_name + '库存不足')
2705
-        //       return
2706
-        //     }
2707
-        // }else{
2708
-        //    if (row.total <= 0) {
2709
-        //       if (selection) {
2710
-        //         selection.forEach(row => {
2711
-        //           if (row.total <= 0) {
2712
-        //             this.$refs.multipleTable.toggleRowSelection(row)
2713
-        //           }
2714
-        //         })
2715
-        //       } else {
2716
-        //         this.$refs.multipleTable.clearSelection()
2717
-        //       }
2718
-        //       this.$message.error(row.drug_name + '库存不足')
2719
-        //       return
2720
-        //     }
2721
-        // }
2722 2670
         console.log('selection', selection)
2723 2671
         console.log('row', row)
2724 2672
         if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217){
@@ -2914,7 +2862,7 @@
2914 2862
                   single_dose: temp[b].single_dose,
2915 2863
                   delivery_way: temp[b].delivery_way,
2916 2864
                   execution_frequency: temp[b].execution_frequency,
2917
-                  retail_price: temp[b].prescribing_number_unit == temp[b].max_unit ? temp[b].retail_price.toString() : temp[b].batch_retai_price.toString(),
2865
+                  retail_price: temp[b].prescribing_number_unit == temp[b].max_unit ? temp[b].retail_price.toString() : temp[b].min_price.toString(),
2918 2866
                   remark: '',
2919 2867
                   day: temp[b].drug_day ? temp[b].drug_day : 1,
2920 2868
                   prescribing_number: temp[b].prescribing_number,
@@ -2998,88 +2946,42 @@
2998 2946
         this.teamList = row
2999 2947
       },
3000 2948
       selectChange(selection, row) {
3001
-        if(row.type == 3){
3002
-          if(row.sum_count <=0){
3003
-            if(selection){
2949
+        console.log('row', row)
2950
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217){
2951
+           if (row.stock_count <= 0) {
2952
+            if (row.type == 3) {
2953
+              if (selection) {
3004 2954
                 selection.forEach(row => {
3005
-                  if (row.sum_count <= 0) {
2955
+                  if (row.stock_count <= 0) {
3006 2956
                     this.$refs.tables.toggleRowSelection(row)
3007
-                  }else{
3008
-                    this.$refs.tables.clearSelection()
3009 2957
                   }
3010
-                  this.$message.error(row.project_name + '库存不足')
3011
-                  return
3012 2958
                 })
2959
+              } else {
2960
+                this.$refs.tables.clearSelection()
2961
+              }
2962
+              this.$message.error(row.project_name + '库存不足')
2963
+              return
3013 2964
             }
3014 2965
           }
2966
+        }else{
2967
+           if (row.total <= 0) {
2968
+            if (row.type == 3) {
2969
+              if (selection) {
2970
+                selection.forEach(row => {
2971
+                  if (row.total <= 0) {
2972
+                    this.$refs.tables.toggleRowSelection(row)
2973
+                  }
2974
+                })
2975
+              } else {
2976
+                this.$refs.tables.clearSelection()
2977
+              }
2978
+              this.$message.error(row.project_name + '库存不足')
2979
+              return
2980
+            }
2981
+          }
2982
+
3015 2983
         }
3016
-       
3017
-        // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278){
3018
-        //    if (row.stock_count <= 0) {
3019
-        //     if (row.type == 3) {
3020
-        //       if (selection) {
3021
-        //         selection.forEach(row => {
3022
-        //           if (row.stock_count <= 0) {
3023
-        //             this.$refs.tables.toggleRowSelection(row)
3024
-        //           }
3025
-        //         })
3026
-        //       } else {
3027
-        //         this.$refs.tables.clearSelection()
3028
-        //       }
3029
-        //       this.$message.error(row.project_name + '库存不足')
3030
-        //       return
3031
-        //     }
3032
-        //   }
3033
-        // }else{
3034
-        //    if (row.total <= 0) {
3035
-        //     if (row.type == 3) {
3036
-        //       if (selection) {
3037
-        //         selection.forEach(row => {
3038
-        //           if (row.total <= 0) {
3039
-        //             this.$refs.tables.toggleRowSelection(row)
3040
-        //           }
3041
-        //         })
3042
-        //       } else {
3043
-        //         this.$refs.tables.clearSelection()
3044
-        //       }
3045
-        //       this.$message.error(row.project_name + '库存不足')
3046
-        //       return
3047
-        //     }
3048
-        //   }
3049
-       // console.log('row', row)
3050
-        // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217){
3051
-        //    if (row.stock_count <= 0) {
3052
-        //     if (row.type == 3) {
3053
-        //       if (selection) {
3054
-        //         selection.forEach(row => {
3055
-        //           if (row.stock_count <= 0) {
3056
-        //             this.$refs.tables.toggleRowSelection(row)
3057
-        //           }
3058
-        //         })
3059
-        //       } else {
3060
-        //         this.$refs.tables.clearSelection()
3061
-        //       }
3062
-        //       this.$message.error(row.project_name + '库存不足')
3063
-        //       return
3064
-        //     }
3065
-        //   }
3066
-        // }else{
3067
-        //    if (row.total <= 0) {
3068
-        //     if (row.type == 3) {
3069
-        //       if (selection) {
3070
-        //         selection.forEach(row => {
3071
-        //           if (row.total <= 0) {
3072
-        //             this.$refs.tables.toggleRowSelection(row)
3073
-        //           }
3074
-        //         })
3075
-        //       } else {
3076
-        //         this.$refs.tables.clearSelection()
3077
-        //       }
3078
-        //       this.$message.error(row.project_name + '库存不足')
3079
-        //       return
3080
-        //     }
3081
-        //   }
3082
-        // }
2984
+
3083 2985
         this.teamList.push(row)
3084 2986
       },
3085 2987
       getlist() {
@@ -3106,23 +3008,16 @@
3106 3008
                 is_special_diseases: project[i].disease_directory,
3107 3009
                 project: project[i],
3108 3010
                 stock_count:0,
3109
-                sum_count:0,
3110
-                batch_retai_price:0,
3111 3011
               }
3112 3012
 
3113 3013
               this.tabProject.push(obj)
3114 3014
             }
3115 3015
 
3116 3016
             var good_info = response.data.data.good_info
3117
-            console.log("good_info2323232323232323",good_info)
3017
+
3118 3018
 
3119 3019
             for (let i = 0; i < good_info.length; i++) {
3120 3020
                good_info[i].stock_count = 0
3121
-
3122
-               if(good_info[i].batch_retai_price > 0){
3123
-                  good_info[i].packing_price = 0
3124
-                  good_info[i].packing_price = good_info[i].batch_retai_price
3125
-               }
3126 3021
               if(good_info[i].good_stock_in&&good_info[i].good_stock_in.length >0 ){
3127 3022
                 for(let j=0;j<good_info[i].good_stock_in.length;j++){
3128 3023
                    good_info[i].stock_count += good_info[i].good_stock_in[j].stock_count
@@ -3146,20 +3041,16 @@
3146 3041
                 is_special_diseases: good_info[i].is_special_diseases,
3147 3042
                 good_info: good_info[i],
3148 3043
                 stock_count:good_info[i].stock_count,
3149
-                sum_count:good_info[i].sum_count,
3150
-                batch_retai_price:good_info[i].batch_retai_price
3151 3044
               }
3152 3045
               this.tabProject.push(obj)
3153 3046
             }
3154 3047
 
3155
-            console.log("猎豹33323232323223323223233223",this.tabProject)
3156 3048
             this.allProject = this.tabProject
3157 3049
 
3158 3050
           }
3159 3051
         })
3160
-      
3161
-      }, 
3162
-      deepClone(source) {
3052
+
3053
+      }, deepClone(source) {
3163 3054
         if (!source && typeof source !== 'object') {
3164 3055
           throw new Error('error arguments', 'shallowClone')
3165 3056
         }

+ 10 - 10
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Просмотреть файл

@@ -1197,16 +1197,16 @@ export default {
1197 1197
           return false
1198 1198
         } else {
1199 1199
           var drugs = response.data.data.drugs
1200
-          // for (let i = 0; i < drugs.length; i++) {
1201
-          //   drugs[i].count = 0
1202
-          //   if (drugs[i].stock_in != null) {
1203
-          //     if (drugs[i].stock_in.length > 0) {
1204
-          //       for (let j = 0; j < drugs[i].stock_in.length; j++) {
1205
-          //         drugs[i].count += (drugs[i].stock_in[j].stock_max_number * drugs[i].min_number + drugs[i].stock_in[j].stock_min_number)
1206
-          //       }
1207
-          //     }
1208
-          //   }
1209
-          // }
1200
+          for (let i = 0; i < drugs.length; i++) {
1201
+            drugs[i].count = 0
1202
+            if (drugs[i].stock_in != null) {
1203
+              if (drugs[i].stock_in.length > 0) {
1204
+                for (let j = 0; j < drugs[i].stock_in.length; j++) {
1205
+                  drugs[i].count += (drugs[i].stock_in[j].stock_max_number * drugs[i].min_number + drugs[i].stock_in[j].stock_min_number)
1206
+                }
1207
+              }
1208
+            }
1209
+          }
1210 1210
           // if(drugs.){
1211 1211
 
1212 1212
           // }