Browse Source

[feat]修改请购单、销售估价、出差单、员工领料单、报销单、详情信息,销售订单添加计划交付时间字段可编辑,质保天数可编辑,

dev
zhangsiqi 5 months ago
parent
commit
3f40ea9508
  1. 1
      ruoyi-admin/src/main/resources/mapper/system/BaseEvectionFormMapper.xml
  2. 97
      ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/pickAdd.html
  3. 65
      ruoyi-admin/src/main/resources/templates/sales/salesEstimate/detail.html
  4. 19
      ruoyi-admin/src/main/resources/templates/sales/salesEstimate/edit.html
  5. 39
      ruoyi-admin/src/main/resources/templates/sales/salesEstimate/salesEstimate.html
  6. 34
      ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/detail.html
  7. 10
      ruoyi-admin/src/main/resources/templates/system/baseExpense/detail.html
  8. 19
      ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/detail.html
  9. 14
      ruoyi-admin/src/main/resources/templates/system/requisitioning/detail.html
  10. 5
      ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
  11. 11
      ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
  12. 1
      ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html

1
ruoyi-admin/src/main/resources/mapper/system/BaseEvectionFormMapper.xml

@ -219,5 +219,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="restoreBaseEvectionFormById" parameterType="Long">
update base_evection_form set del_flag = '0' where evection_id = #{evectionId}
</update>
</mapper>

97
ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/pickAdd.html

