.

src/main/jmrh/src/mixins/pageableTable.js

@@ -111,9 +111,15 @@ export default {
             this.$http
                 .get(this.url, data)
                 .then(res => {
-                    this.tableData = res.content;
-                    this.totalPages = res.totalPages;
-                    this.totalElements = res.totalElements;
+                    if (this.url == '/conversation/all') {
+                        this.tableData = res.data.content;
+                        this.totalPages = res.data.totalPages;
+                        this.totalElements = res.data.totalElements;
+                    } else {
+                        this.tableData = res.content;
+                        this.totalPages = res.totalPages;
+                        this.totalElements = res.totalElements;
+                    }
                     if (this.afterGetData) {
                         this.afterGetData(res);
                     }

src/main/jmrh/src/views/mine/docking.vue

@@ -30,10 +30,10 @@
                         <span class="fail" v-if="item.status === 'DEFEAT'">对接失败</span>
                     </li>
                     <li class="con">
-                        <!-- <img :src="item.resourceSupplyDemand.images[0]" /> -->
-                        <span>{{ item.contact.description }}</span>
+                        <img :src="item.resourceImag" />
+                        <span>{{ item.resourceName }}</span>
                     </li>
-                    <li class="company">{{ item.contact.orgName }}</li>
+                    <li class="company">{{ item.orgName }}</li>
                     <li class="mes">
                         <!-- <p>
                             {{ item.description }}
@@ -125,10 +125,12 @@
                         <span class="fail" v-if="item.status === 'DEFEAT'">对接失败</span>
                     </li>
                     <li class="con">
-                        <!-- <img :src="item.resourceSupplyDemand.images[0]" /> -->
-                        <span>{{ item.contact.description }}</span>
+                        <img :src="item.resourceImag" />
+                        <span>{{ item.resourceName }}</span>
+                    </li>
+                    <li class="company">
+                        {{ item.orgName }}
                     </li>
-                    <li class="company">{{ item.contact.orgName }}</li>
                     <li class="mes">
                         <!-- <p>
                             {{ item.description }}
@@ -238,6 +240,9 @@ export default {
     computed: {
         userInfo() {
             return this.$store.state.userInfo;
+        },
+        tableDataList() {
+            return this.tableData.data.content;
         }
     },
     methods: {
@@ -290,6 +295,10 @@ export default {
                 });
         },
         save() {
+            if (this.model.content == null || this.model.content == '') {
+                this.$message('回复不能为空！');
+                return;
+            }
             this.$http
                 .post('/communicationRecord/save', this.model, { body: 'json' })
                 .then(res => {
@@ -458,7 +467,7 @@ export default {
         width: 90px;
         font-size: 12px;
         color: #c8c9cc;
-        text-align: right;
+        // text-align: right;
     }
     .detail_item {
         margin-top: 12px;
@@ -469,7 +478,7 @@ export default {
             font-size: 12px;
             color: #ad6363;
             line-height: 22px;
-            text-align: right;
+            // text-align: right;
             white-space: nowrap;
             overflow: hidden;
             text-overflow: ellipsis;