diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 4cd98bed4..80da7601b 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -661,5 +661,7 @@ module.exports = {
initiateTaskConfirmation: 'Initiate task confirmation',
alteration: 'alteration',
fixedPlate: 'Fixed plate',
- taskAffirmStatus: 'task Affirm Status'
+ taskAffirmStatus: 'task Affirm Status',
+ listConfirmationStatus:'List confirmation status',
+ ListConfirmationDeadline:'List confirmation deadline',
}
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index be98cf89f..7c7076046 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -665,5 +665,7 @@ module.exports = {
initiateTaskConfirmation:'发起任务确认',
alteration:'变更',
fixedPlate:'定版',
- taskAffirmStatus:'任务发布状态',
+ taskAffirmStatus:'任务确认状态',
+ listConfirmationStatus:'清单确认状态',
+ ListConfirmationDeadline:'清单确认截止时间',
}
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue
index f4a45ae96..b04f2c84c 100644
--- a/jero-web/src/views/projectManagement/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/addModel.vue
@@ -32,12 +32,11 @@
{{$t('targetMarket')}}
-
+
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index dfe8c13ac..703140dab 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -189,11 +189,17 @@
{{$t('regulatoryEngineer')}}
-
+
+
+
+
+ {{ item.text || item.label }}
+
+
+
@@ -205,11 +211,16 @@
{{$t('certifiedEngineer')}}
-
+
+
+
+ {{ item.text || item.label }}
+
+
+
@@ -219,12 +230,16 @@
{{$t('engineeringInterfacePerson')}}
-
+
+
+
+ {{ item.text || item.label }}
+
+
+
@@ -239,7 +254,7 @@
+ v-model="formInline.remark" :rows="4"/>
@@ -255,12 +270,12 @@
:title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}
-
+ :triggerChange="false" :dictCode="'deliverable_template'"/>
@@ -270,11 +285,11 @@
{{$t('deliverableTemplate')}}
-
+
- {{ (formInline.deliverableTemplate === 'null' || formInline.deliverableTemplate === '' ||
- formInline.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+ @click="clickButtonToUpload('designDeliverableTemplate')">
+ {{ (formInline.designDeliverableTemplate === 'null' || formInline.designDeliverableTemplate === '' ||
+ formInline.designDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
}}
@@ -288,13 +303,13 @@
{{$t('Sponsor')}}
-
-
+
+ :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>
@@ -304,13 +319,13 @@
{{$t('personLiable')}}
-
-
+
+ :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>
@@ -322,12 +337,12 @@
{{$t('cutoffTime')}}
-
+
@@ -344,13 +359,13 @@
{{$t('typeOfDeliverables')}}
-
-
+
+ :triggerChange="false" :dictCode="'deliverable_template'"/>
@@ -360,11 +375,12 @@
{{$t('deliverableTemplate')}}
-
+
- {{ (formInline.deliverableTemplate === 'null' || formInline.deliverableTemplate === '' ||
- formInline.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+ @click="clickButtonToUpload('prehomoDeliverableTemplate')">
+ {{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === ''
+ ||
+ formInline.prehomoDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
}}
@@ -378,13 +394,13 @@
{{$t('Sponsor')}}
-
-
+
+ :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>
@@ -394,13 +410,13 @@
{{$t('personLiable')}}
-
-
+
+ :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>
@@ -412,12 +428,12 @@
{{$t('cutoffTime')}}
-
+
@@ -434,13 +450,13 @@
{{$t('typeOfDeliverables')}}
-
-
+
+ :triggerChange="false" :dictCode="'deliverable_template'"/>
@@ -450,11 +466,11 @@
{{$t('deliverableTemplate')}}
-
+
- {{ (formInline.deliverableTemplate === 'null' || formInline.deliverableTemplate === '' ||
- formInline.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+ @click="clickButtonToUpload('verifyDeliverableTemplate')">
+ {{ (formInline.verifyDeliverableTemplate === 'null' || formInline.verifyDeliverableTemplate === '' ||
+ formInline.verifyDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
}}
@@ -468,13 +484,13 @@
{{$t('Sponsor')}}
-
-
+
+ :triggerChange="false" :dictCode="'fa1_qi3_ren2'"/>
@@ -484,13 +500,13 @@
{{$t('personLiable')}}
-
-
+
+ :triggerChange="false" :dictCode="'ze2_ren4_ren2'"/>
@@ -502,12 +518,12 @@
{{$t('cutoffTime')}}
-
+
@@ -527,7 +543,7 @@
@@ -497,6 +568,11 @@
margin-bottom: 10px;
}
+ .box-title-text-index {
+ line-height: 1.4;
+ display: flex;
+ }
+
.title-text {
width: 32px;
color: #000F16;
@@ -511,13 +587,31 @@
text-overflow: ellipsis;
}
+ .title-text-index {
+ width: 110px;
+ color: #000F16;
+ display: inline-block;
+ font-weight: 500;
+ font-size: 14px;
+ margin-right: 16px;
+ margin-top: 3px;
+ text-align: right;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ line-height: 40px;
+ }
+
.box-input {
display: inline-block;
width: 70%;
height: 38px;
margin-top: 2px;
}
-
+ .Required {
+ color: red;
+ margin-right: 4px;
+ }
.box-button {
height: 38px;
}