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

src/lang/zh.js

@@ -188,6 +188,7 @@ export default {
     stockModifyPrice:'耗材调价',
     stockDamaged:'耗材报损',
     stockWarning:'耗材预警',
+    drugModifyPrice:'药品调价',
 
     showconfig: '显示配置',
     user_detail: '使用明细',

src/router/modules/drugs.js

@@ -30,6 +30,12 @@ export default {
       name: 'drugsStockOut',
       meta: { title: 'drugsStockOut', noCache: true }
     },
+    {
+      path: '/stock/drugs/drugModifyPrice',
+      component: () => import('@/xt_pages/stock/drugs/drugModifyPrice'),
+      name: 'drugModifyPrice',
+      meta: { title: 'drugModifyPrice', noCache: true }
+    },
     // {
     //   path: '/stock/drugs/stock/return',
     //   component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrder'),

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -82,14 +82,16 @@
         // });
 
         if(this.org_id == 10138){
-          const style =
-          '@media print {#prescription-print{font-size:12px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 50%;}}}';
-          printJS({
-              printable: "prescription-print",
-              type: "html",
-              style: style,
-              scanStyles: false
-          });
+          setTimeout(() => {
+            const style =
+            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 50%;}}}';
+            printJS({
+                printable: "prescription-print",
+                type: "html",
+                style: style,
+                scanStyles: false
+            });
+          },500)
         }else{
           const style =
           '@media print {.printTitle{font-size: 20px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;font-size:12px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;font-size:12px;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none;font-size:12px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;font-size:12px;}.actionBar div{width:150px;}}';

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -2869,13 +2869,13 @@
               return
             }
           })
