Browse Source

AUTO_COMMITED_BY_SERVER

xinmu_server 7 years ago
parent
commit
78941fa88b

File diff suppressed because it is too large
+ 4 - 2
src/main/java/com/izouma/awesomeadmin/dao/TableNiuseRongliangMapper.xml


+ 95 - 29
src/main/vue/src/pages/TableNiuseRongliang.vue

@@ -2,16 +2,22 @@
     <div>
         <el-form :model="formData" :rules="rules" ref="form" label-width="120px" label-position="right" size="small"
                  style="max-width: 500px;">
-                                                            <el-form-item prop="id" label="ID">
-                <el-input v-model="formData.id" :disabled="'id'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                    <el-form-item prop="牛舍编号" label="牛舍编号">
+                                                                                        <el-form-item prop="牛舍编号" label="牛舍编号">
                 <el-input v-model="formData.牛舍编号" :disabled="'牛舍编号'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                    <el-form-item prop="牧场编号" label="牧场编号">
-                <el-input v-model="formData.牧场编号" :disabled="'牧场编号'==subColumn"></el-input>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <el-form-item prop="牧场编号" label="牧场编号">
+                <template>
+                    <el-select v-model="formData.牧场编号" clearable  placeholder="请选择" :disabled="'牧场编号'==subColumn">
+                        <el-option
+                                v-for="item in 牧场编号Options"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                    <el-form-item prop="牛舍名称" label="牛舍名称">
+                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="牛舍名称" label="牛舍名称">
                 <el-input v-model="formData.牛舍名称" :disabled="'牛舍名称'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         <el-form-item prop="牛舍类别" label="牛舍类别">
@@ -26,10 +32,19 @@
                     </el-select>
                 </template>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="实际存放牛只分类" label="实际存放牛只分类">
-                <el-input v-model="formData.实际存放牛只分类" :disabled="'实际存放牛只分类'==subColumn"></el-input>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <el-form-item prop="实际存放牛只分类" label="实际存放牛只分类">
+                <template>
+                    <el-select v-model="formData.实际存放牛只分类" multiple clearable placeholder="请选择" :disabled="'实际存放牛只分类'==subColumn">
+                        <el-option
+                                v-for="item in 实际存放牛只分类Options"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                    <el-form-item prop="管理员" label="管理员">
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="管理员" label="管理员">
                 <el-input v-model="formData.管理员" :disabled="'管理员'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                                                                                                                                                                                     <el-form-item prop="建筑面积" label="建筑面积">
@@ -59,19 +74,16 @@
                                                                                                                                                                                                                                                                                                                                                                                                                                                     <el-form-item prop="是否青年围产舍" label="是否青年围产舍">
                 <el-input v-model="formData.是否青年围产舍" :disabled="'是否青年围产舍'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                    <el-form-item prop="flagcolumn" label="FlagColumn">
-                <el-input v-model="formData.flagcolumn" :disabled="'flagcolumn'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                    <el-form-item prop="备注" label="备注">
-                <el-input v-model="formData.备注" :disabled="'备注'==subColumn"></el-input>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="备注" label="备注">
+                <multi-upload v-model="formData.备注" :disabled="'备注'==subColumn"></multi-upload>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                    <el-form-item prop="修改人" label="修改人">
-                <el-input v-model="formData.修改人" :disabled="'修改人'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                    <el-form-item prop="修改时间" label="修改时间">
-                <el-input v-model="formData.修改时间" :disabled="'修改时间'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                <el-form-item>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    <el-form-item prop="修改人" label="修改人">
+                            <el-input v-model="formData.修改人" disabled></el-input>
+                        </el-form-item>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            <el-form-item prop="修改时间" label="修改时间">
+                            <el-input v-model="formData.修改时间" disabled></el-input>
+                        </el-form-item>
+                                                                                <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
                 <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
                 <el-button @click="$router.go(-1)">取消</el-button>
