|
@@ -1322,6 +1322,7 @@ class OrderController extends BaseController
|
|
|
//A4打印需要用到的数据
|
|
//A4打印需要用到的数据
|
|
|
$customId = $info['customId'] ?? 0;
|
|
$customId = $info['customId'] ?? 0;
|
|
|
$remark = $info['remark'] ?? '';
|
|
$remark = $info['remark'] ?? '';
|
|
|
|
|
+ $fullAddress = $info['fullAddress'] ?? '';
|
|
|
$custom = CustomClass::getById($customId, true);
|
|
$custom = CustomClass::getById($customId, true);
|
|
|
if (empty($custom)) {
|
|
if (empty($custom)) {
|
|
|
util::fail('没有找到客户');
|
|
util::fail('没有找到客户');
|
|
@@ -1363,6 +1364,7 @@ class OrderController extends BaseController
|
|
|
'shortSendTimeWant' => $shortSendTimeWant,
|
|
'shortSendTimeWant' => $shortSendTimeWant,
|
|
|
'table' => $table,
|
|
'table' => $table,
|
|
|
'remark' => $remark,
|
|
'remark' => $remark,
|
|
|
|
|
+ 'fullAddress' => $fullAddress,
|
|
|
];
|
|
];
|
|
|
$info['printData'] = $a4Print;
|
|
$info['printData'] = $a4Print;
|
|
|
|
|
|
|
@@ -1383,8 +1385,6 @@ class OrderController extends BaseController
|
|
|
$superInfo = ShopAdminClass::getManager($mainId);
|
|
$superInfo = ShopAdminClass::getManager($mainId);
|
|
|
$info['customSuper'] = $superInfo;
|
|
$info['customSuper'] = $superInfo;
|
|
|
|
|
|
|
|
- $info['printFullAddress'] = $info['fullAddress'] ?? '';
|
|
|
|
|
-
|
|
|
|
|
util::success($info);
|
|
util::success($info);
|
|
|
}
|
|
}
|
|
|
|
|
|
