Bladeren bron

禅道bug修改

yangjunfeng 5 jaren geleden
bovenliggende
commit
f6266454e1

+ 75 - 66
CallCenterWeb.UI/src/views/afterSaleManagement/afterSaleListCustodian/index.vue

@@ -67,6 +67,7 @@
67 67
             v-if="aftersales(scope.row.F_CheckStateKG)"
68 68
             type="text"
69 69
             @click="btn_review(scope.row.F_Id)"
70
+            :disabled="isDisable"
70 71
           >售后审核</el-button>
71 72
         </template>
72 73
       </el-table-column>
@@ -83,94 +84,98 @@
83 84
 </template>
84 85
 
85 86
 <script>
86
-import { getDictionaryValueList } from '@/api/commonAPI'
87
+import { getDictionaryValueList } from "@/api/commonAPI";
87 88
 import { getAfterSaleListCustodian } from "@/api/afterSaleManagement/afterSaleList";
88 89
 import { pickerOptions, formatterContent } from "@/utils";
89 90
 import Pagination from "@/components/Pagination"; // 对el-pagination 二次封装
90
-import detail from "@/views/orderManagement/orderList/detail"
91
-import review from "./review"
91
+import detail from "@/views/orderManagement/orderList/detail";
92
+import review from "./review";
92 93
 
