feat: product receive code
Some checks failed
Spell Check / Spell Check with Typos (push) Failing after 11s
Some checks failed
Spell Check / Spell Check with Typos (push) Failing after 11s
This commit is contained in:
parent
8d8ad40de1
commit
cf67ed3d47
4 changed files with 15 additions and 3 deletions
|
|
@ -160,7 +160,12 @@ const emit = defineEmits<{
|
||||||
</q-tooltip>
|
</q-tooltip>
|
||||||
</div>
|
</div>
|
||||||
<div class="text-caption app-text-muted">
|
<div class="text-caption app-text-muted">
|
||||||
{{ props.row.code || '-' }}
|
{{
|
||||||
|
(props.row.taskOrderStatus === TaskOrderStatus.Complete &&
|
||||||
|
props.row.codeProductReceived
|
||||||
|
? props.row.codeProductReceived
|
||||||
|
: props.row.code) || '-'
|
||||||
|
}}
|
||||||
</div>
|
</div>
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td v-if="visibleColumns.includes('issueBranch')">
|
<q-td v-if="visibleColumns.includes('issueBranch')">
|
||||||
|
|
|
||||||
|
|
@ -294,7 +294,7 @@ function closeAble() {
|
||||||
:branch="branch"
|
:branch="branch"
|
||||||
:institution="data.institution"
|
:institution="data.institution"
|
||||||
:details="{
|
:details="{
|
||||||
code: data.code,
|
code: data.codeProductReceived ?? data.code,
|
||||||
name: data.taskName,
|
name: data.taskName,
|
||||||
contactName: data.contactName,
|
contactName: data.contactName,
|
||||||
contactTel: data.contactTel,
|
contactTel: data.contactTel,
|
||||||
|
|
|
||||||
|
|
@ -917,9 +917,14 @@ watch(
|
||||||
v-model:registered-branch-id="currentFormData.registeredBranchId"
|
v-model:registered-branch-id="currentFormData.registeredBranchId"
|
||||||
v-model:institution-id="currentFormData.institutionId"
|
v-model:institution-id="currentFormData.institutionId"
|
||||||
v-model:task-name="currentFormData.taskName"
|
v-model:task-name="currentFormData.taskName"
|
||||||
v-model:code="currentFormData.code"
|
|
||||||
v-model:contact-name="currentFormData.contactName"
|
v-model:contact-name="currentFormData.contactName"
|
||||||
v-model:contact-tel="currentFormData.contactTel"
|
v-model:contact-tel="currentFormData.contactTel"
|
||||||
|
:code="
|
||||||
|
view === TaskOrderStatus.Complete &&
|
||||||
|
currentFormData.codeProductReceived
|
||||||
|
? currentFormData.codeProductReceived
|
||||||
|
: currentFormData.code
|
||||||
|
"
|
||||||
:task-list-group="
|
:task-list-group="
|
||||||
taskListGroup.length === 0 && state.mode === 'create'
|
taskListGroup.length === 0 && state.mode === 'create'
|
||||||
"
|
"
|
||||||
|
|
|
||||||
|
|
@ -53,6 +53,7 @@ export interface TaskOrder {
|
||||||
contactName: string;
|
contactName: string;
|
||||||
taskOrderStatus: TaskOrderStatus;
|
taskOrderStatus: TaskOrderStatus;
|
||||||
taskName: string;
|
taskName: string;
|
||||||
|
codeProductReceived?: string;
|
||||||
code: string;
|
code: string;
|
||||||
id: string;
|
id: string;
|
||||||
userTask: UserTask[];
|
userTask: UserTask[];
|
||||||
|
|
@ -179,6 +180,7 @@ export interface TaskOrderPayload {
|
||||||
registeredBranchId?: string;
|
registeredBranchId?: string;
|
||||||
id?: string;
|
id?: string;
|
||||||
code?: string;
|
code?: string;
|
||||||
|
codeProductReceived?: string;
|
||||||
remark?: string;
|
remark?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue