bonus
/
SmartStorage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

接口调试退料

This commit is contained in:
13218645326 2023-12-24 16:28:36 +08:00
parent 8b6b608201
commit 134a859363
7 changed files with 3187 additions and 871 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
apis/apiTest.js
View File

@ -280,8 +280,32 @@ const backMaterialReceive = {
header
)
},
async backMaterialQrcodeQuery (data = {} , header = {}){
return await Http.post(
HttpConfig.basePath,
HttpConfig.serviceUrl.backMaterialReceive.backMaterialQrcodeQuery,
data,
header
)
},
async backMaterialSetCodeBack (data = {} , header = {}){
return await Http.post(
HttpConfig.basePath,
HttpConfig.serviceUrl.backMaterialReceive.backMaterialSetCodeBack,
data,
header
)
},
async backReceiveCodeQuery (data = {} , header = {}){
return await Http.post(
HttpConfig.basePath,
HttpConfig.serviceUrl.backMaterialReceive.backReceiveCodeQuery,
data,
header
)
},
fetchMaterialOutStore

6
apis/http.js
View File

@ -83,8 +83,12 @@ class HttpConfig {
backMaterialReceiveList: '/backReceive/getbackReceiveList', // 获取退料接收列表
backMaterialReceiveDetail: '/backReceive/receiveView',
backMaterialSetNumBack: '/backReceive/setNumBack',
backMaterialQrcodeQuery:'backReceive/qrcodeQuery',
backMaterialSetCodeBack:'backReceive/setCodeBack',
backReceiveCodeQuery:"backReceive/codeQuery"
}
}
}
export default new HttpConfig()
export default new HttpConfig()

632
pages.json
View File

