From d358bb263d1eb3a6935015de0008d636d7c75ff0 Mon Sep 17 00:00:00 2001
From: 13208366016 <47278630@qq.com>
Date: Fri, 10 Nov 2023 23:27:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../goodsShelf/basicdataGoodsShelfView.vue | 267 +++++++++++++-----
1 file changed, 195 insertions(+), 72 deletions(-)
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
index 0850e448..e4c77e78 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
@@ -248,45 +248,100 @@
:value="index"
/>
-->
-
-
- {{
- isshowupt == 1
- ? '服务号'
- : isshowupt == 2
- ? '订单号'
- : isshowupt == 3
- ? '包件'
- : isshowupt == 4
- ? '托盘'
- : isshowupt == 5
- ? '库存品'
- : isshowupt == 6
- ? '零担订单号'
- : ''
- }}
-
-
-
+
+ {{
+ isshowupt == 1
+ ? '服务号'
+ : isshowupt == 2
+ ? '订单号'
+ : isshowupt == 3
+ ? '包件'
+ : isshowupt == 4
+ ? '托盘'
+ : isshowupt == 5
+ ? '客户名称'
+ : isshowupt == 6
+ ? '零担订单号'
+ : ''
+ }}
+
+
+
+
+ {{
+ isshowupt == 5? '订单自编码:': ''
+ }}
+
+
+
+ {{
+
+ isshowupt == 5? '入库批次号:': ''
+ }}
+
+
+
+ {{
+ isshowupt == 5? '物料编码:': ''
+ }}
+
+
+
+ {{
+ isshowupt == 5? '入库时间:': ''
+ }}
+
+
+
搜索
@@ -410,37 +465,39 @@
"
/>
-
-
- {{
- isshowdow == 1
- ? '订单自编号'
- : isshowdow == 2
- ? '零担'
- : isshowdow == 3
- ? '物料名称'
- : isshowdow == 4
- ? '托盘'
- : ''
- }}
-
-
-
+
+ {{
+ isshowdow == 1
+ ? '订单自编号'
+ : isshowdow == 2
+ ? '零担'
+ : isshowdow == 3
+ ? '物料名称'
+ : isshowdow == 4
+ ? '托盘'
+ : ''
+ }}
+
+
+
+
+
搜索
@@ -509,13 +566,18 @@ import {
Alloclocationsnub,
disable,
} from '@/api/basicdata/basicdataGoodsShelfView';
-import { reactive, toRefs, onMounted, getCurrentInstance } from 'vue';
+import { reactive, ref,toRefs, onMounted, getCurrentInstance } from 'vue';
import { getToken } from '@/utils/auth';
import NProgress from 'nprogress';
import { exportBlob } from '@/api/common';
import { downloadXls } from '@/utils/util';
import { dateNow } from '@/utils/date';
const { proxy } = getCurrentInstance();
+const CustomerName=ref(null);//客户名称
+const Orderselfnumber=ref(null);//订单自编码
+const Receiptbatchnumber=ref(null);//入库批次号
+const materialcode=ref(null);//物料编码
+const Warehousingtime=ref(null);//入库时间
let loadtc = ref(false);
const eldc = ref(false); //导出弹窗
let details = reactive({
@@ -556,6 +618,7 @@ let details = reactive({
],
countnumber: {},
inputtxts: '',
+
checkselectchangearr: [],
isshowdow: false,
inputtxts1: '',
@@ -695,10 +758,15 @@ async function searchbuts() {
break;
case 5:
+ // 库存品搜索功能
url = 'Inventory';
data = {
// warehouseId: details.arrlist[details.checkindex]?.id || '',
- orderCode: details.inputtxts,
+ marketName: details.inputtxts,//客户名称
+ orderCode:Orderselfnumber.value,//订单自编码
+ incomingBatch:Receiptbatchnumber.value,//入库批次号
+ cargoNumber:materialcode.value,//物料编码
+ warehousingTime:Warehousingtime.value,//入库时间
// serviceNumber: details.inputtxts,
current: details.currentPage,
size: details.pageSize,
@@ -1222,6 +1290,61 @@ const showupt = value => {
sortable: true,
head: false,
},
+ {
+ prop: 'marketName',
+ label: '客户名称',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'orderCode',
+ label: '订单自编码',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'incomingBatch',
+ label: '入库批次号',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'cargoNumber',
+ label: '物料编码',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'warehousingTime',
+ label: '入库时间',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
{
prop: 'materialCode',
label: '物料编号',