wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

文件修改。

This commit is contained in:
wangwei 2022-06-24 10:00:52 +08:00
parent cd42aa29af
commit 495b01fba3
3 changed files with 86 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
back/src/views/modules/ability/bsdataresources.vue
View File

@ -27,7 +27,7 @@
<el-table-column prop="payAt" :label="$t('dataresources.putOnDate')" header-align="center" align="center"></el-table-column> <el-table-column prop="payAt" :label="$t('dataresources.putOnDate')" header-align="center" align="center"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" @click="associatedApplication(scope.row.orderId)">{{ $t('dataresources.associatedApplication') }}</el-button> <el-button type="primary" @click="showRelateApplication(scope.row)">{{ $t('dataresources.associatedApplication') }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -42,6 +42,7 @@
</el-pagination> </el-pagination>
<!-- 弹窗, 新增 / 修改 --> <!-- 弹窗, 新增 / 修改 -->
<!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> --> <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> -->
<relate-application v-if="relateApplicationVisible" ref="relateApplication" :relateInfo="relateInfo" @isShowRelatePopup="handleIsShowRelatePopup"></relate-application>
</div> </div>
</el-card> </el-card>
</template> </template>
@ -50,6 +51,8 @@
import mixinViewModule from '@/mixins/view-module' import mixinViewModule from '@/mixins/view-module'
// import AddOrUpdate from './order-add-or-update' // import AddOrUpdate from './order-add-or-update'
import {addDynamicRoute} from "@/router"; import {addDynamicRoute} from "@/router";
import RelateApplication from "./bsabilityai-relate-application.vue"
export default { export default {
mixins: [mixinViewModule], mixins: [mixinViewModule],
data () { data () {
@ -64,11 +67,19 @@ export default {
orderId: '', orderId: '',
status: '', status: '',
userId: '' userId: ''
},
// 关联应用弹窗
relateApplicationVisible: false,
relateInfo: {
id: '',
responseData: {},
linkType: ''
} }
} }
}, },
components: { components: {
// AddOrUpdate // AddOrUpdate,
RelateApplication,
}, },
methods: { methods: {
//重置 //重置
@ -77,10 +88,23 @@ export default {
this.page=1; // 当前页码 this.page=1; // 当前页码
this.query(); this.query();
}, },
//关联应用 // 点击关联应用按钮
associatedApplication(){ showRelateApplication(row){
this.$http.get(`dataResourceRel/queryApplicationRelByResourceId?referenceId=${row.id}`).then(({ data: res }) => {
} if( res && res.data ) {
this.relateApplicationVisible = true;
this.relateInfo = {
id: row.id,
responseData: res.data,
linkType: '2'
};
}
}).catch(() => { })
},
// 是否展示关联应用弹窗
handleIsShowRelatePopup(type) {
this.relateApplicationVisible = type;
}
} }
} }
</script> </script>

42
back/src/views/modules/ability/bsinfrastructure.vue
View File

@ -23,7 +23,7 @@
<el-table-column prop="status" :label="$t('infrastructure.department')" header-align="center" align="center"></el-table-column> <el-table-column prop="status" :label="$t('infrastructure.department')" header-align="center" align="center"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" @click="associatedApplication(scope.row.orderId)">{{ $t('infrastructure.associatedApplication') }}</el-button> <el-button type="primary" @click="showRelateApplication(scope.row)">{{ $t('infrastructure.associatedApplication') }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -38,6 +38,7 @@
</el-pagination> </el-pagination>
<!-- 弹窗, 新增 / 修改 --> <!-- 弹窗, 新增 / 修改 -->
<!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> --> <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> -->
<relate-application v-if="relateApplicationVisible" ref="relateApplication" :relateInfo="relateInfo" @isShowRelatePopup="handleIsShowRelatePopup"></relate-application>
</div> </div>
</el-card> </el-card>
</template> </template>
@ -46,25 +47,35 @@
import mixinViewModule from '@/mixins/view-module' import mixinViewModule from '@/mixins/view-module'
// import AddOrUpdate from './order-add-or-update' // import AddOrUpdate from './order-add-or-update'
import {addDynamicRoute} from "@/router"; import {addDynamicRoute} from "@/router";
import RelateApplication from "./bsabilityai-relate-application.vue"
export default { export default {
mixins: [mixinViewModule], mixins: [mixinViewModule],
data () { data () {
return { return {
mixinViewModuleOptions: { mixinViewModuleOptions: {
getDataListURL: '/pay/order/page', getDataListURL: '/resource/page',
getDataListIsPage: true, getDataListIsPage: true,
deleteURL: '/pay/order', deleteURL: '',
deleteIsBatch: true deleteIsBatch: true
}, },
dataForm: { dataForm: {
orderId: '', orderId: '',
status: '', status: '',
userId: '' userId: '',
type: "基础设施",
},
// 关联应用弹窗
relateApplicationVisible: false,
relateInfo: {
id: '',
responseData: {},
linkType: ''
} }
} }
}, },
components: { components: {
// AddOrUpdate // AddOrUpdate,
RelateApplication,
}, },
methods: { methods: {
//重置 //重置
@ -73,10 +84,23 @@ export default {
this.page=1; // 当前页码 this.page=1; // 当前页码
this.query(); this.query();
}, },
//关联应用 // 点击关联应用按钮
associatedApplication(){ showRelateApplication(row){
this.$http.get(`dataResourceRel/queryApplicationRelByResourceId?referenceId=${row.id}`).then(({ data: res }) => {
} if( res && res.data ) {
this.relateApplicationVisible = true;
this.relateInfo = {
id: row.id,
responseData: res.data,
linkType: '2'
};
}
}).catch(() => { })
},
// 是否展示关联应用弹窗
handleIsShowRelatePopup(type) {
this.relateApplicationVisible = type;
}
} }
} }

