feat: 工位上货选已完成单

yanshishuju
chenhc 10 months ago
parent a351c17cb7
commit 60d4d1b6ae

@ -640,3 +640,13 @@ export function batchAddCode(query) {
}
export function batchAddCodeByOrderFinish(query) {
return axios({
url: "warehouse/inout/batchAddCodeByOrderFinish",
method: "post",
data: query
});
}

@ -14,6 +14,11 @@
<el-button-group
style="display: flex; margin-top: 5px; float: right"
>
<el-button size="mini" type="primary" @click.native="selectPrescribe()" :loading="submitLoading"
v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled"
>选入已完成单据
</el-button>
<el-button size="mini" type="primary" @click.native="chooseDraftOrder()" :loading="submitLoading"
v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled"
>选入草稿单据
@ -293,6 +298,26 @@
>
</chooseDraftOrderDialog>
</el-dialog>
<el-dialog
title="选入已完成单据"
:visible.sync="selectPrescriptionVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="selectPrescriptionVisible"
width="65%"
append-to-body
>
<SelectCollectOrderEndDialog
:RowType="1"
:workPlaceCode="null"
:busType="this.orderFormData.busType"
:fromCorp="this.orderFormData.fromCorp"
:confirmSelect="this.confirmSelect"
:closeDialog="this.closeDialog"
:viewType="viewType"
></SelectCollectOrderEndDialog>
</el-dialog>
</div>
</template>
@ -305,7 +330,7 @@ import {
submitOrderWeb,
saveOrderWeb,
enterCodeWeb, submitAllocateBiz, rollbackWaitcheck, submitCodeResult, submitCheckResult, delmitBiz,
batchVailCode, batchAddCode
batchVailCode, batchAddCode,batchAddCodeByOrderFinish
} from "@/api/inout/order";
import {filterSubAll, findByFrom, findInvByUser} from "@/api/system/invSubWarehouse";
import {parseTime} from "@/utils/coTools";
@ -316,6 +341,7 @@ import DialogCreateOrderSelect from "@/views/inout/DialogCreateOrderSelect";
import codesPanel from "@/views/collect/PanelCreateCodes";
import codeDetailPanel from "@/views/collect/PanelCreateCodeDetail";
import SelectCollectOrderEndDialog from "@/views/collect/SelectCollectOrderEndDialog";
import A from "../../plugins/KeyScaner";
import {findByInvUser, getBusTypeList} from "@/api/basic/busType";
@ -433,7 +459,7 @@ export default {
splitBusType: null,
busType: null,
},
selectPrescriptionVisible: false,
detailList: [],
total: 0,
checkPreInArray: [],
@ -573,7 +599,7 @@ export default {
codeDetailPanel,
editCodeDialog,
DialogCreateOrderSelect,
DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct, chooseDraftOrderDialog
DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct, chooseDraftOrderDialog,SelectCollectOrderEndDialog
},
methods: {
changePlace(val) {
@ -1537,6 +1563,13 @@ export default {
});
}
},
//
selectPrescribe() {
if (this.$route.query.busType != null) {
this.orderFormData.busType = this.$route.query.busType
}
this.selectPrescriptionVisible = true;
},
//稿
chooseDraftOrder() {
if (this.$isBlank(this.orderFormData.workPlaceCode)) {
@ -1554,6 +1587,12 @@ export default {
this.orderQuery = currentRow
this.refreshOrder(this.orderQuery)
},
//
confirmSelect(row) {
this.selectPrescriptionVisible = false;
this.formData = row;
this.batchAddCodeByOrderFinish(row.billNo);
},
draftOrder() {
let tQuery = Object.assign(
JSON.parse(JSON.stringify(this.orderFormData))
@ -1909,7 +1948,19 @@ export default {
// this.scanCode = this.valiCodes.join(";");
});
},
batchAddCodeByOrderFinish(orderFinishBillNo){
this.orderFormData.orderFinishBillNo = orderFinishBillNo
batchAddCodeByOrderFinish(this.orderFormData).then((res) => {
if (res.code === 20000) {
this.$refs.inputRef.focus();
this.orderFormData.billNo = res.data.orderId;
this.refreshCodesPanel(this);
this.printMutiCodeResult(res.data.vailCodeResultResponses)
} else {
this.$message.error(res.message)
}
});
},
async printMutiCodeResult(vailCodeResultResponses) {
this.warnResult = "";
this.errResult = "";

@ -0,0 +1,335 @@
<template>
<div>
<el-table v-loading="preLoading" :data="preDetailList" style="width: 100%" border :row-style="rowStyle">
<template v-for="(item, index) in tableHeader1">
<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' && !(item.columnName == 'productDate' || item.columnName == 'expireDate') && 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>
<el-table-column
v-if="item.columnType == 'text' && (item.columnName == 'productDate' || item.columnName == 'expireDate') && 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])}">{{
convertDateFun(scope.row[item.columnName])
}}</span>
</template>
</el-table-column>
</template>
</el-table>
<pagination
v-show="preTotal>0"
:total="preTotal"
:limit.sync="preQuery.limit"
:page.sync="preQuery.page"
@pagination="preHandleCurrentChange"
></pagination>
<el-dialog
title="扫码替换"
:visible.sync="codeReplaceVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="codeReplaceVisible"
width="60%"
append-to-body
>
<DialogReplaceCode
:prescribeData="bizData"
:closeDialog="closeScanDialog"
></DialogReplaceCode>
</el-dialog>
</div>
</template>
<script>
import {convertDate} from "@/utils/date";
import {executeFuc, getHead} from "@/utils/customConfig";
import { allDetail, codeRemove, getDetail } from '@/api/collect/collectOrder'
import DialogReplaceCode from "./DialogReplaceCode.vue";
/**
* 原始处方明细
*/
export default {
name: "CollectFinishOrderBackupDetail",
props: {
prescribeData: {
type: Object,
default: null,
required: true
},
//1:2:;
fifoSplit: {
type: Object,
default: null,
required: true
},
dealStatus: {
type: Number,
default: 1,
required: true
},
},
data() {
return {
//
//
tableHeader1: [],
queryList1: [],
tableObj1: [],
fromList1: [],
convertDateFun: convertDate,
preLoading: false,
preDetailList: [],
preTotal: 0,
preQuery: {
orderIdFk: null,
page: 1,
limit: 10,
},
countVisible: false,
codeReplaceVisible: false,
bizData: null,
}
},
components: {DialogReplaceCode},
methods: {
deleteMan(_this, row) {
_this.$confirm("是否确定删除该条扫码?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
_this.loading = true;
_this.codeRemoveMan(row.id, 2);
})
},
deleteCode(_this, row) {
_this.$confirm("是否确定移除一个条码?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
_this.loading = true;
_this.codeRemoveMan(row.id, 1);
})
},
codeRemoveMan(codeManId, delType) {
let post = {
codeManId: codeManId,
delType: delType
}
codeRemove(post).then((response) => {
if (response.code === 20000) {
this.$message.success("操作成功!");
this.getList(this)
} else {
this.$message.error(response.message);
}
this.loading = false;
}).catch(() => {
this.loading = false;
})
},
//-------------end
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
preHandleCurrentChange(val) {
this.filterQuery.page = val.page;
this.getPrescribeDetail(this, null);
},
getPrescribeDetail(_this) {
if (_this.prescribeData == null)
return
if (_this.prescribeData != null) {
_this.preQuery.page = 1
_this.preQuery.orderIdFk = this.prescribeData.billNo
}
_this.preLoading = true;
getDetail(_this.preQuery).then(res => {
_this.preLoading = false
if (res.code != 20000) {
_this.$message.error(res.message)
return
}
_this.preDetailList = res.data.list
_this.preLoading = false
}).catch(() => {
_this.preLoading = false
_this.$message.error("数据加载失败")
})
},
codePlaceClick(_this, row) {
_this.bizData = row
_this.codeReplaceVisible = true;
},
closeScanDialog() {
this.getPrescribeDetail(this);
this.codeReplaceVisible = false;
},
rowStyle({row, rowIndex}) {
let rowBackground = {};
if (this.$isBlank(row.finishUdiCode)) {
rowBackground.color = '#f60303';
}
rowBackground.height = "38px"
return rowBackground;
},
},
created() {
if (this.tableHeader1 == null || this.tableHeader1.length == 0) {
getHead("SelectFinishOrderDetail", "1").then((re) => {
//
this.tableObj1 = re.data;
this.tableHeader1 = re.data.tableList;
this.queryList1 = re.data.queryList;
this.fromList1 = re.data.fromList;
this.getPrescribeDetail(this);
});
} else {
this.getPrescribeDetail(this);
}
if (this.dealStatus == 1) {
this.countVisible = false;
} else {
this.countVisible = true;
}
}
}
</script>
<style scoped>
</style>

@ -0,0 +1,558 @@
<template>
<div>
<el-card>
<el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
@submit.native.prevent
size="mini" label-width="100px"
>
<el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList">
<div v-if="showSearch || item.isImport">
<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 == '模糊查询' ? '单据号/单据类型/收货方/发货方' : 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>
</div>
</template>
</el-row>
</el-form>
<!-- <div class="left-search" v-if="!showSearch">-->
<!-- &lt;!&ndash; 关键字搜索 按需配置 &ndash;&gt;-->
<!-- <el-form v-if="queryList && queryList.length > 0" :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) && item.columnName == 'keywords'"-->
<!-- 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>-->
<!-- </template>-->
<!-- </el-row>-->
<!-- </el-form>-->
<!-- </div>-->
<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(this)"
>查询
</el-button
>
<el-button type="primary" icon="el-icon-check" @click="onConfirm"
>选入
</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"
@current-change="handleChange"
: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="整单详情">
<CollectFinishOrderBackupDetail
v-if="panelALive"
:prescribeData="curRow"
></CollectFinishOrderBackupDetail>
</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 CollectFinishOrderDetail from '@/views/collect/CollectFinishOrderDetail'
import CollectFinishOrderBackupDetail from "./SelectCollectFinishOrderBackupDetail"
import {orderFinish, orderPage} from '@/api/collect/collectOrder'
import {filterWorkOptimize} from '@/api/basic/workPlace/sysWorkplaceManage'
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
export default {
name: 'prescribePanel',
props: {
confirmSelect: {
type: Function,
required: true,
},
RowType: {
type: Object,
default: null,
required: false
},
workPlaceCode: {
type: Number,
default: null,
required: true
}
},
data() {
return {
busQuery: {
busKey: '',
workplaceCode: null,
page: 1,
limit: 100
},
//
//
tableHeader: [],
queryList: [],
tableObj: [],
fromList: [],
//
tableHeader1: [],
queryList1: [],
tableObj1: [],
fromList1: [],
convertDateFun: convertDate,
//-------------end
showSearch: false,
filterQuery: {
keywords: null,
busType: null,
tagStatus: 3,
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: [],
getBusType: [],
},
showType: 1,
isLinkDisabled: false,
radioCheck: null,
currentRow: null,
actDateRange: [],
}
},
components: {
addOrder,
errOrder,
prescribeCodePanel,
prescribeOriginPanel,
PanelOrderManuTagCode,
CollectFinishOrderDetail,
CollectFinishOrderBackupDetail
},
methods: {
changePlace(_this, query) {
_this.getWorkBindBusTypes(_this, query)
},
getWorkBindBusTypes(_this, query) {
_this.busQuery.workplaceCode = query
getWorkBindBusTypes(this.busQuery).then(res => {
if (res.code == 20000) {
let busTypes = res.data.list || [];
// _this.options.getWorkPlace = res.data.list || [];
let getWorkPlace = busTypes.map(busType => {
return {
code: busType.documentTypeCode,
label: busType.busName
};
});
_this.options.getBusType = getWorkPlace
if (_this.options.getBusType.length == 1) {
_this.filterQuery.busType = _this.options.getBusType[0].code
} else {
_this.filterQuery.busType = null
}
}
return
})
},
//------------
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()
},
handleChange(val) {
this.radioCheck = val.id;
this.currentRow = val;
},
///------------end
hideSearch() {
this.showSearch = !this.showSearch
this.$nextTick(() => {
console.log('组件已刷新');
});
},
onReset() {
this.filterQuery = {
busType: null,
tagStatus: 3,
billNo: null,
workPlaceCode: null,
page: 1,
limit: 10
}
this.actDateRange = []
this.getList()
},
onSubmit(_this) {
if (_this == null)
_this = this
_this.filterQuery.page = 1
_this.getList()
},
onConfirm() {
this.confirmSelect(this.currentRow)
},
getList() {
this.loading = true
if (this.actDateRange !== null) {
this.filterQuery.startTime = this.actDateRange[0];
this.filterQuery.endTime = this.actDateRange[1];
} else {
this.filterQuery.startTime = null;
this.filterQuery.endTime = null;
}
orderFinish(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,
userIdFlag: true,
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
_this.getWorkBindBusTypes(_this, _this.filterQuery.workPlaceCode)
}
})
.catch(() => {
_this.loading = false
_this.options.findWorkPlace = []
})
}
},
created() {
if (this.$route.query.workplaceId != null) {
this.isLinkDisabled = true
this.filterQuery.workPlaceCode = this.$route.query.workplaceId
this.showType = 2
}
this.findWorkPlace(this, '')
getHead('prescribePanelSelect', '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>

@ -566,6 +566,7 @@ export default {
findWorkPlace: [],
getBusType: [],
},
actDateRange: [],
}
},
@ -631,6 +632,15 @@ export default {
getList() {
this.loading = true;
if (this.actDateRange !== null) {
this.filterQuery.startTime = this.actDateRange[0];
this.filterQuery.endTime = this.actDateRange[1];
} else {
this.filterQuery.startTime = null;
this.filterQuery.endTime = null;
}
this.filterQuery.busType = this.busType
// this.filterQuery.fromCorp = this.fromCorp
this.filterQuery.excludeWorkCode = null

Loading…
Cancel
Save