diff --git a/src/types/descriptions.d.ts b/src/types/descriptions.d.ts
index 70be082d8..62810c7ef 100644
--- a/src/types/descriptions.d.ts
+++ b/src/types/descriptions.d.ts
@@ -10,5 +10,6 @@ export interface DescriptionsSchema {
labelClassName?: string
dateFormat?: string // add by 星语：支持时间的格式化
valueFilter?: function // 展示的过滤函数
+ slotFilter?:boolean // 插槽自定义内容
dictType?: string // add by 星语：支持 dict 字典数据
}
From f63133b34107133cb6a88c9d04389ea7e6dc7c52 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 6 Sep 2024 14:28:53 +0800
Subject: [PATCH 10/21] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
=?UTF-8?q?=E7=A5=A8=E7=94=A8=E5=88=B0=E7=9A=84=E5=85=AC=E7=94=A8=E7=BB=84?=
=?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Detail/src/Detail.vue | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 6b485a7fe..53b17e764 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -23,7 +23,11 @@
:schema="allSchemas.detailSchema"
:columns="2"
width="200px"
- />
+ >
+
+
+
+
From 2bc871eefda8fb9ac2acfd5648fec17cf2f66556 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 6 Sep 2024 15:04:00 +0800
Subject: [PATCH 11/21] =?UTF-8?q?HL-5785=E5=88=B6=E5=93=81=E5=AD=90?=
=?UTF-8?q?=E4=BB=B6=E6=8A=A5=E5=BA=9F=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../productscrap/productscrapRequestMain/index.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 2fbbba948..7b8c16871 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -80,6 +80,7 @@
:buttondataTable="buttondataTable"
@tableFormButton="tableFormButton"
:detailValidate="detailValidate"
+ :detailButtonIsShowAdd="false"
/>
From dece466f89a869d14692339b7255993fcfa4cf07 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Fri, 6 Sep 2024 15:09:16 +0800
Subject: [PATCH 12/21] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=EF=BC=8C=E6=9A=82=E5=AD=98=E5=90=8E=E5=86=8D=E5=8F=91=E5=B8=83?=
=?UTF-8?q?=EF=BC=8C=E6=8F=90=E7=A4=BA=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81?=
=?UTF-8?q?=E9=94=99=E8=AF=AF=20=20HL-5848?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/qms/inspectionJob/index.vue | 13 +++++++++++++
src/views/qms/inspectionQ2/inspectionQ2.data.ts | 6 +++---
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue
index 0cecf6f33..7be97e488 100644
--- a/src/views/qms/inspectionJob/index.vue
+++ b/src/views/qms/inspectionJob/index.vue
@@ -238,6 +238,15 @@ const isShowMainButton3 = (row) => {
}
}
+// 根据状态返回该按钮是否显示
+const isShowMainButton2 = (row, val) => {
+ if (val.indexOf(row.isStaging) > -1) {
+ return false
+ } else {
+ return true
+ }
+}
+
// 根据状态返回该按钮是否显示
const isShowMainButton1 = (row, val) => {
if (val.indexOf(row.status) > -1) {
@@ -269,6 +278,10 @@ const butttondata = (row) => {
hide: isShowMainButton(row, ['1', '2']),
hasPermi: 'qms:inspection-job-main:execute'
}), // 执行
+ defaultButtons.mainListOrderPubBtn({
+ hide: isShowMainButton2(row, ['TRUE']),
+ hasPermi: 'qms:inspection-job-main:execute'
+ }), // 发布
defaultButtons.mainListPackageBtn(null), // 包装
defaultButtons.mainListPlanCheckQualityReportBtn({
hide: isShowMainButton3(row)
diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
index 898bb7f94..91802924c 100644
--- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts
+++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
@@ -329,7 +329,7 @@ export const Q2 = useCrudSchemas(
}
},
{
- label: '整灯物料代码',
+ label: '整灯/分总成物料代码',
field: 'lightItemCode',
sort: 'custom',
table: {
@@ -372,7 +372,7 @@ export const Q2 = useCrudSchemas(
}
},
{
- label: '整灯物料名称',
+ label: '整灯/分总成物料名称',
field: 'lightItemName',
sort: 'custom',
dictClass: 'string',
@@ -454,7 +454,7 @@ export const Q2 = useCrudSchemas(
}
},
{
- label: '标准成本价格',
+ label: '销售价格',
field: 'standardCostPrice',
sort: 'custom',
isSearch: false,
From b121c2f1e38564cfad3b44713d8e747472fc11bf Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Fri, 6 Sep 2024 15:44:49 +0800
Subject: [PATCH 13/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9Q2=E9=80=9A=E7=9F=A5?=
=?UTF-8?q?=E5=8D=95=E7=9A=84=E9=94=80=E5=94=AE=E4=BB=B7=E6=A0=BC=E5=8F=96?=
=?UTF-8?q?=E5=80=BC=E6=96=B9=E5=BC=8F=20=20=20HL-5882?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/qms/inspectionQ2/index.vue | 60 +++++++++++++++++--
.../qms/inspectionQ2/inspectionQ2.data.ts | 2 +-
2 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue
index 2f06c656f..5e88f8696 100644
--- a/src/views/qms/inspectionQ2/index.vue
+++ b/src/views/qms/inspectionQ2/index.vue
@@ -108,6 +108,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue'
import * as StdcostpriceApi from '@/api/wms/stdcostprice'
+import * as SalepriceApi from '@/api/wms/saleprice'
import { formatDate } from '@/utils/formatTime'
import * as SupplieritemApi from '@/api/wms/supplieritem'
import * as SupplierApi from '@/api/wms/supplier'
@@ -171,6 +172,29 @@ const clearSearchInput = (formField) => {
})
}
})
+ SalepriceApi.getSalepricePage(params2).then((res) => {
+ if (res.list?.length > 0) {
+ priceObj.value = res.list[0]
+
+ basicFormRef.value.formRef.setValues({
+ standardCostPrice: priceObj.value.price
+ })
+ } else {
+ StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
+ if (res.list?.length > 0) {
+ priceObj.value = res.list[0]
+
+ basicFormRef.value.formRef.setValues({
+ standardCostPrice: priceObj.value.price
+ })
+ } else {
+ formRef.setValues({
+ standardCostPrice: 0
+ })
+ }
+ })
+ }
+ })
}
}
// 查询页面返回
@@ -230,12 +254,25 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
sort: ''
}
params2.isSearch = true
- StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
+ SalepriceApi.getSalepricePage(params2).then((res) => {
if (res.list?.length > 0) {
priceObj.value = res.list[0]
formRef.setValues({
standardCostPrice: priceObj.value.price
})
+ } else {
+ StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
+ if (res.list?.length > 0) {
+ priceObj.value = res.list[0]
+ formRef.setValues({
+ standardCostPrice: priceObj.value.price
+ })
+ } else {
+ formRef.setValues({
+ standardCostPrice: 0
+ })
+ }
+ })
}
})
setV[formField] = val[0][searchField]
@@ -304,8 +341,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
})
}
})
- if (basicFormRef.value.formRef.formModel.lightItemCode == null||
- basicFormRef.value.formRef.formModel.lightItemCode == ''
+ if (
+ basicFormRef.value.formRef.formModel.lightItemCode == null ||
+ basicFormRef.value.formRef.formModel.lightItemCode == ''
) {
setV['standardCostPrice'] = ''
setV['lightQty'] = 0
@@ -322,12 +360,26 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
sort: ''
}
params2.isSearch = true
- StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
+
+ SalepriceApi.getSalepricePage(params2).then((res) => {
if (res.list?.length > 0) {
priceObj.value = res.list[0]
formRef.setValues({
standardCostPrice: priceObj.value.price
})
+ } else {
+ StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
+ if (res.list?.length > 0) {
+ priceObj.value = res.list[0]
+ formRef.setValues({
+ standardCostPrice: priceObj.value.price
+ })
+ } else {
+ formRef.setValues({
+ standardCostPrice: 0
+ })
+ }
+ })
}
})
}
diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
index 91802924c..4112c30fd 100644
--- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts
+++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
@@ -341,7 +341,7 @@ export const Q2 = useCrudSchemas(
componentProps: {
enterSearch: true,
isSearchList: true, // 开启查询弹窗
- searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+ searchListPlaceholder: '请选择整灯/分总成物料代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '物料基础信息', // 查询弹窗标题
searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
From ef5c3d5ac3a31743dca3a7ddb4b72f7caa0b91de Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Fri, 6 Sep 2024 16:08:30 +0800
Subject: [PATCH 14/21] =?UTF-8?q?WMS=20bug=EF=BC=9AHL-5847=20=E7=89=A9?=
=?UTF-8?q?=E6=96=99=E9=9A=94=E7=A6=BB=E7=9B=B8=E5=85=B3=E6=93=8D=E4=BD=9C?=
=?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86=E6=89=B9?=
=?UTF-8?q?=E6=AC=A1=E7=9A=84=E9=80=89=E6=8B=A9=E5=92=8C=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../inventorymoveJobMain.data.ts | 8 ++++++++
.../inventorymoveRecordMain.data.ts | 8 ++++++++
.../inventorymoveRequestMain.data.ts | 20 +++++++++----------
3 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
index eef4d6bb0..0ad508ced 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
@@ -680,6 +680,14 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive([
width: 150
},
},
+ {
+ label: '供应商批次',
+ field: 'altBatch',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
{
label: '包装号',
field: 'packingNumber',
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
index 6c3323a0a..a8ec0a04d 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
@@ -473,6 +473,14 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive([
width: 150
},
},
+ {
+ label: '供应商批次',
+ field: 'altBatch',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
{
label: '从包装号',
field: 'fromPackingNumber',
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
index 6ac9dab6d..a3c76a5c5 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
@@ -606,6 +606,16 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive(
}
}
},
+ {
+ label: '到批次',
+ field: 'toBatch',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTableForm: false,
+ isForm: false,
+ },
{
label: '供应商批次',
field: 'altBatch',
@@ -624,16 +634,6 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive(
disabled: true
}
},
- {
- label: '到批次',
- field: 'toBatch',
- sort: 'custom',
- table: {
- width: 150
- },
- isTableForm: false,
- isForm: false,
- },
{
label: '从包装号',
field: 'fromPackingNumber',
From 4fa5609a71a04f829c470634fa4338ab71e60891 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 6 Sep 2024 16:38:11 +0800
Subject: [PATCH 15/21] =?UTF-8?q?HL-5861=E4=BE=9B=E5=BA=94=E5=95=86?=
=?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=94=B3=E8=AF=B7=E5=8F=8A=E5=8F=91=E7=A5=A8?=
=?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=92=8C=E4=BB=B7=E5=B7=AE=E6=9F=A5=E7=9C=8B?=
=?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../supplierinvoiceRecordMain.data.ts | 2 +-
.../supplierinvoice/supplierinvoiceRequestMain/index.vue | 4 +++-
.../supplierinvoiceRequestMain.data.ts | 2 +-
.../supplierinvoiceRequestMainDifference.data.ts | 4 ++--
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 459b0be99..bdd554d54 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -1234,7 +1234,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive(
// }
// },
{
- label: '折扣金额',
+ label: '返利未税金额',
field: 'discountAmount1',
formatter: accountantFormart,
table: {
@@ -1505,7 +1505,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive
Date: Fri, 6 Sep 2024 16:53:23 +0800
Subject: [PATCH 16/21] =?UTF-8?q?HL-5785=E5=88=B6=E5=93=81=E5=AD=90?=
=?UTF-8?q?=E4=BB=B6=E6=8A=A5=E5=BA=9F=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../productscrapRequestMain/index.vue | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 7b8c16871..e84101374 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -81,6 +81,8 @@
@tableFormButton="tableFormButton"
:detailValidate="detailValidate"
:detailButtonIsShowAdd="false"
+ :detailButtonIsShowEdit="false"
+ :detailButtonIsShowDelete="false"
/>
@@ -689,6 +691,11 @@ const openForm =async (type: string, row?: number) => {
if (item.field == 'scrappingReason'){
item.value = ''
}
+ if(item.field == 'productionLineCode'){
+ item.componentProps.disabled = false
+ item.componentProps.enterSearch = true
+ item.componentProps.isSearchList = true
+ }
})
}
if(type == 'update'){
@@ -697,6 +704,15 @@ const openForm =async (type: string, row?: number) => {
item.componentProps.disabled = true
item.componentProps.isSearchList = false
}
+ if(item.field == 'productionLineCode'){
+ item.componentProps.enterSearch = true
+ item.componentProps.isSearchList = true
+ }
+ if(item.field == 'productionLineCode'){
+ item.componentProps.disabled = true
+ item.componentProps.enterSearch = false
+ item.componentProps.isSearchList = false
+ }
})
}
formRef.value.open(type, row)
From 1539bb7d4af93486b001dda3a7cfdd1fcc079919 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Fri, 6 Sep 2024 17:24:13 +0800
Subject: [PATCH 17/21] =?UTF-8?q?WMS=20bug=EF=BC=9AHL-5847=20=E9=9A=94?=
=?UTF-8?q?=E7=A6=BB=E8=BD=AC=E5=90=88=E6=A0=BC=E3=80=81=E7=89=A9=E6=96=99?=
=?UTF-8?q?=E9=9A=94=E7=A6=BB=EF=BC=8C=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA?=
=?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5=EF=BC=8C=E5=BA=94=E5=BC=B9?=
=?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84excel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/wms/inventorymoveRequestMain/index.ts | 4 +-
.../inventorymoveRequestMain/index.vue | 24 +++---
.../inventorymoveRequestMainMOVE/index.vue | 24 +++---
.../inventorymoveRequestMainOKHOLD/index.vue | 77 +++++++++++++++++--
4 files changed, 95 insertions(+), 34 deletions(-)
diff --git a/src/api/wms/inventorymoveRequestMain/index.ts b/src/api/wms/inventorymoveRequestMain/index.ts
index 68784d189..72e91ea6c 100644
--- a/src/api/wms/inventorymoveRequestMain/index.ts
+++ b/src/api/wms/inventorymoveRequestMain/index.ts
@@ -129,11 +129,11 @@ export const exportScrapToHoldRequestMain = async (params) => {
}
// 下载用户导入模板
+// 下载用户导入模板（除库存移动外）
+
export const importTemplate = () => {
return request.download({ url: '/wms/inventorymove-request-main/get-import-template' })
}
-
-// 下载用户导入模板（除库存移动外）
export const importTemplateExceptMove = () => {
return request.download({ url: '/wms/inventorymove-request-main/get-import-template-exceptMove' })
}
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index f6dff9ecf..20689e6b7 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -122,8 +122,8 @@ if ( routeName.value == 'OktoholdRequestMain') {
// toInventoryStatus:'HOLD',
businessType :'OkToHold'
}
- // fromInventoryStatus.value = 'OK'
- // toInventoryStatus.value = "HOLD"
+ fromInventoryStatus.value = 'OK'
+ toInventoryStatus.value = "HOLD"
businessType.value = 'OkToHold'
importFileName.value = '物料转隔离申请'
}
@@ -133,8 +133,8 @@ else if ( routeName.value == 'NoktoholdRequestMain') {
// toInventoryStatus:'HOLD',
businessType :'NokToHold'
}
- // fromInventoryStatus.value = 'NOK'
- // toInventoryStatus.value = "HOLD"
+ fromInventoryStatus.value = 'NOK'
+ toInventoryStatus.value = "HOLD"
businessType.value = 'NokToHold'
importFileName.value = '不合格转隔离申请'
}
@@ -144,8 +144,8 @@ else if ( routeName.value == 'HoldtookRequestMain') {
// toInventoryStatus:'OK',
businessType :'HoldToOk'
}
- // fromInventoryStatus.value = 'HOLD'
- // toInventoryStatus.value = "OK"
+ fromInventoryStatus.value = 'HOLD'
+ toInventoryStatus.value = "OK"
businessType.value = 'HoldToOk'
importFileName.value = '隔离转合格申请'
} else if ( routeName.value == 'HoldtoscrapRequestMain') {
@@ -154,8 +154,8 @@ else if ( routeName.value == 'HoldtookRequestMain') {
// toInventoryStatus:'SCRAP',
businessType:'HoldToScrap'
}
- // fromInventoryStatus.value = 'HOLD'
- // toInventoryStatus.value = "SCRAP"
+ fromInventoryStatus.value = 'HOLD'
+ toInventoryStatus.value = "SCRAP"
businessType.value = 'HoldToScrap'
importFileName.value = '隔离转报废申请'
} else if ( routeName.value == 'OktoscrapRequestMain') {
@@ -164,8 +164,8 @@ else if ( routeName.value == 'HoldtookRequestMain') {
// toInventoryStatus:'SCRAP',
businessType :'OkToScrap'
}
- // fromInventoryStatus.value = 'OK'
- // toInventoryStatus.value = "SCRAP"
+ fromInventoryStatus.value = 'OK'
+ toInventoryStatus.value = "SCRAP"
businessType.value = 'OkToScrap'
importFileName.value = '合格转报废申请'
}
@@ -175,8 +175,8 @@ else if ( routeName.value == 'ScraptoholdRequestMain') {
// toInventoryStatus:'HOLD',
businessType :'ScrapToHold'
}
- // fromInventoryStatus.value = 'SCRAP'
- // toInventoryStatus.value = "HOLD"
+ fromInventoryStatus.value = 'SCRAP'
+ toInventoryStatus.value = "HOLD"
businessType.value = 'ScrapToHold'
importFileName.value = '报废转隔离申请'
} else {
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
index 06788711b..f52cd62b5 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
@@ -123,8 +123,8 @@ if ( routeName.value == 'OktoholdRequestMain') {
// toInventoryStatus:'HOLD',
businessType :'OkToHold'
}
- // fromInventoryStatus.value = 'OK'
- // toInventoryStatus.value = "HOLD"
+ fromInventoryStatus.value = 'OK'
+ toInventoryStatus.value = "HOLD"
businessType.value = 'OkToHold'
importFileName.value = '物料转隔离申请'
}
@@ -134,8 +134,8 @@ else if ( routeName.value == 'NoktoholdRequestMain') {
// toInventoryStatus:'HOLD',
businessType :'NokToHold'
}
- // fromInventoryStatus.value = 'NOK'
- // toInventoryStatus.value = "HOLD"
+ fromInventoryStatus.value = 'NOK'
+ toInventoryStatus.value = "HOLD"
businessType.value = 'NokToHold'
importFileName.value = '不合格转隔离申请'
}
@@ -145,8 +145,8 @@ else if ( routeName.value == 'HoldtookRequestMain') {
// toInventoryStatus:'OK',
businessType :'HoldToOk'
}
- // fromInventoryStatus.value = 'HOLD'
- // toInventoryStatus.value = "OK"
+ fromInventoryStatus.value = 'HOLD'
+ toInventoryStatus.value = "OK"
businessType.value = 'HoldToOk'
importFileName.value = '隔离转合格申请'
} else if ( routeName.value == 'HoldtoscrapRequestMain') {
@@ -155,8 +155,8 @@ else if ( routeName.value == 'HoldtookRequestMain') {
// toInventoryStatus:'SCRAP',
businessType:'HoldToScrap'
}
- // fromInventoryStatus.value = 'HOLD'
- // toInventoryStatus.value = "SCRAP"
+ fromInventoryStatus.value = 'HOLD'
+ toInventoryStatus.value = "SCRAP"
businessType.value = 'HoldToScrap'
importFileName.value = '隔离转报废申请'
} else if ( routeName.value == 'OktoscrapRequestMain') {
@@ -165,8 +165,8 @@ else if ( routeName.value == 'HoldtookRequestMain') {
// toInventoryStatus:'SCRAP',
businessType :'OkToScrap'
}
- // fromInventoryStatus.value = 'OK'
- // toInventoryStatus.value = "SCRAP"
+ fromInventoryStatus.value = 'OK'
+ toInventoryStatus.value = "SCRAP"
businessType.value = 'OkToScrap'
importFileName.value = '合格转报废申请'
}
@@ -176,8 +176,8 @@ else if ( routeName.value == 'ScraptoholdRequestMain') {
// toInventoryStatus:'HOLD',
businessType :'ScrapToHold'
}
- // fromInventoryStatus.value = 'SCRAP'
- // toInventoryStatus.value = "HOLD"
+ fromInventoryStatus.value = 'SCRAP'
+ toInventoryStatus.value = "HOLD"
businessType.value = 'ScrapToHold'
importFileName.value = '报废转隔离申请'
} else {
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
index 003fa48bc..0be2f9677 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
@@ -116,15 +116,76 @@ const { tableObject, tableMethods } = useTable({
getListApi: InventorymoveRequestDetailApi.getInventorymoveRequestDetailPage // 分页接口
})
-tableObject.params = {
- // fromInventoryStatus: 'OK',
- // toInventoryStatus:'HOLD',
- businessType :'OkToHold'
+if ( routeName.value == 'OktoholdRequestMain') {
+ tableObject.params = {
+ // fromInventoryStatus: 'OK',
+ // toInventoryStatus:'HOLD',
+ businessType :'OkToHold'
+ }
+ fromInventoryStatus.value = 'OK'
+ toInventoryStatus.value = "HOLD"
+ businessType.value = 'OkToHold'
+ importFileName.value = '物料转隔离申请'
+}
+else if ( routeName.value == 'NoktoholdRequestMain') {
+ tableObject.params = {
+ // fromInventoryStatus: 'NOK',
+ // toInventoryStatus:'HOLD',
+ businessType :'NokToHold'
+ }
+ fromInventoryStatus.value = 'NOK'
+ toInventoryStatus.value = "HOLD"
+ businessType.value = 'NokToHold'
+ importFileName.value = '不合格转隔离申请'
+}
+else if ( routeName.value == 'HoldtookRequestMain') {
+ tableObject.params = {
+ // fromInventoryStatus: 'HOLD',
+ // toInventoryStatus:'OK',
+ businessType :'HoldToOk'
+ }
+ fromInventoryStatus.value = 'HOLD'
+ toInventoryStatus.value = "OK"
+ businessType.value = 'HoldToOk'
+ importFileName.value = '隔离转合格申请'
+} else if ( routeName.value == 'HoldtoscrapRequestMain') {
+ tableObject.params = {
+ // fromInventoryStatus: 'HOLD',
+ // toInventoryStatus:'SCRAP',
+ businessType:'HoldToScrap'
+ }
+ fromInventoryStatus.value = 'HOLD'
+ toInventoryStatus.value = "SCRAP"
+ businessType.value = 'HoldToScrap'
+ importFileName.value = '隔离转报废申请'
+} else if ( routeName.value == 'OktoscrapRequestMain') {
+ tableObject.params = {
+ // fromInventoryStatus: 'OK',
+ // toInventoryStatus:'SCRAP',
+ businessType :'OkToScrap'
+ }
+ fromInventoryStatus.value = 'OK'
+ toInventoryStatus.value = "SCRAP"
+ businessType.value = 'OkToScrap'
+ importFileName.value = '合格转报废申请'
+}
+else if ( routeName.value == 'ScraptoholdRequestMain') {
+ tableObject.params = {
+ // fromInventoryStatus: 'SCRAP',
+ // toInventoryStatus:'HOLD',
+ businessType :'ScrapToHold'
+ }
+ fromInventoryStatus.value = 'SCRAP'
+ toInventoryStatus.value = "HOLD"
+ businessType.value = 'ScrapToHold'
+ importFileName.value = '报废转隔离申请'
+} else {
+ tableObject.params = {
+ businessType :'Move'
+ }
+ businessType.value = 'Move'
+ importFileName.value = '库存移动申请'
}
-// fromInventoryStatus.value = 'OK'
-// toInventoryStatus.value = "HOLD"
-businessType.value = 'OkToHold'
-importFileName.value = '物料转隔离申请'
InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
if(item.field == 'fromWarehouseCode') {
From 8be363477ccd8a9ebbfbf4dcc7d7e52f91dbe6b1 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 6 Sep 2024 17:51:56 +0800
Subject: [PATCH 18/21] =?UTF-8?q?HL-5887SCP=E4=B8=AD=E6=89=93=E5=BC=80?=
=?UTF-8?q?=E6=9F=90=E4=B8=AA=E6=9F=A5=E8=AF=A2=E8=8F=9C=E5=8D=95=EF=BC=8C?=
=?UTF-8?q?=E5=B9=B6=E8=BE=93=E5=85=A5=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
=?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=82=B9=E5=87=BB=E6=9F=A5=E8=AF=A2=E7=AD=9B?=
=?UTF-8?q?=E9=80=89=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=E9=97=AE=E9=A2=98?=
=?UTF-8?q?=EF=BC=9B=E5=86=8D=E5=8E=BB=E6=89=93=E5=BC=80=E5=8F=A6=E4=B8=80?=
=?UTF-8?q?=E4=B8=AA=E6=9F=A5=E8=AF=A2=E8=8F=9C=E5=8D=95=EF=BC=8C=E8=BF=94?=
=?UTF-8?q?=E5=9B=9E=E5=88=9A=E6=89=8D=E8=8F=9C=E5=8D=95=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=EF=BC=8C=E4=B9=8B=E5=89=8D=E8=BE=93=E5=85=A5=E7=9A=84=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E8=A2=AB=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../purchasereceipt/purchasereceiptRecordMain/index.vue | 3 +++
.../purchasereturn/purchasereturnRecordMain/index.vue | 3 +++
.../supplierdeliver/supplierdeliverRecordMain/index.vue | 3 +++
3 files changed, 9 insertions(+)
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
index bf3d77e54..f1ac5f3da 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@@ -363,4 +363,7 @@ const changeTabs = (data) =>{
onMounted(async () => {
getList()
})
+onActivated(() => {
+ getList()
+})
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
index b32e4d42e..48e60e3f1 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
@@ -197,4 +197,7 @@ const searchFormClick = (searchData) => {
onMounted(async () => {
getList()
})
+onActivated(() => {
+ getList()
+})
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
index b8e88cc6f..cb270d6c0 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
@@ -306,4 +306,7 @@ const searchFormClick = (searchData) => {
onMounted(async () => {
getList()
})
+onActivated(() => {
+ getList()
+})
From 1d58a4f622f57dfd317d4cf1d7127ae2415f3282 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Fri, 6 Sep 2024 23:54:43 +0800
Subject: [PATCH 19/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9Q2=E9=80=9A=E7=9F=A5?=
=?UTF-8?q?=E5=8D=95=E7=9A=84=E9=94=80=E5=94=AE=E4=BB=B7=E6=A0=BC=E5=8F=96?=
=?UTF-8?q?=E5=80=BC=E6=96=B9=E5=BC=8F=20HL-5882?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/qms/inspectionQ2/index.vue | 135 ++++++++++++------
src/views/qms/inspectionQ3/index.vue | 4 +-
.../qms/inspectionQ3/inspectionQ3.data.ts | 8 +-
3 files changed, 101 insertions(+), 46 deletions(-)
diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue
index 5e88f8696..48af18b0f 100644
--- a/src/views/qms/inspectionQ2/index.vue
+++ b/src/views/qms/inspectionQ2/index.vue
@@ -142,10 +142,62 @@ const clearSearchInput = (formField) => {
item.componentProps.options = []
}
})
+ if (basicFormRef.value.formRef.formModel.lightItemCode) {
+ basicFormRef.value.formRef.setValues({
+ lightQty: 0,
+ claimAmount: '',
+ otherClaimAmount: 0,
+ summaryAmount: 0,
+ disbursementAmount: 0,
+ remainingAmount: 0
+ })
+
+ const params2 = {
+ by: 'ASC',
+ filters: [
+ {
+ column: 'itemCode',
+ action: '==',
+ value: basicFormRef.value.formRef.formModel.lightItemCode
+ }
+ ],
+ pageNo: 1,
+ pageSize: 500,
+ sort: ''
+ }
+ params2.isSearch = true
+ SalepriceApi.getSalepricePage(params2).then((res) => {
+ if (res.list?.length > 0) {
+ priceObj.value = res.list[0]
+
+ basicFormRef.value.formRef.setValues({
+ standardCostPrice: priceObj.value.price
+ })
+ } else {
+ params2.isSearch = true
+ StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
+ if (res.list?.length > 0) {
+ priceObj.value = res.list[0]
+
+ basicFormRef.value.formRef.setValues({
+ standardCostPrice: priceObj.value.price
+ })
+ } else {
+ basicFormRef.value.formRef.setValues({
+ standardCostPrice: 0
+ })
+ }
+ })
+ }
+ })
+ } else {
+ basicFormRef.value.formRef.setValues({
+ standardCostPrice: ''
+ })
+ }
}
if (formField == 'lightItemCode') {
basicFormRef.value.formRef.setValues({
- standardCostPrice: '',
lightItemName: '',
lightQty: 0,
claimAmount: '',
@@ -154,47 +206,47 @@ const clearSearchInput = (formField) => {
disbursementAmount: 0,
remainingAmount: 0
})
- const params2 = {
- by: 'ASC',
- filters: [
- { column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }
- ],
- pageNo: 1,
- pageSize: 500,
- sort: ''
- }
- params2.isSearch = true
- StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
- if (res.list?.length > 0) {
- priceObj.value = res.list[0]
- basicFormRef.value.formRef.setValues({
- standardCostPrice: priceObj.value.price
- })
+
+ if (basicFormRef.value.formRef.formModel.itemCode) {
+ const params2 = {
+ by: 'ASC',
+ filters: [
+ { column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }
+ ],
+ pageNo: 1,
+ pageSize: 500,
+ sort: ''
}
- })
- SalepriceApi.getSalepricePage(params2).then((res) => {
- if (res.list?.length > 0) {
- priceObj.value = res.list[0]
+ params2.isSearch = true
+ SalepriceApi.getSalepricePage(params2).then((res) => {
+ if (res.list?.length > 0) {
+ priceObj.value = res.list[0]
- basicFormRef.value.formRef.setValues({
- standardCostPrice: priceObj.value.price
- })
- } else {
- StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
- if (res.list?.length > 0) {
- priceObj.value = res.list[0]
+ basicFormRef.value.formRef.setValues({
+ standardCostPrice: priceObj.value.price
+ })
+ } else {
+ params2.isSearch = true
+ StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
+ if (res.list?.length > 0) {
+ priceObj.value = res.list[0]
- basicFormRef.value.formRef.setValues({
- standardCostPrice: priceObj.value.price
- })
- } else {
- formRef.setValues({
- standardCostPrice: 0
- })
- }
- })
- }
- })
+ basicFormRef.value.formRef.setValues({
+ standardCostPrice: priceObj.value.price
+ })
+ } else {
+ basicFormRef.value.formRef.setValues({
+ standardCostPrice: 0
+ })
+ }
+ })
+ }
+ })
+ } else {
+ basicFormRef.value.formRef.setValues({
+ standardCostPrice: ''
+ })
+ }
}
}
// 查询页面返回
@@ -261,6 +313,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
standardCostPrice: priceObj.value.price
})
} else {
+ params2.isSearch = true
StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
if (res.list?.length > 0) {
priceObj.value = res.list[0]
@@ -360,14 +413,16 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
sort: ''
}
params2.isSearch = true
-
+ console.log(123)
SalepriceApi.getSalepricePage(params2).then((res) => {
+ console.log(456)
if (res.list?.length > 0) {
priceObj.value = res.list[0]
formRef.setValues({
standardCostPrice: priceObj.value.price
})
} else {
+ params2.isSearch = true
StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
if (res.list?.length > 0) {
priceObj.value = res.list[0]
diff --git a/src/views/qms/inspectionQ3/index.vue b/src/views/qms/inspectionQ3/index.vue
index a061d7ab9..a444cafdf 100644
--- a/src/views/qms/inspectionQ3/index.vue
+++ b/src/views/qms/inspectionQ3/index.vue
@@ -106,6 +106,7 @@ import * as InspectionQ3MainApi from '@/api/qms/inspectionQ3/inspectionQ3Main'
import * as InspectionQ3DetailApi from '@/api/qms/inspectionQ3/inspectionQ3Detail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import * as ProductionlineApi from '@/api/wms/productionline'
import * as StdcostpriceApi from '@/api/wms/stdcostprice'
import { formatDate } from '@/utils/formatTime'
import { async } from '@antv/x6/lib/registry/marker/async'
@@ -173,7 +174,7 @@ const setTableFormsValues = async (val, index1) => {
newRow['uom'] = val[index1]['uom']
newRow['qty'] = 0
newRow.defectLocation = val[index1]['productionLineCode']
- await ProductionlineitemApi.selectItemCodeToProductionLineCode(val[index1].itemCode).then(
+ await ProductionlineApi.getProductionlineNoPage({}).then(
(res) => {
console.log(res)
if (res?.length > 0) {
@@ -419,7 +420,6 @@ const submitForm = async (formType, submitData) => {
return;
}
let flag = false;
- console.log(1111)
data.subList.forEach((item) => {
if(item.qty == 0){
message.warning("数量不能为0")
diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
index dd059b76e..8fbdeb017 100644
--- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts
+++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
@@ -485,16 +485,16 @@ export const InspectionQ3Detail = useCrudSchemas(
filterable: true,
options: [],
optionsAlias: {
- labelField: 'productionLineName',
- valueField: 'productionLineCode'
+ labelField: 'name',
+ valueField: 'code'
}
}
},
tableForm: {
type: 'Select',
filterable: true,
- valueField: 'productionLineName',
- labelField: 'productionLineCode'
+ valueField: 'name',
+ labelField: 'code'
}
},
{
From e795034da869673bff43cfd9c723a981e8e64a75 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Sat, 7 Sep 2024 10:13:10 +0800
Subject: [PATCH 20/21] =?UTF-8?q?Q3=E6=98=8E=E7=BB=86=E4=B8=AD=E7=BC=BA?=
=?UTF-8?q?=E9=99=B7=E4=BD=8D=E7=BD=AE=E5=B8=A6=E5=87=BA=E9=94=99=E8=AF=AF?=
=?UTF-8?q?=EF=BC=8C=E7=BC=BA=E9=99=B7=E4=BD=8D=E7=BD=AE=E9=9C=80=E8=A6=81?=
=?UTF-8?q?=E6=94=AF=E6=8C=81=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5=20=20HL-?=
=?UTF-8?q?5894?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../qms/inspectionQ3/inspectionQ3.data.ts | 26 ++++++++++---------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
index 8fbdeb017..23d415a91 100644
--- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts
+++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
@@ -323,16 +323,18 @@ export const InspectionQ3Detail = useCrudSchemas(
],
verificationPage: ProductionlineitemApi.getProductionLineCodelistByCodes, // tableForm下方输入框校验失去焦点之后是否正确的方法
isShowTableFormSearch: true, //tableForm下方是否出现输入框
- isRepeat: true,//tableForm下方输入框是否可以重复添加该条数据
+ isRepeat: true, //tableForm下方输入框是否可以重复添加该条数据
// 失去焦点校验参数
- verificationParams: [{
- key: 'itemCode',
- action: '==',
- value: '',
- isMainValue: false,
- isSearch: 'true',
- isFormModel: true,
- }]
+ verificationParams: [
+ {
+ key: 'itemCode',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: 'true',
+ isFormModel: true
+ }
+ ]
},
form: {
// labelMessage: '信息提示说明！！！',
@@ -485,7 +487,7 @@ export const InspectionQ3Detail = useCrudSchemas(
filterable: true,
options: [],
optionsAlias: {
- labelField: 'name',
+ labelField: 'code',
valueField: 'code'
}
}
@@ -493,8 +495,8 @@ export const InspectionQ3Detail = useCrudSchemas(
tableForm: {
type: 'Select',
filterable: true,
- valueField: 'name',
- labelField: 'code'
+ labelField: 'code',
+ valueField: 'code'
}
},
{
From 743aeeb5fbed229cbe0f2f8c1c25942bdf3bfa00 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Sat, 7 Sep 2024 10:35:21 +0800
Subject: [PATCH 21/21] =?UTF-8?q?Q3=E6=98=8E=E7=BB=86=E4=B8=AD=E7=BC=BA?=
=?UTF-8?q?=E9=99=B7=E4=BD=8D=E7=BD=AE=E5=B8=A6=E5=87=BA=E9=94=99=E8=AF=AF?=
=?UTF-8?q?=EF=BC=8C=E7=BC=BA=E9=99=B7=E4=BD=8D=E7=BD=AE=E9=9C=80=E8=A6=81?=
=?UTF-8?q?=E6=94=AF=E6=8C=81=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5=20=20HL-?=
=?UTF-8?q?5894?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/qms/inspectionQ2/index.vue | 76 ++++++++++++++++++++++++----
1 file changed, 65 insertions(+), 11 deletions(-)
diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue
index 48af18b0f..e8f0bebc9 100644
--- a/src/views/qms/inspectionQ2/index.vue
+++ b/src/views/qms/inspectionQ2/index.vue
@@ -159,6 +159,11 @@ const clearSearchInput = (formField) => {
column: 'itemCode',
action: '==',
value: basicFormRef.value.formRef.formModel.lightItemCode
+ },
+ {
+ column: 'available',
+ action: '==',
+ value: 'TRUE'
}
],
pageNo: 1,
@@ -211,7 +216,16 @@ const clearSearchInput = (formField) => {
const params2 = {
by: 'ASC',
filters: [
- { column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }
+ {
+ column: 'itemCode',
+ action: '==',
+ value: basicFormRef.value.formRef.formModel.itemCode
+ },
+ {
+ column: 'available',
+ action: '==',
+ value: 'TRUE'
+ }
],
pageNo: 1,
pageSize: 500,
@@ -258,7 +272,14 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
setV['purchaseReceiptNumber'] = ''
const supplierParams = {
by: 'ASC',
- filters: [{ column: 'code', action: '==', value: val[0].supplierCode }],
+ filters: [
+ { column: 'code', action: '==', value: val[0].supplierCode },
+ {
+ column: 'available',
+ action: '==',
+ value: 'TRUE'
+ }
+ ],
pageNo: 1,
pageSize: 500,
sort: ''
@@ -300,7 +321,14 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
setV['remainingAmount'] = 0
const params2 = {
by: 'ASC',
- filters: [{ column: 'itemCode', action: '==', value: val[0].code }],
+ filters: [
+ { column: 'itemCode', action: '==', value: val[0].code },
+ {
+ column: 'available',
+ action: '==',
+ value: 'TRUE'
+ }
+ ],
pageNo: 1,
pageSize: 500,
sort: ''
@@ -361,7 +389,14 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
const supplieritemParams = {
by: 'ASC',
- filters: [{ column: 'itemCode', action: '==', value: val[0].itemCode }],
+ filters: [
+ { column: 'itemCode', action: '==', value: val[0].itemCode },
+ {
+ column: 'available',
+ action: '==',
+ value: 'TRUE'
+ }
+ ],
pageNo: 1,
pageSize: 500,
sort: ''
@@ -380,7 +415,14 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
})
const itembasicParams = {
by: 'ASC',
- filters: [{ column: 'code', action: '==', value: val[0].itemCode }],
+ filters: [
+ { column: 'code', action: '==', value: val[0].itemCode },
+ {
+ column: 'available',
+ action: '==',
+ value: 'TRUE'
+ }
+ ],
pageNo: 1,
pageSize: 500,
sort: ''
@@ -407,7 +449,14 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
setV['remainingAmount'] = 0
const params2 = {
by: 'ASC',
- filters: [{ column: 'itemCode', action: '==', value: val[0].itemCode }],
+ filters: [
+ { column: 'itemCode', action: '==', value: val[0].itemCode },
+ {
+ column: 'available',
+ action: '==',
+ value: 'TRUE'
+ }
+ ],
pageNo: 1,
pageSize: 500,
sort: ''
@@ -509,7 +558,12 @@ const onChange = (field, e) => {
const paramsCustomer = {
by: 'ASC',
filters: [
- { column: 'code', action: '==', value: basicFormRef.value.formRef.formModel.supplierCode }
+ { column: 'code', action: '==', value: basicFormRef.value.formRef.formModel.supplierCode },
+ {
+ column: 'available',
+ action: '==',
+ value: 'TRUE'
+ }
],
pageNo: 1,
pageSize: 500,
@@ -690,10 +744,10 @@ const formsSuccess = async (formType, data) => {
// message.error('数量不能为0')
// return
// }
- if (!data.standardCostPrice) {
- message.error('标准成本价格不能为0或空')
- return
- }
+ // if (!data.standardCostPrice) {
+ // message.error('标准成本价格不能为0或空')
+ // return
+ // }
if (data.activeTime == 0) data.activeTime = null
if (data.expireTime == 0) data.expireTime = null