Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/xt_pages/data/components/consumables.vue

@@ -43,11 +43,7 @@
       :data="goodInfo.goodInfoData"
       v-loading="goodInfo.loading"
     >
-      <el-table-column label="商品编码" align="center">
-        <template slot-scope="scope">
-          {{ scope.row.good_code }}
-        </template>
-      </el-table-column>
+      <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
       <el-table-column label="名称" align="center">
         <template slot-scope="scope">
           {{ scope.row.good_name }}

src/xt_pages/data/components/drugs.vue

@@ -39,11 +39,8 @@
     </div>
     <el-table :data="list" border style="width: 100%" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}">
-      <el-table-column
-        type="index"
-        label="药品编码"
-        width="50">
-      </el-table-column>
+      <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
+
       <el-table-column prop="date" label="药品名称" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.drug_name}}</div>