提交代码

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/merchantWxpay/controller/MerchantWxpayController.java

@@ -1,58 +0,0 @@
-package com.xingxi.web.controller.business.merchantWxpay.controller;
-
-import com.xingxi.business.MerchantWxpay.domain.MerchantWxpay;
-import com.xingxi.business.MerchantWxpay.service.IMerchantWxpayService;
-import com.xingxi.common.annotation.Log;
-import com.xingxi.common.core.controller.BaseController;
-import com.xingxi.common.core.domain.AjaxResult;
-import com.xingxi.common.enums.BusinessType;
-import com.xingxi.web.controller.business.merchantWxpay.domain.MerchantWxpayVo;
-import com.xingxi.web.controller.business.merchantWxpay.service.IMerchantWxpayVoService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-/**
- * 店铺微信支付信息Controller
- *
- * @author ruoyi
- * @date 2025-03-09
- */
-@Controller
-@RequestMapping("/business/merchant/wxpay")
-public class MerchantWxpayController extends BaseController {
-    private String prefix = "business/merchant/wxpay";
-
-    @Resource
-    private IMerchantWxpayService merchantWxpayService;
-    @Resource
-    private IMerchantWxpayVoService merchantWxpayVoService;
-
-    /**
-     * 修改店铺微信支付信息
-     */
-    @RequiresPermissions("business:merchant:wxpay:edit")
-    @GetMapping("/edit/{mercId}")
-    public String edit(@PathVariable("mercId") Long mercId, ModelMap mmap) {
-        MerchantWxpayVo merchantWxpayVo = merchantWxpayVoService.selectMerchantWxpayVoByMercId(mercId);
-        if (merchantWxpayVo == null) {
-            merchantWxpayVo = new MerchantWxpayVo();
-        }
-        mmap.put("merchantWxpay", merchantWxpayVo);
-        return prefix + "/edit";
-    }
-
-    /**
-     * 修改保存店铺微信支付信息
-     */
-    @RequiresPermissions("business:merchant:wxpay:edit")
-    @Log(title = "店铺微信支付信息", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    @ResponseBody
-    public AjaxResult editSave(MerchantWxpay merchantWxpay) {
-        return toAjax(merchantWxpayService.updateMerchantWxpay(merchantWxpay));
-    }
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/order/controller/OrderController.java

@@ -0,0 +1,53 @@
+package com.xingxi.web.controller.business.order.controller;
+
+import com.xingxi.common.core.controller.BaseController;
+import com.xingxi.common.core.page.TableDataInfo;
+import com.xingxi.common.enums.EDelFlag;
+import com.xingxi.common.enums.ERoleKey;
+import com.xingxi.common.utils.ShiroUtils;
+import com.xingxi.web.controller.business.order.domain.OrderVo;
+import com.xingxi.web.controller.business.order.service.IOrderVoService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 订单 操作处理
+ *
+ * @author hocy
+ * @date 2020-01-17
+ */
+@Controller
+@RequestMapping("/business/order")
+public class OrderController extends BaseController {
+    private String prefix = "business/order";
+
+    @Resource
+    private IOrderVoService orderVoService;
+
+    @RequiresPermissions("business:order:view")
+    @GetMapping()
+    public String order() {
+        return prefix + "/order";
+    }
+
+    /**
+     * 查询订单 列表
+     */
+    @RequiresPermissions("business:order:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(OrderVo orderVo) {
+        startPage();
+        if (ERoleKey.VENDOR.getCode().equals(ShiroUtils.getSysUser().getRoles().get(0).getRoleKey())) {
+            orderVo.setSellerId(ShiroUtils.getUserId());
+        }
+        orderVo.setDelFlag(EDelFlag.NO.getVal());
+        List<OrderVo> list = orderVoService.selectOrderVoList(orderVo);
+        return getDataTable(list);
+    }
+}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/order/domain/OrderVo.java

@@ -0,0 +1,18 @@
+package com.xingxi.web.controller.business.order.domain;
+
+import com.xingxi.business.Order.domain.Order;
+import lombok.Data;
+import lombok.ToString;
+
+/**
+ * 订单 表 t_order
+ *
+ * @author xingxi
+ * @date 2025-05-20
+ */
+@Data
+@ToString(callSuper = true)
+public class OrderVo extends Order {
+
+    private static final long serialVersionUID = 1L;
+}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/order/mapper/OrderVoMapper.java

@@ -0,0 +1,31 @@
+package com.xingxi.web.controller.business.order.mapper;
+
+import com.xingxi.web.controller.business.order.domain.OrderVo;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * 订单  数据层
+ *
+ * @author xingxi
+ * @date 2025-05-20
+ */
+@Repository
+public interface OrderVoMapper {
+    /**
+     * 查询订单Vo 信息
+     *
+     * @param orderId 订单 ID
+     * @return 订单 信息
+     */
+    OrderVo selectOrderVoByOrderId(Long orderId);
+
+    /**
+     * 查询订单Vo 列表
+     *
+     * @param orderVo 订单Vo
+     * @return 订单Vo 集合
+     */
+    List<OrderVo> selectOrderVoByOrderId(OrderVo orderVo);
+}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/order/service/IOrderVoService.java

@@ -0,0 +1,29 @@
+package com.xingxi.web.controller.business.order.service;
+
+import com.xingxi.web.controller.business.order.domain.OrderVo;
+
+import java.util.List;
+
+/**
+ * 订单  服务层
+ *
+ * @author hocy
+ * @date 2020-01-17
+ */
+public interface IOrderVoService {
+    /**
+     * 查询订单 信息
+     *
+     * @param orderId 订单 ID
+     * @return 订单 信息
+     */
+    OrderVo selectOrderVoByOrderId(Long orderId);
+
+    /**
+     * 查询订单Vo 集合
+     *
+     * @param orderVo 订单Vo
+     * @return 订单Vo 集合
+     */
+    List<OrderVo> selectOrderVoList(OrderVo orderVo);
+}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/order/service/impl/OrderVoServiceImpl.java

@@ -0,0 +1,43 @@
+package com.xingxi.web.controller.business.order.service.impl;
+
+import com.xingxi.web.controller.business.order.domain.OrderVo;
+import com.xingxi.web.controller.business.order.mapper.OrderVoMapper;
+import com.xingxi.web.controller.business.order.service.IOrderVoService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 订单  服务层实现
+ *
+ * @author hocy
+ * @date 2020-01-17
+ */
+@Service
+public class OrderVoServiceImpl implements IOrderVoService {
+    @Resource
+    private OrderVoMapper orderVoMapper;
+
+    /**
+     * 查询订单 信息
+     *
+     * @param orderId 订单 ID
+     * @return 订单 信息
+     */
+    @Override
+    public OrderVo selectOrderVoByOrderId(Long orderId) {
+        return orderVoMapper.selectOrderVoByOrderId(orderId);
+    }
+
+    /**
+     * 查询订单Vo 列表
+     *
+     * @param orderVo 订单Vo
+     * @return 订单Vo 集合
+     */
+    @Override
+    public List<OrderVo> selectOrderVoList(OrderVo orderVo) {
+        return orderVoMapper.selectOrderVoByOrderId(orderVo);
+    }
+}

08.src/Xingxi/xingxi-admin/src/main/resources/templates/business/order/order.html

@@ -0,0 +1,586 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('订单列表')" />
+</head>
+<body class="gray-bg">
+    <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+					<div class="select-list">
+						<ul>
+							<li>
+								订单编号：<input type="text" name="orderNo" placeholder="订单编号"/>
+							</li>
+							<li>
+								商品名称：<input type="text" name="srhProdName" placeholder="商品名称"/>
+							</li>
+							<li>
+								支付方式：
+								<select name="payType" th:with="type=${@dict.getType('pay_type')}">
+									<option value="">所有</option>
+									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+								</select>
+							</li>
+							<li>
+								代理姓名：<input type="text" name="agentName" placeholder="代理姓名"/>
+							</li>
+							<li>
+								代理手机：<input type="text" name="agentMobile" placeholder="代理手机"/>
+							</li>
+							<li>
+								客户姓名：<input type="text" name="buyerName" placeholder="客户姓名"/>
+							</li>
+							<li>
+								客户手机：<input type="text" name="buyerMobile" placeholder="客户手机"/>
+							</li>
+							<li>
+								收件人姓名：<input type="text" name="recName" placeholder="收件人姓名"/>
+							</li>
+							<li>
+								收件人手机：<input type="text" name="recMobile" placeholder="收件人手机"/>
+							</li>
+							<li>
+								快递编号：<input type="text" name="expressNo" placeholder="快递编号"/>
+							</li>
+							<li shiro:hasPermission="platform:order:show">
+								商品分类：
+								<select name="prodType" th:with="type=${@dict.getType('prod_type_all')}">
+									<option value="">所有</option>
+									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+								</select>
+							</li>
+							<li shiro:hasPermission="stock:order:show">
+								商品分类：
+								<select name="prodType" th:with="type=${@dict.getType('prod_type_all')}">
+									<option value="">所有</option>
+									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+								</select>
+							</li>
+							<li>
+								正品分类：
+								<select name="giftType" th:with="type=${@dict.getType('gift_type')}">
+									<option value="">所有</option>
+									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+								</select>
+							</li>
+							<li shiro:hasPermission="platform:order:show">
+								供应商：
+								<select id="vendorId" name="vendorId" style="width: 200px;" th:with="us=${@user.getVendorList()}">
+									<option value="">所有</option>
+									<option th:each="u : ${us}" th:text="${u.userName}" th:value="${u.userId}"></option>
+								</select>
+							</li>
+<!--                            <li>-->
+<!--                                商品筛选：-->
+<!--                                <span>已选择 <label id="prodSelectCnt">0</label>项</span>-->
+<!--                                <input type="hidden" id="prodforsrh" name="prodforsrh">-->
+<!--                                <a class="btn btn-info btn-sm" onclick="showProductSelect()"><i class="fa fa-search"></i>&nbsp;商品选择</a>-->
+<!--                            </li>-->
+							<li class="select-time">
+								<label>订单时间： </label>
+								<input type="text" class="time-input" placeholder="开始时间" id="orderTimeFrom" name="params[orderTimeFrom]"/>
+								<span>-</span>
+								<input type="text" class="time-input" placeholder="结束时间" id="orderTimeTo" name="params[orderTimeTo]"/>
+							</li>
+							<li class="select-time">
+								<label>取消时间： </label>
+								<input type="text" class="time-input" placeholder="开始时间" id="cancel TimeFrom" name="params[cancelTimeFrom]"/>
+								<span>-</span>
+								<input type="text" class="time-input" placeholder="结束时间" id="cancelTimeTo" name="params[cancelTimeTo]"/>
+							</li>
+							<li>
+								订单状态：
+								<select name="orderStatus" th:with="type=${@dict.getType('order_status')}">
+									<option value="">所有</option>
+									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+								</select>
+							</li>
+						</ul>
+						<ul>
+							<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>
+							</li>
+						</ul>
+					</div>
+                </form>
+            </div>
+            
+            <div class="btn-group-sm" id="toolbar" role="group">
+				<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="platform:order:export">
+					<i class="fa fa-download"></i> EXCEL导出
+				</a>
+				<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="warehouse:order:export">
+					<i class="fa fa-download"></i> EXCEL导出
+				</a>
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()">-->
+<!--					<i class="fa fa-download"></i> EXCEL导出-->
+<!--                 </a>-->
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table" data-mobile-responsive="true"></table>
+            </div>
+        </div>
+    </div>
+	<th:block th:include="include :: footer" />
+	<!-- 备注区域 -->
+	<script id="remarkDiv" type="text/template">
+		<div class="col-xs-offset-1" style="height: 150px;">
+			<form id="formRemark">
+				<div class="select-list">
+					<ul>
+						<li>
+							<label class="col-sm-5 control-label">备注：</label>
+							<div class="col-sm-8">
+								<textarea id="remark" name="remark" class="form-control" maxlength="500" style="width: 270px; height: 100px;"></textarea>
+							</div>
+						</li>
+					</ul>
+				</div>
+			</form>
+		</div>
+	</script>
+    <script th:src="@{/hocy/js/datatimeTool.js}"></script>
+    <script th:src="@{/hocy/js/currency.js}"></script>
+    <script th:inline="javascript">
+		var editFlag = [[${@permission.hasPermi('platform:order:edit')}]];
+        var prefix = ctx + "hocy/order";
+        var datas = [[${@dict.getType('order_status')}]];
+		var datasPayType = [[${@dict.getType('pay_type')}]];
+
+        var platformFlag = [[${@permission.hasPermi('platform:order:show')}]];
+        var stockFlag = [[${@permission.hasPermi('stock:order:show')}]];
+        var cofounderFlag = [[${@permission.hasPermi('cofounder:order:show')}]];
+
+		var dateFrom = DateAdd("m ", -1, new Date());
+		var dateTo = new Date();
+		$("#orderTimeFrom").val(dateFrom.Format("yyyy-MM-dd"));
+		$("#orderTimeTo").val(dateTo.Format("yyyy-MM-dd"));
+
+        var showColumns = [];
+        if (platformFlag == "") {
+            showColumns = [{
+                field : 'orderNo',
+                title : '订单编号',
+                sortable: false,
+				formatter: function(value, row, index) {
+					var displayString = value;
+					if (row.remark != null && row.remark !== "") {
+						displayString += " <a href='#commenting' data-toggle='tooltip' data-placement='top' title='" + row.remark + "'><i class='fa fa-commenting'></i></a>";
+					}
+					return value;
+					// return displayString;
+				}
+            },
+            {
+                field : 'sumAmount',
+                title : '订单总额',
+                sortable: false,
+				align : "right",
+                formatter: function(value, row, index) {
+                    return formatCurrency(value / 100, 2);
+                }
+            },
+            {
+                field : 'payAmount',
+                title : '实付总额',
+                sortable: false,
+                align : "right",
+                formatter: function(value, row, index) {
+                    return formatCurrency(value / 100, 2);
+                }
+            },
+			// {
+			// 	field : 'payType',
+			// 	title : '支付方式',
+			// 	sortable: false,
+			// 	formatter: function(value, row, index) {
+			// 		return $.table.selectDictLabel(datasPayType, value);
+			// 	}
+			// },
+			{
+				field : 'salesmanTwoName',
+				title : 'HOCY STAR',
+				sortable: false
+			},
+			{
+				field : 'salesmanTwoPhonenumber',
+				title : 'HOCY STAR手机',
+				sortable: false
+			},
+            {
+                field : 'salesmanOneName',
+                title : '和浠店主',
+                sortable: false
+            },
+            {
+                field : 'salesmanOnePhonenumber',
+                title : '和浠店主手机',
+                sortable: false
+            },
+            {
+                field : 'salesmanCofoundName',
+                title : '和浠总代',
+                sortable: false
+            },
+            {
+                field : 'salesmanCofoundPhonenumber',
+                title : '和浠总代手机',
+                sortable: false
+            },
+			{
+				field : 'buyerName',
+				title : '客户姓名',
+				sortable: false
+			},
+			{
+				field : 'buyerMobile',
+				title : '客户手机',
+				sortable: false
+			},
+			{
+				field : 'recName',
+				title : '收件人姓名',
+				sortable: false
+			},
+			{
+				field : 'recMobile',
+				title : '收件人手机',
+				sortable: false
+			},
+            {
+                field : 'orderTime',
+                title : '订单时间',
+                sortable: false
+            },
+			{
+				field : 'cancelTime',
+				title : '取消时间',
+				sortable: false
+			},
+            {
+                field : 'orderStatus',
+                title : '订单状态',
+                sortable: false,
+                formatter: function(value, row, index) {
+                    return $.table.selectDictLabel(datas, value);
+                }
+            },
+            {
+                title: '操作',
+                align: 'center',
+                formatter: function(value, row, index) {
+                    var actions = [];
+					actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.modal.openTab(\'订单详情\', \'' + prefix + '/detail/' + row.id + '\')"><i class="fa fa-edit"></i>查看</a> ');
+					// actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="handleRemark(\'' + row.id + '\')"><i class="fa fa-info"></i>备注</a> ');
+                    return actions.join('');
+                }
+            }]
+        } else if (stockFlag == "") {
+            showColumns = [{
+                field : 'id',
+                visible: false
+            },
+            {
+                field : 'orderNo',
+                title : '订单编号',
+                sortable: false,
+				formatter: function(value, row, index) {
+					var displayString = value;
+					if (row.remark != null && row.remark !== "") {
+						displayString += " <a href='#commenting' data-toggle='tooltip' data-placement='top' title='" + row.remark + "'><i class='fa fa-commenting'></i></a>";
+					}
+                    return value;
+					// return displayString;
+				}
+            },
+            {
+                field : 'salesmanTwoName',
+                title : 'HOCY STAR',
+                sortable: false
+            },
+            {
+                field : 'salesmanTwoPhonenumber',
+                title : 'HOCY STAR手机',
+                sortable: false
+            },
+            {
+                field : 'salesmanOneName',
+                title : '和浠店主',
+                sortable: false
+            },
+            {
+                field : 'salesmanOnePhonenumber',
+                title : '和浠店主手机',
+                sortable: false
+            },
+            {
+                field : 'salesmanCofoundName',
+                title : '和浠总代',
+                sortable: false
+            },
+            {
+                field : 'salesmanCofoundPhonenumber',
+                title : '和浠总代手机',
+                sortable: false
+            },
+			{
+				field : 'buyerName',
+				title : '客户姓名',
+				sortable: false
+			},
+			{
+				field : 'buyerMobile',
+				title : '客户手机',
+				sortable: false
+			},
+			{
+				field : 'recName',
+				title : '收件人姓名',
+				sortable: false
+			},
+			{
+				field : 'recMobile',
+				title : '收件人手机',
+				sortable: false
+			},
+			{
+				field : 'orderTime',
+				title : '订单时间',
+				sortable: false,
+				formatter: function(value, row, index) {
+					return format2Timestamp(row.orderTime);
+				}
+			},
+			{
+				field : 'orderStatus',
+				title : '订单状态',
+				sortable: false,
+				formatter: function(value, row, index) {
+					return $.table.selectDictLabel(datas, value);
+				}
+			},
+            {
+                title: '操作',
+                align: 'center',
+                formatter: function(value, row, index) {
+                    var actions = [];
+                    actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\', 1000)"><i class="fa fa-edit"></i>查看</a> ');
+                    return actions.join('');
+                }
+            }]
+        } else if (cofounderFlag == "") {
+            showColumns = [{
+                field : 'id',
+                visible: false
+            },
+            {
+                field : 'orderNo',
+                title : '订单编号',
+                sortable: false
+            },
+            {
+                field : 'sumAmount',
+                title : '订单金额',
+				align : "right",
+                formatter: function(value, row, index) {
+                    return formatCurrency(value / 100, 2);
+                }
+            },
+            {
+                field : 'payAmount',
+                title : '实付总额',
+                sortable: false,
+                align : "right",
+                formatter: function(value, row, index) {
+                    return formatCurrency(value / 100, 2);
+                }
+            },
+			{
+				field : 'payType',
+				title : '支付方式',
+				sortable: false,
+				formatter: function(value, row, index) {
+					return $.table.selectDictLabel(datasPayType, value);
+				}
+			},
+			{
+				field : 'salesmanUserName',
+				title : '代理姓名',
+				sortable: false
+			},
+			{
+				field : 'salesmanUserPhonenumber',
+				title : '代理手机',
+				sortable: false
+			},
+			// {
+			// 	field : 'salesmanTwoName',
+			// 	title : 'HOCY STAR',
+			// 	sortable: false
+			// },
+			// {
+			// 	field : 'salesmanTwoPhonenumber',
+			// 	title : 'HOCY STAR手机',
+			// 	sortable: false
+			// },
+			// {
+			// 	field : 'salesmanOneName',
+			// 	title : 'HOCY TALENT',
+			// 	sortable: false
+			// },
+			// {
+			// 	field : 'salesmanOnePhonenumber',
+			// 	title : 'HOCY TALENT手机',
+			// 	sortable: false
+			// },
+			{
+				field : 'buyerName',
+				title : '客户姓名',
+				sortable: false
+			},
+			{
+				field : 'buyerMobile',
+				title : '客户手机',
+				sortable: false
+			},
+			{
+				field : 'recName',
+				title : '收件人姓名',
+				sortable: false
+			},
+			{
+				field : 'recMobile',
+				title : '收件人手机',
+				sortable: false
+			},
+			{
+				field : 'orderTime',
+				title : '订单时间',
+				sortable: false
+			},
+			{
+				field : 'orderStatus',
+				title : '订单状态',
+				sortable: false,
+				formatter: function(value, row, index) {
+					return $.table.selectDictLabel(datas, value);
+				}
+			},
+			{
+				field : 'cancelTime',
+				title : '取消时间',
+				sortable: false
+			},
+            {
+                title: '操作',
+                align: 'center',
+                formatter: function(value, row, index) {
+                    var actions = [];
+                    actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\', 1000)"><i class="fa fa-edit"></i>查看</a> ');
+                    return actions.join('');
+                }
+            }]
+        }
+
+        var selectedProducts;
+        function showProductSelect() {
+            layer.open({
+                type: 2,
+                area: ['800px', '600px'],
+                fix: false,
+                //不固定
+                maxmin: true,
+                shade: 0.3,
+                title: "商品选择",
+                content: ctx + "hocy/undelivery/prodSelect",
+                btn: ['确定', '关闭'],
+                // 弹层外区域关闭
+                shadeClose: true,
+                success: setSelectedToModel,
+                yes: function(index, layero) {
+                    var iframeWin = layero.find('iframe')[0];
+                    iframeWin.contentWindow.submitHandler(index, layero);
+                }
+            });
+        }
+
+        function setSelectedToModel(layero, index) {
+            if (selectedProducts != null) {
+                let body = layer.getChildFrame('body', index);
+                body.find("#selectedProds").val(selectedProducts);
+                var iframeWin = window[layero.find('iframe')[0]['name']];
+                iframeWin.$.table.search();
+            }
+        }
+
+        function modelCallback(modelsSelected) {
+            selectedProducts = modelsSelected;
+            $("#prodSelectCnt").text(selectedProducts.length);
+            $("#prodforsrh").val(selectedProducts.join())
+        }
+
+        $(function() {
+			var exportUrlString = prefix + "/export";
+			// if (platformFlag == "") {
+			// 	exportUrlString = prefix + "/exportForPlm";
+			// }
+            var options = {
+                url: prefix + "/list",
+				uniqueId : 'id',
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                exportUrl: exportUrlString,
+                detailUrl: prefix + "/detail/{id}",
+                modalName: "订单",
+				sortName: "orderTime",
+				sortOrder: "desc",
+                columns: showColumns
+            };
+            $.table.init(options);
+        });
+
+		function handleRemark(id) {
+			var rowData = $("#bootstrap-table").bootstrapTable('getRowByUniqueId', id)
+			var content = $('#remarkDiv').html();
+			layer.open({
+				type: 1,
+				fix: false,
+				maxmin: true,
+				shade: 0.3,
+				title: '备注',
+				// 弹层外区域关闭
+				shadeClose: true,
+				content: content, //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
+				btn: ['<i class="fa fa-check"></i> 确定', '<i class="fa fa-remove"></i> 关闭'],
+				btn1: function() {
+					var data = {};
+					data.orderId = id;
+					data.remark = $('#remark').val();
+					var index = layer.load(2, {shade: false});
+					$.modal.disable();
+
+					$.post(prefix + "/saveRemark", data, function(result) {
+						if (result.code === web_status.SUCCESS) {
+							$.modal.closeAll();
+							$.modal.alertSuccess(result.msg);
+							$.table.refresh();
+						} else if (result.code === web_status.WARNING) {
+							$.modal.closeAll();
+							$.modal.enable();
+							$.modal.alertWarning(result.msg)
+						} else {
+							$.modal.closeAll();
+							$.modal.enable();
+							$.modal.alertError(result.msg);
+						}
+					});
+				}
+			});
+			$('#remark').val(rowData.remark);
+		}
+    </script>
+</body>
+</html>