|
@@ -157,7 +157,7 @@
|
|
|
import searchTable from './components/searchTable.vue';
|
|
import searchTable from './components/searchTable.vue';
|
|
|
import addOrEditDialog from './components/addOrEditDialog.vue';
|
|
import addOrEditDialog from './components/addOrEditDialog.vue';
|
|
|
import popModal from '@/components/pop-modal';
|
|
import popModal from '@/components/pop-modal';
|
|
|
- import { reviewStatus} from '@/enum/dict';
|
|
|
|
|
|
|
+ import { reviewStatus } from '@/enum/dict';
|
|
|
|
|
|
|
|
import detailDialog from './components/detailDialog.vue';
|
|
import detailDialog from './components/detailDialog.vue';
|
|
|
|
|
|
|
@@ -174,9 +174,10 @@
|
|
|
import { getPurchaseOutSourceSendDetailAPI } from '@/api/purchasingManage/outSourceSend';
|
|
import { getPurchaseOutSourceSendDetailAPI } from '@/api/purchasingManage/outSourceSend';
|
|
|
import { getWarehouseOutStock } from '@/api/saleManage/saleorder';
|
|
import { getWarehouseOutStock } from '@/api/saleManage/saleorder';
|
|
|
import tabMixins from '@/mixins/tableColumnsMixin';
|
|
import tabMixins from '@/mixins/tableColumnsMixin';
|
|
|
|
|
+ import { getWarehouseListByIds } from '@/api/purchasingManage/returnGoods';
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
- mixins: [dictMixins,tabMixins],
|
|
|
|
|
|
|
+ mixins: [dictMixins, tabMixins],
|
|
|
components: {
|
|
components: {
|
|
|
processSubmitDialog,
|
|
processSubmitDialog,
|
|
|
addInvoiceDialog,
|
|
addInvoiceDialog,
|
|
@@ -295,7 +296,7 @@
|
|
|
fixed: 'right'
|
|
fixed: 'right'
|
|
|
}
|
|
}
|
|
|
],
|
|
],
|
|
|
- cacheKeyUrl:'eos-aba18b2f-purchaseOrder-outSourceSend'
|
|
|
|
|
|
|
+ cacheKeyUrl: 'eos-aba18b2f-purchaseOrder-outSourceSend'
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
|
computed: {},
|
|
computed: {},
|
|
@@ -318,8 +319,7 @@
|
|
|
/* 刷新表格 */
|
|
/* 刷新表格 */
|
|
|
reload(where) {
|
|
reload(where) {
|
|
|
this.$refs.table.reload({ page: 1, where });
|
|
this.$refs.table.reload({ page: 1, where });
|
|
|
- this.$emit('getToDoReminder')
|
|
|
|
|
-
|
|
|
|
|
|
|
+ this.$emit('getToDoReminder');
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
//新增编辑
|
|
//新增编辑
|
|
@@ -379,7 +379,6 @@
|
|
|
async sendSubmit(res) {
|
|
async sendSubmit(res) {
|
|
|
const data = await getPurchaseOutSourceSendDetailAPI(res.id);
|
|
const data = await getPurchaseOutSourceSendDetailAPI(res.id);
|
|
|
const tabName = await this.warehouseOutStock(data);
|
|
const tabName = await this.warehouseOutStock(data);
|
|
|
- console.log(tabName);
|
|
|
|
|
|
|
|
|
|
if (tabName.filter((item) => !item.is).length > 0) {
|
|
if (tabName.filter((item) => !item.is).length > 0) {
|
|
|
this.$message.error(
|
|
this.$message.error(
|
|
@@ -388,7 +387,10 @@
|
|
|
);
|
|
);
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ let storemanIds = '';
|
|
|
|
|
+ let ids = data.productList.map((item) => item.warehouseId);
|
|
|
|
|
+ let warehouseList = await getWarehouseListByIds(ids || []);
|
|
|
|
|
+ storemanIds = warehouseList.map((item) => item.ownerId);
|
|
|
this.processSubmitDialogFlag = true;
|
|
this.processSubmitDialogFlag = true;
|
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
|
let params = {
|
|
let params = {
|
|
@@ -398,14 +400,13 @@
|
|
|
variables: {
|
|
variables: {
|
|
|
businessCode: res.code,
|
|
businessCode: res.code,
|
|
|
businessName: res.supplierName,
|
|
businessName: res.supplierName,
|
|
|
- businessType: '委外发货单'
|
|
|
|
|
|
|
+ businessType: '委外发货单',
|
|
|
|
|
+ storemanIds: storemanIds.toString()
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
this.$refs.processSubmitDialogRef.init(params);
|
|
this.$refs.processSubmitDialogRef.init(params);
|
|
|
});
|
|
});
|
|
|
-
|
|
|
|
|
},
|
|
},
|
|
|
//查看详情
|
|
//查看详情
|
|
|
openorderDetail(row, type) {
|
|
openorderDetail(row, type) {
|