mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

发货记录筛选问题，合同配置查询调整

master
wangjiuyun 2025-06-06 10:01:46 +08:00
parent 5732a44372
commit 4e19262b7e
5 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
View File

@ -28,6 +28,7 @@
<li> <li>
<label>物流公司：</label> <label>物流公司：</label>
<select name="logisticsCompany" class="form-control" th:with="type=${@dict.getType('logistics_company')}"> <select name="logisticsCompany" class="form-control" th:with="type=${@dict.getType('logistics_company')}">
<option value="">请选择</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>

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

@ -448,7 +448,7 @@
</tr>`) </tr>`)
$('#productTable tbody').append(tr) $('#productTable tbody').append(tr)
initSearchProduct() initSearchProduct('1')
initPrice() initPrice()
} }
function addProduct2() { function addProduct2() {
@ -471,7 +471,7 @@
</tr>`) </tr>`)
$('#productTable2 tbody').append(tr) $('#productTable2 tbody').append(tr)
initSearchProduct() initSearchProduct('2')
initPrice() initPrice()
} }
function addProduct3() { function addProduct3() {
@ -494,7 +494,7 @@
</tr>`) </tr>`)
$('#productTable3 tbody').append(tr) $('#productTable3 tbody').append(tr)
initSearchProduct() initSearchProduct('11,22')
initPrice() initPrice()
} }
@ -511,14 +511,14 @@
} }
function initSearchProduct() { function initSearchProduct(type) {
$('.productTable .productBomCode').on('input', function () { $('.productTable .productBomCode').on('input', function () {
let val = $(this).val() let val = $(this).val()
searchProduct(val, 'code', this) searchProduct(val, 'code', this,type)
}) })
$('.productTable .model').on('input', function () { $('.productTable .model').on('input', function () {
let val = $(this).val() let val = $(this).val()
searchProduct(val, 'model', this) searchProduct(val, 'model', this,type)
}) })
$('.productTable .delRow').on('click', function () { $('.productTable .delRow').on('click', function () {
let ele = $(this) let ele = $(this)
@ -538,7 +538,7 @@
}) })
} }
function searchProduct(val, type, ele) { function searchProduct(val, type, ele,typeId) {
if (!val) { if (!val) {
$(ele).parent().parent().find('.productBomCode').val('') $(ele).parent().parent().find('.productBomCode').val('')
$(ele).parent().parent().find('.model').val('') $(ele).parent().parent().find('.model').val('')
@ -548,7 +548,8 @@
let data = { let data = {
pageSize: 10, pageSize: 10,
pageNum: 1, pageNum: 1,
isTable: 0 isTable: 0,
type:typeId
} }
if (type == 'code') { if (type == 'code') {
data.productCode = val data.productCode = val

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

@ -502,7 +502,7 @@
</tr>`) </tr>`)
$('#productTable tbody').append(tr) $('#productTable tbody').append(tr)
initSearchProduct() initSearchProduct('1')
initPrice() initPrice()
} }
function addProduct2(data) { function addProduct2(data) {
@ -525,7 +525,7 @@
</tr>`) </tr>`)
$('#productTable2 tbody').append(tr) $('#productTable2 tbody').append(tr)
initSearchProduct() initSearchProduct('2')
initPrice() initPrice()
} }
function addProduct3(data) { function addProduct3(data) {
@ -548,7 +548,7 @@
</tr>`) </tr>`)
$('#productTable3 tbody').append(tr) $('#productTable3 tbody').append(tr)
initSearchProduct() initSearchProduct('11,22')
initPrice() initPrice()
} }
function addLog(data) { function addLog(data) {
@ -564,14 +564,14 @@
} }
function initSearchProduct() { function initSearchProduct(type) {
$('.productTable .productBomCode').on('input', function () { $('.productTable .productBomCode').on('input', function () {
let val = $(this).val() let val = $(this).val()
searchProduct(val, 'code', this) searchProduct(val, 'code', this,type)
}) })
$('.productTable .model').on('input', function () { $('.productTable .model').on('input', function () {
let val = $(this).val() let val = $(this).val()
searchProduct(val, 'model', this) searchProduct(val, 'model', this,type)
}) })
$('.productTable .delRow').on('click', function () { $('.productTable .delRow').on('click', function () {
let ele = $(this) let ele = $(this)
@ -592,7 +592,7 @@
} }
function searchProduct(val, type, ele) { function searchProduct(val, type, ele,typeId) {
if (!val) { if (!val) {
$(ele).parent().parent().find('.productBomCode').val('') $(ele).parent().parent().find('.productBomCode').val('')
$(ele).parent().parent().find('.model').val('') $(ele).parent().parent().find('.model').val('')
@ -602,7 +602,8 @@
let data = { let data = {
pageSize: 10, pageSize: 10,
pageNum: 1, pageNum: 1,
isTable: 0 isTable: 0,
type:typeId
} }
if (type == 'code') { if (type == 'code') {
data.productCode = val data.productCode = val

23
ruoyi-admin/src/main/resources/templates/project/order/add.html
View File

@ -336,7 +336,7 @@
<th:block th:include="include :: jquery-cxselect-js"/> <th:block th:include="include :: jquery-cxselect-js"/>
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "sip/project" var prefix = ctx + "project/order"
$("#form-product-add").validate({ $("#form-product-add").validate({
focusCleanup: true focusCleanup: true
}); });
@ -502,7 +502,7 @@
</tr>`) </tr>`)
$('#productTable tbody').append(tr) $('#productTable tbody').append(tr)
initSearchProduct() initSearchProduct('1')
initPrice() initPrice()
} }
@ -526,7 +526,7 @@
</tr>`) </tr>`)
$('#productTable2 tbody').append(tr) $('#productTable2 tbody').append(tr)
initSearchProduct() initSearchProduct('2')
initPrice() initPrice()
} }
@ -550,7 +550,7 @@
</tr>`) </tr>`)
$('#productTable3 tbody').append(tr) $('#productTable3 tbody').append(tr)
initSearchProduct() initSearchProduct('11,22')
initPrice() initPrice()
} }
@ -567,14 +567,14 @@
} }
function initSearchProduct() { function initSearchProduct(type) {
$('.productTable .productBomCode').on('input', function () { $('.productTable .productBomCode').on('input', function () {
let val = $(this).val() let val = $(this).val()
searchProduct(val, 'code', this) searchProduct(val, 'code', this,type)
}) })
$('.productTable .model').on('input', function () { $('.productTable .model').on('input', function () {
let val = $(this).val() let val = $(this).val()
searchProduct(val, 'model', this) searchProduct(val, 'model', this,type)
}) })
$('.productTable .delRow').on('click', function () { $('.productTable .delRow').on('click', function () {
let ele = $(this) let ele = $(this)
@ -594,7 +594,7 @@
}) })
} }
function searchProduct(val, type, ele) { function searchProduct(val, type, ele,typeId) {
if (!val) { if (!val) {
$(ele).parent().parent().find('.productBomCode').val('') $(ele).parent().parent().find('.productBomCode').val('')
$(ele).parent().parent().find('.model').val('') $(ele).parent().parent().find('.model').val('')
@ -604,7 +604,8 @@
let data = { let data = {
pageSize: 10, pageSize: 10,
pageNum: 1, pageNum: 1,
isTable: 0 isTable: 0,
type:typeId
} }
if (type == 'code') { if (type == 'code') {
data.productCode = val data.productCode = val
@ -710,7 +711,7 @@
function downloadTem() { function downloadTem() {
var xhr = new XMLHttpRequest(); // 创建XMLHttpRequest对象 var xhr = new XMLHttpRequest(); // 创建XMLHttpRequest对象
window.location.href = prefix + "/list/export" window.location.href = prefix + "/contract/export?fileName=文件1.xlsx"
$.modal.closeLoading() $.modal.closeLoading()
} }
document.getElementById('uploadInput').addEventListener('change', function (event) { document.getElementById('uploadInput').addEventListener('change', function (event) {
@ -718,7 +719,7 @@
let data = new FormData() let data = new FormData()
data.append('file', file) data.append('file', file)
var xhr = new XMLHttpRequest(); // 创建XMLHttpRequest对象 var xhr = new XMLHttpRequest(); // 创建XMLHttpRequest对象
xhr.open('POST', prefix + '/list/readData', true); // 设置请求类型和URL xhr.open('POST', prefix + '/importContractData', true); // 设置请求类型和URL
// 当请求完成时执行的回调函数 // 当请求完成时执行的回调函数
xhr.onload = function (res) { xhr.onload = function (res) {
let data = JSON.parse(res.currentTarget.response) let data = JSON.parse(res.currentTarget.response)

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

@ -11,8 +11,16 @@
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li> <li>
<label>订单信息：</label> <label>项目编号：</label>
<input type="text" name="projectId" placeholder="项目编号/项目名称/项目负责人" /> <input type="text" name="projectCode" placeholder="项目编号" />
</li>
<li>
<label>项目名称：</label>
<input type="text" name="projectName" placeholder="项目名称" />
</li>
<li>
<label>项目负责人：</label>
<input type="text" name="dutyName" placeholder="项目负责人" />
</li> </li>
<li id="element1"> <li id="element1">
<label>属地：</label> <label>属地：</label>