6.19宁夏按钮修改
This commit is contained in:
parent
0a92f972ab
commit
2f63a7d96c
|
|
@ -791,6 +791,8 @@ const indexScan = {
|
|||
},
|
||||
}
|
||||
|
||||
const url = HttpConfig.systemPath
|
||||
|
||||
export default{
|
||||
login,
|
||||
index,
|
||||
|
|
@ -812,5 +814,6 @@ export default{
|
|||
update,
|
||||
rfidBinding,
|
||||
qrcodeBinding,
|
||||
indexScan
|
||||
indexScan,
|
||||
url
|
||||
}
|
||||
|
|
@ -4,12 +4,13 @@ class HttpConfig {
|
|||
// #endif
|
||||
// #ifdef APP-PLUS
|
||||
// baseUrl = "http://112.29.103.165:21624"
|
||||
baseUrl = "http://192.168.0.14:21624"
|
||||
// baseUrl = "http://112.29.103.165:21626"
|
||||
// baseUrl = "http://192.168.0.14:21624"
|
||||
baseUrl = "http://112.29.103.165:21626"
|
||||
// baseUrl = "http://172.20.10.3:8080"
|
||||
// baseUrl = "http://10.40.92.8:8080"
|
||||
// baseUrl = "http://10.40.92.52:28080"
|
||||
// baseUrl = "http://10.40.92.78:28080"
|
||||
// baseUrl = "http://10.40.92.60:38080"
|
||||
// baseUrl = "https://z.csgmall.com.cn/gl"
|
||||
// baseUrl = "http://10.40.92.141:28080"
|
||||
// #endif
|
||||
|
|
|
|||
|
|
@ -459,6 +459,14 @@
|
|||
}
|
||||
|
||||
}
|
||||
,{
|
||||
"path" : "pages/preCrashExam/preCrashExam",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText": "预报废审核"
|
||||
}
|
||||
|
||||
}
|
||||
],
|
||||
"tabBar": {
|
||||
"color": "#2c2c2c",
|
||||
|
|
|
|||
|
|
@ -135,7 +135,13 @@
|
|||
<uni-forms-item name="remark" label="备注" label-width="150">
|
||||
<uni-easyinput v-model="exitFormData.remark" placeholder="请输入"></uni-easyinput>
|
||||
</uni-forms-item>
|
||||
<button class="submit-btn" @click="formSubmit">确认</button>
|
||||
<button
|
||||
class="submit-btn"
|
||||
@click="formSubmit"
|
||||
:disabled="btnDisabled"
|
||||
>
|
||||
确认
|
||||
</button>
|
||||
</uni-forms>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -225,7 +231,8 @@ import { basePath } from '../../public'
|
|||
},
|
||||
fetchedList: [],
|
||||
ableRoleArr: ['admin', 'em04', 'me02', 'dm03'],
|
||||
showLoading: false
|
||||
showLoading: false,
|
||||
btnDisabled: false
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
|
@ -262,6 +269,7 @@ import { basePath } from '../../public'
|
|||
formSubmit () {
|
||||
let that = this
|
||||
that.showLoading = true
|
||||
that.btnDisabled = true
|
||||
that.$refs.exitForm.validate().then(formData => {
|
||||
that.$refs.popup.close()
|
||||
// 判断单位id和工程id是否匹配
|
||||
|
|
@ -294,6 +302,7 @@ import { basePath } from '../../public'
|
|||
}
|
||||
})
|
||||
} else {
|
||||
that.btnDisabled = false
|
||||
that.showLoading = false
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
|
|
@ -304,11 +313,22 @@ import { basePath } from '../../public'
|
|||
console.log(err);
|
||||
})
|
||||
}
|
||||
} else {
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: res.data.msg,
|
||||
success: () => {
|
||||
that.btnDisabled = false
|
||||
}
|
||||
})
|
||||
}
|
||||
}).catch(err => {
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: '单位与工程不匹配！'
|
||||
title: '单位与工程不匹配！',
|
||||
success: () => {
|
||||
that.btnDisabled = false
|
||||
}
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@
|
|||
subList: [],
|
||||
itemList: [],
|
||||
badgeNum: '',
|
||||
photoUrl: 'http://112.29.103.165:21624/dev-api/system',
|
||||
photoUrl: ''
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
|
@ -175,11 +175,13 @@
|
|||
},
|
||||
onShow() {
|
||||
let that = this
|
||||
if (uni.getStorageSync('goodList').length == 0 || !uni.getStorageSync('goodList')) {
|
||||
that.photoUrl = that.$api.url
|
||||
console.log(that.photoUrl);
|
||||
/* if (uni.getStorageSync('goodList').length == 0 || !uni.getStorageSync('goodList')) {
|
||||
uni.setStorageSync('goodList', [])
|
||||
}
|
||||
console.log(uni.getStorageSync('goodList'));
|
||||
|
||||
*/
|
||||
this.selectType(1, 0, 0)
|
||||
that.switchStatus = 0
|
||||
that.lowerStatus = 0
|
||||
|
|
|
|||
|
|
@ -231,6 +231,13 @@ export default {
|
|||
}
|
||||
}).catch(err => {
|
||||
console.log(err);
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: '网络异常，请稍后再试！',
|
||||
success: () => {
|
||||
that.showLoading = false
|
||||
}
|
||||
})
|
||||
})
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,7 +72,13 @@
|
|||
filterable
|
||||
></zxz-uni-data-select>
|
||||
</uni-forms-item>
|
||||
<button class="submit-btn" @click="formSubmit">保存</button>
|
||||
<button
|
||||
class="submit-btn"
|
||||
@click="formSubmit"
|
||||
:disabled="btnDisabled"
|
||||
>
|
||||
保存
|
||||
</button>
|
||||
</uni-forms>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -122,6 +128,7 @@ import { basePath } from '../../public';
|
|||
]
|
||||
}
|
||||
},
|
||||
btnDisabled: false,
|
||||
ableUseArr: ['admin', 'em04', 'me02', 'dm03']
|
||||
}
|
||||
},
|
||||
|
|
@ -268,6 +275,7 @@ import { basePath } from '../../public';
|
|||
let that = this
|
||||
let nowRole = uni.getStorageSync('roles')
|
||||
let found = false
|
||||
that.btnDisabled = true
|
||||
for (let role of nowRole) {
|
||||
console.log(role);
|
||||
if (that.ableUseArr.includes(role)) {
|
||||
|
|
@ -280,7 +288,10 @@ import { basePath } from '../../public';
|
|||
if (!found) {
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: '当前角色没有操作权限！'
|
||||
title: '当前角色没有操作权限！',
|
||||
success: () => {
|
||||
that.btnDisabled = false
|
||||
}
|
||||
})
|
||||
} else {
|
||||
// console.log(1);
|
||||
|
|
@ -324,7 +335,7 @@ import { basePath } from '../../public';
|
|||
}
|
||||
console.log('that.sendData =================== ',that.sendData);
|
||||
// 提交预约商品
|
||||
/* that.$api.fetchMaterial.subCart(that.sendData).then(res => {
|
||||
that.$api.fetchMaterial.subCart(that.sendData).then(res => {
|
||||
console.log(res);
|
||||
if (res.data.code == 200) {
|
||||
uni.showToast({
|
||||
|
|
@ -339,17 +350,23 @@ import { basePath } from '../../public';
|
|||
} else {
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title:res.data.msg
|
||||
title: res.data.msg,
|
||||
success: () => {
|
||||
that.btnDisabled = false
|
||||
}
|
||||
})
|
||||
}
|
||||
}).catch(err => {
|
||||
console.log(err);
|
||||
}) */
|
||||
})
|
||||
that.$refs.popup.close()
|
||||
} else {
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: '无法同时领用机具设备和调试设备！'
|
||||
title: '无法同时领用机具设备和调试设备！',
|
||||
success: () => {
|
||||
that.btnDisabled = false
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -0,0 +1,119 @@
|
|||
<template>
|
||||
<view>
|
||||
<view
|
||||
class="single-fetch"
|
||||
v-for="(fetch, index) in fetchMaterialList"
|
||||
:key="index"
|
||||
>
|
||||
<view class="fetch-upper">
|
||||
<checkbox-group
|
||||
v-show="fetch.taskStatus == 58"
|
||||
style="margin-right: 15rpx;"
|
||||
@change="checkClick(fetch)"
|
||||
>
|
||||
<checkbox :checked="fetch.checked" />
|
||||
</checkbox-group>
|
||||
<view class="upper-lef">
|
||||
{{ fetch.createBy == null ? '' : fetch.createBy.slice(0, 1) }}
|
||||
</view>
|
||||
<view class="upper-rig">
|
||||
<h4 style="font-size: 16px;">{{ fetch.createBy }}</h4>
|
||||
<h4 style="color: #989898;">{{ fetch.unitName }}</h4>
|
||||
</view>
|
||||
</view>
|
||||
<view class="fetch-lower">
|
||||
<view>
|
||||
<span>预报废单号</span>
|
||||
<h4>{{ fetch.scrapNum }}</h4>
|
||||
</view>
|
||||
<view>
|
||||
<span>报废来源</span>
|
||||
<h4>{{ fetch.projectName }}</h4>
|
||||
</view>
|
||||
<view>
|
||||
<span>设备类型</span>
|
||||
<h4>{{ fetch.itemType }}</h4>
|
||||
</view>
|
||||
<view>
|
||||
<span>申请时间</span>
|
||||
<h4>{{ fetch.createTime }}</h4>
|
||||
</view>
|
||||
</view>
|
||||
<view class="fetch-btns">
|
||||
<view
|
||||
style="background-color: #3788FF;"
|
||||
@click="seeDetail(fetch.taskId, fetch.taskStatus, 0)"
|
||||
>
|
||||
<uni-icons style="color: #fff;" type="eye"></uni-icons>
|
||||
查看
|
||||
</view>
|
||||
<view
|
||||
style="background-color: #FCA30D;"
|
||||
v-show="fetch.taskStatus == 58"
|
||||
@click="seeDetail(fetch.taskId, fetch.taskStatus, 1)"
|
||||
>
|
||||
<uni-icons style="color: #fff;" type="auth"></uni-icons>
|
||||
审核
|
||||
</view>
|
||||
</view>
|
||||
<view class="sticky-area">
|
||||
<image src="/static/passed.png" v-show="fetch.taskStatus == 59" mode=""></image>
|
||||
<image src="/static/noPass.png" v-show="fetch.taskStatus == 61" mode=""></image>
|
||||
<image src="/static/noExam.png" v-show="fetch.taskStatus == 58" mode=""></image>
|
||||
</view>
|
||||
</view>
|
||||
<view class="btm-sticky">
|
||||
<view class="checked">
|
||||
<checkbox-group @tap="checkAll" style="margin-right: 15rpx;">
|
||||
<checkbox :checked="allChecked" />
|
||||
</checkbox-group>
|
||||
<text>全选</text>
|
||||
</view>
|
||||
<view
|
||||
class="exam"
|
||||
@click="toggleExam"
|
||||
>
|
||||
审核
|
||||
</view>
|
||||
</view>
|
||||
<uni-popup
|
||||
ref="popup"
|
||||
type="center"
|
||||
:mask-click="false"
|
||||
>
|
||||
<view class="popup">
|
||||
<view class="pop-top">
|
||||
<h4>审批</h4>
|
||||
<uni-icons
|
||||
style="color: #AAAAAA; font-weight: bold;"
|
||||
type="closeempty"
|
||||
@click="closePopup"
|
||||
>
|
||||
</uni-icons>
|
||||
</view>
|
||||
<h4 style="width: 85%; margin: 2vh auto; font-weight: normal; text-align: center;">是否通过审批？</h4>
|
||||
<view class="select-area">
|
||||
<view @click="modalConfirm">通过</view>
|
||||
<view @click="modalReject">驳回</view>
|
||||
</view>
|
||||
</view>
|
||||
</uni-popup>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
|
||||
</style>
|
||||
|
|
@ -102,6 +102,11 @@
|
|||
pic: '/static/fix.png',
|
||||
url: 'fix'
|
||||
},
|
||||
{
|
||||
name: '预报废审核',
|
||||
pic: '/static/preCrashExam.png',
|
||||
url: 'preCrashExam'
|
||||
},
|
||||
{
|
||||
name: '报废审核',
|
||||
pic: '/static/crashExam.png',
|
||||
|
|
|
|||
|
|
@ -419,6 +419,13 @@ const router = createRouter({
|
|||
"meta": {
|
||||
"needAuth": "true"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "/pages/preCrashExam/preCrashExam",
|
||||
"name": 'preCrashExam',
|
||||
"meta": {
|
||||
"needAuth": "true"
|
||||
}
|
||||
}
|
||||
]
|
||||
})
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
Loading…
Reference in New Issue