chenrui 3 lat temu
rodzic
commit
3d8ae47d26

+ 9 - 2
src/components/MultiTab/MultiTab.vue

@@ -189,8 +189,15 @@ export default {
             this.$store.state.app.updateList = false
             this.activeKey = newVal.name
           } else {
-            this.$message.info('您当前打开窗口太多,请关闭一些,窗口不能超过' + this.maxTabNums + '个')
-            this.$router.go(-1)
+            // this.$message.info('您当前打开窗口太多,请关闭一些,窗口不能超过' + this.maxTabNums + '个')
+            const _this = this
+            this.$warning({
+              title: '提示',
+              content: '您当前打开窗口太多,请关闭一些,窗口不能超过' + this.maxTabNums + '个',
+              onOk () {
+                _this.$router.go(-1)
+              }
+            })
           }
         }
       } else { // 已存在

+ 3 - 6
src/views/allocationManagement/warehouseAllocation/detail.vue

@@ -80,9 +80,6 @@ export default {
   data () {
     return {
       exportLoading: false, // 导出loading
-      queryParam: {
-        allocationWarehouseSn: this.outBizSn || this.$route.params.sn
-      },
       warehouse: null, // 基础信息
       productTotal: null,
       // 表头
@@ -101,7 +98,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        return allocWarehouseDetailList(Object.assign(parameter, this.queryParam)).then(res => {
+        return allocWarehouseDetailList(Object.assign(parameter, { allocationWarehouseSn: this.outBizSn || this.$route.params.sn })).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
@@ -128,7 +125,7 @@ export default {
       allocWarehouseDetailSn({ sn: this.outBizSn || this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           this.warehouse = res.data
-          this.queryParam.outWarehouseSn = res.data.outWarehouseSn
+          // this.queryParam.outWarehouseSn = res.data.outWarehouseSn
         } else {
           this.warehouse = null
         }
@@ -136,7 +133,7 @@ export default {
     },
     // 已选产品总计查询
     getProduceTotal () {
-      allocWarehouseDetailCount(this.queryParam).then(res => {
+      allocWarehouseDetailCount({ allocationWarehouseSn: this.outBizSn || this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           this.productTotal = res.data
         } else {

+ 1 - 1
src/views/bulkManagement/bulkReturnGoods/grabEdit.vue

@@ -223,7 +223,7 @@ export default {
       chooseColumns: [
         { title: '散件入库单号', dataIndex: 'sparePartsPurchaseNo', width: '18%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '20%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productUnit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货单价', scopedSlots: { customRender: 'purchaseCost' }, width: '8%', align: 'center' },
         { title: '退货数量', scopedSlots: { customRender: 'purchaseQty' }, width: '8%', align: 'center' },