From c206acfaedc69c390fb67daa81bc686f58a212ef Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 27 十一月 2023 16:12:11 +0800
Subject: [PATCH] 提交配置信息2

---
 igds-web/src/main/resources/static/admin/inout/in-ship-register.js |  139 ++++++++++++++++++++++++----------------------
 1 files changed, 73 insertions(+), 66 deletions(-)

diff --git a/igds-web/src/main/resources/static/admin/inout/in-ship-register.js b/igds-web/src/main/resources/static/admin/inout/in-ship-register.js
index 062e06a..53d665d 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-ship-register.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-ship-register.js
@@ -16,12 +16,12 @@
         });
 
         //鐩戝惉鍝佺
-        layui.form.on('select(select_foodVariety)',function (data) {
+        layui.form.on('select(select_foodVariety)', function (data) {
             updateFoodVariety(data.value);
         });
 
         //鐩戝惉鍖栭獙缁撴灉鍗曞~鍐欐暟鎹�,骞剁粰鍑烘彁绀虹粨鏋�
-        table.on('edit(tableCheckItem)',function (obj) {
+        table.on('edit(tableCheckItem)', function (obj) {
             getResult(obj);
         });
     });
@@ -147,7 +147,7 @@
 /**
  * 寮瑰嚭鍖栭獙鍗曚俊鎭�
  */
-function showCheckDetail(){
+function showCheckDetail() {
     // 璧嬪��
     var data = form.val("form-data");
     data.checkUser = checkUser;
@@ -165,7 +165,7 @@
         yes: function () {
             curCheckData = form.val("form-detail");
 
-            if(null == curCheckData.foodVariety){
+            if (null == curCheckData.foodVariety) {
                 notify("璇峰~鍐欑伯椋熷搧绉嶏紒");
                 return;
             }
@@ -210,12 +210,12 @@
 
     var index = layer.load();
     $.ajax({
-        type : "POST",
-        url : "../../basic/inout/get-check-item",
-        dataType : "json",
-        contentType : "application/json;charset=UTF-8",
-        data : JSON.stringify(data),
-        success : function(result) {
+        type: "POST",
+        url: "../../basic/inout/get-check-item",
+        dataType: "json",
+        contentType: "application/json;charset=UTF-8",
+        data: JSON.stringify(data),
+        success: function (result) {
             if (result.code != "0000") {
                 layer.msg(result.msg);
             } else {
@@ -225,7 +225,7 @@
                 layer.close(index);
             }
         },
-        error : function() {
+        error: function () {
             layer.close(index);
             layer.msg("鍚庡彴寮傚父锛岃閲嶈瘯鎴栬�呰仈绯荤鐞嗗憳锛侊紒");
         }
@@ -239,11 +239,11 @@
     // 娓呯┖鏁版嵁
     $("#tableCheckItem").empty();
     table.render({
-        elem : '#tableCheckItem',
-        data : curCheckItems,
-        page : false,
+        elem: '#tableCheckItem',
+        data: curCheckItems,
+        page: false,
         // skin: 'line',
-        even : true,
+        even: true,
         cols: [[{
             field: 'standardName',
             title: '鍖栭獙椤圭洰',
@@ -274,8 +274,8 @@
     });
 
     $("thead tr").css({
-        "border-bottom" : "2px solid #53adce",
-        "background" : "#eff4f6"
+        "border-bottom": "2px solid #53adce",
+        "background": "#eff4f6"
     });
 }
 
@@ -387,25 +387,32 @@
     // 娓叉煋寰�鏉ュ崟浣嶅垪琛�
     table.render({
         elem: '#tableNotice',
-        url: '../../basic/inout/list-notice鈥攊n',
+        url: '../../basic/inout/list-notice-in',
         page: false,
         even: true,
         method: 'POST',
         contentType: "application/json;charset=UTF-8",
         cols: [[{
+            field: 'name',
+            title: '閫氱煡鍗曞悕绉�',
+            width: '15%'
+        }, {
             field: 'customerName',
-            title: '閫佽揣鍗曚綅'
+            title: '鍙戣揣鍗曚綅'
         }, {
             field: 'foodVarietyName',
             title: '绮鍝佺',
-            width: '15%'
+            width: '12%'
         }, {
             field: 'year',
             title: '骞翠唤',
-            width: '15%'
+            width: '10%'
         }, {
-            field: 'unitName',
-            title: '鏀惰揣鍗曚綅'
+            field: 'depotName',
+            title: "鎵�娑変粨搴�"
+        }, {
+            field: 'contractName',
+            title: '鎵�灞炲悎鍚�'
         }]],
         where: param,
         parseData: function (res) {
@@ -443,7 +450,7 @@
     layer.open({
         type: 1,
         title: "鍏ュ簱閫氱煡鍗�",
-        area: ['700px', '600px'],
+        area: ['850px', '600px'],
         shade: 0,
         content: $('#listNotice'),
         btn: 0,
@@ -461,54 +468,54 @@
     var index = layer.load();
     // 娓叉煋寰�鏉ュ崟浣嶅垪琛�
     table.render({
-        elem : '#tableFoodLoaction',
-        url : '../../basic/common/page-food-location',
-        page : false,
-        toolbar : '#toolbarFoodLocaton',
-        even : true,
-        method : 'POST',
-        contentType : "application/json;charset=UTF-8",
-        cols : [ [ {
-            field : 'code',
-            title : '缂栫爜'
+        elem: '#tableFoodLoaction',
+        url: '../../basic/common/page-dicArea',
+        page: false,
+        toolbar: '#toolbarFoodLocaton',
+        even: true,
+        method: 'POST',
+        contentType: "application/json;charset=UTF-8",
+        cols: [[{
+            field: 'code',
+            title: '缂栫爜'
         }, {
-            field : 'simple',
-            title : '绠�鎷�'
+            field: 'simple',
+            title: '绠�鎷�'
         }, {
-            field : 'name',
-            title : '鍚嶇О',
-            width : '60%'
-        } ] ],
-        where : {
-            "page" : 1,
-            "limit" : 100
+            field: 'name',
+            title: '鍚嶇О',
+            width: '60%'
+        }]],
+        where: {
+            "page": 1,
+            "limit": 100
         },
-        parseData : function(res) {
+        parseData: function (res) {
             if ("0000" == res.code) {
                 return {
-                    "code" : "0",
-                    "msg" : res.msg,
-                    "count" : res.data.total,
-                    "data" : res.data.records
+                    "code": "0",
+                    "msg": res.msg,
+                    "count": res.data.total,
+                    "data": res.data.records
                 }
             } else {
                 return {
-                    "code" : "1",
-                    "msg" : res.msg
+                    "code": "1",
+                    "msg": res.msg
                 }
             }
         },
-        done : function(res) {
+        done: function (res) {
             layer.close(index);
         }
     });
 
     //鍙屽嚮鏄剧ず閫変腑鏁版嵁
-    table.on('rowDouble(tableFoodLoaction)', function(obj){
+    table.on('rowDouble(tableFoodLoaction)', function (obj) {
         var data = obj.data;
         // 璧嬪��
         form.val("form-data", {
-            foodLocation : data.name
+            foodLocation: data.name
         });
         // 鍏抽棴
         layer.close(index2);
@@ -516,18 +523,18 @@
 
     // 寮瑰嚭瀵硅瘽妗�
     var index2 = layer.open({
-        type : 1,
-        title : "閫夋嫨绮骇鍦�",
-        area : [ '600px', '600px' ],
-        shade : 0,
-        content : $('#listFoodLocation'),
-        btn : 0,
-        btn : [ '鍙栨秷' ],
-        yes : function() {
+        type: 1,
+        title: "閫夋嫨绮骇鍦�",
+        area: ['600px', '600px'],
+        shade: 0,
+        content: $('#listFoodLocation'),
+        btn: 0,
+        btn: ['鍙栨秷'],
+        yes: function () {
             // 鍏抽棴
             layer.close(index2);
         },
-        closeBtn : 0
+        closeBtn: 0
     });
 
 }
@@ -536,11 +543,11 @@
 function flushFoodLocation() {
     var key = $("#key2").val();
     table.reload('tableFoodLoaction', {
-        url : "../../basic/common/page-food-location",
-        where : {
-            key : key
+        url: "../../basic/common/page-dicArea",
+        where: {
+            key: key
         },
-        done : function(res) {
+        done: function (res) {
             if (key) {
                 $("#key2").val(key);
             }

--
Gitblit v1.9.3