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

bug修复

This commit is contained in:
bb_pan 2025-05-19 16:02:10 +08:00
parent 00c37c94bf
commit eadf6e799a
13 changed files with 71 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/apis.js
View File

@ -816,7 +816,7 @@ const indexScan = {
const preCrashExam = {
async fetchPreCrashList(data = {}, header = {}) {
return await Http.post(
return await Http.get(
HttpConfig.materialPath,
HttpConfig.serviceUrl.preCrashExam.fetchPreCrashList,
data,

2
apis/http.js
View File

@ -1,6 +1,6 @@
class HttpConfig {
// #ifdef H5
baseUrl = "/api";
// baseUrl = "/api";
// #endif
// #ifdef APP-PLUS
// baseUrl = "http://192.168.0.56:21624";

11
pages/backMaterialReceive/backMaterialReceive.vue
View File

@ -244,7 +244,7 @@ import { basePath } from '../../public'
// 获取退料接收列表
that.$api.backMaterialReceive.backMaterialReceiveList({
companyId: uni.getStorageSync('userInfo').sysUser.companyId,
flag: 1,
flag: 0,
keyWord,
backSource: 2,
pageNum: that.pageNum,
@ -258,10 +258,11 @@ import { basePath } from '../../public'
title: '未查询到相关数据！'
})
} else {
that.pageTotal = res.data.data.total
that.fetchMaterialList = [...that.fetchMaterialList, ...res.data.data.rows]
console.log("fetchMaterialList",that.fetchMaterialList)
}
that.fetchMaterialList = res.data.data
// that.pageTotal = res.data.data.total
// that.fetchMaterialList = [...that.fetchMaterialList, ...res.data.data.rows]
console.log('🚀 ~ getList ~ that.fetchMaterialList:', that.fetchMaterialList)
}
} else {
uni.showToast({
icon: 'none',

7
pages/deviceDetail/deviceDetail.vue
View File

@ -60,7 +60,7 @@ import { basePath } from '../../public';
leftNum: '',
companyId: '',
status: '',
baseUrl: 'http://112.29.103.165:21624/dev-api/system'
baseUrl: ''
}
},
methods: {
@ -157,6 +157,7 @@ import { basePath } from '../../public';
}
},
onLoad(params) {
this.baseUrl = this.$api.url
let that = this
console.log(params);
that.deviceName = params.name
@ -170,7 +171,9 @@ import { basePath } from '../../public';
if (res.data.code == 200) {
that.companyId = res.data.data[0].companyId
for (let i = 0; i < res.data.data.length; i++) {
that.bgList.push(res.data.data[i].photoUrl)
if (res.data.data[i].photoUrl) {
that.bgList.push(res.data.data[i].photoUrl)
}
}
that.specRange = res.data.data.map((item,index) => {
return {

4
pages/exitMaterial/exitMaterial.vue
View File

@ -332,6 +332,10 @@ import { basePath } from '../../public'
}
})
})
}).catch(err => {
console.log(err);
that.showLoading = false
that.btnDisabled = false
})
},
seeDetail (id, typeId) {

6
pages/fetchExam/fetchExam.vue
View File

@ -17,17 +17,17 @@
<checkbox :checked="fetch.checked" />
</checkbox-group> -->
<view class="upper-lef">
{{ fetch.createBy.slice(0, 1) }}
{{ (fetch.applyFor || '-').slice(0, 1) }}
</view>
<view class="upper-rig">
<h4 style="font-size: 16px;">{{ fetch.createBy }}</h4>
<h4 style="font-size: 16px;">{{ fetch.applyFor }}</h4>
<h4 style="color: #989898;">{{ fetch.phoneNumber }}</h4>
</view>
</view>
<view class="fetch-lower">
<view>
<span>领料申请单位</span>
<h4>{{ fetch.deptName }}</h4>
<h4>{{ fetch.unitName }}</h4>
</view>
<view>
<span>领料单号</span>

1
pages/fetchMaterial/fetchMaterial.vue
View File

@ -176,6 +176,7 @@
onShow() {
let that = this
that.photoUrl = that.$api.url
console.log('🚀 ~ onShow ~ that.photoUrl:', that.photoUrl)
console.log(that.photoUrl);
/* if (uni.getStorageSync('goodList').length == 0 || !uni.getStorageSync('goodList')) {
uni.setStorageSync('goodList', [])

39
pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue
View File

@ -79,24 +79,30 @@
</uni-icons>
</view>
<view class="info-area">
<view>
<view class="view">
<h4>类型名称</h4>
<span>{{ infoList.typeName }}</span>
</view>
<view>
<view class="view">
<h4>设备名称</h4>
<span>{{ infoList.typeModelName }}</span>
</view>
<view>
<view class="view">
<h4>待出库数量</h4>
<span>{{ infoList.outNum }}</span>
</view>
<view>
<h4><span style="color: red;">*</span>车牌号</h4>
<view class="view">
<h4>是否有车牌号</h4>
<u-switch v-model="isCarCode" size="22" @change="() => isCarCode ? carCode = '' : carCode = '无车牌'"></u-switch>
</view>
<view class="view">
<h4><span v-if="isCarCode" style="color: red;">*</span>车牌号</h4>
<!-- <uni-number-box v-model="multiNum" @change="multiNumChange" :min="0" :max="infoList.outNum"/> -->
<uni-easyinput
placeholder="请输入车牌号"
v-model="carCode"
:disabled="!isCarCode"
@blur="checkCarCode"
>
</uni-easyinput>
</view>
@ -143,6 +149,7 @@
infoList: '',
multiNum: 1,
carCode: '',
isCarCode: true,
subList: {},
taskId:null,
taskStatus: '',
@ -161,6 +168,9 @@
this.infoList = list
this.rfidNum = list.outNum
this.typeId = list.typeId
this.isCarCode = true
this.carCode = ''
this.multiNum = 1
// this.transMaCode = list.maCode
console.log(this.infoList.manageType, this.infoList);
if (this.taskStatus == 33 || this.taskStatus == 34) {
@ -240,11 +250,23 @@
url: `/pages/rfidOutStore/rfidOutStore?waitOut=${this.rfidNum}&typeId=${this.typeId}&parentId=${this.infoList.parentId}`
})
},
// 检查车牌号
checkCarCode () {
if (this.carCode) {
const reg = /^[\u4E00-\u9FA5]{1}[A-Z]{1}[A-Z0-9]{5,6}$/
if (!reg.test(this.carCode)) {
uni.showToast({
icon: 'none',
title: '车牌号格式不正确！'
})
this.carCode = this.$set(this, 'carCode', '')
}
}
},
multiOut () {
let that = this
let posiIntReg = /^\+?[1-9]\d*$/
// carCode 车牌号必填
if (!that.carCode) {
if (!that.carCode && that.isCarCode) {
uni.showToast({
icon: 'none',
title: '请输入车牌号！'
@ -498,9 +520,10 @@
margin: 30rpx auto;
display: flex;
flex-direction: column;
view{
.view{
margin-bottom: 15rpx;
display: flex;
align-items: center;
h4{
font-weight: normal;
color: #989898;

2
pages/fix/fix.vue
View File

@ -14,7 +14,7 @@
<checkbox :checked="fetch.checked" />
</checkbox-group>
<view class="upper-lef">
{{ fetch.createName.slice(0, 1) }}
{{ (fetch.createName || '-').slice(0, 1) }}
</view>
<view class="upper-rig">
<h4 style="font-size: 16px;">{{ fetch.createName }}</h4>

6
pages/newBuyDetail/newBuyDetail.vue
View File

@ -368,8 +368,8 @@
.then((res) => {
console.log("新购明细----", res);
if (res.data.code == 200) {
that.pageTotal = res.data.total;
res.data.rows.forEach((item) => {
that.pageTotal = res.data.data.total;
res.data.data.rows.forEach((item) => {
if (item.status == "3" || item.status == "0")
item.checked = false;
switch (item.status) {
@ -384,7 +384,7 @@
break;
}
});
that.list = [...that.list, ...res.data.rows];
that.list = [...that.list, ...res.data.data.rows];
} else {
uni.showToast({
icon: "none",

4
pages/orderCart/orderCart.vue
View File

@ -6,9 +6,9 @@
<checkbox :checked="item.checked" />
</checkbox-group>
<view class="details">
<view class="img">
<!-- <view class="img">
<image :src="item.photoUrl"></image>
</view>
</view> -->
<view class="text">
<text>{{item.parentName}}</text>
<text>规格：{{item.typeName}}</text>

4
pages/serviceCenterExamDetail/serviceCenterExamDetail.vue
View File

@ -81,7 +81,7 @@
}).then(res => {
console.log(res);
if (res.data.code == 200) {
res.data.rows.forEach(item => {
res.data.data.rows.forEach(item => {
switch (item.status) {
case '0':
item.taskMark = '待审核'
@ -100,7 +100,7 @@
break;
}
})
that.detailList = res.data.rows
that.detailList = res.data.data.rows
}
}).catch(err => {
console.log(err);

21
pages/workSpace/workSpace.vue
View File

@ -73,16 +73,16 @@
"*:*:*",
],
},
{
name: "退料审批",
pic: "/static/exitExam.png",
url: "exitExam",
isShow: [
"return:auditing:auditing",
"return:auditing:auditing:batch",
"*:*:*",
],
},
// {
// name: "退料审批",
// pic: "/static/exitExam.png",
// url: "exitExam",
// isShow: [
// "return:auditing:auditing",
// "return:auditing:auditing:batch",
// "*:*:*",
// ],
// },
{
name: "RFID绑定",
pic: "/static/rfidBinding.png",
@ -206,6 +206,7 @@
},
});
} else {
console.log('🚀 ~ jumpUrl ~ else:')
uni.navigateTo({
url: `/pages/${path}/${path}`,
});