AUTO_COMMITED_BY_SERVER

src/main/java/com/izouma/awesomeadmin/model/TableNiuseRongliang.java

@@ -25,8 +25,6 @@ public class TableNiuseRongliang{
     private Integer 核定容量;
     private Integer 综合核定的合理承载数;
     private String 是否青年围产舍;
-    private String 泌乳31-60天舍;
-    private String 泌乳61-150天舍;
     private Integer flagcolumn;
     private String 备注;
     private String 修改人;
@@ -158,20 +156,6 @@ private String orderByStr;
     public void set是否青年围产舍(String 是否青年围产舍){
         this.是否青年围产舍 = 是否青年围产舍;
     }
-    public String get泌乳31-60天舍(){
-        return this.泌乳31-60天舍;
-    }
-
-    public void set泌乳31-60天舍(String 泌乳31-60天舍){
-        this.泌乳31-60天舍 = 泌乳31-60天舍;
-    }
-    public String get泌乳61-150天舍(){
-        return this.泌乳61-150天舍;
-    }
-
-    public void set泌乳61-150天舍(String 泌乳61-150天舍){
-        this.泌乳61-150天舍 = 泌乳61-150天舍;
-    }
     public Integer getFlagcolumn(){
         return this.flagcolumn;
     }

src/main/java/com/izouma/awesomeadmin/web/TableNiuseRongliangController.java

@@ -132,10 +132,10 @@ public class TableNiuseRongliangController {
         String sheetName = "Table_牛只_牛舍信息";
         String titleName = "牛舍容量定额配置数据表";
         String fileName = "牛舍容量定额配置表";
-        int columnNumber = 22;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "ID" ,   "牛舍编号" ,   "牧场编号" ,   "牛舍名称" ,   "牛舍类别" ,   "实际存放牛只分类" ,   "管理员" ,   "建筑面积" ,   "设计容量" ,   "颈枷数" ,   "制度要求使用数_颈枷" ,   "卧床数" ,   "制度要求使用数_卧床" ,   "核定容量" ,   "综合核定的合理承载数" ,   "是否青年围产舍" ,   "泌乳31-60天舍" ,   "泌乳61-150天舍" ,   "FlagColumn" ,   "备注" ,   "修改人" ,   "修改时间"  };
-        String[][] dataList = new String[tableNiuseRongliangs.size()][22];
+        int columnNumber = 20;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "ID" ,   "牛舍编号" ,   "牧场编号" ,   "牛舍名称" ,   "牛舍类别" ,   "实际存放牛只分类" ,   "管理员" ,   "建筑面积" ,   "设计容量" ,   "颈枷数" ,   "制度要求使用数_颈枷" ,   "卧床数" ,   "制度要求使用数_卧床" ,   "核定容量" ,   "综合核定的合理承载数" ,   "是否青年围产舍" ,   "FlagColumn" ,   "备注" ,   "修改人" ,   "修改时间"  };
+        String[][] dataList = new String[tableNiuseRongliangs.size()][20];
 
         for (int i = 0; i < tableNiuseRongliangs.size(); i++) {
 
@@ -155,12 +155,10 @@ public class TableNiuseRongliangController {
                         dataList[i][13] = String.valueOf(tableNiuseRongliangs.get(i).get核定容量());
                         dataList[i][14] = String.valueOf(tableNiuseRongliangs.get(i).get综合核定的合理承载数());
                         dataList[i][15] = String.valueOf(tableNiuseRongliangs.get(i).get是否青年围产舍());
-                        dataList[i][16] = String.valueOf(tableNiuseRongliangs.get(i).get泌乳31-60天舍());
-                        dataList[i][17] = String.valueOf(tableNiuseRongliangs.get(i).get泌乳61-150天舍());
-                        dataList[i][18] = String.valueOf(tableNiuseRongliangs.get(i).getFlagcolumn());
-                        dataList[i][19] = String.valueOf(tableNiuseRongliangs.get(i).get备注());
-                        dataList[i][20] = String.valueOf(tableNiuseRongliangs.get(i).get修改人());
-                        dataList[i][21] = String.valueOf(tableNiuseRongliangs.get(i).get修改时间());
+                        dataList[i][16] = String.valueOf(tableNiuseRongliangs.get(i).getFlagcolumn());
+                        dataList[i][17] = String.valueOf(tableNiuseRongliangs.get(i).get备注());
+                        dataList[i][18] = String.valueOf(tableNiuseRongliangs.get(i).get修改人());
+                        dataList[i][19] = String.valueOf(tableNiuseRongliangs.get(i).get修改时间());
                     }
 
 

src/main/vue/src/pages/TableNiuseRongliang.vue

@@ -58,12 +58,6 @@
             </el-form-item>
                                                                                                                                                                                                                                                                                                                                                                                                                                                     <el-form-item prop="是否青年围产舍" label="是否青年围产舍">
                 <el-input v-model="formData.是否青年围产舍" :disabled="'是否青年围产舍'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                    <el-form-item prop="泌乳31-60天舍" label="泌乳31-60天舍">
-                <el-input v-model="formData.泌乳31-60天舍" :disabled="'泌乳31-60天舍'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                    <el-form-item prop="泌乳61-150天舍" label="泌乳61-150天舍">
-                <el-input v-model="formData.泌乳61-150天舍" :disabled="'泌乳61-150天舍'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                                                                                                                                                                                     <el-form-item prop="flagcolumn" label="FlagColumn">
                 <el-input v-model="formData.flagcolumn" :disabled="'flagcolumn'==subColumn"></el-input>
@@ -108,7 +102,7 @@ export default {
             }).then(res => {
                 if (res.success) {
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
                 this.formData = res.data;
 
                 if (this.$route.query.column) {
@@ -139,16 +133,16 @@ export default {
                     }
                 }
                 });
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    },
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    },
     data() {
         return {
             saving: false,
             formData: {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    },
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            },
         rules: {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            },
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    },
                                                                                                                                         牛舍类别Options:[],
