解决冲突

ruoyi-admin/src/main/resources/templates/manage/order/edit.html

@@ -86,6 +86,8 @@
                         <input class="form-control" name="orderPartnerName" th:field="*{orderPartnerName}"
                                onclick="selectPartner()" required>
                         <span class="input-group-addon" onclick="selectPartner()"><i class="fa fa-search"></i></span>
+                        <span class="input-group-addon" id="customerSet" onclick="setCustomer()" title="同步" ><i
+                                class="fa fa-refresh"></i></span>
                     </div>
                 </div>
             </div>
@@ -276,10 +278,21 @@
         }
         $('[name="orderPartnerCode"]').val(rows[0].partnerCode);
         $('[name="orderPartnerName"]').val(rows[0].partnerName);
-
+        $('#customerSet').attr('partnerName', rows[0].partnerName);
-
+        $('#customerSet').attr('contactPerson', rows[0].contactPerson);
+        $('#customerSet').attr('contactPhone', rows[0].contactPhone);
         $.modal.close(index);
     }
+    function initCustomerSet(){
+        $.operate.post( ctx + "system/partner/list",{isTable:0,partnerName:[[${orderInfo.orderPartnerName}]],pageSize:1,pageNum:0},function (res){
+            if(res.rows.length){
+                $('#customerSet').attr('partnerName', res.rows[0].partnerName);
+                $('#customerSet').attr('contactPerson', res.rows[0].contactPerson);
+                $('#customerSet').attr('contactPhone', res.rows[0].contactPhone);
+            }
+
+        })
+    }
 
     function importList() {
         $('#uploadInput').click()
@@ -335,6 +348,7 @@
         })
 
         changeOrderType()
+        initCustomerSet()
     });
 
     function downloadTem() {
@@ -494,6 +508,17 @@
         $('form').find('textarea').css('pointer-events', 'none')
         window.localStorage.removeItem('isOrderDetail')
     }
+    function setCustomer() {
+        if (!$('#customerSet').attr('partnerName')) {
+            $.modal.alertWarning("请先选择代理商");
+            return
+        }
+        $('[name="customerCode"]').attr('readonly', false).attr('required', false).val('').parent().parent().find('label').removeClass('is-required')
+        $(' [name="customerEmail"]').val('');
+        $(' [name="customerName"]').val($('#customerSet').attr('partnerName'));
+        $(' [name="customerContact"]').val($('#customerSet').attr('contactPerson'));
+        $(' [name="customerPhone"]').val($('#customerSet').attr('contactPhone'));
+    }
 
 </script>
 </body>

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

@@ -10,7 +10,10 @@
                 <form id="formId">
                     <div class="select-list">
                         <ul>
-
+                            <li>
+                                <label>订单信息：</label>
+                                <input type="text" name="projectId" placeholder="项目编号/项目名称/项目负责人" />
+                            </li>
                             <li>
                                 <label>地市：</label>
                                 <input type="text" name="city"/>