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

Compare commits

base: mula:97410847dc248057c64106c627e54a205cd78306
Branches Tags
mula:master
mula:dev_1.0.0
..
compare: mula:86c13c73368897b23df2c463fbe3202d994b8609
Branches Tags
mula:master
mula:dev_1.0.0

No commits in common. "97410847dc248057c64106c627e54a205cd78306" and "86c13c73368897b23df2c463fbe3202d994b8609" have entirely different histories.
97410847dc ... 86c13c7336

6 changed files with 18 additions and 33 deletions
Show Stats Expand all files Collapse all files

4
ruoyi-admin/src/main/resources/application-druid.yml
View File

@ -6,11 +6,7 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
<<<<<<< HEAD
url: jdbc:mysql://121.199.168.157:3306/unis_pms?useUnicode=true&rewriteBatchedStatements=true&allowMultiQueries=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
=======
url: jdbc:mysql://121.199.168.157:3306/unis_pms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true url: jdbc:mysql://121.199.168.157:3306/unis_pms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true
>>>>>>> 86c13c73368897b23df2c463fbe3202d994b8609
username: root username: root
password: unis@db password: unis@db
# 从库数据源 # 从库数据源

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

@ -11,11 +11,9 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">关联合同：</label> <label class="col-sm-4 control-label is-required">关联合同：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group">
<input style="display: none" name="orderId" class="form-control" readonly type="text" required> <input style="display: none" name="orderId" class="form-control" readonly type="text" required>
<input name="orderName" class="form-control" type="text" onclick="selectOrder()" required> <input name="orderName" class="form-control" readonly type="text" onclick="openList()" required>
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -160,12 +158,12 @@
minView: "month", minView: "month",
autoclose: true autoclose: true
}); });
function selectOrder(id){ function openList(id){
var options = { var options = {
title: "关联合同", title: "关联合同",
url: prefix + '/selectOrder', url: prefix + '/selectOrder',
skin: 'layui-layer-gray', skin: 'layui-layer-gray',
btn: true, btn: false,
maxmin: false, maxmin: false,
full: false, full: false,
index:1000 index:1000

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

@ -12,11 +12,9 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">关联合同：</label> <label class="col-sm-4 control-label is-required">关联合同：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group">
<input style="display: none" th:orderId="*{orderId}" name="orderId" class="form-control" readonly type="text" required> <input style="display: none" th:orderId="*{orderId}" name="orderId" class="form-control" readonly type="text" required>
<input name="orderName" th:orderName="*{orderName}" class="form-control" type="text" onclick="selectOrder()" required> <input name="orderName" th:orderName="*{orderName}" class="form-control" readonly type="text" onclick="openList()" required>
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -163,12 +161,12 @@
minView: "month", minView: "month",
autoclose: true autoclose: true
}); });
function selectOrder(){ function openList(){
var options = { var options = {
title: "关联合同", title: "关联合同",
url: prefix + '/selectOrder', url: prefix + '/selectOrder',
skin: 'layui-layer-gray', skin: 'layui-layer-gray',
btn: true, btn: false,
maxmin: false, maxmin: false,
full: false, full: false,
index:1000 index:1000

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

@ -5,11 +5,12 @@
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="col-sm-12 select-table table-striped" > <div class="col-sm-12 select-table table-striped" >
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<script> <script>
var prefixOrder = ctx + "manage/order"; var prefixOrder = ctx + "manage/order";
$(function() { $(function() {

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

@ -207,17 +207,9 @@
title: "序号", title: "序号",
formatter: function (value, row, index) { formatter: function (value, row, index) {
// var columnIndex = $.common.sprintf("<input type='hidden' name='index' value='%s'>", $.table.serialNumber(index)); // var columnIndex = $.common.sprintf("<input type='hidden' name='index' value='%s'>", $.table.serialNumber(index));
//var html = $.common.sprintf("<input class='form-control' type='text' name='orderListList[%s].id' value='%s'>", index, value);
var html = $.common.sprintf("<input type='hidden' name='orderListList[%s].id' value='%s'>", index, value); var html = $.common.sprintf("<input type='hidden' name='orderListList[%s].id' value='%s'>", index, value);
return $.table.serialNumber(index); return html+$.table.serialNumber(index);
}
},
{
field: 'id',
align: 'center',
title: "id",
formatter: function (value, row, index) {
var html = $.common.sprintf("<input type='hidden' name='orderListList[%s].id' value='%s'>", index, value);
return html;
} }
}, },
{ {

2
ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
View File

@ -223,7 +223,7 @@
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="item.quantity != null ">quantity = #{item.quantity},</if> <if test="item.quantity != null ">quantity = #{item.quantity},</if>
<if test="item.amount != null">amount = #{item.amount},</if> <if test="item.amount != null">amount = #{item.amount},</if>
<if test="item.remark != null">remark = #{item.remark},</if> <if test="item.remark != null and item.remark!=''">remark = #{item.remark},</if>
updated_at = NOW(), updated_at = NOW(),
</trim> </trim>
where id = #{item.id} where id = #{item.id}