Merge branch 'local_200318_skn' into dev_200318_skn

kuangjiahua
Commit 868e7274d7abe1b3e9a0a84ab803eb088fd61588 2 parents bdbff73f 850ade1c
Showing 6 changed files with 32 additions and 24 deletions
web/src/main/resources/META-INF/spring/spring-mvc.xml
web/src/main/webapp/html/shareRebate/brandRebateImport.html
web/src/main/webapp/html/shareRebate/brandRebateList.html
web/src/main/webapp/html/shareRebate/sknRebateEdit.html
web/src/main/webapp/html/shareRebate/sknRebateImport.html
web/src/main/webapp/html/shareRebate/sknRebateList.html
--- a/web/src/main/resources/META-INF/spring/spring-mvc.xml
View file @868e727
+++ b/web/src/main/resources/META-INF/spring/spring-mvc.xml
View file @868e727
@@ -115,6 +115,7 @@
         <entry key="idfaMatchImport" value-ref="idfaMatchImportServiceImpl"/>
         <entry key="imeiMatchImport" value-ref="idfaMatchImportServiceImpl"/>
         <entry key="unionShareOrdersMonthImport" value-ref="unionShareOrdersMonthImportServiceImpl"/>
+        <entry key="unionRebateImport" value-ref="unionShareRebateServiceImpl"/>
     </util:map>
     <!-- 批量操作服务定义 -->
     <util:map id="batchExportBusiness" key-type="java.lang.String"
--- a/web/src/main/webapp/html/shareRebate/brandRebateImport.html
View file @868e727
+++ b/web/src/main/webapp/html/shareRebate/brandRebateImport.html
View file @868e727
@@ -11,11 +11,12 @@
         <td style="font-size: medium" align="center" width="20%">规则：</td>
         <td style="font-size: medium" width="80%">
             1、上传文件必须是.xls或者.xlsx文件<br>
-            2、Excel表头：品牌ID 、返佣比例、品牌返佣状态<br>
-            3、结算比例格式为百分比，百分号内最多包含一位小数。0.0%＜取值范围≤25.0%；或默认<br>
-            4、返佣状态：1开启、2关闭<br>
-            5、每个csv文件控制在2500行以内<br>
-            6、<a id="downloadSample">下载样例</a>
+            2、Excel表头：品牌ID、返佣比例、返佣类型、品牌返佣状态<br>
+            3、返佣类型：1-默认、2-自定义
+            4、结算比例格式为百分比，百分号内最多包含一位小数。取值范围(0.0%,25.0%]<br>
+            5、返佣状态：1开启、2关闭<br>
+            6、每个csv文件控制在2500行以内<br>
+            7、<a id="downloadSample">下载样例</a>
         </td>
     </tr>
     </tbody>
