4.20测试问题修改
This commit is contained in:
parent
6ab5a35df5
commit
67a1f0b3d9
|
|
@ -3,12 +3,12 @@ class HttpConfig {
|
||||||
baseUrl = "/api"
|
baseUrl = "/api"
|
||||||
// #endif
|
// #endif
|
||||||
// #ifdef APP-PLUS
|
// #ifdef APP-PLUS
|
||||||
baseUrl = "http://112.29.103.165:21624"
|
// baseUrl = "http://112.29.103.165:21624"
|
||||||
// baseUrl = "http://192.168.0.14:21624"
|
// baseUrl = "http://192.168.0.14:21624"
|
||||||
// baseUrl = "http://112.29.103.165:21626"
|
// baseUrl = "http://112.29.103.165:21626"
|
||||||
// baseUrl = "http://172.20.10.3:8080"
|
// baseUrl = "http://172.20.10.3:8080"
|
||||||
// baseUrl = "http://10.40.92.13:8080"
|
// baseUrl = "http://10.40.92.13:8080"
|
||||||
// baseUrl = "http://10.40.92.75:8080"
|
baseUrl = "http://10.40.92.52:28080"
|
||||||
// baseUrl = "http://10.40.92.8:8080"
|
// baseUrl = "http://10.40.92.8:8080"
|
||||||
// baseUrl = "https://z.csgmall.com.cn/gl"
|
// baseUrl = "https://z.csgmall.com.cn/gl"
|
||||||
// #endif
|
// #endif
|
||||||
|
|
|
||||||
|
|
@ -340,7 +340,7 @@
|
||||||
"path" : "pages/moreNotice/moreNotice",
|
"path" : "pages/moreNotice/moreNotice",
|
||||||
"style" :
|
"style" :
|
||||||
{
|
{
|
||||||
"navigationBarTitleText": "更多公告"
|
"navigationBarTitleText": "通知公告"
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -136,7 +136,7 @@
|
||||||
}
|
}
|
||||||
if (this.infoList.manageType == '0') {
|
if (this.infoList.manageType == '0') {
|
||||||
this.$refs.popup1.open()
|
this.$refs.popup1.open()
|
||||||
} else if (this.infoList.manageType == '1') {
|
} else {
|
||||||
const userInfo = uni.getStorageSync('userInfo');
|
const userInfo = uni.getStorageSync('userInfo');
|
||||||
console.log("userInfo", userInfo)
|
console.log("userInfo", userInfo)
|
||||||
const userId = userInfo.userid
|
const userId = userInfo.userid
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
v-show="infoList.length != 0"
|
v-show="infoList.length != 0"
|
||||||
>
|
>
|
||||||
<view>
|
<view>
|
||||||
<h4>物品名称</h4>
|
<h4>机具分类</h4>
|
||||||
<span>{{ item.itemType }}</span>
|
<span>{{ item.itemType }}</span>
|
||||||
</view>
|
</view>
|
||||||
<view>
|
<view>
|
||||||
|
|
@ -154,6 +154,7 @@
|
||||||
width: 100%;
|
width: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
border-bottom: 1px solid #d7d7d7;
|
||||||
view{
|
view{
|
||||||
margin-bottom: 25rpx;
|
margin-bottom: 25rpx;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
@ -169,6 +170,9 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.info-area:last-child{
|
||||||
|
border-bottom: none;
|
||||||
|
}
|
||||||
.sub-btn{
|
.sub-btn{
|
||||||
width: 80%;
|
width: 80%;
|
||||||
margin: 30rpx auto;
|
margin: 30rpx auto;
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,10 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="fetch-lower">
|
<view class="fetch-lower">
|
||||||
|
<view>
|
||||||
|
<span>退料单号</span>
|
||||||
|
<h4>{{ fetch.code }}</h4>
|
||||||
|
</view>
|
||||||
<view>
|
<view>
|
||||||
<span>退料申请单位</span>
|
<span>退料申请单位</span>
|
||||||
<h4>{{ fetch.unitName }}</h4>
|
<h4>{{ fetch.unitName }}</h4>
|
||||||
|
|
@ -140,7 +144,7 @@
|
||||||
</uni-icons>
|
</uni-icons>
|
||||||
</view>
|
</view>
|
||||||
<view class="select-area">
|
<view class="select-area">
|
||||||
<uni-easyinput v-model="rejectReason" placeholder="请填写驳回原因"></uni-easyinput>
|
<uni-easyinput v-model="rejectReason" maxlength="50" placeholder="请填写驳回原因"></uni-easyinput>
|
||||||
<view class="btn" @click="confirmReject">驳回</view>
|
<view class="btn" @click="confirmReject">驳回</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
|
||||||
|
|
@ -142,13 +142,13 @@ import { basePath } from '../../public';
|
||||||
finishCart () {
|
finishCart () {
|
||||||
let that = this
|
let that = this
|
||||||
that.cartList = that.list.filter((item) => {
|
that.cartList = that.list.filter((item) => {
|
||||||
return item.checked == true
|
return item.checked == true && item.offNum > 0
|
||||||
})
|
})
|
||||||
console.log(that.cartList);
|
console.log(that.cartList);
|
||||||
if (that.cartList.length == 0) {
|
if (that.cartList.length == 0) {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
icon: 'none',
|
icon: 'none',
|
||||||
title: '请选择退料项!'
|
title: '请选择退料数量大于0的退料项!'
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
uni.showModal({
|
uni.showModal({
|
||||||
|
|
@ -194,13 +194,22 @@ import { basePath } from '../../public';
|
||||||
},
|
},
|
||||||
exitNumChange (e, index) {
|
exitNumChange (e, index) {
|
||||||
let that = this
|
let that = this
|
||||||
console.log(e, index);
|
let numTest = /^\+?[1-9]\d*$/
|
||||||
if (e.includes('.') || e.includes('-')) {
|
console.log(e, that.list[index].num);
|
||||||
|
if (!numTest.test(e)) {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
icon: 'none',
|
icon: 'none',
|
||||||
title: '退料数量输入有误!',
|
title: '退料数量输入有误!',
|
||||||
success: () => {
|
success: () => {
|
||||||
that.list[index].offNum = 1
|
that.list[index].offNum = 0
|
||||||
|
}
|
||||||
|
})
|
||||||
|
} else if (e > that.list[index].num) {
|
||||||
|
uni.showToast({
|
||||||
|
icon: 'none',
|
||||||
|
title: '退料数量不得大于当前在用量!',
|
||||||
|
success: () => {
|
||||||
|
that.list[index].offNum = 0
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
@ -225,7 +234,7 @@ import { basePath } from '../../public';
|
||||||
} else {
|
} else {
|
||||||
for (let i = 0; i < res.data.data.length; i++) {
|
for (let i = 0; i < res.data.data.length; i++) {
|
||||||
res.data.data[i].num = Number(res.data.data[i].num.split('.')[0])
|
res.data.data[i].num = Number(res.data.data[i].num.split('.')[0])
|
||||||
res.data.data[i].offNum = 1
|
res.data.data[i].offNum = 0
|
||||||
}
|
}
|
||||||
console.log(res);
|
console.log(res);
|
||||||
that.list = res.data.data
|
that.list = res.data.data
|
||||||
|
|
|
||||||
|
|
@ -217,7 +217,7 @@
|
||||||
</uni-icons>
|
</uni-icons>
|
||||||
</view>
|
</view>
|
||||||
<view class="select-area">
|
<view class="select-area">
|
||||||
<uni-easyinput v-model="rejectReason" placeholder="请填写驳回原因"></uni-easyinput>
|
<uni-easyinput v-model="rejectReason" maxlength="50" placeholder="请填写驳回原因"></uni-easyinput>
|
||||||
<view class="btn" @click="confirmReject">驳回</view>
|
<view class="btn" @click="confirmReject">驳回</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,12 @@
|
||||||
<template>
|
<template>
|
||||||
<view>
|
<view>
|
||||||
|
<uni-easyinput
|
||||||
|
class="keyword-ipt"
|
||||||
|
suffixIcon="search"
|
||||||
|
v-model="keywordVal"
|
||||||
|
placeholder="右侧图标"
|
||||||
|
@iconClick="searchKeyword"
|
||||||
|
></uni-easyinput>
|
||||||
<view
|
<view
|
||||||
class="single-fetch"
|
class="single-fetch"
|
||||||
v-for="(fetch, index) in fetchMaterialList"
|
v-for="(fetch, index) in fetchMaterialList"
|
||||||
|
|
@ -133,6 +140,7 @@ import { basePath } from '../../public'
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
keywordVal: '',
|
||||||
showLoading: false,
|
showLoading: false,
|
||||||
allChecked: false,
|
allChecked: false,
|
||||||
fetchMaterialList: [
|
fetchMaterialList: [
|
||||||
|
|
@ -206,11 +214,12 @@ import { basePath } from '../../public'
|
||||||
that.$refs.popup.close()
|
that.$refs.popup.close()
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
initFetch () {
|
initFetch (code) {
|
||||||
let that = this
|
let that = this
|
||||||
that.showLoading = true
|
that.showLoading = true
|
||||||
// 获取领料出库数据
|
// 获取领料出库数据
|
||||||
that.$api.fetchExam.fetchExamList({
|
that.$api.fetchExam.fetchExamList({
|
||||||
|
code,
|
||||||
role: uni.getStorageSync('roles').join(','),
|
role: uni.getStorageSync('roles').join(','),
|
||||||
flag: 0
|
flag: 0
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
|
|
@ -236,12 +245,15 @@ import { basePath } from '../../public'
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
console.log(err);
|
console.log(err);
|
||||||
})
|
})
|
||||||
|
},
|
||||||
|
searchKeyword () {
|
||||||
|
this.initFetch(this.keywordVal)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onShow() {
|
onShow() {
|
||||||
let that = this
|
let that = this
|
||||||
console.log(uni.getStorageSync('roles').join(','));
|
console.log(uni.getStorageSync('roles').join(','));
|
||||||
that.initFetch()
|
that.initFetch('')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
@ -252,6 +264,10 @@ import { basePath } from '../../public'
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding-bottom: 10vh;
|
padding-bottom: 10vh;
|
||||||
}
|
}
|
||||||
|
.keyword-ipt{
|
||||||
|
width: 95%;
|
||||||
|
margin: 20rpx auto;
|
||||||
|
}
|
||||||
.single-fetch{
|
.single-fetch{
|
||||||
width: 95%;
|
width: 95%;
|
||||||
margin: 20rpx auto;
|
margin: 20rpx auto;
|
||||||
|
|
|
||||||
|
|
@ -150,7 +150,7 @@
|
||||||
} else {
|
} else {
|
||||||
this.$refs.popup1.open()
|
this.$refs.popup1.open()
|
||||||
}
|
}
|
||||||
} else if (this.infoList.manageType == 1) {
|
} else {
|
||||||
if (this.infoList.outNum == 0) {
|
if (this.infoList.outNum == 0) {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
icon: 'none',
|
icon: 'none',
|
||||||
|
|
|
||||||
|
|
@ -67,22 +67,32 @@
|
||||||
>
|
>
|
||||||
<view class="popup">
|
<view class="popup">
|
||||||
<view class="pop-top">
|
<view class="pop-top">
|
||||||
<h4>入库</h4>
|
<h4>审批</h4>
|
||||||
<uni-icons
|
<uni-icons
|
||||||
style="color: #AAAAAA; font-weight: bold;"
|
style="color: #AAAAAA; font-weight: bold;"
|
||||||
type="closeempty"
|
type="closeempty"
|
||||||
size="32"
|
|
||||||
@click="closePopup"
|
@click="closePopup"
|
||||||
>
|
>
|
||||||
</uni-icons>
|
</uni-icons>
|
||||||
</view>
|
</view>
|
||||||
<h5 style="width: 85%; margin: 2vh auto; font-weight: normal; text-align: center;">请选择入库方式</h5>
|
<h4 style="width: 85%; margin: 2vh auto; font-weight: normal; text-align: center;">是否通过审批?</h4>
|
||||||
<view class="select-area">
|
<view class="select-area">
|
||||||
<uni-data-checkbox
|
<view @click="modalConfirm">通过</view>
|
||||||
v-model="scanType"
|
<view @click="modalReject">驳回</view>
|
||||||
:localdata="scanRange"
|
<!-- <uni-forms ref="examForm" :modelValue="examFormData" :rules="rules" label-position="top">
|
||||||
@change="scanChange"
|
<uni-forms-item name="ifPass" required label="是否通过" label-width="150">
|
||||||
></uni-data-checkbox>
|
<uni-data-select
|
||||||
|
v-model="examFormData.ifPass"
|
||||||
|
:localdata="ifPassRange"
|
||||||
|
:clear="false"
|
||||||
|
@change="ifPassChange"
|
||||||
|
></uni-data-select>
|
||||||
|
</uni-forms-item>
|
||||||
|
<uni-forms-item required v-show="examFormData.ifPass == '1'" name="noPassReason" label="不通过原因" label-width="150">
|
||||||
|
<uni-easyinput type="textarea" v-model="examFormData.noPassReason" placeholder="请输入内容"></uni-easyinput>
|
||||||
|
</uni-forms-item>
|
||||||
|
<button class="submit-btn" @click="formSubmit">确认</button>
|
||||||
|
</uni-forms> -->
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</uni-popup>
|
</uni-popup>
|
||||||
|
|
@ -145,6 +155,24 @@
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
modalConfirm () {
|
||||||
|
this.subObj = {
|
||||||
|
taskId: this.taskId,
|
||||||
|
checkResult: '1',
|
||||||
|
inputRecordList: this.totalGoods
|
||||||
|
}
|
||||||
|
console.log(this.subObj)
|
||||||
|
this.subNewBuy(this.subObj)
|
||||||
|
},
|
||||||
|
modalReject () {
|
||||||
|
this.subObj = {
|
||||||
|
taskId: this.taskId,
|
||||||
|
checkResult: '2',
|
||||||
|
inputRecordList: this.totalGoods
|
||||||
|
}
|
||||||
|
console.log(this.subObj)
|
||||||
|
this.subNewBuy(this.subObj)
|
||||||
|
},
|
||||||
finishCart () {
|
finishCart () {
|
||||||
let that = this
|
let that = this
|
||||||
that.totalGoods = that.list.filter((item) => {
|
that.totalGoods = that.list.filter((item) => {
|
||||||
|
|
@ -164,7 +192,8 @@
|
||||||
title: '未选中审核项!'
|
title: '未选中审核项!'
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
uni.showModal({
|
that.openPopup()
|
||||||
|
/* uni.showModal({
|
||||||
title: '新购明细审核',
|
title: '新购明细审核',
|
||||||
content: '是否确定审核通过?',
|
content: '是否确定审核通过?',
|
||||||
confirmText: '通过',
|
confirmText: '通过',
|
||||||
|
|
@ -179,17 +208,18 @@
|
||||||
}
|
}
|
||||||
console.log(that.subObj);
|
console.log(that.subObj);
|
||||||
that.subNewBuy(that.subObj)
|
that.subNewBuy(that.subObj)
|
||||||
} /* else if (res.cancel) {
|
} else if (res.cancel) {
|
||||||
// 驳回
|
// 驳回
|
||||||
that.subObj = {
|
that.subObj = {
|
||||||
taskId: that.taskId,
|
taskId: that.taskId,
|
||||||
checkResult: '2',
|
checkResult: '2',
|
||||||
inputRecordList: that.totalGoods
|
inputRecordList: that.totalGoods
|
||||||
}
|
}
|
||||||
that.subNewBuy(that.subObj)
|
console.log(that.subObj);
|
||||||
} */
|
// that.subNewBuy(that.subObj)
|
||||||
}
|
}
|
||||||
})
|
}
|
||||||
|
}) */
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
bindCode () {
|
bindCode () {
|
||||||
|
|
@ -239,6 +269,7 @@
|
||||||
icon: 'none',
|
icon: 'none',
|
||||||
title: res.data.msg,
|
title: res.data.msg,
|
||||||
success: () => {
|
success: () => {
|
||||||
|
that.closePopup()
|
||||||
uni.navigateBack()
|
uni.navigateBack()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
@ -495,8 +526,18 @@
|
||||||
.popup>.select-area{
|
.popup>.select-area{
|
||||||
width: 85%;
|
width: 85%;
|
||||||
margin: 40rpx auto;
|
margin: 40rpx auto;
|
||||||
.uni-data-checklist .checklist-group[data-v-84d5d996]{
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: space-around;
|
||||||
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.popup>.select-area>view{
|
||||||
|
box-sizing: border-box;
|
||||||
|
font-size: 30rpx;
|
||||||
|
padding: 12rpx 24rpx;
|
||||||
|
background-color: #3788FF;
|
||||||
|
color: #fff;
|
||||||
|
border-radius: 20rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
@ -26,6 +26,7 @@
|
||||||
</uni-forms-item>
|
</uni-forms-item>
|
||||||
<view class="bind" @click="toggleBind">绑定</view>
|
<view class="bind" @click="toggleBind">绑定</view>
|
||||||
</uni-forms>
|
</uni-forms>
|
||||||
|
<u-loading-page :loading="showLoading" color="#000" loading-text="加载中,请稍后..."></u-loading-page>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
@ -33,6 +34,7 @@
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
showLoading: false,
|
||||||
qrFormData: {
|
qrFormData: {
|
||||||
typeVal: '',
|
typeVal: '',
|
||||||
specVal: '',
|
specVal: '',
|
||||||
|
|
@ -102,19 +104,22 @@
|
||||||
return item.value == e
|
return item.value == e
|
||||||
})
|
})
|
||||||
console.log(confirmedRange);
|
console.log(confirmedRange);
|
||||||
that.qrFormData.deviceCode = 'NS' + confirmedRange[0].code + confirmedRange[0].modelCode
|
that.qrFormData.deviceCode = `NS${confirmedRange[0].code}${confirmedRange[0].modelCode}`
|
||||||
},
|
},
|
||||||
toggleBind () {
|
toggleBind () {
|
||||||
let that = this
|
let that = this
|
||||||
|
that.showLoading = true
|
||||||
that.$refs.qrForm.validate().then(formData => {
|
that.$refs.qrForm.validate().then(formData => {
|
||||||
console.log(formData);
|
console.log(formData);
|
||||||
that.$api.qrcodeBinding.bindQrcode({
|
that.$api.qrcodeBinding.bindQrcode({
|
||||||
typeId: formData.specVal,
|
typeId: formData.specVal,
|
||||||
maCode: formData.deviceCode,
|
maCode: formData.deviceCode,
|
||||||
qrCode: that.qrcode
|
qrCode: that.qrcode,
|
||||||
|
maStatus: 15
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
console.log(res);
|
console.log(res);
|
||||||
if (res.data.code == 200) {
|
if (res.data.code == 200) {
|
||||||
|
that.showLoading = false
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
icon: 'none',
|
icon: 'none',
|
||||||
title: res.data.msg,
|
title: res.data.msg,
|
||||||
|
|
@ -123,6 +128,7 @@
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
|
that.showLoading = false
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
icon: 'none',
|
icon: 'none',
|
||||||
title: res.data.msg
|
title: res.data.msg
|
||||||
|
|
|
||||||
|
|
@ -58,6 +58,42 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</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>
|
||||||
|
<!-- <uni-forms ref="examForm" :modelValue="examFormData" :rules="rules" label-position="top">
|
||||||
|
<uni-forms-item name="ifPass" required label="是否通过" label-width="150">
|
||||||
|
<uni-data-select
|
||||||
|
v-model="examFormData.ifPass"
|
||||||
|
:localdata="ifPassRange"
|
||||||
|
:clear="false"
|
||||||
|
@change="ifPassChange"
|
||||||
|
></uni-data-select>
|
||||||
|
</uni-forms-item>
|
||||||
|
<uni-forms-item required v-show="examFormData.ifPass == '1'" name="noPassReason" label="不通过原因" label-width="150">
|
||||||
|
<uni-easyinput type="textarea" v-model="examFormData.noPassReason" placeholder="请输入内容"></uni-easyinput>
|
||||||
|
</uni-forms-item>
|
||||||
|
<button class="submit-btn" @click="formSubmit">确认</button>
|
||||||
|
</uni-forms> -->
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</uni-popup>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
@ -125,11 +161,12 @@
|
||||||
title: '未选中审核项!'
|
title: '未选中审核项!'
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
uni.showModal({
|
that.openPopup()
|
||||||
|
/* uni.showModal({
|
||||||
title: '确认审核',
|
title: '确认审核',
|
||||||
content: '是否通过审核?',
|
content: '是否通过审核?',
|
||||||
confirmText: '通过',
|
confirmText: '通过',
|
||||||
// cancelText: '驳回',
|
cancelText: '驳回',
|
||||||
success: (res) => {
|
success: (res) => {
|
||||||
if (res.confirm) {
|
if (res.confirm) {
|
||||||
that.inStoreList.forEach((item) => {
|
that.inStoreList.forEach((item) => {
|
||||||
|
|
@ -137,15 +174,15 @@
|
||||||
})
|
})
|
||||||
console.log(that.inStoreList);
|
console.log(that.inStoreList);
|
||||||
that.subInStore(that.inStoreList)
|
that.subInStore(that.inStoreList)
|
||||||
}/* else if (res.cancel) {
|
} else if (res.cancel) {
|
||||||
that.inStoreList.forEach((item) => {
|
that.inStoreList.forEach((item) => {
|
||||||
item.checkType = 2
|
item.checkType = 2
|
||||||
})
|
})
|
||||||
console.log(that.inStoreList);
|
console.log(that.inStoreList);
|
||||||
that.subInStore(that.inStoreList)
|
that.subInStore(that.inStoreList)
|
||||||
} */
|
|
||||||
}
|
}
|
||||||
})
|
}
|
||||||
|
}) */
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
subInStore (obj) {
|
subInStore (obj) {
|
||||||
|
|
@ -160,6 +197,7 @@
|
||||||
icon: 'none',
|
icon: 'none',
|
||||||
title: res.data.msg,
|
title: res.data.msg,
|
||||||
success: () => {
|
success: () => {
|
||||||
|
that.closePopup()
|
||||||
/* uni.redirectTo({
|
/* uni.redirectTo({
|
||||||
url: '/pages/repairTestInStore/repairTestInStore'
|
url: '/pages/repairTestInStore/repairTestInStore'
|
||||||
}) */
|
}) */
|
||||||
|
|
@ -173,6 +211,26 @@
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
},
|
||||||
|
openPopup () {
|
||||||
|
this.$refs.popup.open()
|
||||||
|
},
|
||||||
|
closePopup () {
|
||||||
|
this.$refs.popup.close()
|
||||||
|
},
|
||||||
|
modalConfirm () {
|
||||||
|
this.inStoreList.forEach(item => {
|
||||||
|
item.checkType = 1
|
||||||
|
})
|
||||||
|
console.log(this.inStoreList);
|
||||||
|
this.subInStore(this.inStoreList)
|
||||||
|
},
|
||||||
|
modalReject () {
|
||||||
|
this.inStoreList.forEach(item => {
|
||||||
|
item.checkType = 2
|
||||||
|
})
|
||||||
|
console.log(this.inStoreList);
|
||||||
|
this.subInStore(this.inStoreList)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onLoad(params) {
|
onLoad(params) {
|
||||||
|
|
@ -195,7 +253,7 @@
|
||||||
console.log(that.fetchList);
|
console.log(that.fetchList);
|
||||||
}
|
}
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
|
console.log(err);
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -308,4 +366,41 @@
|
||||||
width: 150rpx;
|
width: 150rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.popup{
|
||||||
|
width: 80vw;
|
||||||
|
height: 20vh;
|
||||||
|
background-color: #fff;
|
||||||
|
border-radius: 15rpx;
|
||||||
|
overflow: hidden;
|
||||||
|
background: linear-gradient(#D9E7FE, #fff, #fff, #fff);
|
||||||
|
}
|
||||||
|
|
||||||
|
.popup>.pop-top{
|
||||||
|
width: 100%;
|
||||||
|
height: 5vh;
|
||||||
|
box-sizing: border-box;
|
||||||
|
padding: 0 25rpx;
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.popup>.select-area{
|
||||||
|
width: 85%;
|
||||||
|
margin: 40rpx auto;
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-around;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.popup>.select-area>view{
|
||||||
|
box-sizing: border-box;
|
||||||
|
font-size: 30rpx;
|
||||||
|
padding: 12rpx 24rpx;
|
||||||
|
background-color: #3788FF;
|
||||||
|
color: #fff;
|
||||||
|
border-radius: 20rpx;
|
||||||
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -73,6 +73,7 @@
|
||||||
maId: that.infoList[0].maId,
|
maId: that.infoList[0].maId,
|
||||||
carCode: that.carCode,
|
carCode: that.carCode,
|
||||||
outNum: 1,
|
outNum: 1,
|
||||||
|
manageType: 0,
|
||||||
companyId: uni.getStorageSync('userInfo').sysUser.companyId
|
companyId: uni.getStorageSync('userInfo').sysUser.companyId
|
||||||
}
|
}
|
||||||
console.log(that.subList);
|
console.log(that.subList);
|
||||||
|
|
|
||||||
|
|
@ -67,6 +67,42 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</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>
|
||||||
|
<!-- <uni-forms ref="examForm" :modelValue="examFormData" :rules="rules" label-position="top">
|
||||||
|
<uni-forms-item name="ifPass" required label="是否通过" label-width="150">
|
||||||
|
<uni-data-select
|
||||||
|
v-model="examFormData.ifPass"
|
||||||
|
:localdata="ifPassRange"
|
||||||
|
:clear="false"
|
||||||
|
@change="ifPassChange"
|
||||||
|
></uni-data-select>
|
||||||
|
</uni-forms-item>
|
||||||
|
<uni-forms-item required v-show="examFormData.ifPass == '1'" name="noPassReason" label="不通过原因" label-width="150">
|
||||||
|
<uni-easyinput type="textarea" v-model="examFormData.noPassReason" placeholder="请输入内容"></uni-easyinput>
|
||||||
|
</uni-forms-item>
|
||||||
|
<button class="submit-btn" @click="formSubmit">确认</button>
|
||||||
|
</uni-forms> -->
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</uni-popup>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
@ -140,7 +176,8 @@
|
||||||
title: '未选中审核项!'
|
title: '未选中审核项!'
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
uni.showModal({
|
that.openPopup()
|
||||||
|
/* uni.showModal({
|
||||||
title: '确认审核',
|
title: '确认审核',
|
||||||
content: '是否通过审核?',
|
content: '是否通过审核?',
|
||||||
confirmText: '通过',
|
confirmText: '通过',
|
||||||
|
|
@ -156,15 +193,15 @@
|
||||||
}
|
}
|
||||||
console.log(that.subObj);
|
console.log(that.subObj);
|
||||||
that.subInStore(that.subObj)
|
that.subInStore(that.subObj)
|
||||||
}/* else if (res.cancel) {
|
} else if (res.cancel) {
|
||||||
that.inStoreList.forEach((item) => {
|
that.inStoreList.forEach((item) => {
|
||||||
item.checkType = 2
|
item.checkType = 2
|
||||||
})
|
})
|
||||||
console.log(that.inStoreList);
|
console.log(that.inStoreList);
|
||||||
that.subInStore(that.inStoreList)
|
that.subInStore(that.inStoreList)
|
||||||
} */
|
|
||||||
}
|
}
|
||||||
})
|
}
|
||||||
|
}) */
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
subInStore (obj) {
|
subInStore (obj) {
|
||||||
|
|
@ -177,9 +214,7 @@
|
||||||
icon: 'none',
|
icon: 'none',
|
||||||
title: res.data.msg,
|
title: res.data.msg,
|
||||||
success: () => {
|
success: () => {
|
||||||
/* uni.redirectTo({
|
that.closePopup()
|
||||||
url: '/pages/repairTestInStore/repairTestInStore'
|
|
||||||
}) */
|
|
||||||
uni.navigateBack()
|
uni.navigateBack()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
@ -190,6 +225,34 @@
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
},
|
||||||
|
openPopup () {
|
||||||
|
this.$refs.popup.open()
|
||||||
|
},
|
||||||
|
closePopup () {
|
||||||
|
this.$refs.popup.close()
|
||||||
|
},
|
||||||
|
modalConfirm () {
|
||||||
|
let that = this
|
||||||
|
that.taskIdList.push(that.taskId)
|
||||||
|
that.subObj = {
|
||||||
|
checkResult: '通过',
|
||||||
|
taskIdList: that.taskIdList,
|
||||||
|
auditDetailList: that.auditDetailList
|
||||||
|
}
|
||||||
|
console.log(that.subObj);
|
||||||
|
that.subInStore(that.subObj)
|
||||||
|
},
|
||||||
|
modalReject () {
|
||||||
|
let that = this
|
||||||
|
that.taskIdList.push(that.taskId)
|
||||||
|
that.subObj = {
|
||||||
|
checkResult: '驳回',
|
||||||
|
taskIdList: that.taskIdList,
|
||||||
|
auditDetailList: that.auditDetailList
|
||||||
|
}
|
||||||
|
console.log(that.subObj);
|
||||||
|
that.subInStore(that.subObj)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onLoad(params) {
|
onLoad(params) {
|
||||||
|
|
@ -341,4 +404,41 @@
|
||||||
width: 150rpx;
|
width: 150rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.popup{
|
||||||
|
width: 80vw;
|
||||||
|
height: 20vh;
|
||||||
|
background-color: #fff;
|
||||||
|
border-radius: 15rpx;
|
||||||
|
overflow: hidden;
|
||||||
|
background: linear-gradient(#D9E7FE, #fff, #fff, #fff);
|
||||||
|
}
|
||||||
|
|
||||||
|
.popup>.pop-top{
|
||||||
|
width: 100%;
|
||||||
|
height: 5vh;
|
||||||
|
box-sizing: border-box;
|
||||||
|
padding: 0 25rpx;
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.popup>.select-area{
|
||||||
|
width: 85%;
|
||||||
|
margin: 40rpx auto;
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-around;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.popup>.select-area>view{
|
||||||
|
box-sizing: border-box;
|
||||||
|
font-size: 30rpx;
|
||||||
|
padding: 12rpx 24rpx;
|
||||||
|
background-color: #3788FF;
|
||||||
|
color: #fff;
|
||||||
|
border-radius: 20rpx;
|
||||||
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
<template>
|
<template>
|
||||||
<view>
|
<view>
|
||||||
<view class="upper-search">
|
<view class="upper-search">
|
||||||
<h4>{{ companyName }}</h4>
|
<h3>{{ companyName }}</h3>
|
||||||
<uni-easyinput prefixIcon="search" v-model="iptVal" placeholder="搜索" @iconClick="iconClick"></uni-easyinput>
|
<!-- <uni-easyinput prefixIcon="search" v-model="iptVal" placeholder="搜索" @iconClick="iconClick"></uni-easyinput> -->
|
||||||
</view>
|
</view>
|
||||||
<h4 class="tit">业务办理</h4>
|
<h4 class="tit">业务办理</h4>
|
||||||
<view class="secs">
|
<view class="secs">
|
||||||
|
|
@ -142,9 +142,9 @@
|
||||||
}
|
}
|
||||||
.upper-search{
|
.upper-search{
|
||||||
width: 85%;
|
width: 85%;
|
||||||
margin: 5vh auto;
|
margin: 8vh auto;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
h4{
|
h3{
|
||||||
margin-bottom: 1vh;
|
margin-bottom: 1vh;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue