update 查询页面显示字段值多的问题调整

health-admin/src/main/resources/templates/daas/SDaasChannelManagementList.html

@@ -57,7 +57,7 @@
                         </div>
                         <div class="customize-form-group">
                                 <label>创建时间:</label>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
+                                <input type="text" class="time-input" id="beginTime" placeholder="开始时间" name="beginTime"/>
                                 <span>-</span>
                                 <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
                         </div>

health-admin/src/main/resources/templates/dtp/recipe/view.html

@@ -30,8 +30,8 @@
             <h4 class="query-condition-title">查询条件</h4>
             <div class="query-buttons">
                 <button onclick="" class="ant-btn-primary">导出订单</button>
-                <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="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+<!--                <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="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>-->
             </div>
         </div>
         <div class="container-div">

health-admin/src/main/resources/templates/hygl/jf/SHyglJfglPointAdjustmentList.html

@@ -125,7 +125,7 @@
                     { field: 'applicationTime', title: '申请时间', align: 'center' },
                     { field: 'approver', title: '审批人', align: 'center' },
                     { field: 'approvalTime', title: '审批时间', align: 'center' },
-                    { field: 'approvalStatus', title: '审批状态：待审核，审核通过，驳回', align: 'center' },
+                    { field: 'approvalStatus', title: '审批状态', align: 'center' },
                     { field: 'memberCardNumber', title: '会员卡号', align: 'center' },
                     { field: 'memberPhone', title: '会员手机号', align: 'center' },
                     { field: 'memberName', title: '会员姓名', align: 'center' },

health-admin/src/main/resources/templates/spgl/SSpglMdjymlStoreproductinfoList.html

@@ -21,22 +21,19 @@
                     </div>
                 </div>
                 <form id="SSpglMdjymlStoreproductinfo-form" class="customize-search-form">
-                    <div class="customize-form-group-container">
-                    </div>
-                    <div class="customize-form-group-container">
-                    </div>
+
                     <div class="customize-form-group-container">
                         <div class="customize-form-group">
                             <label>商品编码: </label>
-                            <input type="text" class="styled-input" name="productCode" autocomplete="off"/>
+                            <input type="text" class="styled-input" placeholder="请输入商品编码" name="productCode" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
                             <label>商品名称: </label>
-                            <input type="text" class="styled-input" name="productName" autocomplete="off"/>
+                            <input type="text" class="styled-input" placeholder="请输入商品名称" name="productName" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
                             <label>商品类目: </label>
-                            <input type="text" class="styled-input" name="productCategory" autocomplete="off"/>
+                            <input type="text" class="styled-input" placeholder="请输入商品类目" name="productCategory" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
                                 <label>可售状态</label>
@@ -47,10 +44,6 @@
                                 </select>
                         </div>
                         <div class="customize-form-group">
-                            <label><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="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                        </div>
-                        <div class="customize-form-group">
                                 <label>营销分类</label>
                                 <select name="marketingType"  class="styled-input">
                                     <option value="">全部</option>
@@ -58,8 +51,9 @@
                                     <option value="2">线下营销</option>
                                     <option value="3">电话营销</option>
                                 </select>
-                            </div>
+                        </div>
                     </div>
+
                 </form>
             </div>
 

health-admin/src/main/resources/templates/spgl/SSpglProductdetailsList.html

@@ -180,7 +180,12 @@
                     { field: 'productionLicenseNumber', title: '生产许可证号/备案凭证编号', align: 'center' },
                     { field: 'productionLicenseValidUntil', title: '生产许可证号有效期', align: 'center' },
                     { field: 'unitOfDispensing', title: '拆零单位', align: 'center' },
-                    { field: 'isDispensable', title: '是否可拆零', align: 'center' },
+
+                    { field: 'isDispensable', title: '是否可拆零', align: 'center'  ,
+                        formatter: function (value, row, index) {
+                            return statusTools(row);
+                        },
+                    },
                     { field: 'dispensingRatio', title: '拆零比例', align: 'center' },
                     { field: 'uniqueCode', title: '本位码', align: 'center' },
                     { field: 'marketingAuthorizationHolder', title: '上市许可持有人', align: 'center' },
@@ -244,13 +249,13 @@
     }
 
     /* 用户状态显示 */
