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

新增药品出入库单批量扫码修改

Browse Source
dev2.5_scan
yewj 1 week ago
parent 6dc9010756
commit 4af06aae4c
6 changed files with 167 additions and 192 deletions
Show Stats Download Patch File Download Diff File

4
.env.production
Unescape Escape View File

@ -30,7 +30,7 @@ ENV = 'production'
# 平和县医院 # 平和县医院
# VUE_APP_BASE_API = 'http://192.168.0.43:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.43:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/' VUE_APP_BASE_API = 'http://sjld.jiyunas.icu:81/UDI_WMS_MC/'
# 长泰医院 # 长泰医院
# VUE_APP_BASE_API = 'http://192.168.6.189:9160/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.6.189:9160/UDI_WMS_MC/'
@ -76,7 +76,7 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://116.204.116.198:9160/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://116.204.116.198:9160/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
# 湖里妇幼 # 湖里妇幼
VUE_APP_BASE_API = 'http://192.168.158.151:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.158.151:9150/UDI_WMS_MC/'
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/' VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'

2
package.json
Unescape Escape View File

@ -5,7 +5,7 @@
"author": "Glxp", "author": "Glxp",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"build:prod": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build", "build:prod": "vue-cli-service build",
"build:test": "vue-cli-service build --mode test", "build:test": "vue-cli-service build --mode test",
"preview": "node build/index.js --preview", "preview": "node build/index.js --preview",
"lint": "eslint --ext .js,.vue src", "lint": "eslint --ext .js,.vue src",

90
src/views/inoutDrug/DialogCreateDrugOrder.vue
Unescape Escape View File

