调整页面

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyMRP.jsp

@@ -92,7 +92,8 @@
                 <x:inputC name="mabst" label="最大存货水平" labelCol="1" fieldCol="2"/>
                 <x:inputC name="bstrf" label="舍入值" labelCol="1" fieldCol="2"/>
                 <x:selectC name="beskz" label="获取类型" labelCol="1" fieldCol="2" dictionary="beskz" required="true"/>
-                <x:inputC name="sobsl" label="特殊获取方式" labelCol="1" fieldCol="2"/>
+
+                <x:selectC name="sobsl" label="特殊获取方式" labelCol="1" fieldCol="2" dictionary="sobsl" required="false"/>
                 <x:inputC name="lgproName" label="默认生产库存地" labelCol="1" fieldCol="2" wrapper="select"/>
                 <x:hidden name="lgpro"/>
                 <x:selectC name="rgekz" label="倒冲标志" labelCol="1" fieldCol="2" dictionary="rgekz"/>
@@ -102,7 +103,7 @@
                 <x:inputC name="dzeit" label="自制时间" labelCol="1" fieldCol="2"/>
                 <x:inputC name="plifz" label="外部采购交货时间" labelCol="1" fieldCol="2"/>
                 <x:inputC name="fhori" label="排程边际码" labelCol="1" fieldCol="2" required="false"/>
-                <x:inputC name="eisbe" label="安全库存" labelCol="1" fieldCol="2" required="true"/>
+                <x:inputC name="eisbe" label="安全库存" labelCol="1" fieldCol="2" required="false"/>
                 <x:inputC name="eislo" label="最小安全库存" labelCol="1" fieldCol="2"/>
                 <x:selectC name="strgr" label="策略组" labelCol="1" fieldCol="2" dictionary="strgr"/>
                 <x:selectC name="mtvfp" label="可用性检查组" labelCol="1" fieldCol="2" required="true" dictionary="mtvfp"/>

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js

 let gridManager = null;