48
back/src/views/modules/project/list.vue
View File

@ -3,16 +3,16 @@
<div class="mod-pay__order"> <div class="mod-pay__order">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item> <el-form-item>
<el-input v-model="dataForm.orderId" :placeholder="$t('projectList.projectName')" clearable></el-input> <el-input v-model="dataForm.projectName" :placeholder="$t('projectList.projectName')" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-input v-model="dataForm.userId" :placeholder="$t('projectList.projectUnit')" clearable></el-input> <el-input v-model="dataForm.applyDep" :placeholder="$t('projectList.projectUnit')" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-input v-model="dataForm.department" :placeholder="$t('projectList.department')" clearable></el-input> <el-input v-model="dataForm.respDep" :placeholder="$t('projectList.department')" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-date-picker v-model="dataForm.applydate" value-format="yyyy-MM-dd" type="date" :placeholder="$t('projectList.applydate')" clearable></el-date-picker> <el-date-picker v-model="dataForm.applyTime" value-format="yyyy-MM-dd" type="date" :placeholder="$t('projectList.applydate')" clearable></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
@ -22,15 +22,15 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<el-table-column prop="orderId" :label="$t('projectList.projectName')" header-align="center" align="center"></el-table-column> <el-table-column prop="projectName" :label="$t('projectList.projectName')" header-align="center" align="center"></el-table-column>
<el-table-column prop="productName" :label="$t('projectList.projectUnit')" header-align="center" align="center"></el-table-column> <el-table-column prop="applyDep" :label="$t('projectList.projectUnit')" header-align="center" align="center"></el-table-column>
<el-table-column prop="payAmount" :label="$t('projectList.district')" header-align="center" align="center"></el-table-column> <el-table-column prop="regionName" :label="$t('projectList.district')" header-align="center" align="center"></el-table-column>
<el-table-column prop="payAt" :label="$t('projectList.department')" header-align="center" align="center"></el-table-column> <el-table-column prop="respDep" :label="$t('projectList.department')" header-align="center" align="center"></el-table-column>
<el-table-column prop="createDate" :label="$t('projectList.contacts')" header-align="center" align="center"></el-table-column> <el-table-column prop="businessUser" :label="$t('projectList.contacts')" header-align="center" align="center"></el-table-column>
<el-table-column prop="createDate" :label="$t('projectList.contactstel')" header-align="center" align="center"></el-table-column> <el-table-column prop="businessPhone" :label="$t('projectList.contactstel')" header-align="center" align="center"></el-table-column>
<el-table-column prop="createDate" :label="$t('projectList.technology')" header-align="center" align="center"></el-table-column> <el-table-column prop="techUser" :label="$t('projectList.technology')" header-align="center" align="center"></el-table-column>
<el-table-column prop="createDate" :label="$t('projectList.technologytel')" header-align="center" align="center"></el-table-column> <el-table-column prop="techPhone" :label="$t('projectList.technologytel')" header-align="center" align="center"></el-table-column>
<el-table-column prop="createDate" :label="$t('projectList.date')" header-align="center" align="center"></el-table-column> <el-table-column prop="applyTime" :label="$t('projectList.applydate')" header-align="center" align="center"></el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
:current-page="page" :current-page="page"
@ -56,24 +56,22 @@ export default {
data () { data () {
return { return {
mixinViewModuleOptions: { mixinViewModuleOptions: {
getDataListURL: '/pay/order/page', getDataListURL: '/project/page',
getDataListIsPage: true, getDataListIsPage: true,
deleteURL: '/pay/order', deleteURL: '',
deleteIsBatch: true deleteIsBatch: true
}, },
dataForm: { dataForm: {
orderId: '', projectName: '',
status: '', applyDep: '',
userId: '', respDep: '',
department:'', applyTime:'',
applydate:''
}, },
noDataForm: { noDataForm: {
orderId: '', projectName: '',
status: '', applyDep: '',
userId: '', respDep: '',
department:'', applyTime:'',
applydate:''
} }
} }
}, },