diff --git a/src/api/emis/emisSupplier.js b/src/api/emis/emisSupplier.js index 324db1d7..235bfeb0 100644 --- a/src/api/emis/emisSupplier.js +++ b/src/api/emis/emisSupplier.js @@ -18,6 +18,14 @@ export function listSimpleEmisSupplier(query) { }) } +export function chooseSupplier(query) { + return request({ + url: '/emis/emisSupplier/chooseSupplier', + method: 'get', + params: query + }) +} + // 查询公司供应商表详细 export function getEmisSupplier(id) { return request({ diff --git a/src/api/emis/emisTmsSiteBatch.js b/src/api/emis/emisTmsSiteBatch.js index 19b06390..fddf6c9e 100644 --- a/src/api/emis/emisTmsSiteBatch.js +++ b/src/api/emis/emisTmsSiteBatch.js @@ -46,6 +46,14 @@ export function addAllEmisTmsSiteBatch(data) { }) } +export function batchEdit(data) { + return request({ + url: '/emis/emisTmsSiteBatch/batchEdit', + method: 'put', + data: data + }) +} + // 修改一级网点TMS组批次 export function updateEmisTmsSiteBatch(data) { return request({ diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue index 30e5c8c9..5a558873 100644 --- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue +++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue @@ -89,7 +89,7 @@ - + @@ -381,6 +381,7 @@ import moment from 'moment' import PackListView from '@/views/emis/emisTmsSiteBatch/packListView'; import EmisSupplierPicker from '@/views/emis/EmisBaseTools/EmisSupplierPicker'; +import EmisTmsSiteBatchSupplierPicker from '@/views/emis/EmisBaseTools/EmisTmsSiteBatchSupplierPicker'; export default { name: "BigBatchEditForm", @@ -398,7 +399,7 @@ export default { }, }, - components: { EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker, PackListView,EmisSupplierPicker}, + components: { EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker, PackListView,EmisSupplierPicker,EmisTmsSiteBatchSupplierPicker}, dicts: ['emis_waybill_status', 'emis_payment_type', 'emis_biz_shipping_method', 'emis_qujian_fangshi', 'cebp_return_status','emis_declare_mode','emis_customs_clear','emis_big_batch_type'], data() { return { diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue index 17989427..a74fc085 100644 --- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue +++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue @@ -135,7 +135,16 @@ :disabled="single" @click="handleUpdate" v-hasPermi="['emis:emisTmsSiteBatch:edit']" - >修改批次 + >修改 + 批量修改 批量导入 + + + + + @@ -268,6 +282,7 @@ import EmisSupplierPicker from '@/views/emis/EmisBaseTools/EmisSupplierPicker'; import SysUserSimplePicker from '@/views/emis/EmisBaseTools/SysUserSimplePicker.vue'; import BatchImportSiteBatch from '@/views/emis/emisTmsSiteBatch/panel/BatchImportSiteBatch.vue'; +import BatchSiteBatchUpdateForm from '@/views/emis/emisTmsSiteBatch/panel/BatchSiteBatchUpdateForm.vue'; @@ -276,7 +291,7 @@ export default { components: { EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker, PackListView,SysUserSimplePicker, - EmisSupplierPicker,BatchImportSiteBatch + EmisSupplierPicker,BatchImportSiteBatch,BatchSiteBatchUpdateForm }, dicts: [ 'emis_waybill_status', 'emis_payment_type', 'emis_biz_shipping_method', 'emis_qujian_fangshi', 'cebp_return_status','emis_declare_mode','emis_customs_clear','emis_big_batch_type' @@ -325,6 +340,9 @@ export default { }, + openBatchUpdateForm:false, + titleBatchForm: "", + openBatch: false, titleBatch: "", formBatchBillList:"", @@ -533,6 +551,20 @@ export default { }).catch(() => {}); }, + /** 修改按钮操作 */ + handleBatchUpdate(row) { + // this.currentId= row.id; + this.openBatchUpdateForm = true; + this.titleBatchForm = "批量修改"; + }, + handleBatchFormChanged(){ + this.openBatchUpdateForm = false; + this.getList(); + }, + cancelBatchForm(){ + this.openBatchUpdateForm = false; + }, + /** 修改按钮操作 */ handleUpdate() { // let id = this.ids[0] diff --git a/src/views/emis/emisTmsSiteBatchMiss/index.vue b/src/views/emis/emisTmsSiteBatchMiss/index.vue index 3469b166..7a61c8a4 100644 --- a/src/views/emis/emisTmsSiteBatchMiss/index.vue +++ b/src/views/emis/emisTmsSiteBatchMiss/index.vue @@ -89,7 +89,7 @@ ref="refTable" row-key="id" - storageName="emisTmsSiteBatchMissList_main_240706" + storageName="emisTmsSiteBatchMissList_main_240708" size="small" :data="emisTmsSiteBatchMissList" @@ -127,7 +127,12 @@ - + + + +