浏览代码

bug 修复

lilei 3 年之前
父节点
当前提交
49a8478c92
共有 2 个文件被更改,包括 19 次插入2 次删除
  1. 2 2
      src/libs/JGPrint.js
  2. 17 0
      src/views/bulkManagement/bulkWarehousingOrder/edit.vue

+ 2 - 2
src/libs/JGPrint.js

@@ -32,7 +32,7 @@ export const JGPrintTag = function (html, width, height, data) {
   // LODOP.SET_PRINT_STYLEA(0,"QRCodeErrorLevel",'H')
   LODOP.SET_PRINT_COPIES(data.printQty)// 指定份数
   LODOP.SET_PRINT_PAGESIZE(1, width, height)
-  LODOP.PRINT()
+  LODOP.PRINTA()
 }
  
 export const demoGetBASE64 = function (dataArray) {
@@ -168,7 +168,7 @@ export const jGPrint = function (data, type, printerType) {
         LODOP.PRINT_INIT("")
         LODOP.ADD_PRINT_PDF(0, 0, '100%', '100%', data.data[i])
         LODOP.SET_PRINT_PAGESIZE(3, 2090, 40, '')
-        LODOP.PRINT()
+        LODOP.PRINTA()
       }
     }
     

+ 17 - 0
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -413,6 +413,7 @@ export default {
           }
         })
       } else {
+        // 新添加的产品自动添加到已选产品中
         if (data.length == 1 && this.showNewProduct) {
           data[0].putCost = this.paramsData.putCost
           data[0].putQty = this.paramsData.putQty
@@ -473,6 +474,7 @@ export default {
     },
     //  添加/编辑
     handleAdd (row, isEdit) {
+      const _this = this
       if (!isEdit && !(row.putCost || row.putCost == 0)) {
         this.$message.warning('请输入成本价后再添加!')
         return
@@ -489,6 +491,21 @@ export default {
         this.$message.warning('请选择仓位后再添加!')
         return
       }
+      if (!isEdit && !row.warehouseLocationSn) {
+        _this.$confirm({
+          title: '提示',
+          content: '该产品已禁用,确认继续添加吗?',
+          centered: true,
+          onOk () {
+            _this.saveFormData(row, isEdit)
+          }
+        })
+        return
+      }
+      this.saveFormData(row, isEdit)
+    },
+    // 保存
+    saveFormData (row, isEdit) {
       const params = {
         id: isEdit ? row.id : undefined,
         sparePartsPurchaseSn: this.$route.params.sn,