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

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -29,11 +29,6 @@
                         </el-table-column>
 
 
-                        <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-                          <template slot-scope="scope">
-                            {{getGroup(scope.row.statistical_classification)}}
-                          </template>
-                        </el-table-column>
                         <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
                           <template slot-scope="scope">{{scope.row.single_dose}}&nbsp;&nbsp;{{scope.row.single_dose_unit}}</template>
 
@@ -65,6 +60,16 @@
 
                           </template>
                         </el-table-column>
+
+                          <el-table-column align="center" prop="name" width="60" label="总价">
+                              <template slot-scope="scope">
+                                  <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
+                                  {{scope.row.price}}元
+
+                              </template>
+                          </el-table-column>
+
+
                         <el-table-column align="center" prop="name" width="80" label="备注">
                           <template slot-scope="scope">
                             <!--<el-input v-model="scope.row.remark" readonly></el-input>-->

src/xt_pages/outpatientRecord/outpatientRecord.vue

@@ -323,6 +323,13 @@
                       obj.label = that.insutype_arr[b].label
                     }
                   }
+                  if(response.data.data.info.output.insuinfo[i].psn_insu_stas == 1){
+                    obj.label =  obj.label
+
+                  }else{
+                    obj.label =  obj.label +"(已暂停)"
+                  }
+
                   that.insutypes.push(obj)
 
                 }