diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue index fb9d8359d..d95f44987 100644 --- a/jero-web/src/components/PersonnelSelection/index.vue +++ b/jero-web/src/components/PersonnelSelection/index.vue @@ -3,7 +3,7 @@
+ :placeholder="$t('PleaseSelect')+query.db_field_txt"/> {{this.$t('PersonnelSelection')}} diff --git a/jero-web/src/views/documentTools/virtualList/components/addModel.vue b/jero-web/src/views/documentTools/virtualList/components/addModel.vue index 343a75ce7..a513ea4e7 100644 --- a/jero-web/src/views/documentTools/virtualList/components/addModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/addModel.vue @@ -204,6 +204,7 @@ this.$message.success(this.$t('OperationSuccessful')) this.visible = false this.selectedRowKeys = [] + this.$emit('addModelList') } else { this.$message.warning(this.$t('operationFailed')) this.confirmLoading = false diff --git a/jero-web/src/views/documentTools/virtualList/components/batSetting.vue b/jero-web/src/views/documentTools/virtualList/components/batSetting.vue index a40d203ff..29dec7ded 100644 --- a/jero-web/src/views/documentTools/virtualList/components/batSetting.vue +++ b/jero-web/src/views/documentTools/virtualList/components/batSetting.vue @@ -16,11 +16,11 @@ {{$t('scopeOfApplication')}}
- + :triggerChange="false" dictCode="apply_scope"/> @@ -30,8 +30,8 @@ {{$t('certificationType')}} - @@ -44,8 +44,8 @@ {{$t('certificationLevel')}} - @@ -58,11 +58,11 @@ {{$t('areaOfResponsibility')}} - + :triggerChange="false" dictCode="duty_territory"/> @@ -82,7 +82,8 @@ visible: false, confirmLoading: false, formInline: {}, - rules: {} + rules: {}, + ids: [] } }, mounted() { @@ -90,11 +91,32 @@ methods: { edit(data) { this.visible = true + this.$nextTick(() => { + this.ids = data || [] + this.formInline = {} + }) }, handleOk() { - this.visible = false + let ids = JSON.parse(JSON.stringify(this.ids)) + let query = { + ids: ids.join(','), + ...this.formInline + } + this.confirmLoading = true + postAction(this.url.setBatch, query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.visible = false + this.confirmLoading = false + this.$emit('editModelList') + } else { + this.$message.warning(this.$t('operationFailed')) + this.confirmLoading = false + } + }) }, handleCancel() { + this.formInline = {} this.visible = false }, handleInput(value) { diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index cb8024f18..a05370ded 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -19,7 +19,7 @@ @@ -46,7 +46,7 @@ @@ -60,12 +60,46 @@ + + +
+
+ {{$t('scopeOfApplication')}} +
+ + + +
+
+ +
+
+ {{$t('status')}} +
+ + + +
+
+
@@ -73,29 +107,27 @@ {{$t('correspondingStandard')}}
- - + +
- {{$t('implementationCategory')}} + {{$t('ImplementationDate')}}
- - + +
@@ -110,32 +142,14 @@ - -
-
- {{$t('ImplementationDate')}} -
- - - -
-
-
-
@@ -143,33 +157,33 @@ :title="$t('certificationType')">{{$t('certificationType')}}
-
- -
-
- {{$t('certificationLevel')}} -
- - - -
-
+ +
+
+ {{$t('technicalField')}} +
+ + + +
+
@@ -177,57 +191,11 @@ :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}
- - -
-
- -
-
- {{$t('regulatoryEngineer')}} -
- - - -
-
-
- - -
-
- {{$t('certifiedEngineer')}} -
- - - -
-
- -
-
- {{$t('engineeringInterfacePerson')}} -
- - + :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')" + :type="'select'" + :triggerChange="false" :dictCode="'duty_territory'"/>
@@ -238,11 +206,11 @@
{{$t('remarks')}}
- + + v-model="formInline.remark" :rows="4"/> @@ -258,9 +226,9 @@ :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}} - @@ -273,11 +241,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') }} @@ -291,10 +259,10 @@ {{$t('Sponsor')}} - - + @@ -307,10 +275,10 @@ {{$t('personLiable')}} - - + @@ -318,25 +286,6 @@
- - -
-
- {{$t('cutoffTime')}} -
- - - -
-
-
 {{$t('PrehomoConfirmation')}}
@@ -347,10 +296,10 @@ {{$t('typeOfDeliverables')}} - - + @@ -363,11 +312,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') }} @@ -381,10 +331,10 @@ {{$t('Sponsor')}} - - + @@ -397,10 +347,10 @@ {{$t('personLiable')}} - - + @@ -408,25 +358,6 @@ - - -
-
- {{$t('cutoffTime')}} -
- - - -
-
-
 {{$t('verificationAndConformityconfirmation')}}
@@ -437,10 +368,10 @@ {{$t('typeOfDeliverables')}} - - + @@ -453,11 +384,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') }} @@ -471,10 +402,10 @@ {{$t('Sponsor')}} - - + @@ -487,10 +418,10 @@ {{$t('personLiable')}} - - + @@ -498,25 +429,6 @@ - - -
-
- {{$t('cutoffTime')}} -
- - - -
-
-
@@ -536,6 +448,12 @@ export default { name: 'editModel', + props: { + url: { + type: Object, + default: {} + } + }, components: { Standardselection, PersonnelSelection, @@ -553,9 +471,11 @@ mounted() { }, methods: { - editModel() { + editModel(item) { this.visible = true - this.formInline = {} + this.$nextTick(() => { + this.formInline = item || {} + }) }, clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() @@ -585,7 +505,18 @@ this.visible = false }, handleSubmit() { - + this.confirmLoading = true + postAction(this.url.editModel, this.formInline).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.visible = false + this.confirmLoading = false + this.$emit('editModelList') + } else { + this.$message.warning(this.$t('operationFailed')) + this.confirmLoading = false + } + }) }, handleInput(value) { this.$nextTick(() => { diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 0b5bf7c37..c8afdef2a 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -145,10 +145,10 @@
- - + + - + @@ -389,7 +389,7 @@ ...this.queryParam, id: selectedRowKeys.join(',') } - downloadFile(this.url.exportData, '文档库.xls', query, this.Deselect) + downloadFile(this.url.exportData, '虚拟清单名称.zip', query, this.Deselect) }, Deselect() { this.selectedRowKeys = [] @@ -426,6 +426,14 @@ this.pageSize = pageSize this.getList() }, + addModelList() { + this.pageNo = 1 + this.getList() + }, + editModelList() { + this.pageNo = 1 + this.getList() + }, getList() { let query = { pageNo: this.pageNo, @@ -448,6 +456,10 @@ } }) }, + batSettingList() { + this.pageNo = 1 + this.getList() + }, batSettingClick() { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys))) @@ -486,7 +498,7 @@ edit(item) { this.$refs.editModelRef.editModel(JSON.parse(JSON.stringify(item))) }, - deleteLib() { + deleteLib(val) { let _this = this this.$confirm({ content: _this.$t('ConfirmDelete'),