Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

ys_vue/src/views/Home.vue

@@ -188,6 +188,14 @@
         margin-right: 10px;
     }
 
+    .itemNew {
+        height: 25px;
+        margin-left: 15px;
+        i {
+            vertical-align: top;
+        }
+    }
+
 	.container {
 		position: absolute;
 		top: 0px;

ys_vue/src/views/base/comp.vue

@@ -19,6 +19,7 @@
 		<el-table :data="list" highlight-current-row :height="tableHeight" v-loading="listLoading" style="width: 100%;">
             <el-table-column type="index" width="60"></el-table-column>
 			<el-table-column prop="companyName" label="公司名称" width="300" sortable></el-table-column>
+            <el-table-column prop="companyType" label="公司类型" width="200" sortable></el-table-column>
             <el-table-column prop="companyAddress" label="公司地址" sortable></el-table-column>
 			<el-table-column label="操作" width="150">
 				<template slot-scope="scope">
@@ -47,6 +48,12 @@
 				<el-form-item label="公司名称" prop="companyName">
 					<el-input v-model="addForm.companyName" autocomplete="off" placeholder="请输入公司地址"></el-input>
 				</el-form-item>
+                <el-form-item label="公司类型" prop="companyType">
+                    <el-select v-model="addForm.companyType" clearable filterable placeholder="请选择公司类型" style="width:532px">
+                        <el-option v-for="item in team" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+				</el-form-item>
                 <el-form-item label="公司地址" prop="companyAddress">
 					<el-input v-model="addForm.companyAddress" autocomplete="off" placeholder="请输入公司地址"></el-input>
 				</el-form-item>
@@ -63,6 +70,12 @@
 				<el-form-item label="公司名称" prop="companyName">
 					<el-input v-model="editForm.companyName" autocomplete="off" placeholder="请输入公司地址"></el-input>
 				</el-form-item>
+                <el-form-item label="公司名称" prop="companyName">
+                    <el-select v-model="editForm.companyName" clearable filterable placeholder="请选择公司类型" style="width:532px">
+                        <el-option v-for="item in team" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+				</el-form-item>
                 <el-form-item label="公司地址" prop="companyAddress">
 					<el-input v-model="editForm.companyAddress" autocomplete="off" placeholder="请输入公司地址"></el-input>
 				</el-form-item>
@@ -100,6 +113,7 @@
                     ]
                 },
 
+                team: [{label:'资产方',value:0},{label:'生产方',value:1}],
                 // 新增界面
 				addFormVisible: false,
 				addLoading: false,