feat:新增采购枚举

erp/src/main/resources/template/js/supplierContract/contractToOrder.js

@@ -19,18 +19,38 @@ layui.config({
     AjaxPostUtil.request({url: sysMainMation.erpBasePath + "querySupplierContractTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
         let data = json.bean;
         data.erpOrderItemList = data.supplierContractChildList
+            console.log(data)
         // 采购订单的【编辑布局】
         dsFormUtil.initEditPageForStatic('content', 'FP2023042000002', data, {
             savePreParams: function (params) {
-                params.xxx="123213213213213213213213"
+                params.holderId=data.objectId
+                params.holderKey=data.objectKey
+                params.id=id
             },
             saveData: function (params) {
                 // 保存数据
+                AjaxPostUtil.request({url: sysMainMation.erpBasePath + "supplierContractToOrder", params: params, type: 'json', method: "POST", callback: function(json) {
+                    parent.layer.close(index);
+                    parent.refreshCode = '0';
+                }});
 
             },
             loadComponentCallback: function () {
                 $("div[controlType='supplier']").remove();
                 $("div[controlType='purchaseOrderFromType']").remove();
+            },
+            tableAddRowCallback: function (tableId) {
+                $("#addRow" + tableId).remove();
+                $("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".amountOfMoney").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".taxRate").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".taxMoney").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true);
+                $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
+                $("div[controlType='simpleTable']").find("select").prop('disabled', true);
+
+
 
 
             }

erp/src/main/resources/template/js/supplierContract/supplierContractList.js

@@ -46,6 +46,9 @@ layui.config({
 			{ field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
 				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("supplierContractStateEnum", 'id', d.state, 'name');
 			}},
+			{ field: 'childState', title: '合同产品状态', rowspan: '2', width: 150, templet: function (d) {
+				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("supplierContractChildStateEnum", 'id',d.childState, 'name');
+			}},
 	        { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', align: 'left', width: 120 },
 	        { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 },
 	        { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], rowspan: '2', align: 'left', width: 120 },
@@ -75,6 +78,9 @@ layui.config({
 					if (authPermission['perform']) {
 						str += '<a class="layui-btn layui-btn-xs" lay-event="perform">执行</a>';
 					}
+					if(d.childState=="pendingOrder" ||d.childState=="partialRelease"){
+						str += '<a class="layui-btn layui-btn-xs" lay-event="contractToOrder">转采购订单</a>';
+					}
 				}
 				if (d.state == 'executing') {
 					if (authPermission['close']) {
@@ -83,6 +89,9 @@ layui.config({
 					if (authPermission['layAside']) {
 						str += '<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="shelve">搁置</a>';
 					}
+					if(d.childState=="pendingOrder" ||d.childState=="partialRelease") {
+						str += '<a class="layui-btn layui-btn-xs" lay-event="contractToOrder">转采购订单</a>';
+					}
 				}
 				if (d.state == 'layAside') {
 					if (authPermission['recovery']) {
@@ -90,7 +99,7 @@ layui.config({
 					}
 				}
 
-				str += '<a class="layui-btn layui-btn-xs" lay-event="contractToOrder">转采购订单</a>';
+
 
 				return str;
 			}}

erp/src/main/resources/template/tpl/supplierContract/supplierContractList.html

@@ -7,6 +7,9 @@
     <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
 </head>
 <body>
+    <div class="winui-tip alert-info" id="showInfo">
+    只有执行中或者审核通过的订单且合同产品状态为待下达或部分下单才可转采购订单
+    </div>
     <div class="winui-toolbar">
         <div class="winui-tool">
             <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>

web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js

@@ -71,7 +71,11 @@ var dsFormUtil = {
         // 保存数据的回调函数
         saveData: null,
         // 组件加载完成的回调函数
-        loadComponentCallback: function () {}
+        loadComponentCallback: function () {},
+        // 表格组件新增行之后的回调事件
+        tableAddRowCallback: null,
+        // 表格组件删除行之后的回调事件
+        tableDeleteRowCallback: null
     },
 
     pageMation: {},

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

@@ -193,5 +193,6 @@
     "purchaseRequestChildInquiry": {"name": "ERP-申请单子单据明细是否询价", "className": "skyeye-erp#com.skyeye.request.classenum.PurchaseRequestChildInquiry"},
     "purchaseRequestFromType": {"name": "ERP-采购申请单来源单据", "className": "skyeye-erp#com.skyeye.request.classenum.PurchaseRequestFromType"},
     "purchaseRequestInquiryState": {"name": "ERP-采购申请单询价状态", "className": "skyeye-erp#com.skyeye.request.classenum.PurchaseRequestInquiryState"},
-    "purchaseRequestStateEnum": {"name": "ERP-采购申请状态", "className": "skyeye-erp#com.skyeye.request.classenum.PurchaseRequestStateEnum"}
+    "purchaseRequestStateEnum": {"name": "ERP-采购申请状态", "className": "skyeye-erp#com.skyeye.request.classenum.PurchaseRequestStateEnum"},
+    "supplierContractChildStateEnum": {"name": "ERP-采购合同是否转采购订单状态", "className": "skyeye-erp#com.skyeye.contract.classenum.SupplierContractChildStateEnum"}
 }
\ No newline at end of file