Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "2999.999.1314"
+  "version": "2999.999.1315"
 }

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -3203,8 +3203,8 @@ export default {
       for (let i = 0; i < this.teamList.length; i++) {
         for (let a = 0; a < this.curPrescriptions.project.length; a++) {
           if (this.teamList[i].id == this.curPrescriptions.project[a].project_id && this.teamList[i].type == this.curPrescriptions.project[a].type) {
-            this.$message.error('当前处方存在相同的药品，无法添加相同的项目')
-            return
+            // this.$message.error('当前处方存在相同的药品，无法添加相同的项目')
+            // return
           }
         }
       }
@@ -3212,8 +3212,8 @@ export default {
       for (let i = 0; i < this.curDrugs.length; i++) {
         for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
           if (this.curDrugs[i].id == this.curPrescriptions.advices[a].id) {
-            this.$message.error('当前处方存在相同的药品，无法添加相同的药品')
-            return
+            // this.$message.error('当前处方存在相同的药品，无法添加相同的药品')
+            // return
 
           }
         }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3754,8 +3754,8 @@ export default {
       for (let i = 0; i < this.teamList.length; i++) {
         for (let a = 0; a < this.curPrescriptions.project.length; a++) {
           if (this.teamList[i].id == this.curPrescriptions.project[a].project_id && this.teamList[i].type == this.curPrescriptions.project[a].type) {
-            this.$message.error('当前处方存在相同的药品，无法添加相同的项目')
-            return
+            // this.$message.error('当前处方存在相同的药品，无法添加相同的项目')
+            // return
           }
         }
       }
@@ -3763,8 +3763,8 @@ export default {
       for (let i = 0; i < this.curDrugs.length; i++) {
         for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
           if (this.curDrugs[i].id == this.curPrescriptions.advices[a].id) {
-            this.$message.error('当前处方存在相同的药品，无法添加相同的药品')
-            return
+            // this.$message.error('当前处方存在相同的药品，无法添加相同的药品')
+            // return
 
           }
         }

src/xt_pages/outpatientDoctorStation/modeTemplateDetail.vue

@@ -1430,8 +1430,8 @@
         for (let i = 0; i < this.teamList.length; i++) {
           for (let a = 0; a < this.curPrescriptions.project.length; a++) {
             if (this.teamList[i].id == this.curPrescriptions.project[a].project_id) {
-              this.$message.error('当前处方存在相同的药品，无法添加相同的项目')
-              return
+              // this.$message.error('当前处方存在相同的药品，无法添加相同的项目')
+              // return
             }
           }
         }
@@ -1439,8 +1439,8 @@
         for (let i = 0; i < this.curDrugs.length; i++) {
           for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
             if (this.curDrugs[i].id == this.curPrescriptions.advices[a].id) {
-              this.$message.error('当前处方存在相同的药品，无法添加相同的药品')
-              return
+              // this.$message.error('当前处方存在相同的药品，无法添加相同的药品')
+              // return
 
             }
           }

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -219,7 +219,7 @@
                                                 <template slot-scope="scope">{{ scope.row.type == 3?scope.row.zuobiao_stock_num :""}}</template>
                                               </el-table-column>
 
-                                           
+
 
 
                                                 <el-table-column label="规格" width="60">
@@ -228,13 +228,13 @@
                                                 <el-table-column label="单价" width="40">
                                                     <template slot-scope="scope">{{ scope.row.price }}</template>
                                                 </el-table-column>
-                                               
+
                                                 <el-table-column label="库存" width="60" v-if="org_id != 10206" >
                                                 <template slot-scope="scope">
-                                                  <span v-if="scope.row.type == 3">{{scope.row.sum_count}}</span> 
+                                                  <span v-if="scope.row.type == 3">{{scope.row.sum_count}}</span>
                                                 </template>
                                               </el-table-column>
-                                                
+
                                             </el-table>
                                         </div>
                                     </el-tab-pane>
@@ -1627,8 +1627,8 @@
         for (let i = 0; i < this.teamList.length; i++) {
           for (let a = 0; a < this.curPrescriptions.project.length; a++) {
             if (this.teamList[i].id == this.curPrescriptions.project[a].project_id) {
-              this.$message.error('当前处方存在相同的药品，无法添加相同的项目')
-              return
+              // this.$message.error('当前处方存在相同的药品，无法添加相同的项目')
+              // return
             }
           }
         }
@@ -1636,8 +1636,8 @@
         for (let i = 0; i < this.curDrugs.length; i++) {
           for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
             if (this.curDrugs[i].id == this.curPrescriptions.advices[a].id) {
-              this.$message.error('当前处方存在相同的药品，无法添加相同的药品')
-              return
+              // this.$message.error('当前处方存在相同的药品，无法添加相同的药品')
+              // return
 
             }
           }
@@ -1882,7 +1882,7 @@
                     tempAdvice.push(obj)
                   }
                   }
-                
+
                 }
                 //项目
                 for (let b = 0; b < prescription.project.length; b++) {
@@ -2134,7 +2134,7 @@
                     }
 
 
-               
+
                   }
                 }
                 // var preTime = nowTime
@@ -2198,7 +2198,7 @@
         getHisProject().then(response => {
           if (response.data.state == 1) {
             var project = response.data.data.project
-            
+
             for (let i = 0; i < project.length; i++) {
               let obj = {
                 id: project[i].id,
@@ -2594,7 +2594,7 @@
               min_str = (total % min_number) + min_unit;
               }
           }
-         
+
           if(max_str == "" && min_str == ""){
               return "0"
           }else{

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))