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

4.28重庆测试问题修改

This commit is contained in:
FrancisHu 2024-04-28 16:54:53 +08:00
parent dc7a15f3e8
commit 1d79fee877
17 changed files with 184 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue
View File

@ -178,21 +178,18 @@ export default {
scanCode() { scanCode() {
const that = this const that = this
that.closePopup1() that.closePopup1()
/* uni.scanCode({ uni.scanCode({
success: (res) => { success: (res) => {
console.log("beforeScan", res); const fixedCode = res.result.split('=')[1]
const userInfo = uni.getStorageSync('userInfo'); const userId = uni.getStorageSync('userInfo').userid
console.log("beforeScan11111", userInfo,that.taskId)
const userId = userInfo.userid
uni.navigateTo({ uni.navigateTo({
url: `/pages/scanReceive/scanReceive?code=${res.result}&typeId=${that.infoList.typeId}&num=${that.infoList.num}&parentId=${that.infoList.id}&manageType=${that.infoList.manageType}&taskId=${that.taskId}&createBy=${userId}&scanType="back"` url: `/pages/scanReceive/scanReceive?code=${fixedCode}&typeId=${that.infoList.modelId}&num=${that.infoList.num}&parentId=${that.infoList.id}&manageType=${that.infoList.manageType}&taskId=${that.taskId}&createBy=${userId}&scanType="back"`
}) })
} }
}) */
const userId = uni.getStorageSync('userInfo').userid
uni.navigateTo({
url: `/pages/QRIn/QRIn?typeId=${that.infoList.modelId}&num=${that.infoList.num}&parentId=${that.infoList.id}&manageType=${that.infoList.manageType}&taskId=${that.taskId}&createBy=${userId}&scanType="back"`
}) })
/* uni.navigateTo({
url: `/pages/QRIn/QRIn?typeId=${that.infoList.modelId}&num=${that.infoList.num}&parentId=${that.infoList.id}&manageType=${that.infoList.manageType}&taskId=${that.taskId}&createBy=${userId}&scanType="back"`
}) */
}, },
codeOut() { codeOut() {
this.closePopup1() this.closePopup1()

10
pages/codeOutStore/codeOutStore.vue
View File

@ -2,7 +2,7 @@
<view> <view>
<view class="form-area"> <view class="form-area">
<view class="upper-ipt"> <view class="upper-ipt">
<uni-easyinput style="margin-bottom: 15rpx;" v-model="carCode" placeholder="请输入车牌号"></uni-easyinput> <!-- <uni-easyinput style="margin-bottom: 15rpx;" v-model="carCode" placeholder="请输入车牌号"></uni-easyinput> -->
<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>
<view <view
@ -75,7 +75,7 @@
if (res.data.rows.length == 0) { if (res.data.rows.length == 0) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '未查询到设备数据！' title: '请输入编码！'
}) })
} else { } else {
that.infoList = res.data.rows that.infoList = res.data.rows
@ -90,7 +90,7 @@
if (this.infoList[0].typeId != this.typeId) { if (this.infoList[0].typeId != this.typeId) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '编码与机具类型不匹配！' title: '机具类型不匹配！'
}) })
} else { } else {
that.subList = { that.subList = {
@ -100,7 +100,7 @@
taskId: that.taskId, taskId: that.taskId,
maId: that.infoList[0].maId, maId: that.infoList[0].maId,
outNum: 1, outNum: 1,
carCode: that.carCode, // carCode: that.carCode,
companyId: uni.getStorageSync('userInfo').sysUser.companyId companyId: uni.getStorageSync('userInfo').sysUser.companyId
} }
console.log(that.subList); console.log(that.subList);
@ -134,7 +134,7 @@
this.parentId = params.parentId this.parentId = params.parentId
this.manageType = params.manageType this.manageType = params.manageType
this.taskId = params.taskId this.taskId = params.taskId
// this.codeVal = params.transCode this.codeVal = params.code
} }
} }
</script> </script>

2
pages/codeReceive/codeReceive.vue
View File

@ -134,7 +134,7 @@
if (this.infoList[0].typeId != this.typeId) { if (this.infoList[0].typeId != this.typeId) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '编码与机具类型不匹配！' title: '机具类型不匹配！'
}) })
} else { } else {
that.subList = { that.subList = {

34
pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue
View File

@ -75,15 +75,15 @@
<h4>待出库数量</h4> <h4>待出库数量</h4>
<span>{{ infoList.outNum }}</span> <span>{{ infoList.outNum }}</span>
</view> </view>
<view> <!-- <view>
<h4>车牌号</h4> <h4>车牌号</h4>
<!-- <uni-number-box v-model="multiNum" @change="multiNumChange" :min="0" :max="infoList.outNum"/> --> <uni-number-box v-model="multiNum" @change="multiNumChange" :min="0" :max="infoList.outNum"/>
<uni-easyinput <uni-easyinput
placeholder="请输入车牌号" placeholder="请输入车牌号"
v-model="carCode" v-model="carCode"
> >
</uni-easyinput> </uni-easyinput>
</view> </view> -->
<view> <view>
<h4>出库数量</h4> <h4>出库数量</h4>
<!-- <uni-number-box v-model="multiNum" @change="multiNumChange" :min="0" :max="infoList.outNum"/> --> <!-- <uni-number-box v-model="multiNum" @change="multiNumChange" :min="0" :max="infoList.outNum"/> -->
@ -170,24 +170,34 @@
this.$refs.popup2.close() this.$refs.popup2.close()
}, },
scanCode () { scanCode () {
console.log(this.infoList);
this.closePopup1() this.closePopup1()
/* uni.scanCode({ uni.scanCode({
success: (res) => { success: (res) => {
console.log(res); console.log(res);
uni.navigateTo({ const fixedCode = res.result.split('=')[1]
url: `/pages/scanOutStore/scanOutStore?code=${res.result}&typeId=${this.infoList.typeId}&num=${this.infoList.preNum}&parentId=${this.infoList.parenntId}` console.log(fixedCode);
}) if (!fixedCode) {
uni.showToast({
icon: 'none',
title: '未识别到设备！'
})
} else {
uni.navigateTo({
url: `/pages/scanOutStore/scanOutStore?code=${fixedCode}&typeId=${this.infoList.typeId}&num=${this.infoList.preCountNum}&parentId=${this.infoList.parentId}`
})
}
} }
}) */
uni.navigateTo({
url: `/pages/QROut/QROut?typeId=${this.infoList.typeId}&num=${this.infoList.preCountNum}&parentId=${this.infoList.parentId}`
}) })
/* uni.navigateTo({
url: `/pages/QROut/QROut?typeId=${this.infoList.typeId}&num=${this.infoList.preCountNum}&parentId=${this.infoList.parentId}`
}) */
}, },
codeOut () { codeOut () {
this.closePopup1() this.closePopup1()
console.log(this.infoList); console.log(this.infoList);
uni.navigateTo({ uni.navigateTo({
url: `/pages/codeOutStore/codeOutStore?typeId=${this.infoList.typeId}&num=${this.infoList.preCountNum}&parentId=${this.infoList.parentId}&manageType=${this.infoList.manageType}&taskId=${this.infoList.taskId}` url: `/pages/codeOutStore/codeOutStore?typeId=${this.infoList.typeId}&num=${this.infoList.preCountNum}&parentId=${this.infoList.parentId}&manageType=${this.infoList.manageType}&taskId=${this.infoList.taskId}&code=${this.infoList.maCode}`
}) })
}, },
rfidOut () { rfidOut () {
@ -218,7 +228,7 @@
parentId: that.infoList.parentId, parentId: that.infoList.parentId,
typeId: that.infoList.typeId, typeId: that.infoList.typeId,
taskId: that.infoList.taskId, taskId: that.infoList.taskId,
carCode: that.carCode, // carCode: that.carCode,
outNum: that.multiNum, outNum: that.multiNum,
companyId: uni.getStorageSync('userInfo').sysUser.companyId companyId: uni.getStorageSync('userInfo').sysUser.companyId
} }

75
pages/qrcodeBindPage/qrcodeBindPage.vue
View File

