陈少旭 před 7 měsíci
rodič
revize
80e0b54b51

+ 4 - 4
src/xt_pages/hospitalStation/components/deskPrescription.vue Zobrazit soubor

3203
       for (let i = 0; i < this.teamList.length; i++) {
3203
       for (let i = 0; i < this.teamList.length; i++) {
3204
         for (let a = 0; a < this.curPrescriptions.project.length; a++) {
3204
         for (let a = 0; a < this.curPrescriptions.project.length; a++) {
3205
           if (this.teamList[i].id == this.curPrescriptions.project[a].project_id && this.teamList[i].type == this.curPrescriptions.project[a].type) {
3205
           if (this.teamList[i].id == this.curPrescriptions.project[a].project_id && this.teamList[i].type == this.curPrescriptions.project[a].type) {
3206
-            this.$message.error('当前处方存在相同的药品,无法添加相同的项目')
3207
-            return
3206
+            // this.$message.error('当前处方存在相同的药品,无法添加相同的项目')
3207
+            // return
3208
           }
3208
           }
3209
         }
3209
         }
3210
       }
3210
       }
3212
       for (let i = 0; i < this.curDrugs.length; i++) {
3212
       for (let i = 0; i < this.curDrugs.length; i++) {
3213
         for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
3213
         for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
3214
           if (this.curDrugs[i].id == this.curPrescriptions.advices[a].id) {
3214
           if (this.curDrugs[i].id == this.curPrescriptions.advices[a].id) {
3215
-            this.$message.error('当前处方存在相同的药品,无法添加相同的药品')
3216
-            return
3215
+            // this.$message.error('当前处方存在相同的药品,无法添加相同的药品')
3216
+            // return
3217
 
3217
 
3218
           }
3218
           }
3219
         }
3219
         }

+ 4 - 4
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Zobrazit soubor

3754
       for (let i = 0; i < this.teamList.length; i++) {
3754
       for (let i = 0; i < this.teamList.length; i++) {
3755
         for (let a = 0; a < this.curPrescriptions.project.length; a++) {
3755
         for (let a = 0; a < this.curPrescriptions.project.length; a++) {
3756
           if (this.teamList[i].id == this.curPrescriptions.project[a].project_id && this.teamList[i].type == this.curPrescriptions.project[a].type) {
3756
           if (this.teamList[i].id == this.curPrescriptions.project[a].project_id && this.teamList[i].type == this.curPrescriptions.project[a].type) {
3757
-            this.$message.error('当前处方存在相同的药品,无法添加相同的项目')
3758
-            return
3757
+            // this.$message.error('当前处方存在相同的药品,无法添加相同的项目')
3758
+            // return
3759
           }
3759
           }
3760
         }
3760
         }
3761
       }
3761
       }
3763
       for (let i = 0; i < this.curDrugs.length; i++) {
3763
       for (let i = 0; i < this.curDrugs.length; i++) {
3764
         for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
3764
         for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
3765
           if (this.curDrugs[i].id == this.curPrescriptions.advices[a].id) {
3765
           if (this.curDrugs[i].id == this.curPrescriptions.advices[a].id) {
3766
-            this.$message.error('当前处方存在相同的药品,无法添加相同的药品')
3767
-            return
3766
+            // this.$message.error('当前处方存在相同的药品,无法添加相同的药品')
3767
+            // return
3768
 
3768
 
3769
           }
3769
           }
3770
         }
3770
         }

+ 4 - 4
src/xt_pages/outpatientDoctorStation/modeTemplateDetail.vue Zobrazit soubor

1430
         for (let i = 0; i < this.teamList.length; i++) {
1430
         for (let i = 0; i < this.teamList.length; i++) {
1431
           for (let a = 0; a < this.curPrescriptions.project.length; a++) {
1431
           for (let a = 0; a < this.curPrescriptions.project.length; a++) {
1432
             if (this.teamList[i].id == this.curPrescriptions.project[a].project_id) {
1432
             if (this.teamList[i].id == this.curPrescriptions.project[a].project_id) {
1433
-              this.$message.error('当前处方存在相同的药品,无法添加相同的项目')
1434
-              return
1433
+              // this.$message.error('当前处方存在相同的药品,无法添加相同的项目')
1434
+              // return
1435
             }
1435
             }
1436
           }
1436
           }
1437
         }
1437
         }
1439
         for (let i = 0; i < this.curDrugs.length; i++) {
1439
         for (let i = 0; i < this.curDrugs.length; i++) {
1440
           for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
1440
           for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
1441
             if (this.curDrugs[i].id == this.curPrescriptions.advices[a].id) {
1441
             if (this.curDrugs[i].id == this.curPrescriptions.advices[a].id) {
1442
-              this.$message.error('当前处方存在相同的药品,无法添加相同的药品')
1443
-              return
1442
+              // this.$message.error('当前处方存在相同的药品,无法添加相同的药品')
1443
+              // return
1444
 
1444
 
1445
             }
1445
             }
1446
           }
1446
           }

