冲突和修改

gdg

2021-01-18 ee2678ecb9e8d686252feed920a7b2284acd54da

 src/main/webapp/warehouse_stock_mng.xhtml

@@ -368,7 +368,7 @@

            <p:panel styleClass="center-body">

               <p:panelGrid columns="2" styleClass="btn" rendered="#{warehouseStockMngController.editFlag==1}">
               <p:panelGrid columns="3" styleClass="btn" rendered="#{warehouseStockMngController.editFlag==1}">
                  <p:commandButton value="入库" styleClass="edit-btn" process="@form"
                               actionListener="#{warehouseStockMngController.addInputStorageOrder}"
                               disabled="#{warehouseStockMngController.editFlag==0}"
@@ -448,17 +448,19 @@
                  <p:column headerText="订单状态">
                     <h:outputText value="#{row.status!=null?row.status.text:''}"></h:outputText>
                  </p:column>
                  <p:column headerText="到货时间">
                     <h:outputText value="#{row.arrivalTime}">
                        <f:convertDateTime pattern="yyyy-MM-dd" locale="zh_CN"/>
                     </h:outputText>
                  </p:column>

                  <p:column headerText="课题组">
                     <h:outputText value="#{row.project}" />
                  </p:column>
                  <p:column headerText="课题组负责人">
                     <h:outputText value="#{row.projectManage}" />
                  </p:column>

                  <p:column headerText="到货时间">
                     <h:outputText value="#{row.arrivalTime}">
                        <f:convertDateTime pattern="yyyy-MM-dd" locale="zh_CN"/>
                     </h:outputText>
                  </p:column>
               </p:dataTable>
            </p:panel>
         </h:form>