同步

src/views/warehouse/Shipping/AddOrUpdate.vue

@@ -918,6 +918,7 @@ export default {
         fSpecification5: null,
         fSpecification6: null,
         fExrate: null,
+        remark:'箱量',
         createBy: this.userVal.userName,
         createTime: Date.parse(new Date()),
         updateBy: this.userVal.userName,
@@ -928,7 +929,7 @@ export default {
       this.detailList2.push({
         fFeeid: null,
         fUnitprice: null,
-        remarks: null,
+        remark:'票',
         createBy: this.userVal.userName,
         createTime: Date.parse(new Date()),
         updateBy: this.userVal.userName,
@@ -1000,7 +1001,7 @@ export default {
         }
       });
     },
-    saveForm() {
+    saveForm(type) {
       let checkData = {
         fId: this.form.fId,
         fType: "freight",
@@ -1033,6 +1034,9 @@ export default {
                   this.detailList=response.data.itemList?response.data.itemList:[]
                   this.detailList2=response.data.itemList2?response.data.itemList2:[]
                   this.msgSuccess("保存成功");
+                  if (!type){
+                    this.cancel();
+                  }
                 }
               });
             }
@@ -1165,15 +1169,13 @@ export default {
     },
     goBack() {
       this.$confirm("是否确定返回列表?", "提示", {
-        confirmButtonText: "确认返回",
-        cancelButtonText: "立即保存",
+        cancelButtonText: "取消",
+        confirmButtonText: "保存",
         type: "warning",
-      })
-        .then(() => {
-          this.cancel();
-        })
-        .catch(() => {
-          this.saveForm();
+      }).then(() => {
+        this.saveForm(false);
+        }).catch(() => {
+        this.cancel();
         });
     },
   },