Merge pull request '房间定义' (#11) from feature_approval into develop

Reviewed-on: #11
Reviewed-by: Liwei <wei.li@le-it.com.cn>

src/api/property/property.js

@@ -43,3 +43,12 @@ export function delProperty(cid, id) {
     method: 'delete'
   })
 }
+
+// 获取资产类型定义数据
+export function getPropertytypetab (query) {
+	return request({
+		url: '/admin/propertytypetab/selectarr',
+		method: 'get',
+		params: query
+	})
+}

src/views/property/property.vue

@@ -15,6 +15,7 @@
           <span>{{ getValue(scope.row['cid']) }}</span>
         </template>
       </el-table-column>
+			<el-table-column :label="getColumnName('propertytypeid')" prop="propertytypeid" width="100" :show-overflow-tooltip="true" />
       <el-table-column :label="getColumnName('descr')" prop="descr" width="120" :show-overflow-tooltip="true" />
       <el-table-column :label="getColumnName('propertyid')" prop="propertyid" :show-overflow-tooltip="true" width="120" />
       <el-table-column :label="getColumnName('buildingid')" prop="buildingid" :show-overflow-tooltip="true" width="120" />
@@ -78,6 +79,18 @@
           <el-form-item :label="getColumnName('propertyid')" prop="propertyid">
             <el-input v-model="form['propertyid']" :disabled="!isAdd" />
           </el-form-item>
+        </el-col>
+				<el-col :span="12">
+          <el-form-item :label="getColumnName('propertytypeid')" prop="propertytypeid">
+            <el-select v-model="form.propertytypeid" placeholder="请选择">
+              <el-option
+                v-for="item in propertytypeidArray"
+                :key="item.propertytypeid"
+                :label="item.propertytypeid"
+                :value="item.propertytypeid"
+              />
+            </el-select>
+          </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item :label="getColumnName('buildingid')">
@@ -167,7 +180,7 @@
 
 <script>
 import { getWorkshopList } from '@/common/workshop'
-import { getPropertyList, getProperty, delProperty, addProperty, updateProperty } from '@/api/property/property'
+import { getPropertyList, getProperty, delProperty, addProperty, updateProperty, getPropertytypetab } from '@/api/property/property'
 export default {
   name: 'Property',
   data() {
@@ -197,6 +210,7 @@ export default {
         { id: '2', descr: '业主委员会' },
         { id: '3', descr: '空置' }
       ],
+			propertytypeidArray: [],
       // 表单参数
       form: {},
       // 表单校验
@@ -206,13 +220,22 @@ export default {
         ],
         'propertyid': [
           { required: true, message: '此项不能为空', trigger: 'blur' }
-        ]
+        ],
+				'propertytypeid': [
+          { required: true, message: '此项不能为空', trigger: 'blur' }
+        ],
       }
     }
   },
   created() {
     this.options = getWorkshopList()
     this.getList()
+		// 获取资产定义的数据
+		getPropertytypetab({propertytype: 1}).then(
+			res => {
+				this.propertytypeidArray = res.data || []
+			}
+		)
   },
   methods: {
     /** 查询数据列表 */