|
@@ -105,6 +105,7 @@
|
|
|
</el-link>
|
|
</el-link>
|
|
|
</template>
|
|
</template>
|
|
|
</el-popconfirm>
|
|
</el-popconfirm>
|
|
|
|
|
+
|
|
|
<el-link
|
|
<el-link
|
|
|
type="primary"
|
|
type="primary"
|
|
|
:underline="false"
|
|
:underline="false"
|
|
@@ -114,6 +115,15 @@
|
|
|
>
|
|
>
|
|
|
创建发货单
|
|
创建发货单
|
|
|
</el-link>
|
|
</el-link>
|
|
|
|
|
+ <el-link
|
|
|
|
|
+ type="primary"
|
|
|
|
|
+ :underline="false"
|
|
|
|
|
+ icon="el-icon-edit"
|
|
|
|
|
+ @click="creatReturnGoods('entrustedReceive', row)"
|
|
|
|
|
+ v-if="[2].includes(row.reviewStatus)"
|
|
|
|
|
+ >
|
|
|
|
|
+ 创建退货单
|
|
|
|
|
+ </el-link>
|
|
|
</template>
|
|
</template>
|
|
|
</ele-pro-table>
|
|
</ele-pro-table>
|
|
|
</div>
|
|
</div>
|
|
@@ -143,6 +153,11 @@
|
|
|
content="是否确定删除?"
|
|
content="是否确定删除?"
|
|
|
@done="commitBtn"
|
|
@done="commitBtn"
|
|
|
/>
|
|
/>
|
|
|
|
|
+
|
|
|
|
|
+ <addReturnGoodsDialog
|
|
|
|
|
+ ref="addReturnGoodsRef"
|
|
|
|
|
+ @done="reload"
|
|
|
|
|
+ ></addReturnGoodsDialog>
|
|
|
<process-submit-dialog
|
|
<process-submit-dialog
|
|
|
:isNotNeedProcess="false"
|
|
:isNotNeedProcess="false"
|
|
|
:processSubmitDialogFlag.sync="processSubmitDialogFlag"
|
|
:processSubmitDialogFlag.sync="processSubmitDialogFlag"
|
|
@@ -164,16 +179,18 @@
|
|
|
import {
|
|
import {
|
|
|
deleteSaleEntrustedReceiveAPI,
|
|
deleteSaleEntrustedReceiveAPI,
|
|
|
getSaleEntrustedReceivePageAPI,
|
|
getSaleEntrustedReceivePageAPI,
|
|
|
- submit,getPSaleEntrustedReceiveDetailAPI
|
|
|
|
|
|
|
+ submit,
|
|
|
|
|
+ getPSaleEntrustedReceiveDetailAPI
|
|
|
} from '@/api/saleManage/entrustedReceive';
|
|
} from '@/api/saleManage/entrustedReceive';
|
|
|
// import AddOrEditDialog from '@/views/saleManage/saleOrder/customerReturnOrder/addOrEditDialog.vue';
|
|
// import AddOrEditDialog from '@/views/saleManage/saleOrder/customerReturnOrder/addOrEditDialog.vue';
|
|
|
import addInvoiceDialog from '@/views/saleManage/saleOrder/invoice/components/addInvoiceDialog.vue';
|
|
import addInvoiceDialog from '@/views/saleManage/saleOrder/invoice/components/addInvoiceDialog.vue';
|
|
|
import processSubmitDialog from '@/BIZComponents/processSubmitDialog/processSubmitDialog.vue';
|
|
import processSubmitDialog from '@/BIZComponents/processSubmitDialog/processSubmitDialog.vue';
|
|
|
import tabMixins from '@/mixins/tableColumnsMixin';
|
|
import tabMixins from '@/mixins/tableColumnsMixin';
|
|
|
import { getWarehouseListByIds } from '@/api/purchasingManage/returnGoods';
|
|
import { getWarehouseListByIds } from '@/api/purchasingManage/returnGoods';
|
|
|
|
|
+ import addReturnGoodsDialog from '@/views/saleManage/saleOrder/returnGoods/components/addReturnGoodsDialog';
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
- mixins: [dictMixins,tabMixins],
|
|
|
|
|
|
|
+ mixins: [dictMixins, tabMixins],
|
|
|
components: {
|
|
components: {
|
|
|
processSubmitDialog,
|
|
processSubmitDialog,
|
|
|
addInvoiceDialog,
|
|
addInvoiceDialog,
|
|
@@ -182,7 +199,8 @@
|
|
|
popModal,
|
|
popModal,
|
|
|
orderDetailDialog,
|
|
orderDetailDialog,
|
|
|
addOrEditDialog,
|
|
addOrEditDialog,
|
|
|
- detailDialog
|
|
|
|
|
|
|
+ detailDialog,
|
|
|
|
|
+ addReturnGoodsDialog
|
|
|
},
|
|
},
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
@@ -300,7 +318,7 @@
|
|
|
fixed: 'right'
|
|
fixed: 'right'
|
|
|
}
|
|
}
|
|
|
],
|
|
],
|
|
|
- cacheKeyUrl:'eos-00bf7292-saleManage-entrustedReceive',
|
|
|
|
|
|
|
+ cacheKeyUrl: 'eos-00bf7292-saleManage-entrustedReceive'
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
|
computed: {},
|
|
computed: {},
|
|
@@ -314,7 +332,10 @@
|
|
|
...where
|
|
...where
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
-
|
|
|
|
|
|
|
+ //创建退货单
|
|
|
|
|
+ creatReturnGoods(type, row) {
|
|
|
|
|
+ this.$refs.addReturnGoodsRef.open('add', {}, row.id, true);
|
|
|
|
|
+ },
|
|
|
//创建收货单
|
|
//创建收货单
|
|
|
creatSendGoods(type, row) {
|
|
creatSendGoods(type, row) {
|
|
|
this.$refs.invoiceDialogRef.entrustedReceiveInit(row);
|
|
this.$refs.invoiceDialogRef.entrustedReceiveInit(row);
|
|
@@ -323,8 +344,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');
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
//新增编辑
|
|
//新增编辑
|
|
@@ -362,14 +382,12 @@
|
|
|
this.remove(dataId);
|
|
this.remove(dataId);
|
|
|
},
|
|
},
|
|
|
async sendSubmit(res) {
|
|
async sendSubmit(res) {
|
|
|
-
|
|
|
|
|
const data = await getPSaleEntrustedReceiveDetailAPI(res.id);
|
|
const data = await getPSaleEntrustedReceiveDetailAPI(res.id);
|
|
|
let storemanIds = '';
|
|
let storemanIds = '';
|
|
|
let ids = data.productList.map((item) => item.warehouseId);
|
|
let ids = data.productList.map((item) => item.warehouseId);
|
|
|
let warehouseList = await getWarehouseListByIds(ids || []);
|
|
let warehouseList = await getWarehouseListByIds(ids || []);
|
|
|
storemanIds = warehouseList.map((item) => item.ownerId);
|
|
storemanIds = warehouseList.map((item) => item.ownerId);
|
|
|
|
|
|
|
|
-
|
|
|
|
|
this.processSubmitDialogFlag = true;
|
|
this.processSubmitDialogFlag = true;
|
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
|
let params = {
|
|
let params = {
|
|
@@ -382,12 +400,10 @@
|
|
|
businessName: res.productNames,
|
|
businessName: res.productNames,
|
|
|
businessType: '受托收货'
|
|
businessType: '受托收货'
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
this.$refs.processSubmitDialogRef.init(params);
|
|
this.$refs.processSubmitDialogRef.init(params);
|
|
|
});
|
|
});
|
|
|
-
|
|
|
|
|
},
|
|
},
|
|
|
//查看详情
|
|
//查看详情
|
|
|
openorderDetail(row, type) {
|
|
openorderDetail(row, type) {
|