liuyifan vor 5 Jahren
Ursprung
Commit
f06295e6d6

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

@@ -94,7 +94,9 @@ export default {
94 94
         '3': '部分退货',
95 95
         '4': '对发货',
96 96
         '5': '补发货',
97
-        '6': '补差额'
97
+        '6': '补差额',
98
+        '7': '错发',
99
+        '8': '漏发'
98 100
       }
99 101
       return statusMap[status]
100 102
     },

+ 8 - 6
CallCenterWeb.UI/src/views/custodianManagement/afterSaleListCustodian/index.vue

@@ -114,12 +114,14 @@ export default {
114 114
   filters: {
115 115
     judgmentStateName(status) {
116 116
       const statusMap = {
117
-        1: "调换货",
118
-        2: "退货",
119
-        3: "部分退货",
120
-        4: "对发货",
121
-        5: "补发货",
122
-        6: "补差额",
117
+        '1': '调换货',
118
+        '2': '退货',
119
+        '3': '部分退货',
120
+        '4': '对发货',
121
+        '5': '补发货',
122
+        '6': '补差额',
123
+        '7': '错发',
124
+        '8': '漏发'
123 125
       };
124 126
       return statusMap[status];
125 127
     },

+ 2 - 0
CallCenterWeb.UI/src/views/customerServiceManagement/afterSaleRefundList/index.vue

@@ -86,6 +86,8 @@ export default {
86 86
         '4': '对发货',
87 87
         '5': '补发货',
88 88
         '6': '补差额',
89
+        '7': '错发',
90
+        '8': '漏发'
89 91
       }
90 92
       return statusMap[status]
91 93
     },

+ 3 - 1
CallCenterWeb.UI/src/views/customerServiceManagement/customerServiceChangeCollection/index.vue

@@ -104,7 +104,9 @@ export default {
104 104
         '3': '部分退货',
105 105
         '4': '对发货',
106 106
         '5': '补发货',
107
-        '6': '补差额'
107
+        '6': '补差额',
108
+        '7': '错发',
109
+        '8': '漏发'
108 110
       }
109 111
       return statusMap[status]
110 112
     },

+ 1 - 1
CallCenterWeb.UI/src/views/customerServiceManagement/orderListLogisticsTracking/index.vue

@@ -163,7 +163,7 @@
163 163
       <el-table-column prop="F_AddUserName" label="下单员工" align="center" />
164 164
       <el-table-column prop="F_BelongName" label="归属员工" align="center" />
165 165
       <el-table-column prop="F_Type" label="订单类型" align="center" />
166
-      <el-table-column prop="F_NewTrackingNo" label="运单号" align="center" />
166
+      <el-table-column prop="F_TrackingNo" label="运单号" align="center" />
167 167
       <el-table-column prop="F_Waybill" label="物流操作时间" align="center" />
168 168
       <el-table-column label="物流状态" align="center" >
169 169
         <template slot-scope="scope">

+ 2 - 1
CallCenterWeb.UI/src/views/memberManagement/memberList/components/addOrEdit.vue

@@ -179,7 +179,8 @@ export default {
179 179
         disabledDate(time) {
180 180
           // 如果没有后面的-8.64e7就是不可以选择今天的
181 181
           return time.getTime() > Date.now() - 8.64e7
182
-        } },
182
+        }
183
+      },
183 184
       aa: '',
184 185
       sourceOptions: [], // 工单来源下拉数据
185 186
       memberType: [], // 会员类型下拉数据

+ 16 - 0
CallCenterWeb.UI/src/views/memberManagement/memberList/components/addOrder.vue

@@ -100,6 +100,7 @@
100 100
                   v-model="commoditySearchData.num"
101 101
                   :min="1"
102 102
                   label="描述文字"
103
+                  @change="commodityNumChange"
103 104
                 />
104 105
               </el-form-item>
105 106
             </el-col>
@@ -131,6 +132,7 @@
131 132
               <el-button
132 133
                 type="primary"
133 134
                 @click="addCommodity"
135
+                :disabled="isAddCommodity"
134 136
               >添加商品</el-button
135 137
               >
136 138
               <el-button
