Commit 616882c6 by 韩振

1

parent 8d538069
...@@ -73,9 +73,12 @@ export default defineComponent({ ...@@ -73,9 +73,12 @@ export default defineComponent({
function handleRefresh() { function handleRefresh() {
console.log('刷新起点') console.log('刷新起点')
proxy.$refs.InTask[0].loadData() setTimeout(() => {
proxy.$refs.OutTask[0].loadData() proxy.$refs.InTask[0].loadData()
proxy.$refs.NoOrder[0].getTableData() proxy.$refs.OutTask[0].loadData()
proxy.$refs.NoOrder[0].getTableData()
}, 500)
} }
function handleLogChange(data) { function handleLogChange(data) {
log.value = data log.value = data
......
...@@ -27,6 +27,11 @@ ...@@ -27,6 +27,11 @@
<el-table-column prop="modelName" label="号型" align="center"/> <el-table-column prop="modelName" label="号型" align="center"/>
<el-table-column prop="amount" label="箱内数量" align="center"/> <el-table-column prop="amount" label="箱内数量" align="center"/>
<el-table-column prop="xhNo" label="箱号" align="center"/> <el-table-column prop="xhNo" label="箱号" align="center"/>
<el-table-column prop="xhNo" label="操作" align="center">
<template #default="scope">
<el-button type="danger" size="small" @click="deleteEpc(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table> </el-table>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
...@@ -61,6 +66,7 @@ ...@@ -61,6 +66,7 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<audio ref="audio" :src="url" autoplay></audio>
<el-dialog v-model="visible" width="45%" > <el-dialog v-model="visible" width="45%" >
<template #header> <template #header>
<div style="text-align: center;font-size: 18px;font-family: Microsoft YaHei;font-weight: bold;color: #303133;">{{title}}</div> <div style="text-align: center;font-size: 18px;font-family: Microsoft YaHei;font-weight: bold;color: #303133;">{{title}}</div>
...@@ -269,13 +275,16 @@ ...@@ -269,13 +275,16 @@
</template> </template>
<script> <script>
import { defineComponent, ref, reactive, toRefs, onBeforeUnmount } from 'vue' import { defineComponent, ref, reactive, toRefs, onBeforeUnmount, getCurrentInstance } from 'vue'
import { ElMessage, ElCard } from 'element-plus' import { ElMessage, ElCard } from 'element-plus'
import { postAction, getAction } from '@/api/manage' import { postAction, getAction } from '@/api/manage'
import { Help, Monitor } from '@element-plus/icons-vue' import { Help, Monitor } from '@element-plus/icons-vue'
// 引入音频文件
import audio from '../assets/error.mp3'
export default defineComponent({ export default defineComponent({
components: { Monitor, Help }, components: { Monitor, Help },
setup(props, {emit}) { setup(props, {emit}) {
const { proxy } = getCurrentInstance()
const channelList = ref([]); const channelList = ref([]);
const sysForm = ref({}) const sysForm = ref({})
const logData = ref([]) const logData = ref([])
...@@ -307,7 +316,8 @@ export default defineComponent({ ...@@ -307,7 +316,8 @@ export default defineComponent({
removeDevice: '/device/removeDevice', removeDevice: '/device/removeDevice',
saveDevice: '/device/saveDevice', saveDevice: '/device/saveDevice',
updateConfig: '/config/updateConfig', updateConfig: '/config/updateConfig',
getStoreCode: '/config/getStoreCode' getStoreCode: '/config/getStoreCode',
deleteEpc: '/log/deleteEpc',
}, },
storeInfo: {}, storeInfo: {},
storeCode: '', storeCode: '',
...@@ -385,6 +395,11 @@ export default defineComponent({ ...@@ -385,6 +395,11 @@ export default defineComponent({
let stationType = message.stationType let stationType = message.stationType
let noticeInfoList = JSON.parse(message.noticeInfo) let noticeInfoList = JSON.parse(message.noticeInfo)
let newArr = noticeInfoList.map(v=> { let newArr = noticeInfoList.map(v=> {
v.type = message.stationType
if (v.isShow){
//播放音频
proxy.$refs.audio.play()
}
return {...v, stationType: stationType} return {...v, stationType: stationType}
}) })
let channel = channelList.value.find(i => i.stationId == message.stationId) let channel = channelList.value.find(i => i.stationId == message.stationId)
...@@ -542,6 +557,26 @@ export default defineComponent({ ...@@ -542,6 +557,26 @@ export default defineComponent({
}) })
} }
function deleteEpc(row) {
let param = row;
param.storeCode = JSON.parse(sessionStorage.getItem('storeInfo')).storeCode;
// 删除确认
this.$confirm('此操作将删除该数据, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
postAction(state.url.deleteEpc, param).then(res => {
if (res.code !== 99200) return ElMessage.error(res.message);
let channel = channelList.value.find(i => i.stationId == activeTab.value)
let x = channel.logData.indexOf(row)
channel.logData.splice(x, 1)
})
}).catch(() => {
this.$message.error('已取消')
})
}
loadData() loadData()
return { return {
...toRefs(state), ...toRefs(state),
...@@ -571,7 +606,9 @@ export default defineComponent({ ...@@ -571,7 +606,9 @@ export default defineComponent({
handleSubmit, handleSubmit,
clearData, clearData,
changeErr, changeErr,
changeType changeType,
url: audio,
deleteEpc
} }
}, },
}) })
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论