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

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

@@ -23,28 +23,33 @@ layui.config({
         limits: getLimits(),
         limit: getLimit(),
         cols: [[
-            { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-            { field: 'oddNumber', title: '单据单号', align: 'left', width: 220, templet: function (d) {
+            { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' ,rowspan: '2'},
+            { field: 'oddNumber', title: '单据单号', align: 'left', width: 220,rowspan: '2', templet: function (d) {
                 var str = '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
                 if (!isNull(d.fromId)) {
                     str += '<span class="state-new">[转]</span>';
                 }
                 return str;
             }},
-            { field: 'fromTypeId', title: '来源单据类型', width: 120, templet: function (d) {
-                return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotOutFromType", 'id', d.fromTypeId, 'name');
-            }},
-            { field: 'createName', title: '申请人', width: 120 },
-            { field: 'createTime', title: '申请时间', align: 'center', width: 150 },
-            { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
-            { field: 'operTime', title: '单据日期', align: 'center', width: 140 },
-            { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
+            { colspan: '2', title: '来源单据信息', align: 'center' },
+            { field: 'createName', title: '申请人', width: 120,rowspan: '2' },
+            { field: 'createTime', title: '申请时间', align: 'center', width: 150 ,rowspan: '2'},
+            { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 ,rowspan: '2'},
+            { field: 'operTime', title: '单据日期', align: 'center', width: 140 ,rowspan: '2'},
+            { field: 'state', title: '状态', rowspan: '2', width: 90,rowspan: '2', templet: function (d) {
                     return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
                 }},
-            { field: 'otherState', title: '确认状态', width: 90, templet: function (d) {
+            { field: 'otherState', title: '确认状态', width: 90,rowspan: '2', templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotOutOtherState", 'id', d.otherState, 'name');
             }},
             { title: systemLanguage["com.skyeye.operation"][languageType], rowspan: '2', fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
+        ], [
+            { field: 'fromTypeId', title: '来源类型', width: 150, templet: function (d) {
+                    return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotOutFromType", 'id', d.fromTypeId, 'name');
+                }},
+            { field: 'fromId', title: '单据编号', width: 200, templet: function (d) {
+                    return getNotUndefinedVal(d.fromMation?.oddNumber);
+                }}
         ]],
         done: function(json) {
             matchingLanguage();

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

@@ -95,6 +95,9 @@ layui.config({
         } else if (type == 6) {
             // 补料出库单
             pageUrl = 'FP2024070100002';
+        } else if (type == 7) {
+            // 补料出库单
+            pageUrl = 'FP2023091000003';
         }
         _openNewWindows({
             url:  systemCommonUtil.getUrl(pageUrl +'&id=' + data.id, null),
@@ -127,6 +130,9 @@ layui.config({
         } else if (type == 6) {
             // 补料出库单
             pageUrl = '../../tpl/erpPick/erpPatchPickToOut.html';
+        } else if (type == 7) {
+            // 配件申领出库单
+            pageUrl = '../../tpl/sealApply/sealApplyToOut.html';
         }
         _openNewWindows({
             url:  pageUrl + '?id=' + data.id,

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

@@ -23,28 +23,33 @@ layui.config({
         limits: getLimits(),
         limit: getLimit(),
         cols: [[
-            { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-            { field: 'oddNumber', title: '单据单号', align: 'left', width: 220, templet: function (d) {
+            { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers',rowspan: '2' },
+            { field: 'oddNumber', title: '单据单号', align: 'left', width: 220,rowspan: '2', templet: function (d) {
                 var str = '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
                 if (!isNull(d.fromId)) {
                     str += '<span class="state-new">[转]</span>';
                 }
                 return str;
             }},
-            { field: 'idKey', title: '来源单据类型', width: 120, templet: function (d) {
-                    return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotPutFromType", 'id', d.fromTypeId, 'name');
-            }},
-            { field: 'createName', title: '申请人', width: 120 },
-            { field: 'createTime', title: '申请时间', align: 'center', width: 150 },
-            { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
-            { field: 'operTime', title: '单据日期', align: 'center', width: 140 },
-            { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
+            { colspan: '2', title: '来源单据信息', align: 'center' },
+            { field: 'createName', title: '申请人', width: 120 ,rowspan: '2'},
+            { field: 'createTime', title: '申请时间', align: 'center', width: 150 ,rowspan: '2'},
+            { field: 'totalPrice', title: '合计金额', align: 'left', width: 120,rowspan: '2' },
+            { field: 'operTime', title: '单据日期', align: 'center', width: 140,rowspan: '2' },
+            { field: 'state', title: '状态', rowspan: '2', width: 90,rowspan: '2', templet: function (d) {
                     return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
                 }},
-            { field: 'otherState', title: '入库状态', width: 90, templet: function (d) {
+            { field: 'otherState', title: '入库状态', width: 90,rowspan: '2', templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotPutState", 'id', d.otherState, 'name');
             }},
-            { title: systemLanguage["com.skyeye.operation"][languageType], rowspan: '2', fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
+            { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar',rowspan: '2'}
+        ], [
+            { field: 'fromTypeId', title: '来源类型', width: 150, templet: function (d) {
+                    return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotPutFromType", 'id', d.fromTypeId, 'name');
+                }},
+            { field: 'fromId', title: '单据编号', width: 200, templet: function (d) {
+                    return getNotUndefinedVal(d.fromMation?.oddNumber);
+                }}
         ]],
         done: function(json) {
             matchingLanguage();

erp/src/main/resources/template/js/inventoryTaskList/complateInventoryChild.js

@@ -25,7 +25,7 @@ layui.config({
         }
     });
 
-
+    //获取的条形码是入库状态的
     tableSelect.render({
         elem: '#code',	//定义输入框input对象
         checkedKey: 'id', //表格的唯一键值，非常重要，影响到选中状态 必填
@@ -43,10 +43,6 @@ layui.config({
                 { field: 'codeNum', title: '条形码', width: 250, templet: function (d) {
                         return '<a rowId="' + d.id + '" class="notice-title-click">' + d.codeNum + '</a>';
                     }},
-                // { field: 'userName', title: '员工姓名', width: 100 },
-                // { field: 'userSex', title: '性别', width: 60, rowspan: '2', templet: function (d) {
-                //         return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("sexEnum", 'id', d.userSex, 'name');
-                //     }},
             ]]
         },
         done: function (elem, data) {

erp/src/main/resources/template/js/inventoryTaskList/myTaskInventoryList.js

@@ -40,7 +40,7 @@ layui.config({
             { field: 'realNumber', title: '实际盘点数量', rowspan: '2', align: 'center', width: 140 },
             { field: 'profitNum', title: '盘盈数量', rowspan: '2', align: 'center', width: 140 },
             { field: 'planNumber', title: '盘点总数量', rowspan: '2', align: 'center', width: 140 },
-            { field: 'state', title: '状态', width: 90, align: 'center', templet: function (d) {
+            { field: 'state', title: '状态', width: 150, align: 'center', templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("inventoryChildState", 'id', d.state, 'name');
             }},
             { field: 'type', title: '类型', width: 90, align: 'center', templet: function (d) {

erp/src/main/resources/template/js/warehousePersonnel/warehousePersonnel.js

@@ -14,13 +14,14 @@ layui.config({
 
     loadWareshop();
 
+    //获取当前登录用户管理的仓库列表
     form.render();
     function loadWareshop() {
         table.render({
             id: 'warehouseTable',
             elem: '#warehouseTable',
             method: 'get',
-            url: sysMainMation.erpBasePath + 'queryStaffBelongDepotList',
+            url: sysMainMation.erpBasePath + 'storehouse009',
             even: false,
             page: false,
             limits: getLimits(),

seal-service/src/main/resources/template/js/sealApply/sealApplyToOut.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 + "queryOtherWiseOrderTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
+            let data = json.bean;
+            // 仓库出库的【编辑布局】
+            console.log(data)
+            dsFormUtil.initEditPageForStatic('content', 'FP2024070100006', data, {
+                savePreParams: function (params) {
+                    params.farmId=data.farmId
+                    params.departmentId=data.departmentId
+                    params.salesman=data.salesman
+                },
+                saveData: function (params) {
+                    // 保存数据
+                    AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertOtherWiseOrderToDepotOut", params: params, type: 'json', method: "POST", callback: function(json) {
+                            parent.layer.close(index);
+                            parent.refreshCode = '0';
+                        }});
+                },
+                loadComponentCallback: function () {
+                    $("div[controlType='correspondentAllEnter']").remove();
+                    $("div[controlType='depotOutFromType']").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

seal-service/src/main/resources/template/tpl/sealApply/sealApplyToOut.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/sealApply/'}).use('sealApplyToOut');
+</script>
+</body>
+</html>
\ No newline at end of file