UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

界面优化

Browse Source
20240912_adapter_z
anthonywj 8 months ago
parent aa8a7ddf22
commit 048fd0a0fe
6 changed files with 225 additions and 120 deletions
Show Stats Download Patch File Download Diff File

15
src/api/collect/collectOrder.js
Unescape Escape View File

@ -83,6 +83,19 @@ export function bindWork(query) {
}); });
} }
export function importOrder(query) {
return axios({
url: "/udiwms/collect/order/import",
method: "get",
params: query
});
}
export function clearAllOrder(query) {
return axios({
url: "/udiwms/collect/order/clearAll",
method: "get",
params: query
});
}

71
src/views/collect/CollectOrderNew.vue
Unescape Escape View File

@ -93,10 +93,14 @@
>查询 >查询
</el-button </el-button
> >
<!-- <el-button type="primary" icon="el-icon-download" @click="downloadPrescription"--> <el-button type="primary" icon="el-icon-download" @click="downloadPrescription"
<!-- >下载单据--> >下载单据
<!-- </el-button--> </el-button
<!-- >--> >
<el-button type="primary" icon="el-icon-delete" @click="clearAllOrder"
>清除单据
</el-button
>
</el-button-group> </el-button-group>
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
@ -242,7 +246,7 @@ import {convertDate} from "@/utils/date";
import {detail} from "@/api/basic/sicker/prescribeApi"; import {detail} from "@/api/basic/sicker/prescribeApi";
import prescribeDownloadDialog from "@/views/collect/prescribe/prescribeDownloadDialog"; import prescribeDownloadDialog from "@/views/collect/prescribe/prescribeDownloadDialog";
import prescribeOriginPanel from "./PannelOrderBiz"; import prescribeOriginPanel from "./PannelOrderBiz";
import {deleteByOrder, orderPage} from "@/api/collect/collectOrder"; import {clearAllOrder, deleteByOrder, importOrder, orderPage} from "@/api/collect/collectOrder";
import {filterSubAllOptimize} from "@/api/system/invSubWarehouse"; import {filterSubAllOptimize} from "@/api/system/invSubWarehouse";
import {filterWorkOptimize} from "@/api/basic/sysWorkplaceManage"; import {filterWorkOptimize} from "@/api/basic/sysWorkplaceManage";
@ -273,7 +277,7 @@ export default {
showSearch: true, showSearch: true,
filterQuery: { filterQuery: {
tagStatus:"1", // tagStatus: "1", //
billNo: null, billNo: null,
page: 1, page: 1,
limit: 10, limit: 10,
@ -339,16 +343,47 @@ export default {
this.getList(); this.getList();
}, },
downloadPrescription() { downloadPrescription() {
this.downloadPrescriptionVisible = true // this.downloadPrescriptionVisible = true
this.loading = true;
importOrder().then(res => {
this.loading = false
if (res.code == 20000) {
this.$message.success("下载成功！")
this.getList()
} else {
this.$message.error(res.message)
}
}
).catch(() => {
this.loading = false
})
}, },
clearAllOrder() {
this.loading = true;
clearAllOrder().then(res => {
this.loading = false
if (res.code == 20000) {
this.$message.success("清除成功！")
this.getList()
} else {
this.$message.error(res.message)
}
}).catch(() => {
this.loading = false
})
}
,
closeDialog() { closeDialog() {
this.downloadPrescriptionVisible = false; this.downloadPrescriptionVisible = false;
this.getList(); this.getList();
}, }
,
onSubmit() { onSubmit() {
this.filterQuery.page = 1; this.filterQuery.page = 1;
this.getList(); this.getList();
}, }
,
getList() { getList() {
this.loading = true; this.loading = true;
@ -361,22 +396,26 @@ export default {
this.list = [] this.list = []
this.total = 0 this.total = 0
}) })
}, }
,
handleCurrentChange(val) { handleCurrentChange(val) {
this.filterQuery.page = val.page; this.filterQuery.page = val.page;
this.getList(); this.getList();
}, }
,
prescribeClick(_this, row) { prescribeClick(_this, row) {
_this.curRow = row; _this.curRow = row;
_this.refreshCodesPanel(_this); _this.refreshCodesPanel(_this);
}, }
,
refreshCodesPanel(_this) { refreshCodesPanel(_this) {
_this.panelALive = false; _this.panelALive = false;
_this.$nextTick(() => { _this.$nextTick(() => {
_this.panelALive = true; _this.panelALive = true;
}); });
}, }
,
deleteDialog(_this, row) { deleteDialog(_this, row) {
_this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", { _this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
@ -389,7 +428,8 @@ export default {
}) })
.catch(() => { .catch(() => {
}); });
}, }
,
deleteOrders(data) { deleteOrders(data) {
this.loading = true; this.loading = true;
this.deleteData.billNo = data; this.deleteData.billNo = data;
@ -412,7 +452,8 @@ export default {
}) })
.catch(() => { .catch(() => {
}); });
}, }
,
}, },

