WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

Browse Source
This commit is contained in:
liyawei
2022-08-11 17:52:51 +08:00
parent 77fefb3997 b5ce6372fc
commit 1236940685
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1 -1
View File
@@ -610,7 +610,7 @@ module.exports = {
deliverableTemplate: 'Deliverable Template', deliverableTemplate: 'Deliverable Template',
entryName: 'Project Name', entryName: 'Project Name',
targetMarket: 'Target Market', targetMarket: 'Target Market',
projectStatus: 'Development', projectStatus: 'Project Status',
StudioEngineer: 'R&H Studio', StudioEngineer: 'R&H Studio',
CertificationTime: 'Certification Time', CertificationTime: 'Certification Time',
NTplatform: 'NT Platform', NTplatform: 'NT Platform',
jero-web/src/views/externalReports/index.vue
+6 -6
View File
@@ -42,10 +42,10 @@
</span> </span>
<template #overlay v-if='manager'> <template #overlay v-if='manager'>
<a-menu @click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey, record)"> <a-menu @click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey, record)">
<a-menu-item key="1" @click="orgAdd" v-has="'externalReports:folder'">{{$t('Addingfolder')}}</a-menu-item> <a-menu-item key="1" @click="orgAdd" >{{$t('Addingfolder')}}</a-menu-item>
<a-menu-item key="4" @click="orgAdds" v-has="'externalReports:folder'" v-if="deleteNode">{{$t('Addingsubfolders')}}</a-menu-item> <a-menu-item key="4" @click="orgAdds" v-if="deleteNode">{{$t('Addingsubfolders')}}</a-menu-item>
<a-menu-item key="2" @click="orgEdit" v-has="'externalReports:folder'">{{$t('Editfolder')}}</a-menu-item> <a-menu-item key="2" @click="orgEdit" >{{$t('Editfolder')}}</a-menu-item>
<a-menu-item key="3" @click="orgDelete" v-has="'externalReports:folder'">{{$t('Deletefolders')}}</a-menu-item> <a-menu-item key="3" @click="orgDelete" >{{$t('Deletefolders')}}</a-menu-item>
</a-menu> </a-menu>
</template> </template>
@@ -191,7 +191,7 @@
:title="$t('Foldername')">{{$t('Foldername')}}</span> :title="$t('Foldername')">{{$t('Foldername')}}</span>
</div> </div>
<a-form-model-item prop="folderName" style='width: 72%'> <a-form-model-item prop="folderName" style='width: 72%'>
<a-input v-model="form.folderName" :min="1" :max="100" style='width: 130%' class="box-input add-input" :placeholder="$t('PleaseEnter')+$t('Foldername')" /> <a-input v-model.trim="form.folderName" :min="1" :max="100" style='width: 130%' class="box-input add-input" :placeholder="$t('PleaseEnter')+$t('Foldername')" />
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -240,7 +240,7 @@
:title="$t('Folderorder')">{{$t('Folderorder')}}</span> :title="$t('Folderorder')">{{$t('Folderorder')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="orderId"> <a-form-model-item class="itemModel" prop="orderId">
<a-input-number v-model="form.orderId" :min="1" :max="9999" class="box-input add-input" <a-input-number v-model.trim="form.orderId" :min="1" :max="9999" class="box-input add-input"
:placeholder="$t('PleaseEnter')+$t('Folderorder')" :formatter="limitNumber" :placeholder="$t('PleaseEnter')+$t('Folderorder')" :formatter="limitNumber"
:parser="limitNumber" /> :parser="limitNumber" />
<!-- <a-input-number v-model="rowCount" :min="1" :placeholder="$t('pleaseEnter')+$t('numberRows')" :formatter="limitNumber" :parser="limitNumber" />--> <!-- <a-input-number v-model="rowCount" :min="1" :placeholder="$t('pleaseEnter')+$t('numberRows')" :formatter="limitNumber" :parser="limitNumber" />-->
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+10 -10
View File
@@ -670,11 +670,11 @@
mounted() { mounted() {
this.GetgetLoginUserType() this.GetgetLoginUserType()
console.log(this.currentPersonRole) console.log(this.currentPersonRole)
// setTimeout(() => { setTimeout(() => {
// if (this.currentPersonRole == 'dre') { if (this.currentPersonRole == 'dre') {
// this.handlePreservation() this.handlePreservation()
// } }
// }, 10000) }, 10000)
// this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest')) // this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest'))
this.paramsManifest = this.$route.query this.paramsManifest = this.$route.query
// document.title = `${this.paramsManifest.title}-` + this.$t('ParameteItemCollectionList') // document.title = `${this.paramsManifest.title}-` + this.$t('ParameteItemCollectionList')
@@ -1334,11 +1334,11 @@
_this.$message.success(_this.$t('OperationSuccessful')) _this.$message.success(_this.$t('OperationSuccessful'))
this.textLoading = false this.textLoading = false
} }
// setTimeout(() => { setTimeout(() => {
// if (this.currentPersonRole == 'dre') { if (this.currentPersonRole == 'dre') {
// this.handlePreservation() this.handlePreservation()
// } }
// }, 10000) }, 10000)
} else { } else {
if (num && num == 1) { if (num && num == 1) {
_this.$message.warning(_this.$t('operationFailed')) _this.$message.warning(_this.$t('operationFailed'))