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

erp-produce/src/main/resources/template/js/departmentMachining/departmentMachiningList.js

@@ -28,20 +28,29 @@ layui.config({
         limit: getLimit(),
         cols: [[
             { title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers' },
-            { field: 'oddNumber', title: '加工单号', align: 'center', rowspan: '2', width: 200, templet: function (d) {
-                    return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
+            { field: 'oddNumber', title: '单号', rowspan: '2', align: 'left', width: 220, 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: 'operTime', title: '单据日期', align: 'center', rowspan: '2', width: 140 },
             { colspan: '2', title: '来源单据信息', align: 'center' },
-            { field: 'processInstanceId', title: '流程ID', rowspan: '2', width: 100, templet: function (d) {
+            { field: 'departmentMation', title: '部门', rowspan: '2', align: 'left', width: 200, templet: function (d) {
+                    return getNotUndefinedVal(d.departmentMation?.name);
+                }},
+            { field: 'processInstanceId', title: '流程ID', rowspan: '2', width: 280, templet: function (d) {
                     return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
                 }},
             { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
                     return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
                 }},
-            { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2',width: 120 },
+            { field: 'pickState', rowspan: '2', title: '领料状态', align: 'left', width: 80, templet: function (d) {
+                    return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("machinPickStateEnum", 'id', d.pickState, 'name');
+                }},
+            { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2',width: 180 },
             { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', rowspan: '2',width: 150 },
-            { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', rowspan: '2',width: 120 },
+            { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', rowspan: '2',width: 180 },
             { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', rowspan: '2',width: 150 },
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', rowspan: '2',width: 240, toolbar: '#tableBar'}
         ],[

erp-produce/src/main/resources/template/js/erpPreProductionPlan/preProductionTurnToProduction.js

@@ -38,8 +38,8 @@ layui.config({
                 // 新增行的回调函数
                 tableAddRowCallback: function (tableId) {
                     $("#addRow" + tableId).remove();
-                    // $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
-                    // $("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
+                    $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
+                    $("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
                 }
             });
         }});

erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js

@@ -35,19 +35,20 @@ layui.config({
 					return str;
 				}},
 			{ colspan: '2', title: '来源单据信息', align: 'center' },
-			{ field: 'operTime', width: 150, title: '单据日期', rowspan: '2',align: 'center'},
 			{ field: 'processInstanceId', title: '流程ID', rowspan: '2',width: 280, templet: function (d) {
 					return '<a lay-event="details" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
 				}},
 			{ field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
 					return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
 				}},
+
 			{ field: 'machinOrderState', title: '加工状态', rowspan: '2', width: 90, templet: function (d) {
 					return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("productionMachinOrderState", 'id', d.machinOrderState, 'name');
 				}},
 			{ field: 'outState', title: '委外状态', rowspan: '2', width: 90, templet: function (d) {
 					return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("productionOutState", 'id', d.outState, 'name');
 				}},
+
 			{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', rowspan: '2',width: 120 },
 			{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', rowspan: '2',width: 150 },
 			{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', rowspan: '2',width: 120 },

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

@@ -122,7 +122,6 @@ layui.config({
 
     // 编辑
     function edit(data) {
-        console.log('11',data)
         _openNewWindows({
             url: "../../tpl/turnIocatorManage/addWarehouseLevelValue.html?id=" + data.id
                 + "&parentId=" + data.parentId +"&depotId=" + data.depotId,