修改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', high:'High',
centre:'Centre', centre:'Centre',
low:'Low', low:'Low',
interfacePerson:'Interface person',
} }
+1
View File
@@ -3985,4 +3985,5 @@ module.exports = {
high:'高', high:'高',
centre:'中', centre:'中',
low:'低', low:'低',
interfacePerson:'接口人',
} }
@@ -14,11 +14,29 @@
<a-form-model-item ref='region' :label="$t('NareaOfResponsibility')" prop='dutyTerritory'> <a-form-model-item ref='region' :label="$t('NareaOfResponsibility')" prop='dutyTerritory'>
<j-dict-select-tag class="box-input" v-model="form.dutyTerritory" <j-dict-select-tag class="box-input" v-model="form.dutyTerritory"
@input="handleInput('dutyTerritory')" @input="handleInput('dutyTerritory')"
@changeQuery="handleChange"
:placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')" :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
:type="'select'" :type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/> :triggerChange="false" :dictCode="'duty_territory'"/>
</a-form-model-item> </a-form-model-item>
</a-col> </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-row>
</a-form-model> </a-form-model>
<div class="imports-footer"> <div class="imports-footer">
@@ -72,6 +90,7 @@ import Vue from 'vue'
import { ACCESS_TOKEN } from '@/store/mutation-types' import { ACCESS_TOKEN } from '@/store/mutation-types'
import moment from 'moment' import moment from 'moment'
import eventBUs from '../../common/event' import eventBUs from '../../common/event'
export default { export default {
name: 'diolagArea', name: 'diolagArea',
components: {}, components: {},
@@ -81,6 +100,7 @@ export default {
title: this.$t('add'), title: this.$t('add'),
total: 0, total: 0,
selectedRowKeysDate: {}, selectedRowKeysDate: {},
sdtList: [],
loading: false, loading: false,
editId: '', editId: '',
visibleoperationFailed: false, visibleoperationFailed: false,
@@ -123,7 +143,7 @@ export default {
this.bodystyle = { this.bodystyle = {
height: '480px', height: '480px',
overflow: 'hidden', overflow: 'hidden',
overflowY: 'scroll', overflowY: 'scroll'
} }
}, },
methods: { methods: {
@@ -133,6 +153,25 @@ export default {
this.$refs.ruleForm.validateField([value]) this.$refs.ruleForm.validateField([value])
}) })
}, },
handleChange(value) {
this.form.sdt = undefined
this.form = { ...this.form }
this.getSdtList(this.form.dutyTerritory)
},
getSdtList(value) {
let query = {
dutyTerritory: value,
projectId: this.$route.query.projectId,
projectVersion: this.$route.query.projectVersion
}
getAction('/params/collectManifest/getSdtList', query).then((res) => {
if (res.success) {
this.sdtList = res.result || []
} else {
this.sdtList = []
}
})
},
handleCancel() { handleCancel() {
this.$emit('AdjustareasofresponAll', false) this.$emit('AdjustareasofresponAll', false)
}, },
@@ -157,8 +196,8 @@ export default {
projectId: this.$route.query.projectId, projectId: this.$route.query.projectId,
ids: this.selectedRowKeysArray, ids: this.selectedRowKeysArray,
cut: this.cut, cut: this.cut,
dutyTerritory: this.form.dutyTerritory dutyTerritory: this.form.dutyTerritory,
sdt: this.form.sdt
} }
this.textLoading = true this.textLoading = true
postAction('/params/collectManifest/updateBatchDutyTerritory', param).then((res) => { postAction('/params/collectManifest/updateBatchDutyTerritory', param).then((res) => {
@@ -169,7 +208,6 @@ export default {
this.$message.success(this.$t('OperationSuccessful')) this.$message.success(this.$t('OperationSuccessful'))
this.$emit('AdjustareasofresponAll', false) this.$emit('AdjustareasofresponAll', false)
this.$emit('GetgetTableList') this.$emit('GetgetTableList')
} else { } else {
this.NotSelectedRowKeysValue = res.result this.NotSelectedRowKeysValue = res.result
this.visibleoperationFailed = true this.visibleoperationFailed = true
@@ -187,17 +225,19 @@ export default {
this.visibleoperationFailed = false this.visibleoperationFailed = false
this.$emit('AdjustareasofresponAll', false) this.$emit('AdjustareasofresponAll', false)
this.$emit('GetgetTableList') this.$emit('GetgetTableList')
}, }
} }
} }
</script> </script>
<style lang='less' scoped> <style lang='less' scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
.box-title-text-index { .box-title-text-index {
line-height: 1.4; line-height: 1.4;
display: flex; display: flex;
} }
.diolag-area { .diolag-area {
.table-area { .table-area {
margin: 20px 0; margin: 20px 0;
@@ -211,6 +251,7 @@ export default {
color: red; color: red;
} }
} }
.drawer-bootom-button { .drawer-bootom-button {
display: flex; display: flex;
justify-content: center; justify-content: center;
@@ -276,9 +317,11 @@ export default {
background: #fff; background: #fff;
border-radius: 0 0 2px 2px; border-radius: 0 0 2px 2px;
} }
/deep/ .add-input { /deep/ .add-input {
min-height: 135px !important; min-height: 135px !important;
} }
::v-deep .page { ::v-deep .page {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
@@ -234,7 +234,7 @@
<div @click="AdjustareasofresponsibilityClick" class="operator-text-title" <div @click="AdjustareasofresponsibilityClick" class="operator-text-title"
v-if='currentPersonRole == "homo"'> v-if='currentPersonRole == "homo"'>
<a-icon type="setting"/> <a-icon type="setting"/>
{{$t('Adjustareasofresponsibility')}} {{$t('BatchSetting')}}
</div> </div>
<!-- 认证工程师分配填写人--> <!-- 认证工程师分配填写人-->
<div @click="assignedByHomo" class="operator-text-title" v-if='currentPersonRole == "homo" '> <div @click="assignedByHomo" class="operator-text-title" v-if='currentPersonRole == "homo" '>
@@ -272,17 +272,20 @@
{{$t('dataExport')}} {{$t('dataExport')}}
</div> </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"/> <a-icon type="export"/>
{{$t('Derivedlist')}} {{$t('Derivedlist')}}
</div> </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"/> <a-icon type="plus"/>
{{$t('referenceparameter')}} {{$t('referenceparameter')}}
</div> </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"/> <a-icon type="check-circle"/>
{{$t('tempSave')}} {{$t('tempSave')}}
</div> </div>
@@ -359,12 +362,14 @@
<div class="table-operator" v-if="this.$route.query.it"> <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"/> <a-icon type="export" :rotate="-90"/>
{{$t('dataExport')}} {{$t('dataExport')}}
</div> </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"/> <a-icon type="export" :rotate="-90"/>
{{$t('Derivedlist')}} {{$t('Derivedlist')}}
</div> </div>
@@ -455,7 +460,7 @@
@areaVisibleTaskCutOffTimeAll='areaVisibleTaskCutOffTimeAll'/> @areaVisibleTaskCutOffTimeAll='areaVisibleTaskCutOffTimeAll'/>
<!-- </a-modal>--> <!-- </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' <adjustarea-sofrespon v-if='Adjustareasofrespon' :selectedRowKeysArray='selectedRowKeysArray'
@GetgetTableList='GetgetTableList' @GetgetTableList='GetgetTableList'
@AdjustareasofresponAll='AdjustareasofresponAll'/> @AdjustareasofresponAll='AdjustareasofresponAll'/>
@@ -894,7 +899,7 @@
title: this.$t('status'), title: this.$t('status'),
align: 'left', align: 'left',
dataIndex: 'stateText', dataIndex: 'stateText',
width: 120, width: 120
}, },
{ {
title: this.$t('Exporttime'), title: this.$t('Exporttime'),
@@ -1272,8 +1277,14 @@
this.visibleRoleSwitching = false this.visibleRoleSwitching = false
}, },
bringInTheProjectInterfaceClick() { bringInTheProjectInterfaceClick() {
if (this.selectedRowKeysValue && this.selectedRowKeysValue.length > 0) {
let ids = []
this.selectedRowKeysValue.forEach(res => {
ids.push(res.id)
})
let query = { let query = {
paramsManifestId: this.paramsManifest.id, paramsManifestId: this.paramsManifest.id,
ids: ids.join(','),
projectId: this.$route.query.projectId projectId: this.$route.query.projectId
} }
this.textLoading = true this.textLoading = true
@@ -1286,6 +1297,9 @@
} }
this.textLoading = false this.textLoading = false
}) })
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
}, },
handleOkRoleSwitching() { handleOkRoleSwitching() {
if (this.$route.query.type == '1') { if (this.$route.query.type == '1') {