feat:质检单转采购退货和采购入库功能完成

fc534061 · LAPTOP-UV1MNL38\18023 · 07d1fa03 · fc534061 · fc534061 · fc534061
5 changed file
--- a/erp/src/main/resources/template/js/purchaseDeliveryNote/deliveryToPut.js
+++ b/erp/src/main/resources/template/js/purchaseDeliveryNote/deliveryToPut.js
@@ -17,36 +17,36 @@ layui.config({

    // 到货单转采购入库
    AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryPurchaseDeliveryTransPurchasePutById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
-            let data = json.bean;
-            // 采购入库的【编辑布局】
-            dsFormUtil.initEditPageForStatic('content', 'FP2023042300002', data, {
-                savePreParams: function (params) {
-                    params.holderId=data.holderId
-                    params.holderKey=data.holderKey
-                },
-                saveData: function (params) {
-                    // 保存数据
-                    AjaxPostUtil.request({url: sysMainMation.erpBasePath + "deliveryToPurchasePut", params: params, type: 'json', method: "POST", callback: function(json) {
-                            parent.layer.close(index);
-                            parent.refreshCode = '0';
-                        }});
-                },
-                loadComponentCallback: function () {
-                    $("div[controlType='supplier']").remove();
-                    $("div[controlType='purchaseOrderFromType']").remove();
-                },
-                tableAddRowCallback: function (tableId) {
-                    $("#addRow" + tableId).remove();
-                    $("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".amountOfMoney").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".taxRate").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".taxMoney").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
-                }
-            });
-        }});
+        let data = json.bean;
+        // 采购入库的【编辑布局】
+        dsFormUtil.initEditPageForStatic('content', 'FP2023042300002', data, {
+            savePreParams: function (params) {
+                params.holderId=data.holderId
+                params.holderKey=data.holderKey
+            },
+            saveData: function (params) {
+                // 保存数据
+                AjaxPostUtil.request({url: sysMainMation.erpBasePath + "deliveryToPurchasePut", params: params, type: 'json', method: "POST", callback: function(json) {
+                        parent.layer.close(index);
+                        parent.refreshCode = '0';
+                    }});
+            },
+            loadComponentCallback: function () {
+                $("div[controlType='supplier']").remove();
+                $("div[controlType='purchasePutFromType']").remove();
+            },
+            tableAddRowCallback: function (tableId) {
+                $("#addRow" + tableId).remove();
+                $("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".amountOfMoney").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".taxRate").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".taxMoney").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
+            }
+        });
+    }});

 });
\ No newline at end of file
--- a/erp/src/main/resources/template/js/purchaseDeliveryNote/deliveryToQualityInspection.js
+++ b/erp/src/main/resources/template/js/purchaseDeliveryNote/deliveryToQualityInspection.js
@@ -17,38 +17,38 @@ layui.config({

    // 到货单转质检单
    AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryPurchaseDeliveryTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
-            let data = json.bean;
-            // 采购质检的【编辑布局】
-            data.qualityInspectionItemList = data.erpOrderItemList
-            dsFormUtil.initEditPageForStatic('content', 'FP2024061300002', data, {
-                savePreParams: function (params) {
-                    params.holderId=data.holderId
-                    params.holderKey=data.holderKey
-                },
-                saveData: function (params) {
-                    // 保存数据
-                    AjaxPostUtil.request({url: sysMainMation.erpBasePath + "deliveryToQualityInspection", params: params, type: 'json', method: "POST", callback: function(json) {
-                            parent.layer.close(index);
-                            parent.refreshCode = '0';
-                        }});
-                },
-                loadComponentCallback: function () {
-                    $("div[controlType='qualityInspectionFromType']").remove();
-                },
-                tableAddRowCallback: function (tableId) {
-                    $("#addRow" + tableId).remove();
-                    $("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".amountOfMoney").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".taxRate").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".taxMoney").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".qualityInspectionType").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".qualityInspectionRatio").prop('disabled', true);
-                }
-            });
-        }});
+        let data = json.bean;
+        // 采购质检的【编辑布局】
+        data.qualityInspectionItemList = data.erpOrderItemList
+        dsFormUtil.initEditPageForStatic('content', 'FP2024061300002', data, {
+            savePreParams: function (params) {
+                params.holderId=data.holderId
+                params.holderKey=data.holderKey
+            },
+            saveData: function (params) {
+                // 保存数据
+                AjaxPostUtil.request({url: sysMainMation.erpBasePath + "deliveryToQualityInspection", params: params, type: 'json', method: "POST", callback: function(json) {
+                    parent.layer.close(index);
+                    parent.refreshCode = '0';
+                }});
+            },
+            loadComponentCallback: function () {
+                $("div[controlType='qualityInspectionFromType']").remove();
+            },
+            tableAddRowCallback: function (tableId) {
+                $("#addRow" + tableId).remove();
+                $("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".amountOfMoney").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".taxRate").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".taxMoney").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".qualityInspectionType").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".qualityInspectionRatio").prop('disabled', true);
+            }
+        });
+    }});

 });