@ -45,6 +45,8 @@
</div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: bootstrap-table-editable-js" />
<th:block th:include="include :: select2-js" />
<script th:inline="javascript">
var prefix = ctx + "erp/developModifyOrder";
var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]];
@ -83,76 +85,6 @@
}
}
});
var options = {
id: "bootstrap-sub-table-developModify",
// url: prefix + "/getDevelopModifyOrderList",
showSearch: false,
showRefresh: false,
showToggle: false,
showColumns: false,
columns: [
{checkbox: true},
{field: 'index',align: 'center', title: "序号",
formatter: function (value, row, index) {
var columnIndex = $.common.sprintf("<input type='hidden' name='index' value='%s'>", $.table.serialNumber(index));
return columnIndex + $.table.serialNumber(index);
}
},
{title: '物料索引id',field: 'materialId',align: 'center',visible: false},
{title: '料号',field: 'materialCode',align: 'center'},
{title: '物料名称',field: 'materialName',align: 'center'},
{title: '图片',field: 'photoUrl',
formatter: function(value, row, index) {
if(value == null || value == ""){
value = "";
return "<img src='' herf='' />";
}
return $.table.imageView(value);
}
},
{title: '物料类型',field: 'materialType',align: 'center',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
},
{ title: '描述',field: 'describe',align: 'center'},
{title: '品牌',field: 'brand',align: 'center'},
{ title: '单位',field: 'unit',align: 'center',
formatter: function(value, row, index) {
return $.table.selectDictLabel(sysUnitClassDatas, value);
}
},
{title: '半成品类型',field: 'processMethod',align: 'center',
formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value);
}
},
{ title: '对外售价',field: 'materialSole',},
{title: '国内税率',field: 'countTax',align: 'center',},
{ title: '美元汇率',field: 'usdTax', align: 'center',},
{field: 'materialNum',align: 'center',title: '物料的数量',},
{ title: '物料的不含税单价(RMB)',field: 'materialNoRmb',align: 'center',},
{title: '物料的不含税单价(美元)',field: 'materialNoUsd',align: 'center',},
{title: '修改详情',align: 'center',
formatter:function formatterForm(value, row, index) {
// 这里的代码会为每行生成一个表单
var form = $('<form></form>').append(
$('<input/>', { type: 'text', value: row.name, name: 'name', placeholder: 'Name' }),
$('<input/>', { type: 'email', value: row.email, name: 'email', placeholder: 'Email' }),
$('<button/>', { type: 'submit' }).text('Submit')
);
form.on('submit', function(e) {
e.preventDefault(); // 阻止表单默认提交行为
var formData = form.serializeArray(); // 序列化表单数据为数组
console.log(formData); // 在控制台输出表单数据
// 这里可以添加代码处理表单提交,例如发送到服务器等
});
return form; // 返回生成的表单HTML
}},
]
};
$.table.init(options);
var option1 = {
id: "bootstrap-sub-table-material",
// url: prefix + "/list",
@ -192,31 +124,6 @@
}]
};
$.table.init(option1);
var option2 = {
id: "bootstrap-sub-table-biztoitem",
// url: prefix + "/list",
showSearch: false,
showRefresh: false,
showToggle: false,
showColumns: false,
modalName: "通知人",
detailView: true,
height: $(window).height() - 100,
//指定父id列
columns: [
{checkbox: false},
{title: '通知人',field: 'item', },
{title: '确认时间',field: 'materialNo', },
{title: '操作',align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="remove(\'' + row.id + '\')"><i class="fa fa-eye"></i> 删除</a> ');
return actions.join('');
}
}]
};
$.table.init(option2);
});
initAllLevelTable = function(index, row, $detail) {
$("#"+"all_level_table_"+row.id).bootstrapTable({

65
ruoyi-admin/src/main/resources/templates/sales/salesEstimate/detail.html

@ -14,19 +14,19 @@
<div class="form-group">
<label class="col-sm-3 control-label">估价单号:</label>
<div class="col-sm-8">
<input name="aftersalesEstimateCode" th:field="*{aftersalesEstimateCode}" class="form-control" type="text">
<input name="aftersalesEstimateCode" th:field="*{aftersalesEstimateCode}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">用户ID:</label>
<div class="col-sm-8">
<input name="userId" th:field="*{userId}" class="form-control" type="text">
<input name="userId" th:field="*{userId}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">估价状态:</label>
<div class="col-sm-8">
<select name="estimateStatus" class="form-control m-b" th:with="type=${@dict.getType('estimate_status')}">
<select name="estimateStatus" class="form-control m-b" th:with="type=${@dict.getType('estimate_status')}" disabled>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{estimateStatus}"></option>
</select>
</div>
@ -34,56 +34,56 @@
<div class="form-group">
<label class="col-sm-3 control-label">客户代码:</label>
<div class="col-sm-8">
<input name="enterpriseCode" th:field="*{enterpriseCode}" class="form-control" type="text">
<input name="enterpriseCode" th:field="*{enterpriseCode}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户名称:</label>
<div class="col-sm-8">
<input name="enterpriseName" th:field="*{enterpriseName}" class="form-control" type="text">
<input name="enterpriseName" th:field="*{enterpriseName}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">料号:</label>
<div class="col-sm-8">
<input name="materialNo" th:field="*{materialNo}" class="form-control" type="text">
<input name="materialNo" th:field="*{materialNo}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料名称:</label>
<div class="col-sm-8">
<input name="materialName" th:field="*{materialName}" class="form-control" type="text">
<input name="materialName" th:field="*{materialName}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料合计:</label>
<div class="col-sm-8">
<input name="materialSum" th:field="*{materialSum}" class="form-control" type="text">
<input name="materialSum" th:field="*{materialSum}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">数量合计:</label>
<div class="col-sm-8">
<input name="quantitySum" th:field="*{quantitySum}" class="form-control" type="text">
<input name="quantitySum" th:field="*{quantitySum}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">估价币种:</label>
<div class="col-sm-8">
<input name="estimateCurrencies" th:field="*{estimateCurrencies}" class="form-control" type="text">
<input name="estimateCurrencies" th:field="*{estimateCurrencies}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">美元汇率:</label>
<div class="col-sm-8">
<input name="usdTax" id="usdTax_add" class="form-control" type="number" placeholder="美元对人民币汇率">
<input name="usdTax" id="usdTax_add" class="form-control" type="number" placeholder="美元对人民币汇率" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">国内税率:</label>
<div class="col-sm-8">
<div class="input-group">
<input name="rmbTax" id="rmbTax_add" class="form-control" type="number" placeholder="13" />
<input name="rmbTax" id="rmbTax_add" class="form-control" type="number" placeholder="13" readonly />
<span class="input-group-addon">%</span>
</div>
</div>
@ -92,8 +92,8 @@
<label class="col-sm-4 control-label">订价日期:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="pricingDate" th:field="*{pricingDate}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input name="pricingDate" th:field="*{pricingDate}" class="form-control" placeholder="yyyy-MM-dd" type="text" readonly>
<span class="input-group-addon" readonly><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
@ -162,8 +162,19 @@
</div>
</div>
</div>
</form>
<div class="container">
<div class="form-row">
<div class="btn-group-sm" id="toolbar" role="group">
<span>选择报价信息</span>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-sub-table-estimateChild"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
@ -360,14 +371,6 @@
{field: 'auditStatus',align: 'center',title: '审核状态',visible: false,
formatter: function(value, row, index) {return $.table.selectDictLabel(auditStatusDatas, value);}
},
{title: '操作', align: 'center',
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="removeRow(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
return actions.join('');
}
}
],
onEditableSave:function(field, row, oldValue, $el){
var commonCurrency1 = $("#commonCurrency_add option:selected").val();
@ -411,22 +414,6 @@
};
$.table.init(options);
});
//获取单号
$.ajax({
url: prefix + "/getId",
type: "post",
dateType: "json",
success: function (resp) {
if (resp.code === 0) {
$("input[name='aftersalesEstimateCode']").val(resp.data);
} else {
$.modal.msgError("失败啦");
}
},
error: function () {
$.modal.msgError("后台出错啦!");
}
});
/*业务员列表*/
$.ajax({
url: ctx + 'system/salesOrder/getBinessMembers',

19
ruoyi-admin/src/main/resources/templates/sales/salesEstimate/edit.html

@ -162,8 +162,25 @@
</div>
</div>
</div>
</form>
<div class="container">
<div class="form-row">
<div class="btn-group-sm" id="toolbar" role="group">
<span>选择报价信息</span>
<a class="btn btn-success" onclick="insertRow()">
<i class="fa fa-plus"></i> 添加物料
</a>
<a class="btn btn-danger multiple disabled" onclick="insertNRow()">
<i class="fa fa-remove"></i> 添加无料号物料
</a>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-sub-table-estimateChild"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />

39
ruoyi-admin/src/main/resources/templates/sales/salesEstimate/salesEstimate.html

@ -43,6 +43,12 @@
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
</li>
<li>
<label>业务员:</label>
<select name="createBy">
<option value="">所有</option>
</select>
</li>
<li>
<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>
@ -56,15 +62,6 @@
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="sales:salesEstimate:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="sales:salesEstimate:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="sales:salesEstimate:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="sales:salesEstimate:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
@ -72,6 +69,10 @@
</div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<th:block th:include="include :: select2-js" />
<th:block th:include="include :: bootstrap-table-editable-js" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('sales:salesEstimate:edit')}]];
var removeFlag = [[${@permission.hasPermi('sales:salesEstimate:remove')}]];
@ -89,6 +90,7 @@
cancelUrl: prefix + "/cancel/{id}",
restoreUrl: prefix + "/restore/{id}",
exportUrl: prefix + "/export",
detailUrl: prefix + "/detail/{id}",
modalName: "销售估价",
pageList: [5, 10, 25, 50],
pageSize: 10,
@ -117,13 +119,14 @@
{title: '含税总价(RMB)',field: 'allPriceIncludesTaxRmb',},
{title: '不含税总价(美元)',field: 'allPriceExcludingNoTaxDollar',},
{title: '含税总价(美元)',field: 'allPriceExcludingTaxDollar',},
{title: '业务员',field: 'createBy',},
{title: '录入时间',field: 'createTime',},
{title: '更新人',field: 'updateBy',},
{title: '操作',align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.aftersalesEstimateId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.aftersalesEstimateId + '\')"><i class="fa fa-remove"></i>删除</a> ');
actions.push('<a class="btn btn-primary btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.aftersalesEstimateId + '\')"><i class="fa fa-remove"></i>详情</a> ');
if(row.delFlag == '0'){
actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> ');
}else{
@ -135,6 +138,22 @@
]
};
$.table.init(options);
$.ajax({
url: ctx + 'system/salesOrder/getBinessMembers',
type: 'get',
success: function (res) {
console.log(res)
if (res.rows.length > 0) {
var usertData = res.rows;
for (let i in usertData) {
$("select[name='createBy']").append(
"<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
}
} else {
$.modal.msgError(res.msg);
}
}
});
});
</script>
</body>

