Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -2413,7 +2413,12 @@
         this.tabIndex = this.prescriptions.length
 
         var str = this.prescriptions[this.prescriptions.length - 1].name
-        this.tabIndex = parseInt(str.charAt(str.length - 1))
+
+        var reg =/[\u4e00-\u9fa5]/g;
+        // var str= " 阿达 adas 123132  一二三 ";
+        // str= str.replace(/[ ]/g, "");//去空格
+        str= str.replace(reg, "");//去除中文
+        this.tabIndex = parseInt(str.replace(reg, ""))
         ++this.tabIndex
         let newTabName = '处方' + this.tabIndex
         var nowDate = new Date()

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -287,11 +287,11 @@
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">
                                               <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877">
-                                               <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> 
+                                               <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>
                                                <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
                                               </span>
-                                              <span v-else> {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}}</span> 
-                                             
+                                              <span v-else> {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}}</span>
+
                                             </template>
                                         </el-table-column>
                                         <el-table-column label="单价" width="40">
@@ -2419,7 +2419,13 @@
         this.tabIndex = this.prescriptions.length
 
         var str = this.prescriptions[this.prescriptions.length - 1].name
-        this.tabIndex = parseInt(str.charAt(str.length - 1))
+
+        var reg =/[\u4e00-\u9fa5]/g;
+        // var str= " 阿达 adas 123132  一二三 ";
+        // str= str.replace(/[ ]/g, "");//去空格
+        // str= ;//去除中文
+        this.tabIndex = parseInt(str.replace(reg, ""))
+
         ++this.tabIndex
         let newTabName = '处方' + this.tabIndex
         var nowDate = new Date()
@@ -2957,8 +2963,8 @@
             }
 
             var good_info = response.data.data.good_info
-          
- 
+
+
             for (let i = 0; i < good_info.length; i++) {
                good_info[i].stock_count = 0
               if(good_info[i].good_stock_in.length >0 ){