+let coRowNum=0;
 //页面控制标识
 let control = {
     isInitiator: false,//是否为审核人
@@ -34,12 +35,12 @@ function initializate() {
         case '1'://已分发
             // $("#auditForm").show();
             $("#buttonBox").remove();
-            UICtrl.setDisable("#basicInfoDiv")
+          //  UICtrl.setDisable("#basicInfoDiv")
             break;
         case '2'://已分发 从首页进入填写基本数据
             $("#buttonBox").show(); //alert();
             $("#showChart").remove();
-            UICtrl.setEnable("#basicInfoDiv")
+          //  UICtrl.setEnable("#basicInfoDiv")
 
             break;
         case '3'://被驳回
@@ -101,7 +102,7 @@ function initializate() {
 
     var dictUsage=dictUsages.split(";");
     $('input[name="businessUsage"]').change(function () {
-    //alert($(this).is(':checked'));
+       //alert($(this).is(':checked'));
         if ($(this).is(':checked')) {
             console.log($(this).val()); // 输出选中的值
             debugger
@@ -114,6 +115,8 @@ function initializate() {
                 }
             }
             gridManager.addRow({ deptName: name, deptCode: deptCode,userName: "" });
+           // coRowNum+=1;
+            //gridManager.loadData();
         } else {
              let datas=gridManager.getData();
              var selval=$(this).val();
@@ -147,14 +150,14 @@ function loadGrid() {
     //}
 //    let coRowNum = $("#businessUsage").val().replace(/,/g, '') + 1;
    // alert($("#busiLens").val());
-    let coRowNum=$("#busiLens").val();
+     coRowNum=$("#busiLens").val();
     // let length = dept.length;
     // let dept=$("#businessUsage").val().split(",");
     // let a=(dept.length+1)*37.5;
     gridManager = UICtrl.grid("#businessPersonnelListGrid", {
         columns: [
             {display: "部门代码", name: "deptCode", width: 0, minWidth: 10, type: "string", align: "left",hide: true},
-            {display: "部门", name: "deptName", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "部门名称", name: "deptName", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "部门人员", name: "userName", width: 280,disable: true, minWidth: 60, type: "string", align: "left",
                 editor: {
                     type: 'tree',
@@ -364,7 +367,7 @@ function bindEvent() {
         },
         onChange: function (value, data) {
             $('#vtweg').val(data.VTWEG);
-            $('#vtwegName').val(data.VKORGTEXT);
+            $('#vtwegName').val(data.VTWEGTEXT);
         }
     });
     $('#lgnumName').searchbox({
@@ -396,7 +399,7 @@ function bindEvent() {
 function getExtendedData() {
     let msg = "[";
     let isUndefined = false
-    let deptStaffResult = DataUtil.getGridData({
+  /*  let deptStaffResult = DataUtil.getGridData({
         gridManager: gridManager,
         isAllData: true,
         onCheck: function (data) {
@@ -406,10 +409,18 @@ function getExtendedData() {
             }
             return true;
         }
-    });
-
-    if (isUndefined) {
-        Public.tip(`${msg.slice(0, -1)}]未选择对应分发人员`);
+    }); */
+      let deptStaffResult=gridManager.getData();
+    for (var i=0;i<deptStaffResult.length;i++) {
+      //  alert(deptStaffResult[i].deptName); alert(deptStaffResult[i].userCode);
+      if (deptStaffResult[i].userCode==undefined) {
+          //if (isUndefined) {
+          isUndefined=true;
+          break;
+      }
+    }
+    if (isUndefined){
+        Public.tip(deptStaffResult[i].deptName+'未选择对应分发人员');
         return false
     }
     let extendedData = {};

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp

@@ -97,13 +97,14 @@
                 <x:selectC name="mtart" label="物品类型" required="true" labelCol="1" fieldCol="2" dictionary="suppliesType"/>
                 <x:inputC name="matklName" label="物料组" required="true" labelCol="1" fieldCol="2" wrapper="select"/>
                 <x:hidden name="matkl"/>
-                <x:inputC name="lvorm" label="集团级删除" labelCol="1" fieldCol="2"/>
+                <!--x:inputC name="lvorm" label="集团级删除" labelCol="1" fieldCol="2"/-->
+                <x:selectC name="lvorm" label="集团级删除" required="false" labelCol="1" fieldCol="2" dictionary="lvorm"/>
                 <x:inputC name="spartName" label="产品组" required="true" labelCol="1" fieldCol="2" wrapper="select"/>
                 <x:hidden name="spart"/>
                 <x:selectC name="mtposMara" label="项目类别组" labelCol="1" fieldCol="2" dictionary="mtposMara"/>
                 <x:inputC name="maktx" label="汉语品名" required="true" labelCol="1" fieldCol="2"/>
                 <x:selectC name="xchpf" label="批次管理" labelCol="1" fieldCol="2" dictionary="xchpf"/>
-                <x:inputC name="magrv" label="包装物料组" labelCol="1" fieldCol="2"/>
+                <!--x:inputC name="magrv" label="包装物料组" labelCol="1" fieldCol="2"/-->
 
                 <x:inputC name="maktxEn" label="英语品名" labelCol="1" fieldCol="2"/>
                 <x:inputC name="meinsName" label="基本计量单位" labelCol="1" fieldCol="2" wrapper="select"/>
@@ -113,12 +114,13 @@
                 <x:selectC name="gewei" label="重量单位" labelCol="1" fieldCol="2" dictionary="gewei"/>
                 <x:inputC name="volum" label="体积" labelCol="1" fieldCol="2"/>
                 <x:selectC name="voleh" label="体积单位" labelCol="1" fieldCol="2" dictionary="voleh"/>
-                <x:inputC name="iprkz" label="有效时间标识" labelCol="1" fieldCol="2"/>
+                <!--x:inputC name="iprkz" label="有效时间标识" labelCol="1" fieldCol="2"/-->
+                <x:selectC name="iprkz" label="有效时间标识" required="false" labelCol="1" fieldCol="2" dictionary="iprkz"/>
                 <x:inputC name="mhdhb" label="总有效期" labelCol="1" fieldCol="2"/>
                 <x:inputC name="" label="旧料号" labelCol="1" fieldCol="2"/>
 
                 <x:inputC name="mhdrz" label="最小货架寿命" labelCol="1" fieldCol="2"/>
-                <x:inputC name="normt" label="适用标准" labelCol="1" fieldCol="11"/>
+                <x:inputC name="normt" label="适用标准" labelCol="1" fieldCol="2"/>
                 <div class="hg-form-row">
                 <x:inputC name="werksName" label="工厂" required="true" labelCol="1" fieldCol="2" wrapper="select"/>
                 <x:hidden name="werks"/>

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyPurchase.js

@@ -175,6 +175,11 @@ function loadGrid() {
  * @returns {boolean}
  */
 function saveForm(status) {
+    if ($("#baseUnit").val()==$("#bstme").val()){
+        Public.tip("采购计量单位不能和基本计量单位一致！");
+        return false;
+    }
+
     $("#active").val(status)
    // alert($("#businessCode").val());
     let extendedData = getExtendedData();

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplySale.jsp

@@ -100,7 +100,8 @@
                 <x:inputC name="mvgr3" label="用途" labelCol="1" fieldCol="2"/>
                 <x:inputC name="mvgr4" label="备用" labelCol="1" fieldCol="2"/>
                 <x:inputC name="mvgr5" label="备用" labelCol="1" fieldCol="2"/>
-                <x:inputC name="mtpos" label="销售项次组" labelCol="1" fieldCol="2" required="false"/>
+
+                <x:selectC name="mtpos" label="销售项次组" labelCol="1" fieldCol="2" dictionary="mtposMara"/>
                 <x:selectC name="xchpf" label="批次管理" labelCol="1" fieldCol="2" dictionary="xchpf"/>
                 <x:inputC name="tragr" label="运输组" labelCol="1" fieldCol="2" required="false"/>
                 <x:hidden name="ladgr"/>

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyStore.jsp

@@ -84,7 +84,7 @@
                 <x:hidden name="lgort"/>
                 <x:inputC name="sernp" label="序列号参数" labelCol="1" fieldCol="2"/>
                 <x:inputC name="serlv" label="序列号水平" labelCol="1" fieldCol="2"/>
-                <x:selectC name="prctr" label="利润中心" labelCol="1" fieldCol="2" dictionary="PRCTR"/>
+                <x:selectC name="prctr" label="利润中心" labelCol="1" fieldCol="2" dictionary="PRCTR" required="true"/>
               </div>
         </div>