合同选择弹窗，增加新增功能

ruoyi-admin/src/main/resources/templates/project/info/add.html

@@ -358,7 +358,7 @@
         var url = prefix + "/selectCustomer";
         var options = {
             title: '选择客户',
-            width: "680",
+            width: "800",
             url: url,
             height: '600',
             callBack: doSubmitCustomer
@@ -370,7 +370,7 @@
         var url = prefix + "/selectPartner";
         var options = {
             title: '选择代理商',
-            width: "680",
+            width: "800",
             height: '600',
             url: url,
             callBack: doSubmitPartner
@@ -381,8 +381,8 @@
     function selectAgent() {
         var url = prefix + "/selectAgent";
         var options = {
-            title: '选择代理商',
+            title: '选择代表处',
-            width: "680",
+            width: "800",
             height: '600',
             url: url,
             callBack: doSubmitAgent
@@ -393,8 +393,8 @@
     function selectPeople() {
         var url = prefix + "/selectPeople";
         var options = {
-            title: '选择代理商',
+            title: '选择责任人',
-            width: "680",
+            width: "800",
             height: '600',
             url: url,
             callBack: doSubmitPeople
@@ -405,7 +405,7 @@
     function doSubmitCustomer(index, layero) {
         var rows = layero.find("iframe")[0].contentWindow.getSelections();
         if (rows.length == 0) {
-            $.modal.alertWarning("请选择一个用户");
+            $.modal.alertWarning("请选择一个客户");
             return;
         }
         $('[name="customerCode"]').val(rows[0].customerCode);
@@ -428,7 +428,7 @@
     function doSubmitPeople(index, layero) {
         var rows = layero.find("iframe")[0].contentWindow.getSelections();
         if (rows.length == 0) {
-            $.modal.alertWarning("请选择一个代理商");
+            $.modal.alertWarning("请选择一个责任人");
             return;
         }
         $('[name="hzSupportUser"]').val(rows[0].userId);
@@ -440,7 +440,7 @@
     function doSubmitAgent(index, layero) {
         var rows = layero.find("iframe")[0].contentWindow.getSelections();
         if (rows.length == 0) {
-            $.modal.alertWarning("请选择一个代理商");
+            $.modal.alertWarning("请选择一个代表处");
             return;
         }
         $('[name="agentCode"]').val(rows[0].agentCode);

ruoyi-admin/src/main/resources/templates/project/info/edit.html

@@ -397,7 +397,7 @@
         var url = prefix + "/selectCustomer";
         var options = {
             title: '选择客户',
-            width: "680",
+            width: "800",
             url: url,
             height: '600',
             callBack: doSubmitCustomer
@@ -409,7 +409,7 @@
         var url = prefix + "/selectPartner";
         var options = {
             title: '选择代理商',
-            width: "680",
+            width: "800",
             height: '600',
             url: url,
             callBack: doSubmitPartner
@@ -420,8 +420,8 @@
     function selectAgent() {
         var url = prefix + "/selectAgent";
         var options = {
-            title: '选择代理商',
+            title: '选择代表处',
-            width: "680",
+            width: "800",
             height: '600',
             url: url,
             callBack: doSubmitAgent
@@ -432,8 +432,8 @@
     function selectPeople() {
         var url = prefix + "/selectPeople";
         var options = {
-            title: '选择代理商',
+            title: '选择责任人',
-            width: "680",
+            width: "800",
             height: '600',
             url: url,
             callBack: doSubmitPeople
@@ -444,7 +444,7 @@
     function doSubmitCustomer(index, layero) {
         var rows = layero.find("iframe")[0].contentWindow.getSelections();
         if (rows.length == 0) {
-            $.modal.alertWarning("请选择一个用户");
+            $.modal.alertWarning("请选择一个客户");
             return;
         }
         $('[name="customerCode"]').val(rows[0].customerCode);
@@ -467,7 +467,7 @@
     function doSubmitPeople(index, layero) {
         var rows = layero.find("iframe")[0].contentWindow.getSelections();
         if (rows.length == 0) {
-            $.modal.alertWarning("请选择一个代理商");
+            $.modal.alertWarning("请选择一个责任人");
             return;
         }
         $('[name="hzSupportUser"]').val(rows[0].userId);
@@ -479,7 +479,7 @@
     function doSubmitAgent(index, layero) {
         var rows = layero.find("iframe")[0].contentWindow.getSelections();
         if (rows.length == 0) {
-            $.modal.alertWarning("请选择一个代理商");
+            $.modal.alertWarning("请选择一个代表处");
             return;
         }
         $('[name="agentCode"]').val(rows[0].agentCode);

ruoyi-admin/src/main/resources/templates/project/info/project.html

@@ -417,8 +417,11 @@
             yes: function (index, layero) {
                 let body = parent.layer.getChildFrame('body', index)
                 if ($(body.find('#form-product-add').get(0)).validate().form()) {
-                    $.operate.save(prefix + "/add", body.find('#form-product-add').serialize(), function () {
+                    $.operate.save(prefix + "/add", body.find('#form-product-add').serialize(), function (res) {
-                        parent.layer.close(index)
+                        if (res.code == web_status.SUCCESS) {
+                            $.table.search()
+                            parent.layer.close(index)
+                        }
                     });
                 }
             },

ruoyi-admin/src/main/resources/templates/project/info/selectAgent.html

@@ -29,6 +29,7 @@
                         <li style="width: 95%;text-align: right">
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
                                     class="fa fa-search"></i>&nbsp;搜索</a>
+
                             <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
                                     class="fa fa-refresh"></i>&nbsp;重置</a>
                         </li>
@@ -36,9 +37,11 @@
                 </div>
             </form>
         </div>
-
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-success btn-rounded btn-sm" onclick="openAdd()"><i
+                    class="fa fa-plus"></i>&nbsp;添加</a>
+        </div>
         <div class="col-sm-12 select-table table-striped">
-
             <table id="bootstrap-table"></table>
         </div>
     </div>
@@ -49,16 +52,42 @@
 
 <script>
     var prefix = ctx + "system/agent";
+    function openAdd() {
+        window.localStorage.setItem('layerTable',1)
+        var options = {
+            title: "新建代表处",
+            url: prefix + `/add`,
+            maxmin: false,
+            full: false,
+            index: 1000,
+            width: 800,
+            yes: function (index, layero) {
+                let body = parent.layer.getChildFrame('body', index)
+                if ($(body.find('#form-agent-add').get(0)).validate().form()) {
+                    $.operate.save(prefix + "/add", body.find('#form-agent-add').serialize(), function (res) {
+                        if (res.code == web_status.SUCCESS) {
+                            $.table.search()
+                            parent.layer.close(index)
+                        }
+
+                    });
+                }
+            },
+        };
+        $.modal.openOptions(options)
+    }
     $(function () {
         var options = {
             url: prefix + "/list",
+            createUrl: prefix + "/add",
             showSearch: true,
             showColumns: false,
             showToggle: false,
             showPageGo: true,
             showRefresh: false,
-            search: false,
+            // search: false,
             params: {},
+            modalName: "办事处信息",
             columns: [{
                 radio: true
             },

ruoyi-admin/src/main/resources/templates/project/info/selectCustomer.html

@@ -54,6 +54,10 @@
                 </div>
             </form>
         </div>
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-success btn-rounded btn-sm" onclick="openAdd()"><i
+                    class="fa fa-plus"></i>&nbsp;添加</a>
+        </div>
         <div class="col-sm-12 select-table table-striped">
             <table id="bootstrap-table"></table>
         </div>
@@ -63,6 +67,30 @@
 <th:block th:include="include :: footer"/>
 <script>
     var prefix = ctx + "system/customer";
+    function openAdd() {
+        window.localStorage.setItem('layerTable',1)
+        var options = {
+            title: "新建代理商",
+            url: prefix + `/add`,
+            maxmin: false,
+            full: false,
+            index: 1000,
+            width: 800,
+            yes: function (index, layero) {
+                let body = parent.layer.getChildFrame('body', index)
+                if ($(body.find('#form-info-add').get(0)).validate().form()) {
+                    $.operate.save(prefix + "/add", body.find('#form-info-add').serialize(), function (res) {
+                        if (res.code == web_status.SUCCESS) {
+                            $.table.search()
+                            parent.layer.close(index)
+                        }
+
+                    });
+                }
+            },
+        };
+        $.modal.openOptions(options)
+    }
     $(function () {
         var options = {
             url: prefix + "/list",

ruoyi-admin/src/main/resources/templates/project/info/selectPartner.html

@@ -44,6 +44,10 @@
                 </div>
             </form>
         </div>
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-success btn-rounded btn-sm" onclick="openAdd()"><i
+                    class="fa fa-plus"></i>&nbsp;添加</a>
+        </div>
         <div class="col-sm-12 select-table table-striped">
             <table id="bootstrap-table"></table>
         </div>
@@ -54,7 +58,30 @@
 
 <script>
     var prefix = ctx + "system/partner";
+    function openAdd() {
+        window.localStorage.setItem('layerTable',1)
+        var options = {
+            title: "新建代理商",
+            url: prefix + `/add`,
+            maxmin: false,
+            full: false,
+            index: 1000,
+            width: 800,
+            yes: function (index, layero) {
+                let body = parent.layer.getChildFrame('body', index)
+                if ($(body.find('#form-partner-add').get(0)).validate().form()) {
+                    $.operate.save(prefix + "/add", body.find('#form-partner-add').serialize(), function (res) {
+                        if (res.code == web_status.SUCCESS) {
+                            $.table.search()
+                            parent.layer.close(index)
+                        }
 
+                    });
+                }
+            },
+        };
+        $.modal.openOptions(options)
+    }
     $(function () {
         var options = {
             url: prefix + "/list",