93 94
 export default {
94 95
   name: "ConsolidateOrderList",
95 96
   components: {
96
-    Pagination
97
+    Pagination,
97 98
   },
98 99
   filters: {
99
-    judgmentStateName (status) {
100
+    judgmentStateName(status) {
100 101
       const statusMap = {
101
-        '1': '调换货',
102
-        '2': '退货',
103
-        '3': '部门退货',
104
-        '4': '对发货',
105
-        '5': '补发货',
106
-        '6': '补差额',
107
-      }
108
-      return statusMap[status]
102
+        1: "调换货",
103
+        2: "退货",
104
+        3: "部门退货",
105
+        4: "对发货",
106
+        5: "补发货",
107
+        6: "补差额",
108
+      };
109
+      return statusMap[status];
109 110
     },
110
-    judgmentAfterSaleCheckState (status) {
111
+    judgmentAfterSaleCheckState(status) {
111 112
       const statusMap = {
112
-        '0': '保存',
113
-        '1': '审核通过',
114
-        '2': '审核未通过',
115
-      }
116
-      return statusMap[status]
113
+        0: "保存",
114
+        1: "审核通过",
115
+        2: "审核未通过",
116
+      };
117
+      return statusMap[status];
117 118
     },
118
-    judgmentCustodianStateName (status) {
119
+    judgmentCustodianStateName(status) {
119 120
       const statusMap = {
120
-        '0': '未审核',
121
-        '1': '收到货',
122
-        '2': '货物不符',
123
-        '3': '未收到货',
124
-      }
125
-      return statusMap[status]
121
+        0: "未审核",
122
+        1: "收到货",
123
+        2: "货物不符",
124
+        3: "未收到货",
125
+      };
126
+      return statusMap[status];
126 127
     },
127 128
   },
128
-  data () {
129
+  data() {
129 130
     return {
131
+      isDisable: false, //防止多次点击
130 132
       loading: false,
131 133
       searchData: {
132
-        checkState: '', //售后审核状态
133
-        type: '', //售后类型
134
+        checkState: "", //售后审核状态
135
+        type: "", //售后类型
134 136
       },
135
-      checkState: '',
137
+      checkState: "",
136 138
       pickerOptions, // 日期数据
137 139
       pageParams: {
138 140
         pageindex: 1, // 当前第几页
139 141
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
140
-        total: 0 // 总共多少数据
142
+        total: 0, // 总共多少数据
141 143
       },
142 144
       dataLists: [], // 列表数据
143 145
       multipleSelection: [], // 选中的数据
144 146
       selectedId: [], // 选中的数据的id
145 147
     };
146 148
   },
147
-  created () {
148
-    this.getList()
149
-    document.onkeyup = e => {
149
+  created() {
150
+    this.getList();
151
+    document.onkeyup = (e) => {
150 152
       if (e.keyCode === 13) {
151 153
         this.getList();
152 154
       }
153 155
     };
154 156
   },
155 157
   methods: {
156
-    getList () {
158
+    getList() {
157 159
       this.loading = true;
158
-      return new Promise(resolve => {
159
-        if (this.searchData.checkState == null || this.searchData.checkState == '') {
160
-          this.checkState = '-2'
160
+      return new Promise((resolve) => {
161
+        if (
162
+          this.searchData.checkState == null ||
163
+          this.searchData.checkState == ""
164
+        ) {
165
+          this.checkState = "-2";
161 166
         } else {
162
-          this.checkState = this.searchData.checkState
167
+          this.checkState = this.searchData.checkState;
163 168
         }
164 169
         const params = {
165 170
           F_CheckStateKG: this.checkState, //售后审核状态
166 171
           F_Type: this.searchData.type, //售后类型
167 172
           F_State: -2, //订单状态
168
-          F_Id: '',
173
+          F_Id: "",
169 174
           pageindex: this.pageParams.pageindex, // int 第几页
170 175
           pagesize: this.pageParams.pagesize, // int 每页几条信息
171
-          F_PayState: '-2',
176
+          F_PayState: "-2",
172 177
         };
173
-        getAfterSaleListCustodian(params).then(response => {
178
+        getAfterSaleListCustodian(params).then((response) => {
174 179
           this.loading = false;
175 180
           if (response.state.toLowerCase() === "success") {
176 181
             this.pageParams.total = response.data.Totals;
@@ -181,50 +186,54 @@ export default {
181 186
       });
182 187
     },
183 188
     //售后审核
184
-    btn_review (rowid) {
185
-      this.$layer.iframe({
186
-        content: {
187
-          content: review, // 传递的组件对象
188
-          parent: this, // 当前的vue对象
189
-          data: { rowid: rowid } // props
190
-        },
191
-        area: ["20%", "30%"],
192
-        title: "售后审核"
193
-      });
189
+    btn_review(rowid) {
190
+      this.isDisable = true;
191
+      setTimeout(() => {
192
+        this.$layer.iframe({
193
+          content: {
194
+            content: review, // 传递的组件对象
195
+            parent: this, // 当前的vue对象
196
+            data: { rowid: rowid }, // props
197
+          },
198
+          area: ["20%", "30%"],
199
+          title: "售后审核",
200
+        });
201
+        this.isDisable = false;
202
+      }, 1500);
194 203
     },
195
-    btn_search () {
204
+    btn_search() {
196 205
       this.pageParams.pageindex = 1;
197 206
       this.getList();
198 207
     },
199
-    hadndleOrderCode (ordercode) {
208
+    hadndleOrderCode(ordercode) {
200 209
       this.$layer.iframe({
201 210
         content: {
202 211
           content: detail, // 传递的组件对象
203 212
           parent: this, // 当前的vue对象
204
-          data: { 'rowid': ordercode }// props
213
+          data: { rowid: ordercode }, // props
205 214
         },
206
-        area: ['80%', '90%'],
207
-        title: '订单详情'
208
-      })
215
+        area: ["80%", "90%"],
216
+        title: "订单详情",
217
+      });
209 218
     },
210 219
     //售后审核设置
211
-    aftersales (state) {
220
+    aftersales(state) {
212 221
       if (state == 0) {
213
-        return true
222
+        return true;
214 223
       } else {
215
-        return false
224
+        return false;
216 225
       }
217 226
     },
218 227
     //选择多个
219
-    handleSelectionChange (val) {
220
-      const ids = []
221
-      this.multipleSelection = val
228
+    handleSelectionChange(val) {
229
+      const ids = [];
230
+      this.multipleSelection = val;
222 231
       for (let i = 0; i < this.multipleSelection.length; i++) {
223
-        ids.push(this.multipleSelection[i].id)
232
+        ids.push(this.multipleSelection[i].id);
224 233
       }
225 234
       this.selectedPhone = ids;
226 235
     },
227
-  }
236
+  },
228 237
 };
229 238
 </script>
230 239
 

+ 1 - 1
CallCenterWeb.UI/src/views/afterSaleManagement/saleOrderList/index.vue

@@ -36,7 +36,7 @@
36 36
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
37 37
     </div>
38 38
     <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick">
39
-      <!-- <el-tab-pane label="全部" name="-2"></el-tab-pane> -->
39
+      <el-tab-pane label="全部" name="-2"></el-tab-pane>
40 40
       <!-- <el-tab-pane label="无效" name="-1"></el-tab-pane> -->
41 41
       <!-- <el-tab-pane label="暂存" name="0"></el-tab-pane>
42 42
       <el-tab-pane label="提交" name="1"></el-tab-pane>

+ 478 - 0
CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerService/detail.vue

@@ -0,0 +1,478 @@
1
+<template>
2
+  <div class="order_detail">
3
+    <el-row :gutter="20">
4
+      <el-col :md="24" class="order_detail_body">
5
+        <el-card shadow="hover">
6
+          <el-col :md="21">
7
+            <h1 class="title"><svg-icon class="title_icon" icon-class="hongqi" />订单编号:{{ orderDetailData.F_Id }}</h1>
8
+            <!-- <p class="title_sub"><span class="green">{{ name }}</span> 	河南足力健老人鞋 {{ createtime }}</p>
9
+            <p class="title_sub">催单次数:<span class="red">10</span>次 | 工单状态: <span class="done">已完成</span></p> -->
10
+          </el-col>
11
+          <el-col :md="24" class="order_detail_content">
12
+            <el-col :md="6" class="order_detail_item">
13
+              客户姓名:{{ orderDetailData.F_Customer }}
14
+            </el-col>
15
+            <el-col :md="6" class="order_detail_item">
16
+              手机号码:{{ orderDetailData.F_CustomerPhone }}
17
+            </el-col>
18
+            <el-col :md="6" class="order_detail_item">
19
+              消息来源:{{ orderDetailData.F_ADFrom }}
20
+            </el-col>
21
+            <el-col :md="6" class="order_detail_item">
22
+              下单日期:{{ orderDetailData.F_AddTime }}
23
+            </el-col>
24
+            <el-col :md="6" class="order_detail_item">
25
+              下单员工:{{ orderDetailData.F_AddUserName }}
26
+            </el-col>
27
+            <el-col :md="6" class="order_detail_item">
28
+              归属员工:{{ orderDetailData.F_BelongName }}
29
+            </el-col>
30
+            <el-col :md="6" class="order_detail_item">
31
+              订单类型:{{ orderDetailData.F_Type }}
32
+            </el-col>
33
+            <el-col :md="6" class="order_detail_item">
34
+              快递公司:{{ orderDetailData.F_Express }}
35
+            </el-col>
36
+            <el-col :md="6" class="order_detail_item">
37
+              地址:{{ orderDetailData.address }}
38
+            </el-col>
39
+            <el-col :md="6" class="order_detail_item">
40
+              出货仓库:{{ orderDetailData.F_Stock }}
41
+            </el-col>
42
+            <el-col :md="6" class="order_detail_item">
43
+              收件人:{{ orderDetailData.F_Addressee }}
44
+            </el-col>
45
+            <el-col :md="6" class="order_detail_item">
46
+              收件人手机号:{{ orderDetailData.F_AddPhone }}
47
+            </el-col>
48
+            <el-col :md="6" class="order_detail_item">
49
+              送货说明:{{ orderDetailData.F_AddDes }}
50
+            </el-col>
51
+            <el-col :md="6" class="order_detail_item">
52
+              邮编:{{ orderDetailData.F_PostalCode }}
53
+            </el-col>
54
+            <el-col :md="6" class="order_detail_item">
55
+              快递:{{ orderDetailData.F_Express }}
56
+            </el-col>
57
+            <el-col :md="6" class="order_detail_item">
58
+              运费:{{ orderDetailData.F_ExpressFee }}
59
+            </el-col>
60
+            <el-col :md="6" class="order_detail_item">
61
+              支付方式:{{ orderDetailData.F_PayType }}
62
+            </el-col>
63
+            <el-col :md="6" class="order_detail_item">
64
+              使用积分:{{ orderDetailData.F_Score }}
65
+            </el-col>
66
+            <el-col :md="6" class="order_detail_item">
67
+              推荐人:{{ orderDetailData.F_RecommendName }}
68
+            </el-col>
69
+            <el-col :md="6" class="order_detail_item">
70
+              归属人:{{ orderDetailData.F_BelongName }}
71
+            </el-col>
72
+            <el-col :md="6" class="order_detail_item">
73
+              实付金额:{{ orderDetailData.F_RealPrice }}
74
+            </el-col>
75
+            <el-col :md="6" class="order_detail_item">
76
+              应付金额:{{ orderDetailData.F_ShouldPrice }}
77
+            </el-col>
78
+            <el-col :md="6" class="order_detail_item">
79
+              备注:{{ orderDetailData.F_Remark }}
80
+            </el-col>
81
+            <el-col :md="24">
82
+              <el-table :data="orderDetailData.OrderDetailList" stripe border style="width: 100%">
83
+                <el-table-column prop="F_ProductName" label="商品名称" align="center"></el-table-column>
84
+                <el-table-column prop="F_Count" label="商品数量" align="center"></el-table-column>
85
+              </el-table>
86
+            </el-col>
87
+            <el-col :md="24" class="order_detail_item">
88
+              用户订单支付审核:
89
+              <div class="order_content" v-html="content"/>
90
+            </el-col>
91
+            <el-col :md="24">
92
+              <el-table :data="orderPaymentReviewList" stripe border style="width: 100%">
93
+                <el-table-column prop="F_PayUser" label="付款人" align="center"></el-table-column>
94
+                <el-table-column prop="F_PayType" label="付款方式" align="center"></el-table-column>
95
+                <el-table-column prop="F_State" label="审核状态" align="center">
96
+                  <template slot-scope="scope">
97
+                    {{ scope.row.F_State | judgmentAuditState }}
98
+                  </template>
99
+                </el-table-column>
100
+                <el-table-column prop="F_PayTime" label="支付时间" align="center"></el-table-column>
101
+                <el-table-column prop="F_Money" label="付款金额" align="center"></el-table-column>
102
+                <el-table-column prop="F_RemarkXS" label="备注" align="center"></el-table-column>
103
+                <!-- <el-table-column label="操作" align="center" class-name="oparate_btn" fixed="right">
104
+                  <template slot-scope="scope">
105
+                    <el-button size="mini" type="text" v-if="authority_audit(scope.row.F_State)" @click="btn_audit(scope.row.F_Id, 1, scope.row.F_OrderId, scope.row.F_Money)">通过</el-button>
106
+                    <el-button size="mini" type="text" v-if="authority_audit(scope.row.F_State)" @click="btn_audit(scope.row.F_Id, 2, scope.row.F_OrderId, scope.row.F_Money)">不通过</el-button>
107
+                  </template>
108
+                </el-table-column> -->
109
+              </el-table>
110
+            </el-col>
111
+            <!-- <el-col :md="24" class="order_detail_item">
112
+              工单内容:
113
+              <div class="order_content" v-html="content"/>
114
+            </el-col> -->
115
+            <!-- <el-col :md="6">
116
+              <i class="el-icon-time"/>
117
+              已持续 <span class="red">20</span> 小时 <span class="red">20</span> 分 <span class="red">20</span> 秒
118
+            </el-col> -->
119
+            <!-- <el-col :md="8" :offset="16"> -->
120
+              <!-- <el-button type="primary" size="mini" plain>申请</el-button> -->
121
+              <!-- <el-button type="primary" size="mini" plain @click="edit()">修改</el-button> -->
122
+              <!-- <el-button type="primary" size="mini" plain>取消</el-button>
123
+              <el-button type="primary" size="mini" plain>售后</el-button>
124
+              <el-button type="primary" size="mini" plain>关联订单</el-button> -->
125
+            <!-- </el-col> -->
126
+          </el-col>
127
+        </el-card>
128
+      </el-col>
129
+
130
+      <!-- <el-col :md="24">
131
+        <el-card shadow="hover">
132
+          <div slot="header" class="clearfix">
133
+            <span>工单动态</span>
134
+          </div>
135
+          <div class="order_steps">
136
+            <el-steps :active="0" :space="100" direction="vertical" process-status="success">
137
+              <el-step title="已完成" description="2018-10-23 10:30:20 这是一段很长很长很长的描述性文字"/>
138
+              <el-step title="已转派" description="2018-10-23 10:30:20 这是一段很长很长很长的描述性文字"/>
139
+              <el-step title="已创建" description="2018-10-23 10:30:20 这是一段很长很长很长的描述性文字"/>
140
+            </el-steps>
141
+          </div>
142
+        </el-card>
143
+      </el-col> -->
144
+      <!-- <el-col :md="12">
145
+        <el-card shadow="hover" class="order_record">
146
+          <el-tabs v-model="activeName" @tab-click="handleClick">
147
+            <el-tab-pane label="催单记录(2)" name="first">
148
+              <div class="tab_body">
149
+                催单记录
150
+              </div>
151
+            </el-tab-pane>
152
+            <el-tab-pane label="录音记录(3)" name="second">
153
+              <div class="tab_body">
154
+                录音记录
155
+              </div>
156
+            </el-tab-pane>
157
+          </el-tabs>
158
+        </el-card>
159
+      </el-col> -->
160
+    </el-row>
161
+  </div>
162
+</template>
163
+
164
+<script>
165
+import { getOrder } from '@/api/orderManagement/orderList'
166
+import { userOrderPaymentReviewList } from '@/api/customerServiceManagement/orderListCustomerService'
167
+import { mapGetters } from 'vuex'
168
+import checkOrderMoney from './checkOrderMoney'
169
+
170
+export default {
171
+  name: 'Detail',
172
+  filters: {
173
+    judgmentAuditState(status) {
174
+      const statusMap = {
175
+        '0': '未审核',
176
+        '1': '审核通过',
177
+        '2': '审核不通过'
178
+      }
179
+      return statusMap[status]
180
+    }
181
+  },
182
+  props: {
183
+    rowid: {
184
+      type: String,
185
+      default: ''
186
+    },
187
+    layerid: {
188
+      type: String,
189
+      default: ''
190
+    }
191
+  },
192
+  data() {
193
+    return {
194
+      activeName: 'first',
195
+      orderDetailData: {
196
+        F_Customer: '', //客户姓名
197
+        F_CustomerPhone: '', //手机号码
198
+        F_ADFrom: '', //消息来源
199
+        F_Type: '', //订单类型
200
+        F_Id: '', //订单号
201
+        OrderDetailList: [], //订单详情list
202
+        UseActList: [], //活动详情list
203
+        F_State: '', //订单状态
204
+        F_TrackingNo: '', //快递单号
205
+        F_Addressee: '', //收件人
206
+        F_AddPhone: '', //收件人手机号
207
+        F_AddDes: '', //送货说明
208
+        F_PostalCode: '', //邮编
209
+        F_Express: '', //选择的快递
210
+        F_ExpressFee: '', //运费
211
+        F_PayType: '', //支付方式
212
+        F_Stock: '', //出货仓库
213
+        F_RealPrice: '', //实收金额
214
+        F_VipId: '', //关联会员id
215
+        F_Score: '', //使用积分
216
+        F_AddTime: '', //添加时间
217
+        F_AddUserName: '', //下单员工
218
+        F_RecommendName: '', //推荐人名称
219
+        F_BelongName: '', //归属员工
220
+        F_Remark: '', //备注
221
+        address: '', //地址
222
+        F_ShouldPrice: '', //应付金额
223
+      },
224
+      ordercode: '', // 工单编号
225
+      name: '', // 姓名
226
+      phone: '', // 电话
227
+      sex: '', // 性别
228
+      address: '', // 地址
229
+      sourcename: '', // 工单来源
230
+      sourcetype: '', // 工单类型
231
+      content: '', // 工单内容
232
+      createtime: '', // 创建时间
233
+      createuser: '', // 创建人
234
+      orderPaymentReviewList: [], //订单支付审核列表
235
+    }
236
+  },
237
+  computed: {
238
+    ...mapGetters([
239
+      'avatar'
240
+    ])
241
+  },
242
+  created() {
243
+    if (this.rowid) {
244
+      this.getDetail(this.rowid)
245
+      this.getOrderPaymentReviewList(this.rowid)
246
+    }
247
+  },
248
+  methods: {
249
+    handleClick(tab, event) {
250
+      console.log(tab, event)
251
+    },
252
+    // 详情
253
+    getDetail(rid) {
254
+      getOrder(rid).then(response => {
255
+        if (response.state.toLowerCase() === 'success') {
256
+          const res = response.data
257
+          this.orderDetailData.F_Customer = res.F_Customer //客户姓名
258
+          this.orderDetailData.F_CustomerPhone = res.F_CustomerPhone //手机号码
259
+          this.orderDetailData.F_ADFrom = res.F_ADFrom //消息来源
260
+          this.orderDetailData.F_Id = res.F_Id //订单号
261
+          this.orderDetailData.OrderDetailList = res.OrderDetailList //订单详情list
262
+          this.commodityTableData = res.OrderDetailList
263
+          this.orderDetailData.UseActList = res.UseActList //活动详情list
264
+          this.activityAccountData = res.UseActList
265
+          this.orderDetailData.F_State = res.F_State + ''//订单状态
266
+          this.orderDetailData.F_TrackingNo = res.F_TrackingNo //快递单号
267
+          this.orderDetailData.F_Addressee = res.F_Addressee //收件人
268
+          this.orderDetailData.F_AddPhone = res.F_AddPhone //收件人手机号
269
+          this.orderDetailData.F_AddDes = res.F_AddDes //送货说明
270
+          res.F_AddProvince = res.F_AddProvince === null ? '' : res.F_AddProvince //省
271
+          res.F_AddCity = res.F_AddCity === null ? '' : res.F_AddCity //市
272
+          res.F_AddArea = res.F_AddArea === null ? '' : res.F_AddArea //县/区
273
+          res.F_AddTown = res.F_AddTown === null ? '' : res.F_AddTown //乡/镇
274
+          res.F_Address = res.F_Address === null ? '' : res.F_Address //详细地址
275
+          this.orderDetailData.address = res.F_AddProvince + res.F_AddCity + res.F_AddArea + res.F_AddTown + res.F_Address // 地址
276
+          this.orderDetailData.F_PostalCode = res.F_PostalCode //邮编
277
+          this.orderDetailData.F_Express = res.F_Express + '' //选择的快递
278
+          this.orderDetailData.F_ExpressFee = res.F_ExpressFee //运费
279
+          this.orderDetailData.F_PayType = res.F_PayType //支付方式
280
+          this.orderDetailData.F_Stock = res.F_Stock //出货仓库
281
+          this.orderDetailData.F_RealPrice = res.F_RealPrice //实收金额
282
+          this.orderDetailData.F_VipId = res.F_VipId //关联会员id
283
+          this.orderDetailData.F_Score = res.F_UseScore //使用积分
284
+          this.orderDetailData.F_AddTime = res.F_AddTime //添加时间
285
+          this.orderDetailData.F_RecommendName = res.F_RecommendName//推荐人名称
286
+          this.orderDetailData.F_AddUserName = res.F_AddUserName //下单员工
287
+          this.orderDetailData.F_BelongName = res.F_BelongName //归属员工
288
+          this.orderDetailData.F_Type = res.F_Type //订单类型
289
+          this.orderDetailData.F_Remark = res.F_Remark //备注
290
+          this.orderDetailData.F_ShouldPrice = res.F_ShouldPrice //应付金额
291
+          if (res.F_Type === '1') {
292
+            this.orderDetailData.F_Type = '保存' //订单类型
293
+          } else if(res.F_Type === '2') {
294
+            this.orderDetailData.F_Type = '销售审核提交' //订单类型
295
+          }
296
+        }
297
+      })
298
+    },
299
+    edit(){
300
+      debugger
301
+      this.$router.push({path:'/edit',query:{id:this.ordercode}})
302
+    },
303
+    getOrderPaymentReviewList(rid) {
304
+      const params= {
305
+        F_OrderId: rid
306
+      }
307
+      userOrderPaymentReviewList(params).then(response => {
308
+        if (response.state.toLowerCase() === 'success') {
309
+          this.orderPaymentReviewList = response.data
310
+        }
311
+      })
312
+    },
313
+    // btn_audit(id, state, orderId, money) {
314
+    //   this.$layer.iframe({
315
+    //     content: {
316
+    //       content: checkOrderMoney, // 传递的组件对象
317
+    //       parent: this, // 当前的vue对象
318
+    //       data: { 'rowid': id, 'state': state, 'orderId': orderId, 'money': money }// props
319
+    //     },
320
+    //     area: ['50%', '50%'],
321
+    //     title: '订单支付审核'
322
+    //   })
323
+    // },
324
+    authority_audit(state) {
325
+      if ( state == 0 ) {
326
+        return true
327
+      } else if ( state == 1 || state ==2 ) {
328
+        return false
329
+      }
330
+    },
331
+  }
332
+}
333
+</script>
334
+
335
+<style rel="stylesheet/scss" lang="scss">
336
+	.order_detail{
337
+		.el-col{
338
+			margin-bottom: 20px;
339
+		}
340
+		.el-icon-time{
341
+			color: #d81e06;
342
+		}
343
+		.el-card__header{
344
+			padding-top: 14px;
345
+			padding-bottom: 14px;
346
+			background-color: #F5F5F6;
347
+		}
348
+		.order_file{
349
+			.el-card__body{
350
+				padding: 22px 0 0 0;
351
+				text-align: center;
352
+			}
353
+		}
354
+		.order_steps{
355
+			.el-step__icon-inner{
356
+				display: none;
357
+			}
358
+		}
359
+		.order_record {
360
+			.el-card__body{
361
+				padding: 0;
362
+			}
363
+			.el-tabs__header{
364
+				padding: 0px 20px;
365
+				background-color: #F5F5F6;
366
+					.el-tabs__item{
367
+						font-size: 16px;
368
+						height: 47px;
369
+						line-height: 47px;
370
+					}
371
+			}
372
+		}
373
+	}
374
+</style>
375
+
376
+<style rel="stylesheet/scss" lang="scss" scoped>
377
+	.order_detail{
378
+		.order_detail_body{
379
+			margin-bottom: 20px;
380
+			.round_img{
381
+				width: 90px;
382
+				height: 90px;
383
+				border-radius: 50%;
384
+				overflow: hidden;
385
+				margin: 14px;
386
+				img{
387
+					width: 100%;
388
+					height: 100%;
389
+				}
390
+			}
391
+			.title{
392
+				font-size: 20px;
393
+				.title_icon{
394
+					color: #d81e06;
395
+					font-size: 16px;
396
+					margin-right: 20px;
397
+				}
398
+			}
399
+			.title_sub{
400
+				font-size: 14px;
401
+				color: #666666;
402
+			}
403
+			.order_detail_content{
404
+				background-color: #F5F5F6;
405
+				padding-top: 20px;
406
+				color: #4c4c4c;
407
+				font-size: 14px;
408
+				.order_detail_item{
409
+					margin-bottom: 10px;
410
+					.order_content{
411
+						margin-top: 10px;
412
+					}
413
+					.order_file {
414
+						position: relative;
415
+						cursor: pointer;
416
+						.img_mask {
417
+							display: none;
418
+							position: absolute;
419
+							left: 0px;
420
+							top: 0px;
421
+							background-color: rgba(0, 0, 0, 0.3);
422
+							width: 100%;
423
+							height: 22px;
424
+							text-align: right;
425
+							z-index: 1;
426
+							i {
427
+								font-size: 20px;
428
+								line-height: 22px;
429
+								display: inline-block;
430
+								margin-right: 15px;
431
+								color: #fff;
432
+							}
433
+						}
434
+						p {
435
+							margin-top: 5px;
436
+							padding-left: 14px;
437
+							padding-right: 14px;
438
+							white-space: nowrap;
439
+							overflow: hidden;
440
+							text-overflow: ellipsis;
441
+						}
442
+						.file_icon{
443
+							height: 68px;
444
+							line-height: 68px;
445
+							font-size: 68px;
446
+							color: #409EFF;
447
+						}
448
+					}
449
+					.order_file:hover .img_mask {
450
+						display: block;
451
+					}
452
+				}
453
+			}
454
+		}
455
+		.green {
456
+			color: #00c1de;
457
+		}
458
+		.done {
459
+			color: #198120;
460
+		}
461
+		.red {
462
+			color: #d81e06;
463
+		}
464
+		.yellow{
465
+			color: #e6a23c;
466
+		}
467
+		.order_steps{
468
+			// height: 240px;
469
+			.el-step__icon-inner{
470
+				display: none;
471
+			}
472
+		}
473
+
474
+		.tab_body{
475
+			padding: 0 20px 20px 20px;
476
+		}
477
+	}
478
+</style>

+ 25 - 3
CallCenterWeb.UI/src/views/customerServiceManagement/orderTransactionList/index.vue

@@ -81,13 +81,19 @@
81 81
             v-if="authority_refund_entry(scope.row.F_PayState)"
82 82
             type="text"
83 83
             @click="btn_refund_entry(scope.row.F_Id)"
84
-          >录入</el-button>
84
+          >退款</el-button>
85 85
           <el-button
86 86
             v-permission="'HY_audit'"
87 87
             v-if="isexamine(scope.row.F_PayState)"
88 88
             type="text"
89 89
             @click="btn_audit(scope.row.F_Id)"
90 90
           >审核</el-button>
91
+          <el-button
92
+            v-permission="'HY_audit'"
93
+            v-if="isShow"
94
+            type="text"
95
+            @click="btn_detail(scope.row.F_Id)"
96
+          >详情</el-button>
91 97
         </template>
92 98
       </el-table-column>
93 99
     </el-table>
@@ -108,7 +114,7 @@ import { getOrderListCustomerService } from "@/api/customerServiceManagement/ord
108 114
 import { pickerOptions, formatterContent } from "@/utils";
109 115
 import refundEntry from '../orderListCustomerService/refundEntry';
110 116
 import audit from '../orderListCustomerService/audit';
111
-import detail from "@/views/orderManagement/orderList/detail"
117
+import detail from "../orderListCustomerService/detail"
112 118
 import Pagination from "@/components/Pagination"; // 对el-pagination 二次封装
113 119
 
114 120
 export default {
@@ -141,6 +147,7 @@ export default {
141 147
   },
142 148
   data () {
143 149
     return {
150
+      isShow:false, //详情显隐
144 151
       loading: false,
145 152
       searchData: {
146 153
         adFrom: '', //消息/广告媒体来源
@@ -224,11 +231,15 @@ export default {
224 231
     },
225 232
     // tab切换
226 233
     handleTabClick (tab, event) {
234
+      this.isShow=false
235
+      if(tab.name==3){
236
+        this.isShow=true
237
+      }
227 238
         this.getList()
228 239
     },
229 240
     //设置审核权限
230 241
     isexamine (state) {
231
-      if (state == 1) {
242
+      if (state == 1 || state == 2 ||state ==3) {
232 243
         return false
233 244
       } else {
234 245
         return true
@@ -245,6 +256,17 @@ export default {
245 256
         title: '订单审核'
246 257
       })
247 258
     },
259
+     btn_detail (ordercode) {
260
+      this.$layer.iframe({
261
+        content: {
262
+          content: detail, // 传递的组件对象
263
+          parent: this, // 当前的vue对象
264
+          data: { 'rowid': ordercode }// props
265
+        },
266
+        area: ['80%', '90%'],
267
+        title: '订单详情'
268
+      })
269
+    },
248 270
     btn_search () {
249 271
       this.pageParams.pageindex = 1;
250 272
       this.getList();