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

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1208,8 +1208,8 @@
                               : "/"
                           }}
                         </div>
-                        <span v-if="org_id!=10598"> ml</span>
-                        <span v-if="org_id==10598"> L</span>
+                        <span v-if="org_id!=10598 && org_id!=10471"> ml</span>
+                        <span v-if="org_id==10598 || org_id ==10471"> L</span>
                       </div>
                       <div class="inline_block" style="flex: 1">
                         干体重：
@@ -1728,7 +1728,10 @@
                           </td>
                           <td width="50" v-if="org_id == 10375">置换率<br />(ml/h)</td>
                           <td width="50" v-if=" org_id ==0 || org_id ==10489">超滤率<br />(ml/h)</td>
-                          <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id!=10600 && org_id!=10683">超滤量<br />(ml)</td>
+                          <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id!=10600 && org_id!=10683">超滤量<br />
+                            <span v-if="org_id!=10471"> (ml)</span>
+                            <span v-if="org_id==10471">L</span>
+                          </td>
                           <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0">超滤率<br />(ml/h)</td>
                           <td width="50" v-if="org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
                           <td

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -20,8 +20,8 @@
           <th v-if="isShow('血流量1')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('跨膜压1')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702) &&this.$store.getters.xt_user.template_info.org_id!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 " width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702) || this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471"  width="76px"> 超滤量(L) </th>
           <th v-if=" isShow('超滤量1')"  width="76px"> 超滤量(ml) </th>
           <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
           <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1822,7 +1822,11 @@
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
                         <td width="50" v-if="org_id == 10375">置换率<br />(ml/h)</td>
                         <td width="50" v-if="org_id ==10489">超滤率<br/>(ml/h)</td>
-                        <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 10600&& org_id != 10683">超滤量<br />(ml)</td>
+                        <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 10600&& org_id != 10683">
+                          超滤量<br />
+                         <span v-if="org_id == 10471">L</span>
+                         <span v-if="org_id != 10471"> (ml)</span>
+                        </td>
                         <td width="50" v-if="org_id == 10600 || org_id ==10598 || org_id ==10683">超滤率<br/>(ml/h)</td>
                         <td width="50" v-if="org_id ==3877 || org_id == 10449 ">累计超滤量<br />(ml)</td>
                         <td v-if="(prescription.mode_id == 2 ||prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=0 && org_id!=10206" width="50">

src/xt_pages/eleFaPiao/fapiao.vue

@@ -116,7 +116,7 @@
         <el-table-column align="center" prop="name" label="操作">
           <template slot-scope="scope">
 
-            <el-button v-if="scope.row.id > 0 && scope.row.is_red_washed == 1" size="mini" type="primary"
+            <el-button v-if="scope.row.id > 0 && scope.row.is_red_washed == 0" size="mini" type="primary"
                        @click="hongchong(scope.row)">
               红冲
             </el-button>
