Commit 337e42a8 authored by Asjoker's avatar Asjoker

bug 55238 55240 修复

parent 4d70fa2f
...@@ -1579,7 +1579,6 @@ ...@@ -1579,7 +1579,6 @@
filterable filterable
placeholder="请选择" placeholder="请选择"
style="width: 70%" style="width: 70%"
@change="changeMultiple('发票类型', form.TZXX.INVOICETYPE)"
> >
<el-option <el-option
v-for="item in ZINVTYPES" v-for="item in ZINVTYPES"
...@@ -3326,8 +3325,8 @@ export default { ...@@ -3326,8 +3325,8 @@ export default {
}) })
}, },
changeMultiple(label, data) { changeMultiple(label, data) {
if (data.length > 25) { if (data.length > 7) {
this.$message.warning('最多只能选25个' + label) this.$message.warning('最多只能选7个' + label)
data.splice(-1) data.splice(-1)
} }
}, },
......
...@@ -3180,8 +3180,8 @@ export default { ...@@ -3180,8 +3180,8 @@ export default {
}) })
}, },
changeMultiple(label, data) { changeMultiple(label, data) {
if (data.length > 25) { if (data.length > 7) {
this.$message.warning('最多只能选25个' + label) this.$message.warning('最多只能选7个' + label)
data.splice(-1) data.splice(-1)
} }
}, },
......
...@@ -1849,8 +1849,7 @@ export default { ...@@ -1849,8 +1849,7 @@ export default {
HTDFXXHTDFXX: [ HTDFXXHTDFXX: [
], ],
BUSITYPEName: '', BUSITYPEName: '',
amount: '', amount: ''
TRANSFERTYPE: ''
}, },
saveForm: { saveForm: {
CONMAINCODE: '', CONMAINCODE: '',
...@@ -2000,8 +1999,7 @@ export default { ...@@ -2000,8 +1999,7 @@ export default {
HTDFXXHTDFXX: [ HTDFXXHTDFXX: [
], ],
BUSITYPEName: '', BUSITYPEName: '',
amount: '', amount: ''
TRANSFERTYPE: ''
}, },
rules: { rules: {
ISSUPPLYCONTRACT: [{ required: true, message: '是否补充合同', trigger: 'blur' }], ISSUPPLYCONTRACT: [{ required: true, message: '是否补充合同', trigger: 'blur' }],
...@@ -2488,8 +2486,8 @@ export default { ...@@ -2488,8 +2486,8 @@ export default {
} }
}, },
changeMultiple(label, data) { changeMultiple(label, data) {
if (data.length > 25) { if (data.length > 7) {
this.$message.warning('最多只能选25个' + label) this.$message.warning('最多只能选7个' + label)
data.splice(-1) data.splice(-1)
} }
}, },
......
...@@ -2628,8 +2628,8 @@ export default { ...@@ -2628,8 +2628,8 @@ export default {
}) })
}, },
changeMultiple(label, data) { changeMultiple(label, data) {
if (data.length > 25) { if (data.length > 7) {
this.$message.warning('最多只能选25个' + label) this.$message.warning('最多只能选7个' + label)
data.splice(-1) data.splice(-1)
} }
}, },
...@@ -3177,6 +3177,7 @@ export default { ...@@ -3177,6 +3177,7 @@ export default {
add() { add() {
this.saveLoading = true this.saveLoading = true
// 原始的Axios请求方式 // 原始的Axios请求方式
// 将不该存在的属性置空
if (this.form.ISSUPPLYCONTRACT === '0') { if (this.form.ISSUPPLYCONTRACT === '0') {
this.form.SUPCONMAINCODE = '' this.form.SUPCONMAINCODE = ''
} }
...@@ -3223,7 +3224,6 @@ export default { ...@@ -3223,7 +3224,6 @@ export default {
delete this.form.FKDWXX delete this.form.FKDWXX
delete this.form.SKDWXX delete this.form.SKDWXX
} }
// 将不该存在的属性置空
if (this.$route.query.number !== '8') { if (this.$route.query.number !== '8') {
this.form.TZXX.ISSFYBZJ = '' this.form.TZXX.ISSFYBZJ = ''
delete this.form.BZJXX delete this.form.BZJXX
...@@ -3243,14 +3243,15 @@ export default { ...@@ -3243,14 +3243,15 @@ export default {
} }
} }
} }
// 支付币种多选 // 支付币种多选,数组转字符串
this.form.TZXX.PAYMENTCURRENCY = this.form.TZXX.PAYMENTCURRENCY.length ? this.form.TZXX.PAYMENTCURRENCY.join(',') : '' this.form.TZXX.PAYMENTCURRENCY = this.form.TZXX.PAYMENTCURRENCY.length ? this.form.TZXX.PAYMENTCURRENCY.join(',') : ''
// 发票类型多选 // 发票类型多选,数组转字符串
this.form.TZXX.INVOICETYPE = this.form.TZXX.INVOICETYPE.length ? this.form.TZXX.INVOICETYPE.join(',') : '' this.form.TZXX.INVOICETYPE = this.form.TZXX.INVOICETYPE.length ? this.form.TZXX.INVOICETYPE.join(',') : ''
// if (this.form.SignOptions !== undefined) { // if (this.form.SignOptions !== undefined) {
// this.form.PARTIESAUTHORIZED = // this.form.PARTIESAUTHORIZED =
// this.form.SignOptions.map(item => item.signName + '(' + item.sianID + ')').join(',') // this.form.SignOptions.map(item => item.signName + '(' + item.sianID + ')').join(',')
// } // }
// 合同实际履约主体多选,数组转字符串
this.form.SJLYDWID = this.SJLYList.map(item => item.SJLYDWID).join(',') this.form.SJLYDWID = this.SJLYList.map(item => item.SJLYDWID).join(',')
this.form.SJLYDWNAME = this.SJLYList.map(item => item.SJLYDWNAME).join(',') this.form.SJLYDWNAME = this.SJLYList.map(item => item.SJLYDWNAME).join(',')
if (this.form.FJXX.length <= 0) { if (this.form.FJXX.length <= 0) {
...@@ -3340,15 +3341,6 @@ export default { ...@@ -3340,15 +3341,6 @@ export default {
return err return err
}) })
} }
// } else {
// // 提交前判前面走完遍历(数组转为字符串了)在这因为有必填项没填他卡住(为了不影响下次提交时的遍历,再把字符串转为数组)
// if (this.form.TZXX.PAYMENTCURRENCY) {
// this.form.TZXX.PAYMENTCURRENCY = this.form.TZXX.PAYMENTCURRENCY.split(',')
// }
// if (this.form.TZXX.INVOICETYPE) {
// this.form.TZXX.INVOICETYPE = this.form.TZXX.INVOICETYPE.split(',')
// }
// }
} else { } else {
// 提交前判前面走完遍历(数组转为字符串了)在这因为有必填项没填他卡住(为了不影响下次提交时的遍历,再把字符串转为数组) // 提交前判前面走完遍历(数组转为字符串了)在这因为有必填项没填他卡住(为了不影响下次提交时的遍历,再把字符串转为数组)
if (this.form.TZXX.PAYMENTCURRENCY) { if (this.form.TZXX.PAYMENTCURRENCY) {
......
...@@ -2888,8 +2888,8 @@ export default { ...@@ -2888,8 +2888,8 @@ export default {
}) })
}, },
changeMultiple(label, data) { changeMultiple(label, data) {
if (data.length > 25) { if (data.length > 7) {
this.$message.warning('最多只能选25个' + label) this.$message.warning('最多只能选7个' + label)
data.splice(-1) data.splice(-1)
} }
}, },
......
...@@ -2685,8 +2685,8 @@ export default { ...@@ -2685,8 +2685,8 @@ export default {
}) })
}, },
changeMultiple(label, data) { changeMultiple(label, data) {
if (data.length > 25) { if (data.length > 7) {
this.$message.warning('最多只能选25个' + label) this.$message.warning('最多只能选7个' + label)
data.splice(-1) data.splice(-1)
} }
}, },
......
...@@ -3024,8 +3024,8 @@ export default { ...@@ -3024,8 +3024,8 @@ export default {
}) })
}, },
changeMultiple(label, data) { changeMultiple(label, data) {
if (data.length > 25) { if (data.length > 7) {
this.$message.warning('最多只能选25个' + label) this.$message.warning('最多只能选7个' + label)
data.splice(-1) data.splice(-1)
} }
}, },
......
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