2 Commits 119b98d060 ... 8412a13b72

Author SHA1 Message Date
  ningsy 8412a13b72 Merge remote-tracking branch 'origin/master' 4 years ago
  ningsy d4cf70c55e 销售目标与达成修改 nsy update 4 years ago

+ 0 - 151
suishenbang-order/src/main/resources/templates/order/orderSalesDetail/add.html

@@ -1,151 +0,0 @@
-<!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-detail-add">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">是否删除:</label>
-                <div class="col-sm-8">
-                    <input name="isDelete" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">公司代码:</label>
-                <div class="col-sm-8">
-                    <input name="companyCode" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">公司名称:</label>
-                <div class="col-sm-8">
-                    <input name="companyName" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">销售大区代码:</label>
-                <div class="col-sm-8">
-                    <input name="saledeptCode" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">销售大区名称:</label>
-                <div class="col-sm-8">
-                    <input name="saledeptName" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">销售部代码:</label>
-                <div class="col-sm-8">
-                    <input name="officeCode" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">销售部名称:</label>
-                <div class="col-sm-8">
-                    <input name="officeName" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">销售分部/推广组:</label>
-                <div class="col-sm-8">
-                    <input name="subofficeCode" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">销售分部/推广组:</label>
-                <div class="col-sm-8">
-                    <input name="subofficeName" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">工号:</label>
-                <div class="col-sm-8">
-                    <input name="empId" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">销售员:</label>
-                <div class="col-sm-8">
-                    <input name="empName" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">经销商代码:</label>
-                <div class="col-sm-8">
-                    <input name="customerId" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">经销商名称:</label>
-                <div class="col-sm-8">
-                    <input name="customerName" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">已复核:</label>
-                <div class="col-sm-8">
-                    <input name="nowYearAct" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">预算:</label>
-                <div class="col-sm-8">
-                    <input name="nowYearBud" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">未复核:</label>
-                <div class="col-sm-8">
-                    <input name="reviewNo" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">未清:</label>
-                <div class="col-sm-8">
-                    <input name="uncleared" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">冻结:</label>
-                <div class="col-sm-8">
-                    <input name="freeze" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">销售凭证数量:</label>
-                <div class="col-sm-8">
-                    <input name="orderNum" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">日期:</label>
-                <div class="col-sm-8">
-                    <input name="calMonth" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">数据更新时间:</label>
-                <div class="col-sm-8">
-                    <input name="runTime" class="form-control" type="text">
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script type="text/javascript">
-        var prefix = ctx + "OrderSalesDetail/detail"
-        $("#form-detail-add").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/add", $('#form-detail-add').serialize());
-            }
-        }
-    </script>
-</body>
-</html>

+ 10 - 10
suishenbang-order/src/main/resources/templates/order/orderSalesDetail/edit.html

@@ -13,48 +13,48 @@
                     <input name="isDelete" th:field="*{isDelete}" class="form-control" type="text">
                 </div>
             </div>-->
-            <div class="form-group">    
+           <!-- <div class="form-group">
                 <label class="col-sm-3 control-label">公司代码:</label>
                 <div class="col-sm-8">
                     <span class="form-control" th:text="*{companyCode}"></span>
-                   <!-- <input name="companyCode" th:field="*{companyCode}" class="form-control" type="text">-->
+                   &lt;!&ndash; <input name="companyCode" th:field="*{companyCode}" class="form-control" type="text">&ndash;&gt;
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">公司名称:</label>
                 <div class="col-sm-8">
                     <span class="form-control" th:text="*{companyName}"></span>
-                    <!--<input name="companyName" th:field="*{companyName}" class="form-control" type="text">-->
+                    &lt;!&ndash;<input name="companyName" th:field="*{companyName}" class="form-control" type="text">&ndash;&gt;
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">销售大区代码:</label>
                 <div class="col-sm-8">
                     <span class="form-control" th:text="*{saledeptCode}"></span>
-                    <!--<input name="saledeptCode" th:field="*{saledeptCode}" class="form-control" type="text">-->
+                    &lt;!&ndash;<input name="saledeptCode" th:field="*{saledeptCode}" class="form-control" type="text">&ndash;&gt;
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">销售大区名称:</label>
                 <div class="col-sm-8">
                     <span class="form-control" th:text="*{saledeptName}"></span>
