fix: 提交
chenhc
10 months ago
parent
b8781fb399
commit
a99b50ff2a
@ -1,70 +0,0 @@
|
||||
<template>
|
||||
<div>
|
||||
|
||||
|
||||
<el-tabs type="border-card" style="margin: 15px">
|
||||
|
||||
<el-tab-pane label="待处理单据">
|
||||
<CollectOrderAllotCardComponents style="margin: -15px"
|
||||
:tagStatus="'1'"
|
||||
:workPlaceCode="workPlaceCode"
|
||||
@parent-method="parentMethod"
|
||||
></CollectOrderAllotCardComponents>
|
||||
</el-tab-pane>
|
||||
|
||||
<el-tab-pane label="未分配工位单据">
|
||||
<CollectOrderAllotComponents
|
||||
style="margin: -15px"
|
||||
:tagStatus="'0'"
|
||||
:viewType="1"
|
||||
:workPlaceCode="workPlaceCode"
|
||||
></CollectOrderAllotComponents>
|
||||
</el-tab-pane>
|
||||
|
||||
|
||||
|
||||
</el-tabs>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import CollectOrderAllotComponents from "./CollectOrderAllotComponents.vue";
|
||||
import CollectOrderAllotCardComponents from "./CollectOrderAllotCardComponents.vue";
|
||||
|
||||
|
||||
/**
|
||||
* 已完成处方
|
||||
*/
|
||||
export default {
|
||||
name: "PrescribeTagCode",
|
||||
components: {
|
||||
CollectOrderAllotComponents,CollectOrderAllotCardComponents
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
workPlaceCode: null,
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
parentMethod(data,url) {
|
||||
// 处理从子组件传来的数据
|
||||
this.callParentMethod(data)
|
||||
},
|
||||
callParentMethod(val) {
|
||||
// 触发自定义事件 'parent-method'
|
||||
this.$emit('parent-method', val); // someData 是你想要传递给父组件的数据
|
||||
},
|
||||
},
|
||||
created() {
|
||||
if (this.$route.query.workplaceId != null){
|
||||
this.workPlaceCode = Number(this.$route.query.workplaceId);
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,459 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-card>
|
||||
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form"
|
||||
size="mini" label-width="100px"
|
||||
>
|
||||
<el-row style=" display:flex; flex-wrap: wrap; ">
|
||||
<template v-for="(item, index) in queryList">
|
||||
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
|
||||
class="query-form-item"
|
||||
:label="item.columnDesc+`:`" :key="item.id"
|
||||
>
|
||||
<el-input
|
||||
v-model="filterQuery[item.columnName]"
|
||||
:placeholder="item.columnDesc"
|
||||
:disabled="executeEval(null,item.disabledFuc,false)"
|
||||
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
|
||||
class="query-form-item"
|
||||
:label="item.columnDesc+`:`"
|
||||
>
|
||||
<el-select v-model="filterQuery[item.columnName]"
|
||||
:placeholder="item.columnDesc"
|
||||
:disabled="executeEval(null,item.disabledFuc,false)"
|
||||
clearable
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in item.lableRuleObj"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
|
||||
class="query-form-item"
|
||||
:label="item.columnDesc+`:`"
|
||||
>
|
||||
<el-select
|
||||
v-model="filterQuery[item.columnName]"
|
||||
:placeholder="item.columnDesc"
|
||||
@change="executeFuc($event,'5',item.checkRules)"
|
||||
:disabled="executeEval(null,item.disabledFuc,false)"
|
||||
filterable
|
||||
remote
|
||||
:remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
|
||||
clearable
|
||||
>
|
||||
<el-option
|
||||
v-for="item in options[item.clickFuc]"
|
||||
:key="item.code"
|
||||
:label="item.label"
|
||||
:value="item.code"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
|
||||
class="query-form-item"
|
||||
:label="item.columnDesc+`:`"
|
||||
>
|
||||
<el-date-picker
|
||||
:picker-options="pickerOptions"
|
||||
v-model="actDateRange"
|
||||
type="daterange"
|
||||
format="yyyy 年 MM 月 dd 日"
|
||||
value-format="yyyy-MM-dd"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
|
||||
class="query-form-item"
|
||||
:label="item.columnDesc+`:`"
|
||||
>
|
||||
<el-date-picker
|
||||
v-model="filterQuery[item.columnName]"
|
||||
:style="`width:${item.width+'px'}`"
|
||||
value-format="yyyy-MM-dd"
|
||||
:disabled="executeEval(null,item.disabledFuc,false)"
|
||||
type="date"
|
||||
:placeholder="item.columnDesc"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
</template>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<div class="top-right-btn">
|
||||
<el-button-group>
|
||||
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-refresh"
|
||||
@click="onReset"
|
||||
>重置
|
||||
</el-button>
|
||||
<el-button type="primary" icon="el-icon-search" @click="onSubmit"
|
||||
>查询
|
||||
</el-button
|
||||
>
|
||||
</el-button-group>
|
||||
</div>
|
||||
<el-divider style="margin: 15px"></el-divider>
|
||||
<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"
|
||||
:row-style="{ height: '32px' }"
|
||||
@sort-change="handleSortChange"
|
||||
>
|
||||
<template v-for="(item, index) in tableHeader">
|
||||
<el-table-column
|
||||
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
|
||||
type="index" :label="item.columnDesc"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
v-if="item.columnType == 'selection'"
|
||||
type="selection"
|
||||
:width="item.width"
|
||||
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
|
||||
></el-table-column>
|
||||
|
||||
<el-table-column
|
||||
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
|
||||
:prop="item.columnName"
|
||||
:label="item.columnDesc"
|
||||
:sortable="item.sort"
|
||||
:width="item.width"
|
||||
:show-overflow-tooltip="item.tooltip"
|
||||
:key="item.columnName"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
|
||||
:prop="item.columnName"
|
||||
:label="item.columnDesc"
|
||||
:sortable="item.sort"
|
||||
:width="item.width"
|
||||
:show-overflow-tooltip="item.tooltip"
|
||||
:key="item.columnName"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
|
||||
item.lableRuleObj[scope.row[item.columnName]]
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
|
||||
:prop="item.columnName"
|
||||
:label="item.columnDesc"
|
||||
:sortable="item.sort"
|
||||
:width="item.width"
|
||||
:show-overflow-tooltip="item.tooltip"
|
||||
:key="item.columnName"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-tag
|
||||
:type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])"
|
||||
>
|
||||
<span>{{
|
||||
item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
|
||||
}}</span>
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
|
||||
:prop="item.columnName"
|
||||
:label="item.columnDesc"
|
||||
:width="item.width"
|
||||
:key="item.columnName"
|
||||
fixed="right"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
|
||||
:type="buttonItem.type"
|
||||
:size="buttonItem.size"
|
||||
:style="buttonItem.style"
|
||||
:key="buttonItem"
|
||||
v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
|
||||
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
|
||||
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
|
||||
>{{ buttonItem.name }}
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
|
||||
:prop="item.columnName"
|
||||
:label="item.columnDesc"
|
||||
:sortable="item.sort"
|
||||
:width="item.width"
|
||||
:show-overflow-tooltip="item.tooltip"
|
||||
:key="item.columnName"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
|
||||
scope.row[item.columnName]
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</template>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
:limit.sync="filterQuery.limit"
|
||||
:page.sync="filterQuery.page"
|
||||
@pagination="handleCurrentChange"
|
||||
></pagination>
|
||||
</el-card>
|
||||
<el-tabs type="border-card" style="margin: 15px">
|
||||
|
||||
<el-tab-pane label="扫码明细" v-if="RowType != 1">
|
||||
<PanelOrderManuTagCode
|
||||
v-if="panelALive"
|
||||
:fifoSplit="3"
|
||||
:prescribeData="curRow"
|
||||
></PanelOrderManuTagCode>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="拆零明细" v-if="RowType != 1">
|
||||
<prescribeCodePanel
|
||||
v-if="panelALive"
|
||||
:prescribeData="curRow"
|
||||
:fifoSplit="1"
|
||||
></prescribeCodePanel>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="整取明细" v-if="RowType != 1">
|
||||
<prescribeCodePanel
|
||||
v-if="panelALive"
|
||||
:prescribeData="curRow"
|
||||
:fifoSplit="2"
|
||||
></prescribeCodePanel>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="整单详情">
|
||||
<PanelOrderAllDetail
|
||||
v-if="panelALive"
|
||||
:prescribeData="curRow"
|
||||
></PanelOrderAllDetail>
|
||||
</el-tab-pane>
|
||||
|
||||
|
||||
</el-tabs>
|
||||
|
||||
|
||||
</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 prescribeCodePanel from './PanelOrderTagCode'
|
||||
import PanelOrderManuTagCode from './PanelOrderManuTagCode'
|
||||
import prescribeOriginPanel from '@/views/collect/PannelOrderBiz'
|
||||
import PanelOrderAllDetail from '@/views/collect/PanelOrderAllDetail'
|
||||
|
||||
import { orderPage } from '@/api/collect/collectOrder'
|
||||
import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage'
|
||||
|
||||
export default {
|
||||
name: 'panelOrderUpload',
|
||||
props: {
|
||||
RowType: {
|
||||
type: Object,
|
||||
default: null,
|
||||
required: false
|
||||
},
|
||||
tagStatus: {
|
||||
type: Object,
|
||||
default: null,
|
||||
required: false
|
||||
},
|
||||
workPlaceCode: {
|
||||
type: Number,
|
||||
default: null,
|
||||
required: true
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
||||
//界面配置相关
|
||||
//患者处方
|
||||
tableHeader: [],
|
||||
queryList: [],
|
||||
tableObj: [],
|
||||
fromList: [],
|
||||
//处方明细
|
||||
tableHeader1: [],
|
||||
queryList1: [],
|
||||
tableObj1: [],
|
||||
fromList1: [],
|
||||
|
||||
convertDateFun: convertDate,
|
||||
//界面配置-------------end
|
||||
|
||||
showSearch: true,
|
||||
filterQuery: {
|
||||
tagStatus: null,
|
||||
billNo: null,
|
||||
workPlaceCode: null,
|
||||
page: 1,
|
||||
limit: 10
|
||||
},
|
||||
defaultSort: { prop: 'createTime', order: 'desc' },
|
||||
loading: false,
|
||||
list: [],
|
||||
total: 0,
|
||||
|
||||
preLoading: false,
|
||||
preDetailList: [],
|
||||
preTotal: 0,
|
||||
preQuery: {
|
||||
prescribeCode: null,
|
||||
page: 1,
|
||||
limit: 10
|
||||
},
|
||||
|
||||
curRow: null,
|
||||
panelALive: false,
|
||||
options: {
|
||||
findWorkPlace: []
|
||||
},
|
||||
showType: 1
|
||||
}
|
||||
},
|
||||
|
||||
components: {
|
||||
addOrder, errOrder, prescribeCodePanel, prescribeOriginPanel, PanelOrderManuTagCode, 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
|
||||
},
|
||||
handleSortChange(column, prop, order) {
|
||||
if (column.order === 'descending') {
|
||||
this.query.sort = 'desc'
|
||||
} else {
|
||||
this.query.sort = 'asc'
|
||||
}
|
||||
this.query.orderBy = column.prop
|
||||
this.getList()
|
||||
},
|
||||
///界面配置相关------------end
|
||||
|
||||
hideSearch() {
|
||||
this.showSearch = !this.showSearch
|
||||
},
|
||||
onReset() {
|
||||
this.filterQuery = {}
|
||||
this.actDateRange = []
|
||||
this.getList()
|
||||
},
|
||||
onSubmit() {
|
||||
this.filterQuery.page = 1
|
||||
this.getList()
|
||||
},
|
||||
|
||||
getList() {
|
||||
this.loading = true
|
||||
orderPage(this.filterQuery).then(res => {
|
||||
this.loading = false
|
||||
this.list = res.data.list || []
|
||||
this.total = res.data.total || 0
|
||||
}).catch(() => {
|
||||
this.loading = false
|
||||
this.list = []
|
||||
this.total = 0
|
||||
})
|
||||
},
|
||||
handleCurrentChange(val) {
|
||||
this.filterQuery.page = val.page
|
||||
this.getList()
|
||||
},
|
||||
|
||||
prescribeClick(_this, row) {
|
||||
_this.curRow = row
|
||||
_this.refreshCodesPanel(_this)
|
||||
},
|
||||
refreshCodesPanel(_this) {
|
||||
_this.panelALive = false
|
||||
_this.$nextTick(() => {
|
||||
_this.panelALive = true
|
||||
})
|
||||
},
|
||||
|
||||
findWorkPlace(_this, val) {
|
||||
let query = {
|
||||
chargeUser: _this.$store.getters.adminId,
|
||||
key: val,
|
||||
page: 1,
|
||||
limit: 10
|
||||
}
|
||||
filterWorkOptimize(query)
|
||||
.then((response) => {
|
||||
_this.loading = false
|
||||
_this.options.findWorkPlace = response.data || []
|
||||
if (_this.options.findWorkPlace.length == 1) {
|
||||
_this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
_this.loading = false
|
||||
_this.options.findWorkPlace = []
|
||||
})
|
||||
}
|
||||
|
||||
},
|
||||
created() {
|
||||
this.filterQuery.tagStatus = this.tagStatus
|
||||
if (this.$route.query.workplaceId != null) {
|
||||
this.filterQuery.workPlaceCode = this.$route.query.workplaceId
|
||||
this.showType = 2
|
||||
}
|
||||
this.findWorkPlace(this, '')
|
||||
getHead('prescribePanelUpload', '1').then((re) => {
|
||||
// 处理返回的数据
|
||||
this.tableObj = re.data
|
||||
this.tableHeader = re.data.tableList
|
||||
this.queryList = re.data.queryList
|
||||
this.fromList = re.data.fromList
|
||||
this.getList()
|
||||
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.query-form {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.query-form-item {
|
||||
margin-right: 5px;
|
||||
margin-bottom: 6px;
|
||||
}
|
||||
</style>
|
||||
@ -1,82 +0,0 @@
|
||||
<template>
|
||||
<div>
|
||||
|
||||
|
||||
<!-- <el-row :gutter="0" v-if="isLinkDisabled" style="margin-top: 15px">-->
|
||||
<!-- <el-col :span="24" align="right">-->
|
||||
<!-- <div class="inv-hos-title">-->
|
||||
<!-- <span-->
|
||||
<!-- style="margin: 10px;color: #2d8cf0;font-size: 14px;"-->
|
||||
<!-- >部门 : {{ this.userInfo.deptName }}</span>-->
|
||||
|
||||
<!-- <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户 : -->
|
||||
<!--<!– {{–>-->
|
||||
<!--<!– this.userInfo.companyName–>-->
|
||||
<!--<!– }}–>-->
|
||||
<!-- </span>-->
|
||||
<!-- <span-->
|
||||
<!-- style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"-->
|
||||
<!-- >    (用户 : {{-->
|
||||
<!-- this.userInfo.userName-->
|
||||
<!-- }})</span>-->
|
||||
<!-- </div>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- </el-row>-->
|
||||
|
||||
<el-tabs type="border-card" style="margin: 15px">
|
||||
|
||||
<el-tab-pane label="拆零库存">
|
||||
<fifoPanel
|
||||
style="margin: -15px"
|
||||
:panelType="1"
|
||||
:workPlaceCode="workPlaceCode"
|
||||
></fifoPanel>
|
||||
</el-tab-pane>
|
||||
|
||||
<el-tab-pane label="整取库存">
|
||||
<fifoPanel
|
||||
style="margin: -15px"
|
||||
:panelType="2"
|
||||
:workPlaceCode="workPlaceCode"
|
||||
></fifoPanel>
|
||||
</el-tab-pane>
|
||||
|
||||
</el-tabs>
|
||||
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import fifoPanel from "./IoSplitFifoCodePanel";
|
||||
|
||||
export default {
|
||||
name: "PrescribeTagCode",
|
||||
components: {
|
||||
fifoPanel
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
isLinkDisabled: false,
|
||||
workPlaceCode: null,
|
||||
userInfo: {
|
||||
inv: this.$store.getters.locInvName,
|
||||
deptName: this.$store.getters.locDeptName,
|
||||
userName: this.$store.getters.name,
|
||||
companyName: this.$store.getters.companyName,
|
||||
},
|
||||
}
|
||||
},
|
||||
created() {
|
||||
if (this.$route.query.workplaceId != null){
|
||||
this.isLinkDisabled = true
|
||||
this.workPlaceCode = Number(this.$route.query.workplaceId);
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
Loading…
Reference in New Issue