|
@@ -231,7 +231,7 @@
|
|
|
@callback="search"
|
|
@callback="search"
|
|
|
@close="loadFlowFData"
|
|
@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" />
|
|
<print :show="showPrint" :list="printList" :type="printType" />
|
|
|
<labelPrint :show="showPrintYi" :list="printList" :type="printType" />
|
|
<labelPrint :show="showPrintYi" :list="printList" :type="printType" />
|
|
|
</div>
|
|
</div>
|
|
@@ -296,7 +296,7 @@
|
|
|
IbpsAddress,
|
|
IbpsAddress,
|
|
|
IbpsImage,
|
|
IbpsImage,
|
|
|
DictionaryFormat,
|
|
DictionaryFormat,
|
|
|
- // Scan,
|
|
|
|
|
|
|
+ Scan,
|
|
|
Print: () => import('../components/print'),
|
|
Print: () => import('../components/print'),
|
|
|
LabelPrint: () => import('../components/labelPrint')
|
|
LabelPrint: () => import('../components/labelPrint')
|
|
|
|
|
|
|
@@ -762,11 +762,11 @@
|
|
|
this.scanName = val
|
|
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) {
|
|
labelPrint(data, type) {
|
|
|
this.showPrintYi = true
|
|
this.showPrintYi = true
|