+ 12 - 12
src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue Zobrazit soubor

219
                                                 <template slot-scope="scope">{{ scope.row.type == 3?scope.row.zuobiao_stock_num :""}}</template>
219
                                                 <template slot-scope="scope">{{ scope.row.type == 3?scope.row.zuobiao_stock_num :""}}</template>
220
                                               </el-table-column>
220
                                               </el-table-column>
221
 
221
 
222
-                                           
222
+
223
 
223
 
224
 
224
 
225
                                                 <el-table-column label="规格" width="60">
225
                                                 <el-table-column label="规格" width="60">
228
                                                 <el-table-column label="单价" width="40">
228
                                                 <el-table-column label="单价" width="40">
229
                                                     <template slot-scope="scope">{{ scope.row.price }}</template>
229
                                                     <template slot-scope="scope">{{ scope.row.price }}</template>
230
                                                 </el-table-column>
230
                                                 </el-table-column>
231
-                                               
231
+
232
                                                 <el-table-column label="库存" width="60" v-if="org_id != 10206" >
232
                                                 <el-table-column label="库存" width="60" v-if="org_id != 10206" >
233
                                                 <template slot-scope="scope">
233
                                                 <template slot-scope="scope">
234
-                                                  <span v-if="scope.row.type == 3">{{scope.row.sum_count}}</span> 
234
+                                                  <span v-if="scope.row.type == 3">{{scope.row.sum_count}}</span>
235
                                                 </template>
235
                                                 </template>
236
                                               </el-table-column>
236
                                               </el-table-column>
237
-                                                
237
+
238
                                             </el-table>
238
                                             </el-table>
239
                                         </div>
239
                                         </div>
240
                                     </el-tab-pane>
240
                                     </el-tab-pane>
1627
         for (let i = 0; i < this.teamList.length; i++) {
1627
         for (let i = 0; i < this.teamList.length; i++) {
1628
           for (let a = 0; a < this.curPrescriptions.project.length; a++) {
1628
           for (let a = 0; a < this.curPrescriptions.project.length; a++) {
1629
             if (this.teamList[i].id == this.curPrescriptions.project[a].project_id) {
1629
             if (this.teamList[i].id == this.curPrescriptions.project[a].project_id) {
1630
-              this.$message.error('当前处方存在相同的药品,无法添加相同的项目')
1631
-              return
1630
+              // this.$message.error('当前处方存在相同的药品,无法添加相同的项目')
1631
+              // return
1632
             }
1632
             }
1633
           }
1633
           }
1634
         }
1634
         }
1636
         for (let i = 0; i < this.curDrugs.length; i++) {
1636
         for (let i = 0; i < this.curDrugs.length; i++) {
1637
           for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
1637
           for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
1638
             if (this.curDrugs[i].id == this.curPrescriptions.advices[a].id) {
1638
             if (this.curDrugs[i].id == this.curPrescriptions.advices[a].id) {
1639
-              this.$message.error('当前处方存在相同的药品,无法添加相同的药品')
1640
-              return
1639
+              // this.$message.error('当前处方存在相同的药品,无法添加相同的药品')
1640
+              // return
1641
 
1641
 
1642
             }
1642
             }
1643
           }
1643
           }
1882
                     tempAdvice.push(obj)
1882
                     tempAdvice.push(obj)
1883
                   }
1883
                   }
1884
                   }
1884
                   }
1885
-                
1885
+
1886
                 }
1886
                 }
1887
                 //项目
1887
                 //项目
1888
                 for (let b = 0; b < prescription.project.length; b++) {
1888
                 for (let b = 0; b < prescription.project.length; b++) {
2134
                     }
2134
                     }
2135
 
2135
 
2136
 
2136
 
2137
-               
2137
+
2138
                   }
2138
                   }
2139
                 }
2139
                 }
2140
                 // var preTime = nowTime
2140
                 // var preTime = nowTime
2198
         getHisProject().then(response => {
2198
         getHisProject().then(response => {
2199
           if (response.data.state == 1) {
2199
           if (response.data.state == 1) {
2200
             var project = response.data.data.project
2200
             var project = response.data.data.project
2201
-            
2201
+
2202
             for (let i = 0; i < project.length; i++) {
2202
             for (let i = 0; i < project.length; i++) {
2203
               let obj = {
2203
               let obj = {
2204
                 id: project[i].id,
2204
                 id: project[i].id,
2594
               min_str = (total % min_number) + min_unit;
2594
               min_str = (total % min_number) + min_unit;
2595
               }
2595
               }
2596
           }
2596
           }
2597
-         
2597
+
2598
           if(max_str == "" && min_str == ""){
2598
           if(max_str == "" && min_str == ""){
2599
               return "0"
2599
               return "0"
2600
           }else{
2600
           }else{