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

7.30宁夏提交

This commit is contained in:
FrancisHu 2024-07-30 09:43:51 +08:00
parent dd420cfd53
commit 4479ab95f8
13 changed files with 144 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apis/apis.js
View File

@ -734,8 +734,8 @@ const authManage = {
const searchProjUsing = {
async fetchProjUsingList(data = {}, header = {}) {
return await Http.post(
HttpConfig.basePath,
return await Http.get(
HttpConfig.materialPath,
HttpConfig.serviceUrl.searchProjUsing.fetchProjUsingList,
data,
header

4
apis/http.js
View File

@ -145,7 +145,7 @@ class HttpConfig {
subDel: '/appMenu/delMenuById', // 提交删除模块
},
searchProjUsing: {
fetchProjUsingList: '/leaseOutDetails/proUseRecord', // 获取工程在用列表
fetchProjUsingList: '/projUsingRecord/getProjUsingRecordList', // 获取工程在用列表
},
searchFetchRecord: {
fetchRecordList: '/leaseOutDetails/leaseOutRecord', // 获取领用记录列表
@ -166,7 +166,7 @@ class HttpConfig {
},
preCrashExam: {
fetchPreCrashList: '/scrap/getScrapApplyList', //获取预报废审核列表
fetchPreCrashDetail: '/scrap/getScrapAuditListApp', //获取预报废审核列表详情
fetchPreCrashDetail: '/scrap/getScrapRefuseList', //获取预报废审核列表详情
submitPreExam: '/scrap/forecastWasteAudit', //提交审核
},
preCrashList: {

7
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "智慧仓储",
"appid" : "__UNI__9D122E1",
"description" : "",
"versionName" : "1.1.5",
"versionCode" : 115,
"versionName" : "1.1.6",
"versionCode" : 116,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
@ -44,7 +44,8 @@
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
]
],
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
},
/* ios打包配置 */
"ios" : {

13
package.json
View File

@ -3,5 +3,16 @@
"qs": "^6.11.2",
"uni-read-pages": "^1.0.5",
"uni-simple-router": "^2.0.8-beta.4"
}
},
"name": "smartstorage",
"version": "1.0.0",
"main": "main.js",
"devDependencies": {},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"keywords": [],
"author": "",
"license": "ISC",
"description": ""
}

52
pages/exitMaterialSelect/exitMaterialSelect.vue
View File

@ -166,27 +166,41 @@ import { basePath } from '../../public';
companyId: item['companyId']
}
})
console.log(that.submitList);
// 提交退料清单
that.$api.exitMaterial.subExitMaterial(that.submitList).then(res => {
console.log(res);
if (res.data.code == 200) {
uni.showToast({
icon: 'none',
title: res.data.msg,
success: () => {
uni.navigateBack()
}
})
} else {
uni.showToast({
icon: 'none',
title: res.data.msg
})
}
}).catch(err => {
console.log(err);
let setArr = []
that.submitList.backApplyDetails.forEach(list => {
setArr.push(list.companyId)
})
let set = new Set(setArr)
console.log(set.size);
if (set.size == 1) {
that.submitList.companyId = that.submitList.backApplyDetails[0].companyId
console.log(that.submitList);
that.$api.exitMaterial.subExitMaterial(that.submitList).then(res => {
console.log(res);
if (res.data.code == 200) {
uni.showToast({
icon: 'none',
title: res.data.msg,
success: () => {
uni.navigateBack()
}
})
} else {
uni.showToast({
icon: 'none',
title: res.data.msg
})
}
}).catch(err => {
console.log(err);
})
} else {
uni.showToast({
icon: 'none',
title: '无法同时退料机具设备和调试设备！'
})
}
}
}
})

45
pages/fetchExam/fetchExam.vue
View File

