Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

package.json

@@ -16,7 +16,7 @@
     "@xkeshi/vue-barcode": "^1.0.0",
     "axios": "0.18.0",
     "echarts": "^4.2.0-rc.2",
-    "element-ui": "2.10.0",
+    "element-ui": "2.8.2",
     "file-saver": "^1.3.8",
     "html2canvas": "^1.0.0-alpha.12",
     "jquery": "^3.3.1",

src/views/PurchasingCenter/PurchaseSituationSearch/index.vue

@@ -22,7 +22,7 @@
             :value="item.value"/>
         </el-select>
         <span>名&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;称:</span>
-        <el-input v-model="name" placeholder="名称" size="small" clearable style="width:200px"/>
+        <el-input v-model="Name" placeholder="名称" size="small" clearable style="width:200px"/>
       </el-row>
       <el-row style="margin-top:10px">
         <span>规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格:</span>