\ No newline at end of file
--- a/erp/src/main/resources/template/js/purchaseQualityInspection/qualityInspectionToPut.js
+++ b/erp/src/main/resources/template/js/purchaseQualityInspection/qualityInspectionToPut.js
@@ -17,37 +17,38 @@ layui.config({

    // 质检单转采购入库
    AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryQualityInspectionTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
-            let data = json.bean;
-            data.erpOrderItemList=data.qualityInspectionItemList
-            // 采购入库的【编辑布局】
-            dsFormUtil.initEditPageForStatic('content', 'FP2023042300002', data, {
-                savePreParams: function (params) {
-                    // params.holderId=data.holderId
-                    // params.holderKey=data.holderKey
-                },
-                saveData: function (params) {
-                    // 保存数据
-                    AjaxPostUtil.request({url: sysMainMation.erpBasePath + "qualityInspectionToPurchasePut", params: params, type: 'json', method: "POST", callback: function(json) {
-                            parent.layer.close(index);
-                            parent.refreshCode = '0';
-                        }});
-                },
-                loadComponentCallback: function () {
-                    // $("div[controlType='supplier']").remove();
-                    // $("div[controlType='purchaseOrderFromType']").remove();
-                },
-                tableAddRowCallback: function (tableId) {
-                    $("#addRow" + tableId).remove();
-                    $("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".amountOfMoney").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".taxRate").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".taxMoney").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
-                    $("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
-                }
-            });
-        }});
+        let data = json.bean;
+        data.erpOrderItemList=data.qualityInspectionItemList
+        console.log(data)
+        // 采购入库的【编辑布局】
+        dsFormUtil.initEditPageForStatic('content', 'FP2023042300002', data, {
+            savePreParams: function (params) {
+                params.holderId=data.holderId
+                params.holderKey=data.holderKey
+            },
+            saveData: function (params) {
+                // 保存数据
+                AjaxPostUtil.request({url: sysMainMation.erpBasePath + "qualityInspectionToPurchasePut", params: params, type: 'json', method: "POST", callback: function(json) {
+                    parent.layer.close(index);
+                    parent.refreshCode = '0';
+                }});
+            },
+            loadComponentCallback: function () {
+                $("div[controlType='supplier']").remove();
+                $("div[controlType='purchasePutFromType']").remove();
+            },
+            tableAddRowCallback: function (tableId) {
+                $("#addRow" + tableId).remove();
+                $("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".amountOfMoney").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".taxRate").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".taxMoney").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
+            }
+        });
+    }});

 });
\ No newline at end of file
--- a/erp/src/main/resources/template/js/purchaseQualityInspection/qualityInspectionToReturns.js
+++ b/erp/src/main/resources/template/js/purchaseQualityInspection/qualityInspectionToReturns.js
+
+// 以下两个参数开启团队权限时有值
+var objectId = '', objectKey = '';
+// 根据以下两个参数判断：工作流的判断是否要根据serviceClassName的判断
+var serviceClassName;
+
+layui.config({
+    base: basePath,
+    version: skyeyeVersion
+}).extend({
+    window: 'js/winui.window'
+}).define(['window', 'table', 'jquery'], function (exports) {
+    winui.renderColor();
+    var index = parent.layer.getFrameIndex(window.name);
+    var $ = layui.$;
+    var id = GetUrlParam("id");
+
+    // 质检单转退货单
+    AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryQualityInspectionTransReturnById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
+        let data = json.bean;
+        data.erpOrderItemList=data.qualityInspectionItemList
+        // 采购退货的【编辑布局】
+        dsFormUtil.initEditPageForStatic('content', 'FP2023042400002', data, {
+            savePreParams: function (params) {
+                params.holderId=data.holderId
+                params.holderKey=data.holderKey
+            },
+            saveData: function (params) {
+                // 保存数据
+                AjaxPostUtil.request({url: sysMainMation.erpBasePath + "qualityInspectionToPurchaseReturn", params: params, type: 'json', method: "POST", callback: function(json) {
+                    parent.layer.close(index);
+                    parent.refreshCode = '0';
+                }});
+            },
+            loadComponentCallback: function () {
+                $("div[controlType='supplier']").remove();
+                $("div[controlType='purchaseReturnsFromType']").remove();
+            },
+            tableAddRowCallback: function (tableId) {
+                $("#addRow" + tableId).remove();
+                $("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".amountOfMoney").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".taxRate").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".taxMoney").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
+            }
+        });
+    }});
+
+});
\ No newline at end of file
--- a/erp/src/main/resources/template/tpl/purchaseQualityInspection/qualityInspectionToReturns.html
+++ b/erp/src/main/resources/template/tpl/purchaseQualityInspection/qualityInspectionToReturns.html
 <!DOCTYPE html>
-<html lang="en">
+<html>
 <head>
    <meta charset="UTF-8">
-    <title>Title</title>
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
 </head>
 <body>
+<div style="margin:0 auto;padding:20px;">
+    <form class="layui-form" action="" id="showForm" autocomplete="off">
+        <div id="content"></div>
+        <div class="layui-form-item layui-col-xs12">
+            <div class="layui-input-block">
+                <button class="winui-btn" type="button" id="cancle"><language showName="com.skyeye.cancel"></language></button>
+                <button class="winui-btn" lay-submit lay-filter="formSaveDraft" id="formSaveDraft">保存为草稿</button>`
+                <button class="winui-btn" lay-submit lay-filter="formWriteBean" id="formWriteBean">提交</button>
+            </div>
+        </div>
+    </form>
+</div>

+<script src="../../assets/lib/layui/layui.js"></script>
+<script src="../../assets/lib/layui/custom.js"></script>
+<script type="text/javascript">
+    layui.config({base: '../../js/purchaseQualityInspection/'}).use('qualityInspectionToReturns');
+</script>
 </body>
 </html>
\ No newline at end of file