eam
/
eam-uniapp
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix: 权限测试

master
zhang_li 5 months ago
parent
ff879e4c62
commit
a4bb0398cc
18 changed files with 72 additions and 93 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/api/report.js
  2. 11
      src/pages/deviceReport/index.vue
  3. 4
      src/pages/deviceReport/myDeviceReport.vue
  4. 14
      src/pages/index.vue
  5. 6
      src/pages/overhaulOrder/addForm.vue
  6. 2
      src/pages/overhaulOrder/index.vue
  7. 64
      src/pages/repairOrder/detail.vue
  8. 2
      src/pages/repairOrder/index.vue
  9. 2
      src/pages/repairOrder/myOrder.vue
  10. 2
      src/pages/repairOrder/transfer.vue
  11. 4
      src/pages/sparePartsApplication/detail.vue
  12. 4
      src/pages/sparePartsApplication/index.vue
  13. 4
      src/pages/sparePartsApplicationApprove/index.vue
  14. 2
      src/pages/spotCheckOrder/detail.vue
  15. 2
      src/pages/spotCheckOrder/index.vue
  16. 2
      src/pages/spotCheckOrder/myOrder.vue
  17. 6
      src/pages/upkeepOrder/detail.vue
  18. 2
      src/pages/upkeepOrder/myOrder.vue

8
src/api/report.js
View File

@ -16,9 +16,9 @@ export function repairPage(params,type) {
if(type == 'DEVICE'){
return http.get('/eam/device-repair-request/getAppPage',{params})
}else if(type == 'MOLD'){
return http.post('/eam/mold-repair-request/getAppPage',{params})
return http.get('/eam/mold-repair-request/getAppPage',{params})
}else if(type == 'TECH'){
return http.post('/eam/tech-repair-request/getAppPage',{params})
return http.get('/eam/tech-repair-request/getAppPage',{params})
}
}
// 撤销
@ -26,8 +26,8 @@ export function repairCancel(id,type) {
if(type == 'DEVICE'){
return http.delete('/eam/device-repair-request/cancel?id='+id)
}else if(type == 'MOLD'){
return http.post('/eam/mold-repair-request/cancel?id='+id)
return http.delete('/eam/mold-repair-request/cancel?id='+id)
}else if(type == 'TECH'){
return http.post('/eam/tech-repair-request/cancel?id='+id)
return http.delete('/eam/tech-repair-request/cancel?id='+id)
}
}

11
src/pages/deviceReport/index.vue
View File

@ -4,8 +4,7 @@
<u-navbar back-icon-color='#fff' :background="{ background: '#409eff'}" back-text="" title-color='#fff'
:title="title">
<template v-slot:right>
<u-icon name="plus" color="#fff" size="36" style="padding-right: 30rpx;" @click="addForm"
v-if="auth.hasPermiOr(['eam:device-repair-request:create','eam:mold-repair-request:create','eam:tech-repair-request:create'])"></u-icon>
<u-icon name="plus" color="#fff" size="36" style="padding-right: 30rpx;" @click="addForm" v-if="(type=='DEVICE'&&auth.hasPermi('eam:device-repair-request:createAPP'))||(type=='MOLD'&&auth.hasPermi('eam:mold-repair-request:createAPP'))||(type=='TECH'&&auth.hasPermi('eam:tech-repair-request:createAPP'))"></u-icon>
</template>
</u-navbar>
<view class="list">
@ -44,7 +43,13 @@
type="primary" shape='circle' />
</view>
<view class="button">
<u-button shape="circle" type="primary" size="mini" style="min-width: 120rpx;" @click="cancle(item)" v-if="auth.hasPermiOr(['eam:device-repair-request:cancel','eam:mold-repair-request:cancel','eam:tech-repair-request:cancel']) && item.isCancel == 0 &&item.declarer == store.id">撤销</u-button>
<u-button shape="circle" type="primary" size="mini" style="min-width: 120rpx;" @click="cancle(item)"
v-if="((type=='DEVICE'&&auth.hasPermi('eam:device-repair-request:cancelAPP'))
||(type=='MOLD'&&auth.hasPermi('eam:mold-repair-request:cancelAPP'))
||(type=='TECH'&&auth.hasPermi('eam:tech-repair-request:cancelAPP')))&&
item.isCancel == 0 &&
item.declarer == store.id"
>撤销</u-button>
</view>
</view>
</view>