-                    <!--<input name="saledeptName" th:field="*{saledeptName}" class="form-control" type="text">-->
+                    &lt;!&ndash;<input name="saledeptName" th:field="*{saledeptName}" class="form-control" type="text">&ndash;&gt;
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">销售部代码:</label>
                 <div class="col-sm-8">
                     <span class="form-control" th:text="*{officeCode}"></span>
-                    <!--<input name="officeCode" th:field="*{officeCode}" class="form-control" type="text">-->
+                    &lt;!&ndash;<input name="officeCode" th:field="*{officeCode}" class="form-control" type="text">&ndash;&gt;
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">销售部名称:</label>
                 <div class="col-sm-8">
                     <span class="form-control" th:text="*{officeName}"></span>
-                    <!--<input name="officeName" th:field="*{officeName}" class="form-control" type="text">-->
+                    &lt;!&ndash;<input name="officeName" th:field="*{officeName}" class="form-control" type="text">&ndash;&gt;
                 </div>
-            </div>
+            </div>-->
             <div class="form-group">    
                 <label class="col-sm-3 control-label">销售分部/推广组代码:</label>
                 <div class="col-sm-8">
@@ -70,14 +70,14 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">工号:</label>
+                <label class="col-sm-3 control-label">销售员代码:</label>
                 <div class="col-sm-8">
                     <span class="form-control" th:text="*{empId}"></span>
                     <!--<input name="empId" th:field="*{empId}" class="form-control" type="text">-->
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">销售员:</label>
+                <label class="col-sm-3 control-label">销售员姓名:</label>
                 <div class="col-sm-8">
                     <span class="form-control" th:text="*{empName}"></span>
                     <!--<input name="empName" th:field="*{empName}" class="form-control" type="text">-->

+ 9 - 60
suishenbang-order/src/main/resources/templates/order/orderSalesDetail/orderSalesDetail.html

@@ -11,27 +11,11 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <p>公司名称:</p>
-                                <input type="text" name="companyName"/>
-                            </li>
-                            <li>
-                                <p>大区名称:</p>
-                                <input type="text" name="saledeptName"/>
-                            </li>
-                            <li>
-                                <p>销售部名称:</p>
-                                <input type="text" name="officeName"/>
-                            </li>
-                            <li>
-                                <p>销售分部名称:</p>
-                                <input type="text" name="subofficeName"/>
-                            </li>
-                            <li>
-                                <p>工号:</p>
+                                <p>销售员代码:</p>
                                 <input type="text" name="empId"/>
                             </li>
                             <li>
-                                <p>销售员:</p>
+                                <p>销售员姓名:</p>
                                 <input type="text" name="empName"/>
                             </li>
                         </ul>
@@ -81,45 +65,23 @@
                     title : 'id',
                     visible: false
                 },
-                // {
-                //     field : 'companyCode',
-                //     title : '公司代码'
-                // },
-                {
-                    field : 'companyName',
-                    title : '公司名称'
-                },
-                // {
-                //     field : 'saledeptCode',
-                //     title : '销售大区代码'
-                // },
                 {
-                    field : 'saledeptName',
-                    title : '销售大区名称'
-                },
-                // {
-                //     field : 'officeCode',
-                //     title : '销售部代码'
-                // },
-                {
-                    field : 'officeName',
-                    title : '销售部名称'
+                    field : 'subofficeCode',
+                    title : '销售分部/推广组代码',
+                    visible: false
                 },
-                // {
-                //     field : 'subofficeCode',
-                //     title : '销售分部/推广组代码'
-                // },
                 {
                     field : 'subofficeName',
-                    title : '销售分部/推广组'
+                    title : '销售分部/推广组',
+                    visible: false
                 },
                 {
                     field : 'empId',
-                    title : '工号'
+                    title : '销售员代码'
                 },
                 {
                     field : 'empName',
-                    title : '销售员'
+                    title : '销售员姓名'
                 },
                 {
                     field : 'customerId',
@@ -182,19 +144,6 @@
             })
         });
 
-       /* //订单结束时间
-        $("#calMonthDate").datetimepicker({
-            format: 'yyyy-mm',
-            minView: "month",
-            todayBtn:  true,
-            autoclose: true,
-            endDate : new Date(),
-        }).on('changeDate', function(event) {
-            event.preventDefault();
-            event.stopPropagation();
-            var startTime = event.date;
-            $('#calMonthDate').datetimepicker('setStartDate', startTime);
-        });*/
     </script>
 </body>
 </html>