From 8db235ea53d0909dff13844dcb2aa258fe9e6f7c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 11 六月 2024 15:47:09 +0800
Subject: [PATCH] ''
---
h5/pages/staff/task/visitorApprove.vue | 2
h5/pages/staff/task/index.vue | 4 +-
h5/pages/staff/task/visitorReport.vue | 2
admin/src/views/business/approvalConfiguration.vue | 19 +++++----
admin/src/views/operation/serviceCar/apprConfig.vue | 19 +++++----
admin/src/views/business/approvalReport.vue | 19 +++++----
admin/src/views/operation/serviceCar/apprRecord.vue | 3 +
admin/src/views/operation/danger/record.vue | 3 +
8 files changed, 38 insertions(+), 33 deletions(-)
diff --git a/admin/src/views/business/approvalConfiguration.vue b/admin/src/views/business/approvalConfiguration.vue
index 622d55f..e9c66d7 100644
--- a/admin/src/views/business/approvalConfiguration.vue
+++ b/admin/src/views/business/approvalConfiguration.vue
@@ -32,13 +32,13 @@
<div class="content">
<div v-if="item.objIds && item.objIds.length === 1 ">
<span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}</span>
- <span v-if="item.approveType == 0"> 鎴栫</span>
- <span v-if="item.approveType == 1"> 浼氱</span>
+ <span v-if="item.approveType == 0 && item.type == '0'"> 鎴栫</span>
+ <span v-if="item.approveType == 1 && item.type == '0'"> 浼氱</span>
</div>
<div v-else-if="item.objIds && item.objIds.length > 1">
- <span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}绛�</span>
- <span v-if="item.approveType == 0"> 鎴栫</span>
- <span v-if="item.approveType == 1"> 浼氱</span>
+ <span>{{ item.objIds[0].name }} 绛�</span>
+ <span v-if="item.approveType == 0 && item.type == '0'"> 鎴栫</span>
+ <span v-if="item.approveType == 1 && item.type == '0'"> 浼氱</span>
</div>
<div v-else>璇烽�夋嫨</div>
<i class="el-icon-arrow-right"></i>
@@ -277,7 +277,7 @@
item.active = true
if (item.objIds && item.objIds.length > 0) {
const objIds = item.objIds.map(i => {
- return i.id + '-' + i.name
+ return `${i.id}-${i.name}${i.companyName ? '-' + i.companyName : ''}`
})
this.$set(this.searchForm, 'objIds', objIds)
} else {
@@ -298,18 +298,19 @@
item.objIds = item.memberList.map(i => {
return {
id: i.id,
- name: i.name
+ name: i.name,
+ companyName: i.companyName
}
})
}
})
this.apprList = arr
+ this.flowClick(0)
+ this.$forceUpdate()
}
// console.log(res);
})
- this.flowClick(0)
- this.$forceUpdate()
},
onSubmit () {
const { apprList, activeType } = this
diff --git a/admin/src/views/business/approvalReport.vue b/admin/src/views/business/approvalReport.vue
index 81e1aa2..3f9c573 100644
--- a/admin/src/views/business/approvalReport.vue
+++ b/admin/src/views/business/approvalReport.vue
@@ -28,13 +28,13 @@
<div class="content">
<div v-if="item.objIds && item.objIds.length === 1 ">
<span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}</span>
- <span v-if="item.approveType == 0"> 鎴栫</span>
- <span v-if="item.approveType == 1"> 浼氱</span>
+ <span v-if="item.approveType == 0 && item.type == '0'"> 鎴栫</span>
+ <span v-if="item.approveType == 1 && item.type == '0'"> 浼氱</span>
</div>
<div v-else-if="item.objIds && item.objIds.length > 1">
- <span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}绛�</span>
- <span v-if="item.approveType == 0"> 鎴栫</span>
- <span v-if="item.approveType == 1"> 浼氱</span>
+ <span>{{ item.objIds[0].name }} 绛�</span>
+ <span v-if="item.approveType == 0 && item.type == '0'"> 鎴栫</span>
+ <span v-if="item.approveType == 1 && item.type == '0'"> 浼氱</span>
</div>
<div v-else>璇烽�夋嫨</div>
<i class="el-icon-arrow-right"></i>
@@ -264,7 +264,7 @@
item.active = true
if (item.objIds && item.objIds.length > 0) {
const objIds = item.objIds.map(i => {
- return i.id + '-' + i.name
+ return `${i.id}-${i.name}${i.companyName ? '-' + i.companyName : ''}`
})
this.$set(this.searchForm, 'objIds', objIds)
} else {
@@ -285,18 +285,19 @@
item.objIds = item.memberList.map(i => {
return {
id: i.id,
- name: i.name
+ name: i.name,
+ companyName: i.companyName
}
})
}
})
this.apprList = arr
+ this.flowClick(0)
+ this.$forceUpdate()
}
// console.log(res);
})
- this.flowClick(0)
- this.$forceUpdate()
},
onSubmit () {
const { apprList, activeType } = this
diff --git a/admin/src/views/operation/danger/record.vue b/admin/src/views/operation/danger/record.vue
index b59dedd..83b4168 100644
--- a/admin/src/views/operation/danger/record.vue
+++ b/admin/src/views/operation/danger/record.vue
@@ -125,7 +125,8 @@
queryEndTime: '',
areaId: null,
cateId: null,
- status:null
+ status: null,
+ radio: 0
},
cateList: [],
areaList: [],
diff --git a/admin/src/views/operation/serviceCar/apprConfig.vue b/admin/src/views/operation/serviceCar/apprConfig.vue
index 4e203a3..c860674 100644
--- a/admin/src/views/operation/serviceCar/apprConfig.vue
+++ b/admin/src/views/operation/serviceCar/apprConfig.vue
@@ -32,13 +32,13 @@
<div class="content">
<div v-if="item.objIds && item.objIds.length === 1 ">
<span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}</span>
- <span v-if="item.approveType == 0"> 鎴栫</span>
- <span v-if="item.approveType == 1"> 浼氱</span>
+ <span v-if="item.approveType == 0 && item.type == '0'"> 鎴栫</span>
+ <span v-if="item.approveType == 1 && item.type == '0'"> 浼氱</span>
</div>
<div v-else-if="item.objIds && item.objIds.length > 1">
- <span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}绛�</span>
- <span v-if="item.approveType == 0"> 鎴栫</span>
- <span v-if="item.approveType == 1"> 浼氱</span>
+ <span>{{ item.objIds[0].name }} 绛�</span>
+ <span v-if="item.approveType == 0 && item.type == '0'"> 鎴栫</span>
+ <span v-if="item.approveType == 1 && item.type == '0'"> 浼氱</span>
</div>
<div v-else>璇烽�夋嫨</div>
<i class="el-icon-arrow-right"></i>
@@ -286,7 +286,7 @@
item.active = true
if (item.objIds && item.objIds.length > 0) {
const objIds = item.objIds.map(i => {
- return i.id + '-' + i.name
+ return `${i.id}-${i.name}${i.companyName ? '-' + i.companyName : ''}`
})
this.$set(this.searchForm, 'objIds', objIds)
} else {
@@ -307,18 +307,19 @@
item.objIds = item.memberList.map(i => {
return {
id: i.id,
- name: i.name
+ name: i.name,
+ companyName: i.companyName
}
})
}
})
this.apprList = arr
+ this.flowClick(0)
+ this.$forceUpdate()
}
// console.log(res);
})
- this.flowClick(0)
- this.$forceUpdate()
},
onSubmit () {
const { apprList, activeType } = this
diff --git a/admin/src/views/operation/serviceCar/apprRecord.vue b/admin/src/views/operation/serviceCar/apprRecord.vue
index 34fab76..2ed565a 100644
--- a/admin/src/views/operation/serviceCar/apprRecord.vue
+++ b/admin/src/views/operation/serviceCar/apprRecord.vue
@@ -132,7 +132,8 @@
queryStartTime: '',
queryEndTime: '',
type: null,
- status:null
+ status: null,
+ radio: 0
},
cateList: [],
areaList: [],
diff --git a/h5/pages/staff/task/index.vue b/h5/pages/staff/task/index.vue
index 8410340..39d32d6 100644
--- a/h5/pages/staff/task/index.vue
+++ b/h5/pages/staff/task/index.vue
@@ -27,13 +27,13 @@
@click="statusClick(1)"
:class="{ active: search.queryType === 1 }"
class="box_head_item"
- >宸插鐞� {{ headData.noticeDealNum }}</view
+ >宸插鐞�</view
>
<view
@click="statusClick(2)"
:class="{ active: search.queryType === 2 }"
class="box_head_item"
- >鎴戝彂璧风殑 {{ headData.noticeCreateNum }}</view
+ >鎴戝彂璧风殑</view
>
<view
@click="statusClick(3)"
diff --git a/h5/pages/staff/task/visitorApprove.vue b/h5/pages/staff/task/visitorApprove.vue
index 8f0b95e..06d856a 100644
--- a/h5/pages/staff/task/visitorApprove.vue
+++ b/h5/pages/staff/task/visitorApprove.vue
@@ -138,7 +138,7 @@
</view>
</view>
<view class="emyty"></view>
- <view class="main_footer">
+ <view v-if="info.approveDateVO!=null&& info.approveDateVO.canBeApproved!=null && info.approveDateVO.canBeApproved ==1" class="main_footer">
<view class="btn" @click="handleSub(3)">鎷掔粷</view>
<view class="btn agree" @click="handleSub(2)">鍚屾剰</view>
</view>
diff --git a/h5/pages/staff/task/visitorReport.vue b/h5/pages/staff/task/visitorReport.vue
index b877e17..6bc59ab 100644
--- a/h5/pages/staff/task/visitorReport.vue
+++ b/h5/pages/staff/task/visitorReport.vue
@@ -131,7 +131,7 @@
</view>
</view>
<view class="emyty"></view>
- <view class="main_footer">
+ <view v-if="info.approveDateVO!=null&& info.approveDateVO.canBeApproved!=null && info.approveDateVO.canBeApproved ==1" class="main_footer">
<view class="btn" @click="handleSub(3)">鎷掔粷</view>
<view class="btn agree" @click="handleSub(2)">鍚屾剰</view>
</view>
--
Gitblit v1.9.3