@ -364,7 +364,6 @@
<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"
@focus="getInputFocus($event)" @focus="getInputFocus($event)"
@keypress.enter.native="enterKey($event)" @keypress.enter.native="enterKey($event)"
ref="inputRef" ref="inputRef"
@ -601,7 +600,7 @@ import {
submitCodes, submitCodes,
submitOrderWeb, submitOrderWeb,
saveOrderWeb, saveOrderWeb,
submitAllocateBiz, rollbackWaitcheck, submitCodeResult, submitCheckResult, delmitBiz, addDrugOrderWeb, submitAllocateBiz, rollbackWaitcheck, submitCodeResult, submitCheckResult, delmitBiz, addDrugOrderWeb, batchAddCode,
} from "../../api/inout/order"; } from "../../api/inout/order";
import {filterSubAll, findByFrom, findInvByUser} from "../../api/system/invSubWarehouse"; import {filterSubAll, findByFrom, findInvByUser} from "../../api/system/invSubWarehouse";
import {parseTime} from "../../utils/coTools"; import {parseTime} from "../../utils/coTools";
@ -638,6 +637,11 @@ export default {
type: Object, type: Object,
required: true, required: true,
}, },
fromCorp: {
type: Object,
required: true,
},
errView: { errView: {
type: Object, type: Object,
required: true, required: true,
@ -1020,7 +1024,7 @@ export default {
this.closeDialog(); this.closeDialog();
} else { } else {
// this.$message.error(response.message); // this.$message.error(response.message);
const codeDetailComponent = this.$refs.IoCreateOrderCodeDetail.getOrderDetails(); // const codeDetailComponent = this.$refs.IoCreateOrderCodeDetail.getOrderDetails();
} }
}); });
const codeDetailComponent = this.$refs.IoCreateOrderCodeDetail.getOrderDetails(); const codeDetailComponent = this.$refs.IoCreateOrderCodeDetail.getOrderDetails();
@ -1111,9 +1115,9 @@ export default {
(this.curAction.corpType == 1 && !this.curAction.genUnit) (this.curAction.corpType == 1 && !this.curAction.genUnit)
) { ) {
//1.切换往来单位 //1.切换往来单位
this.orderFormData.fromCorp = null; // this.orderFormData.fromCorp = null;
this.delorderData(); // this.delorderData();
this.findMethod(); this.findMethod();
} else if (this.curAction.corpType == 3) { } else if (this.curAction.corpType == 3) {
@ -1353,6 +1357,11 @@ export default {
let tQuery = Object.assign( let tQuery = Object.assign(
JSON.parse(JSON.stringify(this.orderFormData)) JSON.parse(JSON.stringify(this.orderFormData))
); );
if (this.codeFormData.code.includes(';')) {
const codeArray = this.codeFormData.code.split(';')
tQuery.codeList = codeArray
} else
tQuery.code = this.codeFormData.code; tQuery.code = this.codeFormData.code;
tQuery.orderType = this.viewType; tQuery.orderType = this.viewType;
this.addCodeSubmit(tQuery); this.addCodeSubmit(tQuery);
@ -1377,7 +1386,7 @@ export default {
//添加条码后提交 //添加条码后提交
addCodeSubmit(tQuery) { addCodeSubmit(tQuery) {
addDrugOrderWeb(tQuery).then((response) => { batchAddCode(tQuery).then((response) => {
if (response.code === 20000) { if (response.code === 20000) {
this.orderFormData.billNo = response.data.orderId; this.orderFormData.billNo = response.data.orderId;
if (response.data.errMsg != null) { if (response.data.errMsg != null) {
@ -1391,9 +1400,10 @@ export default {
} }
this.corpOrderIdDisabled = true; this.corpOrderIdDisabled = true;
this.refreshCodesPanel(); this.refreshCodesPanel();
this.orderFormData.relId = null;
this.printMutiCodeResult(response.data.vailCodeResultResponses)
this.$refs.inputRef.focus(); this.$refs.inputRef.focus();
this.$refs.inputRef.select(); this.$refs.inputRef.select();
this.orderFormData.relId = null;
} else { } else {
if (response.code == 502) { if (response.code == 502) {
//该产品绑定多个产品ID处理 //该产品绑定多个产品ID处理
@ -1524,6 +1534,27 @@ export default {
} }
}, },
async printMutiCodeResult(vailCodeResultResponses) {
let result = ""
let warnResult = ""
for (let i = 0; i < vailCodeResultResponses.length; i++) {
let data = vailCodeResultResponses[i]
if (data.status == 1) {
result = result + ';' + vailCodeResultResponses[i].code
} else if (data.status == 2) {
if (result == '') {
}
warnResult = warnResult + '\n' + vailCodeResultResponses[i].code + ':' + vailCodeResultResponses[i].errMsg
} else if (data.status == 3) {
result = result + '\n' + vailCodeResultResponses[i].code
}
}
if (!isBlank(warnResult)) {
this.$message.error(warnResult)
}
},
refreshOrder(orderQuery) { refreshOrder(orderQuery) {
this.orderFormData = orderQuery; this.orderFormData = orderQuery;
}, },
@ -1841,29 +1872,11 @@ export default {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
}; };
var that = this;
var inputer = document.getElementById("inputer");
window.sc = new A.KeyScaner(inputer); //传入要监听的DOM节点
sc.onInput = function (text) {
if (text.includes("delete")) {
that.codeFormData.code = "";
that.sictomText = "";
that.originCode = "";
return;
}
if (that.sitcomScan) {
let tempTxt = text;
let str = tempTxt.replace(/[\r]/g, "");
that.sictomText = that.sictomText + str;
that.codeFormData.code = that.sictomText;
} else {
that.codeFormData.code = text;
}
};
inputer.focus();
}, },
created() { created() {
//页面初始化 //页面初始化
this.orderQuery.fromCorp = this.fromCorp
console.log(this.orderQuery.fromCorp)
this.codeFormData.code = ""; this.codeFormData.code = "";
//页面类型 //页面类型
if (this.viewType == 2) { if (this.viewType == 2) {
@ -1936,29 +1949,6 @@ export default {
<style scoped> <style scoped>
#inputer {
width: 100%;
min-height: 30px;
background-color: white;
border: #d0d0d0;
border-style: solid;
border-width: 0.1px;
color: #4a4a4a;
}
#inputer:focus {
width: 100%;
min-height: 30px;
background-color: white;
border: #0080ff;
border-style: solid;
border-width: 0.1px;
color: #4a4a4a;
}
.ime-disabled {
ime-mode: disabled;
}
</style> </style>

15
src/views/inoutDrug/IoCreateOrder.vue
Unescape Escape View File

@ -208,6 +208,7 @@
:orderQuery="idQuery" :orderQuery="idQuery"
:viewType="viewType" :viewType="viewType"
:errView="errView" :errView="errView"
:fromCorp="idQuery.fromCorp"
></addOrder> ></addOrder>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
@ -480,10 +481,18 @@ export default {
_this.idQuery = {}; _this.idQuery = {};
if (row != null && row.status === 4) { if (row != null && row.status === 4) {
_this.errView = 1; _this.errView = 1;
_this.idQuery = row; _this.idQuery = Object.assign(
JSON.parse(JSON.stringify(row))
);
_this.idQuery.fromCorp = row.fromCorp;
} }
if (row != null) if (row != null) {
_this.idQuery = row; _this.idQuery = Object.assign(
JSON.parse(JSON.stringify(row))
);
_this.idQuery.fromCorp = row.fromCorp;
}
_this.addOrderVisible = true; _this.addOrderVisible = true;
}, },
closeDialog() { closeDialog() {

23
src/views/inoutDrug/PanelCreateOrderCodesDrugBiz.vue
Unescape Escape View File

@ -27,12 +27,6 @@
width="120" width="120"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<!--<el-table-column-->
<!-- label="规格型号"-->
<!-- prop="ggxh"-->
<!-- width="140"-->
<!-- show-overflow-tooltip-->
<!--&gt;</el-table-column>-->
<el-table-column <el-table-column
label="包装规格" label="包装规格"
prop="bzgg" prop="bzgg"
@ -57,12 +51,6 @@
width="80" width="80"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<!-- <el-table-column-->
<!-- label="制剂单位"-->
<!-- prop="prepnUnit"-->
<!-- width="140"-->
<!-- show-overflow-tooltip-->
<!-- ></el-table-column>-->
<el-table-column <el-table-column
label="生产日期" label="生产日期"
prop="produceDate" prop="produceDate"
@ -89,13 +77,6 @@
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<!-- <el-table-column-->
<!-- label="供应商"-->
<!-- prop="supName"-->
<!-- width="180"-->
<!-- show-overflow-tooltip-->
<!-- ></el-table-column>-->
<el-table-column label="操作" width="280" fixed="right"> <el-table-column label="操作" width="280" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -265,10 +246,6 @@ export default {
type: Object, type: Object,
required: true, required: true,
}, },
// refreshPanel: {
// type: Function,
// required: true,
// },
selectRlTitle: { selectRlTitle: {
type: Object, type: Object,
required: true, required: true,

15
src/views/inoutDrug/PanelCreateOrderDetailDrug.vue
Unescape Escape View File

@ -2,7 +2,6 @@
<div> <div>
<el-table v-loading="loading" :data="detailList" style="width: 100%;" max-height="350" height="350" <el-table v-loading="loading" :data="detailList" style="width: 100%;" max-height="350" height="350"
border border
:row-style="rowStyle"
ref="multipleTable"> ref="multipleTable">
<el-table-column type="index" label="序号" width="50"></el-table-column> <el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column <el-table-column
@ -48,15 +47,15 @@
<el-table-column label="生产企业" width="150" prop="manufacturer" show-overflow-tooltip></el-table-column> <el-table-column label="生产企业" width="150" prop="manufacturer" show-overflow-tooltip></el-table-column>
<el-table-column label="批准文号" width="150" prop="certCode" show-overflow-tooltip></el-table-column> <el-table-column label="批准文号" width="150" prop="certCode" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="160" fixed="right" <el-table-column label="操作" width="120" fixed="right"
v-if="curAction.mainAction=='WareHouseIn' && curAction.corpType==2"> v-if="curAction.mainAction=='WareHouseIn' && curAction.corpType==2">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" v-if="scope.row.index == selectedIndex" @click.stop="true" <!-- <el-button type="text" size="small" v-if="scope.row.index == selectedIndex" @click.stop="true"-->
@click.native="saveChange(scope.row)">保存 <!-- @click.native="saveChange(scope.row)">保存-->
</el-button> <!-- </el-button>-->
<el-button type="text" size="small" v-if="scope.row.index != selectedIndex" @click.stop="true" <!-- <el-button type="text" size="small" v-if="scope.row.index != selectedIndex" @click.stop="true"-->
@click.native="rowChange(scope.row)">编辑 <!-- @click.native="rowChange(scope.row)">编辑-->
</el-button> <!-- </el-button>-->
<el-button type="text" size="small" v-if="scope.row.id" @click.stop="true" <el-button type="text" size="small" v-if="scope.row.id" @click.stop="true"
@click.native="showCode(scope.row)">扫码明细 @click.native="showCode(scope.row)">扫码明细
</el-button> </el-button>

Write Preview
Loading…
Cancel
Save