Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/views/mes/lpn/lpnNoDuplicate/index.vue

@@ -73,7 +73,7 @@
         prop="salesVoucherItem"
       />
       <el-table-column label="LPN码" align="center" prop="lpnNo" />
-      <el-table-column label="recordOn" align="center" prop="是否打印">
+      <el-table-column label="启用" align="center" prop="recordOn">
         <template slot-scope="scope">
           {{ scope.row.recordOn ? '是' : '否' }}
         </template>
@@ -152,7 +152,7 @@ export default {
       const rowsOff = this.selectedRows.filter(v => !v.recordOn)
       const lpnlist = rowsOff.map(v => v.lpnNo)
       if (lpnlist.length > 0) {
-        this.$modal.msgWarning(lpnlist.join(',') + '无法打印')
+        this.$modal.msgWarning(lpnlist.join(',') + '未启用')
       }
       if (rows.length > 0) {
         const valueList = rows.map((v) => {