From f71917022b1f1078c2670972c8dd9c7f89eb3744 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Wed, 08 Nov 2023 11:16:48 +0800
Subject: [PATCH] fix:查看详情权限修改
---
pages/actionChange/workOrderDetails/index.vue | 15 +++++++++++++--
pages/actionChange/newPage/index.vue | 29 ++++++++++-------------------
pages/actionChange/secondLevelData/index.vue | 4 ++--
3 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/pages/actionChange/newPage/index.vue b/pages/actionChange/newPage/index.vue
index 39a7fcb..f9025c1 100644
--- a/pages/actionChange/newPage/index.vue
+++ b/pages/actionChange/newPage/index.vue
@@ -27,18 +27,14 @@
type="select" />
<u-icon slot="right" name="arrow-right" />
</u-form-item>
- <u-form-item border="none" border-bottom label="������������:" prop="changeType" required @click="
- showCheckBox = true;
- hideKeyboard('changeEnum', 'changeType');
- ">
- <u-input v-model="form.changeType" border="none" disabled disabled-color="#ffffff" placeholder="���������"
- type="select" />
- <u-icon slot="right" name="arrow-right" />
+ <u-form-item border="none" border-bottom label="������������:" prop="changeType" required>
+ <u-radio-group v-model="form.changeType" style="font-size: 13px;">
+ <u-radio :key="index" v-for="(item, index) in changeEnum" :customStyle="{marginRight: '16px'}"
+ :label="item.name" :name="item.value" />
+ </u-radio-group>
</u-form-item>
- <u-form-item border-bottom label="������������:" placeholder="���������" required
- :disabled='Number(sumbitForm.changeType)===1'>
- <u-input v-model="form.changeDay" border="none" type="number"
- :disabled='Number(sumbitForm.changeType)===1' />
+ <u-form-item border-bottom label="������������:" placeholder="���������" required :disabled='Number(form.changeType)===1'>
+ <u-input v-model="form.changeDay" border="none" type="number" :disabled='Number(form.changeType)===1' />
</u-form-item>
<u-form-item border-bottom label="������������:" prop="escalationUnitId" required @click="
showCheckBox = true;
@@ -54,7 +50,7 @@
<u-form-item border-bottom label="������������:" prop="investigationType" required>
<u-radio-group v-model="form.investigationType" style="font-size: 13px;">
<u-radio :key="index" v-for="(item, index) in Dic.investigationEnum"
- :custom-style="{marginRight: '8px'}" :label="item.name" :name="item.value" />
+ :customStyle="{marginRight: '16px'}" :label="item.name" :name="item.value" />
</u-radio-group>
</u-form-item>
<u-form-item border-bottom label="������������:" prop="problemDescribe" required>
@@ -67,7 +63,7 @@
</u-form-item>
</u-form>
<u-picker :show="showCheckBox" keyName="label" :columns="actionOptionList" @cancel="showCheckBox = false"
- @confirm="selectBack"></u-picker>
+ :immediateChange='true' @confirm="selectBack"></u-picker>
<!-- <u-action-sheet v-if="actionOptionList.length > 0" :actions="actionOptionList" :show="showCheckBox" title="���������"
@close="showCheckBox = false" @select="selectBack" /> -->
<view class="bunts">
@@ -102,11 +98,6 @@
trigger: ['blur', 'change']
},
'polluteType': {
- required: true,
- message: '���������',
- trigger: ['blur', 'change']
- },
- 'changeType': {
required: true,
message: '���������',
trigger: ['blur', 'change']
@@ -263,7 +254,7 @@
this.form.escalationTime = data
this.sumbitForm.escalationTime = data
if (this.changeEnum.length > 0) {
- this.form.changeType = this.changeEnum[0].name
+ this.form.changeType = this.changeEnum[0].value
this.sumbitForm.changeType = this.changeEnum[0].value
}
let userInfor = JSON.parse(uni.getStorageSync('userInfor') || '{}')
diff --git a/pages/actionChange/secondLevelData/index.vue b/pages/actionChange/secondLevelData/index.vue
index 6a6f97d..0b640e4 100644
--- a/pages/actionChange/secondLevelData/index.vue
+++ b/pages/actionChange/secondLevelData/index.vue
@@ -126,7 +126,7 @@
alarmLevel: null,
aqi: 0,
baseUrl: '',
- windDir: 'null',
+ windDir: '',
windDeg: 180,
wsData2: null,
// ���������������
@@ -150,7 +150,7 @@
},
computed: {
windDirData() {
- if (this.wsData2) {
+ if (this.wsData2 && this.windDir) {
return `${this.windDir} (${this.wsData2.a01008})`
} else {
return ''
diff --git a/pages/actionChange/workOrderDetails/index.vue b/pages/actionChange/workOrderDetails/index.vue
index 490f43e..887b070 100644
--- a/pages/actionChange/workOrderDetails/index.vue
+++ b/pages/actionChange/workOrderDetails/index.vue
@@ -1,6 +1,6 @@
<template>
<view class="mainContent">
- <basicInfor :basic-infor="basicInfor" />
+ <basicInfor :basic-infor="basicInfor" v-if="isShow" />
<rectificationInfor ref="rectificationInfor" :basic-infor="basicInfor"
v-if="!(pageState === 'view' && basicInfor.state === 20)" />
<approvalnfor ref="approvalnfor" v-if="basicInfor.state >= 30 && basicInfor.stateName!=='���������'"
@@ -35,6 +35,7 @@
unitListL: [],
userInfor: null,
show: false,
+ isShow: false,
option: {}
}
},
@@ -63,7 +64,7 @@
userId: this.userInfor.userId
}
this.$http.httpGet('/allocationApp/authority', params).then(res => {
- if (!res.data) {
+ if (res.data === 3) {
uni.showModal({
content: '���������������������������������������������',
showCancel: false,
@@ -76,8 +77,18 @@
}
},
})
+ } else if (res.data === 1) {
+ // ������������
+ this.basicInfor.pageState = 'edit'
+ this.isShow = true
+ } else if (res.data === 2) {
+ // ���������
+ this.isShow = true
+ this.basicInfor.pageState = 'view'
}
})
+ } else {
+ this.isShow = true
}
console.log('this.basicInfor123', this.basicInfor)
},
--
Gitblit v1.8.0