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

fix: 修复

Browse Source
20240912_adapter
chenhc 6 months ago
parent 117a73ca41
commit 1ba982b4ae
2 changed files with 136 additions and 192 deletions
Show Stats Download Patch File Download Diff File

299
src/views/collect/ConfirmDrugDealOrder.vue
Unescape Escape View File

@ -162,79 +162,79 @@
</el-row> </el-row>
<!-- <div style="border: 1px solid #ebeef5;border-radius: 2px;margin-top: 15px;padding: 15px">--> <div style="border: 1px solid #ebeef5;border-radius: 2px;margin-top: 15px;padding: 15px">
<!-- <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">
<!-- <el-input--> <el-input
<!-- id="inputer"--> id="inputer"
<!-- @focus="getInputFocus($event)"--> @focus="getInputFocus($event)"
<!-- @keypress.enter.native="enterKey($event)"--> @keypress.enter.native="enterKey($event)"
<!-- ref="inputRef"--> ref="inputRef"
<!-- style="ime-mode: disabled"--> style="ime-mode: disabled"
<!-- type="tel"--> type="tel"
<!-- :placeholder="this.placeholder"--> :placeholder="this.placeholder"
<!-- v-model="scanCode"--> v-model="scanCode"
<!-- ></el-input>--> ></el-input>
<!-- &lt;!&ndash; :disabled="scanDisabled"&ndash;&gt;--> <!-- :disabled="scanDisabled"-->
<!-- </el-form-item>--> </el-form-item>
<!-- </el-col>--> </el-col>
<!-- <el-col :span="4">--> <el-col :span="4">
<!-- <el-button-group style="display: flex;">--> <el-button-group style="display: flex;">
<!-- <el-button--> <el-button
<!-- type="primary"--> type="primary"
<!-- size="mini"--> size="mini"
<!-- icon="el-icon-search"--> icon="el-icon-search"
<!-- @click.native.stop="addCode()"--> @click.native.stop="enterKey()"
<!-- style="margin-left: 15px"--> style="margin-left: 15px"
<!-- >--> >
<!-- </el-button>--> </el-button>
<!-- &lt;!&ndash; :disabled="!formData.billNo || (this.formDataVisible != null && this.formDataVisible.scanType == 1)"&ndash;&gt;--> <!-- :disabled="!formData.billNo || (this.formDataVisible != null && this.formDataVisible.scanType == 1)"-->
<!-- <el-button type="primary"--> <!-- <el-button type="primary"-->
<!-- @click="addGs">ALT+29--> <!-- @click="addGs">ALT+29-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- <el-button--> <el-button
<!-- type="primary"--> type="primary"
<!-- size="mini"--> size="mini"
<!-- icon="el-icon-delete"--> icon="el-icon-delete"
<!-- @click.native.stop="clearCode()"--> @click.native.stop="clearCode()"
<!-- >清空--> >清空
<!-- </el-button>--> </el-button>
<!-- </el-button-group>--> </el-button-group>
<!-- </el-col>--> </el-col>
<!-- </el-row>--> </el-row>
<!-- <el-row :gutter="0">--> <!-- <el-row :gutter="0">-->
<!-- <el-col :span="20" style="margin-top: 0px;margin-bottom: 10px;margin-left: 80px">--> <!-- <el-col :span="20" style="margin-top: 0px;margin-bottom: 10px;margin-left: 80px">-->
<!-- <el-checkbox v-model="checked" v-if="!this.formData.billNo && this.formDataVisible.scanType != 1">定向查询--> <!-- <el-checkbox v-model="checked" v-if="!this.formData.billNo && this.formDataVisible.scanType != 1">定向查询-->
<!-- </el-checkbox>--> <!-- </el-checkbox>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- </el-row>--> <!-- </el-row>-->
<!-- <el-alert--> <el-alert
<!-- :title="scanTitle"--> :title="scanTitle"
<!-- :type="scanResultType"--> :type="scanResultType"
<!-- :closable="false"--> :closable="false"
<!-- :dangerouslyUseHTMLString="true"--> :dangerouslyUseHTMLString="true"
<!-- :description="result">--> :description="result">
<!-- </el-alert>--> </el-alert>
<!-- <el-alert--> <el-alert
<!-- v-if="warnVisible"--> v-if="warnVisible"
<!-- title="警告信息:"--> title="警告信息:"
<!-- type="warning"--> type="warning"
<!-- :closable="true"--> :closable="true"
<!-- :dangerouslyUseHTMLString="true"--> :dangerouslyUseHTMLString="true"
<!-- :description="warnResult">--> :description="warnResult">
<!-- </el-alert>--> </el-alert>
<!-- <el-alert--> <el-alert
<!-- v-if="errVisible"--> v-if="errVisible"
<!-- title="错误信息:"--> title="错误信息:"
<!-- type="warning"--> type="warning"
<!-- :closable="true"--> :closable="true"
<!-- :dangerouslyUseHTMLString="true"--> :dangerouslyUseHTMLString="true"
<!-- :description="errResult">--> :description="errResult">
<!-- </el-alert>--> </el-alert>
<!-- </div>--> </div>
<el-descriptions title="单据信息" :column="4" border style="margin-top: 15px"> <el-descriptions title="单据信息" :column="4" border style="margin-top: 15px">
<el-descriptions-item label="业务单号">{{ formData.billNo }}</el-descriptions-item> <el-descriptions-item label="业务单号">{{ formData.billNo }}</el-descriptions-item>
<el-descriptions-item label="发货方">{{ formData.shipperName }}</el-descriptions-item> <el-descriptions-item label="发货方">{{ formData.shipperName }}</el-descriptions-item>
@ -251,6 +251,7 @@
<prescribeOriginPanel <prescribeOriginPanel
v-if="panelALive" v-if="panelALive"
:prescribeData="curRow" :prescribeData="curRow"
:fifoSplitResult="this.fifoSplitResult"
></prescribeOriginPanel> ></prescribeOriginPanel>
<!-- 在表格下方添加说明 --> <!-- 在表格下方添加说明 -->
<el-row style="text-align: right;font-size: 12px;margin-top: 10px"> <el-row style="text-align: right;font-size: 12px;margin-top: 10px">
@ -413,7 +414,7 @@ import {
getNextOrder, getNextOrder,
findByBill, findByBill,
findFromCorp, findFromCorp,
orderDetail, orderDetail,bizConfirm,
removeByScanCode,confirmFinish removeByScanCode,confirmFinish
} from "@/api/collect/collectOrder"; } from "@/api/collect/collectOrder";
import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail"; import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
@ -497,7 +498,7 @@ export default {
scanCode: "", scanCode: "",
isSuccess: false, isSuccess: false,
checked: true, checked: true,
scanTitle: "扫码结果:", scanTitle: "单据录入结果:",
result: " \n", result: " \n",
msgTip: "信息提醒：", msgTip: "信息提醒：",
originCode: "", originCode: "",
@ -522,10 +523,12 @@ export default {
errResult: "", errResult: "",
warnVisible: false, warnVisible: false,
errVisible: false, errVisible: false,
needSplitConfirm: false,
workplaceId: null, workplaceId: null,
ws: null, ws: null,
scanTip: "扫码录入:", scanTip: "单据录入:",
scanSplit: false, scanSplit: false,
info: {},
// //
labels: { labels: {
1: '扫码录入:', 1: '扫码录入:',
@ -552,6 +555,34 @@ export default {
}, },
methods: { methods: {
fifoHandleClick(scanCode){
this.info.confirmSplitCode = scanCode
bizConfirm(this.info).then((response) => {
if (response.code === 20000) {
this.$message.success('操作成功！')
this.getPrescribeDetail(this);
return
} else {
this.$message.error(response.message)
}
})
},
//是否拆零的组件调用父级方法
fifoSplitResult(data,info){
this.info = info
if (data == null)
return;
if (data.needSplitConfirm){//需要
this.needSplitConfirm = data.needSplitConfirm
this.scanTitle = "拆零扫码结果:";
this.scanTip = "拆零扫码:";
this.result = "";
return;
}else {//不需要
return
}
},
getBillNo(billNo) { getBillNo(billNo) {
let post = { let post = {
billNo: billNo, billNo: billNo,
@ -786,130 +817,17 @@ export default {
}, },
enterKey() { enterKey() {
if (this.formData.billNo == null && this.formDataVisible.scanType != 1) { if (this.$isBlank(this.scanCode)) {
this.enterBillNoKey() this.$message.error("请先扫码")
return; return
} }
this.checkSuccess = true; if (!this.needSplitConfirm) {
this.filterQuery.code = this.scanCode.trim(); this.enterBillNoKey()
if (this.filterQuery.code.includes(";")) {
const codeArray = this.filterQuery.code.split(";");
let params = {
codeList: codeArray,
};
this.batchVailCode(params)
return; return;
}
if (this.filterQuery.code)
if (!this.parseString(this.filterQuery.code)) {
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
this.$message.error("无效追溯码");
return;
}
let tQuery = {
viewType: "tagCode",
workPlaceCode: this.workplaceId,
originCode: this.originCode,
busType: this.formData.busType,
code: this.filterQuery.code.trim(),
};
if (this.scanStatus == 1) {
const codeArray = this.filterQuery.code.split(";");
let query = {
orderId: this.formData.billNo,
codeList: codeArray
}
//剔除码
this.removeCodesTemp(query)
} else if (this.scanSplit) {
//todo 拆零扫码确认
const codeArray = this.filterQuery.code.split(";");
let query = {
orderId: this.formData.billNo,
codeList: codeArray
}
//更新扫码确认
batchUpdateCode(query).then((response) => {
this.saveLoading = false
if (response.code === 20000) {
this.$message.success('确认成功')
this.result = ''
this.$refs.inputRef.focus()
this.getBizDetailList();
} else {
this.$message.error(response.message)
}
this.loading = false
this.saveLoading = false
})
} else { } else {
enterCodeWeb(tQuery).then((response) => { this.fifoHandleClick(this.scanCode)
if (response.code === 20000) { this.startDeal();
this.$refs.inputRef.focus(); return;
this.$refs.inputRef.select();
this.isSuccess = true;
this.printCodeResult(response.data, response.message)
this.filterQuery.code = 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.code = response.data.code;
this.originCode = response.data.code;
this.scanCode = ""
} 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.code = response.data.code;
this.scanCode = ""
this.$confirm(response.message, "提示", {
type: "warning",
})
.then(() => {
this.filterQuery.code = response.data.code;
this.addCode();
})
.catch(() => {
this.filterQuery.code = response.data.code;
});
} else if (response.code == 508) {
this.originCode = "";
this.filterQuery.code = "01" + response.data.nameCode;
this.originCode = this.filterQuery.code;
} else if (response.code == 601) {
this.formData.billNo = response.data.billNo
this.placeholder = "已选入单据，请扫UDI码进行作业"
this.getBillNo(this.formData.billNo)
this.startDeal();
} 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;
});
} }
}, },
@ -971,6 +889,7 @@ export default {
this.filterQuery.code = "01" + response.data.nameCode; this.filterQuery.code = "01" + response.data.nameCode;
this.originCode = this.filterQuery.code; this.originCode = this.filterQuery.code;
} else if (response.code == 601) { } else if (response.code == 601) {
this.result = "已选入单据"
this.placeholder = "已选入单据，请扫UDI码进行作业" this.placeholder = "已选入单据，请扫UDI码进行作业"
this.formData.billNo = response.data.billNo this.formData.billNo = response.data.billNo
this.getBillNo(this.formData.billNo) this.getBillNo(this.formData.billNo)
@ -1360,7 +1279,7 @@ export default {
this.originCode = ""; this.originCode = "";
this.formData.code = ""; this.formData.code = "";
this.scanCode = ""; this.scanCode = "";
this.scanTitle = "扫码结果："; this.scanTitle = "单据录入结果：";
this.result = ""; this.result = "";
this.warnResult = "" this.warnResult = ""
this.errResult = "" this.errResult = ""
@ -1642,7 +1561,7 @@ export default {
overdeleteCode() { overdeleteCode() {
this.labelName = 1 this.labelName = 1
this.scanStatus = null this.scanStatus = null
this.scanTip = "扫码录入:" this.scanTip = "单据录入:"
this.placeholder = '请点击输入框进行选扫码' this.placeholder = '请点击输入框进行选扫码'
}, },
}, },

29
src/views/collect/PannelOrderBizCard.vue
Unescape Escape View File

@ -71,6 +71,10 @@ export default {
default: null, default: null,
required: true required: true
}, },
fifoSplitResult: {
type: Function,
required: true
},
//上货方式：1:拆零上货；2:整取上货; //上货方式：1:拆零上货；2:整取上货;
fifoSplit: { fifoSplit: {
type: Object, type: Object,
@ -115,8 +119,29 @@ export default {
handleClick(info){ handleClick(info){
bizConfirm(info).then((response) => { bizConfirm(info).then((response) => {
if (response.code === 20000) { if (response.code === 20000) {
this.$message.success("操作成功！"); if (response.data.needSplitConfirm){
this.getPrescribeDetail(this); this.$confirm("是否确定拆零扫码确认?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "忽略",
type: "warning",
}).then(() => {
this.fifoSplitResult(response.data,info)
}).catch(() => {
//忽略 改为false 继续提交
info.needSplitConfirm = false
//触发提交
bizConfirm(info).then((response) => {
if (response.code === 20000) {
this.getPrescribeDetail(this)
return
} else {
this.$message.error(response.message)
}
})
});
}
this.getPrescribeDetail(this)
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }

Write Preview
Loading…
Cancel
Save