From 0d2937be8eb9531831d1ee294884c30d5211c6f6 Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Fri, 24 May 2024 19:42:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BE=9B=E5=BA=94=E5=95=86=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E6=96=B0=E5=A2=9E=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tpl/purchaseOrder/purchaseOrderList.html     | 16 ++++++++--------
 .../resources/template/json/skyeyeClassEnum.json |  2 ++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/erp/src/main/resources/template/tpl/purchaseOrder/purchaseOrderList.html b/erp/src/main/resources/template/tpl/purchaseOrder/purchaseOrderList.html
index 393cb4a2a..c5cab56a2 100644
--- a/erp/src/main/resources/template/tpl/purchaseOrder/purchaseOrderList.html
+++ b/erp/src/main/resources/template/tpl/purchaseOrder/purchaseOrderList.html
@@ -16,24 +16,24 @@
 	<div style="margin:auto 10px;">
 	    <table id="messageTable" lay-filter="messageTable"></table>
 		<script type="text/html" id="tableBar">
-			{{# if(d.editRow == 1){ }}
-				{{# if(auth('1571812753921')){ }}
+			{{# if (d.editRow == 1) { }}
+				{{# if (auth('1571812753921')) { }}
 					<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
 				{{# } }}
-				{{# if(auth('1596958747047')){ }}
+				{{# if (auth('1596958747047')) { }}
 					<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
 				{{# } }}
-				{{# if(auth('1571812733324')){ }}
+				{{# if (auth('1571812733324')) { }}
 					<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
 				{{# } }}
 			{{# } }}
-			{{# if(d.editRow == 2){ }}
-				{{# if(auth('1629386145750')){ }}
+			{{# if (d.editRow == 2) { }}
+				{{# if (auth('1629386145750')) { }}
 					<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
 				{{# } }}
 			{{# } }}
-			{{# if(d.state == 'pass') { }}
-				{{# if(auth('1571812784641')){ }}
+			{{# if (d.state == 'pass') { }}
+				{{# if (auth('1571812784641')) { }}
 					<a class="layui-btn layui-btn-xs" lay-event="turnPurchase">转采购入库</a>
 				{{# } }}
 			{{# } }}
diff --git a/web/src/main/resources/template/json/skyeyeClassEnum.json b/web/src/main/resources/template/json/skyeyeClassEnum.json
index 56d2508d1..bd552725c 100644
--- a/web/src/main/resources/template/json/skyeyeClassEnum.json
+++ b/web/src/main/resources/template/json/skyeyeClassEnum.json
@@ -52,6 +52,8 @@
     "machinPickStateEnum": {"name": "加工单领料状态", "className": "skyeye-erp#com.skyeye.machin.classenum.MachinPickStateEnum"},
     "machinChildStateEnum": {"name": "工序验收单状态", "className": "skyeye-erp#com.skyeye.machin.classenum.MachinChildStateEnum"},
     "materialNormsCodeInDepot": {"name": "商品规格一物一码库存状态", "className": "skyeye-erp#com.skyeye.material.classenum.MaterialNormsCodeInDepot"},
+    "orderQualityInspectionType": {"name": "ERP采购质检类型", "className": "skyeye-erp#com.skyeye.purchase.classenum.OrderQualityInspectionType"},
+    "orderItemQualityInspectionType": {"name": "ERP采购子单据质检类型", "className": "skyeye-erp#com.skyeye.business.classenum.OrderItemQualityInspectionType"},
 
     "skyeyeView": {"name": "视图类型", "className": "skyeye-pro#com.skyeye.common.SkyeyeViewEnum"},
     "widthScale": {"name": "宽度比例", "className": "skyeye-pro#com.skyeye.attr.classenum.WidthScale"},
-- 
GitLab