clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

no message

This commit is contained in:
cb 2025-06-30 18:07:40 +08:00
parent f9f36c16d9
commit ee36d363a7
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -1632,6 +1632,8 @@ public class OrderController extends BaseController {
&& master.getWorkerId() != null; && master.getWorkerId() != null;
logger.info("是否为监控单{}主单id{}", condition,master); logger.info("是否为监控单{}主单id{}", condition,master);
// 编辑返回属性 // 编辑返回属性
orderListResponse.setOrderType(master.getOrderType());
orderListResponse.setHasServiceOrder(master.getHasServiceOrder());
orderListResponse.setIsMonitoredOrder(condition); orderListResponse.setIsMonitoredOrder(condition);
orderListResponse.setGoodsBrand(master.getGoodsBrand()); orderListResponse.setGoodsBrand(master.getGoodsBrand());
orderListResponse.setGoodsSpecification(master.getGoodsSpecification()); orderListResponse.setGoodsSpecification(master.getGoodsSpecification());

2
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -869,6 +869,8 @@ public class OrderMasterController extends BaseController {
} }
// 编辑返回属性 // 编辑返回属性
orderListResponse.setOrderType(master.getOrderType());
orderListResponse.setHasServiceOrder(master.getHasServiceOrder());
orderListResponse.setPaymentMoney(paymentMoney); orderListResponse.setPaymentMoney(paymentMoney);
orderListResponse.setGoodsBrand(master.getGoodsBrand()); orderListResponse.setGoodsBrand(master.getGoodsBrand());
orderListResponse.setGoodsSpecification(master.getGoodsSpecification()); orderListResponse.setGoodsSpecification(master.getGoodsSpecification());

5
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
View File

@ -208,4 +208,9 @@ public class OrderListResponse {
private String addMoneyRemark; private String addMoneyRemark;
private BigDecimal paymentMoney; private BigDecimal paymentMoney;
/**
* 是否已派发服务订单：0=未派发，1=已派发
*/
private Integer hasServiceOrder;
} }

3
ghy-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.js vendored
View File

@ -273,8 +273,7 @@
var _defaultRootFlag = item[options.parentCode] == '0' || var _defaultRootFlag = item[options.parentCode] == '0' ||
item[options.parentCode] == 0 || item[options.parentCode] == 0 ||
item[options.parentCode] == null || item[options.parentCode] == null ||
item[options.parentCode] == '' || item[options.parentCode] == '';
$.inArray(item[options.code], parentCodes) > 0 && !rootFlag;
if (!item[options.parentCode] || (_root ? (item[options.parentCode] == options.rootIdValue) : _defaultRootFlag)) { if (!item[options.parentCode] || (_root ? (item[options.parentCode] == options.rootIdValue) : _defaultRootFlag)) {
rootFlag = true; rootFlag = true;
if (!target.data_list["_root_"]) { if (!target.data_list["_root_"]) {

2
ghy-admin/src/main/resources/templates/include.html
View File

@ -30,7 +30,7 @@
<script th:src="@{/ajax/libs/validate/jquery.validate.extend.js?v=1.19.3}"></script> <script th:src="@{/ajax/libs/validate/jquery.validate.extend.js?v=1.19.3}"></script>
<script th:src="@{/ajax/libs/validate/messages_zh.js?v=1.19.3}"></script> <script th:src="@{/ajax/libs/validate/messages_zh.js?v=1.19.3}"></script>
<!-- bootstrap-table 表格树插件 --> <!-- bootstrap-table 表格树插件 -->
<script th:src="@{/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.min.js?v=1.18.3}"></script> <script th:src="@{/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.js?v=1.18.3}"></script>
<!-- 遮罩层 --> <!-- 遮罩层 -->
<script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js?v=2.70.0}"></script> <script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js?v=2.70.0}"></script>
<script th:src="@{/ajax/libs/iCheck/icheck.min.js?v=1.0.3}"></script> <script th:src="@{/ajax/libs/iCheck/icheck.min.js?v=1.0.3}"></script>