Browse Source

发票

master_hella_20240701
wangyufei 4 months ago
parent
commit
2f5b4e5487
  1. 17
      src/components/Detail/src/Detail.vue
  2. 14
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
  3. 14
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
  4. 6
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
  5. 2
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

17
src/components/Detail/src/Detail.vue

@ -135,7 +135,7 @@
</div>
<!-- 附件/备注/变更记录 -->
<ContentWrap class="w-[100%]" v-show="tabsList[current].label==annexAlias.label" :style="{height:remarkHeight+'px'}">
<ContentWrap v-if="!annexAlias.hidden" class="w-[100%]" v-show="tabsList[current].label==annexAlias.label" :style="{height:remarkHeight+'px'}">
<!-- 附件组件 -->
<ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
<Annex
@ -150,7 +150,6 @@
</ElScrollbar>
</ContentWrap>
<ContentWrap class="w-[100%]" v-show="tabsList[current].label=='备注'" :style="{height:remarkHeight+'px'}">
<!-- 附件组件 -->
<ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
<!-- 备注组件 -->
<Remarks
@ -162,7 +161,6 @@
</ElScrollbar>
</ContentWrap>
<ContentWrap class="w-[100%]" v-show="tabsList[current].label=='变更记录'" :style="{height:remarkHeight+'px'}">
<!-- 附件组件 -->
<ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
<!-- 变更记录组件 -->
<ChangeRecord :changeRecordData="changeRecordData" class="mt-20px" :key="count"/>
@ -240,6 +238,7 @@ const props = defineProps({
type: Object,
required: false,
default: ()=>({
hidden:false,
label: '附件',
showDownload:false,
showPreview:false,
@ -433,7 +432,8 @@ if (props.isBasic == true) {
}
}
const otherList = [...props.annexTable,{
let otherList = [...props.annexTable,{
label:props.annexAlias.label,
prop:'Annex'
},{
@ -443,6 +443,15 @@ const otherList = [...props.annexTable,{
label:'变更记录',
prop:'ChangeRecord'
}]
if(props.annexAlias.hidden){
otherList = [...props.annexTable,{
label:'备注',
prop:'Remarks'
},{
label:'变更记录',
prop:'ChangeRecord'
}]
}
tabsList.value = [...tabsList?.value,...otherList]
if (!tabsList.value || tabsList.value && tabsList.value.length == otherList.length) {

14
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue

@ -88,8 +88,19 @@
queryField:'tableId',
rowField:'annexMasterId',
}],
},{
label: t('ts.其他附件'),
prop: 'Annex',
tableName:'invoiceOther',
showDownload:true,
hiddenDelete:true,
queryParams:[{
queryField:'tableId',
rowField:'annexMasterId',
}],
}]"
:annexAlias="{
hidden:true,
label:t('ts.其他附件'),
showDownload:true,
hiddenDelete:true
@ -224,6 +235,9 @@ const openDetail = async (row: any, titleName: any, titleValue: any) => {
detailRef.value.openDetail(row, titleName, titleValue)
}
const searchList = (model)=>{
if(model.postingDate){
model.postingDate[1] = model.postingDate[1].replace('00:00:00','23:59:59')
}
selectionRows.value = []
setSearchParams(model)
}

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

@ -14,6 +14,18 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 180,
fixed: 'left'
},
isSearch: false
},
{
label: '发票申请单号',
field:'requestNumber',
sort: 'custom',
table: {
width: 180,
fixed: 'left'
},
sortSearchDefault:1,
sortTableDefault:1,
isSearch: true
},
{
@ -368,7 +380,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
value:[],
component: 'DatePicker',
componentProps: {
valueFormat: 'x',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
dateFormat: 'YYYY-MM-DD',
type: 'daterange',
defaultTime: [new Date('1 '), new Date('1 ')]

6
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@ -137,6 +137,7 @@
fieldTableColumn="poLine"
:annexTable="detailAnnexTable"
:annexAlias="{
hidden:true,
label:t('ts.其他附件')
}"
:otherHeadButttonData="[{
@ -645,6 +646,11 @@ const handleImport = () => {
prop: 'Annex',
tableName:'waybill',
fileSize:20
},{
label: t('ts.其他附件'),
prop: 'Annex',
tableName:'invoiceOther',
fileSize:20
}])
const openDetail = (row : any, titleName : any, titleValue : any) => {
const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name

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

@ -1045,7 +1045,7 @@ export const SupplierinvoiceRequestFinance = useCrudSchemas(reactive<CrudSchema[
style: {width:'100%'},
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
}
},
},

Loading…
Cancel
Save