aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
X1627315083
2023-12-15 16:38:55 +08:00
parent 1e52104b89
commit 5d6a420447
6 changed files with 83 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@@ -1,3 +1,3 @@
# NODE_ENV = 'production'
NODE_ENV = 'development'
VUE_APP_BASE_URL = 'http://www.aida.com.hk'
VUE_APP_BASE_URL = 'http://18.167.251.121:10086'

2
.env.production
View File

@@ -1,2 +1,2 @@
NODE_ENV = 'production'
VUE_APP_BASE_URL = 'http://www.aida.com.hk'
VUE_APP_BASE_URL = 'http://18.167.251.121:10086'

2
.env.test
View File

@@ -1,3 +1,3 @@
NODE_ENV = 'development'
VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
VUE_APP_BASE_URL = 'http://18.167.251.121:10088'
# VUE_APP_BASE_URL = 'http://192.168.1.7:5567'

2
.env.test_build
View File

@@ -1,4 +1,4 @@
NODE_ENV = 'production'
# VUE_APP_BASE_URL = 'https://aida.com.hk/test'
VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
VUE_APP_BASE_URL = 'http://18.167.251.121:10088'

5
src/tool/https.js
View File

@@ -164,9 +164,10 @@ export const Https = {
trialOrderList:`/api/account/trialOrderList`,//获取审批列表
switchIsAutoApproval:`/api/account/switchIsAutoApproval`,//切换是否自动审批
switchIsAutoApproval:`/api/account/getIsAutoApproval`,//获取是否自动审批
getIsAutoApproval:`/api/account/getIsAutoApproval`,//获取是否自动审批
trialOrderApproval:`/api/account/trialOrderApproval`,//通过审批
trialOrderRefuse:`/api/account/trialOrderRefuse`,//拒绝审批
},
axiosGet(url,config) {

81
src/views/trialApproval.vue
View File

@@ -9,6 +9,10 @@
<HeaderComponent></HeaderComponent>
<div class="trial_page_body">
<div class="trial_table_search">
<div class="trial_table_voluntarily">
<span>voluntarily</span>
<a-switch v-model:checked="voluntarily" @change="setIsAutoApproval" />
</div>
<a-range-picker
class="range_picker"
v-model:value="rangePickerValue"
@@ -76,12 +80,14 @@
v-if="column?.Operations"
>
<div
v-show="status == 0"
class="operate_item"
@click="setConsent(record, index)"
>
consent
</div>
<div
v-show="status == 0"
class="operate_item"
@click="setRefuse(record, index)"
>
@@ -147,12 +153,31 @@ export default defineComponent({
// );
// return time;
// },
},
{
title: 'State',
align: "center",
ellipsis: true,
width: 100,
dataIndex: "status",
key: "status",
customRender: (record: any) => {
let str
if(record.value == 0){
str ='unprocessed'
}else if(record.value == 1){
str ='pending'
}else if(record.value == 2){
str ='rejected'
}
return str;
},
},
{
title: 'Address',
align: "center",
ellipsis: true,
width: 150,
width: 100,
dataIndex: "country",
key: "country",
},
@@ -160,7 +185,7 @@ export default defineComponent({
title: 'Surname',
align: "center",
ellipsis: true,
width: 150,
width: 100,
dataIndex: "surname",
key: "surname",
},
@@ -209,6 +234,7 @@ export default defineComponent({
let collectionList: any = ref([]);
let userInfo: any = {};
let status: any = ref(0);
let voluntarily: any = ref(false);
return {
rangePickerValue,
columns,
@@ -218,6 +244,7 @@ export default defineComponent({
status,
currentState,
state,
voluntarily,
};
},
data() {
@@ -241,7 +268,9 @@ export default defineComponent({
if (this.userInfo.userId == 83) {
} else {
router.replace("/home");
return
}
this.getIsAutoApproval()
},
methods: {
//改变页码
@@ -256,6 +285,25 @@ export default defineComponent({
this.currentPage = 1;
this.gettrialList();
},
//获取是否自动审批
getIsAutoApproval(){
Https.axiosPost(Https.httpUrls.getIsAutoApproval, {}).then(
(rv: any) => {
this.voluntarily = rv
}
);
},
setIsAutoApproval(){
return
Https.axiosPost(Https.httpUrls.switchIsAutoApproval, {}).then(
(rv: any) => {
this.getIsAutoApproval
}
);
},
//获取列表
gettrialList() {
let startDate: any = this.rangePickerValue
? new Date(this.rangePickerValue[0]).getTime()
@@ -277,13 +325,24 @@ export default defineComponent({
);
},
setConsent(record: any, index: number){
console.log(record);
return
Https.axiosPost(Https.httpUrls.trialOrderApproval, {ids:record.id}).then(
(rv: any) => {
message.success('同意成功~')
}
);
},
setRefuse(record: any, index: number){
Https.axiosPost(Https.httpUrls.trialOrderRefuse, {ids:record.id}).then(
(rv: any) => {
message.success('拒绝成功~')
}
);
},
//删除分组
deleteGroup(record: any, index: number) {
return
let deleteGroupFun = (id: any, index: number) => {
let data = {
userGroupId: id,
@@ -360,7 +419,19 @@ export default defineComponent({
font-size: 2.2rem;
}
}
.trial_table_voluntarily{
padding: 0 2rem;
margin: 0 2rem;
margin-left: 0;
border: 0.1rem solid #f1f1f1;
span{
font-size: 1.8rem;
}
>button{
transform: scale(.8);
}
}
.content_search_block {
margin-left: 4rem;
display: flex;