diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html index 828c4b70..928d40b2 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html +++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html @@ -28,6 +28,7 @@
  • diff --git a/ruoyi-admin/src/main/resources/templates/project/info/add.html b/ruoyi-admin/src/main/resources/templates/project/info/add.html index dca9366a..dda1ee0f 100644 --- a/ruoyi-admin/src/main/resources/templates/project/info/add.html +++ b/ruoyi-admin/src/main/resources/templates/project/info/add.html @@ -448,7 +448,7 @@ `) $('#productTable tbody').append(tr) - initSearchProduct() + initSearchProduct('1') initPrice() } function addProduct2() { @@ -471,7 +471,7 @@ `) $('#productTable2 tbody').append(tr) - initSearchProduct() + initSearchProduct('2') initPrice() } function addProduct3() { @@ -494,7 +494,7 @@ `) $('#productTable3 tbody').append(tr) - initSearchProduct() + initSearchProduct('11,22') initPrice() } @@ -511,14 +511,14 @@ } - function initSearchProduct() { + function initSearchProduct(type) { $('.productTable .productBomCode').on('input', function () { let val = $(this).val() - searchProduct(val, 'code', this) + searchProduct(val, 'code', this,type) }) $('.productTable .model').on('input', function () { let val = $(this).val() - searchProduct(val, 'model', this) + searchProduct(val, 'model', this,type) }) $('.productTable .delRow').on('click', function () { let ele = $(this) @@ -538,7 +538,7 @@ }) } - function searchProduct(val, type, ele) { + function searchProduct(val, type, ele,typeId) { if (!val) { $(ele).parent().parent().find('.productBomCode').val('') $(ele).parent().parent().find('.model').val('') @@ -548,7 +548,8 @@ let data = { pageSize: 10, pageNum: 1, - isTable: 0 + isTable: 0, + type:typeId } if (type == 'code') { data.productCode = val diff --git a/ruoyi-admin/src/main/resources/templates/project/info/edit.html b/ruoyi-admin/src/main/resources/templates/project/info/edit.html index fbfa5547..c440e13f 100644 --- a/ruoyi-admin/src/main/resources/templates/project/info/edit.html +++ b/ruoyi-admin/src/main/resources/templates/project/info/edit.html @@ -502,7 +502,7 @@ `) $('#productTable tbody').append(tr) - initSearchProduct() + initSearchProduct('1') initPrice() } function addProduct2(data) { @@ -525,7 +525,7 @@ `) $('#productTable2 tbody').append(tr) - initSearchProduct() + initSearchProduct('2') initPrice() } function addProduct3(data) { @@ -548,7 +548,7 @@ `) $('#productTable3 tbody').append(tr) - initSearchProduct() + initSearchProduct('11,22') initPrice() } function addLog(data) { @@ -564,14 +564,14 @@ } - function initSearchProduct() { + function initSearchProduct(type) { $('.productTable .productBomCode').on('input', function () { let val = $(this).val() - searchProduct(val, 'code', this) + searchProduct(val, 'code', this,type) }) $('.productTable .model').on('input', function () { let val = $(this).val() - searchProduct(val, 'model', this) + searchProduct(val, 'model', this,type) }) $('.productTable .delRow').on('click', function () { let ele = $(this) @@ -592,7 +592,7 @@ } - function searchProduct(val, type, ele) { + function searchProduct(val, type, ele,typeId) { if (!val) { $(ele).parent().parent().find('.productBomCode').val('') $(ele).parent().parent().find('.model').val('') @@ -602,7 +602,8 @@ let data = { pageSize: 10, pageNum: 1, - isTable: 0 + isTable: 0, + type:typeId } if (type == 'code') { data.productCode = val 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 24039fb6..0feb90fd 100644 --- a/ruoyi-admin/src/main/resources/templates/project/order/add.html +++ b/ruoyi-admin/src/main/resources/templates/project/order/add.html @@ -336,7 +336,7 @@