修改UAT提出的问题

This commit is contained in:
范强强
2023-10-25 15:45:15 +08:00
parent 1e14950441
commit bfde61a3c0
4 changed files with 318 additions and 259 deletions
+1
View File
@@ -2029,4 +2029,5 @@ module.exports = {
high:'High',
centre:'Centre',
low:'Low',
interfacePerson:'Interface person',
}
+1
View File
@@ -3985,4 +3985,5 @@ module.exports = {
high:'高',
centre:'中',
low:'低',
interfacePerson:'接口人',
}
@@ -14,11 +14,29 @@
<a-form-model-item ref='region' :label="$t('NareaOfResponsibility')" prop='dutyTerritory'>
<j-dict-select-tag class="box-input" v-model="form.dutyTerritory"
@input="handleInput('dutyTerritory')"
@changeQuery="handleChange"
:placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
:type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item :label="$t('interfacePerson')" prop='sdt'>
<a-select
class="box-input"
v-model="form.sdt"
:placeholder="$t('PleaseSelect')+$t('interfacePerson')">
<a-select-option
v-for="(item,index) in sdtList"
:key="item.id"
:value="item.id">
<span class="itemOption" :title="item.userName">
{{ item.userName}}
</span>
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
<div class="imports-footer">
@@ -30,10 +48,10 @@
</div>
</div>
</a-spin>
<!-- <div class='drawer-bootom-button'>-->
<!-- <a-button style='margin-right: 8px' @click='handleCancel'>{{ $t('cancel') }}</a-button>-->
<!-- <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>-->
<!-- </div>-->
<!-- <div class='drawer-bootom-button'>-->
<!-- <a-button style='margin-right: 8px' @click='handleCancel'>{{ $t('cancel') }}</a-button>-->
<!-- <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>-->
<!-- </div>-->
<!-- 错误数据提示-->
<a-modal
:title="$t('operationFailed')"
@@ -49,9 +67,9 @@
<div style='font-size: 18px;margin-bottom: 20px;display: flex;justify-content: center'
class="box-title-text-index" v-for='(item,key) in NotSelectedRowKeysValue'>
<span v-html='item'></span>
<!-- <div>{{$t('NiOnumberis')}}{{ item.nioNumber }},{{$t('Statusis')}}-->
<!-- <span style='color: red'>{{ item.state }}</span>,{{$t('NoOperationPermissionForthisbutton')}}。-->
<!-- </div>-->
<!-- <div>{{$t('NiOnumberis')}}{{ item.nioNumber }},{{$t('Statusis')}}-->
<!-- <span style='color: red'>{{ item.state }}</span>,{{$t('NoOperationPermissionForthisbutton')}}。-->
<!-- </div>-->
</div>
</a-col>
</a-row>
@@ -66,235 +84,260 @@
</template>
<script>
import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
import axios from 'axios'
import Vue from 'vue'
import { ACCESS_TOKEN } from '@/store/mutation-types'
import moment from 'moment'
import eventBUs from '../../common/event'
export default {
name: 'diolagArea',
components: {},
data() {
return {
token:Vue.ls.get(ACCESS_TOKEN),
title: this.$t('add'),
total: 0,
selectedRowKeysDate: {},
loading: false,
editId: '',
visibleoperationFailed:false,
newVisible: false,
textLoading:false,
NotSelectedRowKeysValue:[],
labelCol: {
xs: { span: 24 },
sm: { span: 7 }
import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
import axios from 'axios'
import Vue from 'vue'
import { ACCESS_TOKEN } from '@/store/mutation-types'
import moment from 'moment'
import eventBUs from '../../common/event'
export default {
name: 'diolagArea',
components: {},
data() {
return {
token: Vue.ls.get(ACCESS_TOKEN),
title: this.$t('add'),
total: 0,
selectedRowKeysDate: {},
sdtList: [],
loading: false,
editId: '',
visibleoperationFailed: false,
newVisible: false,
textLoading: false,
NotSelectedRowKeysValue: [],
labelCol: {
xs: { span: 24 },
sm: { span: 7 }
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 14 }
},
form: {},
rules: {
dutyTerritory: [
{ required: true, message: this.$t('PleaseSelect') + this.$t('NareaOfResponsibility'), trigger: 'change' }
]
},
areaTable: [],
flag: false, //表单提交标识
spinLoading: false,
confirmLoading: false,
selectedRowKeys: [],
pageNo: 1,
pageSize: 10,
pickerDate: '',
bodystyle: {}
}
},
props: {
selectedRowKeysArray: {
type: String,
default: '',
require: true
}
},
mounted() {
this.bodystyle = {
height: '480px',
overflow: 'hidden',
overflowY: 'scroll'
}
},
methods: {
handleInput(value) {
this.$nextTick(() => {
this.form = { ...this.form }
this.$refs.ruleForm.validateField([value])
})
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 14 }
},
form: {},
rules: {
dutyTerritory:[
{ required: true, message: this.$t('PleaseSelect')+this.$t('NareaOfResponsibility'), trigger: 'change' }
]
},
areaTable: [],
flag: false, //表单提交标识
spinLoading: false,
confirmLoading: false,
selectedRowKeys: [],
pageNo: 1,
pageSize: 10,
pickerDate: '',
bodystyle:{}
}
},
props: {
selectedRowKeysArray: {
type: String,
default: '',
require: true
}
},
mounted() {
this.bodystyle = {
height: '480px',
overflow: 'hidden',
overflowY: 'scroll',
}
},
methods: {
handleInput(value) {
this.$nextTick(() => {
handleChange(value) {
this.form.sdt = undefined
this.form = { ...this.form }
this.$refs.ruleForm.validateField([value])
})
},
handleCancel() {
this.$emit('AdjustareasofresponAll', false)
},
//保存
handleSubmit() {
this.$refs.ruleForm.validate(valid => {
if(valid){
let long = localStorage.getItem('language')
let cut = ''
if (long && long == 'zh-cn') {
this.cut = 'cn'
} else if (long && long == 'en-us') {
this.cut = 'en'
}
// let _array = []
// this.selectedRowKeysValue.forEach((item, index) => {
// _array.push(item.id)
// })
let _this = this
let param = {
paramsManifestId: this.$route.query.id,
projectId: this.$route.query.projectId,
ids: this.selectedRowKeysArray,
cut: this.cut,
dutyTerritory: this.form.dutyTerritory
}
this.textLoading = true
postAction('/params/collectManifest/updateBatchDutyTerritory', param).then((res) => {
if (res.success) {
if(res.result.length == 0){
this.visibleoperationFailed = false
this.textLoading = false
this.$message.success(this.$t('OperationSuccessful'))
this.$emit('AdjustareasofresponAll', false)
this.$emit('GetgetTableList')
}else{
this.NotSelectedRowKeysValue = res.result
this.visibleoperationFailed = true
this.textLoading = false
}
} else {
this.$message.warning(this.$t('operationFailed'))
}
})
this.getSdtList(this.form.dutyTerritory)
},
getSdtList(value) {
let query = {
dutyTerritory: value,
projectId: this.$route.query.projectId,
projectVersion: this.$route.query.projectVersion
}
})
},
// 错误数据的弹框
cancleoperationFailed() {
this.visibleoperationFailed = false
this.$emit('AdjustareasofresponAll', false)
this.$emit('GetgetTableList')
},
getAction('/params/collectManifest/getSdtList', query).then((res) => {
if (res.success) {
this.sdtList = res.result || []
} else {
this.sdtList = []
}
})
},
handleCancel() {
this.$emit('AdjustareasofresponAll', false)
},
//保存
handleSubmit() {
this.$refs.ruleForm.validate(valid => {
if (valid) {
let long = localStorage.getItem('language')
let cut = ''
if (long && long == 'zh-cn') {
this.cut = 'cn'
} else if (long && long == 'en-us') {
this.cut = 'en'
}
// let _array = []
// this.selectedRowKeysValue.forEach((item, index) => {
// _array.push(item.id)
// })
let _this = this
let param = {
paramsManifestId: this.$route.query.id,
projectId: this.$route.query.projectId,
ids: this.selectedRowKeysArray,
cut: this.cut,
dutyTerritory: this.form.dutyTerritory,
sdt: this.form.sdt
}
this.textLoading = true
postAction('/params/collectManifest/updateBatchDutyTerritory', param).then((res) => {
if (res.success) {
if (res.result.length == 0) {
this.visibleoperationFailed = false
this.textLoading = false
this.$message.success(this.$t('OperationSuccessful'))
this.$emit('AdjustareasofresponAll', false)
this.$emit('GetgetTableList')
} else {
this.NotSelectedRowKeysValue = res.result
this.visibleoperationFailed = true
this.textLoading = false
}
} else {
this.$message.warning(this.$t('operationFailed'))
}
})
}
})
},
// 错误数据的弹框
cancleoperationFailed() {
this.visibleoperationFailed = false
this.$emit('AdjustareasofresponAll', false)
this.$emit('GetgetTableList')
}
}
}
}
</script>
<style lang='less' scoped>
@import '~@assets/less/common.less';
.box-title-text-index {
line-height: 1.4;
display: flex;
}
.diolag-area {
.table-area {
margin: 20px 0;
@import '~@assets/less/common.less';
.action-edit {
margin-right: 10px;
.box-title-text-index {
line-height: 1.4;
display: flex;
}
.diolag-area {
.table-area {
margin: 20px 0;
.action-edit {
margin-right: 10px;
}
}
.table-del {
color: red;
}
}
.table-del {
color: red;
.drawer-bootom-button {
display: flex;
justify-content: center;
}
}
.drawer-bootom-button{
display: flex;
justify-content: center;
}
</style>
<style scoped>
.box-title-text {
line-height: 1.4;
display: flex;
/*align-items: center;*/
}
.box-title-text {
line-height: 1.4;
display: flex;
/*align-items: center;*/
}
.title-text {
width: 114px;
text-align: right;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
height: 42px;
line-height: 48px;
}
.title-text {
width: 114px;
text-align: right;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
height: 42px;
line-height: 48px;
}
.box-input {
display: inline-block;
height: 38px;
width: 100%;
}
.box-input {
display: inline-block;
height: 38px;
width: 100%;
}
.itemModel {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
}
.itemModel {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
}
.Required {
color: red;
margin-right: 4px;
}
.Required {
color: red;
margin-right: 4px;
}
.title-text-text {
margin-top: 9px;
}
.title-text-text {
margin-top: 9px;
}
.formAdd {
margin-bottom: 40px;
}
.formAdd {
margin-bottom: 40px;
}
.drawer-bootom-button {
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff;
border-radius: 0 0 2px 2px;
}
/deep/.add-input{
min-height: 135px!important;
}
::v-deep .page{
.drawer-bootom-button {
position: absolute;
bottom: 0;
width: 100%;
z-index: 100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff;
border-radius: 0 0 2px 2px;
}
/deep/ .add-input {
min-height: 135px !important;
}
::v-deep .page {
display: flex;
justify-content: flex-end;
margin-bottom: 20px;
}
</style>
<style lang='less'>
.area-module {
.ant-modal-wrap {
.ant-modal {
.ant-modal-content {
.ant-modal-footer {
text-align: center;
.area-module {
.ant-modal-wrap {
.ant-modal {
.ant-modal-content {
.ant-modal-footer {
text-align: center;
}
}
}
}
}
}
</style>
@@ -234,7 +234,7 @@
<div @click="AdjustareasofresponsibilityClick" class="operator-text-title"
v-if='currentPersonRole == "homo"'>
<a-icon type="setting"/>
{{$t('Adjustareasofresponsibility')}}
{{$t('BatchSetting')}}
</div>
<!-- 认证工程师分配填写人-->
<div @click="assignedByHomo" class="operator-text-title" v-if='currentPersonRole == "homo" '>
@@ -272,17 +272,20 @@
{{$t('dataExport')}}
</div>
<!-- 导出列表-->
<div @click="Derivedlist" class="operator-text" v-if='currentPersonRole == "sdt" || currentPersonRole == "admin" || currentPersonRole == "studio"'>
<div @click="Derivedlist" class="operator-text"
v-if='currentPersonRole == "sdt" || currentPersonRole == "admin" || currentPersonRole == "studio"'>
<a-icon type="export"/>
{{$t('Derivedlist')}}
</div>
<!-- 引用参数-->
<div @click="referenceparameter" class="operator-text" v-if='currentPersonRole == "dre" || currentPersonRole == "homo"'>
<div @click="referenceparameter" class="operator-text"
v-if='currentPersonRole == "dre" || currentPersonRole == "homo"'>
<a-icon type="plus"/>
{{$t('referenceparameter')}}
</div>
<!-- 保存-->
<div @click="handlePreservation(1)" class="operator-text" v-if='currentPersonRole == "dre" || currentPersonRole == "homo"'>
<div @click="handlePreservation(1)" class="operator-text"
v-if='currentPersonRole == "dre" || currentPersonRole == "homo"'>
<a-icon type="check-circle"/>
{{$t('tempSave')}}
</div>
@@ -359,12 +362,14 @@
<div class="table-operator" v-if="this.$route.query.it">
<!-- 导出-->
<div @click="handleExport('1')" class="operator-text" v-if='currentPersonRole == "homo" || currentPersonRole == "admin" || currentPersonRole == "viewer"'>
<div @click="handleExport('1')" class="operator-text"
v-if='currentPersonRole == "homo" || currentPersonRole == "admin" || currentPersonRole == "viewer"'>
<a-icon type="export" :rotate="-90"/>
{{$t('dataExport')}}
</div>
<!-- 导出列表-->
<div @click="Derivedlist" class="operator-text" v-if='currentPersonRole == "homo" || currentPersonRole == "admin" || currentPersonRole == "viewer"'>
<div @click="Derivedlist" class="operator-text"
v-if='currentPersonRole == "homo" || currentPersonRole == "admin" || currentPersonRole == "viewer"'>
<a-icon type="export" :rotate="-90"/>
{{$t('Derivedlist')}}
</div>
@@ -455,7 +460,7 @@
@areaVisibleTaskCutOffTimeAll='areaVisibleTaskCutOffTimeAll'/>
<!-- </a-modal>-->
<!-- 调整责任领域-->
<a-modal v-model="Adjustareasofrespon" :title="$t('Adjustareasofresponsibility')" width='620px' :footer="null">
<a-modal v-model="Adjustareasofrespon" :title="$t('BatchSetting')" width='620px' :footer="null">
<adjustarea-sofrespon v-if='Adjustareasofrespon' :selectedRowKeysArray='selectedRowKeysArray'
@GetgetTableList='GetgetTableList'
@AdjustareasofresponAll='AdjustareasofresponAll'/>
@@ -631,27 +636,27 @@
@ok="exportok"
@cancel="exportvisiblecancel"
>
<!-- <historyTable :columnshistory='columnshistory' :dataSourcehistory='dataSourcehistory'></historyTable>-->
<a-table
class="table"
:components="drag(columnsexport,'columnsexport')"
:columns="columnsexport"
:pagination="false"
rowKey="id"
:scroll="{x: '100%',y: 400}"
:data-source="dataSourceexport"
:loading="loading"
>
<!-- <historyTable :columnshistory='columnshistory' :dataSourcehistory='dataSourcehistory'></historyTable>-->
<a-table
class="table"
:components="drag(columnsexport,'columnsexport')"
:columns="columnsexport"
:pagination="false"
rowKey="id"
:scroll="{x: '100%',y: 400}"
:data-source="dataSourceexport"
:loading="loading"
>
<span slot="operation" slot-scope="text,record">
<a @click="exportdata(record)" v-if="record.state == '1'">{{$t('download')}}</a>
<a style="margin-left: 5px;" @click="exportdelete(record)">{{$t('delete')}}</a>
</span>
<!-- <span slot="detailText" slot-scope="text,record">-->
<!-- <span class="text" :title="text">-->
<!-- {{text && text.length > 40?text.slice(0,39)+'...':text}}-->
<!-- </span>-->
<!-- </span>-->
</a-table>
<!-- <span slot="detailText" slot-scope="text,record">-->
<!-- <span class="text" :title="text">-->
<!-- {{text && text.length > 40?text.slice(0,39)+'...':text}}-->
<!-- </span>-->
<!-- </span>-->
</a-table>
<div class="page" v-if="dataSourceexport.length > 0">
<a-pagination
:show-total="total => $t('total')+` ${total} `+$t('strip')"
@@ -706,7 +711,7 @@
</a-row>
</a-form-model>
</a-modal>
<!-- 数据导出异步弹窗-->
<!-- 数据导出异步弹窗-->
<a-modal
:title="$t('dataExport')"
:width="500"
@@ -736,7 +741,7 @@
<script>
import TableCollection from '@/components/tableCollection/index'
import parameterColumn from '../dialog/parametercolumn'
import { getAction, postAction, downloadFile ,deleteAction } from '../../../api/manage'
import { getAction, postAction, downloadFile, deleteAction } from '../../../api/manage'
import eventBUs from '../../../common/event'
import customizeList from './customizeList'
import ParameterLibraryAdd from '@/components/ParameterLibraryAdd/index'
@@ -774,7 +779,7 @@
globalAdvancedQuery,
batchUpdateDeadline
},
mixins:[ResizeHeader, ResizeColumnProvide],
mixins: [ResizeHeader, ResizeColumnProvide],
data() {
this.statusList = [
{
@@ -894,7 +899,7 @@
title: this.$t('status'),
align: 'left',
dataIndex: 'stateText',
width: 120,
width: 120
},
{
title: this.$t('Exporttime'),
@@ -1162,9 +1167,9 @@
}
if (this.$route.query.statusFlag == '1') {
this.formInline.state = '1'
} else if(this.$route.query.statusFlag == '2'){
} else if (this.$route.query.statusFlag == '2') {
this.formInline.state = '2'
}else if(this.$route.query.statusFlag == '4'){
} else if (this.$route.query.statusFlag == '4') {
this.formInline.state = '4'
}
// clearTimeout(this.timeBatch)
@@ -1272,20 +1277,29 @@
this.visibleRoleSwitching = false
},
bringInTheProjectInterfaceClick() {
let query = {
paramsManifestId: this.paramsManifest.id,
projectId: this.$route.query.projectId
}
this.textLoading = true
getAction('/params/collectManifest/bringSdtInto', query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
} else {
this.$message.warning(this.$t('operationFailed'))
if (this.selectedRowKeysValue && this.selectedRowKeysValue.length > 0) {
let ids = []
this.selectedRowKeysValue.forEach(res => {
ids.push(res.id)
})
let query = {
paramsManifestId: this.paramsManifest.id,
ids: ids.join(','),
projectId: this.$route.query.projectId
}
this.textLoading = false
})
this.textLoading = true
getAction('/params/collectManifest/bringSdtInto', query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
} else {
this.$message.warning(this.$t('operationFailed'))
}
this.textLoading = false
})
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
},
handleOkRoleSwitching() {
if (this.$route.query.type == '1') {
@@ -1574,7 +1588,7 @@
// downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear)
},
// 导出列表
Derivedlist(){
Derivedlist() {
this.exportvisible = true
this.expoteList()
},
@@ -1587,22 +1601,22 @@
this.pageSizehistory = pageSize
this.expoteList()
},
exportok(){
exportok() {
this.exportvisible = false
},
exportvisiblecancel(){
exportvisiblecancel() {
this.exportvisible = false
},
exportsubmit(){
exportsubmit() {
this.ExportFailed = false
},
exportcancel(){
exportcancel() {
this.ExportFailed = false
},
exportdata(item){
exportdata(item) {
downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.fileId })
},
exportdelete(item){
exportdelete(item) {
this.$confirm({
title: this.$t('confirmDeletion'),
content: '',
@@ -1661,8 +1675,8 @@
paramsTemplatePublishVersion: 1,
cut: this.cut,
userTypes: this.currentPersonRole,
exportName: this.$route.query.projectName.slice(0,-3)+ '-' + this.$route.query.projectVersion + '(' + this.$route.query.title + ')'+'-' + this.$route.query.version,
isHistory:this.isHistroy
exportName: this.$route.query.projectName.slice(0, -3) + '-' + this.$route.query.projectVersion + '(' + this.$route.query.title + ')' + '-' + this.$route.query.version,
isHistory: this.isHistroy
}
let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
getAction('/params/collectManifest/exportAll', query).then((res) => {
@@ -2325,7 +2339,7 @@
let selectedRowKeysValue = []
data.forEach(res => {
if (res.state == 'To be filled' || res.state == '待填写' || res.state == '认证工程师退回' ||
res.state == 'Rejected by homo engineer' ||res.state == 'Modify' || res.state == '变更') {
res.state == 'Rejected by homo engineer' || res.state == 'Modify' || res.state == '变更') {
selectedRowKeysValue.push(res)
}
})
@@ -2509,7 +2523,7 @@
if (keyNameOne[l].type == 'pull_more') {
keyNameOne[l].dataValue = keyNameOne[l].dataValue.join(',')
}
if ((keyNameOne[l].dataValue== undefined || keyNameOne[l].dataValue == null) && keyNameOne[l].isMust == '1' && keyNameOne[l].isLock == '0') {
if ((keyNameOne[l].dataValue == undefined || keyNameOne[l].dataValue == null) && keyNameOne[l].isMust == '1' && keyNameOne[l].isLock == '0') {
this.$message.warning(selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty'))
return
}