@ -108,9 +108,9 @@
}, },
toggleBind () { toggleBind () {
let that = this let that = this
that.showLoading = true
console.log(that.qrcode); console.log(that.qrcode);
that.$refs.qrForm.validate().then(formData => { that.$refs.qrForm.validate().then(formData => {
that.showLoading = true
console.log(formData); console.log(formData);
that.$api.qrcodeBinding.bindQrcode({ that.$api.qrcodeBinding.bindQrcode({
typeId: formData.specVal, typeId: formData.specVal,
@ -145,42 +145,43 @@
let that = this let that = this
const { code } = params const { code } = params
console.log(code); console.log(code);
that.qrcode = code that.qrcode = code
// 根据扫出的编码查询设备 // 根据扫出的编码查询设备
/* that.$api.fetchMaterialOutStore.fetchInfoByQrCode({ /* that.$api.fetchMaterialOutStore.fetchInfoByQrCode({
qrCode: code qrCode: code
}).then(res => { }).then(res => {
console.log('fetchInfoByQrCode =================================',res); console.log('fetchInfoByQrCode =================================',res);
// if (res.data.code == 200) that.deviceStats = res.data.rows[0] // if (res.data.code == 200) that.deviceStats = res.data.rows[0]
if (res.data.rows.length == 0) { if (res.data.rows.length == 0) {
that.showBindBtn = false that.showBindBtn = false
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '未查询到设备数据！' title: '未查询到设备数据！'
}) })
} else { } else {
that.showBindBtn = true that.showBindBtn = true
that.deviceStats = res.data.rows[0] that.deviceStats = res.data.rows[0]
} }
}).catch(err => { }).catch(err => {
console.log(err); console.log(err);
}) */ }) */
// 获取机具设备类型 // 获取机具设备类型
that.$api.qrcodeBinding.fetchDeviceType({ that.$api.qrcodeBinding.fetchDeviceType({
level: '3' level: '3'
}).then(res => { }).then(res => {
console.log(res); console.log(res);
if (res.data.code == 200) { if (res.data.code == 200) {
that.typeRange = res.data.data.map(item => { that.typeRange = res.data.data.map(item => {
return { return {
text: item['typeName'], text: item['typeName'],
value: item['typeId'] value: item['typeId']
} }
}) })
} }
}).catch(err => { }).catch(err => {
console.log(err); console.log(err);
}) })
} }
} }
</script> </script>

2
pages/scanOutStore/scanOutStore.vue
View File

@ -59,7 +59,7 @@
if (this.infoList[0].typeId != this.typeId) { if (this.infoList[0].typeId != this.typeId) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '编码与机具类型不匹配！' title: '机具类型不匹配！'
}) })
} else if (that.num == 0) { } else if (that.num == 0) {
uni.showToast({ uni.showToast({

2
pages/scanReceive/scanReceive.vue
View File

@ -79,7 +79,7 @@
if (this.infoList[0].typeId != this.typeId) { if (this.infoList[0].typeId != this.typeId) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '编码与机具类型不匹配！' title: '机具类型不匹配！'
}) })
} else if (this.infoList[0].sdId != '16') { } else if (this.infoList[0].sdId != '16') {
uni.showToast({ uni.showToast({

25
pages/workSpace/workSpace.vue
View File

@ -120,9 +120,28 @@
console.log(this.iptVal); console.log(this.iptVal);
}, },
jumpUrl (path) { jumpUrl (path) {
uni.navigateTo({ if (path == 'qrcodeBinding') {
url: `/pages/${path}/${path}` uni.scanCode({
}) success: (res) => {
const fixedCode = res.result.split('=')[1]
console.log(fixedCode);
if (!fixedCode) {
uni.showToast({
icon: 'none',
title: '未识别到设备！'
})
} else {
uni.navigateTo({
url: `/pages/qrcodeBindPage/qrcodeBindPage?code=${fixedCode}`
})
}
}
})
} else {
uni.navigateTo({
url: `/pages/${path}/${path}`
})
}
}, },
toast () { toast () {
uni.showToast({ uni.showToast({

BIN
unpackage/cache/apk/__UNI__9D122E1_cm.apk vendored
View File

Binary file not shown.

2
unpackage/cache/apk/apkurl vendored
View File

@ -1 +1 @@
https://app.liuyingyong.cn/build/download/e82cf720-014b-11ef-ad5f-97232358e97f https://app.liuyingyong.cn/build/download/26206c70-053c-11ef-a87d-2bd7f634329a

2
unpackage/cache/apk/cmManifestCache.json vendored
View File

File diff suppressed because one or more lines are too long

8
unpackage/cache/wgt/__UNI__9D122E1/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/cache/wgt/__UNI__9D122E1/app-view.js vendored
View File

File diff suppressed because one or more lines are too long

8
unpackage/dist/build/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/app-plus/app-view.js vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

99
unpackage/dist/dev/app-plus/app-view.js vendored
View File

@ -25822,28 +25822,12 @@ var render = function () {
"uni-view", "uni-view",
{ attrs: { _i: 36 } }, { attrs: { _i: 36 } },
[ [
_c("h4", { attrs: { _i: 37 } }, [_vm._v("车牌号")]), _c("h4", { attrs: { _i: 37 } }, [_vm._v("出库数量")]),
_c("uni-easyinput", { _c("uni-easyinput", {
attrs: { _i: 38 }, attrs: { _i: 38 },
model: { model: {
value: _vm._$g(38, "v-model"), value: _vm._$g(38, "v-model"),
callback: function () {}, callback: function () {},
expression: "carCode",
},
}),
],
1
),
_c(
"uni-view",
{ attrs: { _i: 39 } },
[
_c("h4", { attrs: { _i: 40 } }, [_vm._v("出库数量")]),
_c("uni-easyinput", {
attrs: { _i: 41 },
model: {
value: _vm._$g(41, "v-model"),
callback: function () {},
expression: "multiNum", expression: "multiNum",
}, },
}), }),
@ -25856,8 +25840,8 @@ var render = function () {
_c( _c(
"uni-view", "uni-view",
{ {
staticClass: _vm._$g(42, "sc"), staticClass: _vm._$g(39, "sc"),
attrs: { _i: 42 }, attrs: { _i: 39 },
on: { on: {
click: function ($event) { click: function ($event) {
return _vm.$handleViewEvent($event) return _vm.$handleViewEvent($event)
@ -25872,7 +25856,7 @@ var render = function () {
], ],
1 1
), ),
_c("u-loading-page", { attrs: { _i: 43 } }), _c("u-loading-page", { attrs: { _i: 40 } }),
], ],
2 2
) )
@ -26092,23 +26076,14 @@ var render = function () {
{ staticClass: _vm._$g(2, "sc"), attrs: { _i: 2 } }, { staticClass: _vm._$g(2, "sc"), attrs: { _i: 2 } },
[ [
_c("uni-easyinput", { _c("uni-easyinput", {
staticStyle: { "margin-bottom": "15rpx" },
attrs: { _i: 3 }, attrs: { _i: 3 },
model: {
value: _vm._$g(3, "v-model"),
callback: function () {},
expression: "carCode",
},
}),
_c("uni-easyinput", {
attrs: { _i: 4 },
on: { on: {
iconClick: function ($event) { iconClick: function ($event) {
return _vm.$handleViewEvent($event) return _vm.$handleViewEvent($event)
}, },
}, },
model: { model: {
value: _vm._$g(4, "v-model"), value: _vm._$g(3, "v-model"),
callback: function () {}, callback: function () {},
expression: "codeVal", expression: "codeVal",
}, },
@ -26116,7 +26091,7 @@ var render = function () {
], ],
1 1
), ),
_vm._l(_vm._$g(5, "f"), function (item, index, $20, $30) { _vm._l(_vm._$g(4, "f"), function (item, index, $20, $30) {
return _c( return _c(
"uni-view", "uni-view",
{ {
@ -26124,88 +26099,88 @@ var render = function () {
{ {
name: "show", name: "show",
rawName: "v-show", rawName: "v-show",
value: _vm._$g("5-" + $30, "v-show"), value: _vm._$g("4-" + $30, "v-show"),
expression: "_$g((\"5-\"+$30),'v-show')", expression: "_$g((\"4-\"+$30),'v-show')",
}, },
], ],
key: item, key: item,
staticClass: _vm._$g("5-" + $30, "sc"), staticClass: _vm._$g("4-" + $30, "sc"),
attrs: { _i: "5-" + $30 }, attrs: { _i: "4-" + $30 },
}, },
[ [
_c( _c(
"uni-view", "uni-view",
{ attrs: { _i: "6-" + $30 } }, { attrs: { _i: "5-" + $30 } },
[ [
_c("h4", { attrs: { _i: "7-" + $30 } }, [ _c("h4", { attrs: { _i: "6-" + $30 } }, [
_vm._v("机具分类"), _vm._v("机具分类"),
]), ]),
_c("span", { attrs: { _i: "8-" + $30 } }, [ _c("span", { attrs: { _i: "7-" + $30 } }, [
_vm._v(_vm._$g("8-" + $30, "t0-0")), _vm._v(_vm._$g("7-" + $30, "t0-0")),
]), ]),
], ],
1 1
), ),
_c( _c(
"uni-view", "uni-view",
{ attrs: { _i: "9-" + $30 } }, { attrs: { _i: "8-" + $30 } },
[ [
_c("h4", { attrs: { _i: "10-" + $30 } }, [ _c("h4", { attrs: { _i: "9-" + $30 } }, [
_vm._v("设备名称"), _vm._v("设备名称"),
]), ]),
_c("span", { attrs: { _i: "11-" + $30 } }, [ _c("span", { attrs: { _i: "10-" + $30 } }, [
_vm._v(_vm._$g("11-" + $30, "t0-0")), _vm._v(_vm._$g("10-" + $30, "t0-0")),
]), ]),
], ],
1 1
), ),
_c( _c(
"uni-view", "uni-view",
{ attrs: { _i: "12-" + $30 } }, { attrs: { _i: "11-" + $30 } },
[ [
_c("h4", { attrs: { _i: "13-" + $30 } }, [ _c("h4", { attrs: { _i: "12-" + $30 } }, [
_vm._v("设备规格"), _vm._v("设备规格"),
]), ]),
_c("span", { attrs: { _i: "14-" + $30 } }, [ _c("span", { attrs: { _i: "13-" + $30 } }, [
_vm._v(_vm._$g("14-" + $30, "t0-0")), _vm._v(_vm._$g("13-" + $30, "t0-0")),
]), ]),
], ],
1 1
), ),
_c( _c(
"uni-view", "uni-view",
{ attrs: { _i: "15-" + $30 } }, { attrs: { _i: "14-" + $30 } },
[ [
_c("h4", { attrs: { _i: "16-" + $30 } }, [ _c("h4", { attrs: { _i: "15-" + $30 } }, [
_vm._v("设备状态"), _vm._v("设备状态"),
]), ]),
_c("span", { attrs: { _i: "17-" + $30 } }, [ _c("span", { attrs: { _i: "16-" + $30 } }, [
_vm._v(_vm._$g("17-" + $30, "t0-0")), _vm._v(_vm._$g("16-" + $30, "t0-0")),
]), ]),
], ],
1 1
), ),
_c( _c(
"uni-view", "uni-view",
{ attrs: { _i: "18-" + $30 } }, { attrs: { _i: "17-" + $30 } },
[ [
_c("h4", { attrs: { _i: "19-" + $30 } }, [ _c("h4", { attrs: { _i: "18-" + $30 } }, [
_vm._v("机具编码"), _vm._v("机具编码"),
]), ]),
_c("span", { attrs: { _i: "20-" + $30 } }, [ _c("span", { attrs: { _i: "19-" + $30 } }, [
_vm._v(_vm._$g("20-" + $30, "t0-0")), _vm._v(_vm._$g("19-" + $30, "t0-0")),
]), ]),
], ],
1 1
), ),
_c( _c(
"uni-view", "uni-view",
{ attrs: { _i: "21-" + $30 } }, { attrs: { _i: "20-" + $30 } },
[ [
_c("h4", { attrs: { _i: "22-" + $30 } }, [ _c("h4", { attrs: { _i: "21-" + $30 } }, [
_vm._v("出库数量"), _vm._v("出库数量"),
]), ]),
_c("span", { attrs: { _i: "23-" + $30 } }, [_vm._v("1")]), _c("span", { attrs: { _i: "22-" + $30 } }, [_vm._v("1")]),
], ],
1 1
), ),
@ -26220,12 +26195,12 @@ var render = function () {
{ {
name: "show", name: "show",
rawName: "v-show", rawName: "v-show",
value: _vm._$g(24, "v-show"), value: _vm._$g(23, "v-show"),
expression: "_$g(24,'v-show')", expression: "_$g(23,'v-show')",
}, },
], ],
staticClass: _vm._$g(24, "sc"), staticClass: _vm._$g(23, "sc"),
attrs: { _i: 24 }, attrs: { _i: 23 },
on: { on: {
click: function ($event) { click: function ($event) {
return _vm.$handleViewEvent($event) return _vm.$handleViewEvent($event)