@ -5,365 +5,295 @@
"style": {
"navigationBarTitleText": "首页"
}
}
,{
"path" : "pages/user/user",
"style" :
{
"navigationBarTitleText": "个人中心"
}
}
,{
"path" : "pages/workSpace/workSpace",
"style" :
{
"navigationBarTitleText": "工作台"
}
}
,{
"path" : "pages/login/login",
"style" :
{
"navigationBarTitleText": "登录"
}
}
,{
"path" : "pages/fetchMaterial/fetchMaterial",
"style" :
{
"navigationStyle": "custom"
}
}
,{
"path" : "pages/exitMaterial/exitMaterial",
"style" :
{
"navigationBarTitleText": "退料申请",
}, {
"path": "pages/user/user",
"style": {
"navigationBarTitleText": "个人中心"
}
}, {
"path": "pages/workSpace/workSpace",
"style": {
"navigationBarTitleText": "工作台"
}
}, {
"path": "pages/login/login",
"style": {
"navigationBarTitleText": "登录"
}
}, {
"path": "pages/fetchMaterial/fetchMaterial",
"style": {
"navigationStyle": "custom"
}
}, {
"path": "pages/exitMaterial/exitMaterial",
"style": {
"navigationBarTitleText": "退料申请",
"app-plus": {
"titleNView": {
"buttons": [
"buttons": [{
"float": "right",
"text": "新增",
"fontSize": "16px",
"onclick": "Function"
}]
}
}
}
}, {
"path": "pages/workFetchMaterial/workFetchMaterial",
"style": {
"navigationBarTitleText": "工器具领料申请"
}
}, {
"path": "pages/workExitMaterial/workExitMaterial",
"style": {
"navigationBarTitleText": "工器具退料申请"
}
}, {
"path": "pages/deviceDetail/deviceDetail",
"style": {
"navigationBarTitleText": "机具详情"
}
}, {
"path": "pages/orderCart/orderCart",
"style": {
"navigationBarTitleText": "预约车",
"app-plus": {
"titleNView": {
"buttons": [{
"float": "right",
"text": "删除",
"fontSize": "16px",
"onclick": "Function"
}]
}
}
}
}, {
"path": "pages/fetchExam/fetchExam",
"style": {
"navigationBarTitleText": "领料审批"
}
}, {
"path": "pages/exitMaterialDetail/exitMaterialDetail",
"style": {
"navigationBarTitleText": "退料申请明细"
}
}, {
"path": "pages/fetchMaterialDetail/fetchMaterialDetail",
"style": {
"navigationBarTitleText": "领料明细"
}
}, {
"path": "pages/exitExam/exitExam",
"style": {
"navigationBarTitleText": "退料审批"
}
}, {
"path": "pages/newInStore/newInStore",
"style": {
"navigationBarTitleText": "新购入库"
}
}, {
"path": "pages/newBuyDetail/newBuyDetail",
"style": {
"navigationBarTitleText": "新购明细"
}
}, {
"path": "pages/newInAfterScan/newInAfterScan",
"style": {
"navigationBarTitleText": "新购机具详情"
}
}, {
"path": "pages/fix/fix",
"style": {
"navigationBarTitleText": "维修"
}
}, {
"path": "pages/fixDetail/fixDetail",
"style": {
"navigationBarTitleText": "维修明细"
}
}, {
"path": "pages/innerFix/innerFix",
"style": {
"navigationBarTitleText": "内部维修"
}
}, {
"path": "pages/returnFix/returnFix",
"style": {
"navigationBarTitleText": "返厂维修"
}
}, {
"path": "pages/waitCrash/waitCrash",
"style": {
"navigationBarTitleText": "待报废"
}
}, {
"path": "pages/backMaterialInStore/backMaterialInStore",
"style": {
"navigationBarTitleText": "退料入库"
}
}, {
"path": "pages/backMaterialInStoreDetail/backMaterialInStoreDetail",
"style": {
"navigationBarTitleText": "退料入库明细"
}
}, {
"path": "pages/repairTestInStore/repairTestInStore",
"style": {
"navigationBarTitleText": "修试入库"
}
}, {
"path": "pages/fetchMaterialOutStore/fetchMaterialOutStore",
"style": {
"navigationBarTitleText": "领料出库"
}
}, {
"path": "pages/backMaterialReceive/backMaterialReceive",
"style": {
"navigationBarTitleText": "退料接收"
}
}, {
"path": "pages/repairTestInStoreDetail/repairTestInStoreDetail",
"style": {
"navigationBarTitleText": "修试入库明细"
}
}
, {
"path": "pages/exitMaterialSelect/exitMaterialSelect",
"style": {
"navigationBarTitleText": "退料物料选择"
}
}, {
"path": "pages/exitExamDetail/exitExamDetail",
"style": {
"navigationBarTitleText": "退料明细"
}
}, {
"path": "pages/crashExam/crashExam",
"style": {
"navigationBarTitleText": "报废审核"
}
}, {
"path": "pages/testExam/testExam",
"style": {
"navigationBarTitleText": "试验检验审核"
}
}, {
"path": "pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail",
"style": {
"navigationBarTitleText": "领料出库明细"
}
}, {
"path": "pages/codeOutStore/codeOutStore",
"style": {
"navigationBarTitleText": "编码出库"
}
}, {
"path": "pages/scanOutStore/scanOutStore",
"style": {
"navigationBarTitleText": "二维码出库"
}
}, {
"path": "pages/backMaterialReceiveDetail/backMaterialReceiveDetail",
"style": {
"navigationBarTitleText": "退料接收明细",
"app-plus": {
"titleNView": {
"buttons": [
{
"float": "right",
"text": "新增",
"fontSize": "16px",
"onclick": "Function"
"text": "结束任务",
"fontSize": "12px",
"color": "#4e6ef2"
}
]
}
}
}
}
,{
"path" : "pages/workFetchMaterial/workFetchMaterial",
"style" :
{
"navigationBarTitleText": "工器具领料申请"
}
}
,{
"path" : "pages/workExitMaterial/workExitMaterial",
"style" :
{
"navigationBarTitleText": "工器具退料申请"
}
}
,{
"path" : "pages/deviceDetail/deviceDetail",
"style" :
{
"navigationBarTitleText": "机具详情"
}
}
,{
"path" : "pages/orderCart/orderCart",
"style" :
{
"navigationBarTitleText": "预约车",
"app-plus": {
"titleNView": {
"buttons": [
{
"float": "right",
"text": "删除",
"fontSize": "16px",
"onclick": "Function"
}
]
}
}
}
}
,{
"path" : "pages/fetchExam/fetchExam",
"style" :
{
"navigationBarTitleText": "领料审批"
}
}
,{
"path" : "pages/exitMaterialDetail/exitMaterialDetail",
"style" :
{
"navigationBarTitleText": "退料申请明细"
}
}
,{
"path" : "pages/fetchMaterialDetail/fetchMaterialDetail",
"style" :
{
"navigationBarTitleText": "领料明细"
}
}
,{
"path" : "pages/exitExam/exitExam",
"style" :
{
"navigationBarTitleText": "退料审批"
}
}
,{
"path" : "pages/newInStore/newInStore",
"style" :
{
"navigationBarTitleText": "新购入库"
}
}
,{
"path" : "pages/newBuyDetail/newBuyDetail",
"style" :
{
"navigationBarTitleText": "新购明细"
}
}
,{
"path" : "pages/newInAfterScan/newInAfterScan",
"style" :
{
"navigationBarTitleText": "新购机具详情"
}
}
,{
"path" : "pages/fix/fix",
"style" :
{
"navigationBarTitleText": "维修"
}
}
,{
"path" : "pages/fixDetail/fixDetail",
"style" :
{
"navigationBarTitleText": "维修明细"
}
}
,{
"path" : "pages/innerFix/innerFix",
"style" :
{
"navigationBarTitleText": "内部维修"
}
}
,{
"path" : "pages/returnFix/returnFix",
"style" :
{
"navigationBarTitleText": "返厂维修"
}
}
,{
"path" : "pages/waitCrash/waitCrash",
"style" :
{
"navigationBarTitleText": "待报废"
}
}
,{
"path" : "pages/backMaterialInStore/backMaterialInStore",
"style" :
{
"navigationBarTitleText": "退料入库"
}
}
,{
"path" : "pages/backMaterialInStoreDetail/backMaterialInStoreDetail",
"style" :
{
"navigationBarTitleText": "退料入库明细"
}
}
,{
"path" : "pages/repairTestInStore/repairTestInStore",
"style" :
{
"navigationBarTitleText": "修试入库"
}
}
,{
"path" : "pages/fetchMaterialOutStore/fetchMaterialOutStore",
"style" :
{
"navigationBarTitleText": "领料出库"
}
}
,{
"path" : "pages/backMaterialReceive/backMaterialReceive",
"style" :
{
"navigationBarTitleText": "退料接收"
}
}
,{
"path" : "pages/repairTestInStoreDetail/repairTestInStoreDetail",
"style" :
{
"navigationBarTitleText": "修试入库明细"
}
}
,{
"path" : "pages/exitMaterialSelect/exitMaterialSelect",
"style" :
{
"navigationBarTitleText": "退料物料选择"
}
}
,{
"path" : "pages/exitExamDetail/exitExamDetail",
"style" :
{
"navigationBarTitleText": "退料明细"
}
}
,{
"path" : "pages/crashExam/crashExam",
"style" :
{
"navigationBarTitleText": "报废审核"
}
}
,{
"path" : "pages/testExam/testExam",
"style" :
{
"navigationBarTitleText": "试验检验审核"
}
}
,{
"path" : "pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail",
"style" :
{
"navigationBarTitleText": "领料出库明细"
}
}
,{
"path" : "pages/codeOutStore/codeOutStore",
"style" :
{
"navigationBarTitleText": "编码出库"
}
}
,{
"path" : "pages/scanOutStore/scanOutStore",
"style" :
{
"navigationBarTitleText": "二维码出库"
}
}
,{
"path" : "pages/backMaterialReceiveDetail/backMaterialReceiveDetail",
"style" :
{
"navigationBarTitleText": "退料接收明细"
}
}
}, {
"path": "pages/scanReceive/scanReceive",
"style": {
"navigationBarTitleText": "二维码接收"
}
}, {
"path": "pages/codeReceive/codeReceive",
"style": {
"navigationBarTitleText": "编码接收"
}
}, {
"path": "pages/numReceive/numReceive",
"style": {
"navigationBarTitleText": "数量接收"
}
}
,{
"path" : "pages/scanReceive/scanReceive",
"style" :
{
"navigationBarTitleText": "二维码接收"
}
}
,{
"path" : "pages/codeReceive/codeReceive",
"style" :
{
"navigationBarTitleText": "编码接收"
}
}
,{
"path" : "pages/numReceive/numReceive",
"style" :
{
"navigationBarTitleText": "数量接收"
}
}
],
],
"tabBar": {
"color": "#2c2c2c",
"selectedColor": "#1296db",
"borderStyle": "black",
"backgroundColor": "#FFFFFF",
"iconWidth": "24px",
"list":
[
{
"pagePath": "pages/index/index",
"iconPath": "static/home.png",
"selectedIconPath": "static/homeSelected.png",
"text": "首页"
},
{
"pagePath": "pages/workSpace/workSpace",
"iconPath": "static/workSpace.png",
"selectedIconPath": "static/workSpaceSelected.png",
"text": "工作台"
},
{
"pagePath": "pages/user/user",
"iconPath": "static/my.png",
"selectedIconPath": "static/mySelected.png",
"text": "个人中心"
}
]
},
"color": "#2c2c2c",
"selectedColor": "#1296db",
"borderStyle": "black",
"backgroundColor": "#FFFFFF",
"iconWidth": "24px",
"list": [{
"pagePath": "pages/index/index",
"iconPath": "static/home.png",
"selectedIconPath": "static/homeSelected.png",
"text": "首页"
},
{
"pagePath": "pages/workSpace/workSpace",
"iconPath": "static/workSpace.png",
"selectedIconPath": "static/workSpaceSelected.png",
"text": "工作台"
},
{
"pagePath": "pages/user/user",
"iconPath": "static/my.png",
"selectedIconPath": "static/mySelected.png",
"text": "个人中心"
}
]
},
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app",
@ -372,4 +302,4 @@
"maxWidth": 750
},
"uniIdRouter": {}
}
}

