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 6 months ago
parent
commit
3efa19d53b
  1. 2
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
  2. 2
      src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
  3. 2
      src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
  4. 2
      src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue

2
src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue

@ -203,7 +203,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
setV['customerDockCode'] = val[0]['customerDockCode'] setV['customerDockCode'] = val[0]['customerDockCode']
// //
DeliverRecordDetailApi.getDeliverRecordDetailPage({masterId:val[0]['id']}) DeliverRecordDetailApi.getDeliverRecordDetailPage({masterId:val[0]['masterId']})
.then(res => { .then(res => {
res.list.forEach(obj => { res.list.forEach(obj => {

2
src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue

@ -57,7 +57,7 @@
:allSchemas="UnplannedissueRecordMain.allSchemas" :allSchemas="UnplannedissueRecordMain.allSchemas"
:detailAllSchemas="UnplannedissueRecordDetail.allSchemas" :detailAllSchemas="UnplannedissueRecordDetail.allSchemas"
:detailAllSchemasRules="UnplannedissueRecordDetailRules" :detailAllSchemasRules="UnplannedissueRecordDetailRules"
:apiPage="UnplannedissueRecordDetailApi.getUnplannedissueRecordDetailPage" :apiPage="UnplannedissueRecordDetailApi.getUnplannedissueRecordDetailPageSpare"
/> />
</template> </template>

2
src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue

@ -69,7 +69,7 @@
:detailAllSchemasRules="UnplannedissueRequestDetailRules" :detailAllSchemasRules="UnplannedissueRequestDetailRules"
:apiCreate="UnplannedissueRequestDetailApi.createUnplannedissueRequestDetail" :apiCreate="UnplannedissueRequestDetailApi.createUnplannedissueRequestDetail"
:apiUpdate="UnplannedissueRequestDetailApi.updateUnplannedissueRequestDetail" :apiUpdate="UnplannedissueRequestDetailApi.updateUnplannedissueRequestDetail"
:apiPage="UnplannedissueRequestDetailApi.getUnplannedissueRequestDetailPage" :apiPage="UnplannedissueRequestDetailApi.getUnplannedissueRequestDetailPageSpare"
:apiDelete="UnplannedissueRequestDetailApi.deleteUnplannedissueRequestDetail" :apiDelete="UnplannedissueRequestDetailApi.deleteUnplannedissueRequestDetail"
:Echo="Echo" :Echo="Echo"
@searchTableSuccessDetail="searchTableSuccessDetail" @searchTableSuccessDetail="searchTableSuccessDetail"

2
src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue

@ -280,7 +280,7 @@ const buttonTableClick = async (val, row) => {
} }
const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
const src = ref(BASE_URL + '/jmreport/view/954878108028801024?token=' + getAccessToken()) const src = ref(BASE_URL + '/jmreport/view/955350408322154496?token=' + getAccessToken())
const handleDocumentPrint = async (row) => { const handleDocumentPrint = async (row) => {
window.open(src.value+'&id='+row.masterId) window.open(src.value+'&id='+row.masterId)
} }

Loading…
Cancel
Save