@@ -260,10 +260,38 @@ export default {
     blue(row){
 
     }, yulan(row){
-
+      window.open( row.pdf_url, "_blank");
 
     },hongchong(row){
+      var  id = row.id
+
+      let params = {
+        "id":id,
+        "admin_user_id":this.$store.getters.xt_user.user.id,
+      }
 
+      var that = this;
+      axios.get('http://127.0.0.1:9532/api/fapiao/red',{params:params}).then(function(response) {
+        if (response.data.state == 0) {
+          that.$message.error(response.data.data.msg);
+          return false
+        } else {
+          if(response.data.data.failed_code == -10){
+            that.$confirm(response.data.data.msg, '错误信息', {
+              confirmButtonText: '确 定',
+              type: 'warning'
+            }).then(() => {
+
+            }).catch(() => {
+            })
+          }else{
+            that.$message.success(response.data.data.msg)
+            that.getHisOrderList()
+          }
+
+        }
+      }).catch(function(error) {
+      })
     },
     getAllstaff(){
       adminMainView()

src/xt_pages/eleFaPiao/settleDetail.vue

@@ -151,19 +151,24 @@
                         @click="blue(scope.row)">
               开票
             </el-button>
-            <el-button v-if="scope.row.result.id > 0 && scope.row.result.fapiao_status == 1" disabled="true" size="mini" type="primary"
-                       @click="blue(scope.row)">
+            <el-button v-if="scope.row.result.id > 0  && scope.row.result.fapiao_status == '1'" disabled="true" size="mini" type="primary"
+            >
               开票审核中
             </el-button>
-            <el-button v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == 2" size="mini" type="primary"
+            <el-button v-if="scope.row.result.id == 0 && scope.row.result.fapiao_status == '3'" size="mini" type="primary"
+                       @click="blue(scope.row)">
+              开具蓝票失败，点击查看原因
+            </el-button>
+            <el-button v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == '2'" size="mini" type="primary"
                         @click="hongchong(scope.row)">
               红冲
             </el-button>
-            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == 2"
+            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == '2'"
                        @click="yulan(scope.row)">
               下载
             </el-button>
-            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == 2 && scope.row.fapiao_number == ''"
+
+            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.fapiao_status > 0"
                        @click="chaxun(scope.row)">
               查询并同步发票号码
             </el-button>
@@ -399,7 +404,7 @@ export default {
             }).catch(() => {
             })
           }else{
-            this.getHisOrderList()
+            that.getHisOrderList()
             that.$confirm(response.data.data.msg, '信息', {
               confirmButtonText: '确 定',
               type: 'warning'
@@ -605,23 +610,18 @@ export default {
             })
           }else{
             if(response.data.data.cus_status == 1){
-              Vue.nextTick(() => {
-                // 确保二维码数据存在
-                if (response.data.data.qr_code) {
-                  // 生成新的二维码
-                  var qrcode = new QRCode(that.$refs.qrCodeUrl, {
-                    text: response.data.data.qr_code,
-                    width: 120,
-                    height: 120,
-                    colorDark: '#000000',
-                    colorLight: '#ffffff',
-                    correctLevel: QRCode.CorrectLevel.H
-                  });
-                  that.qr_dialogVisible = true;
-                } else {
-                  that.$message.error('二维码数据为空。');
-                }
-              });
+              that.$nextTick(() =>{
+                that.$refs.qrCodeUrl.innerHTML = ""
+                var qrcode = new QRCode(that.$refs.qrCodeUrl, {
+                  text: response.data.data.qr_code, // 需要转换为二维码的内容
+                  width: 120,
+                  height: 120,
+                  colorDark: '#000000',
+                  colorLight: '#ffffff',
+                  correctLevel: QRCode.CorrectLevel.H
+                })
+              })
+              that.qr_dialogVisible =true
             }else if(response.data.data.cus_status == -1){
               // this.$message.error(response.data.msg)/*  */
               that

src/xt_pages/outpatientCharges/summary.vue

@@ -72,7 +72,7 @@
                      type="primary" @click="export_detail_ten_two">报表下载3
           </el-button>
 
-          
+
         </div>
       </div>
 
@@ -222,10 +222,10 @@
 
         <el-table-column align="center" width="60" prop="name" label="收费类型">
           <template slot-scope="scope">
-            <div v-if="scope.row.his_patient.balance_accounts_type != 2">
+            <div v-if="scope.row.is_medicine_insurance == 1">
               医保
             </div>
-            <div v-if="scope.row.his_patient.balance_accounts_type == 2">
+            <div v-if="scope.row.is_medicine_insurance != 1">
               自费
             </div>
           </template>

src/xt_pages/outpatientTool/components/settle.vue

@@ -83,6 +83,13 @@
               </template>
           </el-table-column>
 
+        <el-table-column align="center" prop="item_name" label="参保地">
+          <template slot-scope="scope">
+            {{scope.row.clr_optins}}
+          </template>
+        </el-table-column>
+
+
         <el-table-column align="center" prop="item_name" label="病种名称">
           <template slot-scope="scope">
             {{scope.row.sick_name}}
@@ -250,14 +257,18 @@
           {{scope.row.setl_time?scope.row.setl_time.split(" ")[0]:getTimes(scope.row.settle_accounts_date)}}
         </template>
       </el-table-column>
-
-
       <el-table-column align="center" prop="item_name" label="病种名称">
         <template slot-scope="scope">
           {{scope.row.sick_name}}
         </template>
       </el-table-column>
 
+      <el-table-column align="center" prop="item_name" label="参保地">
+        <template slot-scope="scope">
+          {{scope.row.clr_optins}}
+        </template>
+      </el-table-column>
+
       <el-table-column align="center" prop="item_name" label="结算类型">
         <template slot-scope="scope">
           <div v-if="scope.row.is_medicine_insurance == 0">自费</div>

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -771,6 +771,8 @@ export default {
           const params = {
             stockIn: this.recordInfo.recordData
           };
+          console.log("params---------",params)
+         
           EditDrugWarehouse(
             params,
             this.warehousing_time,

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -958,13 +958,15 @@ export default {
 
     getStockBatchNumber(id){
        var params = {
-         id:id
+         id:id,
+         storehouse_id:this.storehouse_id,
        }
+       console.log("parmas----------------------",params)
       getStockBatchNumber(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
-
           this.numberList = list
+          // var lastWarehouseInfoTwo = response.data.data.lastWarehouseInfoTwo
         }
      })
     },

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))