Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/xt_pages/data/components/consumables.vue

@@ -149,6 +149,9 @@
         is_charge:'',
         search_input: '',
         options: [{
+          value: '0',
+          label: '全部'
+        },{
           value: '1',
           label: '是'
         }, {

src/xt_pages/data/components/drugs.vue

@@ -39,10 +39,10 @@
     </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 prop="date" label="药品编码" width="80" align="center">
-        <template slot-scope="scope">
-          <div>{{scope.row.drug_code}}</div>
-        </template>
+      <el-table-column
+        type="index"
+        label="药品编码"
+        width="50">
       </el-table-column>
       <el-table-column prop="date" label="药品名称" align="center">
         <template slot-scope="scope">
@@ -97,6 +97,19 @@
 
     ></add-drugs>
     <!-- <maintain ref='maintain'></maintain> -->
+    <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :page-sizes="[10, 50, 100]"
+      :page-size="10"
+      background
+      align="right"
+      style="margin-top:20px;"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="total"
+    >
+    </el-pagination>
+
   </div>
 </template>
 
@@ -237,7 +250,11 @@
         current_id:0,
 
         search_input: '',
-        options: [{
+        options: [
+          {
+            value: '0',
+            label: '全部'
+          },{
           value: '1',
           label: '是'
         }, {
@@ -266,6 +283,14 @@
       }
     },
     methods: {
+      handleSizeChange(val) {
+        this.limit = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.page = val
+        this.getList()
+      },
       changeInject(val){
         this.getList()