1
This commit is contained in:
@@ -29,6 +29,9 @@
|
|||||||
<el-form-item label="后返金额(元)">
|
<el-form-item label="后返金额(元)">
|
||||||
<el-input v-model="form.rebateText" placeholder="不写则按 0.00 落库" clearable />
|
<el-input v-model="form.rebateText" placeholder="不写则按 0.00 落库" clearable />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="订单号(京东)">
|
||||||
|
<el-input v-model="form.orderIdText" placeholder="落库必填,与表单「订单号(需填)」一致" clearable />
|
||||||
|
</el-form-item>
|
||||||
<el-form-item label="物流链接">
|
<el-form-item label="物流链接">
|
||||||
<el-input v-model="form.logisticsLink" type="textarea" :rows="2" placeholder="落库必填" clearable />
|
<el-input v-model="form.logisticsLink" type="textarea" :rows="2" placeholder="落库必填" clearable />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@@ -83,6 +86,7 @@ export default {
|
|||||||
buyer: '',
|
buyer: '',
|
||||||
paymentText: '',
|
paymentText: '',
|
||||||
rebateText: '',
|
rebateText: '',
|
||||||
|
orderIdText: '',
|
||||||
logisticsLink: ''
|
logisticsLink: ''
|
||||||
},
|
},
|
||||||
loading: false,
|
loading: false,
|
||||||
@@ -120,6 +124,7 @@ export default {
|
|||||||
const buyer = (this.form.buyer || '').trim()
|
const buyer = (this.form.buyer || '').trim()
|
||||||
const pay = (this.form.paymentText || '').trim()
|
const pay = (this.form.paymentText || '').trim()
|
||||||
const rebate = (this.form.rebateText || '').trim()
|
const rebate = (this.form.rebateText || '').trim()
|
||||||
|
const orderId = (this.form.orderIdText || '').trim()
|
||||||
const logistics = (this.form.logisticsLink || '').trim()
|
const logistics = (this.form.logisticsLink || '').trim()
|
||||||
if (buyer) {
|
if (buyer) {
|
||||||
t = t.replace(/(下单人(需填):)\n\n/, `$1\n${buyer}\n\n`)
|
t = t.replace(/(下单人(需填):)\n\n/, `$1\n${buyer}\n\n`)
|
||||||
@@ -132,6 +137,9 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
t = t.replace(/(后返金额(注意核对):)\n\n/, `$1\n0.00\n\n`)
|
t = t.replace(/(后返金额(注意核对):)\n\n/, `$1\n0.00\n\n`)
|
||||||
}
|
}
|
||||||
|
if (orderId) {
|
||||||
|
t = t.replace(/(订单号(需填):)\n\n/, `$1\n${orderId}\n\n`)
|
||||||
|
}
|
||||||
if (logistics) {
|
if (logistics) {
|
||||||
t = t.replace(/(物流链接(需填):)\n\n/, `$1\n${logistics}\n\n`)
|
t = t.replace(/(物流链接(需填):)\n\n/, `$1\n${logistics}\n\n`)
|
||||||
}
|
}
|
||||||
@@ -145,8 +153,9 @@ export default {
|
|||||||
canPersistOrderFields() {
|
canPersistOrderFields() {
|
||||||
const buyer = (this.form.buyer || '').trim()
|
const buyer = (this.form.buyer || '').trim()
|
||||||
const pay = (this.form.paymentText || '').trim()
|
const pay = (this.form.paymentText || '').trim()
|
||||||
|
const orderId = (this.form.orderIdText || '').trim()
|
||||||
const logistics = (this.form.logisticsLink || '').trim()
|
const logistics = (this.form.logisticsLink || '').trim()
|
||||||
return !!(buyer && pay && logistics)
|
return !!(buyer && pay && orderId && logistics)
|
||||||
},
|
},
|
||||||
formatInstructionData(data) {
|
formatInstructionData(data) {
|
||||||
if (Array.isArray(data)) {
|
if (Array.isArray(data)) {
|
||||||
@@ -239,7 +248,7 @@ export default {
|
|||||||
}
|
}
|
||||||
if (!this.canPersistOrderFields()) {
|
if (!this.canPersistOrderFields()) {
|
||||||
this.resultText = merged
|
this.resultText = merged
|
||||||
this.$modal.msgWarning('已生成录单文案。落库需填写:下单人、下单付款、物流链接(后返可不填,将按 0.00)')
|
this.$modal.msgWarning('已生成录单文案。落库需填写:下单人、下单付款、订单号、物流链接(后返可不填,将按 0.00)')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
const res2 = await executeInstruction({ command: merged })
|
const res2 = await executeInstruction({ command: merged })
|
||||||
@@ -281,7 +290,7 @@ export default {
|
|||||||
if (!this.canPersistOrderFields()) {
|
if (!this.canPersistOrderFields()) {
|
||||||
this.resultText = merged
|
this.resultText = merged
|
||||||
this.verifyDialogVisible = false
|
this.verifyDialogVisible = false
|
||||||
this.$modal.msgWarning('已强制生成表单。落库仍需填写:下单人、下单付款、物流链接')
|
this.$modal.msgWarning('已强制生成表单。落库仍需填写:下单人、下单付款、订单号、物流链接')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
const res2 = await executeInstruction({ command: merged })
|
const res2 = await executeInstruction({ command: merged })
|
||||||
@@ -307,6 +316,7 @@ export default {
|
|||||||
buyer: '',
|
buyer: '',
|
||||||
paymentText: '',
|
paymentText: '',
|
||||||
rebateText: '',
|
rebateText: '',
|
||||||
|
orderIdText: '',
|
||||||
logisticsLink: ''
|
logisticsLink: ''
|
||||||
}
|
}
|
||||||
this.resultText = ''
|
this.resultText = ''
|
||||||
|
|||||||
Reference in New Issue
Block a user