Browse Source

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

hella_online_20240829
陈薪名 3 months ago
parent
commit
3dc2d29bda
  1. 2
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
  2. 1988
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
  3. 2
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

2
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue

@ -329,7 +329,7 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
window.open(src.value+'&asn_number='+res)
} else {
const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
const src = ref(BASE_URL + '/jmreport/view/979553753876811776?token=' + getAccessToken())
window.open(src.value+'&asn_number='+res)
}
}).catch(err => {

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

File diff suppressed because it is too large

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

@ -16,6 +16,7 @@ const queryParams = {
pageNo: 1,
code: 'PurchaseInvoiceRequest'
}
console.log(34343)
const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
const requestsettingData = data?.list[0] || {}
@ -784,7 +785,6 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
form: {
component: 'Select',
api: () => procurementCreators.list,
value:procurementCreators?.list.length>0?procurementCreators.list[0].id:'',
componentProps: {
optionsAlias: {
labelField: 'nickname',

Loading…
Cancel
Save