From ebe0a7162fa887bfede7cacb794d9415551100f1 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Sat, 17 Aug 2024 10:11:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5190=E9=80=80?= =?UTF-8?q?=E8=B4=A7=E5=8E=9F=E5=9B=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnJobMain.data.ts | 28 ++++++++++++ .../purchasereturnRecordMain.data.ts | 45 ++++++++++++------- .../purchasereturnRequestMain.data.ts | 28 ++++++++++++ 3 files changed, 86 insertions(+), 15 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts index e401c8840..6eafe4f71 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts @@ -935,6 +935,34 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive([ disabled:false } }, + { + label: '退货原因', + field: 'reasonType', + dictType: DICT_TYPE.RETURN_REASON_TYPE, + dictClass: 'string', + // isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + type: 'Select', + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '退货原因描述', + field: 'reason', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '计量单位', field: 'uom', diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts index 4934ee993..cc3db763a 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts @@ -744,20 +744,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive( hiddenInMain: true, isSearch: false }, - { - label: '原因', - field: 'reason', - dictType: DICT_TYPE.PURCHASE_RETURN_REASON, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault: 1013, - hiddenInMain: true - }, - + { label: '物料代码', field: 'itemCode', @@ -887,7 +874,35 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive( // }, // }, { - label: '原因', + label: '退货原因', + field: 'reasonType', + dictType: DICT_TYPE.RETURN_REASON_TYPE, + dictClass: 'string', + // isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + type: 'Select', + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '退货原因描述', + field: 'reason', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '备注', field: 'remark', sort: 'custom', table: { diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts index ba8735894..3f63b07f0 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts @@ -1236,6 +1236,34 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive precision: 6 } }, + { + label: '退货原因', + field: 'reasonType', + dictType: DICT_TYPE.RETURN_REASON_TYPE, + dictClass: 'string', + // isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + type: 'Select', + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '退货原因描述', + field: 'reason', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '库存状态', field: 'inventoryStatus', From 965b13eb612a4a311b6108d4914f4a3e10f683a5 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Sat, 17 Aug 2024 10:20:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/components/LoginForm.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue index 7751297e1..084b29a4e 100644 --- a/src/views/login/components/LoginForm.vue +++ b/src/views/login/components/LoginForm.vue @@ -33,7 +33,7 @@ :prefix-icon="iconLock" show-password type="password" @keyup.enter="getCode()" style="height: 42px;" /> - +
{ @@ -234,7 +234,7 @@ return } let res = null - if(needCode.value=='false'){ + if(!needCode){ res = await LoginApi.loginNoCode(loginData.loginForm) }else{ res = await LoginApi.login(loginData.loginForm) From 0c8be0a04bd8bc19959b7646c14ad6b652b4d4bc Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Sat, 17 Aug 2024 10:31:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=20=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E7=99=BB=E5=BD=95+=E6=9D=A8=E7=8E=89=E7=A6=8F?= =?UTF-8?q?=EF=BC=9A=E5=8E=BB=E6=8E=89=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7=E9=87=87=E8=B4=AD=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BA=BA=E9=BB=98=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/components/LoginForm.vue | 4 +- .../supplierinvoiceRequestMain/index.vue | 40 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue index 084b29a4e..661c0c0eb 100644 --- a/src/views/login/components/LoginForm.vue +++ b/src/views/login/components/LoginForm.vue @@ -174,7 +174,7 @@ // } // } function getCode() { - if(!needCode){ + if(!needCode.value){ return } getCodeImg().then(res => { @@ -234,7 +234,7 @@ return } let res = null - if(!needCode){ + if(!needCode.value){ res = await LoginApi.loginNoCode(loginData.loginForm) }else{ res = await LoginApi.login(loginData.loginForm) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index bca5b0524..8c363166d 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -702,16 +702,16 @@ const buttonTableClick = async (val, row) => { handleRepeal(row.id) } } -const procurementCreators = ref([]) -SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({ - roleCode: 'purchase', - pageSize: 1000, - pageNo: 1, - sort: '', - by: 'ASC' -}).then((res) => { -procurementCreators.value = res.list -}) +// const procurementCreators = ref([]) +// SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({ +// roleCode: 'purchase', +// pageSize: 1000, +// pageNo: 1, +// sort: '', +// by: 'ASC' +// }).then((res) => { +// procurementCreators.value = res.list +// }) /** 添加/修改操作 */ const formRef = ref() const openForm = async (type: string, row?: any) => { @@ -787,10 +787,10 @@ const openForm = async (type: string, row?: any) => { item.componentProps.disabled = false } - if (item.field == 'procurementCreator') { - item.componentProps.options = procurementCreators.value + // if (item.field == 'procurementCreator') { + // item.componentProps.options = procurementCreators.value - } + // } }) } if (row && (row.status == '3' || row.status == '7')) { @@ -813,13 +813,13 @@ const openForm = async (type: string, row?: any) => { } tableData.value = [] // 重置明细数据 formRef.value.open(type, row) - if(type=='create'){ - nextTick(() => { - formRef.value.formRef.setValues({ - procurementCreator:procurementCreators.value[0].id - }) - }) - } + // if(type=='create'){ + // nextTick(() => { + // formRef.value.formRef.setValues({ + // procurementCreator:procurementCreators.value[0].id + // }) + // }) + // } }) } const defaultSupplierCode = ref('')