diff --git a/src/views/mobile/fadan/index.vue b/src/views/mobile/fadan/index.vue
index 8d84271..ebb28e7 100644
--- a/src/views/mobile/fadan/index.vue
+++ b/src/views/mobile/fadan/index.vue
@@ -29,6 +29,9 @@
+
+
+
@@ -83,6 +86,7 @@ export default {
buyer: '',
paymentText: '',
rebateText: '',
+ orderIdText: '',
logisticsLink: ''
},
loading: false,
@@ -120,6 +124,7 @@ export default {
const buyer = (this.form.buyer || '').trim()
const pay = (this.form.paymentText || '').trim()
const rebate = (this.form.rebateText || '').trim()
+ const orderId = (this.form.orderIdText || '').trim()
const logistics = (this.form.logisticsLink || '').trim()
if (buyer) {
t = t.replace(/(下单人(需填):)\n\n/, `$1\n${buyer}\n\n`)
@@ -132,6 +137,9 @@ export default {
} else {
t = t.replace(/(后返金额(注意核对):)\n\n/, `$1\n0.00\n\n`)
}
+ if (orderId) {
+ t = t.replace(/(订单号(需填):)\n\n/, `$1\n${orderId}\n\n`)
+ }
if (logistics) {
t = t.replace(/(物流链接(需填):)\n\n/, `$1\n${logistics}\n\n`)
}
@@ -145,8 +153,9 @@ export default {
canPersistOrderFields() {
const buyer = (this.form.buyer || '').trim()
const pay = (this.form.paymentText || '').trim()
+ const orderId = (this.form.orderIdText || '').trim()
const logistics = (this.form.logisticsLink || '').trim()
- return !!(buyer && pay && logistics)
+ return !!(buyer && pay && orderId && logistics)
},
formatInstructionData(data) {
if (Array.isArray(data)) {
@@ -239,7 +248,7 @@ export default {
}
if (!this.canPersistOrderFields()) {
this.resultText = merged
- this.$modal.msgWarning('已生成录单文案。落库需填写:下单人、下单付款、物流链接(后返可不填,将按 0.00)')
+ this.$modal.msgWarning('已生成录单文案。落库需填写:下单人、下单付款、订单号、物流链接(后返可不填,将按 0.00)')
return
}
const res2 = await executeInstruction({ command: merged })
@@ -281,7 +290,7 @@ export default {
if (!this.canPersistOrderFields()) {
this.resultText = merged
this.verifyDialogVisible = false
- this.$modal.msgWarning('已强制生成表单。落库仍需填写:下单人、下单付款、物流链接')
+ this.$modal.msgWarning('已强制生成表单。落库仍需填写:下单人、下单付款、订单号、物流链接')
return
}
const res2 = await executeInstruction({ command: merged })
@@ -307,6 +316,7 @@ export default {
buyer: '',
paymentText: '',
rebateText: '',
+ orderIdText: '',
logisticsLink: ''
}
this.resultText = ''