问题修改

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

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

CallCenterWeb.UI/src/views/custodianManagement/afterSaleListCustodian/index.vue

@@ -114,12 +114,14 @@ export default {
   filters: {
     judgmentStateName(status) {
       const statusMap = {
-        1: "调换货",
-        2: "退货",
-        3: "部分退货",
-        4: "对发货",
-        5: "补发货",
-        6: "补差额",
+        '1': '调换货',
+        '2': '退货',
+        '3': '部分退货',
+        '4': '对发货',
+        '5': '补发货',
+        '6': '补差额',
+        '7': '错发',
+        '8': '漏发'
       };
       return statusMap[status];
     },

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

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

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

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

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

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

CallCenterWeb.UI/src/views/memberManagement/memberList/components/addOrEdit.vue

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

CallCenterWeb.UI/src/views/memberManagement/memberList/components/addOrder.vue

@@ -100,6 +100,7 @@
                   v-model="commoditySearchData.num"
                   :min="1"
                   label="描述文字"
+                  @change="commodityNumChange"
                 />
               </el-form-item>
             </el-col>
@@ -131,6 +132,7 @@
               <el-button
                 type="primary"
                 @click="addCommodity"
+                :disabled="isAddCommodity"
               >添加商品</el-button
               >
               <el-button
@@ -634,6 +636,7 @@ export default {
       stockList: [], // 出库货仓下拉数据
       ADFromList: [], // 消息来源list
       customerPhoneList: [], // 电话号码
+      isAddCommodity: true,
       addDesList: [], // 送货说明
       expressList: [], // 快递
       payTypeList: [], // 支付方式
@@ -1127,12 +1130,14 @@ export default {
               response.data.Rows[0].F_Match
             this.stockQuantity.configurationQuantityTwo =
               response.data.Rows[0].F_Match1
+            this.isAddCommodity = false
           }
         })
         resolve()
       })
     },
     commodityListChange(item) {
+      this.isAddCommodity = true
       this.commoditySearchData.productId = item.F_ProductId
       this.commoditySearchData.productName = item.F_ProductName
       this.commoditySearchData.specifications = item.F_Specifications
@@ -1147,6 +1152,14 @@ export default {
         })
         return
       }
+      if (this.stockQuantity.stockOne === '' || this.stockQuantity.stockTwo === '') {
+        this.$message({
+          message: '商品没有库存！',
+          type: 'warning'
+        })
+        return
+      }
+      this.isAddCommodity = true
       if (this.commodityTableData.length > 0) {
         for (let i = 0; i < this.commodityTableData.length; i++) {
           if (
@@ -1170,6 +1183,9 @@ export default {
       this.commodityTableData.push(data)
       this.getTotalAmountFun()
     },
+    commodityNumChange() {
+      this.isAddCommodity = false
+    },
     // 获取活动核算
     getActivityAccountList() {
       return new Promise((resolve) => {

CallCenterWeb.UI/src/views/memberManagement/memberList/components/afterSale.vue

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

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

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

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

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

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

@@ -47,6 +47,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="F_Money" label="变动金额" align="center" />
+      <el-table-column prop="F_ReturnType" label="售后原因" align="center" />
       <el-table-column prop="F_TrackingNo" label="运单号" align="center" />
       <el-table-column prop="F_Remark" label="备注" align="center" />
       <el-table-column prop="F_AddTime" label="下单日期" align="center" />
@@ -56,6 +57,7 @@
           <el-button
             v-permission="'HY_waybill_number'"
             type="text"
+            v-if="authority_waybill_number(scope.row.F_ReturnType)"
             @click="btn_waybill_number(scope.row.F_OrderId)"
           >运单号</el-button>
         </template>
@@ -95,7 +97,9 @@ export default {
         '3': '部分退货',
         '4': '对发货',
         '5': '补发货',
-        '6': '补差额'
+        '6': '补差额',
+        '7': '错发',
+        '8': '漏发'
       }
       return statusMap[status]
     },
@@ -283,6 +287,13 @@ export default {
       } else {
         return false
       }
+    },
+    authority_waybill_number(returnType) {
+      if (returnType == "改代收") {
+        return true
+      } else {
+        return false
+      }
     }
   }
 }