Skip to content

F
forbes_crm
Commit 61de956e authored by 黄辉勇's avatar 黄辉勇
Browse files
Options

''

parent b8cd9f92
Hide whitespace changes
Inline Side-by-side
Showing with 1033 additions and 767 deletions
.idea/workspace.xml
View file @ 61de956e
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="5c5955e8-a367-4538-8b22-1de6f1006fed" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/jeethink/jeethink-admin/src/main/resources/application-druid.yml" beforeDir="false" afterPath="$PROJECT_DIR$/jeethink/jeethink-admin/src/main/resources/application-druid.yml" afterDir="false" />
</list>
<list default="true" id="5c5955e8-a367-4538-8b22-1de6f1006fed" name="Default Changelist" comment="" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
......@@ -53,6 +51,7 @@
<workItem from="1616574462972" duration="29000" />
<workItem from="1616632945811" duration="940000" />
<workItem from="1622697665026" duration="399000" />
<workItem from="1622766545211" duration="14000" />
</task>
<servers />
</component>
......@@ -64,9 +63,9 @@
<screen x="0" y="0" width="1280" height="680" />
</state>
<state x="96" y="0" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1280.680@0.0.1280.680" timestamp="1615181359695" />
<state x="421" y="99" key="FileChooserDialogImpl" timestamp="1622697674680">
<state x="421" y="99" key="FileChooserDialogImpl" timestamp="1622766552117">
<screen x="0" y="0" width="1280" height="680" />
</state>
<state x="421" y="99" key="FileChooserDialogImpl/0.0.1280.680@0.0.1280.680" timestamp="1622697674680" />
<state x="421" y="99" key="FileChooserDialogImpl/0.0.1280.680@0.0.1280.680" timestamp="1622766552117" />
</component>
</project>
\ No newline at end of file
jeethink/.idea/workspace.xml
View file @ 61de956e
......@@ -2,7 +2,14 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="d94c205f-9db6-41f8-b7b7-ea3e4a756ff8" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/jeethink-admin/src/main/resources/application-druid.yml" beforeDir="false" afterPath="$PROJECT_DIR$/jeethink-admin/src/main/resources/application-druid.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeethink-crm/src/main/java/com/jeethink/crm/domain/WmsProductAttribute.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeethink-crm/src/main/java/com/jeethink/crm/mapper/WmsProductAttributeMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/jeethink-crm/src/main/resources/mapper/crm/WmsProductAttributeMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeethink-admin/src/main/resources/templates/crm/product/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/jeethink-admin/src/main/resources/templates/crm/product/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeethink-admin/target/classes/templates/crm/order/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/jeethink-admin/target/classes/templates/crm/order/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeethink-admin/target/classes/templates/crm/orderPrice/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/jeethink-admin/target/classes/templates/crm/orderPrice/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeethink-admin/target/classes/templates/crm/product/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/jeethink-admin/target/classes/templates/crm/product/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jeethink-crm/src/main/java/com/jeethink/crm/domain/WmsProduct.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeethink-crm/src/main/java/com/jeethink/crm/domain/WmsProduct.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -13,6 +20,7 @@
<option name="RECENT_TEMPLATES">
<list>
<option value="Class" />
<option value="Interface" />
</list>
</option>
</component>
......@@ -44,12 +52,20 @@
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/jeethink-crm/src/main/resources/mapper/crm" />
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2413793" />
<property name="settings.editor.selected.configurable" value="MavenSettings" />
</component>
<component name="RecentsManager">
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.jeethink.crm.domain" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\software\workspace\forbes_crm\jeethink\jeethink-crm\src\main\resources\mapper\crm" />
</key>
</component>
<component name="RunAnythingCache">
<option name="myCommands">
<command value="mvn install" />
......@@ -104,7 +120,8 @@
<workItem from="1616719974331" duration="13540000" />
<workItem from="1616980755086" duration="19162000" />
<workItem from="1617064670490" duration="25704000" />
<workItem from="1622697676535" duration="1856000" />
<workItem from="1622697676535" duration="3822000" />
<workItem from="1622766554233" duration="4068000" />
</task>
<servers />
</component>
......@@ -116,50 +133,50 @@
<screen x="0" y="0" width="1280" height="680" />
</state>
<state x="96" y="0" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1280.680@0.0.1280.680" timestamp="1622697992147" />
<state x="446" y="34" key="#com.intellij.ide.util.MemberChooser" timestamp="1617068999688">
<state x="446" y="34" key="#com.intellij.ide.util.MemberChooser" timestamp="1622770665249">
<screen x="0" y="0" width="1280" height="680" />
</state>
<state x="446" y="34" key="#com.intellij.ide.util.MemberChooser/0.0.1280.680@0.0.1280.680" timestamp="1617068999688" />
<state x="446" y="34" key="#com.intellij.ide.util.MemberChooser/0.0.1280.680@0.0.1280.680" timestamp="1622770665249" />
<state width="537" height="444" key="DebuggerActiveHint" timestamp="1616637797905">
<screen x="0" y="0" width="1280" height="680" />
</state>
<state width="537" height="444" key="DebuggerActiveHint/0.0.1280.680@0.0.1280.680" timestamp="1616637797905" />
<state x="421" y="99" key="FileChooserDialogImpl" timestamp="1617066948012">
<state x="421" y="99" key="FileChooserDialogImpl" timestamp="1622702895038">
<screen x="0" y="0" width="1280" height="680" />
</state>
<state x="421" y="99" key="FileChooserDialogImpl/0.0.1280.680@0.0.1280.680" timestamp="1617066948012" />
<state width="1222" height="23" key="GridCell.Tab.0.bottom" timestamp="1622699499631">
<state x="421" y="99" key="FileChooserDialogImpl/0.0.1280.680@0.0.1280.680" timestamp="1622702895038" />
<state width="1222" height="143" key="GridCell.Tab.0.bottom" timestamp="1622767079874">
<screen x="0" y="0" width="1280" height="680" />
</state>
<state width="1222" height="23" key="GridCell.Tab.0.bottom/0.0.1280.680@0.0.1280.680" timestamp="1622699499631" />
<state width="1222" height="23" key="GridCell.Tab.0.center" timestamp="1622699499631">
<state width="1222" height="143" key="GridCell.Tab.0.bottom/0.0.1280.680@0.0.1280.680" timestamp="1622767079874" />
<state width="1222" height="143" key="GridCell.Tab.0.center" timestamp="1622767079874">
<screen x="0" y="0" width="1280" height="680" />
</state>
<state width="1222" height="23" key="GridCell.Tab.0.center/0.0.1280.680@0.0.1280.680" timestamp="1622699499631" />
<state width="1222" height="23" key="GridCell.Tab.0.left" timestamp="1622699499631">
<state width="1222" height="143" key="GridCell.Tab.0.center/0.0.1280.680@0.0.1280.680" timestamp="1622767079874" />
<state width="1222" height="143" key="GridCell.Tab.0.left" timestamp="1622767079874">
<screen x="0" y="0" width="1280" height="680" />
</state>
<state width="1222" height="23" key="GridCell.Tab.0.left/0.0.1280.680@0.0.1280.680" timestamp="1622699499631" />
<state width="1222" height="23" key="GridCell.Tab.0.right" timestamp="1622699499631">
<state width="1222" height="143" key="GridCell.Tab.0.left/0.0.1280.680@0.0.1280.680" timestamp="1622767079874" />
<state width="1222" height="143" key="GridCell.Tab.0.right" timestamp="1622767079874">
<screen x="0" y="0" width="1280" height="680" />
</state>
<state width="1222" height="23" key="GridCell.Tab.0.right/0.0.1280.680@0.0.1280.680" timestamp="1622699499631" />
<state width="1222" height="23" key="GridCell.Tab.1.bottom" timestamp="1622699499631">
<state width="1222" height="143" key="GridCell.Tab.0.right/0.0.1280.680@0.0.1280.680" timestamp="1622767079874" />
<state width="1222" height="143" key="GridCell.Tab.1.bottom" timestamp="1622767079874">
<screen x="0" y="0" width="1280" height="680" />
</state>
<state width="1222" height="23" key="GridCell.Tab.1.bottom/0.0.1280.680@0.0.1280.680" timestamp="1622699499631" />
<state width="1222" height="23" key="GridCell.Tab.1.center" timestamp="1622699499631">
<state width="1222" height="143" key="GridCell.Tab.1.bottom/0.0.1280.680@0.0.1280.680" timestamp="1622767079874" />
<state width="1222" height="143" key="GridCell.Tab.1.center" timestamp="1622767079874">
<screen x="0" y="0" width="1280" height="680" />
</state>
<state width="1222" height="23" key="GridCell.Tab.1.center/0.0.1280.680@0.0.1280.680" timestamp="1622699499631" />
<state width="1222" height="23" key="GridCell.Tab.1.left" timestamp="1622699499631">
<state width="1222" height="143" key="GridCell.Tab.1.center/0.0.1280.680@0.0.1280.680" timestamp="1622767079874" />
<state width="1222" height="143" key="GridCell.Tab.1.left" timestamp="1622767079874">
<screen x="0" y="0" width="1280" height="680" />
</state>
<state width="1222" height="23" key="GridCell.Tab.1.left/0.0.1280.680@0.0.1280.680" timestamp="1622699499631" />
<state width="1222" height="23" key="GridCell.Tab.1.right" timestamp="1622699499631">
<state width="1222" height="143" key="GridCell.Tab.1.left/0.0.1280.680@0.0.1280.680" timestamp="1622767079874" />
<state width="1222" height="143" key="GridCell.Tab.1.right" timestamp="1622767079874">
<screen x="0" y="0" width="1280" height="680" />
</state>
<state width="1222" height="23" key="GridCell.Tab.1.right/0.0.1280.680@0.0.1280.680" timestamp="1622699499631" />
<state width="1222" height="143" key="GridCell.Tab.1.right/0.0.1280.680@0.0.1280.680" timestamp="1622767079874" />
<state x="171" y="0" key="Maven.ArtifactSearchDialog" timestamp="1614735610492">
<screen x="0" y="0" width="1280" height="680" />
</state>
......@@ -272,11 +289,6 @@
<line>336</line>
<option name="timeStamp" value="29" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-core/1.6.0/shiro-core-1.6.0.jar!/org/apache/shiro/realm/AuthorizingRealm.class</url>
<line>341</line>
<option name="timeStamp" value="30" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-core/1.6.0/shiro-core-1.6.0.jar!/org/apache/shiro/realm/AuthorizingRealm.class</url>
<line>359</line>
......@@ -362,21 +374,6 @@
<line>73</line>
<option name="timeStamp" value="49" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/jeethink-framework/src/main/java/com/jeethink/framework/shiro/realm/UserRealm.java</url>
<line>58</line>
<option name="timeStamp" value="50" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-core/1.6.0/shiro-core-1.6.0.jar!/org/apache/shiro/authz/ModularRealmAuthorizer.class</url>
<line>195</line>
<option name="timeStamp" value="53" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-core/1.6.0/shiro-core-1.6.0.jar!/org/apache/shiro/mgt/AuthorizingSecurityManager.class</url>
<line>74</line>
<option name="timeStamp" value="54" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/3.0.12.RELEASE/thymeleaf-3.0.12.RELEASE.jar!/org/thymeleaf/processor/element/AbstractAttributeTagProcessor.class</url>
<line>54</line>
......@@ -402,11 +399,6 @@
<line>247</line>
<option name="timeStamp" value="75" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/jeethink-admin/src/main/java/com/jeethink/web/controller/crm/CrmOrderPriceController.java</url>
<line>64</line>
<option name="timeStamp" value="81" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
<watches-manager>
......
jeethink/jeethink-admin/src/main/resources/templates/crm/product/edit.html
View file @ 61de956e
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改产品')" />
</head>
<body class="white-bg">
......
jeethink/jeethink-admin/target/classes/templates/crm/order/edit.html
View file @ 61de956e
......@@ -7,150 +7,177 @@
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-order-edit"
th:object="${crmOrder}">
<h4 class="form-header h4">基本信息</h4>
<input name="orderId" th:field="*{orderId}" type="hidden">
<input name="customerId" type="hidden" id="customerId" />
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">主题：</label>
<div class="col-sm-8">
<input name="orderName" th:field="*{orderName}"
class="form-control" type="text" required>
</div>
</div>
<div class="panel-group" id="accordion">
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="form-header h4 panel-title">
<a data-toggle="collapse"
href="#collapseOne">
基本信息
</a>
</h4>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">成交客户：</label>
<div class="col-sm-8">
<div class="input-group">
<input name="customerName" onclick="selectCustomer()"
th:field="*{customer.customerName}" class="form-control" type="text" placeholder="请选择成交客户 " id="customerName" required readonly>
<span class="input-group-addon"><i class="fa fa-search"></i></span>
<div id="collapseOne" class="panel-collapse collapse in">
<form class="form-horizontal m" id="form-order-edit"
th:object="${crmOrder}">
<input name="orderId" th:field="*{orderId}" type="hidden">
<input name="customerId" type="hidden" id="customerId" />
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">主题：</label>
<div class="col-sm-8">
<input name="orderName" th:field="*{orderName}"
class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">成交客户：</label>
<div class="col-sm-8">
<div class="input-group">
<input name="customerName" onclick="selectCustomer()"
th:field="*{customer.customerName}" class="form-control" type="text" placeholder="请选择成交客户 " id="customerName" required readonly>
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">成交总额：</label>
<div class="col-sm-6">
<input name="totalPrice" th:field="*{totalPrice}" class="form-control" type="text" required>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">成交总额：</label>
<div class="col-sm-8">
<div style="display: flex;border: 1px solid #e5e6e7;border-radius: 4px;width: 100%;">
<input name="totalPrice" th:field="*{totalPrice}" class="form-control" type="text" required style="border: none;width: 70%;">
<i class="fa fa fa-cny" style="width: 30%;display: inline-block;line-height: 30px;text-align: center"><a href="javascript:autoCaculate();">自动计算</a></i>
</div>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">总成本：</label>
<div class="col-sm-8">
<div style="display: flex;border: 1px solid #e5e6e7;border-radius: 4px;width: 100%;">
<input name="costPrice" th:field="*{costPrice}" class="form-control" type="text" required style="border: none;width: 70%;">
<i class="fa fa fa-cny" style="width: 30%;display: inline-block;line-height: 30px;text-align: center"><a href="javascript:autoCaculate();">自动计算</a></i>
</div>
</div>
</div>
</div>
</div>
<div class="col-sm-2">
<i class="fa fa fa-cny"><a href="javascript:autoCaculate();">自动计算</a></i>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">成交/签约时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input name="orderDate" th:value="${#dates.format(crmOrder.orderDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
</div>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">付款方式：</label>
<div class="col-sm-8">
<select name="payType" class="form-control m-b" th:with="type=${@dict.getType('pay_type')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{payType}"></option>
</select>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">总成本：</label>
<div class="col-sm-6">
<input name="costPrice" th:field="*{costPrice}" class="form-control" type="text" required>
</div>
<div class="col-sm-2">
<i class="fa fa fa-cny"><a href="javascript:autoCaculate();">自动计算</a></i>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">有效期开始时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input name="validStart" th:value="${#dates.format(crmOrder.validStart, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
</div>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">有效期结束时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input name="validEnd" th:value="${#dates.format(crmOrder.validEnd, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">成交/签约时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input name="orderDate" th:value="${#dates.format(crmOrder.orderDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
</div>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">付款方式：</label>
<div class="col-sm-8">
<select name="payType" class="form-control m-b" th:with="type=${@dict.getType('pay_type')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{payType}"></option>
</select>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">有效期开始时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input name="validStart" th:value="${#dates.format(crmOrder.validStart, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
</div>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">有效期结束时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input name="validEnd" th:value="${#dates.format(crmOrder.validEnd, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">订单状态：</label>
<div class="col-sm-8">
<select name="orderStatus" class="form-control m-b" th:with="type=${@dict.getType('order_status')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{orderStatus}"></option>
</select>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">合同ID：</label>
<div class="col-sm-8">
<div class="input-group">
<input name="contractId" th:field="*{contractId}" class="form-control" type="text">
<span class="input-group-addon"><i class="fa fa-search"></i></span>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">订单状态：</label>
<div class="col-sm-8">
<select name="orderStatus" class="form-control m-b" th:with="type=${@dict.getType('order_status')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{orderStatus}"></option>
</select>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">合同ID：</label>
<div class="col-sm-8">
<div class="input-group">
<input name="contractId" th:field="*{contractId}" class="form-control" type="text">
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="form-group">
<label class="col-xs-2 control-label">备注：</label>
<div class="col-xs-10">
<textarea name="remark" maxlength="500" class="form-control" rows="3">[[*{remark}]]</textarea>
<div class="row">
<div class="col-sm-12">
<div class="form-group">
<label class="col-xs-2 control-label">备注：</label>
<div class="col-xs-10">
<textarea name="remark" maxlength="500" class="form-control" rows="3">[[*{remark}]]</textarea>
</div>
</div>
</div>
</div>
</div>
</form>
</div>
</div>
</form>
<h4 class="form-header h4">产品信息</h4>
<div class="container-div">
<div class="row">
<div class="btn-group-sm" id="toolbarProduct" role="group">
<a class="btn btn-success" onclick="addProduct();"> <i
class="fa fa-plus"></i> 添加
</a>
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="form-header h4 panel-title">
<a data-toggle="collapse"
href="#collapseTwo">
产品信息
</a>
</h4>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
<div id="collapseTwo" class="panel-collapse collapse">
<div class="container-div">
<div class="row">
<div class="btn-group-sm" id="toolbarProduct" role="group">
<a class="btn btn-success" onclick="addProduct();"> <i
class="fa fa-plus"></i> 添加
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
</div>
</div>
</div>
......
jeethink/jeethink-admin/target/classes/templates/crm/orderPrice/edit.html
View file @ 61de956e
......@@ -7,590 +7,600 @@
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-order-edit" th:object="${crmOrderPrice}">
<h4 class="form-header h4">基本信息</h4>
<input name="orderId" th:field="*{orderId}" type="hidden">
<input name="customerId" type="hidden" id="customerId" />
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">报价客户：</label>
<div class="col-sm-8">
<div class="input-group">
<input name="customerName" onclick="selectCustomer()" th:field="*{customer.customerName}" class="form-control" type="text" placeholder="请选择报价客户 " id="customerName" required readonly>
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">主题：</label>
<div class="col-sm-8">
<input name="orderName" th:field="*{orderName}" class="form-control" type="text" required>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">报价总额：</label>
<div class="col-sm-6">
<input name="totalPrice" th:field="*{totalPrice}" class="form-control" type="text" required>
<input name="costPrice" th:field="*{costPrice}" class="form-control" type="hidden">
</div>
<div class="col-sm-2">
<i class="fa fa fa-cny"><a href="javascript:autoCaculate();">自动计算</a></i>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">币种：</label>
<div class="col-sm-8">
<select name="currency" class="form-control m-b" >
<option value="RMB" >人名币</option>
<option value="USD" >美金</option>
</select>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">单价：</label>
<div class="col-sm-8">
<input name="price" class="form-control" type="text" th:field="*{price}" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label is-required">重量：</label>
<div class="col-sm-8">
<input name="weight" th:field="*{weight}" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">总数量：</label>
<div class="col-sm-8">
<input name="totalQuantity" class="form-control" type="text" th:field="*{totalQuantity}" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label is-required">税率：</label>
<div class="col-sm-8">
<input name="exchRate" th:field="*{exchRate}" class="form-control" type="text" required>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">运费：</label>
<div class="col-sm-8">
<input name="freight" class="form-control" type="text" th:field="*{freight}" required>
<i class="fa fa fa-cny" style="width: 84px"><a href="javascript:autoCaculatea();">自动计算</a></i>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label ">总重量：</label>
<div class="col-sm-8">
<input name="totalWeight" th:field="*{totalWeight}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">装柜标准：</label>
<div class="col-sm-8">
<input name="contStand" class="form-control" type="text" th:field="*{contStand}" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label ">装柜重量：</label>
<div class="col-sm-8">
<input name="contWeight" th:field="*{contWeight}" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">货款总计：</label>
<div class="col-sm-8">
<input name="totalPaymentGoods" class="form-control" type="text" th:field="*{totalPaymentGoods}" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label ">货款增值税：</label>
<div class="col-sm-8">
<input name="addedTax" th:field="*{addedTax}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">运输增值税：</label>
<div class="col-sm-8">
<input name="transportAddedTax" class="form-control" type="text" th:field="*{transportAddedTax}" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label ">毛利增值税：</label>
<div class="col-sm-8">
<input name="profitAddedTax" th:field="*{profitAddedTax}" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">退税：</label>
<div class="col-sm-8">
<input name="taxRebates" class="form-control" type="text" th:field="*{taxRebates}" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label ">开票金额：</label>
<div class="col-sm-8">
<input name="invoiceAmount" th:field="*{invoiceAmount}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">末税总值：</label>
<div class="col-sm-8">
<input name="totalEndTax" class="form-control" type="text" th:field="*{totalEndTax}" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label ">FOB $/kg：</label>
<div class="col-sm-8">
<input name="fob" th:field="*{fob}" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">美金价值：</label>
<div class="col-sm-8">
<input name="dollarVal" class="form-control" type="text" th:field="*{dollarVal}" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label is-required">管理费：</label>
<div class="col-sm-8">
<input name="managFee" class="form-control" type="text" th:field="*{managFee}" required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">毛利：</label>
<div class="col-sm-8">
<input name="profit" class="form-control" type="text" th:field="*{profit}" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label ">净利：</label>
<div class="col-sm-8">
<input name="netProfit" th:field="*{netProfit}" class="form-control" type="text">
</div>
</div>
</div>
</div>
<!--start-->
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-2 control-label">FOB $/kg(5%)：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="fobFive" th:field="*{fobFive}" class="form-control" type="text">
</div>
</div>
<label class="col-sm-2 control-label">美金价值：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="dollarValFive" th:field="*{dollarValFive}" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-2 control-label">毛利：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="profitFive" th:field="*{profitFive}" class="form-control" type="text">
</div>
</div>
<label class="col-sm-2 control-label">管理费：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="managFeeFive" th:field="*{managFeeFive}" class="form-control" type="text">
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">净利：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="netProfitFive" th:field="*{netProfitFive}" class="form-control" type="text">
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-2 control-label">FOB $/kg(10%)：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="fobTen" th:field="*{fobTen}" class="form-control" type="text">
</div>
</div>
<label class="col-sm-2 control-label">美金价值：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="dollarValTen" th:field="*{dollarValTen}" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-2 control-label">毛利：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="profitTen" th:field="*{profitTen}" class="form-control" type="text">
</div>
</div>
<label class="col-sm-2 control-label">管理费：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="managFeeTen" th:field="*{managFeeTen}" class="form-control" type="text">
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">净利：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="netProfitTen" th:field="*{netProfitTen}" class="form-control" type="text">
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-2 control-label">FOB $/kg(15%)：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="fobFifteen" th:field="*{fobFifteen}" class="form-control" type="text">
</div>
</div>
<label class="col-sm-2 control-label">美金价值：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="dollarValFifteen" th:field="*{dollarValFifteen}" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-2 control-label">毛利：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="profitFifteen" th:field="*{profitFifteen}" class="form-control" type="text">
</div>
</div>
<label class="col-sm-2 control-label">管理费：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="managFeeFifteen" th:field="*{managFeeFifteen}" class="form-control" type="text">
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">净利：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="netProfitFifteen" th:field="*{netProfitFifteen}" class="form-control" type="text">
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-2 control-label">FOB $/kg(20%)：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="fobTwenty" th:field="*{fobTwenty}" class="form-control" type="text">
</div>
</div>
<label class="col-sm-2 control-label">美金价值：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="dollarValTwenty" th:field="*{dollarValTwenty}" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-2 control-label">毛利：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="profitTwenty" th:field="*{profitTwenty}" class="form-control" type="text">
</div>
</div>
<label class="col-sm-2 control-label">管理费：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="managFeeTwenty" th:field="*{managFeeTwenty}" class="form-control" type="text">
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">净利：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="netProfitTwenty" th:field="*{netProfitTwenty}" class="form-control" type="text">
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-2 control-label">FOB $/kg(25%)：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="fobTwentyFive" th:field="*{fobTwentyFive}" class="form-control" type="text">
</div>
</div>
<label class="col-sm-2 control-label">美金价值：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="dollarValTwentyFive" th:field="*{dollarValTwentyFive}" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-2 control-label">毛利：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="profitTwentyFive" th:field="*{profitTwentyFive}" class="form-control" type="text">
<div class="panel-group" id="accordion">
<form class="form-horizontal" id="form-order-edit" th:object="${crmOrderPrice}">
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="form-header h4 panel-title">
<a data-toggle="collapse" data-parent="#accordion"
href="#collapseOne">
基本信息
</a>
</h4>
</div>
<div id="collapseOne" class="panel-collapse collapse in">
<div class="panel-body">
<input name="orderId" th:field="*{orderId}" type="hidden">
<input name="customerId" type="hidden" id="customerId" />
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">报价客户：</label>
<div class="col-sm-8">
<div class="input-group">
<input name="customerName" onclick="selectCustomer()" th:field="*{customer.customerName}" class="form-control" type="text" placeholder="请选择报价客户 " id="customerName" required readonly>
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">主题：</label>
<div class="col-sm-8">
<input name="orderName" th:field="*{orderName}" class="form-control" type="text" required>
</div>
</div>
</div>
</div>
</div>
<label class="col-sm-2 control-label">管理费：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="managFeeTwentyFive" th:field="*{managFeeTwentyFive}" class="form-control" type="text">
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">净利：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="netProfitTwentyFive" th:field="*{netProfitTwentyFive}" class="form-control" type="text">
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-2 control-label">FOB $/kg(30%)：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="fobThirty" th:field="*{fobThirty}" class="form-control" type="text">
</div>
</div>
<label class="col-sm-2 control-label">美金价值：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="dollarValThirty" th:field="*{dollarValThirty}" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-2 control-label">毛利：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="profitThirty" th:field="*{profitThirty}" class="form-control" type="text">
</div>
</div>
<label class="col-sm-2 control-label">管理费：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="managFeeThirty" th:field="*{managFeeThirty}" class="form-control" type="text">
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">净利：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="netProfitThirty" th:field="*{netProfitThirty}" class="form-control" type="text">
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-2 control-label">FOB $/kg(35%)：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="fobThirtyFive" th:field="*{fobThirtyFive}" class="form-control" type="text">
</div>
</div>
<label class="col-sm-2 control-label">美金价值：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="dollarValThirtyFive" th:field="*{dollarValThirtyFive}" class="form-control" type="text">
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">报价总额：</label>
<div class="col-sm-6">
<input name="totalPrice" th:field="*{totalPrice}" class="form-control" type="text" required>
<input name="costPrice" th:field="*{costPrice}" class="form-control" type="hidden">
</div>
<div class="col-sm-2">
<i class="fa fa fa-cny"><a href="javascript:autoCaculate();">自动计算</a></i>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">币种：</label>
<div class="col-sm-8">
<select name="currency" class="form-control m-b" >
<option value="RMB" >人名币</option>
<option value="USD" >美金</option>
</select>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">单价：</label>
<div class="col-sm-8">
<input name="price" class="form-control" type="text" th:field="*{price}" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label is-required">重量：</label>
<div class="col-sm-8">
<input name="weight" th:field="*{weight}" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">总数量：</label>
<div class="col-sm-8">
<input name="totalQuantity" class="form-control" type="text" th:field="*{totalQuantity}" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label is-required">税率：</label>
<div class="col-sm-8">
<input name="exchRate" th:field="*{exchRate}" class="form-control" type="text" required>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">运费：</label>
<div class="col-sm-8">
<input name="freight" class="form-control" type="text" th:field="*{freight}" required>
<i class="fa fa fa-cny" style="width: 84px"><a href="javascript:autoCaculatea();">自动计算</a></i>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label ">总重量：</label>
<div class="col-sm-8">
<input name="totalWeight" th:field="*{totalWeight}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">装柜标准：</label>
<div class="col-sm-8">
<input name="contStand" class="form-control" type="text" th:field="*{contStand}" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label ">装柜重量：</label>
<div class="col-sm-8">
<input name="contWeight" th:field="*{contWeight}" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">货款总计：</label>
<div class="col-sm-8">
<input name="totalPaymentGoods" class="form-control" type="text" th:field="*{totalPaymentGoods}" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label ">货款增值税：</label>
<div class="col-sm-8">
<input name="addedTax" th:field="*{addedTax}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">运输增值税：</label>
<div class="col-sm-8">
<input name="transportAddedTax" class="form-control" type="text" th:field="*{transportAddedTax}" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label ">毛利增值税：</label>
<div class="col-sm-8">
<input name="profitAddedTax" th:field="*{profitAddedTax}" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">退税：</label>
<div class="col-sm-8">
<input name="taxRebates" class="form-control" type="text" th:field="*{taxRebates}" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label ">开票金额：</label>
<div class="col-sm-8">
<input name="invoiceAmount" th:field="*{invoiceAmount}" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">末税总值：</label>
<div class="col-sm-8">
<input name="totalEndTax" class="form-control" type="text" th:field="*{totalEndTax}" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label ">FOB $/kg：</label>
<div class="col-sm-8">
<input name="fob" th:field="*{fob}" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">美金价值：</label>
<div class="col-sm-8">
<input name="dollarVal" class="form-control" type="text" th:field="*{dollarVal}" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label is-required">管理费：</label>
<div class="col-sm-8">
<input name="managFee" class="form-control" type="text" th:field="*{managFee}" required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">毛利：</label>
<div class="col-sm-8">
<input name="profit" class="form-control" type="text" th:field="*{profit}" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label ">净利：</label>
<div class="col-sm-8">
<input name="netProfit" th:field="*{netProfit}" class="form-control" type="text">
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!--start-->
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="form-header h4 panel-title">
<a data-toggle="collapse" data-parent="#accordion"
href="#collapseTwo">
成本信息
</a>
</h4>
</div>
<div id="collapseTwo" class="panel-collapse collapse">
<div class="panel-body">
<div class="row">
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">FOB$/kg(5%)：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="fobFive" th:field="*{fobFive}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">10%：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="fobTen" th:field="*{fobTen}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">15%：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="fobTen" th:field="*{fobFifteen}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">20%：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="fobTen" th:field="*{fobTwenty}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">25%：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="fobTen" th:field="*{fobTwentyFive}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">30%：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="fobTen" th:field="*{fobThirty}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">35%：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="fobTen" th:field="*{fobThirtyFive}" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">美金价值(5%)：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="dollarValFive" th:field="*{dollarValFive}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">10%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="dollarValTen" th:field="*{dollarValTen}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">15%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="dollarValFifteen" th:field="*{dollarValFifteen}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">20%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="dollarValFifteen" th:field="*{dollarValTwenty}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">25%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="dollarValFifteen" th:field="*{dollarValTwentyFive}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">30%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="dollarValFifteen" th:field="*{dollarValThirty}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">35%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="dollarValFifteen" th:field="*{dollarValThirtyFive}" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">毛利(5%)：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="profitFive" th:field="*{profitFive}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">10%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="profitTen" th:field="*{profitTen}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">15%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="profitFifteen" th:field="*{profitFifteen}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">20%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="profitFifteen" th:field="*{profitTwenty}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">25%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="profitFifteen" th:field="*{profitTwentyFive}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">30%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="profitFifteen" th:field="*{profitThirty}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">35%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="profitFifteen" th:field="*{profitThirtyFive}" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">管理费(5%)：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="managFeeFive" th:field="*{managFeeFive}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">10%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="managFeeTen" th:field="*{managFeeTen}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">15%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="managFeeFifteen" th:field="*{managFeeFifteen}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">20%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="managFeeFifteen" th:field="*{managFeeTwenty}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">25%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="managFeeFifteen" th:field="*{managFeeTwentyFive}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">30%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="managFeeFifteen" th:field="*{managFeeThirty}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">35%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="managFeeFifteen" th:field="*{managFeeThirtyFive}" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">净利(5%)：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="netProfitFive" th:field="*{netProfitFive}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">10%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="netProfitTen" th:field="*{netProfitTen}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">15%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="netProfitFifteen" th:field="*{netProfitFifteen}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">20%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="netProfitFifteen" th:field="*{netProfitTwenty}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">25%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="netProfitFifteen" th:field="*{netProfitTwentyFive}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">30%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="netProfitFifteen" th:field="*{netProfitThirty}" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group col-sm-3">
<label class="col-sm-4 control-label">35%:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="netProfitFifteen" th:field="*{netProfitThirtyFive}" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">报价人：</label>
<div class="col-sm-8">
<input name="prcieBy" th:field="*{prcieBy}" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">报价时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input name="prcieEndDate" th:value="${#dates.format(crmOrderPrice.prcieEndDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
</div>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">报价有效截止时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input name="prcieEndDate" th:value="${#dates.format(crmOrderPrice.prcieEndDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="form-group">
<label class="col-xs-2 control-label">备注：</label>
<div class="col-xs-10">
<textarea name="remark" maxlength="500" class="form-control" rows="3">[[*{remark}]]</textarea>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</form>
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="form-header h4 panel-title">
<a data-toggle="collapse" data-parent="#accordion"
href="#collapseThree">
产品信息
</a>
</h4>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-2 control-label">毛利：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="profitThirtyFive" th:field="*{profitThirtyFive}" class="form-control" type="text">
<div id="collapseThree" class="panel-collapse collapse">
<div class="container-div panel-body">
<div class="row">
<div class="btn-group-sm" id="toolbarProduct" role="group">
<a class="btn btn-success" onclick="addProduct();"> <i
class="fa fa-plus"></i> 添加
</a>
</div>
</div>
<label class="col-sm-2 control-label">管理费：</label>
<div class="col-sm-4">
<div class="input-group date">
<input name="managFeeThirtyFive" th:field="*{managFeeThirtyFive}" class="form-control" type="text">
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">净利：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="netProfitThirtyFive" th:field="*{netProfitThirtyFive}" class="form-control" type="text">
</div>
</div>
</div>
</div>
</div>
<!--end-->
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">报价人：</label>
<div class="col-sm-8">
<input name="prcieBy" th:field="*{prcieBy}" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">报价时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input name="prcieEndDate" th:value="${#dates.format(crmOrderPrice.prcieEndDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
</div>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">报价有效截止时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input name="prcieEndDate" th:value="${#dates.format(crmOrderPrice.prcieEndDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="form-group">
<label class="col-xs-2 control-label">备注：</label>
<div class="col-xs-10">
<textarea name="remark" maxlength="500" class="form-control" rows="3">[[*{remark}]]</textarea>
</div>
</div>
</div>
</div>
</form>
<h4 class="form-header h4">产品信息</h4>
<div class="container-div">
<div class="row">
<div class="btn-group-sm" id="toolbarProduct" role="group">
<a class="btn btn-success" onclick="addProduct();"> <i
class="fa fa-plus"></i> 添加
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-offset-5 col-sm-10">
......
jeethink/jeethink-admin/target/classes/templates/crm/product/edit.html
View file @ 61de956e
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改产品')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-product-edit" th:object="${wmsProduct}">
<input name="productId" th:field="*{productId}" type="hidden">
......@@ -90,11 +93,58 @@
</div>
</div>
<div class="form-group">
<label class="col-xs-3 control-label">备注：</label>
<div class="col-xs-8">
<textarea name="remark" maxlength="500" class="form-control" rows="3">[[*{remark}]]</textarea>
</div>
<label class="col-xs-3 control-label">备注：</label>
<div class="col-xs-8">
<textarea name="remark" maxlength="500" class="form-control" rows="3">[[*{remark}]]</textarea>
</div>
</div>
<div>
<p onclick="tableChange()"><a href="javascript:;">添加</a></p>
<!-- <button onclick="tableChange()">Copy Text</button>-->
<table class="table table-bordered" id="tables">
<thead>
<tr>
<th>名称</th>
<th>值</th>
<th>操作</th>
</tr>
</thead>
<tbody id="tbody">
<tr>
<td align="center">
<input type="text" name="NO[]" size="2" />
</td>
<td align="center">
<input type="text" name="serial_number[]" />
</td>
<td>
<input type="button" id="Button2" onClick="deltr(this)" value="删行">
</td>
</tr>
</tbody>
</table>
<script type="text/javascript">
//添加表格
function tableChange() {
var tableHtml ="";
tableHtml += '<tr>'
+'<td align="center"><input type="text" name="NO[]" size="2" /> </td>'
+'<td align="center"><input type="text" name="serial_number[]"/></td>'
+'<td><input type="button" onClick="deltr(this)" value="删行"></td>'
+'</tr>';
$("#tbody").append(tableHtml) ; //在表格后面添加一行
}
function deltr(opp) {
var length = $("#tbody tr").length;
if (length <= 1) {
alert("至少保留一行");
} else {
$(opp).parent().parent().remove();//移除当前行
}
}
</script>
</div>
</form>
</div>
<div class="row">
......@@ -104,7 +154,9 @@
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var argsList = []
var prefix = ctx + "crm/product";
$("#form-product-edit").validate({
focusCleanup: true
......@@ -136,7 +188,7 @@
var url = prefix + '/image/'+productId;
$.modal.open("修改产品图片", url);
}
/*产品管理-编辑-选择产品分类树*/
function selectCatogory() {
var treeId = $("#treeId").val();
......@@ -161,5 +213,6 @@
}
}
</script>
</body>
</html>
\ No newline at end of file
jeethink/jeethink-crm/src/main/java/com/jeethink/crm/domain/WmsProduct.java
View file @ 61de956e
......@@ -6,6 +6,8 @@ import com.jeethink.common.annotation.Excel;
import com.jeethink.common.annotation.Excel.Type;
import com.jeethink.common.core.domain.BaseEntity;
import java.util.List;
/**
* 产品对象 wms_product
*
......@@ -69,6 +71,9 @@ public class WmsProduct extends BaseEntity
/** 产品图片 */
private String productImage;
/***产品属性**/
private List<WmsProductAttribute> wmsProductAttributes;
public void setProductId(Long productId)
{
this.productId = productId;
......@@ -205,6 +210,14 @@ public class WmsProduct extends BaseEntity
}
public List<WmsProductAttribute> getWmsProductAttributes() {
return wmsProductAttributes;
}
public void setWmsProductAttributes(List<WmsProductAttribute> wmsProductAttributes) {
this.wmsProductAttributes = wmsProductAttributes;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
......
jeethink/jeethink-crm/src/main/java/com/jeethink/crm/domain/WmsProductAttribute.java 0 → 100644
View file @ 61de956e
package com.jeethink.crm.domain;
import com.jeethink.common.annotation.Excel;
import com.jeethink.common.annotation.Excel.Type;
import com.jeethink.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* 产品对象 wms_product_attribute
*
* @author jeethink
* @date 2020-03-12
*/
public class WmsProductAttribute extends BaseEntity
{
private static final long serialVersionUID = 1L;
/**属性ID**/
private Long attributeId;
/** 产品ID */
private Long productId;
/***属性名**/
private String name;
/**属性值**/
private String attrVal;
/** 删除标识 */
private String delFlag;
public Long getAttributeId() {
return attributeId;
}
public void setAttributeId(Long attributeId) {
this.attributeId = attributeId;
}
public Long getProductId() {
return productId;
}
public void setProductId(Long productId) {
this.productId = productId;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getAttrVal() {
return attrVal;
}
public void setAttrVal(String attrVal) {
this.attrVal = attrVal;
}
public String getDelFlag() {
return delFlag;
}
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
}
jeethink/jeethink-crm/src/main/java/com/jeethink/crm/mapper/WmsProductAttributeMapper.java 0 → 100644
View file @ 61de956e
package com.jeethink.crm.mapper;
import com.jeethink.crm.domain.WmsProduct;
import com.jeethink.crm.domain.WmsProductAttribute;
import java.util.List;
/***
* 产品属性
*/
public interface WmsProductAttributeMapper {
/***
* 新增产品属性
* @param productAttribute
* @return
*/
public int insertWmsProductAttribute(WmsProductAttribute productAttribute);
/***
* 删除产品属性
* @param attributeId
* @return
*/
public int deleteWmsProductAttributeById(Long attributeId);
/***
* 批量删除属性
* @param attributeIds
* @return
*/
public int deleteWmsProductAttributeByIds(String[] attributeIds);
/***
* 删除产品属性
* @param prodId
* @return
*/
public int deleteWmsProductAttributeByProdId(Long prodId);
}
jeethink/jeethink-crm/src/main/resources/mapper/crm/WmsProductAttributeMapper.xml 0 → 100644
View file @ 61de956e
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jeethink.crm.mapper.WmsProductAttributeMapper">
<resultMap type="WmsProductAttribute" id="WmsProductAttributeResult">
<id property="attributeId" column="attribute_id" />
<result property="productId" column="product_id" />
<result property="name" column="name" />
<result property="attrVal" column="attr_val" />
<result property="delFlag" column="del_flag" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<insert id="insertWmsProductAttribute" parameterType="WmsProductAttribute" useGeneratedKeys="true" keyProperty="attributeId">
insert into wms_product_attribute
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="productId != null ">product_id,</if>
<if test="name != null ">name,</if>
<if test="attrVal != null and productName != ''">attr_val,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="createTime != null ">create_time,</if>
<if test="updateBy != null and updateBy != ''">update_by,</if>
<if test="updateTime != null ">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="productId != null ">#{productId},</if>
<if test="name != null ">#{name},</if>
<if test="attrVal != null and attrVal != ''">#{attrVal},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="createTime != null ">#{createTime},</if>
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
<if test="updateTime != null ">#{updateTime},</if>
</trim>
</insert>
<delete id="deleteWmsProductAttributeById" parameterType="Long">
delete from wms_product_attribute where attribute_id = #{attributeId}
</delete>
<delete id="deleteWmsProductAttributeByIds" parameterType="String">
delete from wms_product_attribute where attribute_id in
<foreach item="attributeId" collection="array" open="(" separator="," close=")">
#{attributeId}
</foreach>
</delete>
<delete id="deleteWmsProductAttributeByProdId" parameterType="Long">
delete from wms_product_attribute where product_id = #{prodId}
</delete>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment