diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index b01d9b6c0..f92e75487 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -144,7 +144,7 @@
                   {{text && text.length > 10 ? text.slice(0,9)+'...':text}}
               </span>
               <span slot="designDeliverableTemplateName" slot-scope="text,record">
-          <span>{{record.designDeliverableType_dictText}}</span><br v-if="record.designDeliverableType_dictText">
+          <span>{{record.designDeliverableTypeName}}</span><br v-if="record.designDeliverableTypeName">
            <a v-if="record.designDeliverableTemplate && record.designDeliverableTemplate.split(',').length == 1"
               :title="record.designDeliverableTemplateName"
               @click="pdfPreviewClick(record.designDeliverableTemplateName,record.designDeliverableTemplate)">
@@ -155,7 +155,7 @@
            <span v-else>--</span>
         </span>
               <span slot="prehomoDeliverableTemplateName" slot-scope="text,record">
-           <span>{{record.prehomoDeliverableType_dictText}}</span><br v-if="record.prehomoDeliverableType_dictText">
+           <span>{{record.prehomoDeliverableTypeName}}</span><br v-if="record.prehomoDeliverableTypeName">
            <a v-if="record.prehomoDeliverableTemplate && record.prehomoDeliverableTemplate.split(',').length == 1"
               :title="record.prehomoDeliverableTemplateName"
               @click="pdfPreviewClick(record.prehomoDeliverableTemplateName,record.prehomoDeliverableTemplate)">
@@ -166,7 +166,7 @@
            <span v-else>--</span>
         </span>
               <span slot="verifyDeliverableTemplateName" slot-scope="text,record">
-          <span>{{record.verifyDeliverableType_dictText}}</span><br v-if="record.verifyDeliverableType_dictText">
+          <span>{{record.verifyDeliverableTypeName}}</span><br v-if="record.verifyDeliverableTypeName">
            <a v-if="record.verifyDeliverableTemplate && record.verifyDeliverableTemplate.split(',').length == 1"
               :title="record.verifyDeliverableTemplateName"
               @click="pdfPreviewClick(record.verifyDeliverableTemplateName,record.verifyDeliverableTemplate)">
diff --git a/jero-web/src/views/processCenter/components/standardContentList.vue b/jero-web/src/views/processCenter/components/standardContentList.vue
index 8a8466017..c17cf6bf8 100644
--- a/jero-web/src/views/processCenter/components/standardContentList.vue
+++ b/jero-web/src/views/processCenter/components/standardContentList.vue
@@ -141,7 +141,7 @@
         InitiatorName: this.standardContentListQuery.designInitiatorName,
         DutyName: this.standardContentListQuery.designDutyName,
         DueDate: this.standardContentListQuery.designDueDate,
-        DeliverableType: this.standardContentListQuery.designDeliverableType_dictText,
+        DeliverableType: this.standardContentListQuery.designDeliverableTypeName,
         DeliverableTemplate: this.standardContentListQuery.designDeliverableTemplate,
         DeliverableTemplateName: this.standardContentListQuery.designDeliverableTemplateName,
         remark: this.standardContentListQuery.designRemark
@@ -151,7 +151,7 @@
         InitiatorName: this.standardContentListQuery.prehomoInitiatorName,
         DutyName: this.standardContentListQuery.prehomoDutyName,
         DueDate: this.standardContentListQuery.prehomoDueDate,
-        DeliverableType: this.standardContentListQuery.prehomoDeliverableType_dictText,
+        DeliverableType: this.standardContentListQuery.prehomoDeliverableTypeName,
         DeliverableTemplate: this.standardContentListQuery.prehomoDeliverableTemplate,
         DeliverableTemplateName: this.standardContentListQuery.prehomoDeliverableTemplateName,
         remark: this.standardContentListQuery.prehomoRemark
@@ -161,7 +161,7 @@
         InitiatorName: this.standardContentListQuery.verifyInitiatorName,
         DutyName: this.standardContentListQuery.verifyDutyName,
         DueDate: this.standardContentListQuery.verifyDueDate,
-        DeliverableType: this.standardContentListQuery.verifyDeliverableType_dictText,
+        DeliverableType: this.standardContentListQuery.verifyDeliverableTypeName,
         DeliverableTemplate: this.standardContentListQuery.verifyDeliverableTemplate,
         DeliverableTemplateName: this.standardContentListQuery.verifyDeliverableTemplateName,
         remark: this.standardContentListQuery.verifyRemark
diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index 9a11930df..8ff71697b 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -297,7 +297,7 @@
               flowType: 2,
               Sponsor: 'designInitiatorName',
               personLiable: 'designDutyName',
-              typeOfDeliverables: 'designDeliverableType_dictText',
+              typeOfDeliverables: 'designDeliverableTypeName',
               deliverableTemplate: 'designDeliverableTemplate',
               DueDate: 'designDueDate',
               remarks: 'designRemark',
@@ -321,7 +321,7 @@
               id: this.$route.query.id,
               Sponsor: 'prehomoInitiatorName',
               personLiable: 'prehomoDutyName',
-              typeOfDeliverables: 'prehomoDeliverableType_dictText',
+              typeOfDeliverables: 'prehomoDeliverableTypeName',
               deliverableTemplate: 'prehomoDeliverableTemplate',
               DueDate: 'prehomoDueDate',
               remarks: 'prehomoRemark',
@@ -345,7 +345,7 @@
               isDisplay: isTrue,
               Sponsor: 'verifyInitiatorName',
               personLiable: 'verifyDutyName',
-              typeOfDeliverables: 'verifyDeliverableType_dictText',
+              typeOfDeliverables: 'verifyDeliverableTypeName',
               deliverableTemplate: 'verifyDeliverableTemplate',
               DueDate: 'verifyDueDate',
               remarks: 'verifyRemark',
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index e6a513714..b661d8d5b 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -160,7 +160,7 @@
                   {{ text && text.length > 10 ? text.slice(0, 9) + '...' : text }}
         </span>
         <span slot="designDeliverableTemplateName" slot-scope="text,record">
-          <span>{{ record.designDeliverableType_dictText }}</span><br v-if="record.designDeliverableType_dictText">
+          <span>{{ record.designDeliverableTypeName }}</span><br v-if="record.designDeliverableTypeName">
            <a v-if="record.designDeliverableTemplate && record.designDeliverableTemplate.split(',').length == 1"
               :title="record.designDeliverableTemplateName"
               @click="pdfPreviewClick(record.designDeliverableTemplateName,record.designDeliverableTemplate)">
@@ -172,7 +172,7 @@
         </span>
 
         <span slot="prehomoDeliverableTemplateName" slot-scope="text,record">
-           <span>{{ record.prehomoDeliverableType_dictText }}</span><br v-if="record.prehomoDeliverableType_dictText">
+           <span>{{ record.prehomoDeliverableTypeName }}</span><br v-if="record.prehomoDeliverableTypeName">
            <a v-if="record.prehomoDeliverableTemplate && record.prehomoDeliverableTemplate.split(',').length == 1"
               :title="record.prehomoDeliverableTemplateName"
               @click="pdfPreviewClick(record.prehomoDeliverableTemplateName,record.prehomoDeliverableTemplate)">
@@ -184,7 +184,7 @@
         </span>
 
         <span slot="verifyDeliverableTemplateName" slot-scope="text,record">
-          <span>{{ record.verifyDeliverableType_dictText }}</span><br v-if="record.verifyDeliverableType_dictText">
+          <span>{{ record.verifyDeliverableTypeName }}</span><br v-if="record.verifyDeliverableTypeName">
            <a v-if="record.verifyDeliverableTemplate && record.verifyDeliverableTemplate.split(',').length == 1"
               :title="record.verifyDeliverableTemplateName"
               @click="pdfPreviewClick(record.verifyDeliverableTemplateName,record.verifyDeliverableTemplate)">
diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue
index 82ac313b9..c119a66e5 100644
--- a/jero-web/src/views/projectManagement/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/components/nonConformance.vue
@@ -221,7 +221,7 @@
             query.flowType = 2
             query.Sponsor = 'designInitiatorName'
             query.personLiable = 'designDutyName'
-            query.typeOfDeliverables = 'designDeliverableType_dictText'
+            query.typeOfDeliverables = 'designDeliverableTypeName'
             query.deliverableTemplate = 'designDeliverableTemplate'
             query.DueDate = 'designDueDate'
             query.remarks = 'designRemark'
@@ -230,7 +230,7 @@
             query.flowType = 3
             query.Sponsor = 'prehomoInitiatorName'
             query.personLiable = 'prehomoDutyName'
-            query.typeOfDeliverables = 'prehomoDeliverableType_dictText'
+            query.typeOfDeliverables = 'prehomoDeliverableTypeName'
             query.deliverableTemplate = 'prehomoDeliverableTemplate'
             query.DueDate = 'prehomoDueDate'
             query.remarks = 'prehomoRemark'
@@ -239,7 +239,7 @@
             query.flowType = 4
             query.Sponsor = 'verifyInitiatorName'
             query.personLiable = 'verifyDutyName'
-            query.typeOfDeliverables = 'verifyDeliverableType_dictText'
+            query.typeOfDeliverables = 'verifyDeliverableTypeName'
             query.deliverableTemplate = 'verifyDeliverableTemplate'
             query.DueDate = 'verifyDueDate'
             query.remarks = 'verifyRemark'
diff --git a/jero-web/src/views/projectManagement/historicalVersion/index.vue b/jero-web/src/views/projectManagement/historicalVersion/index.vue
index 51d3b91d6..f52c7b1eb 100644
--- a/jero-web/src/views/projectManagement/historicalVersion/index.vue
+++ b/jero-web/src/views/projectManagement/historicalVersion/index.vue
@@ -61,7 +61,7 @@
                   {{ text && text.length > 20 ? text.slice(0, 19) + '...' : text }}
         </span>
         <span slot="designDeliverableTemplateName" slot-scope="text,record">
-          <span>{{ record.designDeliverableType_dictText }}</span><br v-if="record.designDeliverableType_dictText">
+          <span>{{ record.designDeliverableTypeName }}</span><br v-if="record.designDeliverableTypeName">
            <a v-if="record.designDeliverableTemplate && record.designDeliverableTemplate.split(',').length == 1"
               @click="pdfPreviewClick(record.designDeliverableTemplateName,record.designDeliverableTemplate)">
              {{ record.designDeliverableTemplateName }}
@@ -71,7 +71,7 @@
            <span v-else>--</span>
         </span>
         <span slot="prehomoDeliverableTemplateName" slot-scope="text,record">
-           <span>{{ record.prehomoDeliverableType_dictText }}</span><br v-if="record.prehomoDeliverableType_dictText">
+           <span>{{ record.prehomoDeliverableTypeName }}</span><br v-if="record.prehomoDeliverableTypeName">
            <a v-if="record.prehomoDeliverableTemplate && record.prehomoDeliverableTemplate.split(',').length == 1"
               @click="pdfPreviewClick(record.prehomoDeliverableTemplateName,record.prehomoDeliverableTemplate)">
              {{ record.prehomoDeliverableTemplateName }}
@@ -81,7 +81,7 @@
            <span v-else>--</span>
         </span>
         <span slot="verifyDeliverableTemplateName" slot-scope="text,record">
-          <span>{{ record.verifyDeliverableType_dictText }}</span><br v-if="record.verifyDeliverableType_dictText">
+          <span>{{ record.verifyDeliverableTypeName }}</span><br v-if="record.verifyDeliverableTypeName">
            <a v-if="record.verifyDeliverableTemplate && record.verifyDeliverableTemplate.split(',').length == 1"
               @click="pdfPreviewClick(record.verifyDeliverableTemplateName,record.verifyDeliverableTemplate)">
              {{ record.verifyDeliverableTemplateName }}
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
index f822af33a..a16435549 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
@@ -357,7 +357,7 @@
             query.flowType = 2
             query.Sponsor = 'designInitiatorName'
             query.personLiable = 'designDutyName'
-            query.typeOfDeliverables = 'designDeliverableType_dictText'
+            query.typeOfDeliverables = 'designDeliverableTypeName'
             query.deliverableTemplate = 'designDeliverableTemplate'
             query.DueDate = 'designDueDate'
             query.remarks = 'designRemark'
@@ -366,7 +366,7 @@
             query.flowType = 3
             query.Sponsor = 'prehomoInitiatorName'
             query.personLiable = 'prehomoDutyName'
-            query.typeOfDeliverables = 'prehomoDeliverableType_dictText'
+            query.typeOfDeliverables = 'prehomoDeliverableTypeName'
             query.deliverableTemplate = 'prehomoDeliverableTemplate'
             query.DueDate = 'prehomoDueDate'
             query.remarks = 'prehomoRemark'
@@ -375,7 +375,7 @@
             query.flowType = 4
             query.Sponsor = 'verifyInitiatorName'
             query.personLiable = 'verifyDutyName'
-            query.typeOfDeliverables = 'verifyDeliverableType_dictText'
+            query.typeOfDeliverables = 'verifyDeliverableTypeName'
             query.deliverableTemplate = 'verifyDeliverableTemplate'
             query.DueDate = 'verifyDueDate'
             query.remarks = 'verifyRemark'