瀏覽代碼

装箱单成衣字段增加,预装箱单参照数据分页增加

jbb 2 年之前
父節點
當前提交
751de65bd8

+ 15 - 1
src/views/packing-list/packinglist-clothes/clothesAddDrawer.vue

@@ -537,8 +537,14 @@ export default {
               // clothesFactory: data.garmentFactory,
               exportInvoiceNo: data.exportInvoiceNo,
               bookNum: data.depositaryReceiptNo,
+              syPreAssembledPackingListId:data.syPreAssembledPackingListId,
+              elementsId:data.elementsId,
+              business_Type_Value:data.business_Type_Value,
+              salesman:data.salesman,
+              salesDepartment:data.salesDepartment,
+              ompoId:data.ompoId
             }
-            this.setHeadCalField(data.syPackingListTailoringItemList)
+          this.setHeadCalField(data.syPackingListTailoringItemList)
           this.dynamicColumns(data.sizeTables)
           this.clothesAddData = data.syPackingListTailoringItemList
           this.clothesAddData.map(item =>{
@@ -750,6 +756,12 @@ export default {
           newObj.totalPrice = this.clothesAdd.totalPrice
           newObj.total = this.clothesAdd.total
           newObj.syPackingListTailoringItemList = this.clothesAddData
+          newObj.syPreAssembledPackingListId=this.clothesAdd.syPreAssembledPackingListId,
+          newObj.elementsId=this.clothesAdd.elementsId,
+          newObj.business_Type_Value=this.clothesAdd.business_Type_Value,
+          newObj.salesman=this.clothesAdd.salesman,
+          newObj.salesDepartment=this.clothesAdd.salesDepartment,
+          newObj.ompoId=this.clothesAdd.ompoId
           var sort = 0;
           for (var i=0; i<newObj.syPackingListTailoringItemList.length;i++){
              var tableRow = newObj.syPackingListTailoringItemList[i];
@@ -809,6 +821,7 @@ export default {
           }
            tableRow.sort = ++sort;
          } 
+         debugger
          if(this.editDecide === 'edit'){
            editSpltList(newObj).then(res => {
              if (res.success) {
@@ -824,6 +837,7 @@ export default {
         }else {
           addSpltList(newObj).then(res => {
              if (res.success) {
+               debugger
               this.$message.success('新增成功')
               this.close()
               //清空信息

+ 7 - 3
src/views/pre-book/advancePackingListModal.vue

@@ -67,7 +67,7 @@
           :columns="advancePackingListColumns"
           :data-source="advancePackingListData"
           :loading="loading"
-          :pagination="ipagination"
+          :pagination="pagination"
           row-key="itemId"
           :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
           @change="handleTableChange"
@@ -265,7 +265,8 @@ export default {
 
       // orderDataform: this.$form.createForm(this),
       confirmLoading: false,
-      advancePackingListModVis: false
+      advancePackingListModVis: false,
+      pagination:{}
     }
   },
   // 接收父组件 方法
@@ -365,7 +366,10 @@ export default {
       this.selectedRowKeys = [];
       this.close()
     },
-    handleTableChange() {},
+     handleTableChange(pagination, filters, sorter) {
+      this.queryParam.pageNo = pagination.current
+      this.searchQuery()
+    },
     // 选中行
     onSelectChange(keys, rows) {
       this.selectedRowKeys = keys;