247
pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue
View File

@ -1,11 +1,6 @@
<template>
<view>
<view
class="single-fetch"
v-for="(fetch, index) in fetchList"
:key="index"
@click="openPopup(fetch)"
>
<view class="single-fetch" v-for="(fetch, index) in fetchList" :key="index" @click="openPopup(fetch)">
<view>
<span>类型名称</span>
<h4>{{ fetch.typeName }}</h4>
@ -19,20 +14,12 @@
<h4>{{ fetch.num }}</h4>
</view>
</view>
<uni-popup
ref="popup1"
type="center"
:mask-click="false"
>
<uni-popup ref="popup1" type="center" :mask-click="false">
<view class="popup1">
<view class="pop-top">
<h4>退料接收</h4>
<uni-icons
style="color: #AAAAAA; font-weight: bold;"
type="closeempty"
size="32"
@click="closePopup1"
>
<uni-icons style="color: #AAAAAA; font-weight: bold;" type="closeempty" size="32"
@click="closePopup1">
</uni-icons>
</view>
<h5 style="width: 85%; margin: 2vh auto; font-weight: normal; text-align: center;">请选择接收方式</h5>
@ -45,20 +32,12 @@
</view> -->
</view>
</uni-popup>
<uni-popup
ref="popup2"
type="center"
:mask-click="false"
>
<uni-popup ref="popup2" type="center" :mask-click="false">
<view class="popup2">
<view class="pop-top">
<h4>退料接收</h4>
<uni-icons
style="color: #AAAAAA; font-weight: bold;"
type="closeempty"
size="32"
@click="closePopup2"
>
<uni-icons style="color: #AAAAAA; font-weight: bold;" type="closeempty" size="32"
@click="closePopup2">
</uni-icons>
</view>
<view class="info-area">
@ -91,10 +70,7 @@
<uni-easyinput type="number" v-model="waitCrashNum" placeholder="请输入"></uni-easyinput>
</view>
</view>
<view
class="sub-btn"
@click="multiOut"
>
<view class="sub-btn" @click="multiOut">
退料接收
</view>
</view>
@ -108,7 +84,7 @@
data() {
return {
fetchList: [
],
codeVal: '',
manageType: '',
@ -116,27 +92,36 @@
multiNum: 1,
subList: {},
fixVal: '',
fixRange: [
{ text: '合格', value: '0' },
{ text: '待修', value: '1' },
{ text: '待报废', value: '2' }
fixRange: [{
text: '合格',
value: '0'
},
{
text: '待修',
value: '1'
},
{
text: '待报废',
value: '2'
}
],
passedNum: '',
waitRepairNum: '',
waitCrashNum: ''
waitCrashNum: '',
detailsId: ''
}
},
methods: {
openPopup (list) {
openPopup(list) {
console.log(list);
this.infoList = list
if (this.infoList.manageType == '0') {
this.$refs.popup1.open()
} else if (this.infoList.manageType == '1') {
const userInfo = uni.getStorageSync('userInfo');
console.log("userInfo",userInfo)
console.log("userInfo", userInfo)
const userId = userInfo.userid
const {
taskId,
id,
@ -145,9 +130,9 @@
typeName,
typeCode,
num
}=this.infoList
} = this.infoList
const params = {
taskId ,
taskId,
id,
typeId,
manageType,
@ -157,37 +142,79 @@
num
}
const urlStr = QS.stringify(params)
console.log("urlSTR",urlStr)
console.log("urlSTR", urlStr)
uni.navigateTo({
url: `/pages/numReceive/numReceive?${urlStr}`
})
}
},
closePopup1 () {
closePopup1() {
this.$refs.popup1.close()
},
closePopup2 () {
closePopup2() {
this.$refs.popup2.close()
},
scanCode () {
scanCode() {
this.closePopup1()
uni.scanCode({
success: (res) => {
console.log(res);
console.log("beforeScan", res);
/* {
"taskId": "294",
"arr": [
{
"parentId": 34,
"typeId": "5",
"backNum": "1",
"backStatus": "1",
"manageType": "0",
"createBy": "1",
"maId":"1"
}
]
} */
const userInfo = uni.getStorageSync('userInfo');
console.log("userInfo", userInfo)
const userId = userInfo.userid
uni.navigateTo({
url: `/pages/scanReceive/scanReceive?code=${res.result}&typeId=${this.infoList.typeId}&num=${this.infoList.preNum}&parentId=${this.infoList.parenntId}`
url: `/pages/scanReceive/scanReceive?code=${res.result}&typeId=${this.infoList.typeId}&num=${this.infoList.num}&parentId=${this.infoList.id}&manageType=${this.infoList.manageType}taskId=${this.infoList.taskId}&createBy=${userId}&scanType="back"`
})
}
})
},
codeOut () {
codeOut() {
this.closePopup1()
console.log(this.infoList);
const userInfo = uni.getStorageSync('userInfo');
console.log("userInfo", userInfo)
const userId = userInfo.userid
const {
taskId,
id,
typeId,
manageType,
typeName,
typeCode,
num
} = this.infoList
const params = {
taskId,
id,
typeId,
manageType,
userId,
typeName,
typeCode,
num
}
const urlStr = QS.stringify(params)
console.log("urlSTR", urlStr)
uni.navigateTo({
url: `/pages/codeReceive/codeReceive?typeId=${this.infoList.typeId}&num=${this.infoList.preNum}&parentId=${this.infoList.parenntId}&typeId=${this.infoList.typeId}`
url: `/pages/codeReceive/codeReceive?${urlStr}`
})
},
multiOut () {
multiOut() {
let that = this
this.closePopup2()
that.subList = {
@ -216,66 +243,69 @@
}).catch(err => {
console.log(err);
})
},
initListData() {
let that = this
that.$api.backMaterialReceive.backMaterialReceiveDetail({
id: that.detailsId
}).then(res => {
if (res.data.code == 200) {
for (let i = 0; i < res.data.data.length; i++) {
res.data.data[i].num = res.data.data[i].num.split('.')[0]
}
that.fetchList = res.data.data
console.log(that.fetchList);
}
}).catch(err => {
console.log(err);
})
}
},
onLoad(params) {
let that = this
console.log(params.id);
// 获取详情
that.$api.backMaterialReceive.backMaterialReceiveDetail({
id: params.id
}).then(res => {
if (res.data.code == 200) {
for (let i = 0; i < res.data.data.length; i++) {
res.data.data[i].num = res.data.data[i].num.split('.')[0]
}
that.fetchList = res.data.data
console.log(that.fetchList);
}
}).catch(err => {
console.log(err);
})
/* that.$api.fetchExam.fetchExamList({
taskId: params.taskId
}, null).then(res => {
if (res.data.code == 200) {
for (let i = 0; i < res.data.data.rows[0].leaseApplyInfoList.length; i++) {
that.fetchList.push(res.data.data.rows[0].leaseApplyInfoList[i].leaseApplyDetails[0])
}
// that.fetchList[1].manageType = 0
console.log(that.fetchList);
}
}).catch(err => {
console.log(err);
}) */
this.detailsId = params.id
},
onShow() {
this.initListData()
},
onNavigationBarButtonTap(ev) {
console.log("点击了自定义按钮",ev);
}
}
</script>
<style lang="scss">
.single-fetch{
.single-fetch {
width: 100%;
box-sizing: border-box;
padding: 20rpx 35rpx;
border-bottom: 1px solid #DDDDDD;
view{
view {
display: flex;
align-items: center;
margin-bottom: 25rpx;
span{
span {
color: #A7A7A7;
padding-right: 20rpx;
}
h4{
h4 {
font-size: 14px;
font-weight: normal;
}
}
view:last-child{
view:last-child {
margin-bottom: 0;
}
}
.btm-exam{
.btm-exam {
position: fixed;
left: 0;
bottom: 0;
@ -285,7 +315,8 @@
display: flex;
justify-content: flex-end;
border-top: 2px solid #F6F8FF;
.exam{
.exam {
box-sizing: border-box;
padding: 10rpx 50rpx;
border-radius: 30rpx;
@ -294,14 +325,16 @@
color: #fff;
}
}
.popup1{
.popup1 {
width: 80vw;
height: 20vh;
background-color: #fff;
border-radius: 15rpx;
overflow: hidden;
background: linear-gradient(#D9E7FE, #fff, #fff, #fff);
.pop-top{
.pop-top {
width: 100%;
height: 5vh;
box-sizing: border-box;
@ -310,13 +343,15 @@
justify-content: space-between;
align-items: center;
}
.select-area{
.select-area {
width: 85%;
margin: 40rpx auto;
display: flex;
justify-content: space-around;
align-items: center;
view{
view {
box-sizing: border-box;
font-size: 14px;
padding: 10rpx 20rpx;
@ -324,19 +359,22 @@
border-radius: 20rpx;
}
}
.ipt-area{
.ipt-area {
width: 85%;
margin: 40rpx auto;
}
}
.popup2{
.popup2 {
width: 80vw;
height: 60vh;
background-color: #fff;
border-radius: 15rpx;
overflow: hidden;
background: linear-gradient(#D9E7FE, #fff, #fff, #fff);
.pop-top{
.pop-top {
width: 100%;
height: 5vh;
box-sizing: border-box;
@ -345,27 +383,32 @@
justify-content: space-between;
align-items: center;
}
.info-area{
.info-area {
width: 85%;
margin: 30rpx auto;
display: flex;
flex-direction: column;
view{
view {
margin-bottom: 15rpx;
display: flex;
align-items: center;
h4{
h4 {
font-weight: normal;
color: #989898;
font-size: 14px;
width: 35%;
}
span{
span {
font-size: 14px;
}
}
}
.sub-btn{
.sub-btn {
width: 85%;
margin: 30rpx auto;
background-color: #3788FF;
@ -379,4 +422,4 @@
font-size: 14px;
}
}
</style>
</style>

164
pages/codeReceive/codeReceive.vue
View File

@ -2,31 +2,28 @@
<view>
<view class="form-area">
<view class="upper-ipt">
<uni-easyinput suffixIcon="search" v-model="codeVal" placeholder="请输入编码" @iconClick="searchCode"></uni-easyinput>
<uni-easyinput suffixIcon="search" v-model="codeVal" placeholder="请输入编码"
@iconClick="searchCode"></uni-easyinput>
</view>
<view
class="info-area"
v-for="(item, index) in infoList"
:key="index"
v-show="infoList.length != 0"
>
<view class="info-area" v-for="(item, index) in infoList" :key="index" v-show="infoList.length != 0"
@click="actionSheetFn(item)">
<view>
<h4>物品名称</h4>
<span>{{ item.itemType }}</span>
<h4>类型名称</h4>
<span>{{ item.typeName }}</span>
</view>
<view>
<h4>设备名称</h4>
<span>{{ item.deviceType }}</span>
<h4>规格型号</h4>
<span>{{ item.typeCode }}</span>
</view>
<view>
<h4>设备规格</h4>
<span>{{ item.specificationType }}</span>
<h4>设备编码</h4>
<span>{{ item.maCode }}</span>
</view>
<view style="flex-direction: column;">
<h4 style="margin-bottom: 30rpx;">待修状态</h4>
<uni-data-checkbox v-model="fixVal" :localdata="fixRange"></uni-data-checkbox>
<view>
<h4>设备状态</h4>
<span>{{ item.sdStatus }}</span>
</view>
<!-- <view>
<!-- <view>
<h4>设备状态</h4>
<span>{{ item.maStatusName }}</span>
</view>
@ -39,11 +36,7 @@
<span>1</span>
</view> -->
</view>
<view
class="sub-btn"
v-show="infoList.length != 0"
@click="outStore"
>
<view class="sub-btn" v-show="infoList.length != 0" @click="outStore">
接收
</view>
</view>
@ -60,37 +53,34 @@
parentId: '',
infoList: '',
subList: {},
fixVal: '',
fixRange: [
{ text: '合格', value: '0' },
{ text: '待修', value: '1' },
{ text: '待报废', value: '2' }
]
manageType:'',
createBy:''
}
},
methods: {
searchCode () {
searchCode() {
let that = this
that.infoList = []
console.log(that.codeVal);
// 根据maId获取设备详情
that.$api.fetchMaterialOutStore.fetchInfoByCode({
that.$api.backMaterialReceive.backReceiveCodeQuery({
maCode: that.codeVal
}, null).then(res => {
console.log(res);
if (res.data.rows.length == 0) {
if (res.data.data.length == 0) {
uni.showToast({
icon: 'none',
title: '未查询到设备数据！'
})
} else {
that.infoList = res.data.rows
that.infoList = res.data.data
}
}).catch(err => {
console.log(err);
})
},
outStore () {
outStore() {
let that = this
console.log(that.infoList);
/* if (this.infoList.typeId != this.typeId) {
@ -99,14 +89,14 @@
title: '编码与机具类型不匹配！'
})
} else { */
that.subList = {
parentId: that.parentId,
typeId: that.typeId,
maId: that.infoList[0].maId,
outNum: 1,
companyId: uni.getStorageSync('userInfo').sysUser.companyId
}
console.log(that.subList);
that.subList = {
parentId: that.parentId,
typeId: that.typeId,
maId: that.infoList[0].maId,
outNum: 1,
companyId: uni.getStorageSync('userInfo').sysUser.companyId
}
console.log(that.subList);
// }
// 提交编码出库申请
that.$api.fetchMaterialOutStore.subOutStore(that.subList, null).then(res => {
@ -128,47 +118,115 @@
}).catch(err => {
console.log(err);
})
},
actionSheetFn(item) {
const that = this
uni.showActionSheet({
itemList: ['合格', '待修', '待报废'],
itemColor: '#333',
success: function(res) {
// console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
let type = res.tapIndex + 1
const arrList = [{
"parentId": that.parentId,
"typeId": that.typeId,
"backNum": "1",
"backStatus": type,
"manageType": that.manageType,
"createBy": that.createBy,
"maId": item.maId
}]
const params = {
taskId: that.taskId,
arr: arrList
}
// 提交编码出库申请
that.$api.backMaterialReceive.backMaterialSetCodeBack(params, null).then(res => {
console.log(res);
if (res.data.code == 200) {
uni.showToast({
icon: 'none',
title: res.data.msg,
})
that.searchCode()
} else {
uni.showToast({
icon: 'none',
title: res.data.msg
})
}
}).catch(err => {
console.log(err);
})
},
fail: function(res) {
console.log(res.errMsg);
}
});
}
},
onLoad(params) {
console.log(params);
console.log("init",params);
this.typeId = params.typeId
this.num = params.num
this.parentId = params.parentId
this.manageType = params.manageType
this.createBy=params.userId
this.taskId = params.taskId
}
}
</script>
<style lang="scss">
.form-area{
width: 90%;
.form-area {
width: 100%;
margin: 40rpx auto;
.upper-ipt{
width: 100%;
.upper-ipt {
width: 90%;
display: flex;
align-items: center;
margin-bottom: 30rpx;
margin: 0 auto;
}
.info-area{
width: 100%;
.info-area {
display: flex;
flex-direction: column;
view{
width: 90%;
margin: 0 auto;
view {
margin-bottom: 25rpx;
display: flex;
align-items: center;
h4{
h4 {
width: 35%;
font-weight: normal;
font-size: 14px;
color: #989898;
}
span{
span {
font-size: 14px;
}
}
&::after{
display: block;
content: "";
width: 750rpx;
height: 1px;
background-color: #d2d2d2;
margin-left: -5%;
margin-bottom: 12px;
}
}
.sub-btn{
.sub-btn {
width: 80%;
margin: 30rpx auto;
box-sizing: border-box;
@ -181,4 +239,4 @@
border-radius: 40rpx;
}
}
</style>
</style>

191
pages/scanReceive/scanReceive.vue
View File

@ -1,25 +1,24 @@
<template>
<view>
<view
class="info-area"
v-for="(item, index) in infoList"
:key="index"
v-show="infoList.length != 0"
>
<view class="info-area" v-for="(item, index) in infoList" :key="index" v-show="infoList.length != 0">
<view>
<h4>物品名称</h4>
<span>{{ item.itemType }}</span>
<h4>类型名称</h4>
<span>{{ item.typeName }}</span>
</view>
<view>
<h4>设备名称</h4>
<span>{{ item.deviceType }}</span>
<h4>规格型号</h4>
<span>{{ item.typeCode }}</span>
</view>
<view>
<h4>设备规格</h4>
<span>{{ item.specificationType }}</span>
<h4>设备编码</h4>
<span>{{ item.maCode }}</span>
</view>
<view>
<h4>设备状态</h4>
<span>{{ item.sdStatus }}</span>
</view>
<view style="flex-direction: column;">
<h4 style="margin-bottom: 30rpx;">待修状态</h4>
<!-- <h4 style="margin-bottom: 30rpx;">待修状态</h4> -->
<uni-data-checkbox v-model="fixVal" :localdata="fixRange"></uni-data-checkbox>
</view>
<!-- <view>
@ -35,11 +34,7 @@
<span>1</span>
</view> -->
</view>
<view
class="sub-btn"
v-show="infoList.length != 0"
@click="outStore"
>
<view class="sub-btn" v-show="infoList.length != 0" @click="outStore">
接收
</view>
</view>
@ -54,41 +49,60 @@
parentId: '',
infoList: '',
fixVal: '',
fixRange: [
{ text: '合格', value: '0' },
{ text: '待修', value: '1' },
{ text: '待报废', value: '2' }
]
fixRange: [{
text: '合格',
value: '1'
},
{
text: '待修',
value: '2'
},
{
text: '待报废',
value: '3'
}
],
initData: {}
}
},
methods: {
outStore () {
outStore() {
let that = this
console.log(that.infoList);
/* if (this.infoList.typeId != this.typeId) {
if (!this.fixVal) {
uni.showToast({
icon: 'none',
title: '编码与机具类型不匹配！'
title: "请选择一种接收状态",
})
} else { */
that.subList = {
parentId: that.parentId,
typeId: that.typeId,
maId: that.infoList[0].maId,
outNum: 1,
companyId: uni.getStorageSync('userInfo').sysUser.companyId
}
console.log(that.subList);
// }
return
}
const arrList = [{
"parentId": this.initData.parentId,
"typeId": this.initData.typeId,
"backNum": "1",
"backStatus": this.fixVal,
"manageType": this.initData.manageType,
"createBy": this.initData.createBy,
"maId": that.infoList[0].maId
}]
const params = {
taskId: this.initData.taskId,
arr: arrList
}
// 提交编码出库申请
that.$api.fetchMaterialOutStore.subOutStore(that.subList, null).then(res => {
that.$api.backMaterialReceive.backMaterialSetCodeBack(params, null).then(res => {
console.log(res);
if (res.data.code == 200) {
uni.showToast({
icon: 'none',
title: res.data.msg,
success: () => {
uni.navigateBack()
setTimeout(() => {
uni.navigateBack()
},200)
}
})
} else {
@ -100,56 +114,101 @@
}).catch(err => {
console.log(err);
})
}
},
initFetchInfoByCode(params) {
let that = this
this.typeId = params.typeId
this.num = params.num
this.parentId = params.parentId
// 根据扫出的编码查询设备
that.$api.fetchMaterialOutStore.fetchInfoByCode({
maCode: params.code
}, null).then(res => {
console.log("", res);
if (res.data.rows.length == 0) {
uni.showToast({
icon: 'none',
title: '未查询到设备数据！'
})
} else {
// that.infoList = res.data.rows
}
}).catch(err => {
console.log(err);
})
},
iniBackMaterialReceive(params) {
let that = this
this.typeId = params.typeId
this.num = params.num
this.parentId = params.parentId
// 根据扫出的编码查询设备
that.$api.backMaterialReceive.backMaterialQrcodeQuery({
qrCode: params.code
}, null).then(res => {
console.log("backMaterialQrcodeQuery", res.data.data);
if (res.data.data.length == 0) {
// qrcodeQuery 页面数据
uni.showToast({
icon: 'none',
title: '未查询到设备数据！'
})
} else {
that.infoList = res.data.data
}
}).catch(err => {
console.log(err);
})
},
},
onLoad(params) {
let that = this
console.log(params);
this.typeId = params.typeId
this.num = params.num
this.parentId = params.parentId
// 根据扫出的编码查询设备
that.$api.fetchMaterialOutStore.fetchInfoByCode({
maCode: params.code
}, null).then(res => {
console.log(res);
if (res.data.rows.length == 0) {
uni.showToast({
icon: 'none',
title: '未查询到设备数据！'
})
} else {
that.infoList = res.data.rows
}
}).catch(err => {
console.log(err);
})
// 测试代码 sjf-note 记得删除
const testParams = {
"code": "20231224-0067",
"typeId": "4",
"num": "4",
"parentId": "32",
"manageType": "0",
"createBy": "1",
scanType: 'back',
taskId: "357"
}
params = testParams
this.initData = params
this.initFetchInfoByCode(params)
this.iniBackMaterialReceive(params)
}
}
</script>
<style lang="scss">
.info-area{
.info-area {
width: 90%;
margin: 40rpx auto;
display: flex;
flex-direction: column;
view{
view {
margin-bottom: 25rpx;
display: flex;
align-items: center;
h4{
h4 {
width: 35%;
font-weight: normal;
font-size: 14px;
color: #989898;
}
span{
span {
font-size: 14px;
}
}
}
.sub-btn{
.sub-btn {
width: 80%;
margin: 30rpx auto;
box-sizing: border-box;
@ -161,4 +220,4 @@
align-items: center;
border-radius: 40rpx;
}
</style>
</style>

2792
unpackage/dist/dev/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long