From 2b759f000043b4db0fc758922568dbcb0856022b Mon Sep 17 00:00:00 2001 From: yangzifeng <2547435354@qq.com> Date: Wed, 4 Feb 2026 15:28:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wisdom/bill/index.vue | 36 +++++++++------- src/views/wisdom/outbound/index.vue | 64 ++++++++++++++++++++++++----- 2 files changed, 76 insertions(+), 24 deletions(-) diff --git a/src/views/wisdom/bill/index.vue b/src/views/wisdom/bill/index.vue index c955ce4..08dd268 100644 --- a/src/views/wisdom/bill/index.vue +++ b/src/views/wisdom/bill/index.vue @@ -355,8 +355,8 @@ @@ -945,6 +945,14 @@ function addLineFun() { planList.value.push(info); } +// 选择库位修改库位数组 +const changePcode = (e) => { + let index = kwOptions.value.findIndex((item) => item.pcode == e); + kwOptions.value.splice(index, 1); + kwOptions.value.unshift({ pcode: e }); + console.log(e, index); +} + //添加数量 function addNum(row) { let addRow = {}; @@ -980,19 +988,19 @@ function submitForm() { proxy.$modal.msgError("现场图片不能为空"); return; } - let iscfwz = false; //库位是否为空 - let bigData = checkPlanList.value; - for (let i = 0; i < bigData.length; i++) { - //库位 - if (!bigData[i].pcode) { - iscfwz = true; - } - } + // let iscfwz = false; //库位是否为空 + // let bigData = checkPlanList.value; + // for (let i = 0; i < bigData.length; i++) { + // //库位 + // if (!bigData[i].pcode) { + // iscfwz = true; + // } + // } //发现场入库类型可以不用选库位 - if (storeData.value.operationType != "RK025" && iscfwz) { - proxy.$modal.msgError("请选择库位"); - return; - } + // if (storeData.value.operationType != "RK025" && iscfwz) { + // proxy.$modal.msgError("请选择库位"); + // return; + // } // if(isExamine.value==1 && !storeData.value.approverId){ // proxy.$modal.msgError("审批人不能为空"); // return diff --git a/src/views/wisdom/outbound/index.vue b/src/views/wisdom/outbound/index.vue index d924535..5a59ea3 100644 --- a/src/views/wisdom/outbound/index.vue +++ b/src/views/wisdom/outbound/index.vue @@ -400,6 +400,7 @@ @@ -408,6 +409,7 @@ @@ -416,6 +418,7 @@ @@ -424,6 +427,7 @@ @@ -431,12 +435,12 @@ - + - + @@ -466,6 +470,7 @@ label: 'warehouseName', value: 'warehouseCode', }" + clearable /> @@ -473,16 +478,17 @@ - + - + 查询 + 重置 @@ -953,7 +959,6 @@ import { getToken } from "@/utils/auth"; import bill from "@/components/storageBill/bill.vue"; import printBill from "@/components/printBill/bill.vue"; import { ref } from "vue"; -import { pl } from "element-plus/es/locales.mjs"; const headers = ref({ Authorization: "Bearer " + getToken(), @@ -989,7 +994,13 @@ const resource = ref(""); //调度模式 1仅立库;2立库+AGV const data = reactive({ form: {}, - storeData: {}, //出库数据 + storeData: { + teamCode: null, + operationType: null, + operator: null, + execStatus: null, + isDelivery: null, + }, //出库数据 rules: { operationType: [ { required: true, message: "出库类型不能为空", trigger: "change" }, @@ -1156,6 +1167,23 @@ function searchPlan() { }); } +const searchReset = () => { + outQueryParams.value = { + xmNo: "", + sapNo: "", + wlNo: "", + wlMs: "", + xmMs: "", + pcode: "", + wlType: "", + cangku: [], + gysMc: "", + pageNum: 1, + pageSize: 50, + remark: "", + } +} + //出库 多选框选中数据 const checkOutList = ref([]); function handleSelectionChange(selection) { @@ -1208,14 +1236,18 @@ const deleteOutBoundData = () => { /** 新增按钮操作 */ function handleAdd() { - reset(); open.value = true; outBoundData.value = []; title.value = "添加出库单据"; + nextTick(() => { + // proxy.$refs["stockRef"].resetFields(); + reset(); + }) } /** 提交按钮 */ function submitForm() { + console.log(storeData.value, outQueryParams.value) if (outBoundData.value.length !== checkOutList.value.length) { proxy.$modal.msgError("请查看勾选数据"); return; @@ -1261,16 +1293,28 @@ function handleExport() { // 取消按钮 function cancel() { + stockRef.value.clearValidate(); open.value = false; reset(); } +const stockRef = ref(null); // 表单重置 function reset() { planList.value = []; - storeData.value = {}; - orderNum.value = ""; - proxy.resetForm("stockRef"); + storeData.value.execStatus = null + storeData.value.isDelivery = null + outQueryParams.value.xmNo = "" + outQueryParams.value.sapNo = "" + outQueryParams.value.wlMs = "" + outQueryParams.value.xmMs = "" + outQueryParams.value.pcode = "" + outQueryParams.value.cangku = [] + outQueryParams.value.gysMc = "" + outQueryParams.value.remark = "" + nextTick(() => { + stockRef.value.clearValidate() + }); } /** 搜索按钮操作 */