Compare commits
No commits in common. "01112ccd2324d56e1718ebd512c2eb7257ff831b" and "37fd83aee7ec42ed8c37c1b9d2832eef269e9dca" have entirely different histories.
01112ccd23
...
37fd83aee7
|
|
@ -27,7 +27,7 @@
|
|||
<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">
|
||||
<template slot-scope="scope">
|
||||
<el-button type="primary" @click="showRelateApplication(scope.row)">{{ $t('dataresources.associatedApplication') }}</el-button>
|
||||
<el-button type="primary" @click="associatedApplication(scope.row.orderId)">{{ $t('dataresources.associatedApplication') }}</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -42,7 +42,6 @@
|
|||
</el-pagination>
|
||||
<!-- 弹窗, 新增 / 修改 -->
|
||||
<!-- <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>
|
||||
</el-card>
|
||||
</template>
|
||||
|
|
@ -51,8 +50,6 @@
|
|||
import mixinViewModule from '@/mixins/view-module'
|
||||
// import AddOrUpdate from './order-add-or-update'
|
||||
import {addDynamicRoute} from "@/router";
|
||||
import RelateApplication from "./bsabilityai-relate-application.vue"
|
||||
|
||||
export default {
|
||||
mixins: [mixinViewModule],
|
||||
data () {
|
||||
|
|
@ -67,19 +64,11 @@ export default {
|
|||
orderId: '',
|
||||
status: '',
|
||||
userId: ''
|
||||
},
|
||||
// 关联应用弹窗
|
||||
relateApplicationVisible: false,
|
||||
relateInfo: {
|
||||
id: '',
|
||||
responseData: {},
|
||||
linkType: ''
|
||||
}
|
||||
}
|
||||
},
|
||||
components: {
|
||||
// AddOrUpdate,
|
||||
RelateApplication,
|
||||
// AddOrUpdate
|
||||
},
|
||||
methods: {
|
||||
//重置
|
||||
|
|
@ -88,23 +77,10 @@ export default {
|
|||
this.page=1; // 当前页码
|
||||
this.query();
|
||||
},
|
||||
// 点击关联应用按钮
|
||||
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;
|
||||
}
|
||||
//关联应用
|
||||
associatedApplication(){
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<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">
|
||||
<template slot-scope="scope">
|
||||
<el-button type="primary" @click="showRelateApplication(scope.row)">{{ $t('infrastructure.associatedApplication') }}</el-button>
|
||||
<el-button type="primary" @click="associatedApplication(scope.row.orderId)">{{ $t('infrastructure.associatedApplication') }}</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -38,7 +38,6 @@
|
|||
</el-pagination>
|
||||
<!-- 弹窗, 新增 / 修改 -->
|
||||
<!-- <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>
|
||||
</el-card>
|
||||
</template>
|
||||
|
|
@ -47,35 +46,25 @@
|
|||
import mixinViewModule from '@/mixins/view-module'
|
||||
// import AddOrUpdate from './order-add-or-update'
|
||||
import {addDynamicRoute} from "@/router";
|
||||
import RelateApplication from "./bsabilityai-relate-application.vue"
|
||||
export default {
|
||||
mixins: [mixinViewModule],
|
||||
data () {
|
||||
return {
|
||||
mixinViewModuleOptions: {
|
||||
getDataListURL: '/resource/page',
|
||||
getDataListURL: '/pay/order/page',
|
||||
getDataListIsPage: true,
|
||||
deleteURL: '',
|
||||
deleteURL: '/pay/order',
|
||||
deleteIsBatch: true
|
||||
},
|
||||
dataForm: {
|
||||
orderId: '',
|
||||
status: '',
|
||||
userId: '',
|
||||
type: "基础设施",
|
||||
},
|
||||
// 关联应用弹窗
|
||||
relateApplicationVisible: false,
|
||||
relateInfo: {
|
||||
id: '',
|
||||
responseData: {},
|
||||
linkType: ''
|
||||
userId: ''
|
||||
}
|
||||
}
|
||||
},
|
||||
components: {
|
||||
// AddOrUpdate,
|
||||
RelateApplication,
|
||||
// AddOrUpdate
|
||||
},
|
||||
methods: {
|
||||
//重置
|
||||
|
|
@ -84,23 +73,10 @@ export default {
|
|||
this.page=1; // 当前页码
|
||||
this.query();
|
||||
},
|
||||
// 点击关联应用按钮
|
||||
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;
|
||||
}
|
||||
//关联应用
|
||||
associatedApplication(){
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,16 +3,16 @@
|
|||
<div class="mod-pay__order">
|
||||
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
|
||||
<el-form-item>
|
||||
<el-input v-model="dataForm.projectName" :placeholder="$t('projectList.projectName')" clearable></el-input>
|
||||
<el-input v-model="dataForm.orderId" :placeholder="$t('projectList.projectName')" clearable></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-input v-model="dataForm.applyDep" :placeholder="$t('projectList.projectUnit')" clearable></el-input>
|
||||
<el-input v-model="dataForm.userId" :placeholder="$t('projectList.projectUnit')" clearable></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-input v-model="dataForm.respDep" :placeholder="$t('projectList.department')" clearable></el-input>
|
||||
<el-input v-model="dataForm.department" :placeholder="$t('projectList.department')" clearable></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-date-picker v-model="dataForm.applyTime" value-format="yyyy-MM-dd" type="date" :placeholder="$t('projectList.applydate')" clearable></el-date-picker>
|
||||
<el-date-picker v-model="dataForm.applydate" value-format="yyyy-MM-dd" type="date" :placeholder="$t('projectList.applydate')" clearable></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
|
||||
|
|
@ -22,15 +22,15 @@
|
|||
</el-form-item>
|
||||
</el-form>
|
||||
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
|
||||
<el-table-column prop="projectName" :label="$t('projectList.projectName')" 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="regionName" :label="$t('projectList.district')" 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="businessUser" :label="$t('projectList.contacts')" 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="techUser" :label="$t('projectList.technology')" 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="applyTime" :label="$t('projectList.applydate')" header-align="center" align="center"></el-table-column>
|
||||
<el-table-column prop="orderId" :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="payAmount" :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="createDate" :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="createDate" :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="createDate" :label="$t('projectList.date')" header-align="center" align="center"></el-table-column>
|
||||
</el-table>
|
||||
<el-pagination
|
||||
:current-page="page"
|
||||
|
|
@ -56,22 +56,24 @@ export default {
|
|||
data () {
|
||||
return {
|
||||
mixinViewModuleOptions: {
|
||||
getDataListURL: '/project/page',
|
||||
getDataListURL: '/pay/order/page',
|
||||
getDataListIsPage: true,
|
||||
deleteURL: '',
|
||||
deleteURL: '/pay/order',
|
||||
deleteIsBatch: true
|
||||
},
|
||||
dataForm: {
|
||||
projectName: '',
|
||||
applyDep: '',
|
||||
respDep: '',
|
||||
applyTime:'',
|
||||
orderId: '',
|
||||
status: '',
|
||||
userId: '',
|
||||
department:'',
|
||||
applydate:''
|
||||
},
|
||||
noDataForm: {
|
||||
projectName: '',
|
||||
applyDep: '',
|
||||
respDep: '',
|
||||
applyTime:'',
|
||||
orderId: '',
|
||||
status: '',
|
||||
userId: '',
|
||||
department:'',
|
||||
applydate:''
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue