Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server

api/src/main/resources/template/js/apiPage/apiPage.js

@@ -117,7 +117,7 @@ layui.config({
 		$.each(jsonList, function(i, item) {
 			// 获取当前接口所属模块的下标
 			var thisModelIndex = getModelIndex(model, item.modelName);
-			if(model[thisModelIndex].id === modelId){
+			if (model[thisModelIndex].id === modelId) {
 				var groupName = "未分类接口";
 				if (!isNull(item.groupName)) {
 					groupName = item.groupName;

erp-produce/src/main/resources/template/js/erpPick/erpPickToOut.js

@@ -16,7 +16,7 @@ layui.config({
     var id = GetUrlParam("id");
 
     // 领料出库单转仓库出库
-    AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryRequisitionOutLetList", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
+    AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryRequisitionOutLetsTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
             let data = json.bean;
             // 仓库出库的【编辑布局】
             dsFormUtil.initEditPageForStatic('content', 'FP2024070100006', data, {

erp-produce/src/main/resources/template/js/erpPick/erpReturnPickToPut.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 + "queryReturnPutTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
+            let data = json.bean;
+            console.log(data)
+            // 仓库入库的【编辑布局】
+            dsFormUtil.initEditPageForStatic('content', 'FP2024070100009', data, {
+                savePreParams: function (params) {
+                    params.holderId=data.holderId
+                    params.holderKey=data.holderKey
+                },
+                saveData: function (params) {
+                    // 保存数据
+                    AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertReturnPutToTurnDepot", params: params, type: 'json', method: "POST", callback: function(json) {
+                            parent.layer.close(index);
+                            parent.refreshCode = '0';
+                        }});
+                },
+                loadComponentCallback: function () {
+                    $("select[attrkey='holderIdType']").prop('disabled', true);
+                    $("select[attrkey='holderIdType']").parent().next().children('i').remove();
+                    $("div[controlType='depotPutFromType']").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(".warehouse").prop('disabled', true);
+                }
+            });
+        }});
+
+});
\ No newline at end of file

erp-produce/src/main/resources/template/tpl/erpPick/erpReturnPickToPut.html

+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <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/erpPick/'}).use('erpReturnPickToPut');
+</script>
+</body>
+</html>
\ No newline at end of file

erp/src/main/resources/template/js/depotOut/list.js

@@ -31,7 +31,7 @@ layui.config({
                 }
                 return str;
             }},
-            { field: 'fromTypeId', title: '单据类型', width: 120, templet: function (d) {
+            { field: 'fromTypeId', title: '来源单据类型', width: 120, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotOutFromType", 'id', d.fromTypeId, 'name');
             }},
             { field: 'createName', title: '申请人', width: 120 },

erp/src/main/resources/template/js/depotOut/transList.js

@@ -110,7 +110,7 @@ layui.config({
         let pageUrl = '';
         let type = idKeyToIdMap[data.idKey];
         if (type == 1) {
-            // 采购退货单purchaseReturnToOut
+            // 采购退货单
             pageUrl = '../../tpl/purchaseReturns/purchaseReturnToOut.html';
         } else if (type == 2) {
             // 销售出库单

erp/src/main/resources/template/js/depotPut/list.js

@@ -31,7 +31,7 @@ layui.config({
                 }
                 return str;
             }},
-            { field: 'idKey', title: '单据类型', width: 120, templet: function (d) {
+            { field: 'idKey', title: '来源单据类型', width: 120, templet: function (d) {
                     return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotPutFromType", 'id', d.fromTypeId, 'name');
             }},
             { field: 'createName', title: '申请人', width: 120 },

erp/src/main/resources/template/js/depotPut/transList.js

@@ -114,16 +114,16 @@ layui.config({
             pageUrl = '../../tpl/purchasePut/purchasePutToPut.html';
         } else if (type == 2) {
             // 销售退货单
-            pageUrl = '';
+            pageUrl = '../../tpl/salesReturns/salesReturnsToPut.html';
         } else if (type == 3) {
             // 零售退货单
-            pageUrl = '';
+            pageUrl = '../../tpl/retailReturns/retailReturnsToPut.html';
         } else if (type == 4) {
             // 其他入库单
-            pageUrl = '';
+            pageUrl = '../../tpl/otherWarehous/otherWarehousToPut.html';
         } else if (type == 5) {
             // 退料入库单
-            pageUrl = '';
+            pageUrl = '../../tpl/erpPick/erpReturnPickToPut.html';
         } else if (type == 6) {
             // 物料退货单
             pageUrl = '';

erp/src/main/resources/template/js/otherWarehous/otherWarehousToPut.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 + "queryOtherWareHousTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
+            let data = json.bean;
+            console.log(data)
+            // 仓库入库的【编辑布局】
+            dsFormUtil.initEditPageForStatic('content', 'FP2024070100009', data, {
+                savePreParams: function (params) {
+                    params.holderId=data.holderId
+                    params.holderKey=data.holderKey
+                },
+                saveData: function (params) {
+                    // 保存数据
+                    AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertOtherWareHousToTurnDepot", params: params, type: 'json', method: "POST", callback: function(json) {
+                            parent.layer.close(index);
+                            parent.refreshCode = '0';
+                        }});
+                },
+                loadComponentCallback: function () {
+                    $("select[attrkey='holderIdType']").prop('disabled', true);
+                    $("select[attrkey='holderIdType']").parent().next().children('i').remove();
+                    $("div[controlType='depotPutFromType']").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(".warehouse").prop('disabled', true);
+                }
+            });
+        }});
+
+});
\ No newline at end of file

erp/src/main/resources/template/js/retailReturns/retailReturnsToPut.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 + "queryRetailReturnsTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
+            let data = json.bean;
+            console.log(data)
+            // 仓库入库的【编辑布局】
+            dsFormUtil.initEditPageForStatic('content', 'FP2024070100009', data, {
+                savePreParams: function (params) {
+                    params.holderId=data.holderId
+                    params.holderKey=data.holderKey
+                },
+                saveData: function (params) {
+                    // 保存数据
+                    AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertRetailReturnsToTurnDepot", params: params, type: 'json', method: "POST", callback: function(json) {
+                            parent.layer.close(index);
+                            parent.refreshCode = '0';
+                        }});
+                },
+                loadComponentCallback: function () {
+                    $("select[attrkey='holderIdType']").prop('disabled', true);
+                    $("select[attrkey='holderIdType']").parent().next().children('i').remove();
+                    $("div[controlType='depotPutFromType']").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(".warehouse").prop('disabled', true);
+                }
+            });
+        }});
+
+});
\ No newline at end of file

erp/src/main/resources/template/js/salesReturns/salesReturnsToPut.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 + "querySalesReturnsTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
+            let data = json.bean;
+            // 仓库入库的【编辑布局】
+            dsFormUtil.initEditPageForStatic('content', 'FP2024070100009', data, {
+                savePreParams: function (params) {
+                },
+                saveData: function (params) {
+                    // 保存数据
+                    AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertSalesReturnsToTurnDepot", params: params, type: 'json', method: "POST", callback: function(json) {
+                            parent.layer.close(index);
+                            parent.refreshCode = '0';
+                        }});
+                },
+                loadComponentCallback: function () {
+                    $("select[attrkey='holderIdType']").prop('disabled', true);
+                    $("select[attrkey='holderIdType']").parent().next().children('i').remove();
+                    $("div[controlType='depotPutFromType']").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(".warehouse").prop('disabled', true);
+                }
+            });
+        }});
+
+});
\ No newline at end of file

erp/src/main/resources/template/tpl/otherWarehous/otherWarehousToPut.html

+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <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/otherWarehous/'}).use('otherWarehousToPut');
+</script>
+</body>
+</html>
\ No newline at end of file

erp/src/main/resources/template/tpl/retailReturns/retailReturnsToPut.html

+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <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/retailReturns/'}).use('retailReturnsToPut');
+</script>
+</body>
+</html>
\ No newline at end of file

erp/src/main/resources/template/tpl/salesReturns/salesReturnsToPut.html

+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <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/salesReturns/'}).use('salesReturnsToPut');
+</script>
+</body>
+</html>
\ No newline at end of file