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

12/23 单据审核校验优化，药品.器械发票优化

Browse Source
20240912_adapter
wangwei 3 months ago
parent 85451c0132
commit 364fec7ded
3 changed files with 145 additions and 32 deletions
Show Stats Download Patch File Download Diff File

155
src/views/collect/IocCollectOrderCheckCode.vue
Unescape Escape View File

@ -139,6 +139,7 @@
<el-table-column label="药品编码" prop="nameCode"></el-table-column>
<el-table-column label="药品通用名称" prop="cpmctymc" width="110"></el-table-column>
<el-table-column label="包装规格" prop="ggxh" width="110"></el-table-column>
<el-table-column label="扫码数量" prop="scanCount" width="110"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="productDate"></el-table-column>
<el-table-column label="失效日期" prop="expireDate"></el-table-column>
@ -189,7 +190,7 @@
<script>
import { isBlank } from '@/utils/strUtil'
import { getCodeEndList } from '@/api/collect/IoCollectCodeSelect'
import { enterCodeBillNo } from '@/api/inout/order'
import { enterCodeBillNo, enterCodeWeb } from '@/api/inout/order'
import { autoCodeResult, findByBill, manualCodeDetail, orderDetail } from '@/api/collect/collectOrder'
import { checkCollectOrderManCode, finishCheckOrder } from '@/api/collect/splitCreateOrder'
@ -250,13 +251,18 @@ export default {
checkCodeList: [],
busDataList:[],
busDataTotal:0
busDataTotal:0,
//用于校验扫码数量
codeCount: 0,
}
},
methods: {
enterKey() {
// this.result = "\n"
this.errResult = ''
// this.errVisible = false
// this.successVisible = true
//是否已经有单据
if (this.orderData.billNo == null) {
this.enterBillNoKey()
@ -280,10 +286,78 @@ export default {
return
}
}
//单码校验
let tQuery = {
code: this.filterQuery.udiCode.trim(),
};
enterCodeWeb(tQuery).then((response) => {
if (response.code === 20000) {
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
this.isSuccess = true;
this.printCodeResult(response.data, response.message)
this.filterQuery.udiCode = response.data.code;
this.scanCode = ""
this.originCode = ""
this.addCode();
} else {
if (response.code == 502) {
this.checkSuccess = false;
this.isSuccess = false;
this.printCodeResult(response.data, response.message)
this.filterQuery.udiCode = response.data.code;
this.originCode = response.data.code;
} else if (response.code == 501) {
this.checkSuccess = false;
this.$message.error(response.message);
this.scanCode = ""
} else if (response.code == 503) {
this.checkSuccess = false;
this.isSuccess = false;
this.printCodeResult(response.data, response.message)
this.filterQuery.udiCode = response.data.code;
this.scanCode = ""
this.$confirm(response.message, "提示", {
type: "warning",
})
.then(() => {
this.filterQuery.udiCode = response.data.code;
this.addCode();
})
.catch(() => {
this.filterQuery.udiCode = response.data.code;
});
} else {
this.scanCode = ""
this.$alert(response.message, "提示", {
confirmButtonText: "确定",
type: "warning",
closeOnClickModal: true,
callback: (action) => {
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
},
});
}
}
this.loading = false;
});
// this.getInputFocus()
},
addCode(){
//前端单码校验是否已经校验该码
let isIncludes = this.checkCode(this.filterQuery.udiCode)
if (!isIncludes){
this.filterQuery.orderIdFk = this.orderData.billNo
this.verifyCode(this.filterQuery)
// this.getInputFocus()
}else {
this.scanCode = ""
this.getInputFocus()
this.$message.error("该追溯码已审核")
}
},
checkCode(code){
return this.checkCodeList.includes(code)
},
enterBillNoKey(billNo) {
@ -366,11 +440,15 @@ export default {
this.checkCodeList.push(code);
});
this.printCodeResultList(res.data)
this.codeCount = this.codeCount + query.udiCodeList.length
this.checkCodeEnd()
} else {
//如果校验成功
this.codeCount = this.codeCount + 1
this.checkCodeList.push(res.data.code)
this.verifyFinish(1, res.data, res.message)
// this.$message.success('校验成功')
this.checkCodeEnd()
}
} else {
if (Array.isArray(res.data)) {
@ -381,6 +459,17 @@ export default {
}
})
},
checkCodeEnd(){
if (this.codeCount == this.detailList.length){
this.$confirm("单据追溯码已经全部审核完毕，是否立即完成单据审核？", '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.commitCheckOrder()
})
}
},
verifyFinish(val, data, message) {
if (val == 1) {
this.errVisible = false
@ -474,7 +563,7 @@ export default {
}
// 2. 判断是否以 "01" 开头且长度大于等于 18
if (str.startsWith('01') && str.length >= 18) {
if (str.startsWith('01') && str.length >= 16) {
return true
}
@ -520,21 +609,6 @@ export default {
this.resultTotal = res.data.total || 0
this.$message.error('数据加载失败')
})
} else {
this.codeQuery.fifoSplit = this.fifoSplit
autoCodeResult(this.codeQuery).then(res => {
this.codeLoading = false
if (res.code != 20000) {
this.$message.error(res.message)
return
}
this.codeDetailList = res.data.list
this.codeTotal = res.data.total || 0
this.codeLoading = false
}).catch(() => {
this.codeLoading = false
this.$message.error('数据加载失败')
})
}
},
@ -542,9 +616,32 @@ export default {
batchVailCode(params) {
// batchVailCode(params).then((res) => {
// if (res.code === 20000) {
const vailCodeResultResponseList = []
const vailCodeResultResponse = {}
const codeList = []
params.udiCodeList.forEach(code => {
let isIncludes = this.checkCode(code)
if (isIncludes){
vailCodeResultResponse.status = 2;
vailCodeResultResponse.code = code;
vailCodeResultResponse.errMsg = "追溯码已被校验";
vailCodeResultResponseList.push(vailCodeResultResponse);
}else {
codeList.push(code)
}
});
if (vailCodeResultResponseList.length > 0){
this.printCodeResultList(vailCodeResultResponseList)
}
if (codeList.length > 0){
params.udiCodeList = codeList
this.verifyCode(params)
}
this.scanCode = ""
this.$refs.inputRef.focus()
this.$refs.inputRef.select()
this.verifyCode(params)
// } else {
// this.$message.error(res.message)
// }
@ -552,6 +649,16 @@ export default {
},
confirmCheckOrder() {
//完成校验
if (this.codeCount != this.detailList.length){
this.$confirm('当前单据追溯码未全部审核是否完成此单据?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.commitCheckOrder()
}).catch(() => {
})
}else {
this.$confirm('是否确定完成此单据审核?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -560,6 +667,8 @@ export default {
this.commitCheckOrder()
}).catch(() => {
})
}
},
commitCheckOrder() {
this.finishOrder()
@ -606,10 +715,12 @@ export default {
this.scanResultType = 'success'
this.curRow = null
this.orderData = {}
this.codeCount = 0
this.workplaceId = Number(this.$route.query.workplaceId)
this.codeList = []
this.detailList = []
this.checkCodeList = []
this.busDataList = []
this.result = '\n'
this.scanTip = '扫码审核:'
this.placeholder = '请输入单据号进行扫码审核'
@ -651,6 +762,8 @@ export default {
}
// this.getResultDetailList()
// this.init()
this.checkCodeList = []
this.codeCount = 0
},
mounted() {
this.getInputFocus()

2
src/views/inout/InvoiceCkeck.vue
Unescape Escape View File

@ -504,7 +504,7 @@ export default {
this.inputQuery.list = this.invoiceRow;
let mount = 0;
for (var i = 0; i < this.invoiceRow.length; i++) {
mount += this.invoiceRow[i].price
mount += this.invoiceRow[i].amount
}
if (mount != this.inputQuery.price) {
this.$confirm("价格不匹配，是否确定提交?", "提示", {

2
src/views/inoutDrug/InvoiceCkeck.vue
Unescape Escape View File

@ -410,7 +410,7 @@ export default {
this.inputQuery.list = this.invoiceRow;
let mount = 0;
for (var i = 0; i < this.invoiceRow.length; i++) {
mount += this.invoiceRow[i].price
mount += this.invoiceRow[i].amount
}
if (mount != this.inputQuery.price) {
this.$confirm("价格不匹配，是否确定提交?", "提示", {

Write Preview
Loading…
Cancel
Save