diff --git a/ruoyi-admin/src/main/resources/templates/project/order/add.html b/ruoyi-admin/src/main/resources/templates/project/order/add.html index 0feb90fd..ffe52427 100644 --- a/ruoyi-admin/src/main/resources/templates/project/order/add.html +++ b/ruoyi-admin/src/main/resources/templates/project/order/add.html @@ -203,12 +203,12 @@ 进货商* + onclick="selectPartner()" required> 进货商代码* + class="form-control" readonly placeholder="选择后带入" required> 进货商类型* - + 供货商* @@ -450,6 +450,7 @@ } $('[name="partnerCode"]').val(rows[0].partnerCode); $('[name="partnerName"]').val(rows[0].partnerName); + $('[name="level"]').val(rows[0].level); $.modal.close(index); } @@ -711,7 +712,16 @@ function downloadTem() { var xhr = new XMLHttpRequest(); // 创建XMLHttpRequest对象 - window.location.href = prefix + "/contract/export?fileName=文件1.xlsx" + if(!$('[name="orderChannel"]').val()){ + $.modal.alertWarning("请先选择下单通路"); + return + } + if($('[name="orderChannel"]').val()==1){ + window.location.href = prefix + "/contract/export?fileName=文件111.xlsx" + }else{ + window.location.href = prefix + "/contract/export?fileName=文件222.xlsx" + } + $.modal.closeLoading() } document.getElementById('uploadInput').addEventListener('change', function (event) { diff --git a/ruoyi-admin/src/main/resources/templates/project/order/selectCustomer.html b/ruoyi-admin/src/main/resources/templates/project/order/selectCustomer.html new file mode 100644 index 00000000..cb34a9e5 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/project/order/selectCustomer.html @@ -0,0 +1,137 @@ + + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+
+
+
+
+
+ + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/project/order/selectPartner.html b/ruoyi-admin/src/main/resources/templates/project/order/selectPartner.html new file mode 100644 index 00000000..dc34427e --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/project/order/selectPartner.html @@ -0,0 +1,111 @@ + + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/project/order/selectPeople.html b/ruoyi-admin/src/main/resources/templates/project/order/selectPeople.html new file mode 100644 index 00000000..df1fe2a4 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/project/order/selectPeople.html @@ -0,0 +1,96 @@ + + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java index 4567ebc0..3821adee 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java @@ -214,4 +214,19 @@ public class ProjectOrderInfoController extends BaseController log.error("下载文件失败", e); } } + @GetMapping("/selectCustomer") + public String selectCustomer() + { + return prefix + "/selectCustomer"; + } + @GetMapping("/selectPartner") + public String selectPartner() + { + return prefix + "/selectPartner"; + } + @GetMapping("selectPeople") + public String selectPeople() + { + return prefix + "/selectPeople"; + } }