bug

CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerService/index.vue

@@ -256,7 +256,7 @@ export default {
           F_TrackingNo: this.searchData.trackingNo, //运单号
           SearchStartTime: this.searchData.searchTime[0], //添加开始时间
           SearchEndTime: this.searchData.searchTime[1], //添加结束时间
-          F_PayState: -2, //交易状态
+          F_PayState: 'this.searchData.payState', //交易状态
           F_IsExpress: -2, //-2全部 0客服未分配快递 1已分配
         };
         getOrderListCustomerService(params).then(response => {

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

@@ -83,9 +83,13 @@
       </el-table-column>
       <el-table-column prop="F_Customer" label="客户姓名" align="center" min-width />
       <el-table-column prop="F_CustomerPhone" label="手机号码" align="center" min-width="140">
-        <template slot-scope="scope" >
+        <template slot-scope="scope">
           {{ scope.row.F_CustomerPhone}}
-          <i class="el-icon-phone phoneIcon" v-if="authority_call_out(scope.row.F_Status)" @click="clickCallOut(scope.row.F_CustomerPhone)"></i>
+          <i
+            class="el-icon-phone phoneIcon"
+            v-if="authority_call_out(scope.row.F_Status)"
+            @click="clickCallOut(scope.row.F_CustomerPhone)"
+          ></i>
         </template>
       </el-table-column>
       <el-table-column label="订购商品" align="center" min-width>
@@ -112,7 +116,7 @@
           >支付</el-button>
           <el-button
             v-permission="'HY_edit'"
-            v-if="authority_edit(scope.row.F_State)"
+            v-if="authority_edit(scope.row.F_State,scope.row.F_Type)"
             type="text"
             @click="btn_edit(scope.row.F_Id)"
           >编辑</el-button>
@@ -255,7 +259,7 @@ export default {
           F_TrackingNo: this.searchData.trackingNo, //运单号
           SearchStartTime: this.searchData.searchTime[0], //添加开始时间
           SearchEndTime: this.searchData.searchTime[1], //添加结束时间
-          F_PayState:'-2',
+          F_PayState: -2,
         };
         getOrderLists(params).then(response => {
           this.loading = false;
@@ -411,10 +415,11 @@ export default {
       }
     },
     // 编辑权限
-    authority_edit (state) {
-      if (state == 0 || state == 2) {
+    authority_edit (state, type) {
+      if ((state == 0 || state == 2) && (type != '售后订单')) {
         return true
-      } else {
+      }
+      else {
         return false
       }
     },
@@ -427,7 +432,7 @@ export default {
       }
     },
     // 外呼权限
-    authority_call_out(status) {
+    authority_call_out (status) {
       if (status == 0 || status == 1) {
         return true
       } else {