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

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

@@ -21,8 +21,6 @@ layui.config({
             // 仓库入库的【编辑布局】
             dsFormUtil.initEditPageForStatic('content', 'FP2024070100009', data, {
                 savePreParams: function (params) {
-                    params.holderId=data.holderId
-                    params.holderKey=data.holderKey
                 },
                 saveData: function (params) {
                     // 保存数据

erp-produce/src/main/resources/template/js/materialReturnOrder/materialReturnOrderToPut.js

@@ -21,8 +21,6 @@ layui.config({
             // 仓库入库的【编辑布局】
             dsFormUtil.initEditPageForStatic('content', 'FP2024070100009', data, {
                 savePreParams: function (params) {
-                    params.holderId=data.holderId
-                    params.holderKey=data.holderKey
                 },
                 saveData: function (params) {
                     // 保存数据
@@ -32,9 +30,6 @@ layui.config({
                         }});
                 },
                 loadComponentCallback: function () {
-                    $("select[attrkey='holderIdType']").prop('disabled', true);
-                    $("select[attrkey='holderIdType']").parent().next().children('i').remove();
-
                     $("div[controlType='correspondentEnter']").remove();
                     $("div[controlType='depotPutFromType']").remove();
                 },

school/src/main/resources/template/js/announcement/announcementList.js

@@ -121,7 +121,7 @@ layui.config({
     }
 
     function getTableParams() {
-        return $.extend(true, {objectKey: objectKey, objectId: subjectClassesId,subjectClassesId: subjectClassesId}, initTableSearchUtil.getSearchValue("messageTable"));
+        return $.extend(true, {objectKey: objectKey, objectId: subjectClassesId, holderId: subjectClassesId}, initTableSearchUtil.getSearchValue("messageTable"));
     }
 
     exports('announcementList', {});

school/src/main/resources/template/js/announcement/write.js

@@ -12,7 +12,6 @@ layui.config({
     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");
     var objectId = GetUrlParam("objectId");

school/src/main/resources/template/js/homework/correct.js

@@ -7,7 +7,6 @@ layui.config({
     winui.renderColor();
     var index = parent.layer.getFrameIndex(window.name);
     var $ = layui.$,
-        textool = layui.textool,
         form = layui.form;
     var id = GetUrlParam("id");
     var assignmentId = GetUrlParam("assignmentId");
@@ -36,11 +35,9 @@ layui.config({
             }});
     }
 
-    form.on('submit(formAddBean)', function (data) {
-        if($("#score").val()>fullMarks ){
+    form.on('submit(formAddBean)', function (data) {0
+        if (parseInt($("#score").val()) > parseInt(fullMarks) || parseInt($("#score").val()) < 0) {
             winui.window.msg('请输入正确评分', {icon: 2, time: 2000});
-            console.log(fullMarks)
-            console.log($("#score").val())
             return false;
         }
         if (winui.verifyForm(data.elem)) {

school/src/main/resources/template/js/topic/details.js

@@ -30,7 +30,6 @@ layui.config({
         page: false,
         cols: [[
             { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-            // { field: 'title', title: '标题', align: 'left', width: 300},
             { field: 'content', title: '内容', align: 'left', width: 300},
             { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', width: 120 , templet: function(d) {
                     return getNotUndefinedVal(d.createMation?.name);

school/src/main/resources/template/js/topic/write.js

@@ -12,9 +12,7 @@ layui.config({
     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");
     var objectId = GetUrlParam("objectId");
     var objectKey = GetUrlParam("objectKey");
     objectParams.subjectClassesId = GetUrlParam("subjectClassesId");