diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts
index 309422d37..753c999d9 100644
--- a/src/api/wms/demandforecastingDetail/index.ts
+++ b/src/api/wms/demandforecastingDetail/index.ts
@@ -35,7 +35,12 @@ const getPageParams = (params)=>{
params.endDate = params.dueDate[1].format('YYYY-MM-DD')
}
}
- params.dueDate = ''
+ console.log(params.dueDate)
+ if (!params.dueDate || params.dueDate.length == 0) {
+ params.startDate = ''
+ params.endDate = ''
+ }
+ // params.dueDate = ''
//计划员
if(params.planerId&¶ms.planerId.length>0){
@@ -79,7 +84,6 @@ export const getDemandforecastingDetailPage = async (params) => {
return await request.post({ url: '/wms/demandforecasting-detail/senior', data })
} else {
params = getPageParams(params)
- console.log('params',params)
return await request.get({ url: `/wms/demandforecasting-detail/page`, params })
}
}
diff --git a/src/api/wms/demandforecastingMain/index.ts b/src/api/wms/demandforecastingMain/index.ts
index 0433af12c..cbb7bfb59 100644
--- a/src/api/wms/demandforecastingMain/index.ts
+++ b/src/api/wms/demandforecastingMain/index.ts
@@ -85,7 +85,11 @@ const getPageParams = (params)=>{
params.endDate = params.dueDate[1].format('YYYY-MM-DD')
}
}
- params.dueDate = ''
+ if (!params.dueDate || params.dueDate.length == 0) {
+ params.startDate = ''
+ params.endDate = ''
+ }
+ // params.dueDate = ''
//计划员
if(params.planerId&¶ms.planerId.length>0){
diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue
index a9f8b472b..e89826f8a 100644
--- a/src/components/Annex/src/Annex.vue
+++ b/src/components/Annex/src/Annex.vue
@@ -4,7 +4,9 @@
diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue
index 92cec2464..c8c84e960 100644
--- a/src/views/qms/inspectionQ2/index.vue
+++ b/src/views/qms/inspectionQ2/index.vue
@@ -131,13 +131,20 @@ const clearSearchInput = (formField) => {
if (formField == 'itemCode') {
basicFormRef.value.formRef.setValues({
itemName: '',
- SupplierCode: '',
- SupplierName: ''
+ supplierCode: '',
+ supplierName: '',
+ purchaseReceiptNumber: ''
+ })
+ Q2.allSchemas.formSchema.forEach((item) => {
+ if (item.field == 'supplierCode') {
+ item.componentProps.options = []
+ }
})
}
if (formField == 'lightItemCode') {
basicFormRef.value.formRef.setValues({
standardCostPrice: '',
+ lightItemName: '',
lightQty: 0,
claimAmount: '',
otherClaimAmount: 0,
@@ -147,7 +154,9 @@ const clearSearchInput = (formField) => {
})
const params2 = {
by: 'ASC',
- filters: [{ column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }],
+ filters: [
+ { column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }
+ ],
pageNo: 1,
pageSize: 500,
sort: ''
@@ -212,22 +221,22 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
setV['summaryAmount'] = 0
setV['disbursementAmount'] = 0
setV['remainingAmount'] = 0
- const params2 = {
- by: 'ASC',
- filters: [{ column: 'itemCode', action: '==', value: val[0].code }],
- pageNo: 1,
- pageSize: 500,
- sort: ''
- }
- params2.isSearch = true
- StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
- if (res.list?.length > 0) {
- priceObj.value = res.list[0]
- formRef.setValues({
- standardCostPrice: priceObj.value.price
- })
- }
- })
+ const params2 = {
+ by: 'ASC',
+ filters: [{ column: 'itemCode', action: '==', value: val[0].code }],
+ pageNo: 1,
+ pageSize: 500,
+ sort: ''
+ }
+ params2.isSearch = true
+ StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
+ if (res.list?.length > 0) {
+ priceObj.value = res.list[0]
+ formRef.setValues({
+ standardCostPrice: priceObj.value.price
+ })
+ }
+ })
setV[formField] = val[0][searchField]
formRef.setValues(setV)
}
@@ -245,9 +254,10 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
}
if (formField == 'itemCode') {
- setV['SupplierCode'] = ''
- setV['SupplierName'] = ''
+ setV['supplierCode'] = ''
+ setV['supplierName'] = ''
setV['itemName'] = ''
+ setV['purchaseReceiptNumber'] = ''
setV['uom'] = val[0].supplierUom
Q2Api.getEmail().then((res) => {
@@ -293,8 +303,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
})
}
})
-
- if (val[0].lightItemCode == null) {
+ if (basicFormRef.value.formRef.formModel.lightItemCode == null||
+ basicFormRef.value.formRef.formModel.lightItemCode == ''
+ ) {
setV['standardCostPrice'] = ''
setV['lightQty'] = 0
setV['claimAmount'] = ''
diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
index 9f1652a69..898bb7f94 100644
--- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts
+++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
@@ -23,7 +23,7 @@ export const Q2Rules = reactive({
itemCode: [{ required: true, message: '请选择供应商物料代码', trigger: 'change' }],
supplierCode: [{ required: true, message: '请选择供应商代码', trigger: 'change' }],
purchaseReceiptNumber: [
- { required: true, message: '请选择采购收货单号', trigger: 'change' },
+ // { required: true, message: '请选择采购收货单号', trigger: 'change' },
{ max: 255, message: '不得超过255个字符', trigger: 'blur' }
],
claimTime: [{ required: true, message: '请选择索赔日期', trigger: 'change' }],
diff --git a/src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts b/src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts
index 1cd6491d4..452c19a7e 100644
--- a/src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts
+++ b/src/views/wms/inventoryManage/balanceSummary/balanceSummary.data.ts
@@ -63,6 +63,10 @@ export const BalanceSummary = useCrudSchemas(
label: ' ',
field: 'name',
sort: 'custom',
+ align: 'left',
+ table:{
+ width: 350
+ }
},
{
label: '总数',
diff --git a/src/views/wms/inventoryManage/balanceSummary/index.vue b/src/views/wms/inventoryManage/balanceSummary/index.vue
index 40db7b901..09ee9ebcd 100644
--- a/src/views/wms/inventoryManage/balanceSummary/index.vue
+++ b/src/views/wms/inventoryManage/balanceSummary/index.vue
@@ -26,6 +26,7 @@