From b14564a35173d65b90fe6b56b828c97384abd171 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 25 九月 2023 09:47:26 +0800
Subject: [PATCH] change html
---
.gitignore | 33 +++++++++++
src/main/webapp/order_mng_chanege_code.xhtml | 107 +++++++++++++++++++----------------
src/main/webapp/order_mng_ruku.xhtml | 18 ++++-
pom.xml | 6 +-
4 files changed, 106 insertions(+), 58 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..549e00a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/pom.xml b/pom.xml
index 4f628a5..4eb06f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
<id>central</id>
<name>Maven Repository Switchboard</name>
<layout>default</layout>
- <url>http://repo.springsource.org/libs-milestone</url>
+ <url>https://repo.springsource.org/libs-milestone</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
@@ -21,7 +21,7 @@
<repository>
<id>prime-repo</id>
<name>PrimeFaces Maven Repository</name>
- <url>http://repository.primefaces.org</url>
+ <url>https://repository.primefaces.org</url>
<layout>default</layout>
</repository>
</repositories>
@@ -394,7 +394,7 @@
<profile>
<id>test</id>
<properties>
- <profile.active>test</profile.active>
+ <profile.active>cq</profile.active>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
diff --git a/src/main/webapp/order_mng_chanege_code.xhtml b/src/main/webapp/order_mng_chanege_code.xhtml
index 31f10a1..aeeb03f 100644
--- a/src/main/webapp/order_mng_chanege_code.xhtml
+++ b/src/main/webapp/order_mng_chanege_code.xhtml
@@ -111,13 +111,13 @@
<p:column headerText="批号" width="120">
<!--<p:cellEditor>-->
- <!--<f:facet name="output">-->
- <h:outputText value="#{row.articleNumber}" />
- <!--</f:facet>-->
- <!--<f:facet name="input">-->
- <!--<p:inputText value="#{row.articleNumber}" maxlength="32" style="width: 100%"-->
- <!--required="true" requiredMessage="请输入批号"/>-->
- <!--</f:facet>-->
+ <!--<f:facet name="output">-->
+ <h:outputText value="#{row.articleNumber}" />
+ <!--</f:facet>-->
+ <!--<f:facet name="input">-->
+ <!--<p:inputText value="#{row.articleNumber}" maxlength="32" style="width: 100%"-->
+ <!--required="true" requiredMessage="请输入批号"/>-->
+ <!--</f:facet>-->
<!--</p:cellEditor>-->
</p:column>
@@ -127,9 +127,13 @@
<h:outputText value="#{row.startReagentCode}" />
</f:facet>
<f:facet name="input">
- <p:inputNumber value="#{row.startReagentCode}" maxlength="32" style="width: 100%"
- required="true" requiredMessage="请输入条形码开始"
- decimalPlaces="0" thousandSeparator=""/>
+ <p:inputText value="#{row.startReagentCode}" style="width: 100%" required="true" requiredMessage="请输入条形码开始"
+ maxlength="24"
+ size="24"
+ decimalPlaces="0" thousandSeparator=""
+ onkeyup="this.value = this.value.replace(/\D/g,'')" >
+ </p:inputText>
+
</f:facet>
</p:cellEditor>
</p:column>
@@ -140,66 +144,69 @@
<h:outputText value="#{row.endReagentCode}" />
</f:facet>
<f:facet name="input">
- <p:inputNumber value="#{row.endReagentCode}" maxlength="32" style="width: 100%"
- required="true" requiredMessage="请输入条形码结束"
- decimalPlaces="0" thousandSeparator=""/>
+ <p:inputText value="#{row.endReagentCode}" style="width: 100%" required="true" requiredMessage="请输入条形码结束"
+ maxlength="24"
+ size="24"
+ decimalPlaces="0" thousandSeparator=""
+ onkeyup="this.value = this.value.replace(/\D/g,'')" >
+ </p:inputText>
</f:facet>
</p:cellEditor>
</p:column>
<p:column headerText="仓库名" width="120">
<!--<p:cellEditor>-->
- <!--<f:facet name="output">-->
- <h:outputText value="#{orderMngController.formatWarehouseName(row.houseId)}" />
- <!--</f:facet>-->
- <!--<f:facet name="input">-->
- <!--<p:selectOneMenu value="#{row.houseId}" style="width: 110px"-->
- <!--required="true" requiredMessage="请选择仓库">-->
- <!--<p:ajax event="change" process="@this"-->
- <!--listener="#{orderMngController.onWarehouseSelectChange(row.houseId)}"-->
- <!--update="containerSelect,placeSelect"></p:ajax>-->
- <!--<f:selectItems value="#{orderMngController.warehouseList}" var="item"-->
- <!--itemValue="#{item.id}" itemLabel="#{item.name}"></f:selectItems>-->
- <!--</p:selectOneMenu>-->
- <!--</f:facet>-->
+ <!--<f:facet name="output">-->
+ <h:outputText value="#{orderMngController.formatWarehouseName(row.houseId)}" />
+ <!--</f:facet>-->
+ <!--<f:facet name="input">-->
+ <!--<p:selectOneMenu value="#{row.houseId}" style="width: 110px"-->
+ <!--required="true" requiredMessage="请选择仓库">-->
+ <!--<p:ajax event="change" process="@this"-->
+ <!--listener="#{orderMngController.onWarehouseSelectChange(row.houseId)}"-->
+ <!--update="containerSelect,placeSelect"></p:ajax>-->
+ <!--<f:selectItems value="#{orderMngController.warehouseList}" var="item"-->
+ <!--itemValue="#{item.id}" itemLabel="#{item.name}"></f:selectItems>-->
+ <!--</p:selectOneMenu>-->
+ <!--</f:facet>-->
<!--</p:cellEditor>-->
</p:column>
<p:column headerText="货柜名" width="120">
<!--<p:cellEditor>-->
- <!--<f:facet name="output">-->
- <h:outputText value="#{orderMngController.formatWarehouseContainerName(row.containerId)}" />
- <!--</f:facet>-->
- <!--<f:facet name="input">-->
- <!--<p:selectOneMenu id="containerSelect" value="#{row.containerId}" style="width: 110px"-->
- <!--required="true" requiredMessage="请选择货柜">-->
- <!--<p:ajax event="change" process="@this"-->
- <!--listener="#{orderMngController.onWarehouseContainerSelectChange(row.containerId)}"-->
- <!--update="placeSelect"></p:ajax>-->
- <!--<f:selectItems value="#{orderMngController.warehouseContainerList}" var="item"-->
- <!--itemValue="#{item.id}" itemLabel="#{item.containerCode}"></f:selectItems>-->
- <!--</p:selectOneMenu>-->
- <!--</f:facet>-->
+ <!--<f:facet name="output">-->
+ <h:outputText value="#{orderMngController.formatWarehouseContainerName(row.containerId)}" />
+ <!--</f:facet>-->
+ <!--<f:facet name="input">-->
+ <!--<p:selectOneMenu id="containerSelect" value="#{row.containerId}" style="width: 110px"-->
+ <!--required="true" requiredMessage="请选择货柜">-->
+ <!--<p:ajax event="change" process="@this"-->
+ <!--listener="#{orderMngController.onWarehouseContainerSelectChange(row.containerId)}"-->
+ <!--update="placeSelect"></p:ajax>-->
+ <!--<f:selectItems value="#{orderMngController.warehouseContainerList}" var="item"-->
+ <!--itemValue="#{item.id}" itemLabel="#{item.containerCode}"></f:selectItems>-->
+ <!--</p:selectOneMenu>-->
+ <!--</f:facet>-->
<!--</p:cellEditor>-->
</p:column>
<p:column headerText="货柜位置" width="120">
<!--<p:cellEditor>-->
- <!--<f:facet name="output">-->
- <h:outputText value="#{orderMngController.formatWarehouseContainerPlaceName(row.placeId)}" />
- <!--</f:facet>-->
- <!--<f:facet name="input">-->
- <!--<p:selectOneMenu id="placeSelect" value="#{row.placeId}" style="width: 110px"-->
- <!--required="true" requiredMessage="请选择货柜位置">-->
- <!--<f:selectItems value="#{orderMngController.warehouseContainerPlaceList}" var="item"-->
- <!--itemValue="#{item.id}" itemLabel="#{item.metaValue}"></f:selectItems>-->
- <!--</p:selectOneMenu>-->
- <!--</f:facet>-->
+ <!--<f:facet name="output">-->
+ <h:outputText value="#{orderMngController.formatWarehouseContainerPlaceName(row.placeId)}" />
+ <!--</f:facet>-->
+ <!--<f:facet name="input">-->
+ <!--<p:selectOneMenu id="placeSelect" value="#{row.placeId}" style="width: 110px"-->
+ <!--required="true" requiredMessage="请选择货柜位置">-->
+ <!--<f:selectItems value="#{orderMngController.warehouseContainerPlaceList}" var="item"-->
+ <!--itemValue="#{item.id}" itemLabel="#{item.metaValue}"></f:selectItems>-->
+ <!--</p:selectOneMenu>-->
+ <!--</f:facet>-->
<!--</p:cellEditor>-->
</p:column>
<p:column width="40">
-
+
<p:rowEditor/>
</p:column>
diff --git a/src/main/webapp/order_mng_ruku.xhtml b/src/main/webapp/order_mng_ruku.xhtml
index fad8cbd..f472738 100644
--- a/src/main/webapp/order_mng_ruku.xhtml
+++ b/src/main/webapp/order_mng_ruku.xhtml
@@ -129,8 +129,12 @@
<h:outputText value="#{row.startReagentCode}" />
</f:facet>
<f:facet name="input">
- <p:inputNumber value="#{row.startReagentCode}" maxlength="32" style="width: 100%"
- decimalPlaces="0" thousandSeparator=""/>
+ <p:inputText value="#{row.startReagentCode}" style="width: 100%" required="true" requiredMessage="请输入条形码开始"
+ maxlength="24"
+ size="24"
+ decimalPlaces="0" thousandSeparator=""
+ onkeyup="this.value = this.value.replace(/\D/g,'')" >
+ </p:inputText>
</f:facet>
</p:cellEditor>
</p:column>
@@ -141,8 +145,12 @@
<h:outputText value="#{row.endReagentCode}" />
</f:facet>
<f:facet name="input">
- <p:inputNumber value="#{row.endReagentCode}" maxlength="32" style="width: 100%"
- decimalPlaces="0" thousandSeparator=""/>
+ <p:inputText value="#{row.endReagentCode}" style="width: 100%" required="true" requiredMessage="请输入条形码结束"
+ maxlength="24"
+ size="24"
+ decimalPlaces="0" thousandSeparator=""
+ onkeyup="this.value = this.value.replace(/\D/g,'')" >
+ </p:inputText>
</f:facet>
</p:cellEditor>
</p:column>
@@ -199,7 +207,7 @@
</p:column>
<p:column width="40">
-
+
<p:rowEditor/>
</p:column>
--
Gitblit v1.9.2