34
ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/detail.html

@ -12,7 +12,7 @@
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">出差单编号:</label>
<div class="col-sm-8">
<input name="evectionCode" th:field="*{evectionCode}" class="form-control" type="text">
<input name="evectionCode" th:field="*{evectionCode}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
@ -36,35 +36,35 @@
<div class="form-group">
<label class="col-sm-3 control-label">同行人:</label>
<div class="col-sm-8">
<input name="partnerBy" th:field="*{partnerBy}" class="form-control" type="text">
<input name="partnerBy" th:field="*{partnerBy}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">出差地:</label>
<div class="col-sm-8">
<input name="evectionAddr" th:field="*{evectionAddr}" class="form-control" type="text">
<input name="evectionAddr" th:field="*{evectionAddr}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">出差详细地址:</label>
<div class="col-sm-8">
<input name="evectionDetailAddr" th:field="*{evectionDetailAddr}" class="form-control" type="text">
<input name="evectionDetailAddr" th:field="*{evectionDetailAddr}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">出差事由:</label>
<div class="col-sm-8">
<input name="evectionCauses" th:field="*{evectionCauses}" class="form-control" type="text">
<input name="evectionCauses" th:field="*{evectionCauses}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">出差时间:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="evectionBeginTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
<input name="evectionBeginTime" class="form-control" placeholder="yyyy-MM-dd" type="text" readonly>
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<span class="input-group-addon">-</span>
<input name="evectionEndTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
<input name="evectionEndTime" class="form-control" placeholder="yyyy-MM-dd" type="text" readonly>
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
@ -72,13 +72,13 @@
<div class="form-group">
<label class="col-sm-3 control-label">派工单号:</label>
<div class="col-sm-8">
<input name="dispatchlistCode" th:field="*{dispatchlistCode}" class="form-control" type="text">
<input name="dispatchlistCode" th:field="*{dispatchlistCode}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">生产单号:</label>
<div class="col-sm-8">
<input name="makeCode" th:field="*{makeCode}" class="form-control" type="text">
<input name="makeCode" th:field="*{makeCode}" class="form-control" type="text" readonly>
</div>
</div>
</form>
@ -88,7 +88,23 @@
<script th:inline="javascript">
var prefix = ctx + "system/baseEvectionForm";
$("#form-baseEvectionForm-detail").validate({focusCleanup: true});
$(function(){
getSelections();
})
function getSelections(){
$.ajax({
url: ctx + "system/requisitioning/getEmpUserName",
type: "get",
dataType: "json",
success: function (data) {
$("select[name='deptName']").append($('<option></option>').val(data.deptName).html(data.deptName));
$("select[name='evectionBy']").append($('<option></option>').val(data.userName).html(data.userName));
$("select[name='postName']").append($('<option></option>').val(data.postName).html(data.postName));
}
});
}
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-baseEvectionForm-detail').serialize());