@@ -102,7 +114,18 @@ export default {
             }).then(res => {
                 if (res.success) {
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                                
+                        if(res.data.实际存放牛只分类){
+                            res.data.实际存放牛只分类 = res.data.实际存放牛只分类.split(',');
+                        }else{
+                            res.data.实际存放牛只分类 = [];
+                        }
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        if(res.data.修改时间){
+                            res.data.修改时间 = format(new Date(res.data.修改时间), 'YYYY/MM/DD HH:mm', { locale: zh });
+                        }
+
+                                                        
                 this.formData = res.data;
 
                 if (this.$route.query.column) {
@@ -116,7 +139,24 @@ export default {
             }
         }
 
-                                                                                                                                                                                                                                                                                        this.$http.get({
+                                                                                                                                                                        this.$http.get({
+                        url:'/commonQuery/all',
+                        data: {
+                            tableName: 'Table_牛只_牧场信息',
+                            databasetype: 'SqlServer',
+                            dataSourceCode: 'dataSourceSqlserver',
+                        }
+                    }).then(res => {
+                        if (res.success) {
+
+                    if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                            this.牧场编号Options.push({label: item.牧场名称, value:item.牧场编号});
+                    })
+                    }
+                }
+                });
+                                                                                                                                                                                this.$http.get({
                         url:'/commonQuery/all',
                         data: {
                             tableName: 'Table_牛只_参数_牛舍类型',
@@ -133,16 +173,38 @@ export default {
                     }
                 }
                 });
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    },
+                                                                                                                        this.$http.get({
+                        url:'/commonQuery/all',
+                        data: {
+                            tableName: 'Table_牛只_参数_牛只类型',
+                            databasetype: 'SqlServer',
+                            dataSourceCode: 'dataSourceSqlserver',
+                        }
+                    }).then(res => {
+                        if (res.success) {
+
+                    if (res.data.length > 0) {
+                        res.data.forEach(item => {
+                            this.实际存放牛只分类Options.push({label: item.牛只类型, value:item.牛只类型});
+                    })
+                    }
+                }
+                });
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                this.formData.修改人 = this.userInfo.username;
+                                                                                                        },
     data() {
         return {
             saving: false,
             formData: {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            },
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            修改人:'',
+                                                                                                                                    修改时间:format(new Date(), 'YYYY/MM/DD HH:mm', { locale: zh }),
+                                    },
         rules: {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     },
-                                                                                                                                        牛舍类别Options:[],
-                                                                                                                                                                                                                                                                                                                                                        subColumn: '',
+                                                                                                牧场编号Options:[],
+                                                                                                        牛舍类别Options:[],
+                                                                                    实际存放牛只分类Options:[],
+                                                                                                                                                                                                                                                                                                                                    subColumn: '',
                 subValue: '',
     }
     },
@@ -203,7 +265,11 @@ methods: {
     submit() {
         var data = JSON.parse(JSON.stringify(this.formData));
 
-                                                                                                                                                                                                                                                                                                                                                                                                                        
+                                                                                                                                                                                                                                                                                                                                                                                                                                if(data.修改时间){
+                    data.修改时间 = Date.parse(new Date(data.修改时间));
+                }
+
+                    
     this.$http.post({
         url: this.formData.id ? '/tableNiuseRongliang/update' : '/tableNiuseRongliang/save',
         data: data

+ 4 - 19
src/main/vue/src/pages/TableNiuseRongliangs.vue

@@ -43,14 +43,7 @@
                     min-width="50"
                     align="center">
             </el-table-column>
-                            
-                                            <el-table-column
-                                v-if="isColumnShow('id')"
-                                prop="id"
-                                label="ID"
-                                min-width="100">
-                        </el-table-column>
-                                                                
+                                                        
                                             <el-table-column
                                 v-if="isColumnShow('牛舍编号')"
                                 prop="牛舍编号"
@@ -181,6 +174,7 @@
                                 v-if="isColumnShow('修改时间')"
                                 prop="修改时间"
                                 label="修改时间"
+                                :formatter="DateTimeFormatter"
                                 min-width="100">
                         </el-table-column>
                                                             <el-table-column
@@ -325,12 +319,7 @@
                 filter1: '',
                 filter2: '',
                 tableColumns: [
-                                                                        {
-                                label: 'ID',
-                                value: 'id',
-                                show: true
-                            },
-                                                                                                {
+                                                                                                                    {
                                 label: '牛舍编号',
                                 value: '牛舍编号',
                                 show: true
@@ -433,11 +422,7 @@
                 tableSortFields: [],
                 searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
                 advancedQueryColumns: [
-                                                                        {
-                                label: 'ID',
-                                value: 'ID'
-                            },
-                                                                                                {
+                                                                                                                    {
                                 label: '牛舍编号',
                                 value: '牛舍编号'
                             },

Some files were not shown because too many files changed in this diff