Skip to content

F
factory_front
Commit 9eef5518 by qinjianhui
Options

Merge branch 'dev'

parents 3c03a950 0daefde9
Showing with 35 additions and 35 deletions
src/views/order/podUs/index.vue
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
:class="exceptionStatus === 3 ? 'sub-active' : ''" :class="exceptionStatus === 3 ? 'sub-active' : ''"
@click="handleExceptionCommand(3)" @click="handleExceptionCommand(3)"
> >
<span class="sub-status-item-label">已处理</span> <span class="sub-status-item-label">待同步</span>
</div> </div>
</div> </div>
<div class="operation-box mb-10"> <div class="operation-box mb-10">
...@@ -202,14 +202,14 @@ ...@@ -202,14 +202,14 @@
> >
<ElButton type="warning" @click="assignOrder"> 分派 </ElButton> <ElButton type="warning" @click="assignOrder"> 分派 </ElButton>
</span> </span>
<span <!-- <span
v-if="status === 'EXCEPTION_ORDER' && exceptionStatus === 2" v-if="status === 'EXCEPTION_ORDER' && exceptionStatus === 2"
class="item" class="item"
> >
<ElButton type="warning" @click="handleExceptionOrder"> <ElButton type="warning" @click="handleExceptionOrder">
处理异常 处理异常
</ElButton> </ElButton>
</span> </span> -->
<span v-if="status === 'PICKING'" class="item"> <span v-if="status === 'PICKING'" class="item">
<ElButton type="primary" @click="printProductionOrder"> <ElButton type="primary" @click="printProductionOrder">
打印生产单 打印生产单
...@@ -1162,7 +1162,7 @@ import { ...@@ -1162,7 +1162,7 @@ import {
createLogisticsOrderApi, createLogisticsOrderApi,
updateLogisticsToPickingApi, updateLogisticsToPickingApi,
createLogisticsOrdersApi, createLogisticsOrdersApi,
handleExceptionOrderApi, // handleExceptionOrderApi,
} from '@/api/podUsOrder' } from '@/api/podUsOrder'
import { BaseRespData } from '@/types/api' import { BaseRespData } from '@/types/api'
...@@ -1608,37 +1608,37 @@ const assignOrder = async () => { ...@@ -1608,37 +1608,37 @@ const assignOrder = async () => {
currentOrderIds.value = selection.value.map((item) => item.id) currentOrderIds.value = selection.value.map((item) => item.id)
exceptionDialogVisible.value = true exceptionDialogVisible.value = true
} }
const handleExceptionOrder = async () => { // const handleExceptionOrder = async () => {
if (selection.value.length === 0) { // if (selection.value.length === 0) {
return ElMessage.warning('请选择数据') // return ElMessage.warning('请选择数据')
} // }
try { // try {
await showConfirm('确定处理异常吗?', { // await showConfirm('确定处理异常吗?', {
confirmButtonText: '确认', // confirmButtonText: '确认',
cancelButtonText: '取消', // cancelButtonText: '取消',
type: 'warning', // type: 'warning',
}) // })
} catch { // } catch {
return // return
} // }
const orderIds = selection.value.map((item) => item.id) // const orderIds = selection.value.map((item) => item.id)
const loading = ElLoading.service({ // const loading = ElLoading.service({
fullscreen: true, // fullscreen: true,
text: '操作中...', // text: '操作中...',
background: 'rgba(0, 0, 0, 0.3)', // background: 'rgba(0, 0, 0, 0.3)',
}) // })
try { // try {
const res = await handleExceptionOrderApi(orderIds) // const res = await handleExceptionOrderApi(orderIds)
if (res.code !== 200) return // if (res.code !== 200) return
ElMessage.success('操作成功') // ElMessage.success('操作成功')
search() // search()
loadTabData() // loadTabData()
} catch (e) { // } catch (e) {
console.error(e) // console.error(e)
} finally { // } finally {
loading.close() // loading.close()
} // }
} // }
const printProductionOrder = async () => { const printProductionOrder = async () => {
if (selection.value.length === 0) { if (selection.value.length === 0) {
return ElMessage.warning('请选择数据') return ElMessage.warning('请选择数据')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment