|
|
@@ -42,9 +42,13 @@
|
|
|
<view class="an-niu" @click.native="showModal(item.id)" v-if="item.workStatus=='未审核'">
|
|
|
<text class="detailDel">删除</text>
|
|
|
</view>
|
|
|
- <view class="an-niu" @click.native="onClick(item.id)" link><text class="detail">查看详情</text>
|
|
|
+ <view @click.native="onClick(item.id)" link class="an-niu" ><text class="detail">查看详情</text>
|
|
|
</view>
|
|
|
- <view class="an-niu" @click.native="editClick(item.id)" link><text class="detail" v-if="item.workStatus=='未审核'">编辑</text>
|
|
|
+ <view @click.native="editClick(item.id)" link class="an-niu" ><text class="solve"
|
|
|
+ v-if="item.workStatus=='未审核'">编辑</text>
|
|
|
+ </view>
|
|
|
+ <view @click.native="processClick(item.id)" link class="an-niu" v-if="item.workStatus=='未审核'&&juese=='fire_leader'"><text class="solve"
|
|
|
+ >审核</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
</uni-card>
|
|
|
@@ -63,6 +67,9 @@
|
|
|
@select="sexSelect"></u-action-sheet>
|
|
|
<u-modal :show="show" @confirm="confirm" @cancel="cancel" @close="close" asyncClose closeOnClickOverlay
|
|
|
showCancelButton confirmColor="red" :title="title" :content="content" ref="uModal"></u-modal>
|
|
|
+ <u-modal title="审核是否通过" :show="showShenHe" showCancelButton closeOnClickOverlay confirmText="审核通过"
|
|
|
+ cancelText="审核不通过" @confirm="confirmShenHe" :closeOnClickOverlay="true" @cancel="cancelShenHe" @close="close">
|
|
|
+ </u-modal>
|
|
|
<!-- 加载中 -->
|
|
|
<isLodingModel></isLodingModel>
|
|
|
</view>
|
|
|
@@ -83,6 +90,7 @@
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
+ showShenHe:false,
|
|
|
screenHeight: this.$screenHeight,
|
|
|
wheight: '',
|
|
|
keyword: '',
|
|
|
@@ -110,7 +118,8 @@
|
|
|
formData: {},
|
|
|
show: false,
|
|
|
showtimeStart: false,
|
|
|
- showtimeEnd: false
|
|
|
+ showtimeEnd: false,
|
|
|
+ juese: {}
|
|
|
};
|
|
|
},
|
|
|
// 在 vue页面，向起始页通过事件传递数据
|
|
|
@@ -129,6 +138,7 @@
|
|
|
onShow() {
|
|
|
this.actions = []
|
|
|
that = this;
|
|
|
+ this.juese=uni.getStorageSync('getUserInfo_key').userRoles.appRoles[0].role_lable
|
|
|
getOrgId({
|
|
|
pageNo: this.pageNo,
|
|
|
pageSize: this.pageSize,
|
|
|
@@ -153,6 +163,25 @@
|
|
|
onReady() {},
|
|
|
mixins: [uni.$u.mixin],
|
|
|
methods: {
|
|
|
+ processClick() { //审核
|
|
|
+ this.showShenHe=true
|
|
|
+ },
|
|
|
+ //审核通过
|
|
|
+ confirmShenHe() {
|
|
|
+ this.showShenHe = false
|
|
|
+ // verifytask({
|
|
|
+ // }).then(response => {
|
|
|
+ // if (response.data) {
|
|
|
+
|
|
|
+ // this.tableData = []
|
|
|
+ // this.getData()
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ },
|
|
|
+ //审核不通过
|
|
|
+ cancelShenHe() {
|
|
|
+ this.showShenHe = false
|
|
|
+ },
|
|
|
search(val) {
|
|
|
console.log(val, 'valvals', this.formData);
|
|
|
this.tableData = []
|
|
|
@@ -215,7 +244,7 @@
|
|
|
console.log(response, 'sdsdsd');
|
|
|
this.isLoaded = true
|
|
|
this.tableData = response.data ? [...this.tableData, ...response.data.list] : []
|
|
|
- this.total = response.data?response.data.total:0
|
|
|
+ this.total = response.data ? response.data.total : 0
|
|
|
this.loading = false
|
|
|
});
|
|
|
},
|
|
|
@@ -231,7 +260,7 @@
|
|
|
editClick(val) {
|
|
|
this.isLoaded = false
|
|
|
uni.navigateTo({
|
|
|
- url: `/pagesB/fire/fireWork/addWork/index?title=查看动火审批&&editData=${val}&&orgaction=${JSON.stringify(this.actions)}`
|
|
|
+ url: `/pagesB/fire/fireWork/addWork/index?title=编辑动火审批&&editData=${val}&&orgaction=${JSON.stringify(this.actions)}`
|
|
|
})
|
|
|
},
|
|
|
addClick() {
|
|
|
@@ -322,7 +351,7 @@
|
|
|
.detailDel {
|
|
|
width: 60px;
|
|
|
height: 60rpx;
|
|
|
- padding: 0 20rpx;
|
|
|
+ // padding: 0 20rpx;
|
|
|
border-radius: 30px;
|
|
|
background-color: #ff2e31;
|
|
|
color: white;
|
“yueshang”