diff --git a/src/manifest.json b/src/manifest.json
index 53d882e..a04fdd3 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "material-app",
+ "name" : "材料站管理",
"appid" : "__UNI__AEEB2B7",
"description" : "",
"versionName" : "1.0.1",
@@ -60,6 +60,38 @@
"sdkConfigs" : {
"ad" : {},
"geolocation" : {}
+ },
+ "icons" : {
+ "android" : {
+ "hdpi" : "unpackage/res/icons/72x72.png",
+ "xhdpi" : "unpackage/res/icons/96x96.png",
+ "xxhdpi" : "unpackage/res/icons/144x144.png",
+ "xxxhdpi" : "unpackage/res/icons/192x192.png"
+ },
+ "ios" : {
+ "appstore" : "unpackage/res/icons/1024x1024.png",
+ "ipad" : {
+ "app" : "unpackage/res/icons/76x76.png",
+ "app@2x" : "unpackage/res/icons/152x152.png",
+ "notification" : "unpackage/res/icons/20x20.png",
+ "notification@2x" : "unpackage/res/icons/40x40.png",
+ "proapp@2x" : "unpackage/res/icons/167x167.png",
+ "settings" : "unpackage/res/icons/29x29.png",
+ "settings@2x" : "unpackage/res/icons/58x58.png",
+ "spotlight" : "unpackage/res/icons/40x40.png",
+ "spotlight@2x" : "unpackage/res/icons/80x80.png"
+ },
+ "iphone" : {
+ "app@2x" : "unpackage/res/icons/120x120.png",
+ "app@3x" : "unpackage/res/icons/180x180.png",
+ "notification@2x" : "unpackage/res/icons/40x40.png",
+ "notification@3x" : "unpackage/res/icons/60x60.png",
+ "settings@2x" : "unpackage/res/icons/58x58.png",
+ "settings@3x" : "unpackage/res/icons/87x87.png",
+ "spotlight@2x" : "unpackage/res/icons/80x80.png",
+ "spotlight@3x" : "unpackage/res/icons/120x120.png"
+ }
+ }
}
},
"nativePlugins" : {}
diff --git a/src/pages/toolsLease/codeOut.vue b/src/pages/toolsLease/codeOut.vue
index f6186ca..17cf55c 100644
--- a/src/pages/toolsLease/codeOut.vue
+++ b/src/pages/toolsLease/codeOut.vue
@@ -66,7 +66,7 @@
-
+
@@ -234,17 +234,17 @@ const delMaterial = (item, index) => {
}
// 获取编码列表
const getCodeDetailData = async (id, publishTask, typeId) => {
- console.log('yyyyyyyyyy', id, publishTask, typeId)
- const res = await getCodeDetailAPI({ id: id, publishTask: publishTask, typeId: typeId })
- console.log('zzzzzzzzz', res)
- formData.value = res.data
- console.log('xxxxxxxxxxxxxx', formData.value, maxNum.value)
- // maxNum.value = formData.value.preNum - formData.value.alNum
+ // console.log('yyyyyyyyyy', id, publishTask, typeId)
+ // const res = await getCodeDetailAPI({ id: id, publishTask: publishTask, typeId: typeId })
+ // console.log('zzzzzzzzz', res)
+ // formData.value = res.data
+ // console.log('xxxxxxxxxxxxxx', formData.value, maxNum.value)
+ // // maxNum.value = formData.value.preNum - formData.value.alNum
- queryCodeParams.value.typeId = queryParams.value.typeId
- queryCodeParams.value.pageNum = 1
- codeDeviceList.value = []
- getCodeDeviceListData() //获取编码列表
+ // queryCodeParams.value.typeId = queryParams.value.typeId
+ // queryCodeParams.value.pageNum = 1
+ // codeDeviceList.value = []
+ // getCodeDeviceListData() //获取编码列表
}
// 获取编码列表
@@ -512,6 +512,8 @@ const scanStart = () => {
uni.showToast({ title: '扫码识别失败', icon: 'none' })
} else {
const params = { qrCode, typeId: queryParams.value.typeId }
+ console.log('🚀 ~ success: ~ queryParams.value.isAddCode:', queryParams.value.isAddCode)
+ if (queryParams.value.isAddCode) delete params.typeId
console.log('🚀 ~ success: ~ params:', params)
try {
const res = await getInfoByQrcode(params)
@@ -537,7 +539,7 @@ const scanStart = () => {
})
}
} else {
- uni.showToast({ title: res.data.msg, icon: 'none' })
+ uni.showToast({ title: res.data.msg, icon: 'none', duration: 1500 })
}
} else {
uni.showToast({ title: '扫码识别失败', icon: 'none' })
@@ -553,6 +555,12 @@ const scanStart = () => {
})
}
+// 处理RFID识别
+const handleRfid = () => {
+ // 提示
+ uni.showToast({ title: '请在扫码终端操作', icon: 'none' })
+}
+
// 处理扫描成功事件
const handleScanSuccess = (result) => {
qrCodeScan.value = result
diff --git a/src/pages/toolsLease/toolsLeaseAdd.vue b/src/pages/toolsLease/toolsLeaseAdd.vue
index 8cc6392..3dc2049 100644
--- a/src/pages/toolsLease/toolsLeaseAdd.vue
+++ b/src/pages/toolsLease/toolsLeaseAdd.vue
@@ -84,7 +84,7 @@
{
item.preNum = 1
return false
}
+ if (opts.value.isNew == 0 || opts.value.isOut) {
+ if (item.preNum > item.storageNum) {
+ uni.showToast({
+ icon: 'none',
+ title: '出库数量不能大于库存数量',
+ })
+ // 重置为库存数量
+ item.preNum = item.storageNum
+ return false
+ }
+ }
}
// 选择工程
@@ -305,8 +316,6 @@ const submit = () => {
form.value
.validate()
.then(async (valid) => {
- if (loading.value) return
- loading.value = true
console.log('🚀 ~ form.value.validate.then ~ valid:', valid)
if (tableData.value.length === 0) {
await uni.showToast({
@@ -340,9 +349,17 @@ const submit = () => {
if (!opts.value.isEdit && opts.value.isNew != 0) {
const res = await addLeaseTask(params)
console.log('🚀 ~ .then ~ res:', res)
+ uni.showToast({
+ icon: 'none',
+ title: '操作成功',
+ })
back()
} else if (opts.value.isEdit && opts.value.isNew != 0) {
const res = await editLeaseTask(params)
+ uni.showToast({
+ icon: 'none',
+ title: '操作成功',
+ })
back()
} else {
let res = {}
@@ -357,18 +374,16 @@ const submit = () => {
item.parentId = opts.value.parentId || res.data
item.outNum = item.preNum
})
- await leaseOutApi({ leaseOutDetailsList: tableData.value })
+ const res2 = await leaseOutApi({ leaseOutDetailsList: tableData.value })
+ console.log('🚀 ~ .then ~ res2:', res2)
+ uni.showToast({
+ icon: 'none',
+ title: '操作成功',
+ })
back()
}
- loading.value = false
- // 提示
- uni.showToast({
- icon: 'none',
- title: '操作成功',
- })
} catch (error) {
console.log('🚀 ~ .then ~ error:', error)
- loading.value = false
}
})
.catch((err) => {
diff --git a/src/static/clz-logo.png b/src/static/clz-logo.png
new file mode 100644
index 0000000..e5e4986
Binary files /dev/null and b/src/static/clz-logo.png differ
diff --git a/src/static/clz_icon.9.png b/src/static/clz_icon.9.png
new file mode 100644
index 0000000..640cfc5
Binary files /dev/null and b/src/static/clz_icon.9.png differ
diff --git a/unpackage/res/icons/1024x1024.png b/unpackage/res/icons/1024x1024.png
new file mode 100644
index 0000000..09129c9
Binary files /dev/null and b/unpackage/res/icons/1024x1024.png differ
diff --git a/unpackage/res/icons/120x120.png b/unpackage/res/icons/120x120.png
new file mode 100644
index 0000000..f602cad
Binary files /dev/null and b/unpackage/res/icons/120x120.png differ
diff --git a/unpackage/res/icons/144x144.png b/unpackage/res/icons/144x144.png
new file mode 100644
index 0000000..d525896
Binary files /dev/null and b/unpackage/res/icons/144x144.png differ
diff --git a/unpackage/res/icons/152x152.png b/unpackage/res/icons/152x152.png
new file mode 100644
index 0000000..9668387
Binary files /dev/null and b/unpackage/res/icons/152x152.png differ
diff --git a/unpackage/res/icons/167x167.png b/unpackage/res/icons/167x167.png
new file mode 100644
index 0000000..57f7ec2
Binary files /dev/null and b/unpackage/res/icons/167x167.png differ
diff --git a/unpackage/res/icons/180x180.png b/unpackage/res/icons/180x180.png
new file mode 100644
index 0000000..43af9ca
Binary files /dev/null and b/unpackage/res/icons/180x180.png differ
diff --git a/unpackage/res/icons/192x192.png b/unpackage/res/icons/192x192.png
new file mode 100644
index 0000000..4d22fd2
Binary files /dev/null and b/unpackage/res/icons/192x192.png differ
diff --git a/unpackage/res/icons/20x20.png b/unpackage/res/icons/20x20.png
new file mode 100644
index 0000000..b946949
Binary files /dev/null and b/unpackage/res/icons/20x20.png differ
diff --git a/unpackage/res/icons/29x29.png b/unpackage/res/icons/29x29.png
new file mode 100644
index 0000000..22066c1
Binary files /dev/null and b/unpackage/res/icons/29x29.png differ
diff --git a/unpackage/res/icons/40x40.png b/unpackage/res/icons/40x40.png
new file mode 100644
index 0000000..1d54728
Binary files /dev/null and b/unpackage/res/icons/40x40.png differ
diff --git a/unpackage/res/icons/58x58.png b/unpackage/res/icons/58x58.png
new file mode 100644
index 0000000..bbb6278
Binary files /dev/null and b/unpackage/res/icons/58x58.png differ
diff --git a/unpackage/res/icons/60x60.png b/unpackage/res/icons/60x60.png
new file mode 100644
index 0000000..0a36fc4
Binary files /dev/null and b/unpackage/res/icons/60x60.png differ
diff --git a/unpackage/res/icons/72x72.png b/unpackage/res/icons/72x72.png
new file mode 100644
index 0000000..cc9e25d
Binary files /dev/null and b/unpackage/res/icons/72x72.png differ
diff --git a/unpackage/res/icons/76x76.png b/unpackage/res/icons/76x76.png
new file mode 100644
index 0000000..111de30
Binary files /dev/null and b/unpackage/res/icons/76x76.png differ
diff --git a/unpackage/res/icons/80x80.png b/unpackage/res/icons/80x80.png
new file mode 100644
index 0000000..421787e
Binary files /dev/null and b/unpackage/res/icons/80x80.png differ
diff --git a/unpackage/res/icons/87x87.png b/unpackage/res/icons/87x87.png
new file mode 100644
index 0000000..bff3311
Binary files /dev/null and b/unpackage/res/icons/87x87.png differ
diff --git a/unpackage/res/icons/96x96.png b/unpackage/res/icons/96x96.png
new file mode 100644
index 0000000..2909eb0
Binary files /dev/null and b/unpackage/res/icons/96x96.png differ