Browse Source

预装箱单修改,删除功能接口修改;预装箱子表删除功能修改

jbb 2 years ago
parent
commit
b9b51e4017

+ 10 - 6
src/views/advance-packingList/adPaList-clothes.vue

@@ -191,7 +191,6 @@
         @ok="modalFormOk"
       ></addAdpacking-drawer>
 
-
       <detailsAdpacking-drawer ref="detailsAdpackingDrawer" @ok="modalFormOk"></detailsAdpacking-drawer>
     </div>
   </div>
@@ -204,7 +203,7 @@ import moment from 'moment'
 import addAdpackingDrawer from '@views/advance-packingList/addAdpackingDrawer.vue'
 import detailsAdpackingDrawer from '@views/advance-packingList/detailsAdpackingDrawer.vue'
 
-import { getadPaList, itemByMainId, submit, cancelSubmit } from '@api/document/advance-packingList.js'
+import { getadPaList, itemByMainId, submit, cancelSubmit, deleteAdPaList} from '@api/document/advance-packingList.js'
 
 export default {
   productName: 'AdPaListClothes', // 预装箱单-成衣
@@ -432,8 +431,8 @@ export default {
     edit(record) {
       itemByMainId({id:record.id}).then(res => {
         if (res.success) {
-          
           this.$refs.addAdpackingDrawer.visible = true;
+          this.$refs.addAdpackingDrawer.editDecide = 'edit';
           this.$refs.addAdpackingDrawer.addAdpacking = res.result; //接口参数
           this.$refs.addAdpackingDrawer.loadSizeTables(res.result.syPreAssembledPackingListItemList[0].sizeTables);
           var totalNetWeight = 0;
@@ -533,9 +532,14 @@ export default {
       console.log('点击删除项id:', record.id)
       this.$nextTick(() => {
         deleteAdPaList({ id: record.id }).then(res => {
-          console.log('res:', res)
-          this.getadPaListClothes()
-          this.$message.success('删除成功')
+          if (res.success) {
+            console.log('res:', res)
+            this.getadPaListClothes()
+            this.$message.success('删除成功')
+          } else {
+            this.$message.error('删除成功')
+          }
+       
         })
       })
     },

+ 23 - 2
src/views/advance-packingList/addAdpackingDrawer.vue

@@ -185,7 +185,7 @@ import moment from 'moment'
 
 import ReferShipmentDetailsModal from '@views/advance-packingList/referShipmentDetailsModal.vue'
 
-import { addAdvPac } from '@api/document/advance-packingList.js'
+import { addAdvPac, editById } from '@api/document/advance-packingList.js'
 import { queryShippingDetails } from '@api/document/advance-packingList.js'
 import { JVXETypes } from '@/components/jeecg/JVxeTable'
 import { pushIfNotExist, randomNumber, randomUUID } from '@/utils/util'
@@ -407,6 +407,7 @@ export default {
 
       loading: false, // 表格加载
       visible: false,
+      editDecide: 'add',
       dateFormat: 'YYYY-MM-DD',
 
       addAdpacking: {
@@ -514,7 +515,10 @@ export default {
     },
     //  保存
     saveAdd() {
+      debugger
       var newObj = this.addAdpacking;
+      console.log(newObj)
+      debugger
       if (this.sizeFields.length == 0){
         this.$message.error('当前记录没有尺码字段,无法保存');
         return;
@@ -590,7 +594,21 @@ export default {
       if (newObj.id == undefined || newObj.id == ""){
           newObj.push_status = 0;
       }
-      addAdvPac(newObj).then(res => {
+      if(this.editDecide === 'edit'){
+        editById(newObj).then(res => {
+          if (res.success) {
+             this.$message.success('编辑成功')
+             this.close()
+              //清空信息
+             newObj = {syPreAssembledPackingListItemList:[]};
+             this.fatherList() // 调用父组件 查询方法
+            // this.msgFormSon = {}  清空子表信息
+          }else{
+             this.$message.error(res.message)
+          }
+         })
+      }else {
+        addAdvPac(newObj).then(res => {
         if (res.success) {
           this.$message.success('新增成功')
           this.close()
@@ -602,6 +620,8 @@ export default {
           this.$message.error(res.message)
         }
       })
+      }
+      
       
 
       // const that = this
@@ -703,6 +723,7 @@ export default {
     close() {
       this.$emit('close')
       this.visible = false;
+      this.editDecide = 'add'
       this.addAdpacking = {syPreAssembledPackingListItemList:[]};
     },
     aa() {},