diff --git a/.env.development b/.env.development
index 7903d2b..8a258ab 100644
--- a/.env.development
+++ b/.env.development
@@ -3,8 +3,8 @@ ENV = 'development'
# 接口地址
# 许镇-本地服地址
-#VUE_APP_BASE_API = 'http://192.168.99.67:12010'
-VUE_APP_BASE_API = 'http://192.168.99.86:12010'
+VUE_APP_BASE_API = 'http://192.168.99.72:12010'
+#VUE_APP_BASE_API = 'http://192.168.99.86:12010'
#VUE_APP_BASE_API = 'http://27.19.205.234:17070'
diff --git a/src/api/stockTask/index.js b/src/api/stockTask/index.js
index e30ed0e..c4dd0de 100644
--- a/src/api/stockTask/index.js
+++ b/src/api/stockTask/index.js
@@ -156,4 +156,12 @@ export function FetchMoveBills(data) {
})
}
-export default { add, edit, del, FetchUpdateStockTaskStatus, FetchInitSuggestTilting, FetchInitSetting, FetchEditSetting, FetchInitHomeInfo, FetchInitStockInfo, FetchInitHotBookList, FetchInitHotShelfList, FetchInitBookDetailsByGrids, FetchAITerminalStatusQuery, FetchBillByShelfIdAndGridShelf, FetchIsGoodcutByBillNoAndGridId, FetchInitErrorProbaDesc, FetchShowByBillIdAndShelfIdAndGridShelf, FetchStartStopBookAIService, FetchMoveBills }
+// 根据层架位id获取最新盘点信息
+export function FetchNewBillByGridId(params) {
+ return request({
+ url: 'api/stocktask-task/getNewBillByGridId' + '?' + qs.stringify(params, { indices: false }),
+ method: 'get'
+ })
+}
+
+export default { add, edit, del, FetchUpdateStockTaskStatus, FetchInitSuggestTilting, FetchInitSetting, FetchEditSetting, FetchInitHomeInfo, FetchInitStockInfo, FetchInitHotBookList, FetchInitHotShelfList, FetchInitBookDetailsByGrids, FetchAITerminalStatusQuery, FetchBillByShelfIdAndGridShelf, FetchIsGoodcutByBillNoAndGridId, FetchInitErrorProbaDesc, FetchShowByBillIdAndShelfIdAndGridShelf, FetchStartStopBookAIService, FetchMoveBills, FetchNewBillByGridId }
diff --git a/src/views/dashboard/PanelGroup.vue b/src/views/dashboard/PanelGroup.vue
index 5fe12a0..2a9e520 100644
--- a/src/views/dashboard/PanelGroup.vue
+++ b/src/views/dashboard/PanelGroup.vue
@@ -33,9 +33,19 @@
+
@@ -50,6 +60,12 @@
+
@@ -150,4 +166,11 @@ export default {
}
}
}
+
+.error-data{
+ font-size: 24px;
+ font-weight: bold;
+ color: #ED4A41;
+ margin: 10px 0 0 0;
+}
diff --git a/src/views/home.vue b/src/views/home.vue
index 4c9b073..754df5f 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -188,7 +188,9 @@ export default {
regionCount: 0,
shelfCount: 0,
gridCount: 0,
- deviceCount: 0
+ deviceCount: 0,
+ noStockGridCount: 0,
+ deviceErrorCount: 0
},
taskStockLogData: [],
echartsTimer: null,
@@ -342,7 +344,9 @@ export default {
regionCount: data.regionCount,
shelfCount: data.shelfCount,
gridCount: data.gridCount,
- deviceCount: data.deviceCount
+ deviceCount: data.deviceCount,
+ noStockGridCount: data.noStockGridCount,
+ deviceErrorCount: data.deviceErrorCount
}
})
},
diff --git a/src/views/visualCheck/checkManage/bookSearch/index.vue b/src/views/visualCheck/checkManage/bookSearch/index.vue
index f719224..7b192df 100644
--- a/src/views/visualCheck/checkManage/bookSearch/index.vue
+++ b/src/views/visualCheck/checkManage/bookSearch/index.vue
@@ -13,10 +13,10 @@
-
+
一键下架
@@ -86,58 +86,49 @@
已选图书
- - 【条码号】图书题名1
- - 【条码号】图书题名1
- - 【条码号】图书题名1
- - 【条码号】图书题名1
- - 【条码号】图书题名1
- - 【条码号】图书题名1
- - 【条码号】图书题名1
- - 【条码号】图书题名1
- - 【条码号】图书题名1
- - 【条码号】图书题名1
+ - 【{{ item.barcode }}】{{ item.bookName }}
选择上架位置
-
+
-
+
-
+
-
+
@@ -145,8 +136,8 @@
@@ -306,7 +297,10 @@ export default {
},
tabIndex: 0,
defaultImg: defaultImg,
- imageUrl: defaultImg
+ imageUrl: defaultImg,
+ selectBookData: [],
+ selectShelfVal: '',
+ selectGridVal: null
}
},
@@ -400,8 +394,36 @@ export default {
this.crud.delAllLoading = false
})
},
- handleBatchListing() {
- this.addBookShelfVisible = true
+ handleBatchListing(datas) {
+ const hasNonUnknownStatus = datas.some(item => item.bookStatus !== '未知')
+ if (hasNonUnknownStatus) {
+ this.$message({ message: '当前所选数据包含已上架过的图书,请检查后再操作!', type: 'error', offset: 8 })
+ return
+ } else {
+ this.selectBookData = datas
+ this.addBookShelfVisible = true
+ }
+ },
+ saveBatchUp() {
+ this.$refs.form.validate((valid) => {
+ if (valid) {
+ const params = {
+ 'gridId': this.selectGridVal.id,
+ 'stockRegion': this.selectShelfVal + '-' + removeQUPrefix(this.selectGridVal.gridName)
+ }
+ console.log('params', params)
+
+ // crudBook.FetchFastDownShelf(params).then(() => {
+ // this.$message({ message: '批量上架成功', type: 'success', offset: 8 })
+ // this.crud.refresh()
+ // }).catch(err => {
+ // console.log(err)
+ // })
+ } else {
+ console.log('error submit!!')
+ return false
+ }
+ })
},
changeFloorValue(value) {
console.log(value)
@@ -411,7 +433,7 @@ export default {
this.shelfOptions = []
this.girdOptions = []
const params = {
- 'floorId': value
+ 'floorId': value.id
}
FetchRegionAllByFloor(params).then(res => {
this.regionOptions = res
@@ -424,7 +446,7 @@ export default {
this.crud.form.girdId = null
this.girdOptions = []
const params = {
- 'regionId': value
+ 'regionId': value.id
}
FetchShelfAllByRegionId(params).then(res => {
this.shelfOptions = res
@@ -433,9 +455,10 @@ export default {
},
changeShelfValue(value) {
console.log(value)
+ this.selectShelfVal = value.floorName + '-' + value.regionName
this.crud.form.girdId = null
const params = {
- 'shelfId': value
+ 'shelfId': value.shelfId
}
FetchShelfGridAllByShelfId(params).then(res => {
this.girdOptions = res
@@ -443,8 +466,13 @@ export default {
})
},
changeGirdValue(value) {
+ this.selectGridVal = value
console.log(value)
+ },
+ handleCloseDialog() {
+ this.addBookShelfVisible = false
}
+
}
}
diff --git a/src/views/visualCheck/checkManage/dataScreening/girdList.vue b/src/views/visualCheck/checkManage/dataScreening/girdList.vue
index ab7291b..70c2d49 100644
--- a/src/views/visualCheck/checkManage/dataScreening/girdList.vue
+++ b/src/views/visualCheck/checkManage/dataScreening/girdList.vue
@@ -127,7 +127,7 @@
在架:
{{ baseStockData.length !==0 && baseStockData[index].onShelfNum }}
-
+
详情
@@ -173,7 +173,7 @@
盘点照片
-->
-