Commit 3efcbb43 authored by 刘文虎's avatar 刘文虎

Merge branch 'master' into lwh-dev

parents d2df992c e11ef10f
Pipeline #3974 canceled with stages
...@@ -606,7 +606,7 @@ ...@@ -606,7 +606,7 @@
remark: data.remark, remark: data.remark,
attach: data.attach, attach: data.attach,
type: data.type, // 收据样式 type: data.type, // 收据样式
showSeal: data.showSeal,
// 编辑情况下,下一页的数据 // 编辑情况下,下一页的数据
expenseDetails: data.expenseDetails, expenseDetails: data.expenseDetails,
faultRecord: data.faultRecord faultRecord: data.faultRecord
...@@ -633,6 +633,11 @@ ...@@ -633,6 +633,11 @@
this.form.id = '' this.form.id = ''
this.form.copyId = data.id this.form.copyId = data.id
this.faultRecord.id = '' this.faultRecord.id = ''
if (this.form.expenseDetails) {
for (var item of this.form.expenseDetails) {
item.id = ''
}
}
} }
}, },
handleListChange(lists) { handleListChange(lists) {
......
...@@ -378,6 +378,8 @@ export default { ...@@ -378,6 +378,8 @@ export default {
// CREATE:创建账单;SEND:发送客户;ENSURE:客户确认;SETTLE:标记为已结清 // CREATE:创建账单;SEND:发送客户;ENSURE:客户确认;SETTLE:标记为已结清
operateTexts() { operateTexts() {
return { return {
COPY: '复制账单',
UPDATE: '修改账单',
CREATE: '创建账单', CREATE: '创建账单',
SEND: '发送客户', SEND: '发送客户',
ENSURE: '客户确认', ENSURE: '客户确认',
......
...@@ -64,6 +64,9 @@ export default { ...@@ -64,6 +64,9 @@ export default {
if (!number || isNaN(Number(number))) { if (!number || isNaN(Number(number))) {
return false; return false;
} }
if(number==0){
return false;
}
this.$emit('confirm', { this.$emit('confirm', {
number: this.value, number: this.value,
key: this.valueKey, key: this.valueKey,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment