diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/component/DialogPush.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/component/DialogPush.vue new file mode 100644 index 00000000..9c09ad00 --- /dev/null +++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/component/DialogPush.vue @@ -0,0 +1,98 @@ + + + + + diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue index 75088a6a..83c9fbd1 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue @@ -92,6 +92,16 @@ v-hasPermi="['picking:outbound:export']" >导出 + + 推送到智慧工地 - - + + + + + + + + @@ -525,10 +569,12 @@ import { import { getTypeList } from '@/api/store/warehousing' import { equipmentTypeTree } from '@/api/store/tools' import Treeselect from '@riophae/vue-treeselect' +import MapDialog from '@/views/warehouseManage/machinery/coding/component/MapDialog' +import DialogPush from './component/DialogPush' import '@riophae/vue-treeselect/dist/vue-treeselect.css' export default { name: 'receiveOut', - components: { Treeselect }, + components: { Treeselect, MapDialog, DialogPush }, data() { return { // 遮罩层 @@ -602,6 +648,7 @@ export default { outTotal: 0, //编码弹窗分页-总数 outCodeList: [], //编码弹窗表格数据 outNumList: [], //数量弹窗表格数据 + selectList: [], } }, created() { @@ -833,6 +880,26 @@ export default { `领料出库_${new Date().getTime()}.xlsx`, ) }, + // 推送智慧工地 + handlePush() { + console.log('🚀 ~ handlePush ~ :',) + this.$refs.dialogPush.openDialog(true) + }, + handleSelect(val) { + console.log('🚀 ~ handleSelect ~ :', val) + this.selectList = val + console.log('🚀 ~ handleSelect ~ this.selectList:', this.selectList) + }, + handleMap(row) { + console.log('~ handleMap ~ 地图', row) + const params = { + deviceType: row.deviceType, + } + // 点击打开弹框 + this.$refs.mapDIalog.openMapDialog(true) + this.$refs.mapDIalog.getEquipmentInfo(params) + this.$refs.mapDIalog.initMap() + }, }, } diff --git a/sgzb-ui/src/views/warehouseManage/machinery/IOTequipment/index.vue b/sgzb-ui/src/views/warehouseManage/machinery/IOTequipment/index.vue index 21afdb41..e7fcb097 100644 --- a/sgzb-ui/src/views/warehouseManage/machinery/IOTequipment/index.vue +++ b/sgzb-ui/src/views/warehouseManage/machinery/IOTequipment/index.vue @@ -43,6 +43,7 @@ 记录 修改 删除 + 解绑 @@ -267,6 +268,12 @@ export default { // this.getList() // }) }, + handleUnbind(row) { + const params = { + id: row.id, + } + console.log('🚀 ~ handleUnbind ~ 解绑', row) + }, selectionChange(val) { console.log('🚀 ~ selectionChange ~ val:', val) }, diff --git a/sgzb-ui/src/views/warehouseManage/machinery/coding/component/BindIOT.vue b/sgzb-ui/src/views/warehouseManage/machinery/coding/component/BindIOT.vue index 7e2b391f..6e9ced37 100644 --- a/sgzb-ui/src/views/warehouseManage/machinery/coding/component/BindIOT.vue +++ b/sgzb-ui/src/views/warehouseManage/machinery/coding/component/BindIOT.vue @@ -26,7 +26,7 @@ - +