|
|
@ -51,7 +51,8 @@
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div style="border: 1px solid #ebeef5;border-radius: 2px;margin-top: 15px;padding: 15px" v-loading="this.loading">
|
|
|
|
<div style="border: 1px solid #ebeef5;border-radius: 2px;margin-top: 15px;padding: 15px"
|
|
|
|
|
|
|
|
v-loading="this.loading">
|
|
|
|
<el-row :gutter="0" style="margin-top: 5px">
|
|
|
|
<el-row :gutter="0" style="margin-top: 5px">
|
|
|
|
<el-col :span="20">
|
|
|
|
<el-col :span="20">
|
|
|
|
<el-form-item prop="code" :label="scanTip" label-width="80px">
|
|
|
|
<el-form-item prop="code" :label="scanTip" label-width="80px">
|
|
|
@ -208,15 +209,16 @@
|
|
|
|
:confirmSelect="this.confirmSelect"
|
|
|
|
:confirmSelect="this.confirmSelect"
|
|
|
|
:closeDialog="this.closeDialog"
|
|
|
|
:closeDialog="this.closeDialog"
|
|
|
|
:viewType="viewType"
|
|
|
|
:viewType="viewType"
|
|
|
|
|
|
|
|
:isAudit="true"
|
|
|
|
></selectPrescribeDialog>
|
|
|
|
></selectPrescribeDialog>
|
|
|
|
</el-dialog>
|
|
|
|
</el-dialog>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
|
|
<script>
|
|
|
|
<script>
|
|
|
|
import { isBlank } from '@/utils/strUtil'
|
|
|
|
import {isBlank} from '@/utils/strUtil'
|
|
|
|
import { getCodeEndList } from '@/api/collect/IoCollectCodeSelect'
|
|
|
|
import {getCodeEndList} from '@/api/collect/IoCollectCodeSelect'
|
|
|
|
import { enterCodeBillNo, enterCodeWeb } from '@/api/inout/order'
|
|
|
|
import {enterCodeBillNo, enterCodeWeb} from '@/api/inout/order'
|
|
|
|
import {
|
|
|
|
import {
|
|
|
|
autoCodeResult,
|
|
|
|
autoCodeResult,
|
|
|
|
findByBill,
|
|
|
|
findByBill,
|
|
|
@ -225,7 +227,7 @@ import {
|
|
|
|
abandonOrder,
|
|
|
|
abandonOrder,
|
|
|
|
getCurOrder
|
|
|
|
getCurOrder
|
|
|
|
} from '@/api/collect/collectOrder'
|
|
|
|
} from '@/api/collect/collectOrder'
|
|
|
|
import { checkCollectOrderManCode, draftOrder, finishCheckOrder, updateOrder } from '@/api/collect/splitCreateOrder'
|
|
|
|
import {checkCollectOrderManCode, draftOrder, finishCheckOrder, updateOrder} from '@/api/collect/splitCreateOrder'
|
|
|
|
import selectPrescribeDialog from "@/views/collect/selectCollectOrderDialog";
|
|
|
|
import selectPrescribeDialog from "@/views/collect/selectCollectOrderDialog";
|
|
|
|
import { getSet } from '@/api/collect/collectSet'
|
|
|
|
import { getSet } from '@/api/collect/collectSet'
|
|
|
|
|
|
|
|
|
|
|
@ -286,8 +288,8 @@ export default {
|
|
|
|
codeList: [],
|
|
|
|
codeList: [],
|
|
|
|
|
|
|
|
|
|
|
|
checkCodeList: [],
|
|
|
|
checkCodeList: [],
|
|
|
|
busDataList:[],
|
|
|
|
busDataList: [],
|
|
|
|
busDataTotal:0,
|
|
|
|
busDataTotal: 0,
|
|
|
|
//用于校验扫码数量
|
|
|
|
//用于校验扫码数量
|
|
|
|
codeCount: 0,
|
|
|
|
codeCount: 0,
|
|
|
|
selectPrescriptionVisible: false,
|
|
|
|
selectPrescriptionVisible: false,
|
|
|
@ -305,20 +307,20 @@ export default {
|
|
|
|
if (this.scanCode.includes("DMOENTER")) {
|
|
|
|
if (this.scanCode.includes("DMOENTER")) {
|
|
|
|
if (this.orderData.billNo == null) {
|
|
|
|
if (this.orderData.billNo == null) {
|
|
|
|
this.$message.error('请先选择单据')
|
|
|
|
this.$message.error('请先选择单据')
|
|
|
|
}else {
|
|
|
|
} else {
|
|
|
|
this.confirmCheckOrder()
|
|
|
|
this.confirmCheckOrder()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.scanCode = ''
|
|
|
|
this.scanCode = ''
|
|
|
|
return
|
|
|
|
return
|
|
|
|
}else if (this.scanCode.includes("DMOCANCEL")) {
|
|
|
|
} else if (this.scanCode.includes("DMOCANCEL")) {
|
|
|
|
if (this.orderData.billNo == null) {
|
|
|
|
if (this.orderData.billNo == null) {
|
|
|
|
this.$message.error('请先选择单据')
|
|
|
|
this.$message.error('请先选择单据')
|
|
|
|
}else {
|
|
|
|
} else {
|
|
|
|
this.cancelOrder()
|
|
|
|
this.cancelOrder()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.scanCode = ''
|
|
|
|
this.scanCode = ''
|
|
|
|
return
|
|
|
|
return
|
|
|
|
}else if (this.scanCode.includes("DMODEL")) {
|
|
|
|
} else if (this.scanCode.includes("DMODEL")) {
|
|
|
|
// this.deleteCode()
|
|
|
|
// this.deleteCode()
|
|
|
|
this.scanCode = ''
|
|
|
|
this.scanCode = ''
|
|
|
|
return
|
|
|
|
return
|
|
|
@ -392,7 +394,7 @@ export default {
|
|
|
|
.catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
this.filterQuery.udiCode = response.data.code;
|
|
|
|
this.filterQuery.udiCode = response.data.code;
|
|
|
|
});
|
|
|
|
});
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
this.scanCode = ""
|
|
|
|
this.scanCode = ""
|
|
|
|
this.$alert(response.message, "提示", {
|
|
|
|
this.$alert(response.message, "提示", {
|
|
|
|
confirmButtonText: "确定",
|
|
|
|
confirmButtonText: "确定",
|
|
|
@ -410,19 +412,19 @@ export default {
|
|
|
|
// this.getInputFocus()
|
|
|
|
// this.getInputFocus()
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
addCode(){
|
|
|
|
addCode() {
|
|
|
|
//前端单码校验是否已经校验该码
|
|
|
|
//前端单码校验是否已经校验该码
|
|
|
|
let isIncludes = this.checkCode(this.filterQuery.udiCode)
|
|
|
|
let isIncludes = this.checkCode(this.filterQuery.udiCode)
|
|
|
|
if (!isIncludes){
|
|
|
|
if (!isIncludes) {
|
|
|
|
this.filterQuery.orderIdFk = this.orderData.billNo
|
|
|
|
this.filterQuery.orderIdFk = this.orderData.billNo
|
|
|
|
this.verifyCode(this.filterQuery)
|
|
|
|
this.verifyCode(this.filterQuery)
|
|
|
|
}else {
|
|
|
|
} else {
|
|
|
|
this.scanCode = ""
|
|
|
|
this.scanCode = ""
|
|
|
|
this.getInputFocus()
|
|
|
|
this.getInputFocus()
|
|
|
|
this.$message.error("该追溯码已审核")
|
|
|
|
this.$message.error("该追溯码已审核")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
checkCode(code){
|
|
|
|
checkCode(code) {
|
|
|
|
return this.checkCodeList.includes(code)
|
|
|
|
return this.checkCodeList.includes(code)
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
@ -449,7 +451,7 @@ export default {
|
|
|
|
this.getCodeList()
|
|
|
|
this.getCodeList()
|
|
|
|
this.getBizDetailList()
|
|
|
|
this.getBizDetailList()
|
|
|
|
this.updateOrder()
|
|
|
|
this.updateOrder()
|
|
|
|
}else {
|
|
|
|
} else {
|
|
|
|
this.$refs.inputRef.focus()
|
|
|
|
this.$refs.inputRef.focus()
|
|
|
|
this.$refs.inputRef.select()
|
|
|
|
this.$refs.inputRef.select()
|
|
|
|
this.scanCode = ''
|
|
|
|
this.scanCode = ''
|
|
|
@ -526,8 +528,8 @@ export default {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
},
|
|
|
|
},
|
|
|
|
checkCodeEnd(){
|
|
|
|
checkCodeEnd() {
|
|
|
|
if (this.codeCount == this.detailList.length){
|
|
|
|
if (this.codeCount == this.detailList.length) {
|
|
|
|
this.$confirm("单据追溯码已经全部审核完毕,是否立即完成单据审核?", '提示', {
|
|
|
|
this.$confirm("单据追溯码已经全部审核完毕,是否立即完成单据审核?", '提示', {
|
|
|
|
confirmButtonText: '确定',
|
|
|
|
confirmButtonText: '确定',
|
|
|
|
cancelButtonText: '取消',
|
|
|
|
cancelButtonText: '取消',
|
|
|
@ -687,21 +689,21 @@ export default {
|
|
|
|
const vailCodeResultResponse = {}
|
|
|
|
const vailCodeResultResponse = {}
|
|
|
|
const codeList = []
|
|
|
|
const codeList = []
|
|
|
|
params.udiCodeList.forEach(code => {
|
|
|
|
params.udiCodeList.forEach(code => {
|
|
|
|
let isIncludes = this.checkCode(code)
|
|
|
|
let isIncludes = this.checkCode(code)
|
|
|
|
if (isIncludes){
|
|
|
|
if (isIncludes) {
|
|
|
|
vailCodeResultResponse.status = 2;
|
|
|
|
vailCodeResultResponse.status = 2;
|
|
|
|
vailCodeResultResponse.code = code;
|
|
|
|
vailCodeResultResponse.code = code;
|
|
|
|
vailCodeResultResponse.errMsg = "追溯码已被校验";
|
|
|
|
vailCodeResultResponse.errMsg = "追溯码已被校验";
|
|
|
|
vailCodeResultResponseList.push(vailCodeResultResponse);
|
|
|
|
vailCodeResultResponseList.push(vailCodeResultResponse);
|
|
|
|
}else {
|
|
|
|
} else {
|
|
|
|
codeList.push(code)
|
|
|
|
codeList.push(code)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
if (vailCodeResultResponseList.length > 0){
|
|
|
|
if (vailCodeResultResponseList.length > 0) {
|
|
|
|
this.printCodeResultList(vailCodeResultResponseList)
|
|
|
|
this.printCodeResultList(vailCodeResultResponseList)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (codeList.length > 0){
|
|
|
|
if (codeList.length > 0) {
|
|
|
|
params.udiCodeList = codeList
|
|
|
|
params.udiCodeList = codeList
|
|
|
|
this.verifyCode(params)
|
|
|
|
this.verifyCode(params)
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -716,7 +718,7 @@ export default {
|
|
|
|
},
|
|
|
|
},
|
|
|
|
confirmCheckOrder() {
|
|
|
|
confirmCheckOrder() {
|
|
|
|
//完成校验
|
|
|
|
//完成校验
|
|
|
|
if (this.codeCount != this.detailList.length){
|
|
|
|
if (this.codeCount != this.detailList.length) {
|
|
|
|
this.$confirm('当前单据追溯码未全部审核是否完成此单据?', '提示', {
|
|
|
|
this.$confirm('当前单据追溯码未全部审核是否完成此单据?', '提示', {
|
|
|
|
confirmButtonText: '确定',
|
|
|
|
confirmButtonText: '确定',
|
|
|
|
cancelButtonText: '取消',
|
|
|
|
cancelButtonText: '取消',
|
|
|
@ -725,7 +727,7 @@ export default {
|
|
|
|
this.commitCheckOrder()
|
|
|
|
this.commitCheckOrder()
|
|
|
|
}).catch(() => {
|
|
|
|
}).catch(() => {
|
|
|
|
})
|
|
|
|
})
|
|
|
|
}else {
|
|
|
|
} else {
|
|
|
|
this.$confirm('是否确定完成此单据审核?', '提示', {
|
|
|
|
this.$confirm('是否确定完成此单据审核?', '提示', {
|
|
|
|
confirmButtonText: '确定',
|
|
|
|
confirmButtonText: '确定',
|
|
|
|
cancelButtonText: '取消',
|
|
|
|
cancelButtonText: '取消',
|
|
|
@ -745,7 +747,7 @@ export default {
|
|
|
|
finishOrder() {
|
|
|
|
finishOrder() {
|
|
|
|
finishCheckOrder(this.orderData).then(res => {
|
|
|
|
finishCheckOrder(this.orderData).then(res => {
|
|
|
|
if (res.code == 20000) {
|
|
|
|
if (res.code == 20000) {
|
|
|
|
}else {
|
|
|
|
} else {
|
|
|
|
this.$message.error(res.message)
|
|
|
|
this.$message.error(res.message)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}).catch(() => {
|
|
|
|
}).catch(() => {
|
|
|
@ -759,10 +761,10 @@ export default {
|
|
|
|
type: 'warning'
|
|
|
|
type: 'warning'
|
|
|
|
}).then(() => {
|
|
|
|
}).then(() => {
|
|
|
|
abandonOrder(this.orderData).then(res => {
|
|
|
|
abandonOrder(this.orderData).then(res => {
|
|
|
|
if (res.code == 20000){
|
|
|
|
if (res.code == 20000) {
|
|
|
|
this.init()
|
|
|
|
this.init()
|
|
|
|
this.$message.success("放弃成功")
|
|
|
|
this.$message.success("放弃成功")
|
|
|
|
}else {
|
|
|
|
} else {
|
|
|
|
this.$message.error(res.message)
|
|
|
|
this.$message.error(res.message)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
@ -785,7 +787,7 @@ export default {
|
|
|
|
this.selectSysParam()
|
|
|
|
this.selectSysParam()
|
|
|
|
// this.startDeal();
|
|
|
|
// this.startDeal();
|
|
|
|
},
|
|
|
|
},
|
|
|
|
selectAllData(){
|
|
|
|
selectAllData() {
|
|
|
|
this.placeholder = '已选入单据,请扫描追溯码进行审核'
|
|
|
|
this.placeholder = '已选入单据,请扫描追溯码进行审核'
|
|
|
|
this.scanCode = ''
|
|
|
|
this.scanCode = ''
|
|
|
|
this.orderData.workPlaceCode = this.workplaceId;
|
|
|
|
this.orderData.workPlaceCode = this.workplaceId;
|
|
|
@ -909,7 +911,7 @@ export default {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
},
|
|
|
|
},
|
|
|
|
rowStyle({ row, rowIndex }) {
|
|
|
|
rowStyle({row, rowIndex}) {
|
|
|
|
let rowBackground = {}
|
|
|
|
let rowBackground = {}
|
|
|
|
if (this.checkCodeList.length == 0) {
|
|
|
|
if (this.checkCodeList.length == 0) {
|
|
|
|
rowBackground.color = '#F56C6C'
|
|
|
|
rowBackground.color = '#F56C6C'
|
|
|
|