jbb 2 лет назад
Родитель
Сommit
4cddaad3c1
2 измененных файлов с 49 добавлено и 22 удалено
  1. 48 22
      src/views/pre-book/addPreBookDrawer.vue
  2. 1 0
      src/views/pre-book/preBookList.vue

+ 48 - 22
src/views/pre-book/addPreBookDrawer.vue

@@ -2,7 +2,7 @@
   <!-- 新增预托书 -->
   <div id="addPreBookDrawer">
     <a-drawer
-      title="新增预托书"
+      :title="(defultMethod == 'add')?'新增预托书':'编辑预托书'"
       width="89%"
       placement="right"
       :closable="true"
@@ -382,14 +382,14 @@ export default {
 
         {
           title: '业务部门',
-          key: 'operatingDepartment',
+          key: 'salesDepartment',
           width: 120,
 
           className: 'replacecolor'
         },
         {
           title: '采购/委外订单号',
-          key: 'purchaseAboardOrderNum',
+          key: 'spurOrSubOrder',
           width: 160,
 
           className: 'replacecolor'
@@ -421,6 +421,7 @@ export default {
       addPreBook: {}, //主表信息
       confirmLoading: false,
       visible: false,
+      defultMethod:'add',
       dateFormat: 'YYYY-MM-DD',
       toolbarConfig: {
           btn: []
@@ -449,24 +450,45 @@ export default {
       console.log('増行')
 
       const addrow = {
-        englishName: '',
-        sort: '',
-        smallPo: '',
-        quantity: '',
-        boxNumber: '',
-        grossWeight: '',
-        netWeight: '',
-        volume: '',
-        distributionPoint: '',
-        containerCode: '',
-        containerNumber: '',
-        unitPrice: '',
-        preDeliveryDate: '',
-        salesman: '',
-        operatingDepartment: '',
-        purchaseAboardOrderNum: '',
-        purchaseAboardFactory: '',
-        operation: ''
+          id:"",
+          syLetterDepositId:"",
+          preDeliveryDate:"",
+          clientAbbreviation:"",
+          syPreAssembledPackingListId:"",
+          syPreAssembledPackingListItemId:"",
+          acSetNo:"",
+          garmentFactory:"",
+          // hod:"",
+          styleNo:"",
+          poNo:"",
+          itemCode:"",
+          distributionPoint:"",
+          size:"",
+          startingBoxNumber:"",
+          endCaseNumber:"",
+          colour:"",
+          piecesBox:"",
+          boxNumber:"",
+          total:"",
+          netWeight:"",
+          totalNetWeight:"",
+          grossWeight:"",
+          totalGrossWeight:"",
+          outerBoxLength:0,
+          outerBoxWidth:0,
+          outerBoxHeight:0,
+          totalVolume:"",
+          netWeightToo:0,
+          unitPrice:"",
+          totalPrice:"",
+          containerCode:"",
+          containerNumber:"",
+          custor:"",
+          itemNumber:"",
+          preAssembledPackingNo:"",
+          salesman:"",
+          salesDepartment:"",
+          spurOrSubOrder:""
       }
 
       this.addPerBookData.push(addrow)
@@ -553,6 +575,7 @@ export default {
     close() {
       this.$emit('close')
       this.visible = false
+      this.defultMethod = 'add'
       this.$refs.form.resetFields()
     },
 
@@ -612,7 +635,10 @@ export default {
           containerNumber:data.containerNumber,
           custor:data.customer,
           itemNumber:data.itemNumber,
-          preAssembledPackingNo:data.documentNo
+          preAssembledPackingNo:data.documentNo,
+          salesman:data.salesman,
+          salesDepartment:data.salesDepartment,
+          spurOrSubOrder:data.spurOrSubOrder
         };
         ret.push(sub);
       }

+ 1 - 0
src/views/pre-book/preBookList.vue

@@ -323,6 +323,7 @@ export default {
         if (res.success) {
           res.result.consigneeAll = res.result.consignee+"+"+res.result.consigneeAddress+"+"+res.result.notifyParty+"+"+res.result.notifyPartyAddress;
           this.$refs.addPreBookDrawer.addPreBook = res.result;
+          this.$refs.addPreBookDrawer.defultMethod = 'edit';
           res.result.syLetterDepositItemList.map(item =>{
              var str =item.hod
               var n=str.split(" ");