质量信息记录调整

topsun-xt/src/main/webapp/biz/topsun/sap/qualityInfoRecord/qualityInfoRecordDetail.js

@@ -31,7 +31,7 @@ function initItemGrid() {
             dataAction: 'server',
             url: web_app.name + '/sapQualityInfoRecordItem/querySapQualityInfoRecordItems.ajax',
             parms:{sapQualityInfoRecordId:Public.isNotBlank(getId())?getId():$("#tempId").val()},
-            height: '98%',
+            height: '95%',
             heightDiff: -4,
             sortName: 'id',
             sortOrder: 'asc',
@@ -44,10 +44,18 @@ function initItemGrid() {
             //autoApplyNextEditor:false,
             toolbar: toolbarOptions,
             onBeforeEdit: function (editParma) {
-                if (Public.isBlank(editParma.record.grsrq) && (editParma.column.name=='grscertnr' || editParma.column.name=='grscertdatai')){
+                //输入物料号敲回车后，品名描述和无老祖自动带出，而且这两个字段将成为灰色，不允许修改
+                if (Public.isNotBlank(editParma.record.matnr) && editParma.column.name=='matklName'){
                     return false;
                 }
-                if (Public.isBlank(editParma.record.fscrq) && (editParma.column.name=='fsccertnr' || editParma.column.name=='fsccertdatai')){
+                //不输入物料号而只输入物料组。这种情况下，物料编码和品名描述字段就是灰色，而物料组可以写操作
+                if (Public.isNotBlank(editParma.record.matklName) && Public.isBlank(editParma.record.matnr) && editParma.column.name=='matnr'){
+                    return false;
+                }
+                if ("0" === editParma.record.grsrq && (editParma.column.name=='grscertnr' || editParma.column.name=='grscertdatai')){
+                    return false;
+                }
+                if ("0" === editParma.record.fscrq && (editParma.column.name=='fsccertnr' || editParma.column.name=='fsccertdatai')){
                     return false;
                 }
 
@@ -101,7 +109,7 @@ function getGridColumns() {
         },
         {display: "物料编码", name: "matnr", width: "200", align: "left", type: "string",
             editor: {
-                required: true, type: "select",
+                required: false, type: "select",
                 data: {
                     type: 'system',
                     name: "sapMaterialSelect",
@@ -120,11 +128,11 @@ function getGridColumns() {
             }
         },
         {display: "物料描述", name: "maktx", width: "300", align: "left", type: "string",
-            editor: {required: true, type: "text"}
+            //editor: {required: true, type: "text"}
         },
         {display: "物料组", name: "matklName", width: "200", align: "left", type: "string",
             editor: {
-                required: true, type: "select",
+                required: false, type: "select",
                 data: {
                     type: 'system',
                     name: "dictionary",
@@ -168,7 +176,7 @@ function getGridColumns() {
         {display: "打样单号码", name: "zspaufnr", width: "200", align: "left", type: "string",
             editor: {type: "text", required: false,}
         },
-        {display: "GRSRQ", name: "grsrq", width: "100", align: "left", type: "string",
+        {display: "GRSRQ", name: "grsrqTextView", width: "100", align: "left", type: "string",
             editor: {
                 type: 'dictionary',
                 data: {name: 'grsrq'},
@@ -186,10 +194,10 @@ function getGridColumns() {
         {display: "GRS证书到期日", name: "grscertdatai", width: "150", align: "left", type: "date",
             editor: {type: 'date'}
         },
-        {display: "FSC认证要求", name: "fscrq", width: "200", align: "left", type: "string",
+        {display: "FSC认证要求", name: "fscrqTextView", width: "200", align: "left", type: "string",
             editor: {
                 type: 'dictionary',
-                data: {name: 'grsrq'},
+                data: {name: 'fscrq'},
                 textField: 'fscrqTextView',
                 valueField: 'fscrq',
                 required: true,
@@ -239,35 +247,55 @@ function getExtendedData(processAction) {
         if (!datas) {
             return false;
         }
-        if (Public.isNotBlank($("#tempId").val())){
+        var checked1 = false;
+        var checked2 = false;
+        var checked3 = false;
+        var checked4 = false;
+        //if (Public.isNotBlank($("#tempId").val())){
             datas.forEach(data=>{
-                data.id = "";
-                data.sapQualityInfoRecordId=""
-                data.zqinfno=""
-                data.type=""
-                data.message=""
-                if (Public.isNotBlank(data.grsrq)){
+                // data.id = "";
+                // data.sapQualityInfoRecordId=""
+                // data.zqinfno=""
+                // data.type=""
+                // data.message=""
+                if ("X" === data.grsrq){
                     if (Public.isBlank(data.grscertnr)){
-                        Public.tip("GRS证书号不能为空")
-                        return false
+                        checked1 = true;
+
                     }
                     if (Public.isBlank(data.grscertdatai)){
-                        Public.tip("GRS证书到期日不能为空")
-                        return false
+                        checked2 = true;
+
                     }
                 }
-                if (Public.isNotBlank(data.fscrq)){
+                if ("X" === data.fscrq){
                     if (Public.isBlank(data.fsccertnr)){
-                        Public.tip("FSC证书号不能为空")
-                        return false
+                        checked3 = true;
+
                     }
                     if (Public.isBlank(data.fsccertdatai)){
-                        Public.tip("FSC证书到期日不能为空")
-                        return false
+                        checked4 = true;
+
                     }
                 }
             })
+        if (checked1){
+            Public.tip("GRS证书号不能为空")
+            return false
+        }
+        if (checked2){
+            Public.tip("GRS证书到期日不能为空")
+            return false
+        }
+        if (checked3){
+            Public.tip("FSC证书号不能为空")
+            return false
+        }
+        if (checked4){
+            Public.tip("FSC证书到期日不能为空")
+            return false
         }
+        //}
         extendedData.items = Public.encodeJSONURI(datas);
     }
     return extendedData;