Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

master_hella_20240701
zhaoxuebing 3 months ago
parent
commit
984dabda39
  1. 5
      src/components/Detail/src/Detail.vue
  2. 3
      src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
  3. 2
      src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
  4. 27
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts

5
src/components/Detail/src/Detail.vue

@ -938,7 +938,10 @@ const handleDelete = async (id: number) => {
// //
await getList() await getList()
updateKey.value += 1 updateKey.value += 1
} catch {} } catch {
tableObject.loading = false
getList()
}
} }
// //
const searchFormClick = async (searchData) => { const searchFormClick = async (searchData) => {

3
src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue

@ -393,6 +393,9 @@ const submitForm = async (formType, data) => {
await RelegateRequestMainApi.createRelegateRequestMain(data) await RelegateRequestMainApi.createRelegateRequestMain(data)
message.success(t('common.createSuccess')) message.success(t('common.createSuccess'))
} else { } else {
if(data.masterId){
data.id = data.masterId
}
await RelegateRequestMainApi.updateRelegateRequestMain(data) await RelegateRequestMainApi.updateRelegateRequestMain(data)
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
} }

2
src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts

@ -668,7 +668,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.REQUEST_STATUS, dictType: DICT_TYPE.REQUEST_STATUS,
dictClass: 'string', dictClass: 'string',
isForm: false, isForm: false,
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
isTableForm: false, isTableForm: false,
}, },

27
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts

@ -48,17 +48,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
component: 'InputNumber', component: 'InputNumber',
} }
}, },
{
label: '财务凭证号',
field: 'voucher_number',
sort: 'custom',
table: {
width: 180,
},
isTable:false,
sortTableDefault:6,
isForm: false
},
{ {
label: '状态', label: '状态',
@ -328,7 +318,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sortTableDefault:10 sortTableDefault:10
}, },
{ {
label: '过账日期', label: '过账时间',
field: 'postingDate', field: 'postingDate',
formatter: dateFormatter, formatter: dateFormatter,
detail: { detail: {
@ -341,6 +331,17 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 180 width: 180
} }
}, },
{
label: '财务凭证号',
field: 'voucherNumber',
sort: 'custom',
table: {
width: 180,
},
isTable:true,
sortTableDefault:6,
isForm: false
},
{ {
label: '业务类型', label: '业务类型',
field:'businessType', field:'businessType',
@ -899,7 +900,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
} }
}, },
{ {
label: '凭证号', label: '财务凭证号',
field: 'voucherNumber', field: 'voucherNumber',
sort: 'custom', sort: 'custom',
table: { table: {

Loading…
Cancel
Save