8
src/views/collect/DealOrder.vue
Unescape Escape View File

@ -45,19 +45,19 @@
type="primary" type="primary"
:disabled="isSelectOrder" :disabled="isSelectOrder"
@click.native="selectPrescribe()" @click.native="selectPrescribe()"
>选入单据 >选入单据1
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
:disabled="formData.tagStatus<2" :disabled="formData.tagStatus<2"
@click.native="saveDraftOrder()" @click.native="saveDraftOrder()"
>单据挂起 >单据挂起1
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
:disabled="formData.tagStatus<2" :disabled="formData.tagStatus<2"
@click.native="finishOrder()" @click.native="finishOrder()"
>处理完成 >处理完成1
</el-button> </el-button>
<el-dropdown @command="handleCommand"> <el-dropdown @command="handleCommand">
@ -216,6 +216,7 @@
append-to-body append-to-body
> >
<selectPrescribeDialog <selectPrescribeDialog
:workPlaceCode="this.formData.workPlaceCode"
:confirmSelect="this.confirmSelect" :confirmSelect="this.confirmSelect"
:closeDialog="this.closeDialog" :closeDialog="this.closeDialog"
></selectPrescribeDialog> ></selectPrescribeDialog>
@ -521,6 +522,7 @@ export default {
//选择单据 //选择单据
selectPrescribe() { selectPrescribe() {
console.log(this.formData.workPlaceCode)
this.selectPrescriptionVisible = true; this.selectPrescriptionVisible = true;
}, },

68
src/views/collect/DealOrderBlank.vue
Unescape Escape View File

@ -38,26 +38,26 @@
<el-button <el-button
type="primary" type="primary"
:disabled="isSelectOrder" :disabled="isSelectOrder"
@click.native="selectPrescribe()" @click.native="nextCollectOrder()"
>下一单据 >下一单据
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
:disabled="isSelectOrder" :disabled="isSelectOrder"
@click.native="selectPrescribe()" @click.native="selectPrescribe()"
>选入单据 >选入单据1
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
:disabled="formData.tagStatus<2" :disabled="formData.tagStatus<2"
@click.native="saveDraftOrder()" @click.native="saveDraftOrder()"
>单据挂起 >单据挂起1
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
:disabled="formData.tagStatus<2" :disabled="formData.tagStatus<2"
@click.native="finishOrder()" @click.native="finishOrder()"
>处理完成 >处理完成1
</el-button> </el-button>
<el-dropdown @command="handleCommand"> <el-dropdown @command="handleCommand">
@ -216,6 +216,7 @@
append-to-body append-to-body
> >
<selectPrescribeDialog <selectPrescribeDialog
:workPlaceCode="this.formData.workPlaceCode"
:confirmSelect="this.confirmSelect" :confirmSelect="this.confirmSelect"
:closeDialog="this.closeDialog" :closeDialog="this.closeDialog"
></selectPrescribeDialog> ></selectPrescribeDialog>
@ -234,9 +235,10 @@ import prescribeCodePanel from "./PanelOrderTagCode";
import PannelOrderBiz from "./PannelOrderBiz"; import PannelOrderBiz from "./PannelOrderBiz";
import {listPage} from "@/api/basic/sysWorkplaceManage"; import {listPage} from "@/api/basic/sysWorkplaceManage";
import {enterCodeWeb} from "@/api/inout/order"; import {enterCodeWeb} from "@/api/inout/order";
import {draftOrder, finishOrder, tagCode} from "@/api/collect/splitCreateOrder"; import {draftOrder, finishOrder, startSplit, tagCode} from "@/api/collect/splitCreateOrder";
import {selectCorpList} from "@/api/basic/basicUnitMaintain"; import {selectCorpList} from "@/api/basic/basicUnitMaintain";
import {delDrugLevel} from "@/api/basic/product/drugUdiinfos"; import {delDrugLevel} from "@/api/basic/product/drugUdiinfos";
import {getNextOrder} from "@/api/collect/collectOrder";
export default { export default {
/** /**
@ -265,7 +267,7 @@ export default {
list: [], list: [],
total: 0, total: 0,
defaultSort: {prop: 'createTime', order: 'desc'}, defaultSort: {prop: 'createTime', order: 'desc'},
formDataVisible:{ formDataVisible: {
operationType: null, operationType: null,
unitTittle: "往来单位", unitTittle: "往来单位",
corpType: 1, corpType: 1,
@ -309,7 +311,7 @@ export default {
methods: { methods: {
findFromInvList(val) { findFromInvList(val) {
let cQuery = { let cQuery = {
corpType:this.formDataVisible.corpType, corpType: this.formDataVisible.corpType,
}; };
selectCorpList(cQuery) selectCorpList(cQuery)
.then((response) => { .then((response) => {
@ -318,10 +320,13 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
workPlaceCodeChange(value){ workPlaceCodeChange(value) {
this.curWorkPlaces.forEach(item => {if(item.workplaceId == value){ this.formDataVisible = item this.curWorkPlaces.forEach(item => {
} }) if (item.workplaceId == value) {
if (this.formDataVisible.operationType == 1){ this.formDataVisible = item
}
})
if (this.formDataVisible.operationType == 1) {
this.findFromInvList(""); this.findFromInvList("");
} }
return return
@ -355,7 +360,7 @@ export default {
} }
listPage(query).then((res) => { listPage(query).then((res) => {
this.curWorkPlaces = res.data.list || []; this.curWorkPlaces = res.data.list || [];
if (this.curWorkPlaces.length == 1 && this.formData.workPlaceCode == null) { if (this.curWorkPlaces.length == 1 && this.formData.workPlaceCode == null) {
this.formData.workPlaceCode = this.curWorkPlaces[0].workplaceId; this.formData.workPlaceCode = this.curWorkPlaces[0].workplaceId;
} }
this.workPlaceCodeChange(this.formData.workPlaceCode); this.workPlaceCodeChange(this.formData.workPlaceCode);
@ -454,12 +459,13 @@ export default {
addCode() { addCode() {
if (this.$isBlank(this.filterQuery.code)) { if (this.$isBlank(this.filterQuery.code)) {
this.filterQuery.code = this.scanCode.trim(); this.filterQuery.code = this.scanCode.trim();
return;
} }
if (this.$isBlank(this.filterQuery.code) && this.$isBlank(this.scanCode)) { if (this.$isBlank(this.filterQuery.code) && this.$isBlank(this.scanCode)) {
return; return;
} }
let tagQuery = { let tagQuery = {
workPlaceCode: this.formData.workPlaceCode,
fromCorp: this.formData.fromCorp,
billNo: this.formData.billNo, billNo: this.formData.billNo,
code: this.filterQuery.code.trim(), code: this.filterQuery.code.trim(),
}; };
@ -468,6 +474,7 @@ export default {
if (res.code == 20000) { if (res.code == 20000) {
this.formData.tagStatus = 2; this.formData.tagStatus = 2;
this.formData = res.data; this.formData = res.data;
this.refreshCodesPanel(this);
} else { } else {
this.$message.error(res.message) this.$message.error(res.message)
} }
@ -513,10 +520,27 @@ export default {
}, },
//选择单据
selectPrescribe() { selectPrescribe() {
console.log(this.formData.workPlaceCode)
this.selectPrescriptionVisible = true; this.selectPrescriptionVisible = true;
}, },
//获取下一单据
nextCollectOrder() {
getNextOrder(this.formData).then(res => {
this.loading = false
if (res.code == 20000) {
this.formData = res.data;
this.dealSplitOrder()
} else {
this.$message.error(res.message)
}
}).catch(() => {
this.loading = false
})
},
closeDialog() { closeDialog() {
this.selectPrescriptionVisible = false; this.selectPrescriptionVisible = false;
}, },
@ -525,9 +549,27 @@ export default {
this.selectPrescriptionVisible = false; this.selectPrescriptionVisible = false;
this.formData = row; this.formData = row;
this.curRow = row; this.curRow = row;
this.dealSplitOrder()
this.refreshCodesPanel(this); this.refreshCodesPanel(this);
}, },
//开始拆零
dealSplitOrder() {
startSplit(this.formData).then(res => {
this.loading = false
if (res.code == 20000) {
console.log(res.data)
this.refreshCodesPanel(this);
} else {
console.log(res.message)
}
}).catch(() => {
this.loading = false
})
},
printCodeResult(data, isSuccess) { printCodeResult(data, isSuccess) {
const resultParts = ["追溯码：" + data.code + "\r\n"]; const resultParts = ["追溯码：" + data.code + "\r\n"];

2
src/views/collect/prescribe/prescribeOriginPanel.vue
Unescape Escape View File

@ -220,7 +220,7 @@ export default {
}, },
created() { created() {
getHead("prescribeOriginPanel", "1").then((re) => { getHead("selectTagPrescribe-1", "1").then((re) => {
// 处理返回的数据 // 处理返回的数据
this.tableObj1 = re.data; this.tableObj1 = re.data;
this.tableHeader1 = re.data.tableList; this.tableHeader1 = re.data.tableList;

181
src/views/collect/selectCollectOrderDialog.vue
Unescape Escape View File

@ -9,11 +9,11 @@
class="query-form-item" class="query-form-item"
:label="item.columnDesc+`:`" :key="item.id"> :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
@ -24,10 +24,10 @@
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
clearable> clearable>
<el-option <el-option
v-for="dict in item.lableRuleObj" v-for="dict in item.lableRuleObj"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -35,19 +35,19 @@
class="query-form-item" class="query-form-item"
:label="item.columnDesc+`:`"> :label="item.columnDesc+`:`">
<el-select <el-select
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
@change="executeFuc($event,'5',item.checkRules)" @change="executeFuc($event,'5',item.checkRules)"
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
filterable filterable
remote remote
:remote-method="(query) => executeFuc(query,'5',item.clickFuc)" :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
clearable> clearable>
<el-option <el-option
v-for="item in options[item.clickFuc]" v-for="item in options[item.clickFuc]"
:key="item.code" :key="item.code"
:label="item.label" :label="item.label"
:value="item.code" :value="item.code"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -55,26 +55,26 @@
class="query-form-item" class="query-form-item"
:label="item.columnDesc+`:`"> :label="item.columnDesc+`:`">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
v-model="actDateRange" v-model="actDateRange"
type="daterange" type="daterange"
format="yyyy 年 MM 月 dd 日" format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
class="query-form-item" class="query-form-item"
:label="item.columnDesc+`:`"> :label="item.columnDesc+`:`">
<el-date-picker <el-date-picker
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:style="`width:${item.width+'px'}`" :style="`width:${item.width+'px'}`"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
type="date" type="date"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</template> </template>
@ -84,9 +84,9 @@
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@click="onReset" @click="onReset"
>重置 >重置
</el-button> </el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit" <el-button type="primary" icon="el-icon-search" @click="onSubmit"
@ -111,36 +111,36 @@
<template v-for="(item, index) in tableHeader"> <template v-for="(item, index) in tableHeader">
<el-table-column <el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)" v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column> type="index" :label="item.columnDesc"></el-table-column>
<el-table-column <el-table-column
v-if="item.columnType == 'selection'" v-if="item.columnType == 'selection'"
type="selection" type="selection"
:width="item.width" :width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)" :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)" v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName" :prop="item.columnName"
:label="item.columnDesc" :label="item.columnDesc"
:sortable="item.sort" :sortable="item.sort"
:width="item.width" :width="item.width"
:show-overflow-tooltip="item.tooltip" :show-overflow-tooltip="item.tooltip"
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio> <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)" v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName" :prop="item.columnName"
:label="item.columnDesc" :label="item.columnDesc"
:sortable="item.sort" :sortable="item.sort"
:width="item.width" :width="item.width"
:show-overflow-tooltip="item.tooltip" :show-overflow-tooltip="item.tooltip"
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
@ -149,17 +149,17 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)" v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName" :prop="item.columnName"
:label="item.columnDesc" :label="item.columnDesc"
:sortable="item.sort" :sortable="item.sort"
:width="item.width" :width="item.width"
:show-overflow-tooltip="item.tooltip" :show-overflow-tooltip="item.tooltip"
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag <el-tag
:type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])"> :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{ <span>{{
item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName] item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
}}</span> }}</span>
@ -167,12 +167,12 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)" v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName" :prop="item.columnName"
:label="item.columnDesc" :label="item.columnDesc"
:width="item.width" :width="item.width"
:key="item.columnName" :key="item.columnName"
fixed="right" fixed="right"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj" <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
@ -188,13 +188,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)" v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName" :prop="item.columnName"
:label="item.columnDesc" :label="item.columnDesc"
:sortable="item.sort" :sortable="item.sort"
:width="item.width" :width="item.width"
:show-overflow-tooltip="item.tooltip" :show-overflow-tooltip="item.tooltip"
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
@ -206,18 +206,18 @@
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:limit.sync="filterQuery.limit" :limit.sync="filterQuery.limit"
:page.sync="filterQuery.page" :page.sync="filterQuery.page"
@pagination="handleCurrentChange" @pagination="handleCurrentChange"
></pagination> ></pagination>
</el-card> </el-card>
<el-tabs type="border-card" style="margin: 15px"> <el-tabs type="border-card" style="margin: 15px">
<el-tab-pane label="单据明细"> <el-tab-pane label="单据明细">
<prescribeOriginPanel <prescribeOriginPanel
v-if="panelALive" v-if="panelALive"
:prescribeData="curRow" :prescribeData="curRow"
></prescribeOriginPanel> ></prescribeOriginPanel>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -231,7 +231,6 @@ import addOrder from "@/views/inout/DialogCreateOrder";
import errOrder from "@/views/inout/IoCreateErrorOrder"; import errOrder from "@/views/inout/IoCreateErrorOrder";
import {executeFuc, getHead} from "@/utils/customConfig"; import {executeFuc, getHead} from "@/utils/customConfig";
import {convertDate} from "@/utils/date"; import {convertDate} from "@/utils/date";
import {page as prescribePage} from "@/api/basic/sicker/prescribeApi";
import prescribeDownloadDialog from "@/views/collect/prescribe/prescribeDownloadDialog"; import prescribeDownloadDialog from "@/views/collect/prescribe/prescribeDownloadDialog";
import prescribeOriginPanel from "./PannelOrderBiz"; import prescribeOriginPanel from "./PannelOrderBiz";
import {orderPage} from "@/api/collect/collectOrder"; import {orderPage} from "@/api/collect/collectOrder";
@ -247,6 +246,10 @@ export default {
type: Function, type: Function,
required: true, required: true,
}, },
workPlaceCode: {
type: String,
required: true,
},
}, },
data() { data() {
return { return {
@ -325,6 +328,10 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
this.filterQuery.workPlaceCode = this.workPlaceCode
console.log(this.filterQuery.workPlaceCode)
console.log(this.workPlaceCode)
debugger
orderPage(this.filterQuery).then(res => { orderPage(this.filterQuery).then(res => {
this.loading = false this.loading = false
this.list = res.data.list || [] this.list = res.data.list || []

Write Preview
Loading…
Cancel
Save