Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/order/addAssociatedOrder.vue

@@ -5,7 +5,7 @@
     <el-form inline label-width="85px" label-position="left">
       <el-form-item label="订单号">
         <div class="content">
-          <el-input v-model="relateOrderId"></el-input>
+            <el-input v-model.trim="params.relateOrderNo"></el-input>
         </div>
       </el-form-item>
       <el-form-item>
@@ -49,6 +49,8 @@
         </template>
       </el-table-column>
     </el-table>
+    <pagination v-show="total > 0" :total="total" :page.sync="params.page" :limit.sync="params.rows"
+                @pagination="getUnassociatedOrder" />
     <el-row style="margin-top: 40px">
       <el-col>
         <el-button type="primary" @click="batchJoin(multipleSelection.map(e => e.orderId))"
@@ -78,9 +80,13 @@ export default {
   data() {
     return {
       orderDetails: {},
-      relateOrderId: '',
       list: [],
       multipleSelection: [],
+      params:{
+        page:1,
+        rows:10
+      },
+      total:0
     }
   },
   created() {
@@ -96,11 +102,12 @@ export default {
   methods: {
     getUnassociatedOrder() {
       getUnGuanlianOrderByOrderId({
-        orderId: this.orderId,
-        relateOrderId: this.relateOrderId ? this.relateOrderId : 0
+          orderId: this.orderId,
+         ...this.params
       }).then(r => {
         if (r.code === 0) {
-          this.list = r.data
+          this.list = r.data.list;
+          this.total = r.data.total;
         }
       })
     },

src/views/ecw/order/associatedOrder.vue

@@ -8,7 +8,7 @@
   <el-divider></el-divider>
   <el-form inline label-width="100px">
     <el-form-item label="订单号"><div class="content">
-      <el-input v-model="params.relateOrderId"></el-input>
+      <el-input v-model.trim="params.relateOrderNo"></el-input>
     </div></el-form-item>
     <el-form-item><div class="content">
       <el-button @click="getList">查询</el-button>
@@ -59,7 +59,7 @@
      </el-table-column>
      <el-table-column label="操作人" prop="creator">
        <template v-slot="{row}">
-         {{userList.find( i => row.creator == i.id).nickname}}
+         {{(userList.find( i => row.creator == i.id) || {}).nickname}}
        </template>
      </el-table-column>
      <el-table-column label="操作时间">
@@ -75,6 +75,8 @@
        </template>
      </el-table-column>
    </el-table>
+  <pagination v-show="total > 0" :total="total" :page.sync="params.page" :limit.sync="params.rows"
+              @pagination="getList" />
 </div>
 </template>
 
@@ -114,13 +116,16 @@ export default {
       orderDetails:{},
       params:{
         orderId:undefined,
-        relateOrderId:undefined
+        relateOrderNo:undefined,
+        page:1,
+        rows:10
       },
       list:[],
       DICT_TYPE,
       getDictDatas,
       multipleSelection:[],
-      userList:[]
+      userList:[],
+      total:0,
     }
   },
   created() {
@@ -137,7 +142,8 @@ export default {
     getList(){
       guanlianList(this.params).then(r => {
         if(r.code === 0){
-          this.list = r.data
+          this.list = r.data.list;
+          this.total = r.data.total;
         }
       })
     },

src/views/ecw/order/components/ordeDetailsForm.vue

@@ -17,11 +17,11 @@
       <el-descriptions-item label="目的地">{{details.logisticsInfoDto ? details.logisticsInfoDto.destTitleZh : ''}}</el-descriptions-item>
       <el-descriptions-item  label="发货人姓名">{{details.consignorVO ? details.consignorVO.name : ''}}</el-descriptions-item>
       <el-descriptions-item  label="发货人公司">{{details.consignorVO ? details.consignorVO.company : ''}}</el-descriptions-item>
-      <el-descriptions-item  label="发货人电话">{{details.consignorVO ? details.consignorVO.countryCode : ''}} {{details.consignorVO ? details.consignorVO.phone : ''}}</el-descriptions-item>
+      <el-descriptions-item  label="发货人电话">+{{details.consignorVO ? details.consignorVO.countryCode : ''}} {{details.consignorVO ? details.consignorVO.phone : ''}}</el-descriptions-item>
       <el-descriptions-item></el-descriptions-item>
       <el-descriptions-item  label="收货人姓名">{{details.consigneeVO ? details.consigneeVO.name :''}}</el-descriptions-item>
       <el-descriptions-item  label="收货人公司">{{details.consigneeVO ? details.consigneeVO.company :''}}</el-descriptions-item>
-      <el-descriptions-item  label="收货人电话">{{details.consigneeVO ? details.consigneeVO.countryCode :''}} {{details.consigneeVO ? details.consigneeVO.phone :''}}</el-descriptions-item>
+      <el-descriptions-item  label="收货人电话"> +{{details.consigneeVO ? details.consigneeVO.countryCode :''}} {{details.consigneeVO ? details.consigneeVO.phone :''}}</el-descriptions-item>
       <el-descriptions-item></el-descriptions-item>
     </el-descriptions>
   </div>

src/views/ecw/order/components/warehouseDetails.vue

@@ -59,8 +59,8 @@
         <p>
           {{row.consignorName}}
         </p>
-        <p>
-         {{row.consignorCountryCode}}  {{row.consignorPhone}}
+        <p style="white-space: nowrap">
+         +{{row.consignorCountryCode}}  {{row.consignorPhone}}
         </p>
       </template>
   </el-table-column>
@@ -69,8 +69,8 @@
         <p>
           {{row.consigneeName}}
         </p>
-        <p>
-          {{row.consigneeCountryCode}} {{row.consigneePhone}}
+        <p style="white-space: nowrap">
+          +{{row.consigneeCountryCode}} {{row.consigneePhone}}
         </p>
       </template>
     </el-table-column>

src/views/ecw/order/mutexOrder.vue

@@ -8,7 +8,7 @@
     <el-divider></el-divider>
     <el-form inline label-width="100px">
       <el-form-item label="订单号"><div class="content">
-        <el-input v-model="params.relateOrderId"></el-input>
+        <el-input v-model.trim="params.relateOrderNo"></el-input>
       </div></el-form-item>
       <el-form-item><div class="content">
         <el-button @click="getList">查询</el-button>
@@ -75,6 +75,8 @@
         </template>
       </el-table-column>
     </el-table>
+    <pagination v-show="total > 0" :total="total" :page.sync="params.page" :limit.sync="params.rows"
+                @pagination="getList" />
   </div>
 </template>
 
@@ -104,8 +106,10 @@ export default {
       orderDetails:{},
       params:{
         orderId:undefined,
-        mutualOrderId:undefined
+        page:1,
+        rows:10,
       },
+      total:0,
       list:[],
       DICT_TYPE,
       getDictDatas,
@@ -127,7 +131,8 @@ export default {
     getList(){
       guanlianList(this.params).then(r => {
         if(r.code === 0){
-          this.list = r.data
+          this.list = r.data.list;
+          this.total = r.data.total;
         }
       })
     },

src/views/ecw/order/notMutexOrder.vue

@@ -5,7 +5,7 @@
     <el-form inline label-width="85px" label-position="left">
       <el-form-item label="订单号">
         <div class="content">
-          <el-input v-model="mutualOrderId"></el-input>
+          <el-input v-model.trim="params.relateOrderNo"></el-input>
         </div>
       </el-form-item>
       <el-form-item>
@@ -53,6 +53,8 @@
         </template>
       </el-table-column>
     </el-table>
+    <pagination v-show="total > 0" :total="total" :page.sync="params.page" :limit.sync="params.rows"
+                @pagination="getUnassociatedOrder" />
     <el-row style="margin-top: 40px">
       <el-col>
         <el-button type="primary" @click="batchJoin(multipleSelection.map(e => e.orderId))"
@@ -85,6 +87,11 @@ export default {
       mutualOrderId: '',
       list: [],
       multipleSelection: [],
+      total:0,
+      params:{
+        page:1,
+        rows:10,
+      }
     }
   },
   created() {
@@ -101,11 +108,11 @@ export default {
     getUnassociatedOrder() {
       getUnGuanlianOrderByOrderId({
         orderId: this.orderId,
-        mutualOrderId: this.mutualOrderId ? this.mutualOrderId : 0
+        ...this.params,
       }).then(r => {
         if (r.code === 0) {
-          this.list = r.data
-          console.log(this.list[0])
+          this.list = r.data.list;
+          this.total = r.data.total;
         }
       })
     },

src/views/member/user/index.vue

@@ -38,7 +38,7 @@
       <el-table-column label="真实姓名" align="center" prop="identityName" />
       <el-table-column label="区号">
         <template v-slot:default = 'scope'>
-          {{scope.row.areaCode ? `${scope.row.areaCode}`:''}}
+          +{{scope.row.areaCode ? `${scope.row.areaCode}`:''}}
         </template>
       </el-table-column>
       <el-table-column label="手机号" show-overflow-tooltip align="center" prop="mobile" >

src/views/member/user/underReview.vue

@@ -36,7 +36,7 @@
       <el-table-column label="真实姓名" align="center" prop="identityName" />
       <el-table-column label="区号">
         <template v-slot:default = 'scope'>
-          {{scope.row.areaCode ? `${scope.row.areaCode}`:''}}
+          +{{scope.row.areaCode ? `${scope.row.areaCode}`:''}}
         </template>
       </el-table-column>
       <el-table-column label="手机号" show-overflow-tooltip align="center" prop="mobile" >