@@ -23,7 +24,7 @@
 <script type="text/javascript">
     $(function () {
-        //todo
+
         $("#downloadSample").attr("href", contextPath + "/common/shareRebateBrand.xlsx");
         $("#batchImportDiv").fileUpload({
@@ -31,12 +32,11 @@
             uploadInputName: "file",
             url: contextPath + "/batch/import",
             queryParams: {
-                type: "shareRebateImport",//todo
-                args: "import"
+                type: "unionRebateImport",
+                args: "brand"
             },
             showFileName: false,
             onLoadSuccess: function (fileName, data) {
-                //todo
                 $("#shareRebateBrandTable").myDatagrid("reload");
                 $("#batchImportDialogDiv").dialog("close");
                 $.messager.show({
--- a/web/src/main/webapp/html/shareRebate/brandRebateList.html
View file @868e727
+++ b/web/src/main/webapp/html/shareRebate/brandRebateList.html
View file @868e727
@@ -16,8 +16,8 @@
         <input class="easyui-combobox" id="brand" style="width: 200px;" >
         <input class="easyui-combobox" id="state"  style="width:150px;" data-options="editable:false"/>
         <a id="searchBtn" class="easyui-linkbutton btn-info">查询</a>
-        <a id="addBtn" class="easyui-linkbutton btn-primary">新增</a>
-        <a id="batchImportBtn" class="easyui-linkbutton btn-primary">批量导入</a>
+        <a id="addBtn" class="easyui-linkbutton btn-primary" style="margin-left: 10px">新增</a>
+        <a id="batchImportBtn" class="easyui-linkbutton btn-primary" style="margin-left: 10px">批量导入</a>
     </div>
 </div>
--- a/web/src/main/webapp/html/shareRebate/sknRebateEdit.html
View file @868e727
+++ b/web/src/main/webapp/html/shareRebate/sknRebateEdit.html
View file @868e727
@@ -4,9 +4,12 @@
         <table cellspacing="0" border="0" align="center" style="width:90%;margin-top:0px;line-height:10px;height:200px;" id="sknRebateEditTable">
         <tr>
             <td width="30%"  align="left">SKN ：</span></td>
-            <td width="70%"  align="left" colspan="3">
+            <td width="70%"  align="left" colspan="3" id="sknInputTR">
                 <input class="inputParam easyui-textbox" style="width:200px"  id="skn" name="skn" />
             </td>
+            <td width="70%"  align="left" colspan="3" id="sknStrTR" hidden>
+                <span id="sknStr"></span>
+            </td>
         </tr>
         <tr>
@@ -65,6 +68,9 @@
         if (data){
             sknTextBox.textbox('readonly',true);
             sknTextBox.textbox("setValue", data.skn);
+            $("#sknInputTR").hide();
+            $("#sknStrTR").show();
+            $("#sknStr").html(data.skn);
             if(data.type == 1){
                 $(":radio[name='type'][value='1']").prop("checked",true);
             }else if(data.type == 2){
--- a/web/src/main/webapp/html/shareRebate/sknRebateImport.html
View file @868e727
+++ b/web/src/main/webapp/html/shareRebate/sknRebateImport.html
View file @868e727
@@ -30,8 +30,8 @@
             uploadInputName: "file",
             url: contextPath + "/batch/import",
             queryParams: {
-                type: "unionShareRebateSknImport",
-                args: "import"
+                type: "unionRebateImport",
+                args: "skn"
             },
             showFileName: false,
             onLoadSuccess: function (fileName, data) {
--- a/web/src/main/webapp/html/shareRebate/sknRebateList.html
View file @868e727
+++ b/web/src/main/webapp/html/shareRebate/sknRebateList.html
View file @868e727
@@ -17,9 +17,10 @@
         <input class="easyui-combobox" id="brand" sytle="width: 200px">
         <input class="easyui-combobox" id="state"  style="width:150px;" data-options="editable:false"/>
         <a id="searchBtn" class="easyui-linkbutton btn-info" >查询</a>
-        <a id="addBtn" class="easyui-linkbutton btn-primary" >新增</a>
-        <a id="exportBtn" class="easyui-linkbutton btn-success" >导出</a>
-        <a id="batchImportBtn" class="easyui-linkbutton btn-success">批量导入</a>
+        <a id="addBtn" class="easyui-linkbutton btn-primary" style="margin-left: 10px">新增</a>
+        <a id="exportBtn" class="easyui-linkbutton btn-success" style="margin-left: 10px; width:54px; height:37px" >导出</a>
+        <a id="batchImportBtn" class="easyui-linkbutton btn-success" style="margin-left: 10px">批量导入</a>
+
     </div>
 </div>
@@ -61,7 +62,7 @@
                 table.datagrid("load", {
                     skn: sknTextBox.textbox("getValue"),
                     brand: brandCombobox.combobox("getValue"),
-                    state: sknTextBox.combobox("getValue")
+                    state: stateCombobox.combobox("getValue")
                 });
             }
         });
@@ -70,7 +71,7 @@
             iconCls: "icon-search",
             onClick: function () {
                 saveShareRebateSkn(0);
-                window.self.paramObject.brandRebateData = null;
+                window.self.paramObject.sknRebateData = null;
             }
         });
@@ -81,10 +82,10 @@
             textField: "text",
             required: false,
             prompt: "选择品牌",
-            url: contextPath + "/UnionShareRebateBrandRest/queryAllBrand",
+            url: contextPath + "/UnionRebateRest/queryAllBrandList",
             panelHeight: 200,
             loadFilter: function (data) {
-                return defaultLoadFilter(data);
+                return data;
             }
         });
@@ -220,7 +221,7 @@
                                     param.name = rowData.name;
                                     param.id = id;
                                 }
-                                param.rebatePercentStr = rebate;
+                                param.rebatePercentStr = rebate == "" ? 0 : rebate;
                                 return true;
                             },
                             success: function (data) {
@@ -270,11 +271,11 @@
             }
         });
-        $("#exportBtn").linkbutton({
+        /*$("#exportBtn").linkbutton({
             onClick: function () {
                 window.open(contextPath + "/batch/export.do?type=unionShareRebateSkn&queryConf=" + JSON.stringify(getParams()));
             }
-        });
+        });*/
         function getParams() {
             var params = {};