-    function statusTools(row) {
-        if (row.status == 1) {
-            return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.userId + '\')"></i> ';
-        } else {
-            return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.userId + '\')"></i> ';
+        function statusTools(row) {
+            if (row.isDispensable == 1) {
+                return '<span style="color: #00B83F">是</span>';
+            } else {
+                return '<span style="color: #005cc5">否</span>';
+            }
         }
-    }
 </script>
 </body>
 

health-admin/src/main/resources/templates/xtsz/SXtszMdzhglAccountmanagementList.html

@@ -27,24 +27,12 @@
                     </div>
                     <div class="customize-form-group-container">
                         <div class="customize-form-group">
-                            <label>门店ID: </label>
-                            <input type="text" class="styled-input" name="storeId" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>账号名: </label>
-                            <input type="text" class="styled-input" name="accountName" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
                             <label>姓名: </label>
-                            <input type="text" class="styled-input" name="realName" autocomplete="off"/>
+                            <input type="text" class="styled-input" placeholder="请输入姓名" name="realName" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
                             <label>手机号码: </label>
-                            <input type="text" class="styled-input" name="mobileNumber" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>二维码: </label>
-                            <input type="text" class="styled-input" name="qrcodeUrl" autocomplete="off"/>
+                            <input type="text" class="styled-input" placeholder="请输入手机号码" name="mobileNumber" autocomplete="off"/>
                         </div>
                     </div>
                 </form>

health-admin/src/main/resources/templates/xtsz/SXtszMdzhglStoremanagementList.html

@@ -27,184 +27,8 @@
                     </div>
                     <div class="customize-form-group-container">
                         <div class="customize-form-group">
-                            <label>门店名称: </label>
-                            <input type="text" class="styled-input" name="storeName" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
                             <label>门店简称: </label>
-                            <input type="text" class="styled-input" name="storeShortName" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>门店类型: </label>
-                            <input type="text" class="styled-input" name="storeType" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>行政区域: </label>
-                            <input type="text" class="styled-input" name="administrativeArea" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>行政区域编码: </label>
-                            <input type="text" class="styled-input" name="administrativeAreaCode" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>门二维码: </label>
-                            <input type="text" class="styled-input" name="qrCode" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>电话: </label>
-                            <input type="text" class="styled-input" name="phoneNumber" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>营业时间: </label>
-                            <input type="text" class="styled-input" name="businessHours" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>地址: </label>
-                            <input type="text" class="styled-input" name="address" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>经度: </label>
-                            <input type="text" class="styled-input" name="longitude" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>纬度: </label>
-                            <input type="text" class="styled-input" name="latitude" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>门店编码: </label>
-                            <input type="text" class="styled-input" name="storeCode" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>地图: </label>
-                            <input type="text" class="styled-input" name="mapUrl" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>所在片区: </label>
-                            <input type="text" class="styled-input" name="area" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>参考门店编码: </label>
-                            <input type="text" class="styled-input" name="referenceStoreCode" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>门店属性: </label>
-                            <input type="text" class="styled-input" name="storeAttribute" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>门店内码: </label>
-                            <input type="text" class="styled-input" name="internalCode" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>助记码: </label>
-                            <input type="text" class="styled-input" name="mnemonicCode" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>采购组织: </label>
-                            <input type="text" class="styled-input" name="procurementOrganization" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>销售组织: </label>
-                            <input type="text" class="styled-input" name="salesOrganization" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>分销渠道: </label>
-                            <input type="text" class="styled-input" name="distributionChannel" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>部门: </label>
-                            <input type="text" class="styled-input" name="department" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>租赁面积: </label>
-                            <input type="text" class="styled-input" name="leaseArea" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>外租面积: </label>
-                            <input type="text" class="styled-input" name="externalLeaseArea" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>经营面积: </label>
-                            <input type="text" class="styled-input" name="operatingArea" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>传真: </label>
-                            <input type="text" class="styled-input" name="faxNumber" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>联系人: </label>
-                            <input type="text" class="styled-input" name="contactPerson" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>开业日期: </label>
-                            <input type="text" class="styled-input" name="openingDate" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>交割日期: </label>
-                            <input type="text" class="styled-input" name="transferDate" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>关店日期: </label>
-                            <input type="text" class="styled-input" name="closingDate" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>最近翻新改造日期: </label>
-                            <input type="text" class="styled-input" name="lastRenovationDate" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>门店租金: </label>
-                            <input type="text" class="styled-input" name="rent" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>门店状态: </label>
-                            <input type="text" class="styled-input" name="storeStatus" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>社区及商住店: </label>
-                            <input type="text" class="styled-input" name="communityAndResidentialStore" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>编制人数: </label>
-                            <input type="text" class="styled-input" name="staffCount" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>日历: </label>
-                            <input type="text" class="styled-input" name="calendar" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>门店使用的系统: </label>
-                            <input type="text" class="styled-input" name="systemUsed" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>详细地址: </label>
-                            <input type="text" class="styled-input" name="detailedAddress" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>大区: </label>
-                            <input type="text" class="styled-input" name="district" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>选址商圈店型: </label>
-                            <input type="text" class="styled-input" name="locationBusinessCircleStoreType" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>特殊业态店型: </label>
-                            <input type="text" class="styled-input" name="specialBusinessType" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>营业面积分类: </label>
-                            <input type="text" class="styled-input" name="businessAreaCategory" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>月销售额等级: </label>
-                            <input type="text" class="styled-input" name="monthlySalesLevel" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>医保政策分类: </label>
-                            <input type="text" class="styled-input" name="medicalInsurancePolicyCategory" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>顾客年龄层: </label>
-                            <input type="text" class="styled-input" name="customerAgeLayer" autocomplete="off"/>
+                            <input type="text" class="styled-input" placeholder="门店简称搜索" name="storeShortName" autocomplete="off"/>
                         </div>
                     </div>
                 </form>