10
ruoyi-admin/src/main/resources/templates/system/baseExpense/detail.html

@ -73,9 +73,6 @@
<div class="form-row">
<div class="btn-group-sm" id="toolbar" role="group">
<span style="color: black;font-size:17px;font-weight: bold" >报销分类信息</span>
<a class="btn btn-success" onclick="insertRow()">
<span class="fa fa-plus"></span> 添加报销
</a>
</div>
</div>
<div class="col-sm-12 select-table table-striped">
@ -143,13 +140,6 @@
{title: '出差单号',field: 'evectionCode',editable: {type:'text',mode:'inline'}},
{title: '采购单号',field: 'purcahseCode',editable: {type:'text',mode:'inline',}},
{title: '委外单号',field: 'outsourceCode',editable: {type:'text',mode:'inline',}},
{title: '操作', align: 'center',
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="removeRow(\'' + row.index + '\')"><i class="fa fa-remove"></i>删除</a> ');
return actions.join('');
}
}
],
};
$.table.init(options);

19
ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/detail.html

@ -12,29 +12,26 @@
<div class="form-group">
<label class="col-sm-3 control-label">领料单编号:</label>
<div class="col-sm-8">
<input name="requisitieCode" th:field="*{requisitieCode}" class="form-control" type="text">
<input name="requisitieCode" th:field="*{requisitieCode}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">关联销售订单号:</label>
<div class="col-sm-8">
<input name="correlationCode" th:field="*{correlationCode}" class="form-control" type="text">
<input name="correlationCode" th:field="*{correlationCode}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">用途:</label>
<div class="col-sm-8">
<input name="remark" th:field="*{remark}" class="form-control" type="text">
<input name="remark" th:field="*{remark}" class="form-control" type="text" readonly>
</div>
</div>
</form>
<div class="container">
<div class="form-row">
<div class="btn-group-sm" id="toolbar" role="group">
<span>选择报价信息</span>
<a class="btn btn-success" onclick="insertRow()">
<i class="fa fa-plus"></i> 添加物料
</a>
<span>报价信息</span>
</div>
</div>
<div class="row">
@ -53,7 +50,6 @@
var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]];
var processMethodDatas = [[${@dict.getType('processMethod')}]];
var prefix = ctx + "system/empRequisiteOrder"
var prefix = ctx + "system/empRequisiteOrder";
$("#form-empRequisiteOrder-detail").validate({focusCleanup: true});
//获取子表信息
@ -108,13 +104,6 @@
{title: '更新人',field: 'updateBy',align: 'center',visible: false},
{title: '上次更新时间',field: 'updateTime',align: 'center',visible: false},
{title: '备注',field: 'remark',align: 'center',editable: true},
{title: '操作', align: 'center',
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="removeRow(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
return actions.join('');
}
}
],
onEditableSave:function(field, row, oldValue, $el){
row.materialNoRmbSum = Number(row.materialNum * Number(row.materialNoRmb)).toFixed(2);

14
ruoyi-admin/src/main/resources/templates/system/requisitioning/detail.html

@ -36,17 +36,14 @@
<div class="form-group">
<label class="col-sm-3 control-label">关联单号:</label>
<div class="col-sm-8">
<input name="correlationCode" th:field="*{correlationCode}" class="form-control" type="text">
<input name="correlationCode" th:field="*{correlationCode}" class="form-control" type="text" readonly>
</div>
</div>
</form>
<div class="container">
<div class="form-row">
<div class="btn-group-sm" id="toolbar" role="group">
<span>选择报价信息</span>
<a class="btn btn-success" onclick="insertRow()">
<i class="fa fa-plus"></i> 添加物料
</a>
<span>报价信息</span>
</div>
</div>
<div class="row">
@ -124,13 +121,6 @@
{title: '更新人',field: 'updateBy',align: 'center',visible: false},
{title: '上次更新时间',field: 'updateTime',align: 'center',visible: false},
{title: '备注',field: 'remark',align: 'center'},
{title: '操作', align: 'center',
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="removeRow(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
return actions.join('');
}
}
],
onEditableSave:function(field, row, oldValue, $el){
row.materialNoRmbSum = Number(row.materialNum * Number(row.materialNoRmb)).toFixed(2);

5
ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html

@ -441,13 +441,12 @@
field: 'expiryDay',
editable: {
type: 'text',
emptytext: "天数",
emptyText: "天数",
enabled:true,
title: '质保天数',
validate: function (value) { //字段验证
if (!$.trim(value)) {
return '不能为空';
}else{
return value + "天数";
}
}
},

11
ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html

@ -455,18 +455,21 @@
{ title: '物料的含税单价(美元)',field: 'materialUsd',align: 'center'},
{ title: '物料的含税总价(美元)',field: 'materialUsdSum',align: 'center'},
{ title: '物料的不含税总价(美元)',field: 'materialNoUsdSum',align: 'center'},
{ title: '物料的含税单价(RMB)',field: 'materialRmb',align: 'center'},
{ title: '物料的含税总价(RMB)',field: 'materialNoRmbSum', align: 'center'},
{ title: '物料的不含税总价(RMB)',field: 'materialRmbSum',align: 'center'},
{ title: '计划交付时间',field: 'deliveryTime',align: 'center',
editable: {type: 'date',title: '计划交付时间',format: 'yyyy-mm-dd', emptytext: "计划交付时间",
editable: {type: 'text',enabled:true,title: '计划交付时间',format: 'yyyy-mm-dd', emptyText: "计划交付时间",
formatter: function (value, row, index) {
return value;
}}
}
}
},
{title: '质保天数',align: 'center',field: 'expiryDay',
editable: {type: 'text',emptytext: "天数",title: '质保天数',formatter: function (value, row, index) {
editable: {type: 'text', enabled:true,emptyText: "天数",title: '质保天数',formatter: function (value, row, index) {
return value + "天数";
}},
}
},
},
{ title: '录入人',field: 'createBy',align: 'center',visible: false},

1
ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html

@ -229,6 +229,7 @@
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
detailUrl: prefix + "/detail/{id}",
pagination: true,
pageList: [5, 10, 25, 50],
pageSize: 10,
sortable: true, // 是否启用排序

Loading…
Cancel
Save