Commit a0aba82d0721bfbb1fead4093cf18af15a830912

Authored by gesilong
2 parents 61fa90fb 858fa22f

Merge branch 'cjerp-2.0' into test_cjerp

@@ -83,6 +83,7 @@ export default { @@ -83,6 +83,7 @@ export default {
83 } 83 }
84 const fields = [ 84 const fields = [
85 { key: 'applyShipmentDate', label: '现申请发货日期' }, 85 { key: 'applyShipmentDate', label: '现申请发货日期' },
  86 + { key: 'delayReason', label: '延期原因' },
86 ] 87 ]
87 for (let i = 0; i < list.length; i++) { 88 for (let i = 0; i < list.length; i++) {
88 const it = list[i] || {} 89 const it = list[i] || {}
@@ -358,6 +358,10 @@ export default { @@ -358,6 +358,10 @@ export default {
358 uni.showToast({ title: '请选择现申请发货日期', icon: 'none' }) 358 uni.showToast({ title: '请选择现申请发货日期', icon: 'none' })
359 return 359 return
360 } 360 }
  361 + if (!this.applyDelayForm.delayReason || !String(this.applyDelayForm.delayReason).trim()) {
  362 + uni.showToast({ title: '请输入延期原因', icon: 'none' })
  363 + return
  364 + }
361 const delayedShipmentDetailList = [this.applyDelayForm].map((r) => { 365 const delayedShipmentDetailList = [this.applyDelayForm].map((r) => {
362 return { 366 return {
363 orderId: r.orderId, 367 orderId: r.orderId,
@@ -142,8 +142,8 @@ export default { @@ -142,8 +142,8 @@ export default {
142 quantity: response?.totalQuantity || '', 142 quantity: response?.totalQuantity || '',
143 deliveryDate: response?.deliveryDate || '', 143 deliveryDate: response?.deliveryDate || '',
144 destination: response?.destination || '', 144 destination: response?.destination || '',
145 - consignee: response?.consignee || '',  
146 - phone: response?.phone || '', 145 + consignee: response?.contractCreateByName || '',
  146 + phone: response?.contractCreateByTelephone || '',
147 returnPlanArrangement: response?.returnPlanArrangement || '', 147 returnPlanArrangement: response?.returnPlanArrangement || '',
148 other: response?.other || '', 148 other: response?.other || '',
149 specialLoadingRequirement: response?.specialLoadingRequirement || '', 149 specialLoadingRequirement: response?.specialLoadingRequirement || '',