@@ -1631,7 +1632,7 @@
add
添加共用公司
-
填写与快递公司甲共用同一份合同的快递公司，可添加多个。
+
填写归属上述合同主体、共用合同和打款资料的快递名称，可添加多个。
@@ -2011,6 +2012,7 @@
var operatorRequiredMark = root.querySelector('[data-account-operator-required]');
var cooperationOperatorField = root.querySelector('[data-cooperation-operator-field]');
var secondaryOperatorInput = root.querySelector('input[name="secondary_operator_name"]');
+ var operatorHelp = root.querySelector('[data-account-operator-help]');
var sharedCourierList = root.querySelector('[data-shared-courier-list]');
var sharedCourierAdd = root.querySelector('[data-shared-courier-add]');
var quoteVersionField = root.querySelector('[data-quote-confirmation-field]');
@@ -2716,7 +2718,7 @@
return input.checked;
});
var accountSignerType = accountSignerTypeInput ? accountSignerTypeInput.value : 'organization';
- var accountSignerIsPerson = accountSignerType === 'person';
+ var accountSignerIsPerson = accountAgreement && accountSignerType === 'person';
if (accountSignerTypeField) {
accountSignerTypeField.hidden = !accountAgreement;
}
@@ -2732,7 +2734,7 @@
: '填写对方在 E 签宝认证的企业全称';
}
if (operatorNameInput) {
- var needsOperatorName = cooperationContract || (accountAgreement && !accountSignerIsPerson);
+ var needsOperatorName = cooperationContract || templateType === 'shared-contract' || (accountAgreement && !accountSignerIsPerson);
operatorNameInput.disabled = !needsOperatorName;
operatorNameInput.required = needsOperatorName;
if (accountAgreement && accountSignerIsPerson) {
@@ -2747,6 +2749,11 @@
secondaryOperatorInput.disabled = !cooperationContract;
secondaryOperatorInput.required = cooperationContract;
}
+ if (operatorHelp) {
+ operatorHelp.textContent = templateType === 'shared-contract'
+ ? '填写合同主体经办人的真实姓名，须与上方 E 签宝账号实名认证一致；快递名称填写在下方物流商名单。'
+ : '仅用于 E 签宝身份核验，不是收款人姓名；收款人姓名请填写在下方账户资料中。';
+ }
if (accountSignerLabel) {
accountSignerLabel.textContent = accountSignerIsPerson ? '对方签署个人姓名' : '对方签署企业全称';
}
diff --git a/tests/Feature/Business/AgreementSigningPageTest.php b/tests/Feature/Business/AgreementSigningPageTest.php
index a5f1a90b..097919de 100644
--- a/tests/Feature/Business/AgreementSigningPageTest.php
+++ b/tests/Feature/Business/AgreementSigningPageTest.php
@@ -348,8 +348,9 @@ class AgreementSigningPageTest extends FeatureTestCase
->assertSee('data-template-fields="shared-contract"', false)
->assertSee('data-template-preview="shared-contract"', false)
->assertSeeText('合同合作方')
- ->assertSeeText('快递公司甲（主体）')
- ->assertSeeText('共用合同的快递公司（可多个）')
+ ->assertSeeText('合同主体（企业全称）')
+ ->assertSeeText('共用合同物流商（快递名称，可多个）')
+ ->assertSeeText('填写合同主体经办人的真实姓名，须与上方 E 签宝账号实名认证一致')
->assertSee('name="shared_courier_names[]"', false)
->assertSee('data-shared-courier-add', false)
->assertSeeText('添加共用公司')
diff --git a/tests/Feature/Business/CourierAgreementSignatureWorkflowTest.php b/tests/Feature/Business/CourierAgreementSignatureWorkflowTest.php
index a49cfdab..1e8b5447 100644
--- a/tests/Feature/Business/CourierAgreementSignatureWorkflowTest.php
+++ b/tests/Feature/Business/CourierAgreementSignatureWorkflowTest.php
@@ -265,20 +265,68 @@ class CourierAgreementSignatureWorkflowTest extends FeatureTestCase
$signature = CourierAgreementSignature::query()->firstOrFail();
$this->assertSame(['快递公司乙', '快递公司丙'], $signature->payload['shared_courier_names']);
+ $this->assertSame('快递公司甲', $signature->organization_name);
+ $this->assertSame('张经理', $signature->operator_name);
$this->assertSame('快递公司乙', $signature->payload['shared_courier_name']);
$this->assertSame('请在3个工作日内完成签章。', $signature->payload['shared_note']);
$pdf = Storage::disk('uploads')->get($signature->source_pdf_path);
$this->assertStringStartsWith('%PDF-', $pdf);
+ $html = view('business.pdf.courier-agreement', [
+ 'signature' => $signature,
+ 'type' => $signature->document_type,
+ 'title' => $signature->documentLabel(),
+ 'payload' => $signature->payload,
+ 'signatureDate' => '2026年9月21日',
+ 'fontPath' => str_replace('\\', '/', resource_path('fonts/DroidSansFallback.ttf')),
+ ])->render();
+ foreach (['快递公司甲', '快递公司乙', '快递公司丙', '请在3个工作日内完成签章。'] as $text) {
+ $this->assertStringContainsString($text, strip_tags($html));
+ }
Http::assertSent(function (ClientRequest $request): bool {
if ($request->url() !== 'https://smlopenapi.esign.test/v3/sign-flow/create-by-file') {
return false;
}
- return data_get($request->data(), 'signers.0.orgSignerInfo.orgName') === '快递公司乙';
+ return count($request->data()['signers'] ?? []) === 1
+ && data_get($request->data(), 'signers.0.signerType') === 1
+ && data_get($request->data(), 'signers.0.orgSignerInfo.orgName') === '快递公司甲'
+ && data_get($request->data(), 'signers.0.orgSignerInfo.transactorInfo.psnAccount') === '13800138000'
+ && data_get($request->data(), 'signers.0.orgSignerInfo.transactorInfo.psnInfo.psnName') === '张经理';
});
}
+ public function test_shared_contract_rejects_missing_real_name_without_creating_a_task_or_remote_request(): void
+ {
+ Http::fake();
+ $payload = [
+ 'idempotency_key' => 'shared-contract-missing-name',
+ 'courier_name' => '快递公司乙',
+ 'document_type' => 'shared-contract',
+ 'signing_subject' => $this->company->name,
+ 'company_full_name' => $this->company->name,
+ 'signature_date' => '2026-09-21',
+ 'signing_deadline' => now()->addDays(7)->toDateString(),
+ 'esign_account' => '13800138000',
+ 'archive_mode' => 'auto',
+ 'contract_partner_name' => '合同主体有限公司',
+ 'shared_courier_names' => ['快递公司乙', '快递公司丙'],
+ ];
+
+ $this->withExceptionHandling()->loginAs()
+ ->postJson(route('business.courier-agreement-signatures.store'), $payload)
+ ->assertStatus(422)
+ ->assertJsonValidationErrors('operator_name');
+
+ $payload['operator_name'] = ' ';
+ $this->postJson(route('business.courier-agreement-signatures.store'), $payload)
+ ->assertStatus(422)
+ ->assertJsonValidationErrors('operator_name');
+
+ $this->assertDatabaseCount('business_courier_agreement_signatures', 0);
+ Http::assertNothingSent();
+ }
+
public function test_quote_confirmation_binds_an_approved_version_and_uses_only_the_courier_signer(): void
{
$this->fakeEsign();
--
2.47.2