nsy 销售目标与达成修改

suishenbang-order/src/main/java/com/dgtly/order/controller/OrderSalesDetailController.java

@@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletRequest;
 public class OrderSalesDetailController extends BaseController
 {
     private String prefix = "order/orderSalesDetail";
-    final private static String queryUrl = "http://192.168.0.41:8010";
+    final private static String queryUrl = "http://10.32.2.212:8010";
     @Autowired
     private RestTemplate restTemplate;
 
@@ -54,9 +54,9 @@ public class OrderSalesDetailController extends BaseController
     public Object list(HttpServletRequest request)
     {
         //走网关
-        String url = cloudPath+"order"+"/order/orderSalesDetail/list";
+        //String url = cloudPath+"order"+"/order/orderSalesDetail/list";
         //本地测试 不走网关
-        //String url = queryUrl + "/order/orderSalesDetail/list";
+        String url = queryUrl + "/order/orderSalesDetail/list";
         String str = "";
         try {
             //设置为form方式
@@ -83,9 +83,9 @@ public class OrderSalesDetailController extends BaseController
     public String info(@PathVariable("id") Long id, ModelMap mmap)
     {
         //走网关
-        String url = cloudPath+"order/order/orderSalesDetail/info/"+id;
+        //String url = cloudPath+"order/order/orderSalesDetail/info/"+id;
         //本地测试 不走网关
-        //String url = queryUrl + "/order/orderSalesDetail/info/"+id;
+        String url = queryUrl + "/order/orderSalesDetail/info/"+id;
         try {
             String str = restTemplate.getForObject(url, String.class);
             OrderSalesDetail orderSalesDetail = JSONObject.toJavaObject(JSON.parseObject(str),OrderSalesDetail.class);

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

@@ -13,20 +13,18 @@
                     <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">-->
                 </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">-->
                 </div>
-            </div>
+            </div>-->
             <div class="form-group">    
                 <label class="col-sm-3 control-label">销售大区代码：</label>
                 <div class="col-sm-8">
@@ -55,102 +53,90 @@
                     <!--<input name="officeName" th:field="*{officeName}" 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="*{subofficeCode}"></span>
-                    <!--<input name="subofficeCode" th:field="*{subofficeCode}" class="form-control" type="text">-->
+                    &lt;!&ndash;<input name="subofficeCode" th:field="*{subofficeCode}" 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="*{subofficeName}"></span>
-                    <!--<input name="subofficeName" th:field="*{subofficeName}" class="form-control" type="text">-->
+                    &lt;!&ndash;<input name="subofficeName" th:field="*{subofficeName}" class="form-control" type="text">&ndash;&gt;
                 </div>
-            </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">-->
                 </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="*{customerId}"></span>
-                    <!--<input name="customerId" th:field="*{customerId}" 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="*{customerName}"></span>
-                    <!--<input name="customerName" th:field="*{customerName}" class="form-control" type="text">-->
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">已复核：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">预算：</label>
                 <div class="col-sm-8">
-                    <span class="form-control" th:text="*{nowYearAct}"></span>
-                    <!--<input name="nowYearAct" th:field="*{nowYearAct}" class="form-control" type="text">-->
+                    <span class="form-control" th:text="*{nowYearBud}"></span>
                 </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="*{nowYearBud}"></span>
-                    <!--<input name="nowYearBud" th:field="*{nowYearBud}" class="form-control" type="text">-->
+                    <span class="form-control" th:text="*{nowYearAct}"></span>
                 </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="*{reviewNo}"></span>
-                    <!--<input name="reviewNo" th:field="*{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">
                     <span class="form-control" th:text="*{uncleared}"></span>
-                    <!--<input name="uncleared" th:field="*{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">
                     <span class="form-control" th:text="*{freeze}"></span>
-                    <!--<input name="freeze" th:field="*{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">
                     <span class="form-control" th:text="*{orderNum}"></span>
-                    <!--<input name="orderNum" th:field="*{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">
                     <span class="form-control" th:text="*{calMonth}"></span>
-                    <!--<input name="calMonth" th:field="*{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">
                     <span class="form-control" th:text="*{runTime}"></span>
-                    <!--<input name="runTime" th:field="*{runTime}" class="form-control" type="text">-->
                 </div>
             </div>
         </form>

suishenbang-order/src/main/resources/templates/order/orderSalesDetail/orderSalesDetail.html

@@ -10,10 +10,6 @@
                 <form id="formId">
                     <div class="select-list">
                         <ul>
-                            <li>
-                                <p>公司名称：</p>
-                                <input type="text" name="companyName"/>
-                            </li>
                             <li>
                                 <p>销售大区：</p>
                                 <input type="text" name="saledeptName"/>
@@ -23,19 +19,19 @@
                                 <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>
                             <li>
-                                <p>经销商：</p>
+                                <p>客户代码：</p>
+                                <input type="text" name="customerId"/>
+                            </li>
+                            <li>
+                                <p>客户名称：</p>
                                 <input type="text" name="customerName" on/>
                             </li>
                             <li>
@@ -75,49 +71,53 @@
                     title : 'id',
                     visible: false
                 },
-                // {
-                //     field : 'companyCode',
-                //     title : '公司代码'
-                // },
-                {
-                    field : 'companyName',
-                    title : '公司名称'
-                },
-                // {
-                //     field : 'saledeptCode',
-                //     title : '销售大区代码'
-                // },
+                    /*{
+                        field : 'companyCode',
+                        title : '公司代码'
+                    },
+                    {
+                        field : 'companyName',
+                        title : '公司名称'
+                    },
+                    {
+                        field : 'saledeptCode',
+                        title : '销售大区代码'
+                    },*/
                 {
                     field : 'saledeptName',
                     title : '销售大区名称'
                 },
-                // {
-                //     field : 'officeCode',
-                //     title : '销售部代码'
-                // },
+                /*{
+                    field : 'officeCode',
+                    title : '销售部代码'
+                },*/
                 {
                     field : 'officeName',
                     title : '销售部名称'
                 },
-                // {
-                //     field : 'subofficeCode',
-                //     title : '销售分部/推广组代码'
-                // },
+                /*{
+                    field : 'subofficeCode',
+                    title : '销售分部/推广组代码'
+                },
                 {
                     field : 'subofficeName',
                     title : '销售分部/推广组'
-                },
+                },*/
                 {
                     field : 'empId',
-                    title : '工号'
+                    title : '销售员代码'
                 },
                 {
                     field : 'empName',
-                    title : '销售员'
+                    title : '销售员名称'
+                },
+                {
+                    field : 'customerId',
+                    title : '客户代码'
                 },
                 {
                     field : 'customerName',
-                    title : '经销商名称'
+                    title : '客户名称'
                 },
                 {
                     field : 'nowYearBud',