-                                                                                                                                                                                                                                                                                                                                                                                                subColumn: '',
+                                                                                                                                                                                                                                                                                                                                                        subColumn: '',
                 subValue: '',
     }
     },
@@ -169,7 +163,7 @@ methods: {
         var data = JSON.parse(JSON.stringify(this.formData));
 
         var logicalData = {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                    }
+                                                                                                                                                                                                                                                                                                                                                                                                                            }
 
         if (JSON.stringify(logicalData) == '{}') {
             this.submit();
@@ -209,7 +203,7 @@ methods: {
     submit() {
         var data = JSON.parse(JSON.stringify(this.formData));
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                        
     this.$http.post({
         url: this.formData.id ? '/tableNiuseRongliang/update' : '/tableNiuseRongliang/save',
         data: data

src/main/vue/src/pages/TableNiuseRongliangs.vue

@@ -156,20 +156,6 @@
                                 min-width="100">
                         </el-table-column>
                                                                 
-                                            <el-table-column
-                                v-if="isColumnShow('泌乳31-60天舍')"
-                                prop="泌乳31-60天舍"
-                                label="泌乳31-60天舍"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('泌乳61-150天舍')"
-                                prop="泌乳61-150天舍"
-                                label="泌乳61-150天舍"
-                                min-width="100">
-                        </el-table-column>
-                                                                
                                             <el-table-column
                                 v-if="isColumnShow('flagcolumn')"
                                 prop="flagcolumn"
@@ -418,16 +404,6 @@
                                 label: '是否青年围产舍',
                                 value: '是否青年围产舍',
                                 show: true
-                            },
-                                                                                                {
-                                label: '泌乳31-60天舍',
-                                value: '泌乳31-60天舍',
-                                show: true
-                            },
-                                                                                                {
-                                label: '泌乳61-150天舍',
-                                value: '泌乳61-150天舍',
-                                show: true
                             },
                                                                                                 {
                                 label: 'FlagColumn',
@@ -520,14 +496,6 @@
                                                                                                 {
                                 label: '是否青年围产舍',
                                 value: '是否青年围产舍'
-                            },
-                                                                                                {
-                                label: '泌乳31-60天舍',
-                                value: '泌乳31-60天舍'
-                            },
-                                                                                                {
-                                label: '泌乳61-150天舍',
-                                value: '泌乳61-150天舍'
                             },
                                                                                                 {
                                 label: 'FlagColumn',

src/main/webapp/WEB-INF/html/admin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.8202c32b2d3b5e968a6baf131a90329a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.5fd80085a27914af2d9a.js></script><script type=text/javascript src=/static/js/vendor.976c0ffa3464c7b2676f.js></script><script type=text/javascript src=/static/js/admin.5c8bc32da8aaf640a1db.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.8202c32b2d3b5e968a6baf131a90329a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.84bb8356101ecdd32697.js></script><script type=text/javascript src=/static/js/vendor.976c0ffa3464c7b2676f.js></script><script type=text/javascript src=/static/js/admin.49651bec9af635eede4d.js></script></body></html>