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

代码备份

Browse Source
20240912_adapter_z
anthonywj 1 year ago
parent 668308d5a8
commit 3499764f8a
8 changed files with 447 additions and 642 deletions
Show Stats Download Patch File Download Diff File

172
src/views/inout/DialogCreateOrder.vue
Unescape Escape View File

@ -1,8 +1,59 @@
<template> <template>
<div> <div>
<el-card style="margin: 5px;margin-top: -15px"> <el-form
:model="orderFormData"
:rules="formRules"
ref="dataForm"
label-width="110px"
>
<el-card style="margin: 5px;margin-top: -20px">
<el-row v-if="viewType != 1">
<el-col :span="18">
<el-form-item prop="code" label="扫码录入:">
<el-input
id="inputer"
@focus="getInputFocus($event)"
@keypress.enter.native="enterKey($event)"
ref="inputRef"
style="ime-mode: disabled"
type="tel"
placeholder="请点击输入框进行扫码设置或者扫码录入"
v-model="scanCode"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-button-group>
<el-button
type="primary"
size="mini"
@click.native.stop="addCode()"
style="margin-left: 15px"
>添加
</el-button>
<el-button icon="el-icon-view" @click="hideSearch">显示/隐藏快捷设置</el-button>
<el-button
type="primary"
size="mini"
v-if="curAction.useDyCount == 2"
@click.native.stop="addInvProduct()"
>库存选入
</el-button>
</el-button-group>
</el-col>
</el-row>
<el-row>
<div class="result-display" :class="{'result-success': isSuccess, 'result-failure': !isSuccess}">
<p class="result-text" :class="{'result-text-success': isSuccess, 'result-text-failure': !isSuccess}">{{
result
}}</p>
</div>
</el-row>
<el-row style="margin-top: 25px;margin-bottom: -15px">
<div v-if="showSearch && splitBusType!=null"> <div v-if="showSearch && splitBusType!=null">
<el-divider style="margin-top: 60px"> <el-divider>
<p style="font-weight: bold">扫码快捷设置</p> <p style="font-weight: bold">扫码快捷设置</p>
</el-divider> </el-divider>
<el-row justify="center"> <el-row justify="center">
@ -31,21 +82,14 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-divider>
</el-divider>
</div> </div>
<el-form </el-row>
:model="orderFormData" </el-card>
:rules="formRules" <el-card style="margin: 5px;">
ref="dataForm"
label-width="110px"
style="margin-bottom: -15px"
>
<el-row> <el-row>
<el-button-group <el-button-group
style="display: flex; margin: 0px 0 15px 0; height: 35px;float: right" style="display: flex; margin: 0px 0 15px 0; height: 35px;float: right"
> >
<el-button icon="el-icon-view" @click="hideSearch">显示/隐藏快捷设置</el-button>
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
@ -61,10 +105,10 @@
>立即提交 >立即提交
</el-button> </el-button>
<el-button type="primary" @click="submit(1)" :loading="checkLoading" <el-button type="primary" @click="submit(1)" :loading="checkLoading" size="mini"
v-if="viewType == 7">校验结果提交 v-if="viewType == 7">校验结果提交
</el-button> </el-button>
<el-button type="primary" @click="submit(2)" :loading="codeLoading" <el-button type="primary" @click="submit(2)" :loading="codeLoading" size="mini"
v-if="viewType == 7">扫码结果提交 v-if="viewType == 7">扫码结果提交
</el-button> </el-button>
<el-button size="mini" type="primary" @click.native="revokeBill()" :loading="retractLoading" <el-button size="mini" type="primary" @click.native="revokeBill()" :loading="retractLoading"
@ -74,7 +118,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item prop="corpOrderId" label="单据号:"> <el-form-item prop="corpOrderId" class="query-form-item" label="单据号:">
<el-input <el-input
v-model="orderFormData.corpOrderId" v-model="orderFormData.corpOrderId"
auto-complete="off" auto-complete="off"
@ -85,7 +129,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item prop="createTime" label="单据时间:"> <el-form-item prop="createTime" class="query-form-item" label="单据时间:">
<el-date-picker <el-date-picker
v-model="orderFormData.createTime" v-model="orderFormData.createTime"
type="datetime" type="datetime"
@ -99,7 +143,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item prop="invCode" label="当前仓库:"> <el-form-item prop="invCode" class="query-form-item" label="当前仓库:">
<el-select <el-select
v-model="orderFormData.invCode" v-model="orderFormData.invCode"
placeholder="当前仓库" placeholder="当前仓库"
@ -124,7 +168,7 @@
</el-col> </el-col>
<el-col :span="11" v-if="splitBusType!=null"> <el-col :span="11" v-if="splitBusType!=null">
<el-form-item prop="workPlaceCode" label="当前工位:"> <el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:">
<el-select <el-select
v-model="orderFormData.workPlaceCode" v-model="orderFormData.workPlaceCode"
placeholder="当前工位" placeholder="当前工位"
@ -148,7 +192,7 @@
</el-col> </el-col>
<el-col :span="11" v-if="splitBusType!=null"> <el-col :span="11" v-if="splitBusType!=null">
<el-form-item prop="fifoSplit" label="上货方式:"> <el-form-item prop="fifoSplit" class="query-form-item" label="上货方式:">
<el-select v-model="orderFormData.fifoSplit" placeholder="请选择出入库类型" style="width: 90%"> <el-select v-model="orderFormData.fifoSplit" placeholder="请选择出入库类型" style="width: 90%">
<el-option label="拆零上货" :value="1"></el-option> <el-option label="拆零上货" :value="1"></el-option>
<el-option label="整取上货" :value="2"></el-option> <el-option label="整取上货" :value="2"></el-option>
@ -157,7 +201,7 @@
</el-col> </el-col>
<el-col :span="11" v-if="!splitBusType"> <el-col :span="11" v-if="!splitBusType">
<el-form-item prop="action" label="单据类型:"> <el-form-item prop="action" class="query-form-item" label="单据类型:">
<el-select <el-select
v-model="orderFormData.action" v-model="orderFormData.action"
placeholder="请选择单据类型" placeholder="请选择单据类型"
@ -180,7 +224,7 @@
<el-col :span="11" v-if="!splitBusType"> <el-col :span="11" v-if="!splitBusType">
<el-form-item <el-form-item
prop="fromCorp" prop="fromCorp"
label="往来信息:" label="往来信息:" class="query-form-item"
v-if=" v-if="
curAction.corpType === 0 || curAction.corpType === 0 ||
curAction.corpType === 2 || curAction.corpType === 2 ||
@ -211,7 +255,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
prop="fromCorp" prop="fromCorp" class="query-form-item"
v-if="curAction.corpType == 3" v-if="curAction.corpType == 3"
label="往来信息:" label="往来信息:"
> >
@ -237,7 +281,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="往来信息:" label="往来信息:" class="query-form-item"
v-if="curAction.corpType == 1 && curAction.genUnit " v-if="curAction.corpType == 1 && curAction.genUnit "
> >
<el-input <el-input
@ -281,7 +325,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item prop="remark" label="单据备注:"> <el-form-item prop="remark" class="query-form-item" label="单据备注:">
<el-input <el-input
v-model="orderFormData.remark" v-model="orderFormData.remark"
auto-complete="off" auto-complete="off"
@ -296,7 +340,7 @@
<el-row v-if="curSpaceShow"> <el-row v-if="curSpaceShow">
<el-col :span="11"> <el-col :span="11">
<el-form-item prop="acceptance" label="预验收单据:"> <el-form-item prop="acceptance" class="query-form-item" label="预验收单据:">
<el-select <el-select
style="width: 90%" style="width: 90%"
v-model="checkPreInArray" v-model="checkPreInArray"
@ -317,7 +361,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item prop="curSpaceCode" label="当前货位:"> <el-form-item prop="curSpaceCode" class="query-form-item" label="当前货位:">
<el-select <el-select
v-model="orderFormData.curSpaceCode" v-model="orderFormData.curSpaceCode"
placeholder="当前货位" placeholder="当前货位"
@ -342,7 +386,7 @@
</el-row> </el-row>
<el-row v-if="preInSpaceShow"> <el-row v-if="preInSpaceShow">
<el-col :span="11"> <el-col :span="11">
<el-form-item prop="checkPreInSpaceCode" label="预验收出库货位:"> <el-form-item prop="checkPreInSpaceCode" class="query-form-item" label="预验收出库货位:">
<el-select <el-select
v-model="orderFormData.checkPreInSpaceCode" v-model="orderFormData.checkPreInSpaceCode"
placeholder="预验收货位" placeholder="预验收货位"
@ -368,7 +412,7 @@
</el-row> </el-row>
<el-row v-if="preSpaceShow"> <el-row v-if="preSpaceShow">
<el-col :span="11"> <el-col :span="11">
<el-form-item prop="preCurSpaceCode" label="寄售出库货位:"> <el-form-item prop="preCurSpaceCode" class="query-form-item" label="寄售出库货位:">
<el-select <el-select
v-model="orderFormData.preCurSpaceCode" v-model="orderFormData.preCurSpaceCode"
placeholder="寄售出库货位" placeholder="寄售出库货位"
@ -393,52 +437,15 @@
</el-row> </el-row>
<el-row v-if="errView == 1"> <el-row v-if="errView == 1">
<el-col :span="20"> <el-col :span="20">
<el-form-item prop="errMsg" label="异常信息:"> <el-form-item prop="errMsg" class="query-form-item" label="异常信息:">
<el-input v-model="orderFormData.errMsg" disabled></el-input> <el-input v-model="orderFormData.errMsg" disabled></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="viewType != 1">
<el-col :span="20">
<el-form-item prop="code" label="扫码录入:">
<el-input
id="inputer"
@focus="getInputFocus($event)"
@keypress.enter.native="enterKey($event)"
ref="inputRef"
style="ime-mode: disabled"
type="tel"
placeholder="请点击输入框进行扫码设置或者扫码录入"
v-model="scanCode"
></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-button
type="primary"
size="mini"
@click.native.stop="addCode()"
style="margin-left: 15px"
>添加
</el-button>
<el-button
type="primary"
size="mini"
v-if="curAction.useDyCount == 2"
@click.native.stop="addInvProduct()"
>库存选入
</el-button>
</el-col>
</el-row>
</el-form>
<div class="result-display" :class="{'result-success': isSuccess, 'result-failure': !isSuccess}">
<p class="result-text" :class="{'result-text-success': isSuccess, 'result-text-failure': !isSuccess}">{{
result
}}</p>
</div>
</el-card> </el-card>
</el-form>
<el-tabs type="border-card" style="margin: 5px"> <el-tabs type="border-card" style="margin: 5px">
<el-tab-pane label="校验详情" v-if="viewCheckVisible || viewType == 7"> <el-tab-pane label="校验详情" v-if="viewCheckVisible || viewType == 7">
@ -558,7 +565,6 @@
v-on:selectBindRl="selectBindRl" v-on:selectBindRl="selectBindRl"
></selectRlDialog> ></selectRlDialog>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="请指定当前产品所在货位" title="请指定当前产品所在货位"
:visible.sync="selectSpaceVisible" :visible.sync="selectSpaceVisible"
@ -573,7 +579,6 @@
v-on:selectSpaceBind="selectSpaceBind" v-on:selectSpaceBind="selectSpaceBind"
></DialogSelectSpace> ></DialogSelectSpace>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="提示" title="提示"
:visible.sync="checkTipDialogVisible" :visible.sync="checkTipDialogVisible"
@ -590,7 +595,6 @@
<el-button type="primary" @click="submit(2)">扫码结果提交</el-button> <el-button type="primary" @click="submit(2)">扫码结果提交</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="库存物资录入" title="库存物资录入"
:visible.sync="selectInvProductVisible" :visible.sync="selectInvProductVisible"
@ -606,7 +610,6 @@
:type="3" :type="3"
></dialogInvProduct> ></dialogInvProduct>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -1223,6 +1226,9 @@ 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.orderFormData.workPlaceCode = this.curWorkPlaces[0].workplaceId;
}
}) })
}, },
@ -1245,7 +1251,7 @@ export default {
//添加条码 //添加条码
addCode(event) { addCode() {
this.originCode = ""; this.originCode = "";
this.sictomText = ""; this.sictomText = "";
this.orderFormData.corpOrderId = this.orderFormData.corpOrderId.trim(); this.orderFormData.corpOrderId = this.orderFormData.corpOrderId.trim();
@ -1254,9 +1260,15 @@ export default {
this.codeFormData.expireDate = ""; this.codeFormData.expireDate = "";
this.codeFormData.serialNo = ""; this.codeFormData.serialNo = "";
this.actionEnable = true; this.actionEnable = true;
if (event == null) {
} else event.target.select();
this.$refs.inputRef.select(); this.$refs.inputRef.select();
if (this.$isBlank(this.codeFormData.code)) {
this.codeFormData.code = this.scanCode.trim();
return;
}
if (this.$isBlank(this.codeFormData.code) && this.$isBlank(this.scanCode)) {
return;
}
if (this.$isBlank(this.orderFormData.action)) { if (this.$isBlank(this.orderFormData.action)) {
this.$message.warning("请选择单据类型！"); this.$message.warning("请选择单据类型！");
return; return;
@ -1301,8 +1313,6 @@ export default {
return; return;
} }
} }
if (this.checkPreInArray != null) { if (this.checkPreInArray != null) {
this.orderFormData.checkPreInOrders = this.checkPreInArray.join(","); this.orderFormData.checkPreInOrders = this.checkPreInArray.join(",");
} }
@ -1313,8 +1323,7 @@ export default {
parseTime(date, "{y}{m}{d}{h}{i}{s}") + parseTime(date, "{y}{m}{d}{h}{i}{s}") +
Math.ceil(Math.random() * 89 + 10); Math.ceil(Math.random() * 89 + 10);
} }
this.codeFormData.code = this.scanCode.trim();
if (this.$isBlank(this.codeFormData.code)) return;
this.loading = true; this.loading = true;
let tQuery = Object.assign( let tQuery = Object.assign(
JSON.parse(JSON.stringify(this.orderFormData)) JSON.parse(JSON.stringify(this.orderFormData))
@ -1743,9 +1752,9 @@ export default {
this.$refs.inputRef.focus(); this.$refs.inputRef.focus();
this.$refs.inputRef.select(); this.$refs.inputRef.select();
this.isSuccess = true; this.isSuccess = true;
this.scanCode = ""
this.printCodeResult(response.data) this.printCodeResult(response.data)
this.codeFormData.code = response.data.code; this.codeFormData.code = response.data.code;
this.scanCode = ""
this.addCode(); this.addCode();
} else { } else {
if (response.code == 502) { if (response.code == 502) {
@ -2020,6 +2029,11 @@ export default {
<style scoped> <style scoped>
.query-form-item {
margin-right: 5px;
margin-bottom: 6px;
}
#inputer { #inputer {
width: 100%; width: 100%;
min-height: 30px; min-height: 30px;

19
src/views/inout/split/IoSplitFifoCodePanel.vue
Unescape Escape View File

@ -221,7 +221,7 @@
</el-card> </el-card>
<el-tabs type="border-card" style="margin: 15px"> <el-tabs type="border-card" style="margin: 15px">
<el-tab-pane> <el-tab-pane>
<span slot="label"> {{ currentRow.cpmctymc }}-扫码明细</span> <span slot="label"> {{ currentRow.cpmctymc }}-库存码明细</span>
<el-form v-if="queryList4 && queryList4.length > 0" :inline="true" :model="resultQuery" class="query-form" <el-form v-if="queryList4 && queryList4.length > 0" :inline="true" :model="resultQuery" class="query-form"
size="mini"> size="mini">
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
@ -546,8 +546,8 @@ export default {
}) })
}, },
detailClick(row) { detailClick(_this, row) {
this.resultQuery = { _this.resultQuery = {
relId: row.relId, relId: row.relId,
batchNo: row.batchNo, batchNo: row.batchNo,
supId: row.supId, supId: row.supId,
@ -556,19 +556,20 @@ export default {
page: 1, page: 1,
limit: 10 limit: 10
} }
this.getResultDetailList(); _this.currentRow = row
_this.getResultDetailList();
}, },
getResultDetailList() { getResultDetailList() {
this.loading = true; this.loading = true;
splitFifoDetail(this.resultQuery).then(res => { splitFifoDetail(this.resultQuery).then(res => {
this.loading = false this.loading = false
this.list = res.data.list || [] this.resultDetailList = res.data.list || []
this.total = res.data.total || 0 this.resultTotal = res.data.total || 0
}).catch(() => { }).catch(() => {
this.loading = false this.loading = false
this.list = [] this.resultDetailList = []
this.total = 0 this.resultTotal = 0
}) })
}, },
@ -598,7 +599,7 @@ export default {
this.fromList = re.data.fromList; this.fromList = re.data.fromList;
this.getList(); this.getList();
}); });
getHead("IoEditOrder-smmx", "1").then((re) => { getHead("ioSplitFifoCode-smmx", "1").then((re) => {
// 处理返回的数据 // 处理返回的数据
this.tableObj4 = re.data; this.tableObj4 = re.data;
this.tableHeader4 = re.data.tableList; this.tableHeader4 = re.data.tableList;

1
src/views/inout/split/IoSplitScanCode.vue
Unescape Escape View File

@ -94,7 +94,6 @@
</el-button </el-button
> >
<el-button type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button> <el-button type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button>
<el-button type="danger" icon="el-icon-error" @click="errOrderDialog">异常扫码单</el-button>
</el-button-group> </el-button-group>
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>

14
src/views/inout/split/bindWorkDialog.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card> <el-card style="margin-top: -20px">
<el-form :model="query" label-width="auto" v-show="showSearch" size="mini" class="query-form"> <el-form :model="query" label-width="auto" v-show="showSearch" size="mini">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="当前仓库:" class="query-form-item"> <el-form-item label="当前仓库:" class="query-form-item">
@ -35,10 +35,10 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column type="index" label="序号"></el-table-column> <el-table-column type="index" label="序号"></el-table-column>
<el-table-column label="工位编码" prop="workplaceId" width="90"></el-table-column> <el-table-column label="工位编码" prop="workplaceId"></el-table-column>
<el-table-column label="工位名称" prop="workplaceName" width="90"></el-table-column> <el-table-column label="工位名称" prop="workplaceName"></el-table-column>
<el-table-column label="所属仓库" prop="invName" width="90"></el-table-column> <el-table-column label="所属仓库" prop="invName"></el-table-column>
<el-table-column label="备注" prop="remake" width="90"></el-table-column> <el-table-column label="备注" prop="remake"></el-table-column>
</el-table> </el-table>
</el-card> </el-card>
@ -202,7 +202,7 @@ export default {
bindWork() { bindWork() {
let query = { let query = {
prescribeList: this.prescribeList, prescribeList: this.prescribeList,
workplaceCode: this.radioCheck workplaceCode: this.currentRow.workplaceId
} }
bindWork(query).then(res => { bindWork(query).then(res => {
if (res.code != 20000) { if (res.code != 20000) {

2
src/views/inout/split/prescribeAllot.vue
Unescape Escape View File

@ -231,7 +231,7 @@
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="bindWorkPlaceVisible" v-if="bindWorkPlaceVisible"
width="45%" width="65%"
append-to-body append-to-body
> >
<bindWorkDialog <bindWorkDialog

76
src/views/inout/split/prescribeDownloadDialog.vue
Unescape Escape View File

@ -1,5 +1,5 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form"
size="mini" label-width="100px"> size="mini" label-width="100px">
@ -167,27 +167,27 @@
</el-tag> </el-tag>
</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"-->
<!-- :type="buttonItem.type"--> <!-- :type="buttonItem.type"-->
<!-- :size="buttonItem.size"--> <!-- :size="buttonItem.size"-->
<!-- :style="buttonItem.style"--> <!-- :style="buttonItem.style"-->
<!-- :key="buttonItem"--> <!-- :key="buttonItem"-->
<!-- v-if="executeEval(scope.row,buttonItem.hasPermi,true)"--> <!-- v-if="executeEval(scope.row,buttonItem.hasPermi,true)"-->
<!-- :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"--> <!-- :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"-->
<!-- @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"--> <!-- @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"-->
<!-- >{{ buttonItem.name }}--> <!-- >{{ buttonItem.name }}-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- </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"
@ -214,12 +214,13 @@
@pagination="handleCurrentChange" @pagination="handleCurrentChange"
></pagination> ></pagination>
</el-card> </el-card>
</div> </div>
</template> </template>
<script> <script>
import {prescribeOnline,prescribeSave} from "@/api/basic/sicker/skPersonApi"; import {prescribeOnline, prescribeSave} from "@/api/basic/sicker/skPersonApi";
import {executeFuc, getHead} from "@/utils/customConfig"; import {executeFuc, getHead} from "@/utils/customConfig";
import {deleteDataByCode} from "@/api/basic/sicker/prescribeApi";
export default { export default {
name: "prescribeDownloadDialog", name: "prescribeDownloadDialog",
@ -286,8 +287,8 @@ export default {
loading: false, loading: false,
list: [], list: [],
total: 0, total: 0,
downloadPrescriptionVisible:false, downloadPrescriptionVisible: false,
deleteData:{}, deleteData: {},
preLoading: false, preLoading: false,
preDetailList: [], preDetailList: [],
preTotal: 0, preTotal: 0,
@ -330,17 +331,17 @@ export default {
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
}, },
downloadPrescription(){ downloadPrescription() {
if (this.selectList.length == 0){ if (this.selectList.length == 0) {
this.$message.error("请选择下载处方") this.$message.error("请选择下载处方")
return return
}else { } else {
//请求后端 进行 保存 处方 //请求后端 进行 保存 处方
prescribeSave(this.selectList).then(res => { prescribeSave(this.selectList).then(res => {
if (res.code == 20000){ if (res.code == 20000) {
this.closeDialog() this.closeDialog()
this.$message.success("操作成功") this.$message.success("操作成功")
}else { } else {
this.$message.error(res.message) this.$message.error(res.message)
} }
}).catch(() => { }).catch(() => {
@ -350,7 +351,7 @@ export default {
}, },
handleUserSelectionChange(val) { handleUserSelectionChange(val) {
this.selectList = val.map(i=>i) this.selectList = val.map(i => i)
}, },
onSubmit() { onSubmit() {
this.filterQuery.page = 1; this.filterQuery.page = 1;
@ -412,7 +413,7 @@ export default {
this.getPrescribeDetail(this, null); this.getPrescribeDetail(this, null);
}, },
deleteDialog(_this,row) { deleteDialog(_this, row) {
_this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", { _this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
@ -464,5 +465,14 @@ export default {
</script> </script>
<style scoped> <style scoped>
.query-form {
display: flex;
flex-wrap: wrap;
width: 100%;
}
.query-form-item {
margin-right: 5px;
margin-bottom: 6px;
}
</style> </style>

151
src/views/inout/split/prescribeTagCodeDeal.vue
Unescape Escape View File

@ -2,118 +2,9 @@
<div> <div>
<el-form :model="formData" class="order-el-form" ref="formData" label-width="120px"> <el-form :model="formData" class="order-el-form" ref="formData" label-width="120px">
<el-card> <el-card>
<el-row :gutter="0">
<el-col :span="22" align="right">
<el-button-group>
<el-button
type="primary"
@click.native="selectPrescribe()"
>选入处方
</el-button>
</el-button-group>
</el-col>
</el-row>
<el-row :gutter="20" class="order-el-row" style="margin-top: 20px ">
<el-col :span="12">
<el-form-item prop="code" label="处方编码:">
<el-input
v-model="formData.code"
auto-complete="off"
clearable
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="sickName" label="患者名称:">
<el-input
v-model="formData.sickName"
auto-complete="off"
clearable
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="adNum" label="住院号:">
<el-input
v-model="formData.adNum"
auto-complete="off"
clearable
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="expireDate" label="就诊卡号:">
<el-input
v-model="formData.cpmctymc"
auto-complete="off"
clearable
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="createDr" label="开方医生:">
<el-input
v-model="formData.createDr"
auto-complete="off"
clearable
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="prescribeDate" label="开方时间:">
<el-input
v-model="formData.prescribeDate"
auto-complete="off"
clearable
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="deptName" label="就诊科室:">
<el-input
v-model="formData.deptName"
auto-complete="off"
clearable
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="amount" label="处方费用:">
<el-input
v-model="formData.amount"
auto-complete="off"
clearable
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="remark" label="处方备注:">
<el-input
v-model="formData.remark"
auto-complete="off"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-card>
<el-tabs type="border-card" style="margin: 15px">
<el-tab-pane label="手动扫码">
<el-row :gutter="0"> <el-row :gutter="0">
<el-col :span="20"> <el-col :span="20">
<el-form-item prop="code" label="扫码关联:"> <el-form-item prop="code" label="扫码录入:">
<el-input <el-input
id="inputer" id="inputer"
@focus="getInputFocus($event)" @focus="getInputFocus($event)"
@ -141,6 +32,45 @@
result result
}}</p> }}</p>
</div> </div>
</el-card>
<el-card>
<el-row :gutter="0">
<el-col :span="22" align="right">
<el-button-group>
<el-button
type="primary"
@click.native="selectPrescribe()"
>下一单处方
</el-button>
<el-button
type="primary"
@click.native="selectPrescribe()"
>选入处方
</el-button>
<el-button
type="primary"
@click.native="selectPrescribe()"
>处理完成
</el-button>
</el-button-group>
</el-col>
</el-row>
<el-descriptions title="处方详情" :column="4" border>
<el-descriptions-item label="处方编码">{{formData.code}}</el-descriptions-item>
<el-descriptions-item label="患者名称">{{formData.sickName}}</el-descriptions-item>
<el-descriptions-item label="住院号">{{formData.adNum}}</el-descriptions-item>
<el-descriptions-item label="就诊卡号">{{formData.clinicNumber}}</el-descriptions-item>
<el-descriptions-item label="开方医生">{{formData.createDr}}</el-descriptions-item>
<el-descriptions-item label="开方时间">{{formData.prescribeDate}}</el-descriptions-item>
<el-descriptions-item label="就诊科室">{{formData.deptName}}</el-descriptions-item>
<el-descriptions-item label="处方费用">{{formData.amount}}</el-descriptions-item>
<el-descriptions-item label="处方备注">{{formData.remark}}</el-descriptions-item>
</el-descriptions>
</el-card>
<el-tabs type="border-card" style="margin: 15px">
<el-tab-pane label="手动扫码">
<el-table v-loading="loading" :data="list" style="width: 100%" border> <el-table v-loading="loading" :data="list" style="width: 100%" border>
<template v-for="(item, index) in tableHeader"> <template v-for="(item, index) in tableHeader">
<el-table-column <el-table-column
@ -252,7 +182,6 @@
</el-table-column> </el-table-column>
</template> </template>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"

206
src/views/inout/split/selectPrescribeDialog.vue
Unescape Escape View File

@ -109,7 +109,6 @@
:row-style="{ height: '32px' }" :row-style="{ height: '32px' }"
@sort-change="handleSortChange"> @sort-change="handleSortChange">
<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)"
@ -216,127 +215,10 @@
</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
<el-table v-loading="preLoading" :data="preDetailList" style="width: 100%" border> v-if="panelALive"
<template v-for="(item, index) in tableHeader1"> :prescribeData="curRow"
<el-table-column ></prescribeOriginPanel>
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-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -348,12 +230,10 @@
import addOrder from "@/views/inout/DialogCreateOrder"; 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 store from "@/store";
import {filterOrder} from "@/api/inout/order";
import {convertDate} from "@/utils/date"; import {convertDate} from "@/utils/date";
import {detail, page as prescribePage, deleteDataByCode} from "@/api/basic/sicker/prescribeApi"; import {page as prescribePage} from "@/api/basic/sicker/prescribeApi";
import {materialPrescribePage} from "@/api/inout/splitCode";
import prescribeDownloadDialog from "@/views/inout/split/prescribeDownloadDialog"; import prescribeDownloadDialog from "@/views/inout/split/prescribeDownloadDialog";
import prescribeOriginPanel from "./prescribeOriginPanel";
export default { export default {
name: "selectPrescribeDialog", name: "selectPrescribeDialog",
@ -369,18 +249,12 @@ export default {
}, },
data() { data() {
return { return {
//界面配置相关 //界面配置相关
//患者处方 //患者处方
tableHeader: [], tableHeader: [],
queryList: [], queryList: [],
tableObj: [], tableObj: [],
fromList: [], fromList: [],
//处方明细
tableHeader1: [],
queryList1: [],
tableObj1: [],
fromList1: [],
convertDateFun: convertDate, convertDateFun: convertDate,
//界面配置-------------end //界面配置-------------end
@ -395,21 +269,16 @@ export default {
list: [], list: [],
total: 0, total: 0,
deleteData: {}, deleteData: {},
preLoading: false,
preDetailList: [],
preTotal: 0,
radioCheck: null, radioCheck: null,
currentRow: null, curRow: null,
preQuery: { panelALive
prescribeCode: null, :
page: 1, false,
limit: 10,
},
} }
}, },
components: { components: {
addOrder, errOrder, prescribeDownloadDialog addOrder, errOrder, prescribeDownloadDialog, prescribeOriginPanel
}, },
methods: { methods: {
@ -473,35 +342,18 @@ export default {
}, },
prescribeClick(_this, row) { prescribeClick(_this, row) {
this.getPrescribeDetail(_this, row) _this.curRow = row;
this.getCodeDetail(_this, row) _this.radioCheck = row.id;
_this.currentRow = row;
_this.refreshCodesPanel(_this);
}, },
refreshCodesPanel(_this) {
getPrescribeDetail(_this, row) { _this.panelALive = false;
if (row != null) { _this.$nextTick(() => {
_this.preQuery.page = 1 _this.panelALive = true;
_this.preQuery.prescribeCode = row.code });
}
_this.preLoading = true;
detail(_this.preQuery).then(res => {
_this.preLoading = false
if (res.code != 20000) {
_this.$message.error(res.message)
return
}
_this.preDetailList = res.data.items
_this.preLoading = false
}).catch(() => {
_this.preLoading = false
_this.$message.error("数据加载失败")
})
}, },
preHandleCurrentChange(val) {
this.filterQuery.page = val.page;
this.getPrescribeDetail(this, null);
},
handleChange(val) { handleChange(val) {
this.radioCheck = val.id; this.radioCheck = val.id;
this.currentRow = val; this.currentRow = val;
@ -518,20 +370,20 @@ export default {
this.getList(); this.getList();
}); });
getHead("selectTagPrescribe-1", "1").then((re) => {
// 处理返回的数据
this.tableObj1 = re.data;
this.tableHeader1 = re.data.tableList;
this.queryList1 = re.data.queryList;
this.fromList1 = re.data.fromList;
this.getList();
});
} }
} }
</script> </script>
<style scoped> <style scoped>
.query-form {
display: flex;
flex-wrap: wrap;
width: 100%;
}
.query-form-item {
margin-right: 5px;
margin-bottom: 6px;
}
</style> </style>

Write Preview
Loading…
Cancel
Save