From 8022884aba77eed406e6d9cf4a50bdb6eec2917e Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 10 Dec 2024 10:33:27 +0800
Subject: [PATCH 1/7] =?UTF-8?q?FWHL-98SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF?=
=?UTF-8?q?=E5=A2=83=EF=BC=8C=E5=88=87=E6=8D=A2=E4=B8=BA=E8=8B=B1=E6=96=87?=
=?UTF-8?q?=E7=8E=AF=E5=A2=83=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
=?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E7=9A=84=E6=9B=B4=E5=A4=9A=E6=8C=89?=
=?UTF-8?q?=E9=92=AE=E6=97=A0=E6=B3=95=E6=93=8D=E4=BD=9C=E3=80=82=E5=BD=B1?=
=?UTF-8?q?=E5=93=8D=E4=BE=9B=E5=BA=94=E5=95=86=E6=89=93=E5=8D=B0=E6=A0=87?=
=?UTF-8?q?=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/XButton/src/ButtonBaseMore.vue | 21 +++++++++++++------
.../supplierdeliverRequestMain/index.vue | 2 +-
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/components/XButton/src/ButtonBaseMore.vue b/src/components/XButton/src/ButtonBaseMore.vue
index f1b7574d1..9a4e459e2 100644
--- a/src/components/XButton/src/ButtonBaseMore.vue
+++ b/src/components/XButton/src/ButtonBaseMore.vue
@@ -14,11 +14,11 @@
{{ item.label }}
-
- 更多
+
+ {{ t('ts.更多') }}
-
+
{
const all_permission = '*:*:*'
@@ -80,13 +85,13 @@ const showList = ()=>{
}
const getMoreList = computed(()=>{
let list = showList()
- return list.slice(3)
+ return list.slice(props.showMoreLength)
})
const getButtonList = computed(()=>{
let list = showList()
if(list.length>3){
console.log('list===',list)
- return list.slice(0, 3)
+ return list.slice(0, props.showMoreLength)
}
return list
})
@@ -131,5 +136,9 @@ const updataTableColumns = (val) => {
margin: 0px;
}
}
-
+.more{
+ &.el-button:focus-visible {
+ outline: none;
+ }
+}
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 14d3475d7..1333b3e35 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -55,7 +55,7 @@
-
From 5c692c425c72c269456f443645adc9873a0c7063 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 10 Dec 2024 10:34:28 +0800
Subject: [PATCH 2/7] FWHL-97
---
src/locales/en-US.ts | 54 ++++++++++++++++++-
src/locales/zh-CN.ts | 54 ++++++++++++++++++-
.../supplierApbalanceMain/index.vue | 10 ++--
3 files changed, 111 insertions(+), 7 deletions(-)
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 3d295d2cb..5a40b7e19 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1298,7 +1298,59 @@ export default {
发票回转:'Return of invoice',
发票回转成功: 'The invoice has been successfully forwarded',
最后更新人: 'Last Updated By',
- 可开票数量范围是:'The range of invoices is'
+ 可开票数量范围是:'The range of invoices is',
+ 日程待开票数据查询: 'Schedule to be invoiced data query',
+ 离散待开票数据查询: 'Discrete invoicing data query',
+ 待开票删除数据查询: 'Pending invoicing delete data query',
+ 采购离散订单查看: 'Purchase discrete order view',
+ 供应商对账管理: 'Supplier reconciliation management',
+ 询证函日期管理: 'Confirmation date management',
+ 月份: 'month',
+ 日期: 'date',
+ 公司代码: 'company code',
+ 月: 'month',
+ 日: 'day',
+ 年度: 'year',
+ 月度: 'monthly',
+ 应付挂账金额: 'Amount payable payable',
+ 其他应付金额: 'Other amounts payable',
+ 预付金额: 'Amount paid in advance',
+ 暂估金额: 'Provisional estimated amount',
+ 暂估余额: 'Provisional estimated balance',
+ 活动金额: 'Amount of activity',
+ 打印开始时间: 'Print start time',
+ 打印结束时间: 'Print end time',
+ 票据总数: 'Total number of bills',
+ 实际开票数量: 'Actual invoice quantity',
+ 发票申请单号: 'Invoice application number',
+ 已读状态: 'Read state',
+ 价差合计: 'Total spread',
+ 发票未税金额: 'Invoice amount not taxed',
+ 发票税额: 'Invoice tax amount',
+ 发票价税合计: 'Invoice value and tax total',
+ 未税尾差: 'Untaxed residuals',
+ 税额尾差: 'The tax tail difference',
+ 价差合计尾差: 'Spread sum tail spread',
+ 价税合计尾差: 'Total difference in value and tax',
+ 财务凭证号: 'Financial Voucher No.',
+ 供应商维护税额: 'Supplier maintenance tax',
+ 供应商维护未税金额: 'supplier maintains the untaxed amount',
+ 供应商维护价税合计: 'Total supplier maintenance price and tax',
+ 回转日期: 'Date of return',
+ 说明: 'Notes',
+ 回转凭证号: 'Turn voucher number',
+ 凭证描述: 'Credential Description',
+ 恢复: 'recovery',
+ 部分开票: 'Partial billing',
+ 发票回转中: 'The invoice is being transferred',
+ 询证: 'confirmation',
+ 请选择年: 'Please select Year',
+ 请选择月: 'Please select month',
+ 请选择日: 'Please select day',
+ 回调函明细: 'Details of callback letter',
+ 履历表: 'Resume',
+ 更多: 'more'
+
},
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 5e531dc5f..fb1be92aa 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1296,7 +1296,59 @@ export default {
发票回转:'发票回转',
发票回转成功: '发票回转成功',
最后更新人:'最后更新人',
- 可开票数量范围是:'可开票数量范围是'
+ 可开票数量范围是:'可开票数量范围是',
+ 日程待开票数据查询: '日程待开票数据查询',
+ 离散待开票数据查询: '离散待开票数据查询',
+ 待开票删除数据查询: '待开票删除数据查询',
+ 采购离散订单查看: '采购离散订单查看',
+ 供应商对账管理: '供应商对账管理',
+ 询证函日期管理: '询证函日期管理',
+ 月份: '月份',
+ 日期: '日期',
+ 公司代码: '公司代码',
+ 月: '月',
+ 日: '日',
+ 年度: '年度',
+ 月度: '月度',
+ 应付挂账金额: '应付挂账金额',
+ 其他应付金额: '其他应付金额',
+ 预付金额: '预付金额',
+ 暂估金额: '暂估金额',
+ 暂估余额: '暂估余额',
+ 活动金额: '活动金额',
+ 打印开始时间: '打印开始时间',
+ 打印结束时间: '打印结束时间',
+ 票据总数: '票据总数',
+ 实际开票数量: '实际开票数量',
+ 发票申请单号: '发票申请单号',
+ 已读状态: '已读状态',
+ 价差合计: '价差合计',
+ 发票未税金额: '发票未税金额',
+ 发票税额: '发票税额',
+ 发票价税合计: '发票价税合计',
+ 未税尾差: '未税尾差',
+ 税额尾差: '税额尾差',
+ 价差合计尾差: '价差合计尾差',
+ 价税合计尾差: '价税合计尾差',
+ 财务凭证号: '财务凭证号',
+ 供应商维护税额: '供应商维护税额',
+ 供应商维护未税金额: '供应商维护未税金额',
+ 供应商维护价税合计: '供应商维护价税合计',
+ 回转日期: '回转日期',
+ 说明: '说明',
+ 回转凭证号: '回转凭证号',
+ 凭证描述: '凭证描述',
+ 恢复: '恢复',
+ 部分开票: '部分开票',
+ 发票回转中: '发票回转中',
+ 询证: '询证',
+ 请选择年: '请选择年',
+ 请选择月: '请选择月',
+ 请选择日: '请选择日',
+ 回调函明细: '回调函明细',
+ 履历表: '履历表',
+ 更多: '更多'
+
},
}
diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
index f8a8d9696..c5dc06367 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
@@ -3,24 +3,24 @@
-
+
-
+
-
+
- 询证
+ {{t(`ts.询证`)}}
@@ -86,7 +86,7 @@
:detailButtonIsShowDelete=false
:slotDetailTabList="[
{
- label: '回调函明细',
+ label: t(`ts.回调函明细`),
prop: 'adjustment'
}
]"
From 455d5176b6752d19ae740f9c2f4aff4f22400e06 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 10 Dec 2024 10:39:45 +0800
Subject: [PATCH 3/7] =?UTF-8?q?FWHL-102SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF?=
=?UTF-8?q?=E5=A2=83=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E8=A7=92=E8=89=B2?=
=?UTF-8?q?=E5=B0=86=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92=E5=85=B3=E9=97=AD?=
=?UTF-8?q?=E7=9A=84=E6=8C=89=E9=92=AE=E5=8F=96=E6=B6=88=E6=9D=83=E9=99=90?=
=?UTF-8?q?=EF=BC=8C=E4=BD=86=E4=BE=9B=E5=BA=94=E5=95=86=E7=99=BB=E5=BD=95?=
=?UTF-8?q?=E5=90=8E=EF=BC=8C=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92=E4=BE=9D?=
=?UTF-8?q?=E7=84=B6=E5=8F=AF=E4=BB=A5=E7=9C=8B=E5=88=B0=E5=85=B3=E9=97=AD?=
=?UTF-8?q?=E6=8C=89=E9=92=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../supplierdeliver/purchasePlanMain/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 2184c3046..11e85365c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -424,7 +424,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
}
return [
// defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['2']) }), // 打开
- defaultButtons.mainListPurchasePlanCloBtn({ hide: !(row.status!=6&&row.status!=2&&row.type=='SCHEDULE') }), // 关闭
+ defaultButtons.mainListPurchasePlanCloBtn({ hide: !(row.status!=6&&row.status!=2&&row.type=='SCHEDULE') , hasPermi: 'wms:purchase-plan-main:close'}), // 关闭
defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1']) }), // 发布
defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['3']) }), // 接受
defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['3']) }), // 不接受
From a183a58eab944cacaff31f715e198999539c449b Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 10 Dec 2024 10:50:51 +0800
Subject: [PATCH 4/7] FWHL-70
---
.../productscrapRequestMain/productscrapRequestMain.data.ts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 938de9583..829c83855 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -863,6 +863,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([
value: 'TRUE',
isMainValue: false
}],
+ isShowTableFormSearch: true,
+ verificationPage: ProductionlineitemApi.getProductionlineitemPageBom, // tableForm下方输入框校验失去焦点之后是否正确的方法
verificationParams: [{
key: 'itemCode',
action: '==',
From 40b57405f815fa86431e3c200315ec4180a23a6f Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 10 Dec 2024 13:22:16 +0800
Subject: [PATCH 5/7] FWHL-100
---
.../productionreturnRequestMainNo/index.vue | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
index d67dcb7fc..f08808159 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -724,6 +724,17 @@ const submitFormLabel = async (formType, submitData) => {
if(data.masterId){
data.id = data.masterId
}
+ let flag = true
+ detatableData.tableList.forEach(item => {
+ if(!item.supplierItemCode){
+ flag = false
+ }
+ });
+ if(!flag){
+ message.error('请填写供应商代码')
+ return
+ }
+
try {
detatableData.tableList.forEach(async (item) => {
await PackageApi.createPackageLabel({...item,toLocationCode:item.fromLocationCode}).then(res => {
From 110277e0d23e15b497a967596216cc62a33c8457 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 10 Dec 2024 14:03:51 +0800
Subject: [PATCH 6/7] =?UTF-8?q?FWHL-61=E5=A4=87=E4=BB=B6=E6=94=B6=E8=B4=A7?=
=?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8E=A8=E8=8D=90=E5=BA=93=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/wms/spareitemLocation/index.ts | 8 +++++++-
.../sparepartReturnRequestMain/index.vue | 12 ++++++++++++
.../sparepartReturnRequestMain.data.ts | 2 +-
.../sparereceiptRequestMain/index.vue | 16 +++++++++++++---
4 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/src/api/wms/spareitemLocation/index.ts b/src/api/wms/spareitemLocation/index.ts
index 5f5a2e81b..053b7b10f 100644
--- a/src/api/wms/spareitemLocation/index.ts
+++ b/src/api/wms/spareitemLocation/index.ts
@@ -50,4 +50,10 @@ export const exportSpareitemLocation = async (params) => {
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/wms/spareitem-location/get-import-template' })
-}
\ No newline at end of file
+}
+
+
+// 自动推荐库位
+export const queryItemLocation = async (data) => {
+ return await request.post({ url: `/wms/spareitem-location/queryItemLocation`, data })
+}
diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
index 7dd585274..beeda28e4 100644
--- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
@@ -108,6 +108,7 @@ import {
} from './sparepartReturnRequestMain.data'
import * as UnplannedreceiptRequestMainApi from '@/api/wms/unplannedreceiptRequestMain'
import * as UnplannedreceiptRequestDetailApi from '@/api/wms/unplannedreceiptRequestDetail'
+import * as SpareitemLocationApi from '@/api/wms/spareitemLocation'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import * as ItembasicApi from "@/api/wms/itembasic";
import { formatTime } from '@/utils/index'
@@ -170,6 +171,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
message.warning('不能同时选择可制造和可采购的物料')
}
newVal = newVal.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['code']))
+
+
+ let locationList = await SpareitemLocationApi.queryItemLocation({
+ "itemCodeList":newVal.map(item=>(item['code']))
+ })
+ console.log('locationList',locationList)
+
newVal.forEach(item=>{
let tfk = JSON.parse(JSON.stringify(tableFormKeys))
tfk.batch = formatTime(new Date(), 'yyyyMMdd')
@@ -179,6 +187,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
tfk['itemCode'] = item['code']
tfk['uom'] = item['uom']
tfk['validityDays'] = item['validityDays']
+ let locationItem = locationList.find(location=>location['itemCode'] == item['code'])
+ if(locationItem){
+ tfk['toLocationCode'] = locationItem['locationCode']
+ }
tableData.value.push(tfk)
})
} else if(formField === 'costcentreCode'){
diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
index 9638264f6..956c6b76d 100644
--- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
@@ -639,7 +639,7 @@ export const UnplannedreceiptRequestMainRules = reactive({
{ required: false, message: '请输入项目代码', trigger: 'blur' }
],
toWarehouseCode: [
- { required: true, message: '请输入到库位代码', trigger: 'blur' }
+ { required: true, message: '请输入到仓库代码', trigger: 'blur' }
],
departmentCode: [
{ required: true, message: '请输入部门', trigger: 'blur' }
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
index b6bdf9697..0c99e0a8f 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
@@ -126,6 +126,7 @@ import {
} from './sparereceiptRequestMain.data'
import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequestMain'
import * as PurchasereceiptRequestDetailApi from '@/api/wms/purchasereceiptRequestDetail'
+import * as SpareitemLocationApi from '@/api/wms/spareitemLocation'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { formatDate } from '@/utils/formatTime'
import * as SupplieritemApi from '@/api/wms/supplieritem'
@@ -223,7 +224,7 @@ const onEnter = async (field,value)=>{
formRef.value.setDefaultBlurValue(field,value)
// getSearchTableData(value,true)
}
-const updateTableData = (tableList)=>{
+const updateTableData = async (tableList)=>{
console.log('tableList',tableList)
let itemCodes = tableList.filter(item=>tableData.value.find(item1=>item1['poNumber']==item['number']&&item1['supplierCode']==item['supplierCode']&&item1['poLine']==item['lineNumber']&&item1['itemCode']==item['itemCode']))
console.log('itemCodes',itemCodes)
@@ -234,6 +235,10 @@ const updateTableData = (tableList)=>{
}
tableList = tableList.filter(item=>!tableData.value.find(item1=>item1['poNumber']==item['number']&&item1['supplierCode']==item['supplierCode']&&item1['poLine']==item['lineNumber']&&item1['itemCode']==item['itemCode']))
if(tableList.length==0) return
+ let locationList = await SpareitemLocationApi.queryItemLocation({
+ "itemCodeList":tableList.map(item=>(item.itemCode))
+ })
+ console.log('locationList',locationList)
tableList.forEach(row=>{
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row}))
newRow['poLine'] = row['lineNumber']
@@ -249,7 +254,10 @@ const updateTableData = (tableList)=>{
newRow['arriveDate'] = dayjs().valueOf()
//批次
newRow['batch'] = formatDate(newRow['produceDate'],'YYYYMMDD');
- newRow['defaultToLocationCode'] =row['defaultLocation']
+ let locationItem = locationList.find(location=>location['itemCode'] == row['itemCode'])
+ if(locationItem){
+ newRow['defaultToLocationCode'] = locationItem['locationCode']
+ }
if(!tableData.value.find((item:object)=>item.poNumber == newRow.poNumber&&item.itemCode == newRow.itemCode&&item.poLine == newRow.poLine&&item.batch == newRow.batch)){
tableData.value.push(newRow)
}
@@ -288,7 +296,9 @@ const getSearchTableData = async (number,isEnter=false)=>{
}).then((res)=>{
res.list.forEach((item,index)=>{
const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
- findItem['expireTime'] = item['expireTime']
+ if(findItem){
+ findItem['expireTime'] = item['expireTime']
+ }
})
})
}
From 5d8873b6c1acd260445ecdd2665adc5ef70466a7 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 10 Dec 2024 14:21:47 +0800
Subject: [PATCH 7/7] =?UTF-8?q?FWHL-106WMS=20=E5=BA=93=E5=AD=98=E8=BD=AC?=
=?UTF-8?q?=E7=A7=BB=E8=AE=B0=E5=BD=95=20=E6=96=B0=E5=A2=9E=E6=97=B6=20?=
=?UTF-8?q?=E6=B8=85=E7=A9=BA=E4=BB=8E=E5=BA=93=E4=BD=8D=E6=97=B6=EF=BC=8C?=
=?UTF-8?q?=E6=98=8E=E7=BB=86=E4=B9=9F=E5=BA=94=E8=AF=A5=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../inventorymoveRecordMainNew/index.vue | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
index ccc5db4e6..38e2281b2 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
@@ -61,7 +61,8 @@
@tableSelectionDelete="tableSelectionDelete"
@searchTableSuccess="searchTableSuccess"
@submitForm="submitForm"
- />
+ @clearSearchInput="clearSearchInput"
+ />
@@ -373,6 +374,13 @@ const submitForm = async (formType, submitData) => {
formRef.value.formLoading = false
}
}
+const clearSearchInput = (field)=>{
+ console.log('field',field)
+ if('fromLocationCode' == field){
+ //从库位代码
+ tableData.value = []
+ }
+}
// 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
console.log('searchTableSuccess',formField, searchField, val, formRef, type, row)
@@ -415,6 +423,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if(formField=='fromLocationCode'){
//从库位代码
setV['fromWarehouseCode'] = val[0]['warehouseCode']
+ tableData.value = []
+
}else if(formField=='toLocationCode'){
//到库位代码
setV['toWarehouseCode'] = val[0]['warehouseCode']