Merge branch 'cjerp-2.0' into test_cjerp

@@ -83,6 +83,7 @@ export default {
       }
       const fields = [
         { key: 'applyShipmentDate', label: '现申请发货日期' },
+        { key: 'delayReason', label: '延期原因' },
       ]
       for (let i = 0; i < list.length; i++) {
         const it = list[i] || {}

@@ -358,6 +358,10 @@ export default {
         uni.showToast({ title: '请选择现申请发货日期', icon: 'none' })
         return
       }
+      if (!this.applyDelayForm.delayReason || !String(this.applyDelayForm.delayReason).trim()) {
+        uni.showToast({ title: '请输入延期原因', icon: 'none' })
+        return
+      }
       const delayedShipmentDetailList = [this.applyDelayForm].map((r) => {
         return {
           orderId: r.orderId,

@@ -142,8 +142,8 @@ export default {
                     quantity: response?.totalQuantity || '',
                     deliveryDate: response?.deliveryDate || '',
                     destination: response?.destination || '',
-                    consignee: response?.consignee || '',
-                    phone: response?.phone || '',
+                    consignee: response?.contractCreateByName || '',
+                    phone: response?.contractCreateByTelephone || '',
                     returnPlanArrangement: response?.returnPlanArrangement || '',
                     other: response?.other || '',
                     specialLoadingRequirement: response?.specialLoadingRequirement || '',