|
@@ -47,7 +47,7 @@ Page({
|
|
|
list = [];
|
|
|
if (submitedit.length) {
|
|
|
for (let i = 0; i < submitedit.length; i++) {
|
|
|
- (submitedit[i].status == '未提报') ? this.delete_submitdetailed(submitedit[i].sat_submiteditid): list.push(submitedit[i]);
|
|
|
+ (submitedit[i].status == '未提报' && submitedit[i].content == '') ? this.delete_submitdetailed(submitedit[i].sat_submiteditid): list.push(submitedit[i]);
|
|
|
};
|
|
|
res.data.submitedit = list;
|
|
|
};
|
|
@@ -121,6 +121,9 @@ Page({
|
|
|
if (this.data.submiteditData.sat_submiteditmodelid) return this.setData({
|
|
|
startRecord: true
|
|
|
})
|
|
|
+ this.setData({
|
|
|
+ content: ""
|
|
|
+ })
|
|
|
_Http.basic({
|
|
|
"classname": "saletool.submitedit.submitedit",
|
|
|
"method": "insertorupdate",
|
|
@@ -130,7 +133,6 @@ Page({
|
|
|
"sat_submiteditid": 0
|
|
|
}
|
|
|
}).then(res => {
|
|
|
- console.log("asdasd", res)
|
|
|
if (res.msg != '成功') return wx.showToast({
|
|
|
title: res.data,
|
|
|
icon: "none"
|
|
@@ -139,7 +141,6 @@ Page({
|
|
|
startRecord: true,
|
|
|
submiteditData: res.data
|
|
|
})
|
|
|
- console.log(this.data.submiteditData)
|
|
|
})
|
|
|
},
|
|
|
/* 隐藏新建 */
|
|
@@ -148,7 +149,6 @@ Page({
|
|
|
startRecord: false
|
|
|
})
|
|
|
},
|
|
|
-
|
|
|
/* 提交明细 */
|
|
|
submit() {
|
|
|
if (!this.data.content && this.data.detailsData.istextrequired == 1) return wx.showToast({
|
|
@@ -205,8 +205,11 @@ Page({
|
|
|
title: '提交成功',
|
|
|
});
|
|
|
res.data.status = '已提报';
|
|
|
+ let submitedit = this.data.detailsData.submitedit;
|
|
|
+ let i = submitedit.findIndex(v => v.sat_submiteditid == res.data.sat_submiteditid);
|
|
|
+ i == -1 ? submitedit.push(res.data) : submitedit[i] = res.data;
|
|
|
this.setData({
|
|
|
- "detailsData.submitedit": this.data.detailsData.submitedit.concat([res.data]),
|
|
|
+ "detailsData.submitedit": submitedit,
|
|
|
submiteditData: [],
|
|
|
startRecord: false,
|
|
|
done: this.data.oneToOne == 'true' ? true : '',
|
|
@@ -230,6 +233,15 @@ Page({
|
|
|
})
|
|
|
},
|
|
|
|
|
|
+ reedit() {
|
|
|
+ this.setData({
|
|
|
+ CheckTheRecord: false,
|
|
|
+ submiteditData: this.data.recordL,
|
|
|
+ startRecord: true,
|
|
|
+ content: this.data.recordL.content
|
|
|
+ })
|
|
|
+ },
|
|
|
+
|
|
|
recordClose() {
|
|
|
this.setData({
|
|
|
recordL: {},
|