diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 8ae293110..ca207d461 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -841,4 +841,5 @@ module.exports = { startMonth:'Start Month', endMonth:'End Month', Importing:'Importing...', + projectDeliveryDescription:'Project delivery description', } \ 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 bf58b9e86..7d292ac2e 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -846,4 +846,5 @@ module.exports = { startMonth:'开始日期', endMonth:'结束日期', Importing:'导入中...', + projectDeliveryDescription:'工程交付说明', } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index 83d5ee4d7..970138b50 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -36,6 +36,7 @@ :scroll="{x: 1600}" :data-source="dataSource" :columns="columns" + :width="500" > @@ -75,31 +76,48 @@ @ok="handleOk" @cancel="handleCancel" > - - - -
-
- * - {{$t('engineer')}} -
- - - -
-
- -
-
+
+ + + +
* {{item}} + :title="$t('engineer')">{{$t('engineer')}} +
+ + + +
+
+ +
+
+
+ {{item.name}} +
+ + + + {{$t('delete')}} +
+
+
+ +
+
+ * + {{$t('feedbackFromTheEngineer')}}
-
- - -
-
- * - {{$t('feedbackFromTheEngineer')}} + + +
+
+ * + {{$t('Deliverables')}} +
+ + + {{ (formInline.fileId === 'null' || formInline.fileId === '' || + formInline.fileId == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} + +
- - - -
- - -
-
- * - {{$t('Deliverables')}} + + +
+
+ * + {{$t('replyFromProjectContactPerson')}} +
+ + +
- - - {{ (formInline.fileId === 'null' || formInline.fileId === '' || - formInline.fileId == null) ? $t('clickUpload') : $t('viewUploadedFiles') - }} - - -
- - -
-
- * - {{$t('replyFromProjectContactPerson')}} -
- - - -
-
- - + + + +
+ { if (res.success) { @@ -525,6 +531,25 @@ }, PersonnelSelectionChange(value, id) { this.formInline[value] = id + if (id) { + this.formInline.userName.split(',').forEach(res => { + this.distributionEngineerList.push({ + deliveryInstructions: '', + name: res + }) + }) + } + this.formInline = { ...this.formInline } + }, + deleteText(num) { + this.distributionEngineerList.splice(num, 1) + this.distributionEngineerList = [...this.distributionEngineerList] + this.formInline.userName = this.formInline.userName.split(',') + this.formInline.userName.splice(num, 1) + this.formInline.userName = this.formInline.userName.join(',') + this.formInline.userId = this.formInline.userId.split(',') + this.formInline.userId.splice(num, 1) + this.formInline.userId = this.formInline.userId.join(',') this.formInline = { ...this.formInline } }, edit(val, title) { @@ -692,6 +717,7 @@ .formAdd { margin-bottom: 40px; + width: calc(100% - 12px); } .button-text { @@ -719,4 +745,12 @@ color: #00B3BE !important; cursor: pointer; } + + .text-del { + display: inline-block; + text-align: right; + width: 50px; + color: #00B3BE; + cursor: pointer; + } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue index 697ecc0f3..b0b72c37e 100644 --- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue @@ -36,7 +36,7 @@
- +
{{$t('feedbackMessage')}} @@ -145,7 +145,7 @@ } .itemModel { - width: calc(100% - 130px); + width: 100%; display: inline-block; margin-top: 2px; margin-bottom: 12px; diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index 8b6de9f3f..72d4510e0 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -99,10 +99,10 @@ title: this.$t('applicableSupplement'), value: 'applicableSupplement' }, - { - title: this.$t('remarks'), - value: 'remark' - } + // { + // title: this.$t('remarks'), + // value: 'remark' + // } ], standardContentList: [ { @@ -128,7 +128,7 @@ }, {}, { - title: this.$t('taskDescription'), + title: this.$t('descriptionDeliverables'), value: this.$route.query.remarks } ]