-          this.$confirm('是否保存当前处方', '保存', {
-            confirmButtonText: '确 定',
-            cancelButtonText: '取 消',
-            type: 'warning'
-          }).then(() => {
-            this.open(1)
-          }).catch(() => {
+          // this.$confirm('是否保存当前处方', '保存', {
+          //   confirmButtonText: '确 定',
+          //   cancelButtonText: '取 消',
+          //   type: 'warning'
+          // }).then(() => {
+          //   this.open(1)
+          // }).catch(() => {
 
             for(let i = 0; i < this.all_data.length; i++){
               if(this.all_data[i].id == val.id){
@@ -3301,7 +3301,7 @@
               }
             })
 
-          })
+          // })
 
           // this.$message.error('需要保存保存处方才能切换')
         } else {

src/xt_pages/outpatientDoctorStation/print.vue

@@ -76,14 +76,16 @@ export default {
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       if(this.org_id == 10138){
-        const style =
-        '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 90%;}}}';
-        printJS({
-          printable: "prescriptionPrint",
-          type: "html",
-          style: style,
-          scanStyles: false
-        });
+        setTimeout(() => {
+          const style =
+          '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 90%;}}}';
+          printJS({
+            printable: "prescriptionPrint",
+            type: "html",
+            style: style,
+            scanStyles: false
+          });
+        },500)
       }else{
         const style =
         '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{padding:0 10px;min-height:450px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}';

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -66,15 +66,17 @@ export default {
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       if(this.org_id == 10138){
+        setTimeout(() => {
+          const style =
+          '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 90%;}}}';
+          printJS({
+            printable: "prescriptionPrint",
+            type: "html",
+            style: style,
+            scanStyles: false
+          });
+        },500)
         
-        const style =
-        '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 90%;}}}';
-        printJS({
-          printable: "prescriptionPrint",
-          type: "html",
-          style: style,
-          scanStyles: false
-        });
       }else{
         const style =
         '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.prescription-print{font-size: 14px;}.printTitle{font-size: 18px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:5px;padding:0 10px;}.infoTitle div{width: 300px;margin-bottom:5px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;}.prescriptionBox{padding:0 10px;min-height:380px;}.Rp{font-size: 22px;font-weight: bold;line-height:1px;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox p{line-height: 1px;padding-bottom:10px !important;} .drugsOne{line-height: 1px;margin-bottom:10px !important;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; padding:0 10px;margin:5px 0;} .actionBar div{width:150px;}}';

src/xt_pages/stock/drugs/drugModifyPrice.vue

@@ -0,0 +1,293 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div style="display: flex;align-items: center;justify-content: space-between;">
+        <div>
+            <el-input
+            size="small"
+            style="width: 200px;"
+            class="filter-item"
+            v-model.trim="searchKey"
+            placeholder=""
+            />
+            <el-button
+            size="small"
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+            >搜索</el-button
+            >
+            <el-date-picker
+            size="small"
+            v-model="value1"
+            type="date"
+            style="margin-left:5px;width:140px;"
+            placeholder="选择日期">
+            </el-date-picker>
+            <el-date-picker
+            size="small"
+            v-model="value2"
+            type="date"
+            style="margin-left:5px;width:140px;"
+            placeholder="选择日期">
+            </el-date-picker>
+        </div>
+        <div>
+            <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
+            <el-button size="small" type="primary">核对</el-button>
+            <el-button size="small" type="primary" @click="print">打印</el-button>
+            <el-button size="small" type="primary">导出</el-button>
+        </div>
+      </div>
+      <div style="margin-top:10px">
+            <el-table :data="tableData" border :height="tableHeight" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
+                <el-table-column
+                prop="date"
+                label="单据编码">
+                </el-table-column>
+                <el-table-column
+                prop="date"
+                label="调价日期">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="操作人">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="状态">
+                </el-table-column>
+                <el-table-column
+                prop="name"
+                label="核对人">
+                </el-table-column>
+                <el-table-column
+                label="操作">
+                    <template slot-scope="scope">
+                        <el-button type="text" size="small">删除</el-button>
+                        <el-button type="text" size="small">编辑</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
+    </div>
+    <el-dialog
+        title="库房调价"
+        :visible.sync="dialogVisible"
+        width="1200px"
+        :before-close="handleClose">
+        <el-form :model="form" class="modifyDialog" label-width="120px">
+            <el-form-item label="药品名称">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="原价格">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="现价格">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="调价数量">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="备注" style="width:66%;">
+                <div style="display:flex;">
+                    <el-input v-model="form.name"></el-input>
+                    <el-button style="margin-left:5px;" type="primary">添加</el-button>
+                </div>
+            </el-form-item>
+        </el-form>
+        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
+            <el-table-column
+            prop="date"
+            label="单据编号"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="date"
+            label="药品名称"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="规格"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="单位"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="调价数量"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="原进货价"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="原零售价"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="新零售价"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="生产厂商"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="批准文号"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="供应商"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            prop="name"
+            label="备注"
+            width="100">
+            </el-table-column>
+            <el-table-column
+            fixed="right"
+            width="100"
+            label="操作">
+                <template slot-scope="scope">
+                    <el-button type="text" size="small">删除</el-button>
+                    <el-button type="text" size="small">编辑</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+        </span>
+    </el-dialog>
+  
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "../../components/bread-crumb";
+
+export default {
+    name: "stockModifyPrice",
+    components:{
+        BreadCrumb
+    },
+    data() {
+        return{
+            crumbs: [
+                { path: false, name: "库存管理" },
+                { path: false, name: "耗材管理" },
+                { path: false, name: "耗材调价" }
+            ],
+            tableHeight: '',
+            fullHeight: document.documentElement.clientHeight,
+            searchKey:'',
+            value1:'',
+            value2:'',
+            tableData: [{
+                date: '2016-05-02',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1518 弄'
+                }, {
+                date: '2016-05-04',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1517 弄'
+                }, {
+                date: '2016-05-01',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1519 弄'
+                }, {
+                date: '2016-05-03',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1516 弄'
+            }],
+            dialogVisible:false,
+            form: {
+                name: '',
+            },
+        }
+    },
+    methods:{
+        search(){
+
+        },
+        print(){
+            this.$router.push({path:'/stock/stockModifyPricePrint'})
+            
+        }
+    },
+    created(){
+        let tableHeight = document.body.clientHeight - 200;
+        this.tableHeight = tableHeight
+    },
+    mounted() {
+      const that = this;
+      window.onresize = () => {
+        return (() => {
+          window.fullHeight = document.documentElement.clientHeight;
+          that.fullHeight = window.fullHeight
+        })()
+      }
+    },
+    watch: {
+      fullHeight(val) {
+        if (!this.timer) {
+          this.fullHeight = val
+          let tableHeight = val - 200
+          this.tableHeight = tableHeight
+          this.timer = true
+          let that = this
+          setTimeout(function() {
+            that.timer = false
+          }, 400)
+        }
+      }
+
+    }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.app-container {
+  // margin: 20px;
+  font-size: 15px;
+}
+.modifyDialog{
+    display: flex;
+    flex-wrap: wrap;
+    margin-bottom: 10px;
+    .el-form-item{
+        width: 33%;
+    }
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+::-webkit-scrollbar{
+    height: 20px !important;
+}
+</style>

src/xt_pages/stock/stockWarning.vue

@@ -6,6 +6,14 @@
     <div class="app-container">
         <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
             <div>
+                <el-select v-model="value" size="small" placeholder="请选择">
+                    <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
                 <el-input
                 size="small"
                 style="width: 200px;"
@@ -21,124 +29,33 @@
                 @click="search"
                 >搜索</el-button
                 >
-                <el-date-picker
-                size="small"
-                v-model="value1"
-                type="date"
-                style="margin-left:5px;width:140px;"
-                placeholder="选择日期">
-                </el-date-picker>
-                <el-date-picker
-                size="small"
-                v-model="value2"
-                type="date"
-                style="margin-left:5px;width:140px;"
-                placeholder="选择日期">
-                </el-date-picker>
+                <el-select v-model="value" size="small" placeholder="请选择">
+                    <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
             </div>
             <div>
-                <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
-                <el-button size="small" type="primary">核对</el-button>
-                <el-button size="small" type="primary" @click="print">打印</el-button>
                 <el-button size="small" type="primary">导出</el-button>
             </div>
         </div>
         <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
             <el-table-column
-            prop="date"
-            label="报损编码">
-            </el-table-column>
-            <el-table-column
-            prop="date"
-            label="报损日期">
-            </el-table-column>
-            <el-table-column
-            prop="name"
-            label="操作人">
+            type="selection"
+            width="55">
             </el-table-column>
             <el-table-column
-            prop="name"
-            label="审核日期">
+            type="index"
+            width="50">
             </el-table-column>
             <el-table-column
-            prop="name"
-            label="核对人">
-            </el-table-column>
-            <el-table-column
-            prop="name"
-            label="状态">
-            </el-table-column>
-            <el-table-column
-            label="操作">
-                <template slot-scope="scope">
-                    <el-button type="text" size="small">删除</el-button>
-                    <el-button type="text" size="small">编辑</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :page-sizes="[5, 10, 50, 100]"
-            :page-size="5"
-            background
-            style="margin-top:20px;text-align: right"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="total"
-        >
-        </el-pagination>
-    </div>
-    <el-dialog
-        title="库房调价"
-        :visible.sync="dialogVisible"
-        width="1200px"
-        :before-close="handleClose">
-        <el-form :model="form" class="modifyDialog" label-width="120px">
-            <el-form-item label="耗材ID">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="药品名称">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="规格">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="单位">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="进货价">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="零售价">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="报损数量">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="库存">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="产地">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="批准文号">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="生产厂商">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item>
-            <el-form-item label="备注">
-                <div style="display:flex;">
-                    <el-input v-model="form.name"></el-input>
-                    <el-button style="margin-left:5px;" type="primary">添加</el-button>
-                </div>
-            </el-form-item>
-        </el-form>
-        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-            <el-table-column
+            fixed="left"
             prop="date"
             label="耗材ID"
-            width="100">
+            width="80">
             </el-table-column>
             <el-table-column
             prop="date"
@@ -147,7 +64,7 @@
             </el-table-column>
             <el-table-column
             prop="name"
-            label="规格"
+            label="规格型号"
             width="100">
             </el-table-column>
             <el-table-column
@@ -157,22 +74,22 @@
             </el-table-column>
             <el-table-column
             prop="name"
-            label="调价数量"
+            label="零售价"
             width="100">
             </el-table-column>
             <el-table-column
             prop="name"
-            label="原进货价"
+            label="进货价"
             width="100">
             </el-table-column>
             <el-table-column
             prop="name"
-            label="原零售价"
+            label="库存数量"
             width="100">
             </el-table-column>
             <el-table-column
             prop="name"
-            label="新零售价"
+            label="库存预警"
             width="100">
             </el-table-column>
             <el-table-column
@@ -192,24 +109,30 @@
             </el-table-column>
             <el-table-column
             prop="name"
-            label="备注"
+            label="供应商"
             width="100">
             </el-table-column>
             <el-table-column
-            fixed="right"
-            width="100"
-            label="操作">
-                <template slot-scope="scope">
-                    <el-button type="text" size="small">删除</el-button>
-                    <el-button type="text" size="small">编辑</el-button>
-                </template>
+            prop="name"
+            label="状态"
+            width="80">
+            </el-table-column>
+            <el-table-column
+            label="备注">
             </el-table-column>
         </el-table>
-        <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-        </span>
-    </el-dialog>
+        <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[5, 10, 50, 100]"
+            :page-size="5"
+            background
+            style="margin-top:20px;text-align: right"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+        >
+        </el-pagination>
+    </div>
   
   </div>
 </template>
@@ -230,8 +153,6 @@ export default {
                 { path: false, name: "耗材报损" }
             ],
             searchKey:'',
-            value1:'',
-            value2:'',
             tableData: [{
                 date: '2016-05-02',
                 name: '王小虎',
@@ -249,20 +170,28 @@ export default {
                 name: '王小虎',
                 address: '上海市普陀区金沙江路 1516 弄'
             }],
-            dialogVisible:false,
-            form: {
-                name: '',
-            },
             total: 0,
+            options: [{
+                value: '选项1',
+                label: '黄金糕'
+                }, {
+                value: '选项2',
+                label: '双皮奶'
+                }, {
+                value: '选项3',
+                label: '蚵仔煎'
+                }, {
+                value: '选项4',
+                label: '龙须面'
+                }, {
+                value: '选项5',
+                label: '北京烤鸭'
+            }],
         }
     },
     methods:{
         search(){
 
-        },
-        print(){
-            this.$router.push({path:'/stock/stockModifyPricePrint'})
-            
         },
         handleSizeChange(){},
         handleCurrentChange(){}