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

药品扫码流程修改

Browse Source
dev_unify
anthonywj 11 months ago
parent 54c5f86598
commit 8058206dee
5 changed files with 101 additions and 329 deletions
Show Stats Download Patch File Download Diff File

8
src/api/pharmaceuticals/drugDistribution.js
Unescape Escape View File

@ -106,6 +106,14 @@ export function addOrderWeb(query) {
});
}
export function addDrugOrderWeb(query) {
return axios({
url: "/warehouse/inout/drug/addOrderWeb",
method: "post",
data: query
});
}
export function enterCodeWeb(query) {
return axios({
url: "/warehouse/inout/enterCode",

2
src/views/basic/product/drug/drugAdd.vue
Unescape Escape View File

@ -664,8 +664,10 @@ export default {
this.saveLoading = false
if (res.code == 20000) {
this.$message.success("保存成功！");
this.selectedIndex = null;
if (this.newProductData.id != null)
this.getDetailList();
} else {
this.$message.error(res.message)
}

66
src/views/pharmaceuticals/distribution/DialogCreateOrder.vue
Unescape Escape View File

@ -242,7 +242,7 @@
<script>
import {
submitBiz, addOrderWeb, submitCodes, submitOrderWeb, saveOrderWeb,
updateCodeBindSup, enterCodeWeb, submitAllocateBiz
updateCodeBindSup, enterCodeWeb, submitAllocateBiz, addDrugOrderWeb
} from "@/api/pharmaceuticals/drugDistribution";
import {findByFrom, findInvByUser} from "@/api/system/invSubWarehouse";
import {parseTime} from "@/utils/coTools";
@ -580,13 +580,6 @@ export default {
this.addCodeAfterCheck(event);
},
addCodeAfterCheck(event) {
this.originCode = "";
this.sictomText = "";
this.orderFormData.corpOrderId = this.orderFormData.corpOrderId.trim();
this.codeFormData.batchNo = "";
this.codeFormData.produceDate = "";
this.codeFormData.expireDate = "";
this.codeFormData.serialNo = "";
this.actionEnable = true;
if (event == null) {
} else event.target.select();
@ -624,10 +617,9 @@ export default {
},
//添加条码后提交
addCodeSubmit(tQuery) {
addOrderWeb(tQuery).then((response) => {
addDrugOrderWeb(tQuery).then((response) => {
if (response.code === 20000) {
this.orderFormData.billNo = response.data.orderId;
if (response.data.errMsg != null) {
@ -869,58 +861,8 @@ export default {
//校验UDI码格式是否正确
enterKey() {
this.checkSuccess = true;
let tQuery = {
originCode: this.originCode,
code: this.codeFormData.code.trim(),
}
enterCodeWeb(tQuery).then((response) => {
if (response.code === 20000) {
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
this.codeFormData.code = response.data;
this.addCode();
} else {
if (response.code == 502) {
this.checkSuccess = false;
this.codeFormData.code = response.data;
this.originCode = this.codeFormData.code;
} else if (response.code == 501) {
this.checkSuccess = false;
this.$message.error(response.message);
} else if (response.code == 503) {
this.checkSuccess = false;
this.codeFormData.code = response.data;
this.$confirm(response.message, "提示", {
type: "warning",
})
.then(() => {
this.codeFormData.code = response.data;
this.addCode();
})
.catch(() => {
this.codeFormData.code = this.originCode;
});
} else if (response.code == 508) {
this.originCode = "";
this.codeFormData.code = "01" + response.data.nameCode;
this.originCode = this.codeFormData.code;
} else {
this.$alert(response.message, '提示', {
confirmButtonText: '确定',
type: 'warning',
closeOnClickModal: true,
callback: action => {
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
}
});
}
}
this.loading = false;
});
enterKey(event) {
this.addCode()
},

4
src/views/pharmaceuticals/distribution/IoCreateOrder.vue
Unescape Escape View File

@ -377,13 +377,9 @@
import {
deleteByOrderId,
submitOrderWeb,
updateUnit, mergeOrder,
getOrderList
} from "@/api/pharmaceuticals/drugDistribution";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"
import draggable from "vuedraggable";
import addOrder from "./DialogCreateOrder";
import store from "@/store";
import {getInvListByUserOptimize} from "@/api/system/invWarehouse";
import {getLocalJoinByUserOptimize} from "@/api/basic/busType";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";

252
src/views/pharmaceuticals/distribution/IoDealOrder.vue
Unescape Escape View File

@ -1,88 +1,12 @@
<template>
<div>
<el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<!-- <el-row>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="单号:">-->
<!-- <el-input v-model="filterQuery.billNo" placeholder="单号"-->
<!-- style="width: 90%"-->
<!-- clearable="true"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- &lt;!&ndash; <el-col :span="8">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-form-item class="query-form-item" label="采购部门:">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"&ndash;&gt;-->
<!-- &lt;!&ndash; style="width: 90%"&ndash;&gt;-->
<!-- &lt;!&ndash; >&ndash;&gt;-->
<!-- &lt;!&ndash; <el-option&ndash;&gt;-->
<!-- &lt;!&ndash; v-for="item in deptList"&ndash;&gt;-->
<!-- &lt;!&ndash; :key="item.name"&ndash;&gt;-->
<!-- &lt;!&ndash; :label="item.name"&ndash;&gt;-->
<!-- &lt;!&ndash; :value="item.code">&ndash;&gt;-->
<!-- &lt;!&ndash; <span style="float: left">{{ item.name }}</span>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-option>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-select>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="收货仓库:">-->
<!-- <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"-->
<!-- style="width: 90%"-->
<!-- @change="invChange"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in invList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="单据类型:">-->
<!-- <el-select v-model="filterQuery.action" placeholder="请选择单据类型"-->
<!-- style="width: 90%"-->
<!-- clearable>-->
<!-- <el-option-->
<!-- v-for="item in busTypes"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.action">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="创建时间:">-->
<!-- <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="结束日期"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini"
label-width="100px" v-show="showSearch">
<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)" :label="item.columnDesc+`:`" :key="item.id">
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`" :key="item.id">
<el-input
v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
@ -91,7 +15,8 @@
clearable
></el-input>
</el-form-item>
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-select v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
@ -104,7 +29,8 @@
/>
</el-select>
</el-form-item>
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-select
v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
@ -122,7 +48,8 @@
/>
</el-select>
</el-form-item>
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
@ -134,7 +61,8 @@
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-date-picker
v-model="filterQuery[item.columnName]"
:style="`width:${item.width+'px'}`"
@ -170,66 +98,6 @@
:default-sort="defaultSort"
@sort-change="handleSortChange"
>
<!-- <el-table-column label="序号" type="index"></el-table-column>-->
<!-- <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>-->
<!-- <el-table-column label="单据类型" prop="billTypeName" width="150">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip-->
<!-- sortable="custom"-->
<!-- :sort-orders="['ascending', 'descending']">-->
<!-- <template slot-scope="scope">-->
<!-- <i class="el-icon-time"></i>-->
<!-- <span>{{ scope.row.createTime }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="收货仓库" prop="invName" width="120">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>-->
<!-- <el-table-column label="来源" prop="fromType" width="120">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ fromTypeMap[scope.row.fromType] }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="单据状态" prop="status" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag :type="statusFilterType(scope.row.status)">{{-->
<!-- checkStatus[scope.row.status]-->
<!-- }}-->
<!-- </el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作" width="150" fixed="right">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="addOrders(scope.row)"-->
<!-- >编辑-->
<!-- </el-button-->
<!-- >-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="deleteDialog(scope.row.billNo)"-->
<!-- >删除-->
<!-- </el-button-->
<!-- >-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="onUpload(scope.row.billNo)"-->
<!-- >校验提交-->
<!-- </el-button-->
<!-- >-->
<!-- </template>-->
<!-- </el-table-column>-->
<template v-for="(item, index) in tableHeader">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
@ -264,7 +132,9 @@
: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>
<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
@ -277,8 +147,11 @@
: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
: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>
@ -313,7 +186,9 @@
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
scope.row[item.columnName]
}}</span>
</template>
</el-table-column>
</template>
@ -361,30 +236,6 @@
<!--单据业务详情-->
<el-tab-pane>
<span slot="label">单据 {{ currentRow == null ? '' : currentRow.billNo }}-业务扫码校验结果</span>
<!--<el-form :inline="true" :model="bizQuery" class="query-form" size="mini">-->
<!-- <el-form-item class="query-form-item" label="物资名称:">-->
<!-- <el-input-->
<!-- v-model="bizQuery.productName"-->
<!-- placeholder="请输入物资名称"-->
<!-- clearable-->
<!-- >-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item>-->
<!-- <el-button-group>-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- icon="el-icon-refresh"-->
<!-- @click="onBizReset"-->
<!-- >重置-->
<!-- </el-button>-->
<!-- <el-button type="primary" @click="onBizSubmit"-->
<!-- icon="el-icon-search"-->
<!-- >查询-->
<!-- </el-button>-->
<!-- </el-button-group>-->
<!-- </el-form-item>-->
<!--</el-form>-->
<el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
:row-style="rowStyle"
row-key="id"
@ -404,57 +255,30 @@
label="规格型号" width="150"
prop="spec"
></el-table-column>
<el-table-column label="批次号" header-align="center">
<el-table-column header-align="center"
label="手录" width="100"
<el-table-column label="批次号"
prop="bbatchNo"
show-overflow-tooltip
></el-table-column>
<el-table-column header-align="center"
label="扫码"
prop="sbatchNo" width="100"
show-overflow-tooltip
></el-table-column>
</el-table-column>
<el-table-column label="生产日期" header-align="center">
<el-table-column header-align="center"
label="手录" width="100"
prop="bproductDate"
show-overflow-tooltip
></el-table-column>
<el-table-column header-align="center"
label="扫码" width="100"
prop="sproductDate"
show-overflow-tooltip
></el-table-column>
width="120"
show-overflow-tooltip>
</el-table-column>
<el-table-column label="失效日期" header-align="center">
<el-table-column header-align="center"
label="手录" width="100"
prop="bexpireDate"
show-overflow-tooltip
></el-table-column>
<el-table-column header-align="center"
label="扫码" width="100"
prop="sexpireDate"
show-overflow-tooltip
></el-table-column>
</el-table-column>
<el-table-column label="数量" header-align="center">
<el-table-column
header-align="center"
label="单据数量" width="100"
prop="count"
></el-table-column>
<el-table-column
header-align="center"
label="扫码数量" width="100"
prop="scanCount"
></el-table-column>
</el-table-column>
<el-table-column label="生产日期"
prop="bproductDate"
width="120"
show-overflow-tooltip>
</el-table-column>
<el-table-column label="失效日期"
prop="bexpireDate"
width="120"
show-overflow-tooltip>
</el-table-column>
<el-table-column
label="价格"
prop="price" width="100"
@ -509,7 +333,7 @@ export default {
billNo: null,
mainAction: null,
action: null,
statusType: "unCheck",
statusType: "unAllocate",
page: 1,
limit: 10,
startTime: null,
@ -517,7 +341,7 @@ export default {
invCode: this.$store.getters.locInvCode,
productType: 2
},
viewType: 3,
viewType: 4,
checkStatus: {
1: "草稿",
2: "等待处理",

Write Preview
Loading…
Cancel
Save