2023-3-20

src/HDrpManagement/orderManage/modules/edit.vue

@@ -168,12 +168,13 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <div class="container" style="text-align:right">
+              <div class="container" v-if="addresstotal" style="text-align:right">
                 <el-pagination
                   background
                   small
                   :current-page="addressparam.content.pageNumber"
                   @current-change="addresPageChange"
+                  :page-size="addressparam.content.pageSize"
                   layout="total,prev, pager, next"
                   :total="addresstotal">
                 </el-pagination>
@@ -409,6 +410,7 @@ export default {
       this.addressparam.content.sys_enterpriseid = this.data.sys_enterpriseid
       const res = await this.$api.requested(this.addressparam)
       this.addresstotal = res.total
+      console.log(this.addresstotal);
       this.receiveAddresslist = res.data
     },
 

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -173,6 +173,7 @@
                   background
                   small
                   :current-page="addressparam.content.pageNumber"
+                  :page-size="addressparam.content.pageSize"
                   @current-change="addresPageChange"
                   layout="total,prev, pager, next"
                   :total="addresstotal">

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -164,7 +164,8 @@
                   small
                   :current-page="addressparam.content.pageNumber"
                   @current-change="addresPageChange"
-                  layout="total,prev, pager, next"
+                  :page-size="addressparam.content.pageSize"
+                  layout="total,prev,pager, next"
                   :total="addresstotal">
                 </el-pagination>
               </div>

src/components/normal-basic-layout/details/modules/group/group.vue

@@ -42,7 +42,7 @@
       </el-popover>
     </div>
     <div style="padding:10px">
-      <div class="flex-align-center" style="margin-bottom:16px" v-show="men.isleader === 0" v-for="men in item.team" :key="men.index">
+      <div class="flex-align-center" style="margin-bottom:16px" v-show="men.isleader === 1" v-for="men in item.team" :key="men.index">
         <div class="avatar inline-16"  :class="men.isleader === 1?'leader':''" >
           <img class="avatar__image" v-if="men.headpic" :src="men.headpic" alt="">
           <p v-else>{{men.name.substr(0, 1)}}</p>

src/views/message/components/list.vue

@@ -111,7 +111,9 @@ export default {
   color: #999999;
 }
 .list .item-box .item .right {
-  
+  position: absolute;
+  right: 0;
+  top: 20px;
 }
 .list .item-box .item .right .read {
   background: #FFEBEA;

vue.config.js

@@ -15,8 +15,8 @@ module.exports = {
       proxy: {
         '/apis': {
           // target: 'http://61.164.207.46:8000',  // target host*/
-          /*target: 'http://192.168.3.9:8080',  // target host*!/*/
-          target: 'https://oms.idcgroup.com.cn:8079/',  // target host
+          target: 'http://192.168.3.9:8080',  // target host*!
+          // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites