9/3 追溯码查询

20240912_adapter_z
wangwei 10 months ago
parent 489baf0f90
commit 116296d138

@ -55,8 +55,8 @@
</el-row>
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="管理设备:" prop="autoTag" class="query-form-item">
<el-select v-model="formData.autoTag" style="width: 80%" placeholder="请选择是否管理设备"
<el-form-item label="队列管理:" prop="autoTag" class="query-form-item">
<el-select v-model="formData.autoTag" style="width: 80%" placeholder="请选择是否队列设备"
>
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option>

@ -215,7 +215,7 @@
<span>{{ workplaceTypeMap[scope.row.workplaceType] }}</span>
</template>
</el-table-column>
<el-table-column label="管理设备" prop="autoTag" width="100">
<el-table-column label="队列管理" prop="autoTag" width="100">
<template slot-scope="scope">
<span>{{ autoTagTypes[scope.row.autoTag] }}</span>
</template>

@ -118,7 +118,7 @@
<el-divider style="margin: 15px"></el-divider>
<div v-if="false">
<!--<div v-if="tableStatus">-->
<el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
@row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)" ref="multipleTable"
:default-sort="defaultSort"
@ -231,18 +231,24 @@
:page.sync="filterQuery.page"
@pagination="handleCurrentChange"
></pagination>
</div>
<!--</div>-->
</el-card>
<el-dialog
title="赋码详情"
:visible.sync="checkDetailVisible"
title="单据详情"
:visible.sync="orderDetailVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="checkDetailVisible"
width="65%"
v-if="orderDetailVisible"
width="80%"
append-to-body
>
<orderDetailDialog
:orderData="orderData"
>
</orderDetailDialog>
</el-dialog>
</div>
@ -251,13 +257,15 @@
<script>
import { executeFuc, getHead } from '@/utils/customConfig'
import { convertDate } from '@/utils/date'
import {isBlank} from "@/utils/strUtil";
import { deleteByOrder, orderPage } from '@/api/collect/collectOrder'
import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage'
import { IoCollectCodePage } from '@/api/collect/IoCollectCodeSelect'
import orderDetailDialog from "./orderDetailDialog"
export default {
name: 'IoCollectCodeSelect',
name: 'IoCollectCodeSelect1',
components: {orderDetailDialog},
data() {
return {
//
@ -266,7 +274,7 @@ export default {
queryList: [],
tableObj: [],
fromList: [],
convertDateFun: convertDate,
// convertDateFun: convertDate,
//-------------end
showSearch: true,
@ -304,7 +312,10 @@ export default {
options: {
findWorkPlace: []
},
checkDetailVisible: false
checkDetailVisible: false,
tableStatus: false,
orderDetailVisible: false,
orderData: {}
}
},
methods: {
@ -344,26 +355,39 @@ export default {
this.showSearch = !this.showSearch
},
onReset() {
this.filterQuery = {}
this.actDateRange = []
this.getList()
this.filterQuery = {
page: 1,
limit: 10
}
this.list = []
// this.actDateRange = []
// this.getList()
},
closeDialog() {
this.bindWorkPlaceVisible = false
this.getList()
},
onSubmit() {
this.filterQuery.page = 1
// let h = this.hasOtherProperties(this.filterQuery)
this.getList()
},
getList() {
this.list = []
if (isBlank(this.filterQuery.workPlaceCode) &&
isBlank(this.filterQuery.billNo) &&
isBlank(this.filterQuery.fromType) &&
isBlank(this.filterQuery.fromCorp) &&
isBlank(this.filterQuery.code)) {
return this.$message.error("请输入查询条件")
}
this.loading = true
IoCollectCodePage(this.filterQuery).then(res => {
this.loading = false
this.list = res.data.list || []
this.total = res.data.total || 0
}).catch(() => {
this.loading = false
this.list = []
@ -422,15 +446,10 @@ export default {
this.$refs.inputRef.select()
},
hasOtherProperties(filterQuery) {
//
const keys = Object.keys(filterQuery)
//
const knownKeys = ['page', 'limit']
//
const otherKeys = keys.filter(key => !knownKeys.includes(key))
// truefalse
return otherKeys.length > 0
orderDetail(_this,row){
_this.orderData = row
_this.orderDetailVisible = true
}
},
mounted() {
@ -447,9 +466,9 @@ export default {
})
// this.timerAuto()
},
destroyed() {
clearInterval(this.timer)
}
// destroyed() {
// clearInterval(this.timer)
// }
}
</script>

@ -0,0 +1,175 @@
<template>
<div>
<el-form :model="formData" class="order-el-form" ref="formData" label-width="120px" @submit.native.prevent>
<el-card>
<el-descriptions title="单据信息" :column="4" border style="margin-top: 15px">
<el-descriptions-item label="业务单号">{{ formData.billNo }}</el-descriptions-item>
<el-descriptions-item label="往来信息">{{ formData.fromCorp }}</el-descriptions-item>
<el-descriptions-item label="单据类型">{{ formData.busTypeName }}</el-descriptions-item>
<el-descriptions-item label="来源系统">{{ formData.fromType }}</el-descriptions-item>
<el-descriptions-item label="单据时间">{{ formData.billTime }}</el-descriptions-item>
<el-descriptions-item label="单据备注">{{ formData.remark }}</el-descriptions-item>
</el-descriptions>
</el-card>
<el-tabs type="border-card" style="margin: 15px" v-model="editableTabsValue">
<el-tab-pane label="扫码详情" name="prescribeOriginPanel">
<prescribeOriginPanel
v-if="panelALive"
:prescribeData="curRow"
></prescribeOriginPanel>
</el-tab-pane>
<el-tab-pane label="拆零详情" name="prescribeCodePanel1">
<prescribeCodePanel
v-if="panelALive"
:prescribeData="curRow"
:fifoSplit="1"
></prescribeCodePanel>
</el-tab-pane>
<el-tab-pane label="整取详情" name="prescribeCodePanel2">
<prescribeCodePanel
v-if="panelALive"
:prescribeData="curRow"
:fifoSplit="2"
></prescribeCodePanel>
</el-tab-pane>
<el-tab-pane label="整单详情" name="PanelOrderAllDetail">
<PanelOrderAllDetail
v-if="panelALive"
:prescribeData="curRow"
></PanelOrderAllDetail>
</el-tab-pane>
</el-tabs>
</el-form>
</div>
</template>
<script>
import addOrder from '@/views/inout/DialogCreateOrder'
import errOrder from '@/views/inout/IoCreateErrorOrder'
import { executeFuc, getHead } from '@/utils/customConfig'
import { convertDate } from '@/utils/date'
import selectPrescribeDialog from '@/views/collect/selectCollectOrderDialog'
import prescribeOriginPanel from './PannelOrderBiz'
import prescribeCodePanel from './PanelOrderTagCode'
import PanelOrderAllDetail from '@/views/collect/PanelOrderAllDetail'
export default {
/**
* 处理处方
*/
name: 'prescribeTagCodeDeal',
props: {
orderData: {
type: Object,
required: true
}
},
data() {
return {
tabsName: [
'prescribeOriginPanel',
'prescribeCodePanel1',
'prescribeCodePanel2',
'PanelOrderAllDetail'
],
editableTabsValue: 'prescribeOriginPanel',
//
//
loading: false,
tableHeader: [],
queryList: [],
tableObj: [],
fromList: [],
convertDateFun: convertDate,
//-------------end
list: [],
total: 0,
defaultSort: { prop: 'createTime', order: 'desc' },
curWorkPlaces: [],
erpList: [],
formData: {
billNo: null,
tagStatus: -1,
invCode: null,
busType: null,
workPlaceCode: null,
fromCorp: null,
confirmFinish: false
},
curRow: null,
panelALive: false
}
},
components: {
prescribeCodePanel,
prescribeOriginPanel,
PanelOrderAllDetail
},
methods: {
//------------
executeFuc(row, type, clickFuc, value) {
return executeFuc(this, row, type, clickFuc, value)
},
executeEval(row, expression, defaultRet) {
if (expression) {
return eval(expression)
}
return defaultRet
},
///------------end
refreshCodesPanel(_this) {
_this.panelALive = false
_this.$nextTick(() => {
_this.panelALive = true
})
},
startDeal() {
this.curRow = this.formData
this.refreshCodesPanel(this)
}
// toggleBusType() {
// //
// // this.$refs.selectHeadEmpId.blur();
// this.selectBusTypeDisabled = true
// },
},
created() {
getHead('prescribeTagCodeDeal', '1').then((re) => {
//
this.tableObj = re.data
this.tableHeader = re.data.tableList
this.queryList = re.data.queryList
this.fromList = re.data.fromList
})
this.formData = this.orderData
this.startDeal()
}
}
</script>
<style scoped>
.el-col {
margin-top: -5px;
margin-bottom: -5px;
}
.el-dropdown {
vertical-align: top;
}
.el-dropdown + .el-dropdown {
margin-left: 15px;
}
.el-icon-arrow-down {
font-size: 12px;
}
</style>
Loading…
Cancel
Save