|
@@ -445,7 +445,6 @@ export default {
|
|
|
visible: false,
|
|
|
editDecide: 'add',
|
|
|
dateFormat: 'YYYY-MM-DD',
|
|
|
- addState:'0',
|
|
|
addAdpacking: {
|
|
|
syPreAssembledPackingListItemList:[]
|
|
|
}, //主表信息
|
|
@@ -544,10 +543,7 @@ export default {
|
|
|
},
|
|
|
async myHandSubmit(){
|
|
|
this.addAdpacking.status=1;
|
|
|
- await this.saveAdd();
|
|
|
- if(this.addState == '1'){
|
|
|
- this.$emit('hand-submit',this.row)
|
|
|
- }
|
|
|
+ this.saveAdd();
|
|
|
},
|
|
|
// 保存
|
|
|
async saveAdd() {
|
|
@@ -580,10 +576,14 @@ export default {
|
|
|
}
|
|
|
if(this.judge == 0){
|
|
|
if(this.editDecide === 'edit'){
|
|
|
- await editById(newObj).then(res => {
|
|
|
+ editById(newObj).then(res => {
|
|
|
this.btnLoading = true
|
|
|
if (res.success) {
|
|
|
- this.$message.success('编辑成功')
|
|
|
+ if(newObj.status == '1'){
|
|
|
+ this.$message.success('编辑并提交成功')
|
|
|
+ }else {
|
|
|
+ this.$message.success('编辑成功')
|
|
|
+ }
|
|
|
this.close()
|
|
|
this.btnLoading = false
|
|
|
//清空信息
|
|
@@ -598,17 +598,20 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
}else {
|
|
|
- await addAdvPac(newObj).then(res => {
|
|
|
+ addAdvPac(newObj).then(res => {
|
|
|
this.btnLoading = true
|
|
|
- if (res.success) {
|
|
|
- this.addState = '1'
|
|
|
- this.$message.success('新增成功')
|
|
|
- this.close()
|
|
|
- this.btnLoading = false
|
|
|
- //清空信息
|
|
|
- newObj = {syPreAssembledPackingListItemList:[]};
|
|
|
- this.row = res.result
|
|
|
- this.fatherList() // 调用父组件 查询方法
|
|
|
+ if (res.success) {
|
|
|
+ if(newObj.status == '1'){
|
|
|
+ this.$message.success('新增并提交成功')
|
|
|
+ }else {
|
|
|
+ this.$message.success('新增成功')
|
|
|
+ }
|
|
|
+ this.close()
|
|
|
+ this.btnLoading = false
|
|
|
+ //清空信息
|
|
|
+ newObj = {syPreAssembledPackingListItemList:[]};
|
|
|
+ this.row = res.result
|
|
|
+ this.fatherList() // 调用父组件 查询方法
|
|
|
// this.msgFormSon = {} 清空子表信息
|
|
|
}else{
|
|
|
this.$message.error(res.message)
|
|
@@ -629,7 +632,7 @@ export default {
|
|
|
// }
|
|
|
// })
|
|
|
},
|
|
|
- JudgeVluabled(){
|
|
|
+ JudgeVluabled(){
|
|
|
this.judge = 0
|
|
|
for (var i=0; i<this.addAdpacking.syPreAssembledPackingListItemList.length;i++){
|
|
|
var tableRow = this.addAdpacking.syPreAssembledPackingListItemList[i];
|
|
@@ -698,7 +701,7 @@ export default {
|
|
|
|
|
|
},
|
|
|
// 设置表头信息
|
|
|
- setHeadData(referData, mData){
|
|
|
+ setHeadData(referData, mData){
|
|
|
var itemData = {};
|
|
|
if (mData.syPreAssembledPackingListItemList != null && mData.syPreAssembledPackingListItemList.size>0){
|
|
|
itemData = mData.syPreAssembledPackingListItemList[0];
|