4
src/pages/deviceReport/myDeviceReport.vue
View File

@ -59,7 +59,7 @@
ref,
getCurrentInstance
} from 'vue'
import * as deviceApi from "@/api/device.js"
import * as reportApi from "@/api/report.js"
const { proxy } = getCurrentInstance()
const params = ref({
pageNo: 1,
@ -72,7 +72,7 @@
if (status.value == 'nomore') return;
status.value = 'loading';
proxy.$modal.loading('加载中')
await deviceApi.deviceRepairPage(params.value).then((res) => {
await reportApi.repairPage(params.value,'DEVICE').then((res) => {
proxy.$modal.closeLoading()
if (res.data.list.length > 0) {
list.value = list.value.concat(res.data.list);

14
src/pages/index.vue
View File

@ -162,16 +162,20 @@
await proxy.$onLaunched;
if (getAccessToken()) {
meaus.value = store.meaus
if(meaus.value&&meaus.value[3]&&meaus.value[3].children){
isShowItemApprove1.value = meaus.value[3].children.some(item=>{
console.log(meaus.value)
let isHave = meaus.value.find (item=>item.path == 'parePartsManagement')
let isHaveIndex = meaus.value.findIndex (item=>item.path == 'parePartsManagement')
if(isHave&&isHave.children){
isShowItemApprove1.value = isHave.children.some(item=>{
return item.componentName == 'itemApprove1'
})
isShowItemApprove2.value = meaus.value[3].children.some(item=>{
isShowItemApprove2.value = isHave.children.some(item=>{
return item.componentName == 'itemApprove2'
})
await sparePartsApplicationApprovePage()
await sparePartsApplicationApprovePage1()
console.log(isShowItemApprove1.value)
console.log(isShowItemApprove2.value)
// 如果只有一级审核 、待审核数量等于一级审核数量
if(isShowItemApprove1.value && !isShowItemApprove2.value){
number.value =number1.value
@ -182,7 +186,7 @@
}
// 如果一级审核二级审核都存在 待审核数量等于二级审核数量
if(isShowItemApprove1.value && isShowItemApprove2.value){
meaus.value[3].children.splice(1,1)
meaus.value[isHaveIndex].children.splice(1,1)
number.value =number2.value
}
}

6
src/pages/overhaulOrder/addForm.vue
View File

@ -142,7 +142,7 @@
//维修人员
const selecUserList = ref([])//维修人员
const isShowSelecUser = ref(false)
const chooseUserInfo = ref({})
const chooseUserInfo = ref(null)
function submit() {
// 校验
if (!form.value.describes) {
@ -393,6 +393,10 @@
}
// 选择人员
function chooseUser() {
if(!chooseUserInfo.value){
proxy.$modal.showToast('请选择人员')
return;
}
form.value[field.value] = chooseUserInfo.value
isShowSelecUser.value = false
}

2
src/pages/overhaulOrder/index.vue
View File

@ -5,7 +5,7 @@
title="检修工单">
<!-- <template v-slot:right v-if="isEngineer"> -->
<template v-slot:right>
<u-icon name="plus" color="#fff" size="36" style="padding-right: 30rpx;" @click="addForm" v-if="auth.hasPermiOr(['eam:device-inspection-job-main:create','eam:mold-inspection-job-main:create','eam:tech-inspection-job-main:create'])"></u-icon>
<u-icon name="plus" color="#fff" size="36" style="padding-right: 30rpx;" @click="addForm" v-if="(params.type=='DEVICE'&&auth.hasPermi('eam:device-inspection-job-main:createAPP'))||(params.type=='MOLD'&&auth.hasPermi('eam:mold-inspection-job-main:createAPP'))||(params.type=='TECH'&&auth.hasPermi('eam:tech-inspection-job-main:createAPP'))"></u-icon>
</template>
</u-navbar>
<!-- <Search @search='search' @screen='screen'/> -->

64
src/pages/repairOrder/detail.vue
View File

@ -9,7 +9,7 @@
v-if="data.status == 'PECEIVED' && (!serviceList || serviceList && serviceList.length == 0)">转办
</view> -->
<view @click="transfer"
v-if="data.status == 'PECEIVED'&&auth.hasPermiOr(['eam:device-maintenance-job-main:turnTo','eam:mold-maintenance-job-main:turnTo','eam:tech-maintenance-job-main:orderClick'])">
v-if="data.status == 'PECEIVED'&&((type=='DEVICE'&&auth.hasPermi('eam:device-maintenance-job-main:turnToAPP'))||(type=='MOLD'&&auth.hasPermi('eam:mold-maintenance-job-main:turnToAPP'))||(type=='TECH'&&auth.hasPermi('eam:tech-maintenance-job-main:turnToAPP')))">
转办
</view>
</view>
@ -207,23 +207,23 @@
</view>
<view class="footer">
<view class="btns"
v-if="data.status == 'PENDING'&&auth.hasPermiOr(['eam:device-maintenance-job-main:orderClick','eam:mold-maintenance-job-main:orderClick','eam:tech-maintenance-job-main:orderClick'])">
v-if="data.status == 'PENDING'&&((type=='DEVICE'&&auth.hasPermi('eam:device-maintenance-job-main:orderClickAPP'))||(type=='MOLD'&&auth.hasPermi('eam:mold-maintenance-job-main:orderClickAPP'))||(type=='TECH'&&auth.hasPermi('eam:tech-maintenance-job-main:orderClickAPP')))">
<u-button type="primary" @click="orderClick(1)" :loading='loading' :disabled='loading'>接单</u-button>
</view>
<view class="btns" v-if="data.status == 'PECEIVED'">
<u-button shape="shape" type="warning" style="min-width: 120rpx;" :loading='loading1' @click="editForm"
:disabled='loading1'
v-if="auth.hasPermiOr(['eam:device-maintenance-job-main:update','eam:mold-maintenance-job-main:update','eam:tech-maintenance-job-main:update'])">修改工单</u-button>
:disabled='loading1' v-if="(type=='DEVICE'&&auth.hasPermi('eam:device-maintenance-job-main:updateAPP'))||(type=='MOLD'&&auth.hasPermi('eam:mold-maintenance-job-main:updateAPP'))||(type=='TECH'&&auth.hasPermi('eam:tech-maintenance-job-main:updateAPP'))">修改工单</u-button>
<u-button type="primary" @click="orderClickSuccess()" :loading='loading' :disabled='loading'
v-if="auth.hasPermiOr(['eam:device-maintenance-job-main:orderClickFinish','eam:mold-maintenance-job-main:orderClickFinish','eam:tech-maintenance-job-main:orderClickFinish'])">完成</u-button>
v-if="(type=='DEVICE'&&auth.hasPermi('eam:device-maintenance-job-main:orderClickFinishAPP'))||(type=='MOLD'&&auth.hasPermi('eam:mold-maintenance-job-main:orderClickFinishAPP'))||(type=='TECH'&&auth.hasPermi('eam:tech-maintenance-job-main:orderClickFinishAPP'))">完成</u-button>
</view>
<view class="btns"
v-if="((data.status == 'COMPLETED' && !data.requestNumber) || (data.status == 'APPLYPASS')) && auth.hasPermiOr(['eam:device-maintenance-job-main:orderClickVerify','eam:mold-maintenance-job-main:orderClickVerify','eam:tech-maintenance-job-main:orderClickVerify'])">
v-if="((data.status == 'COMPLETED' && !data.requestNumber) || (data.status == 'APPLYPASS')) && ((type=='DEVICE'&&auth.hasPermi('eam:device-maintenance-job-main:orderClickVerifyAPP'))||(type=='MOLD'&&auth.hasPermi('eam:mold-maintenance-job-main:orderClickVerifyAPP'))||(type=='TECH'&&auth.hasPermi('eam:tech-maintenance-job-main:orderClickVerifyAPP')))">
<u-button type="primary" @click="verify()" :loading='loading' :disabled='loading'>验证</u-button>
</view>
<view class="btns"
v-if="(data.status == 'COMPLETED' && data.requestNumber && data.applyer == store.id)&&auth.hasPermiOr(['eam:device-maintenance-job-main:orderClickConfirm','eam:mold-maintenance-job-main:orderClickConfirm','eam:tech-maintenance-job-main:orderClickConfirm'])">
v-if="(data.status == 'COMPLETED' && data.requestNumber && data.applyer == store.id)&& ((type=='DEVICE'&&auth.hasPermi('eam:device-maintenance-job-main:orderClickConfirmAPP'))||(type=='MOLD'&&auth.hasPermi('eam:mold-maintenance-job-main:orderClickConfirmAPP'))||(type=='TECH'&&auth.hasPermi('eam:tech-maintenance-job-main:orderClickConfirmAPP')))">
<u-button type="primary" @click="orderClickApply()" :loading='loading'
:disabled='loading'>维修确认</u-button>
</view>
@ -430,7 +430,7 @@
loading.value = false
}, 1500)
} else {
proxy.$modal.showToast('操作失败')
proxy.$modal.showToast(res.msg)
loading.value = false
}
}).catch(() => {
@ -441,7 +441,7 @@
/**
* 维修确认
*/
async function orderClickConfirm() {
async function orderClickConfirm(status) {
isApplyShowSuccess.value = false
result.value = status
isShowSuccess.value = false
@ -449,29 +449,13 @@
number: data.value.number,
status: data.value.status,
id: data.value.id,
result: result.value,
result: result.value ,
requestNumber: data.value.requestNumber,
content: data.value.applyContent ? data.value.applyContent : ''
}
// 修改工单接口参数
const dataTwo = {
id: data.value && data.value.id ? data.value.id : '',
describes: data.value.describes,
type: data.value.type,
deviceNumber: data.value.deviceNumber,
factoryAreaNumber: data.value.factoryAreaNumber,
classes: data.value.classes,
faultType: data.value.faultType
}
// 如果直接点击完成先走修改工单接口
await repairOrderApi.orderClickConfirm(dataTwo).then((res) => { }).catch(() => {
proxy.$modal.closeLoading()
loading.value = false
})
proxy.$modal.confirm('是否完成?').then(async () => {
proxy.$modal.loading('加载中')
loading.value = true
await repairOrderApi.orderClickFinish(dataOne).then((res) => {
await repairOrderApi.orderClickConfirm(dataOne, type.value).then((res) => {
if (res.data) {
proxy.$modal.showToast('操作成功')
setTimeout(() => {
@ -479,14 +463,13 @@
loading.value = false
}, 1500)
} else {
proxy.$modal.showToast('操作失败')
proxy.$modal.showToast(res.msg)
loading.value = false
}
}).catch(() => {
proxy.$modal.closeLoading()
loading.value = false
})
})
}
/**
* 验证确认
@ -501,22 +484,6 @@
requestNumber: data.value.requestNumber,
content: data.value.applyContent ? data.value.applyContent : ''
}
// 修改工单接口参数
const dataTwo = {
id: data.value && data.value.id ? data.value.id : '',
describes: data.value.describes,
type: data.value.type,
deviceNumber: data.value.deviceNumber,
factoryAreaNumber: data.value.factoryAreaNumber,
classes: data.value.classes,
faultType: data.value.faultType
}
// 如果直接点击完成先走修改工单接口
await repairOrderApi.repairOrderUpdate(dataTwo, type.value).then((res) => { }).catch(() => {
proxy.$modal.closeLoading()
loading.value = false
})
proxy.$modal.confirm('是否完成?').then(async () => {
proxy.$modal.loading('加载中')
loading.value = true
await repairOrderApi.orderClickVerify(dataOne, type.value).then((res) => {
@ -527,14 +494,13 @@
loading.value = false
}, 1500)
} else {
proxy.$modal.showToast('操作失败')
proxy.$modal.showToast(res.msg)
loading.value = false
}
}).catch(() => {
proxy.$modal.closeLoading()
loading.value = false
})
})
}
// APP维修工单接单、点击完成、验证
// async function orderClick(type1) {
@ -656,7 +622,7 @@
await getDeviceRepairDetailsByNumber()
loading.value = false
} else {
proxy.$modal.showToast('操作失败')
proxy.$modal.showToast(res.msg)
loading.value = false
}
}).catch(() => {
@ -770,7 +736,7 @@
})
}
async function getDeviceRepairDetail(number) {
await repairOrderApi.getDeviceRepairDetail(number,type.value).then((res) => {
await repairOrderApi.getDeviceRepairDetail(number, type.value).then((res) => {
proxy.$modal.closeLoading()
data.value = res.data
if (data.value.requestNumber) {

2
src/pages/repairOrder/index.vue
View File

@ -4,7 +4,7 @@
<u-navbar back-icon-color='#fff' :background="{ background: '#409eff'}" back-text="" title-color='#fff'
:title="params.flag == 2 ? '报修确认' : '维修工单'">
<template v-slot:right v-if="params.flag!='2'">
<u-icon name="plus" color="#fff" size="36" style="padding-right: 30rpx;" @click="addForm" v-if="auth.hasPermiOr(['eam:device-maintenance-job-main:create','eam:mold-maintenance-job-main:create','eam:tech-maintenance-job-main:create'])"></u-icon>
<u-icon name="plus" color="#fff" size="36" style="padding-right: 30rpx;" @click="addForm" v-if="(params.type=='DEVICE'&&auth.hasPermi('eam:device-maintenance-job-main:createAPP'))||(params.type==='MOLD'&&auth.hasPermi('eam:mold-maintenance-job-main:createAPP'))||(params.type==='TECH'&&auth.hasPermi('eam:tech-maintenance-job-main:createAPP'))"></u-icon>
</template>
</u-navbar>
<view class="list">

2
src/pages/repairOrder/myOrder.vue
View File

@ -95,7 +95,7 @@
if (status.value == 'nomore') return;
status.value = 'loading';
proxy.$modal.loading('加载中')
await repairOrderApi.repairOrderPage(params.value).then((res) => {
await repairOrderApi.repairOrderPage(params.value,'DEVICE').then((res) => {
proxy.$modal.closeLoading()
if (res.data.list.length > 0) {
list.value = list.value.concat(res.data.list);

2
src/pages/repairOrder/transfer.vue
View File

@ -174,7 +174,7 @@
proxy.$modal.confirm('是否转办维修工单').then(() => {
proxy.$modal.loading('加载中')
loading.value = true
repairOrderApi.transfer(paramsData).then((res) => {
repairOrderApi.transfer(paramsData,type.value).then((res) => {
proxy.$modal.closeLoading()
if (res.data) {
proxy.$modal.showToast('转办成功')

4
src/pages/sparePartsApplication/detail.vue
View File

@ -38,8 +38,8 @@
</view>
<view class="footer" v-if="from == 3 || from == 2">
<view class="btns">
<button class="reset" @click="reject" v-if="auth.hasPermiOr(['eam:item-apply-request-main:role0','eam:item-apply-request-main:role1'])">驳回</button>
<button class="sure" @click="agree" :loading='loading' :disabled='loading' v-if="auth.hasPermiOr(['eam:item-apply-request-main:role0','eam:item-apply-request-main:role1'])">通过</button>
<button class="reset" @click="reject" v-if="(from==2&&auth.hasPermi('eam:item-apply-request-main:role0APP'))||(from==3&&auth.hasPermi('eam:item-apply-request-main:role1APP'))">驳回</button>
<button class="sure" @click="agree" :loading='loading' :disabled='loading' v-if="(from==2&&auth.hasPermi('eam:item-apply-request-main:role0APP'))||(from==3&&auth.hasPermi('eam:item-apply-request-main:role1APP'))">通过</button>
</view>
<view style="height: constant(safe-area-inset-bottom); height: env(safe-area-inset-bottom);"></view>
</view>

4
src/pages/sparePartsApplication/index.vue
View File

@ -4,7 +4,7 @@
<u-navbar back-icon-color='#fff' :background="{ background: '#409eff'}" back-text="" title-color='#fff'
title="备件领用申请">
<template v-slot:right>
<u-icon name="plus" color="#fff" size="36" style="padding-right: 30rpx;" @click="addForm" v-if="auth.hasPermiOr(['eam:item-apply-request-main:create'])"></u-icon>
<u-icon name="plus" color="#fff" size="36" style="padding-right: 30rpx;" @click="addForm" v-if="auth.hasPermi('eam:item-apply-request-main:createAPP')"></u-icon>
</template>
</u-navbar>
<!-- <Search @search='search' @screen='screen' /> -->
@ -41,7 +41,7 @@
</view>
<view class="button">
<u-button shape="circle" type="primary" size="mini" style="min-width: 120rpx;"
v-if="item.status==0" @click="cancle(item)">撤回</u-button>
v-if="item.status==0&&auth.hasPermi('eam:item-apply-request-main:cancelAPP')" @click="cancle(item)">撤回</u-button>
</view>
</view>

4
src/pages/sparePartsApplicationApprove/index.vue
View File

@ -38,9 +38,9 @@
</view>
<view class="button">
<u-button shape="circle" size="mini" style="min-width: 120rpx;"
v-if="item.status==0&&auth.hasPermiOr(['eam:item-apply-request-main:role0','eam:item-apply-request-main:role1'])" @click="reject(item)">驳回</u-button>
v-if="item.status==0&&((from==2&&auth.hasPermi('eam:item-apply-request-main:role0APP'))||(from==3&&auth.hasPermi('eam:item-apply-request-main:role1APP')))" @click="reject(item)">驳回</u-button>
<u-button shape="circle" type="primary" size="mini" style="min-width: 120rpx;margin-left: 20rpx;"
v-if="item.status==0&&auth.hasPermiOr(['eam:item-apply-request-main:role0','eam:item-apply-request-main:role1'])" @click="agree(item)">通过</u-button>
v-if="item.status==0&&((from==2&&auth.hasPermi('eam:item-apply-request-main:role0APP'))||(from==3&&auth.hasPermi('eam:item-apply-request-main:role1APP')))" @click="agree(item)">通过</u-button>
</view>
</view>

2
src/pages/spotCheckOrder/detail.vue
View File

@ -95,7 +95,7 @@
</view>
<view class="footer">
<view class="btns"
v-if="(data.status == 'COMPLETED' || data.status =='APPLYPASS' || data.status =='APPLYREJECTED')&& auth.hasPermiOr(['eam:device-spot-inspection-record-main:orderClickVerify','eam:mold-spot-inspection-record-main:orderClickVerify','eam:tech-spot-inspection-record-main:orderClickVerify'])">
v-if="(data.status == 'COMPLETED' || data.status =='APPLYPASS' || data.status =='APPLYREJECTED')&& ((type=='DEVICE'&&auth.hasPermi('eam:device-spot-inspection-record-main:orderClickVerifyAPP'))||(type=='MOLD'&&auth.hasPermi('eam:mold-spot-inspection-record-main:orderClickVerifyAPP'))||(type=='TECH'&&auth.hasPermi('eam:tech-spot-inspection-record-main:orderClickVerifyAPP')))">
<u-button type="primary" @click="orderClickVerify()" :loading='loading'
:disabled='loading'>验证</u-button>
</view>

2
src/pages/spotCheckOrder/index.vue
View File

@ -4,7 +4,7 @@
<u-navbar back-icon-color='#fff' :background="{ background: '#409eff'}" back-text="" title-color='#fff'
title="点检工单">
<template v-slot:right>
<u-icon name="plus" color="#fff" size="36" style="padding-right: 30rpx;" @click="addForm" v-if="auth.hasPermiOr(['eam:device-spot-inspection-record-main:create','eam:mold-spot-inspection-record-main:create','eam:tech-spot-inspection-record-main:create'])"></u-icon>
<u-icon name="plus" color="#fff" size="36" style="padding-right: 30rpx;" @click="addForm" v-if="(params.type=='DEVICE'&&auth.hasPermi('eam:device-spot-inspection-record-main:createAPP'))||(params.type=='MOLD'&&auth.hasPermi('eam:mold-spot-inspection-record-main:createAPP'))||(params.type=='TECH'&&auth.hasPermi('eam:tech-spot-inspection-record-main:createAPP'))"></u-icon>
</template>
</u-navbar>
<view class="list">

2
src/pages/spotCheckOrder/myOrder.vue
View File

@ -80,7 +80,7 @@
if (status.value == 'nomore') return;
status.value = 'loading';
proxy.$modal.loading('加载中')
await spotCheckOrderApi.spotCheckOrderPage(params.value).then((res) => {
await spotCheckOrderApi.spotCheckOrderPage(params.value,'DEVICE').then((res) => {
proxy.$modal.closeLoading()
if (res.data.list.length > 0) {
list.value = list.value.concat(res.data.list);

6
src/pages/upkeepOrder/detail.vue
View File

@ -142,13 +142,13 @@
<view class="footer">
<view class="btns">
<u-button type="primary"
v-if="data.status == 'PENDING' && auth.hasPermiOr(['eam:device-maintain-job-main:orderClick','eam:mold-maintain-job-main:orderClick','eam:tech-maintain-job-main:orderClick'])"
v-if="data.status == 'PENDING' && ((type=='DEVICE'&&auth.hasPermi('eam:device-maintain-job-main:orderClickAPP'))||(type=='MOLD'&&auth.hasPermi('eam:mold-maintain-job-main:orderClickAPP'))||(type=='TECH'&&auth.hasPermi('eam:tech-maintain-job-main:orderClickAPP')))"
@click="orderClick()" :loading='loading' :disabled='loading'>接单</u-button>
<u-button type="primary"
v-if="data.status == 'PECEIVED' && auth.hasPermiOr(['eam:device-maintain-job-main:orderClickFinish','eam:mold-maintain-job-main:orderClickFinish','eam:tech-maintain-job-main:orderClickFinish'])"
v-if="data.status == 'PECEIVED' && ((type=='DEVICE'&&auth.hasPermi('eam:device-maintain-job-main:orderClickFinishAPP'))||(type=='MOLD'&&auth.hasPermi('eam:mold-maintain-job-main:orderClickFinishAPP'))||(type=='TECH'&&auth.hasPermi('eam:tech-maintain-job-main:orderClickFinishAPP')))"
@click="orderClickFinish()" :loading='loading' :disabled='loading'>完成</u-button>
<u-button type="primary"
v-if="data.status == 'COMPLETED' && auth.hasPermiOr(['eam:device-maintain-job-main:orderClickVerify','eam:mold-maintain-job-main:orderClickVerify','eam:tech-maintain-job-main:orderClickVerify'])"
v-if="data.status == 'COMPLETED' && ((type=='DEVICE'&&auth.hasPermi('eam:device-maintain-job-main:orderClickVerifyAPP'))||(type=='MOLD'&&auth.hasPermi('eam:mold-maintain-job-main:orderClickVerifyAPP'))||(type=='TECH'&&auth.hasPermi('eam:tech-maintain-job-main:orderClickVerifyAPP')))"
@click="verify()" :loading='loading' :disabled='loading'>验证</u-button>
</view>
<view style="height: constant(safe-area-inset-bottom); height: env(safe-area-inset-bottom);"></view>

2
src/pages/upkeepOrder/myOrder.vue
View File

@ -89,7 +89,7 @@
if (status.value == 'nomore') return;
status.value = 'loading';
proxy.$modal.loading('加载中')
await upkeepOrderApi.upkeepOrderPage(params.value).then((res) => {
await upkeepOrderApi.upkeepOrderPage(params.value,'DEVICE').then((res) => {
proxy.$modal.closeLoading()
if (res.data.list.length > 0) {
list.value = list.value.concat(res.data.list);

Write Preview
Loading…
Cancel
Save