Merge branch 'master' of http://119.23.210.103:3000/wy/lh_firm_former

src/business/platform/data/templaterender/templates/list.vue

@@ -231,7 +231,7 @@
             @callback="search"
             @close="loadFlowFData"
         />
-        <!-- <Scan :currentScan="scanName" :scanVisible="scanVisible" :obj="obj" v-if="scanVisible" @scanOff="scanOff" /> -->
+        <Scan :currentScan="scanName" :scanVisible="scanVisible" :obj="obj" v-if="scanVisible" @scanOff="scanOff" />
         <print :show="showPrint" :list="printList" :type="printType" />
         <labelPrint :show="showPrintYi" :list="printList" :type="printType" />
     </div>
@@ -296,7 +296,7 @@
             IbpsAddress,
             IbpsImage,
             DictionaryFormat,
-            // Scan,
+            Scan,
             Print: () => import('../components/print'),
             LabelPrint: () => import('../components/labelPrint')
 
@@ -762,11 +762,11 @@
                 this.scanName = val
             },
             // /*按钮传参*/
-            // scanHandlerObj(val, obj) {
-            //     this.scanVisible = true
-            //     this.scanName = val
-            //     this.obj = obj
-            // },
+            scanHandlerObj(val, obj) {
+                this.scanVisible = true
+                this.scanName = val
+                this.obj = obj
+            },
             // 一般验收物料标签打印
             labelPrint(data, type) {
                 this.showPrintYi = true