Browse Source

Merge remote-tracking branch 'origin/master_hella' into master_hella

hella_online_20240829
gaojs 2 months ago
parent
commit
3083f001d2
  1. 18
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
  2. 3
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
  3. 7
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
  4. 4
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

18
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue

@ -133,6 +133,7 @@ import { getAccessToken } from '@/utils/auth'
import { getJmreportBaseUrl } from '@/utils/systemParam'
import { formatDate } from '@/utils/formatTime'
import { usePageLoading } from '@/hooks/web/usePageLoading'
import * as SubjectAccountApi from '@/api/wms/subjectAccount'
const { loadStart, loadDone } = usePageLoading()
//
defineOptions({ name: 'UnplannedreceiptRequestMain' })
@ -246,6 +247,23 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
}
if(formField === 'reasonCodeRequisition'){
setV['reasonCodeRequisition'] = val[0]['code']
let accountRes = await SubjectAccountApi.getSubjectAccountPage({
pageSize: 20,
pageNo: 1,
code: val[0]['code'],
costcentreType: formRef.formModel['costCenterType'],
sort: '',
by: 'ASC'
})
console.log('UnplannedreceiptRequestMainRules',UnplannedreceiptRequestMainRules)
if( UnplannedreceiptRequestMainRules['projectCode']){
UnplannedreceiptRequestMainRules['projectCode'][0]['required'] = false
if(accountRes&&accountRes.list&&accountRes.list.length>0){
if(accountRes.list[0]['isProject']=='TRUE'){
UnplannedreceiptRequestMainRules['projectCode'][0]['required'] = true
}
}
}
}
if(formField === 'projectCode'){
setV['projectCode'] = val[0]['projectCode']

3
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@ -650,6 +650,9 @@ export const UnplannedreceiptRequestMainRules = reactive({
costCenterType: [
{ required: true, message: '请输入成本中心类型', trigger: 'blur' }
],
projectCode: [
{ required: false, message: '请输入项目代码', trigger: 'blur' }
],
reasonCodeRequisition: [
{ required: true, message: '请输入领用原因代码', trigger: 'blur' }
],

7
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue

@ -24,6 +24,7 @@
@formFormDateChange="formFormDateChange"
@inputNumberChange="inputNumberChange"
@onEnter="onEnter"
@clearSearchInput="clearSearchInput"
>
<template v-slot="{row}">
@ -458,6 +459,12 @@ const onEnter = async (field,value)=>{
value:value
}])
}
const clearSearchInput = (field) => {
if(field == 'ppNumber'){
tableData.value = []
}
}
defineExpose({ openForm , openFormByCreate}) // open
</script>

4
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@ -2084,8 +2084,8 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
}
},
{
label: '参考凭证描述',
field: 'voucherNumberRemark',
label: '备注',
field: 'remark',
hiddenInMain:true,
},
{

Loading…
Cancel
Save