Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-web

src/views/item/detail.vue

@@ -57,8 +57,8 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                        <el-input v-model="postForm.oaNo" class="filter-item" :placeholder="tip" :disabled="oaNoDisable" :readonly="oaNoReadonly">
-                          <template slot="prepend">{{postForm.belongTo}}</template>
+                        <el-input :value="postForm.oaNo" class="filter-item" placeholder="系统自动生成" :disabled="true" readonly="true">
+                          
                         </el-input>
                       </el-form-item>
                     </el-col>

src/views/personal/facePrice.vue

@@ -191,9 +191,14 @@
                 border-right: 1px solid #ebeced;
                 color: #333333; 
                 ">
+                     <el-table-column label="数据源" align="center" prop="dataResource">
+                        <template slot-scope="{row}">
+                            <span style="color: red;">{{ row.dataResource }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="小区名称" align="center" prop="communityName">
                         <template slot-scope="{row}">
-                            <span>{{ row.communityName }}</span>
+                            <span style="color: red;">{{ row.communityName }}</span>
                         </template>
                     </el-table-column>
                     <el-table-column label="成交单价(元)" align="center" prop="price">
@@ -209,16 +214,26 @@
 
                     <el-table-column label="成交总价(万)" align="center" prop="amount">
                         <template slot-scope="{row}">
-                            <span style="color: red;">{{ row.amount ? (row.amount / 10000).toFixed(2) + '万' : '-'
+                            <span style="color: red;">{{ row.amount ? (row.amount ) + '万' : '-'
                                 }}</span>
                         </template>
                     </el-table-column>
+                    <el-table-column label="挂牌价" align="center" prop="structure">
+                        <template slot-scope="{row}">
+                            <span style="color: red;">{{ row.upPrice?(row.upPrice+'万'):'-' }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="成交日期" align="center" prop="dealDate">
+                        <template slot-scope="{row}">
+                            <span style="color: red;">{{ row.dealDate }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="区域" align="center" prop="areaName">
                         <template slot-scope="{row}">
                             <span>{{ row.areaName }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="板块" align="center" prop="businessName">
+                    <!-- <el-table-column label="板块" align="center" prop="businessName">
                         <template slot-scope="{row}">
                             <span>{{ row.businessName }}</span>
                         </template>
@@ -232,7 +247,7 @@
                         <template slot-scope="{row}">
                             <span>{{ row.buildingType }}</span>
                         </template>
-                    </el-table-column>
+                    </el-table-column> -->
                     <el-table-column label="装修" align="center" prop="decoration">
                         <template slot-scope="{row}">
                             <span>{{ row.decoration }}</span>
@@ -253,21 +268,14 @@
                             <span>{{ row.orientation }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="结构" align="center" prop="structure">
-                        <template slot-scope="{row}">
-                            <span>{{ row.structure }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="成交日期" align="center" prop="dealDate">
-                        <template slot-scope="{row}">
-                            <span>{{ row.dealDate }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="数据源" align="center" prop="dataResource">
+                  
+                  
+                    <el-table-column label="链家数据网址" align="center" prop="structure" show-overflow-tooltip> 
                         <template slot-scope="{row}">
-                            <span>{{ row.dataResource }}</span>
+                            <a :href="row.url" target="_blank">{{ row.url }}</a>
                         </template>
                     </el-table-column>
+                   
                 </el-table>
             </div>
             <div v-if="enternalData.ups.length > 0" style="width: 100%; overflow: auto;" v-show="activateTable == 'up'">
@@ -277,9 +285,14 @@
                     border-right: 1px solid #ebeced;
                     color: #333333; 
                     ">
+                     <el-table-column label="数据源" align="center" prop="dataResource">
+                        <template slot-scope="{row}">
+                            <span style="color: red;">{{ row.dataResource }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="小区名称" align="center" prop="communityName">
                         <template slot-scope="{row}">
-                            <span>{{ row.communityName }}</span>
+                            <span style="color: red;">{{ row.communityName }}</span>
                         </template>
                     </el-table-column>
                     <el-table-column label="挂牌单价(元)" align="center" prop="price">
@@ -349,11 +362,7 @@
                             <span>{{ row.upDate }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="数据源" align="center" prop="dataResource">
-                        <template slot-scope="{row}">
-                            <span>{{ row.dataResource }}</span>
-                        </template>
-                    </el-table-column>
+                   
                 </el-table>
             </div>
             <div v-else style="height: 200px; width: 100%;">