货主页面调整

huhai
1 parent 96d815b8
Showing 9 changed files with 55 additions and 33 deletions
src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java
src/main/java/com/huaheng/pc/general/company/mapper/CompanyMapper.java
src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java
src/main/java/com/huaheng/pc/general/company/service/ICompanyService.java
src/main/resources/templates/general/company/add.html
src/main/resources/templates/general/company/company.html
src/main/resources/templates/general/company/edit.html
src/main/resources/templates/receipt/receiptHeader/edit.html
src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
@@ -2,6 +2,7 @@ package com.huaheng.pc.general.company.controller;
  
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
+import com.huaheng.pc.general.company.mapper.CompanyMapper;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -34,6 +35,7 @@ public class CompanyController extends BaseController
     @Autowired
 	private ICompanyService companyService;
  
+
 	@RequiresPermissions("general:company:view")
 	@GetMapping()
 	public String company()
@@ -50,8 +52,10 @@ public class CompanyController extends BaseController
 	public TableDataInfo list(Company company)
 	{
         Page<Company> page = getPage();
+        company.setDeleted(false);
         EntityWrapper<Company> entityWrapper = new EntityWrapper();
-        companyService.selectPage(page, entityWrapper) ;
+		entityWrapper.setEntity(company);
+		companyService.selectPage(page, entityWrapper) ;
         return getDataTable(page);
 	}
  
@@ -12,7 +12,6 @@ public interface CompanyMapper extends BaseMapper&lt;Company&gt; {
  
     int deleteCompanyByIds(String ids);
  
-
 }
  
  
@@ -34,6 +34,8 @@ public class CompanyServiceImpl extends ServiceImpl&lt;CompanyMapper, Company&gt; impl
         }
         return companys;
     }
+
+
 }
  
  
@@ -10,6 +10,7 @@ public interface ICompanyService extends IService&lt;Company&gt; {
  
     List<Company> selectCompanyByUserId(Integer userId);
  
+
 }
  
  
@@ -20,7 +20,10 @@
 			<div class="form-group">	
 				<label class="col-sm-3 control-label">公司类型：</label>
 				<div class="col-sm-8">
-					<input id="type" name="type" class="form-control" type="text">
+					<!--<input id="type" name="type" class="form-control" type="text">-->
+					<select id="type" class="form-control m-b" th:with="companyType=${@dict.getType('companyType')}">
+						<option th:each="dict : ${companyType}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
+					</select>
 				</div>
 			</div>
 			<div class="form-group">	
@@ -122,13 +125,14 @@
 			<div class="form-group">	
 				<label class="col-sm-3 control-label">是否有效：</label>
 				<div class="col-sm-8">
-					<input id="enable" name="enable" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">是否删除：</label>
-				<div class="col-sm-8">
-					<input id="deleted" name="deleted" class="form-control" type="text">
+					<!--<input id="enable" name="enable" class="form-control" type="text">-->
+					<div class="onoffswitch">
+						<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">
+						<label class="onoffswitch-label" for="enable">
+							<span class="onoffswitch-inner"></span>
+							<span class="onoffswitch-switch"></span>
+						</label>
+					</div>
 				</div>
 			</div>
 			<div class="form-group">	
@@ -22,7 +22,7 @@
         var editFlag = [[${@permission.hasPermi('general:company:edit')}]];
         var removeFlag = [[${@permission.hasPermi('general:company:remove')}]];
         var prefix = ctx + "general/company"
-
+        var datas = [[${@dict.getType('sys_normal_disable')}]];
         $(function() {
             var options = {
                 url: prefix + "/list",
@@ -115,23 +115,26 @@
 				},
 				{
 					field : 'enable', 
-					title : '是否有效' 
-				},
-				{
-					field : 'deleted', 
-					title : '是否删除' 
+					title : '是否有效' ,
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(datas, value);
+                    }
 				},
 				{
 					field : 'userDef1', 
-					title : '自定义字段1' 
+					title : '自定义字段1' ,
+					visible:false
 				},
 				{
 					field : 'userDef2', 
-					title : '自定义字段2' 
+					title : '自定义字段2'  ,
+                    visible:false
 				},
 				{
 					field : 'userDef3', 
-					title : '自定义字段3' 
+					title : '自定义字段3'  ,
+                    visible:false
 				},
 		        {
 		            title: '操作',
@@ -123,15 +123,17 @@
             <div class="form-group">	
                 <label class="col-sm-3 control-label">是否有效：</label>
                 <div class="col-sm-8">
-                    <input id="enable" name="enable" th:field="*{enable}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">是否删除：</label>
-                <div class="col-sm-8">
-                    <input id="deleted" name="deleted" th:field="*{deleted}" class="form-control" type="text">
+                    <!--<input id="enable" name="enable" th:field="*{enable}" class="form-control" type="text">-->
+                    <div class="onoffswitch">
+                        <input type="checkbox" th:checked="*{enable}" class="onoffswitch-checkbox" id="enable" name="enable">
+                        <label class="onoffswitch-label" for="enable">
+                            <span class="onoffswitch-inner"></span>
+                            <span class="onoffswitch-switch"></span>
+                        </label>
+                    </div>
                 </div>
             </div>
+
             <div class="form-group">	
                 <label class="col-sm-3 control-label">自定义字段1：</label>
                 <div class="col-sm-8">
@@ -28,7 +28,7 @@
             <div class="form-group">	
                 <label class="col-sm-3 control-label">入库类型：</label>
                 <div class="col-sm-8">
-                    <select id="type" class="form-control m-b" th:with="receiptHeaderType=${@dict.getType('receiptHeaderType')}">
+                    <select id="type" class="form-control m-b" th:with="receiptHeaderType=${@dict.getType('receiptType')}">
                         <option th:each="dict : ${receiptHeaderType}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}" th:field="*{type}></option>
                     </select>
                 </div>
@@ -21,8 +21,8 @@
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('receipt:bill:edit')}]];
         var removeFlag = [[${@permission.hasPermi('receipt:bill:remove')}]];
-        var prefix = ctx + "receipt/receiptHeader"
-
+        var prefix = ctx + "receipt/receiptHeader";
+        var datas = [[${@dict.getType('sys_normal_disable')}]];
         $(function() {
             var options = {
                 url: prefix + "/list",
@@ -123,19 +123,26 @@
 				},
 				{
 					field : 'enable', 
-					title : '是否有效' 
+					title : '是否有效',
+					align: 'center',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(datas, value);
+                    }
 				},
 				{
 					field : 'userDef1', 
-					title : '自定义字段1' 
+					title : '自定义字段1',
+					visible: false
 				},
 				{
 					field : 'userDef2', 
-					title : '自定义字段2' 
+					title : '自定义字段2',
+                    visible: false
 				},
 				{
 					field : 'userDef3', 
-					title : '自定义字段3' 
+					title : '自定义字段3' ,
+                    visible: false
 				},
 		        {
 		            title: '操作',