问题修改

CallCenterWeb.UI/src/store/modules/user.js

@@ -14,7 +14,8 @@ const user = {
     extension: '',
     avatar: '',
     seatflag: false,
-    menus: []
+    menus: [],
+    mobile: '',
   },
 
   mutations: {
@@ -47,6 +48,9 @@ const user = {
     },
     SET_MENUS: (state, menus) => {
       state.menus = menus
+    },
+    SET_MOBILE: (state, mobile) => {
+      state.mobile = mobile
     }
   },
 
@@ -81,6 +85,7 @@ const user = {
           commit('SET_EXT', window.localStorage.getItem('ext'))// 分机号
           commit('SET_GROUPID', data.F_SeartGroupID) // 用户的坐席组id
           commit('SET_AVATAR', data.F_HeadImg) // 用户头像
+          commit('SET_MOBILE', data.F_Mobile) // 用户头像
           resolve(response)
         }).catch(error => {
           reject(error)

CallCenterWeb.UI/src/views/afterSaleManagement/afterSaleList/addOrEdit.vue

@@ -334,7 +334,6 @@ export default {
         if (response.state.toLowerCase() === 'success') {
           const res = response.data.Rows[0]
           this.ruleForm.F_OrderId = res.F_OrderId //订单编号
-          this.ruleForm.F_DetailList = res.F_DetailList //补发产品列表
           this.ruleForm.F_OldDetailList = res.F_OldDetailList //退回产品列表
           this.ruleForm.F_Type = res.F_Type + '' //售后类型
           this.ruleForm.F_Money = res.F_Money //变动金额
@@ -343,9 +342,25 @@ export default {
           this.ruleForm.F_ReturnDes = res.F_ReturnDes //售后原因
           this.ruleForm.F_ProductStatus = res.F_ProductStatus //退回商品状态
           this.getAfterSaleOrderCommodity(this.ruleForm.F_OrderId)
+          this.getReissueGoods(res.F_DetailList) //补发商品
         }
       })
     },
+    getReissueGoods(goodsData) {
+      let reissueGoods = goodsData.split('|')
+      let data = {
+        F_ProductId: '',
+        F_ProductName: '',
+        F_Count: '',
+      }
+      for (let i = 0; i < reissueGoods.length; i++) {
+        let reissueGoodsDetail = reissueGoods[i].split(',')
+        data.F_ProductId = reissueGoodsDetail[0]
+        data.F_ProductName = reissueGoodsDetail[1]
+        data.F_Count = reissueGoodsDetail[2]
+        this.commodityTableData.push(data)
+      }
+    },
     // 售后订单商品列表
     getAfterSaleOrderCommodity(rid) {
       const params = {

CallCenterWeb.UI/src/views/afterSaleManagement/orderList/index.vue

@@ -23,8 +23,6 @@
       <el-input v-model="searchData.customerPhone" placeholder="请输入客户手机号" class="filter-item" />
       <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" />
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
-      <el-button v-permission="'HY_merge'" type="primary" class="filter-item" @click="btn_merge">合并</el-button>
-      <el-button v-permission="'HY_split'" type="primary" class="filter-item" @click="btn_split">拆分</el-button>
     </div>
     <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick" >
       <el-tab-pane label="全部" name="-2"></el-tab-pane>
@@ -88,7 +86,7 @@ import detail from "@/views/orderManagement/orderList/detail"
 import Pagination from "@/components/Pagination"; // 对el-pagination 二次封装
 
 export default {
-  name: "orderList",
+  name: "SaleOrderList",
   components: {
     Pagination
   },

CallCenterWeb.UI/src/views/personalInfo/index.vue

@@ -45,13 +45,13 @@
               <label class="item_label">手机号码</label>
             </el-col>
             <el-col :md="21">
-              <span class="item_span">您已绑定了手机 <b>15238368612</b>【您的手机为安全手机，可以找回密码，但不能用于登录】</span>
-              <el-tooltip class="item" effect="dark" content="暂未处理" placement="top-start">
+              <span class="item_span">您已绑定了手机 <b>{{ mobile }}</b>【您的手机为安全手机，但不能用于登录】</span>
+              <!-- <el-tooltip class="item" effect="dark" content="暂未处理" placement="top-start">
                 <el-button type="text" class="btn_tel">修改</el-button>
-              </el-tooltip>
+              </el-tooltip> -->
             </el-col>
           </li>
-          <li class="list_item clearfix">
+          <!-- <li class="list_item clearfix">
             <el-col :md="3">
               <label class="item_label">转接设置</label>
             </el-col>
@@ -61,7 +61,7 @@
                 <el-button type="text" class="btn_trans">修改</el-button>
               </el-tooltip>
             </el-col>
-          </li>
+          </li> -->
         </ul>
       </el-col>
     </el-row>
@@ -100,7 +100,8 @@ export default {
       'usercode',
       'userRole',
       'seatflag',
-      'extension'
+      'extension',
+      'mobile',
     ])
   },
   created() {