From 3236778a727a75bdb2f6fcb752c59068ec12ac28 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 03 May 2022 19:11:33 +0800
Subject: [PATCH] Merge branch 'developer' into alpha
---
zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-zb-list.html | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-zb-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-zb-list.html
index b15b2d8..6321741 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-zb-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-zb-list.html
@@ -17,17 +17,11 @@
<body class=" container-fluid">
<div class="pd-10">
- <div class="row" >
- <a th:href="@{/admin/redirect/hive/products/shoppinggoods-zb-list}" class="btn btn-info " type="button"></i>总部产品</a>
- <a th:href="@{/admin/redirect/hive/products/shoppinggoods-md-list}" class="btn btn-default " type="button"></i>本店产品</a>
-
- </div>
<!-- 搜索框部分start -->
<div class="row form-head">
<form class="form-inline" id="serchform">
<input autocomplete="off" type="hidden" name="salePlatform" value="线下">
- <input autocomplete="off" type="hidden" name="headquarters" value="1">
<div class="form-group mr-20">
<label for="name">商品名称</label>
<input class="form-control " name="name" id="name">
@@ -83,6 +77,15 @@
</select>
</div>
+ <div class="form-group mr-20">
+ <label for=" ">是否总部产品</label>
+ <select class="form-control" name="headquarters" id=" ">
+ <option value=''>--请选择--</option>
+ <option value='1'>是</option>
+ <option value='2'>否</option>
+ </select>
+ </div>
+
<div class="form-group mr-20">
<label>商品创建日期</label>
@@ -103,6 +106,9 @@
<div class="row mt-10">
<div id="option-bar">
<button matrix:btn="shoppinggoods1-add" onclick="openEdit()" type="button" class="btn btn-info btn-sm"><i class="fa fa-eye" ></i> 查看</button>
+ <button matrix:btn="shoppinggoods1-add" onclick="openAdd()" type="button" class="btn btn-info btn-sm"><i class="fa fa-plus" ></i> 新增</button>
+ <button matrix:btn="shoppinggoods1-edit" onclick="openEdit()" type="button" class="btn btn-info btn-sm"><i class="fa fa-edit" ></i> 编辑</button>
+ <button matrix:btn="shoppinggoods1-dels" onclick="myGrid.delItems()" type="button" class="btn btn-danger btn-sm"><i class="fa fa-trash" ></i>批量删除</button>
<button matrix:btn="shoppinggoods1-add" onclick="exportExcel()" type="button" class="btn btn-default btn-sm"><i class="fa fa-download"></i>导出 </button>
</div>
<!-- 数据表格部分 -->
@@ -120,7 +126,7 @@
<th data-field="isPresent">是否赠送</th>
<th data-field="goodType" data-sortable="true">类型</th>
<th data-field="cateName" >分类</th>
- <th data-field="achieveRuleName" >业绩规则</th>
+ <th data-field="shopName" >创建门店</th>
<th data-field="createTime" data-sortable="true" data-formatter="MGrid.getTime">创建时间</th>
</tr>
</thead>
--
Gitblit v1.9.1