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

common/src/main/resources/template/js/dsFormPage/editPageContentIsTable.js

@@ -102,7 +102,7 @@ layui.config({
 				return _html;
 			}},
 			{ field: 'dataFrom', title: '数据源', align: 'left', width: 200, templet: function (d) {
-				var disabledClass = d.showType == showType[2].id ? '' : 'layui-btn-disabled';
+				var disabledClass = d.showType == showType[3].id ? '' : 'layui-btn-disabled';
 				var btnName = '选择数据源';
 				if (!isNull(d.dataType)) {
 					btnName = '更换数据源';
@@ -170,7 +170,7 @@ layui.config({
 				return `<div id="require${d.id}" cus-id="${d.id}"></div>`;
 			}},
 			{ field: 'dataFrom', title: '数据源', align: 'left', width: 200, templet: function (d) {
-				var disabledClass = d.showType == showType[2].id ? '' : 'layui-btn-disabled';
+				var disabledClass = d.showType == showType[3].id ? '' : 'layui-btn-disabled';
 				var btnName = '选择数据源';
 				if (!isNull(d.dataType)) {
 					btnName = '更换数据源';
@@ -280,7 +280,7 @@ layui.config({
 		if (id.startsWith('showType')) {
 			var showTypeVal = _this.val();
 			var cusId = _this.attr('cus-id');
-			if (showTypeVal == showType[2].id) {
+			if (showTypeVal == showType[3].id) {
 				// 下拉框
 				$(`#dataFrom${cusId}`).removeClass('layui-btn-disabled');
 				$(`#dataFrom${cusId}`).attr('data', '{}');
@@ -345,7 +345,7 @@ layui.config({
 		$.each(tableDataList, function (i, item) {
 			item.align = $(`#align${item.id}`).val();
 			item.require = dataShowType.getData(`require${item.id}`);
-			if (item.showType == showType[2].id) {
+			if (item.showType == showType[3].id) {
 				// 下拉框时，选择的数据源信息
 				var dataFrom = JSON.parse($(`#dataFrom${item.id}`).attr('data'));
 				if (!isNull(dataFrom.dataType)) {

school/src/main/resources/template/js/yearSubject/saveYearSubject.js

@@ -65,7 +65,7 @@ layui.config({
                 majorId: $("#majorId").val(),
                 year: $("#year").val()
             }
-            // 获取科目列表
+            // 获取科目列表 TODO 待删除
             AjaxPostUtil.request({url: sysMainMation.schoolBasePath + "querySubjectListBySchoolId", params: {schoolId: tempParams.schoolId}, type: 'json', method: 'GET', callback: function (json) {
                 subjectList = json.rows;
             }, async: false});

web/src/main/resources/template/json/skyeyeClassEnum.json

@@ -53,7 +53,7 @@
     "machinPickStateEnum": {"name": "加工单领料状态", "className": "skyeye-erp#com.skyeye.machin.classenum.MachinPickStateEnum"},
     "machinChildStateEnum": {"name": "工序验收单状态", "className": "skyeye-erp#com.skyeye.machin.classenum.MachinChildStateEnum"},
     "materialNormsCodeInDepot": {"name": "商品规格一物一码库存状态", "className": "skyeye-erp#com.skyeye.material.classenum.MaterialNormsCodeInDepot"},
-    "orderQualityInspectionType": {"name": "ERP采购质检类型", "className": "skyeye-erp#com.skyeye.purchase.classenum.OrderQualityInspectionType"},
+    "orderQualityInspectionType": {"name": "ERP采购质检类型", "className": "skyeye-erp#com.skyeye.business.classenum.OrderQualityInspectionType"},
     "orderItemQualityInspectionType": {"name": "ERP采购子单据质检类型", "className": "skyeye-erp#com.skyeye.business.classenum.OrderItemQualityInspectionType"},
 
     "orderArrivalState": {"name": "采购订单到货状态", "className": "skyeye-erp#com.skyeye.purchase.classenum.OrderArrivalState"},