@ -1,5 +1,8 @@
<template>
<view>
<view class="search-bar">
<uni-easyinput suffixIcon="search" v-model="fetchIpt" placeholder="请输入关键字" @iconClick="searchKeyword"></uni-easyinput>
</view>
<view
class="single-fetch"
v-for="(fetch, index) in fetchMaterialList"
@ -26,6 +29,10 @@
<span>领料申请单位</span>
<h4>{{ fetch.deptName }}</h4>
</view>
<view>
<span>领料单号</span>
<h4>{{ fetch.code }}</h4>
</view>
<view>
<span>领料申请工程</span>
<h4>{{ fetch.proName }}</h4>
@ -232,10 +239,9 @@ import { basePath } from '../../public'
export default {
data() {
return {
pageOpt: {
pageNum: 1,
pageSize: 10
},
fetchIpt: '',
pageNum: 1,
pageSize: 10,
pageTotal: 0,
showLoading: false,
showSubLoading: false,
@ -269,6 +275,10 @@ import { basePath } from '../../public'
}
},
methods: {
searchKeyword () {
this.fetchMaterialList = []
this.initFetch(this.fetchIpt)
},
seeDetail (taskId) {
uni.navigateTo({
url: `/pages/fetchMaterialDetail/fetchMaterialDetail?taskId=${taskId}`
@ -307,6 +317,7 @@ import { basePath } from '../../public'
},
toggleOpenModal (info) {
this.modalList = info
console.log(info);
this.$refs.popup.open()
},
modalConfirm () {
@ -327,14 +338,18 @@ import { basePath } from '../../public'
if (that.modalList.leaseApplyInfoList[0].leaseApplyDetails[0].companyId == 101) {
this.examList = {
taskId: that.modalList.taskId,
taskType: that.modalList.taskType,
taskStatus: that.modalList.taskStatus + 1,
companyId: that.modalList.leaseApplyInfoList[0].companyId,
code: that.modalList.code,
leaseApplyInfoList: that.modalList.leaseApplyInfoList
}
} else if (that.modalList.leaseApplyInfoList[0].leaseApplyDetails[0].companyId == 102) {
this.examList = {
taskId: that.modalList.taskId,
taskType: that.modalList.taskType,
taskStatus: that.modalList.taskStatus + 2,
companyId: that.modalList.leaseApplyInfoList[0].companyId,
code: that.modalList.code,
leaseApplyInfoList: that.modalList.leaseApplyInfoList
}
@ -342,7 +357,9 @@ import { basePath } from '../../public'
} else {
this.examList = {
taskId: that.modalList.taskId,
taskType: that.modalList.taskType,
taskStatus: that.modalList.taskStatus + 1,
companyId: that.modalList.leaseApplyInfoList[0].companyId,
code: that.modalList.code,
leaseApplyInfoList: that.modalList.leaseApplyInfoList,
leaseApplyDetails: that.modalList.leaseApplyInfoList[0].leaseApplyDetails
@ -399,7 +416,9 @@ import { basePath } from '../../public'
}
this.examList = {
taskId: that.modalList.taskId,
taskType: that.modalList.taskType,
taskStatus: that.modalList.taskStatus + 1,
companyId: that.modalList.leaseApplyInfoList[0].companyId,
leaseApplyInfoList: that.modalList.leaseApplyInfoList,
leaseApplyDetails: that.modalList.leaseApplyInfoList[0].leaseApplyDetails
}
@ -508,6 +527,7 @@ import { basePath } from '../../public'
}
this.examList = {
taskId: info.taskId,
companyId: info.leaseApplyInfoList[0].companyId,
taskStatus: info.taskStatus + 1,
leaseApplyInfoList: info.leaseApplyInfoList
}
@ -662,10 +682,14 @@ import { basePath } from '../../public'
console.log(err);
})
},
initFetch () {
initFetch (keyWord) {
let that = this
that.showLoading = true
that.$api.fetchExam.fetchTrueExamList(that.pageOpt).then(res => {
that.$api.fetchExam.fetchTrueExamList({
keyWord,
pageNum: that.pageNum,
pageSize: that.pageSize
}).then(res => {
console.log(res);
if (res.data.code == 200) {
if (res.data.data.length == 0) {
@ -720,6 +744,7 @@ import { basePath } from '../../public'
},
onShow() {
let that = this
that.fetchIpt = ''
console.log(uni.getStorageSync('userInfo'));
console.log(that.roles);
for (let i = 0; i < that.roles.length; i++) {
@ -741,8 +766,8 @@ import { basePath } from '../../public'
},
onReachBottom() {
if (this.fetchMaterialList.length >= this.pageTotal) return
this.pageOpt.pageNum++
this.initFetch()
this.pageNum++
this.initFetch(this.fetchIpt)
}
}
</script>
@ -753,6 +778,10 @@ import { basePath } from '../../public'
box-sizing: border-box;
padding-bottom: 10vh;
}
.search-bar{
width: 95%;
margin: 20rpx auto;
}
.single-fetch{
width: 95%;
margin: 20rpx auto;

4
pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue
View File

@ -141,7 +141,7 @@
codeVal: '',
manageType: '',
infoList: '',
multiNum: 0,
multiNum: 1,
carCode: '',
subList: {},
taskId:null,
@ -242,7 +242,7 @@
},
multiOut () {
let that = this
let posiIntReg = /^\+?[0-9]\d*$/
let posiIntReg = /^\+?[1-9]\d*$/
if (!posiIntReg.test(that.multiNum)) {
uni.showToast({
icon: 'none',

1
pages/index/index.vue
View File

@ -274,6 +274,7 @@
}
// 获取通知公告
that.$api.index.fetchNotice().then(res => {
console.log(res);
if (res.data.code == 200) {
if (res.data.data.length != 0) {
res.data.data.forEach(item => {

2
pages/orderCart/orderCart.vue
View File

@ -319,7 +319,7 @@ import { basePath } from '../../public';
if (set.size == 1) {
that.sendData = {
userId: uni.getStorageSync('userInfo').sysUser.userId,
companyId: uni.getStorageSync('userInfo').sysUser.companyId,
companyId: that.totalGoods[0].companyId,
createBy: uni.getStorageSync('userInfo').sysUser.userName,
unitId: formData.deptName,
projectId: formData.projName,

3
pages/preCrashListDetail/preCrashListDetail.vue
View File

@ -134,6 +134,9 @@
export default {
data() {
return {
pageNum: 1,
pageSize: 10,
pageTotal: 0,
imgPrefix: '',
showBtn: '',
taskId: '',

19
pages/rfidBinding/rfidBinding.vue
View File

@ -3,12 +3,12 @@
<view class="upper-bgd">
<h4 style="font-size: 16px; font-weight: normal;">RFID标签绑定</h4>
<uni-data-select
v-model="powerVal"
:localdata="powerRange"
placeholder="请选择功率"
@change="powerChange"
:clear="false"
></uni-data-select>
v-model="powerVal"
:localdata="powerRange"
placeholder="请选择功率"
@change="powerChange"
:clear="false"
></uni-data-select>
</view>
<view class="lower-rfid" v-show="showStats">
<view class="stat-cont">
@ -39,7 +39,7 @@
<h4>物资状态</h4>
<span>{{ bindStats.sdStatus }}</span>
</view>
<view>
<!-- <view>
<h4>本次维修时间</h4>
<span>5</span>
</view>
@ -54,7 +54,7 @@
<view>
<h4>领料单位名称</h4>
<span>8</span>
</view>
</view> -->
</view>
</view>
</view>
@ -170,8 +170,7 @@
},
onLoad() {
// 初始化rfid识别
const obj = rfidMod.initUHF()
console.log(obj);
rfidMod.initUHF()
// 筛入频率
for (let i = 5; i <= 30; i++) {
this.powerRange.push({

44
pages/searchProjUsing/searchProjUsing.vue
View File

@ -10,25 +10,41 @@
:key="index"
>
<h4 style="margin-bottom: 15rpx; font-size: 16px;">{{ record.unitName }}</h4>
<view>
<h5>协议号</h5>
<span>{{ record.agreementCode }}</span>
</view>
<view>
<h5>往来单位</h5>
<span>{{ record.unitName }}</span>
</view>
<view>
<h5>工程名称</h5>
<span>{{ record.proName }}</span>
</view>
<view>
<h5>设备类型</h5>
<h5>机具名称</h5>
<span>{{ record.typeName }}</span>
</view>
<view>
<h5>规格型号</h5>
<h5>规格名称</h5>
<span>{{ record.typeModelName }}</span>
</view>
<view>
<h5>领用数量</h5>
<span>{{ record.alNum }}</span>
<h5>单位</h5>
<span>{{ record.unit }}</span>
</view>
<view>
<h5>租赁数量</h5>
<span>{{ record.outNum }}</span>
</view>
<view>
<h5>归还数量</h5>
<span>{{ record.backNum }}</span>
</view>
<view>
<h5>在用数量</h5>
<span>{{ record.num }}</span>
<span>{{ record.usNum }}</span>
</view>
</view>
</view>
@ -38,6 +54,9 @@
export default {
data() {
return {
pageNum: 1,
pageSize: 10,
pageTotal: 0,
dateVal: '',
iptVal: '',
recordList: []
@ -47,17 +66,21 @@
iconClick () {
let that = this
console.log(that.iptVal);
that.recordList = []
this.searchRecord(that.iptVal)
},
searchRecord (keyWord) {
let that = this
// 查询工程记录
that.$api.searchProjUsing.fetchProjUsingList({
keyWord
keyWord,
pageNum: that.pageNum,
pageSize: that.pageSize
}).then(res => {
console.log(res);
if (res.data.code == 200) {
that.recordList = res.data.data
that.pageTotal = res.data.data.total
that.recordList = [...that.recordList, ...res.data.data.rows]
}
}).catch(err => {
console.log(err);
@ -66,7 +89,12 @@
},
onShow() {
let that = this
that.searchRecord('')
that.searchRecord(that.iptVal)
},
onReachBottom() {
if (this.recordList.length >= this.pageTotal) return;
this.pageNum++
this.searchRecord(this.iptVal)
}
}
</script>

4
pages/serviceCenterExam/serviceCenterExam.vue
View File

@ -17,10 +17,10 @@
<checkbox :checked="pre.checked" />
</checkbox-group> -->
<view class="upper-lef">
{{ list.createBy == null ? '' : list.createBy.slice(0, 1) }}
{{ list.purchaserName == null ? '' : list.purchaserName.slice(0, 1) }}
</view>
<view class="upper-rig">
<h4 style="font-size: 16px;">{{ list.createBy }}</h4>
<h4 style="font-size: 16px;">{{ list.purchaserName == null ? '' : list.purchaserName }}</h4>
<!-- <h4 style="color: #989898;">{{ list.unitName }}</h4> -->
</view>
</view>