@@ -634,6 +636,7 @@ export default {
634 636
       stockList: [], // 出库货仓下拉数据
635 637
       ADFromList: [], // 消息来源list
636 638
       customerPhoneList: [], // 电话号码
639
+      isAddCommodity: true,
637 640
       addDesList: [], // 送货说明
638 641
       expressList: [], // 快递
639 642
       payTypeList: [], // 支付方式
@@ -1127,12 +1130,14 @@ export default {
1127 1130
               response.data.Rows[0].F_Match
1128 1131
             this.stockQuantity.configurationQuantityTwo =
1129 1132
               response.data.Rows[0].F_Match1
1133
+            this.isAddCommodity = false
1130 1134
           }
1131 1135
         })
1132 1136
         resolve()
1133 1137
       })
1134 1138
     },
1135 1139
     commodityListChange(item) {
1140
+      this.isAddCommodity = true
1136 1141
       this.commoditySearchData.productId = item.F_ProductId
1137 1142
       this.commoditySearchData.productName = item.F_ProductName
1138 1143
       this.commoditySearchData.specifications = item.F_Specifications
@@ -1147,6 +1152,14 @@ export default {
1147 1152
         })
1148 1153
         return
1149 1154
       }
1155
+      if (this.stockQuantity.stockOne === '' || this.stockQuantity.stockTwo === '') {
1156
+        this.$message({
1157
+          message: '商品没有库存!',
1158
+          type: 'warning'
1159
+        })
1160
+        return
1161
+      }
1162
+      this.isAddCommodity = true
1150 1163
       if (this.commodityTableData.length > 0) {
1151 1164
         for (let i = 0; i < this.commodityTableData.length; i++) {
1152 1165
           if (
@@ -1170,6 +1183,9 @@ export default {
1170 1183
       this.commodityTableData.push(data)
1171 1184
       this.getTotalAmountFun()
1172 1185
     },
1186
+    commodityNumChange() {
1187
+      this.isAddCommodity = false
1188
+    },
1173 1189
     // 获取活动核算
1174 1190
     getActivityAccountList() {
1175 1191
       return new Promise((resolve) => {

+ 4 - 4
CallCenterWeb.UI/src/views/memberManagement/memberList/components/afterSale.vue

@@ -6,14 +6,14 @@
6 6
       </el-form-item>
7 7
       <el-form-item label="售后类型" prop="F_Type" >
8 8
         <el-select v-model="ruleForm.F_Type" class="form_select" filterable clearable placeholder="请选择售后类型" @change="changeType">
9
-          <el-option label="调换货" value="1"></el-option>
9
+          <!-- <el-option label="调换货" value="1"></el-option>
10 10
           <el-option label="退货" value="2"></el-option>
11
-          <el-option label="部分退货" value="3"></el-option>
11
+          <el-option label="部分退货" value="3"></el-option> -->
12 12
           <el-option label="对发货" value="4"></el-option>
13 13
           <el-option label="补发货" value="5"></el-option>
14 14
           <el-option label="补差额" value="6"></el-option>
15
-          <el-option label="错发" value="7"></el-option>
16
-          <el-option label="漏发" value="8"></el-option>
15
+          <!-- <el-option label="错发" value="7"></el-option>
16
+          <el-option label="漏发" value="8"></el-option> -->
17 17
         </el-select>
18 18
       </el-form-item>
19 19
       <el-form-item label="变动金额" prop="F_Money">

+ 5 - 5
CallCenterWeb.UI/src/views/orderManagement/orderList/afterSale.vue

@@ -9,9 +9,9 @@
9 9
           <!-- <el-option label="调换货" value="1"></el-option>
10 10
           <el-option label="退货" value="2"></el-option> -->
11 11
           <el-option label="部分退货" value="3"></el-option>
12
-          <el-option label="对发货" value="4"></el-option>
12
+          <!-- <el-option label="对发货" value="4"></el-option>
13 13
           <el-option label="补发货" value="5"></el-option>
14
-          <el-option label="补差额" value="6"></el-option>
14
+          <el-option label="补差额" value="6"></el-option> -->
15 15
         </el-select>
16 16
       </el-form-item>
17 17
       <el-form-item label="变动金额" prop="F_Money">
@@ -20,9 +20,9 @@
20 20
       </el-form-item>
21 21
       <el-form-item label="售后原因" prop="F_ReturnType" >
22 22
         <el-select v-model="ruleForm.F_ReturnType" class="form_select" filterable placeholder="请选择售后原因">
23
-          <!-- <el-option label="改代收" value="改代收">
24
-          </el-option> -->
25
-          <el-option v-for="item in afterSaleReasonsList" :key="item.F_ValueId" :label="item.F_Value" :value="item.F_Value"></el-option>
23
+          <el-option label="改代收" value="改代收">
24
+          </el-option>
25
+          <!-- <el-option v-for="item in afterSaleReasonsList" :key="item.F_ValueId" :label="item.F_Value" :value="item.F_Value"></el-option> -->
26 26
         </el-select>
27 27
       </el-form-item>
28 28
       <!-- <el-form-item label="售后原因" prop="F_ReturnDes" >

+ 3 - 1
CallCenterWeb.UI/src/views/orderManagement/orderList/edit.vue

@@ -426,6 +426,7 @@ export default {
426 426
       returnOrderDetailList: [], //返回商品列表
427 427
       activityAccountData: [], //活动核算数据
428 428
       orderType: [],//订单类型
429
+      returnExpressFee: '', //返回运费
429 430
       pickerOptions, // 日期数据
430 431
       stockQuantity: { //库存数量
431 432
         stockOne: '',
@@ -579,7 +580,7 @@ export default {
579 580
           }
580 581
           this.loading = true;
581 582
           this.ruleForm.F_State = state
582
-          this.ruleForm.F_ExpressFee = this.ruleForm.F_ExpressFee == '' ? 0 : this.ruleForm.F_ExpressFee
583
+          this.ruleForm.F_ExpressFee = this.ruleForm.F_ExpressFee == this.returnExpressFee ? 0 : this.ruleForm.F_ExpressFee
583 584
           this.ruleForm.F_UseScore = this.ruleForm.F_UseScore == '' ? 0 : this.ruleForm.F_UseScore
584 585
           this.ruleForm.OrderMoney.F_PayTime = this.ruleForm.OrderMoney.F_PayTime == '' ? '1970-01-01 00:00:00' : this.ruleForm.OrderMoney.F_PayTime
585 586
           this.ruleForm.OrderMoney.F_Money = this.ruleForm.OrderMoney.F_Money == '' ? 0 : this.ruleForm.OrderMoney.F_Money
@@ -1060,6 +1061,7 @@ export default {
1060 1061
         this.ruleForm.F_Address = res.F_Address //详细地址
1061 1062
         this.ruleForm.F_PostalCode = res.F_PostalCode //邮编
1062 1063
         this.ruleForm.F_Express = res.F_Express + '' //选择的快递
1064
+        this.ruleForm.returnExpressFee = res.F_ExpressFee //运费
1063 1065
         this.ruleForm.F_ExpressFee = res.F_ExpressFee //运费
1064 1066
         this.ruleForm.F_PayType = res.F_PayType //支付方式
1065 1067
         this.ruleForm.F_Stock = res.F_Stock //出货仓库

+ 12 - 1
CallCenterWeb.UI/src/views/orderManagement/salesAfterSaleList/index.vue

@@ -47,6 +47,7 @@
47 47
         </template>
48 48
       </el-table-column>
49 49
       <el-table-column prop="F_Money" label="变动金额" align="center" />
50
+      <el-table-column prop="F_ReturnType" label="售后原因" align="center" />
50 51
       <el-table-column prop="F_TrackingNo" label="运单号" align="center" />
51 52
       <el-table-column prop="F_Remark" label="备注" align="center" />
52 53
       <el-table-column prop="F_AddTime" label="下单日期" align="center" />
@@ -56,6 +57,7 @@
56 57
           <el-button
57 58
             v-permission="'HY_waybill_number'"
58 59
             type="text"
60
+            v-if="authority_waybill_number(scope.row.F_ReturnType)"
59 61
             @click="btn_waybill_number(scope.row.F_OrderId)"
60 62
           >运单号</el-button>
61 63
         </template>
@@ -95,7 +97,9 @@ export default {
95 97
         '3': '部分退货',
96 98
         '4': '对发货',
97 99
         '5': '补发货',
98
-        '6': '补差额'
100
+        '6': '补差额',
101
+        '7': '错发',
102
+        '8': '漏发'
99 103
       }
100 104
       return statusMap[status]
101 105
     },
@@ -283,6 +287,13 @@ export default {
283 287
       } else {
284 288
         return false
285 289
       }
290
+    },
291
+    authority_waybill_number(returnType) {
292
+      if (returnType == "改代收") {
293
+        return true
294
+      } else {
295
+        return false
296
+      }
286 297
     }
287 298
   }
288 299
 }