diff --git a/src/pages/04_product-service/MainPage.vue b/src/pages/04_product-service/MainPage.vue
index a7354b72..eb97e83e 100644
--- a/src/pages/04_product-service/MainPage.vue
+++ b/src/pages/04_product-service/MainPage.vue
@@ -270,6 +270,12 @@ const hideStat = ref(false);
const tbColumn = {
groupAndType: [
+ {
+ name: 'branchLabelNo',
+ align: 'center',
+ label: 'orderNumber',
+ field: 'branchNo',
+ },
{
name: 'name',
align: 'left',
@@ -297,6 +303,12 @@ const tbColumn = {
],
product: [
+ {
+ name: 'branchLabelNo',
+ align: 'center',
+ label: 'orderNumber',
+ field: 'branchNo',
+ },
{ name: 'productName', align: 'left', label: 'productName', field: 'name' },
{
name: 'productDetail',
@@ -318,6 +330,12 @@ const tbColumn = {
},
],
service: [
+ {
+ name: 'branchLabelNo',
+ align: 'center',
+ label: 'orderNumber',
+ field: 'branchNo',
+ },
{ name: 'serviceName', align: 'left', label: 'serviceName', field: 'name' },
{
name: 'serviceDetail',
@@ -346,17 +364,31 @@ const tbColumn = {
const tbControl = reactive({
groupAndType: {
- fieldDisplay: ['name', 'detail', 'formDialogInputRemark', 'createdAt'],
- fieldSelected: ['name', 'detail', 'formDialogInputRemark', 'createdAt'],
+ fieldDisplay: [
+ { value: 'branchLabelNo', label: 'orderNumber' },
+ { value: 'name', label: 'name' },
+ { value: 'detail', label: 'detail' },
+ { value: 'formDialogInputRemark', label: 'formDialogInputRemark' },
+ { value: 'createdAt', label: 'createdAt' },
+ ],
+ fieldSelected: [
+ 'branchLabelNo',
+ 'name',
+ 'detail',
+ 'formDialogInputRemark',
+ 'createdAt',
+ ],
},
product: {
fieldDisplay: [
- 'productName',
- 'productDetail',
- 'productProcessingTime',
- 'priceInformation',
+ { value: 'branchLabelNo', label: 'orderNumber' },
+ { value: 'productName', label: 'productName' },
+ { value: 'productDetail', label: 'productDetail' },
+ { value: 'productProcessingTime', label: 'productProcessingTime' },
+ { value: 'priceInformation', label: 'priceInformation' },
],
fieldSelected: [
+ 'branchLabelNo',
'productName',
'productDetail',
'productProcessingTime',
@@ -365,12 +397,14 @@ const tbControl = reactive({
},
service: {
fieldDisplay: [
- 'serviceName',
- 'serviceDetail',
- 'serviceWorkTotal',
- 'createdAt',
+ { value: 'branchLabelNo', label: 'orderNumber' },
+ { value: 'serviceName', label: 'serviceName' },
+ { value: 'serviceDetail', label: 'serviceDetail' },
+ { value: 'serviceWorkTotal', label: 'serviceWorkTotal' },
+ { value: 'createdAt', label: 'createdAt' },
],
fieldSelected: [
+ 'branchLabelNo',
'serviceName',
'serviceDetail',
'serviceWorkTotal',
@@ -1995,8 +2029,8 @@ watch(
for="select-field"
:options="
tbControl.groupAndType.fieldDisplay.map((x) => ({
- label: $t(x),
- value: x,
+ label: $t(x.label),
+ value: x.value,
}))
"
:hide-dropdown-icon="$q.screen.lt.sm"
@@ -2134,6 +2168,24 @@ watch(
}
"
>
+
+ {{
+ productMode === 'type'
+ ? (currentPageType - 1) * pageSizeType +
+ props.rowIndex +
+ 1
+ : (currentPageGroup - 1) * pageSizeGroup +
+ props.rowIndex +
+ 1
+ }}
+
+
+ {{
+ (currentPageServiceAndProduct - 1) *
+ pageSizeServiceAndProduct +
+ props.rowIndex +
+ 1
+ }}
+