diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityRefundsExchangesController.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityRefundsExchangesController.java index 6116a10e..f34df9e6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityRefundsExchangesController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityRefundsExchangesController.java @@ -329,4 +329,27 @@ public class QualityRefundsExchangesController extends BaseController } + /** + * 入库前退换货单-确认供应商-已有退换货 + */ + @GetMapping("/beforeHasConfirmSupplier/{refundsExchangesId}") + public String beforeHasConfirmSupplier(@PathVariable("refundsExchangesId") Long refundsExchangesId, ModelMap mmap) + { + QualityRefundsExchanges qualityRefundsExchanges = qualityRefundsExchangesService.selectQualityRefundsExchangesById(refundsExchangesId); + mmap.put("qualityRefundsExchanges", qualityRefundsExchanges); + return prefix + "/beforeHasConfirmSupplier"; + } + + /** + * 保存入库前退换货单-确认供应商-已有退换货 + */ + @RequiresPermissions("quality:refundsExchanges:beforeHasConfirmSupplier") + @Log(title = "品质管理退换货单", businessType = BusinessType.UPDATE) + @PostMapping("/beforeHasConfirmSupplier") + @ResponseBody + public AjaxResult beforeHasConfirmSupplierSave(QualityRefundsExchanges qualityRefundsExchanges) + { + return toAjax(qualityRefundsExchangesService.returnBeforeStorageDetail(qualityRefundsExchanges)); + } + } diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeHasConfirmSupplier.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeHasConfirmSupplier.html new file mode 100644 index 00000000..cc46d8d5 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeHasConfirmSupplier.html @@ -0,0 +1,191 @@ + + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ +
+
+
+
+
+ + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/refundsExchanges.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/refundsExchanges.html index 1cc91cce..871e1231 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/refundsExchanges.html +++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/refundsExchanges.html @@ -82,7 +82,10 @@ var closingProceduresFlag = [[${@permission.hasPermi('quality:refundsExchanges:closingProcedures')}]]; var returnBeforeStorageDetailFlag = [[${@permission.hasPermi('quality:refundsExchanges:returnBeforeStorageDetail')}]]; - var returnAfterStorageDetailFlag = [[${@permission.hasPermi('quality:refundsExchanges:returnAfterStorageDetailFlag')}]]; + var returnAfterStorageDetailFlag = [[${@permission.hasPermi('quality:refundsExchanges:returnAfterStorageDetail')}]]; + + var beforeHasConfirmSupplierFlag = [[${@permission.hasPermi('quality:refundsExchanges:beforeHasConfirmSupplier')}]]; + var refundsExchangesStatusDatas = [[${@dict.getType('refunds_exchanges_status')}]]; var qualityWarehouseStatusDatas = [[${@dict.getType('quality_warehouse_status')}]]; @@ -198,6 +201,10 @@ if (row.qualityReturnNode == 1){ actions.push('详情 '); } + /*入库前退换货-确认供应商-已有供应商*/ + if (row.qualityReturnNode == 0){ + actions.push('确认供应商 '); + } return actions.join(''); } @@ -224,6 +231,8 @@ var url = ctx + 'quality/refundsExchanges/closingProcedures/' +refundsExchangesId; $.modal.open("结案",url); } + + /*添加退货单*/ function add() { var rows = $("#bootstrap-table").bootstrapTable('getSelections'); console.log("rows" + rows); @@ -244,6 +253,12 @@ }; + /*入库前退货-确认供应商-已经-有供应商*/ + function beforeHasConfirmSupplier(refundsExchangesId){ + var url = ctx + 'quality/refundsExchanges/beforeHasConfirmSupplier/' + refundsExchangesId; + $.modal.open("确认供应商",url); + } + \ No newline at end of file