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

src/views/Inventory/InventoryManagement/index.vue

@@ -32,7 +32,7 @@
         </el-table-column>
         <el-table-column label="联系人" align="center">
           <template slot-scope="scope">
-            {{ scope.row.姓名 }}
+            {{ scope.row.联系人 }}
           </template>
         </el-table-column>
         <el-table-column label="备注" width="180" align="center">
@@ -97,6 +97,11 @@
             {{ scope.row.仓库名称 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="追溯码" width="150">
+          <template slot-scope="scope">
+            <canvas :id="canvas[scope.$index]"/>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" min-width="100" align="center" fixed="right">
           <template slot-scope="scope">
             <el-button
@@ -243,6 +248,7 @@
 </template>
 <script>
 import { initWarehouse, addWarehouse, alterWarehouse, deleteWarehouse, searchLocate, addLocate, alterLocate, deleteLocate, searchPeople } from '@/api/Inventory/InventoryManagement'
+import QRCode from 'qrcode'
 export default {
   data() {
     return {
@@ -341,6 +347,7 @@ export default {
             不可用量: response.data[i].不可用量,
             仓库名称: response.data[i].仓库名称
           })
+          this.useqrcode ()
         }
       })
     },
@@ -536,6 +543,15 @@ export default {
         })
       })
     },
+    useqrcode() {
+      // 生成的二维码内容，可以添加变量
+      this.QueryDetail = this.num
+      var canvas = document.getElementById('canvas')
+      QRCode.toCanvas(canvas, this.QueryDetail, function (error) {
+        if (error) console.error(error)
+        console.log('success!')
+      })
+    },
     // 重置表单
     callLocateOff(formName) {
       this.form2 = {}