adf

.env.development

@@ -5,6 +5,6 @@ NODE_ENV = 'production'
 
 # base api
 # 玫苑
-#VUE_APP_BASE_API = 'http://101.201.121.115:8092'
+VUE_APP_BASE_API = 'http://101.201.121.115:8092'
 # 和瑞 
-VUE_APP_BASE_API = 'http://101.201.121.115:8094'
+# VUE_APP_BASE_API = 'http://101.201.121.115:8094'

.env.production

@@ -5,6 +5,6 @@ NODE_ENV = 'production'
 
 # base api
 # 玫苑
-# VUE_APP_BASE_API = 'http://101.201.121.115:8092'
+VUE_APP_BASE_API = 'http://101.201.121.115:8092'
 # 和瑞 
-VUE_APP_BASE_API = 'http://101.201.121.115:8094'
+# VUE_APP_BASE_API = 'http://101.201.121.115:8094'

.env.staging

@@ -5,7 +5,7 @@ NODE_ENV = 'production'
 
 # base api
 # 玫苑
-# VUE_APP_BASE_API = 'http://101.201.121.115:8092'
+VUE_APP_BASE_API = 'http://101.201.121.115:8092'
 # 和瑞 
-VUE_APP_BASE_API = 'http://101.201.121.115:8094'
+# VUE_APP_BASE_API = 'http://101.201.121.115:8094'
 

src/api/system/sysuser.js

@@ -9,6 +9,13 @@ export function listUser(query) {
   })
 }
 
+
+export function getAllUsers() {
+  return request({
+    url: '/admin/users/alluser',
+    method: 'get'
+  })
+}
 // 查询用户详细
 export function getUser(userId) {
   return request({

src/views/commonPhoneManagement/index.vue

@@ -75,6 +75,11 @@
               placeholder="请选择"
               format="HH:mm"
               value-format="HH:mm"
+              :picker-options="{
+                start: '00:00',
+                step: '00:01',
+                end: '23:59'
+              }"
             >
             </el-time-select>
           </el-form-item>
@@ -86,6 +91,11 @@
               placeholder="请选择"
               format="HH:mm"
               value-format="HH:mm"
+              :picker-options="{
+                start: '00:00',
+                step: '00:01',
+                end: '23:59'
+              }"
             >
             </el-time-select>
           </el-form-item>

src/views/property/building.vue

@@ -21,6 +21,7 @@
       <el-table-column :label="getColumnName('address')" prop="address" width="140" :show-overflow-tooltip="true" />
       <el-table-column :label="getColumnName('constructionarea')" prop="constructionarea" width="135" :show-overflow-tooltip="true" />
       <el-table-column :label="getColumnName('totalhouseholds')" prop="totalhouseholds" width="130" :show-overflow-tooltip="true" />
+      <el-table-column :label="getColumnName('custodian')" prop="custodian" width="130" :show-overflow-tooltip="true" />
       <el-table-column :label="getColumnName('lastmodifytime')" align="center" width="154">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row['lastmodifytime']) }}</span>
@@ -61,36 +62,48 @@
     <!-- 添加或修改配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px">
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
-        <el-col :span="12">
+        <el-col :span="24">
           <el-form-item :label="getColumnName('buildingid')" prop="buildingid">
             <el-input v-model="form['buildingid']" :disabled="!isAdd" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="24">
           <el-form-item :label="getColumnName('propertytypeid')">
             <el-input v-model="form['propertytypeid']" placeholder="请输入" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="24">
           <el-form-item :label="getColumnName('descr')">
             <el-input v-model="form['descr']" placeholder="请输入" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="24">
           <el-form-item :label="getColumnName('address')">
             <el-input v-model="form['address']" placeholder="请输入" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="24">
           <el-form-item :label="getColumnName('constructionarea')">
             <el-input v-model="form['constructionarea']" placeholder="请输入" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="24">
           <el-form-item :label="getColumnName('totalhouseholds')">
             <el-input v-model.number="form['totalhouseholds']" placeholder="请输入" />
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <el-form-item :label="getColumnName('custodian')">
+            <el-select v-model="form['custodian']" placeholder="请选择">
+              <el-option
+                v-for="item in userList"
+                :key="item.userid"
+                :label="item.userid"
+                :value="item.userid">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -103,6 +116,7 @@
 <script>
 import { getWorkshopList } from '@/common/workshop'
 import { getBuildingList, getBuilding, delBuilding, addBuilding, updateBuilding } from '@/api/property/building'
+import { getAllUsers } from '@/api/system/sysuser'
 export default {
   name: 'Building',
   data() {
@@ -137,14 +151,21 @@ export default {
         'buildingid': [
           { required: true, message: '此项不能为空', trigger: 'blur' }
         ]
-      }
+      },
+      userList:[]
     }
   },
   created() {
     this.options = getWorkshopList()
-    this.getList()
+    this.getList();
+    this.getAllUsers();
   },
   methods: {
+    getAllUsers(){
+      getAllUsers().then(({data})=>{
+        this.userList = data || [];
+      })
+    },
     /** 查询数据列表 */
     getList() {
       this.loading = true