问题修改

CallCenterWeb.UI/src/styles/index.scss

@@ -138,16 +138,30 @@ a:hover {
 
 //vue-layer
 .vl-notify {
-  left: 55% !important;
+  // left: 55% !important;
+  z-index: 2000 !important;
+  .vlicon-max {
+    display: none;
+  }
+  .vl-notify-content {
+    height: 100% !important;
+    width: 100% !important;
+    padding: 20px !important;
+  }
+  .vl-notify-content > div {
+    width: 100% !important;
+  }
 }
+// .vl-notify-iframe {
+//   margin-left: 90px !important;
+//   margin-top: 26px !important;
+// }
 .vl-notify-mask {
   z-index: 1900;
   background-color: #000 !important;
   opacity: 0.4 !important;
 }
 .vl-notify-content {
-  height: 100% !important;
-  width: 100% !important;
   /*滚动条样式*/
   &::-webkit-scrollbar {
     /*滚动条整体样式*/
@@ -166,9 +180,6 @@ a:hover {
     border-radius: 0;
     background-color: #f5f5f5;
   }
-  .el-row {
-    width: 100%;
-  }
 }
 
 //分页

CallCenterWeb.UI/src/views/CustomerServiceReport/salesDataSheet/index.vue

@@ -1,19 +1,7 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-date-picker
-        v-model="searchDate"
-        :picker-options="pickerOptions"
-        class="filter-item"
-        type="daterange"
-        format="yyyy年MM月dd日"
-        value-format="yyyy-MM-dd"
-        align="left"
-        unlink-panels
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      />
+      <el-date-picker v-model="searchDate" :picker-options="pickerOptions" class="filter-item" type="daterange" format="yyyy年MM月dd日" value-format="yyyy-MM-dd" align="left" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
       <el-button type="primary" @click="btn_search">搜索</el-button>
       <el-button type="primary" @click="btn_export">导出</el-button>
     </div>
@@ -27,14 +15,14 @@
 </template>
 
 <script>
-import { getSalesDataSheet } from '@/api/CustomerServiceReport/CustomerServiceReport'
-import { pickerOptions } from '@/utils'
+import { getSalesDataSheet } from "@/api/CustomerServiceReport/CustomerServiceReport"
+import { pickerOptions } from "@/utils"
 
 export default {
   data() {
     return {
       loading: false,
-      searchDate: '', // 日期
+      searchDate: "", // 日期
       pickerOptions, // 日期数据
       dataLists: [], // 列表数据
     }
@@ -42,9 +30,9 @@ export default {
   watch: {
     searchDate(val) {
       if (val == null) {
-        this.searchDate = ''
+        this.searchDate = ""
       }
-    }
+    },
   },
   created() {
     this.getList()
@@ -64,7 +52,7 @@ export default {
         }
         getSalesDataSheet(params).then((response) => {
           this.loading = false
-          if (response.state.toLowerCase() === 'success') {
+          if (response.state.toLowerCase() === "success") {
             this.dataLists = response.data
           }
         })
@@ -75,10 +63,9 @@ export default {
       this.getList()
     },
     btn_export() {
-      window.location.href =
-        this.$store.getters.serverConfig.BASE_API + 'api/KFReport/efficiency?isdc=1' + '&starttime=' + (this.searchDate && this.searchDate[0]) + '&endtime=' + (this.searchDate && this.searchDate[1])
-    }
-  }
+      window.location.href = this.$store.getters.serverConfig.BASE_API + "api/KFReport/efficiency?isdc=1" + "&starttime=" + (this.searchDate && this.searchDate[0]) + "&endtime=" + (this.searchDate && this.searchDate[1])
+    },
+  },
 }
 </script>
 

CallCenterWeb.UI/src/views/CustomerServiceReport/salesTimeTable/index.vue

@@ -19,7 +19,7 @@
       <el-table-column prop="core" label="中心" align="center" />
       <el-table-column prop="group" label="小组" align="center" min-width />
       <el-table-column prop="Name" label="销售" align="center" />
-      <el-table-column prop="TalkLongTime" label="销售" align="center" />
+      <el-table-column prop="TalkLongTime" label="销售时长" align="center" />
     </el-table>
   </div>
 </template>

CallCenterWeb.UI/src/views/afterSaleManagement/addAfterSale/editCommodityNum.vue

@@ -37,8 +37,12 @@ export default {
   },
   methods: {
     submitForm() {
-      this.$parent.$layer.close(this.layerid)
-      this.$parent.editCommodityNum(this.ruleForm.quantity, this.row)
+      if (Number(this.row.F_Count) >= Number(this.ruleForm.quantity)) {
+        this.$parent.$layer.close(this.layerid)
+        this.$parent.editCommodityNum(this.ruleForm.quantity, this.row)
+      } else {
+        this.$message.error("退回鞋子数量不能大于卖的产品数量！")
+      }
     },
   },
 }

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

@@ -84,8 +84,8 @@
               <el-table-column type="selection" width="55"></el-table-column>
               <el-table-column prop="F_ProductName" label="商品名称" align="center"></el-table-column>
               <el-table-column prop="F_Count" label="商品数量" align="center"></el-table-column>
-              <el-table-column prop="F_DealPrice" label="商品单价" align="center"></el-table-column>
-              <el-table-column prop="F_TotlePrice" label="商品总价" align="center"></el-table-column>
+              <el-table-column prop="F_Price" label="商品单价" align="center"></el-table-column>
+              <el-table-column prop="F_DealPrice" label="商品总价" align="center"></el-table-column>
               <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
                   <el-button type="text" @click="btn_editCommodityNum(scope.row)">修改数量</el-button>
@@ -114,7 +114,7 @@ import { getDictionaryValueList } from "@/api/commonAPI"
 import { getOrder } from "@/api/orderManagement/orderList"
 import { getCommodityType } from "@/api/commodityManagement/commodityType"
 import { getCommodityList } from "@/api/commodityManagement/commodityList"
-import { addAfterSaleList, editAfterSaleList, afterSaleListDetail, getAfterSaleOrderCommodityList } from "@/api/afterSaleManagement/afterSaleList"
+import { addAfterSaleList, editAfterSaleList, afterSaleListDetail, getAfterSaleOrderReturnCommodityList } from "@/api/afterSaleManagement/afterSaleList"
 import { getTotalAmount } from "@/api/orderManagement/orderList"
 import editCommodityNum from "./editCommodityNum"
 
@@ -214,7 +214,6 @@ export default {
     }
   },
   created() {
-    this.getAfterSaleReasons()
     this.getCommodityTypeSelect()
     Promise.all([]).then(() => {
       if (this.rowid) {
@@ -385,7 +384,7 @@ export default {
           this.ruleForm.F_ProductStatus = res.F_ProductStatus //退回商品状态
           this.ruleForm.F_Reason = res.F_Reason //处理原因
           this.ruleForm.F_Aspiration = res.F_Aspiration //客户意愿
-          this.getAfterSaleOrderCommodity(this.ruleForm.F_OrderId)
+          this.getAfterSaleOrderCommodity(rid)
           this.getReissueGoods(res.F_DetailList) //补发商品
           this.getTotalAmountFun()
         }
@@ -408,7 +407,7 @@ export default {
       const params = {
         orderid: rid,
       }
-      getAfterSaleOrderCommodityList(params).then((response) => {
+      getAfterSaleOrderReturnCommodityList(params).then((response) => {
         if (response.state.toLowerCase() === "success") {
           const res = response.data
           this.oldCommodityTableData = res

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

@@ -29,6 +29,8 @@
               <el-table :data="oldCommodityTableData" stripe border style="width: 100%">
                 <el-table-column prop="F_ProductName" label="商品名称" align="center"></el-table-column>
                 <el-table-column prop="F_Count" label="商品数量" align="center"></el-table-column>
+              <el-table-column prop="F_Price" label="商品单价" align="center"></el-table-column>
+              <el-table-column prop="F_DealPrice" label="商品总价" align="center"></el-table-column>
               </el-table>
             </el-col>
           </el-col>

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

@@ -37,8 +37,12 @@ export default {
   },
   methods: {
     submitForm() {
-      this.$parent.$layer.close(this.layerid)
-      this.$parent.editCommodityNum(this.ruleForm.quantity, this.row)
+      if (Number(this.row.F_Count) >= Number(this.ruleForm.quantity)) {
+        this.$parent.$layer.close(this.layerid)
+        this.$parent.editCommodityNum(this.ruleForm.quantity, this.row)
+      } else {
+        this.$message.error("退回鞋子数量不能大于卖的产品数量！")
+      }
     },
   },
 }

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

@@ -64,10 +64,10 @@
       <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
           <el-button v-permission="'HY_after_sale_detail'" type="text" @click="btn_after_sale_detail(scope.row.F_Id)">详情</el-button>
-          <el-button v-permission="'HY_review'" v-if="authority_review(scope.row.F_CheckStateSH)" type="text" @click="btn_review(scope.row.F_Id)">审核</el-button>
-          <el-button v-permission="'HY_remind'" v-if="authority_remind(scope.row.F_CheckStateSH)" type="text" @click="btn_remind(scope.row.F_Id)">提醒</el-button>
-          <el-button v-permission="'HY_edit'" v-if="authority_edit(scope.row.F_CheckStateSH)" type="text" @click="btn_edit(scope.row.F_Id)">编辑</el-button>
-          <el-button v-permission="'HY_delete'" v-if="authority_delete(scope.row.F_CheckStateSH)" type="text" @click="btn_delete(scope.row.F_Id)">删除</el-button>
+          <el-button v-permission="'HY_review'" v-if="authority_review(scope.row.F_CheckStateSH, scope.row.F_Type)" type="text" @click="btn_review(scope.row.F_Id)">审核</el-button>
+          <el-button v-permission="'HY_remind'" v-if="authority_remind(scope.row.F_CheckStateSH, scope.row.F_Type)" type="text" @click="btn_remind(scope.row.F_Id)">提醒</el-button>
+          <el-button v-permission="'HY_edit'" v-if="authority_edit(scope.row.F_CheckStateSH, scope.row.F_Type)" type="text" @click="btn_edit(scope.row.F_Id)">编辑</el-button>
+          <el-button v-permission="'HY_delete'" v-if="authority_delete(scope.row.F_CheckStateSH, scope.row.F_Type)" type="text" @click="btn_delete(scope.row.F_Id)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -299,30 +299,46 @@ export default {
       }
       this.selectedPhone = ids
     },
-    authority_review(checkStateSH) {
-      if (checkStateSH == 0 && (this.activeName == "-2" || this.activeName == "0")) {
-        return true
-      } else {
+    authority_review(checkStateSH, type) {
+      if (type === 9) {
         return false
+      } else {
+        if (checkStateSH == 0 && (this.activeName == "-2" || this.activeName == "0")) {
+          return true
+        } else {
+          return false
+        }
       }
     },
-    authority_remind(checkStateSH) {
-      if (checkStateSH == 4) {
-        return true
-      } else {
+    authority_remind(checkStateSH, type) {
+      if (type === 9) {
         return false
+      } else {
+        if (checkStateSH == 4) {
+          return true
+        } else {
+          return false
+        }
       }
     },
-    authority_edit(checkStateSH) {
-      // if ((checkStateSH == 0 || checkStateSH == 2) && this.activeName == "-2") {
+    authority_edit(checkStateSH, type) {
+      if (type === 9) {
+        return false
+      } else {
         return true
+      }
+      // if ((checkStateSH == 0 || checkStateSH == 2) && this.activeName == "-2") {
       // } else {
       //   return false
       // }
     },
-    authority_delete(checkStateSH) {
+    authority_delete(checkStateSH, type) {
+      if (type === 9) {
+        return false
+      } else {
+        return true
+      }
       // if (checkStateSH == 0 || checkStateSH == 2) {
-      return true
       // } else {
       //   return false
       // }

CallCenterWeb.UI/src/views/afterSaleManagement/afterSaleOrderList/edit.vue

@@ -938,6 +938,7 @@ export default {
       this.commodityTableData.splice(index, 1)
       this.getTotalAmountFun()
       if (this.activityAccountData.length > 0 && this.commodityTableData.length > 0) {
+        this.activityAccountData = []
         this.getActivityAccountList()
       } else {
         this.activityAccountData = []

CallCenterWeb.UI/src/views/callScreen/components/createOrder.vue

@@ -1000,6 +1000,7 @@ export default {
       this.commodityTableData.splice(index, 1)
       this.getTotalAmountFun()
       if (this.activityAccountData.length > 0 && this.commodityTableData.length > 0) {
+        this.activityAccountData = []
         this.getActivityAccountList()
       } else {
         this.activityAccountData = []

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

@@ -8,13 +8,7 @@
         <el-option label="货物不符" value="2"></el-option>
         <el-option label="未收到货" value="3"></el-option>
       </el-select> -->
-      <el-select
-        v-model="searchData.type"
-        class="filter-item"
-        filterable
-        clearable
-        placeholder="请选择售后类型"
-      >
+      <el-select v-model="searchData.type" class="filter-item" filterable clearable placeholder="请选择售后类型">
         <el-option label="调换货" value="1"></el-option>
         <el-option label="退货" value="2"></el-option>
         <!-- <el-option label="部分退货" value="3"></el-option> -->
@@ -24,6 +18,7 @@
         <!-- <el-option label="错发" value="7"></el-option> -->
         <!-- <el-option label="漏发" value="8"></el-option> -->
       </el-select>
+      <el-input v-model="searchData.orderId" 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_import_receiving'" type="primary" class="filter-item" @click="btn_import_receiving">导入</el-button>
       <el-button v-permission="'HY_export'" type="primary" class="filter-item" @click="btn_export">导出</el-button>
@@ -37,25 +32,15 @@
     <div>
       <span>订单数量：{{ pageParams.total }}</span>
     </div>
-    <el-table
-      v-loading="loading"
-      :data="dataLists"
-      border
-      stripe
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange">
       <el-table-column type="selection"></el-table-column>
       <el-table-column type="index" label="编号" align="center" fixed width="80" />
       <el-table-column prop="F_OrderId" label="订单编号" align="center" min-width="180">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="hadndleOrderCode(scope.row.F_OrderId)"
-          >{{ scope.row.F_OrderId }}</el-button>
+          <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_OrderId)">{{ scope.row.F_OrderId }}</el-button>
         </template>
       </el-table-column>
-      <el-table-column prop="F_AboutOrderId" label="关联订单编号" align="center" min-width="180" >
+      <el-table-column prop="F_AboutOrderId" label="关联订单编号" align="center" min-width="180">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_AboutOrderId)">{{ scope.row.F_AboutOrderId }}</el-button>
         </template>
@@ -77,13 +62,7 @@
       <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
           <el-button v-permission="'HY_after_sale_detail'" type="text" @click="btn_after_sale_detail(scope.row.F_Id)">详情</el-button>
-          <el-button
-            v-permission="'HY_review'"
-            v-if="aftersales(scope.row.F_CheckStateKG)"
-            type="text"
-            @click="btn_review(scope.row.F_Id)"
-            :disabled="isDisable"
-          >审核</el-button>
+          <el-button v-permission="'HY_review'" v-if="aftersales(scope.row.F_CheckStateKG)" type="text" @click="btn_review(scope.row.F_Id)" :disabled="isDisable">审核</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -99,17 +78,17 @@
 </template>
 
 <script>
-import { getDictionaryValueList } from "@/api/commonAPI";
-import { getAfterSaleListCustodian } from "@/api/afterSaleManagement/afterSaleList";
-import { pickerOptions, formatterContent } from "@/utils";
-import { exportAfterSaleCustodian } from '@/api/custodianManagement/orderListCustodian'
-import Pagination from "@/components/Pagination"; // 对el-pagination 二次封装
-import detail from "@/views/orderManagement/orderList/detail";
-import review from "./review";
-import importReceiving from './importReceiving';
-import afterSaleDetail from '@/views/afterSaleManagement/afterSaleList/afterSaleDetail'
-import { mapGetters } from "vuex";
-import request from '@/utils/request'
+import { getDictionaryValueList } from "@/api/commonAPI"
+import { getAfterSaleListCustodian } from "@/api/afterSaleManagement/afterSaleList"
+import { pickerOptions, formatterContent } from "@/utils"
+import { exportAfterSaleCustodian } from "@/api/custodianManagement/orderListCustodian"
+import Pagination from "@/components/Pagination" // 对el-pagination 二次封装
+import detail from "@/views/orderManagement/orderList/detail"
+import review from "./review"
+import importReceiving from "./importReceiving"
+import afterSaleDetail from "@/views/afterSaleManagement/afterSaleList/afterSaleDetail"
+import { mapGetters } from "vuex"
+import request from "@/utils/request"
 
 export default {
   name: "ConsolidateOrderList",
@@ -119,24 +98,24 @@ export default {
   filters: {
     judgmentStateName(status) {
       const statusMap = {
-        '1': '调换货',
-        '2': '退货',
-        '3': '部分退货',
-        '4': '对发货',
-        '5': '补发货',
-        '6': '补差额',
-        '7': '错发',
-        '8': '漏发'
-      };
-      return statusMap[status];
+        1: "调换货",
+        2: "退货",
+        3: "部分退货",
+        4: "对发货",
+        5: "补发货",
+        6: "补差额",
+        7: "错发",
+        8: "漏发",
+      }
+      return statusMap[status]
     },
     judgmentAfterSaleCheckState(status) {
       const statusMap = {
         0: "保存",
         1: "审核通过",
         2: "审核未通过",
-      };
-      return statusMap[status];
+      }
+      return statusMap[status]
     },
     judgmentCustodianStateName(status) {
       const statusMap = {
@@ -144,18 +123,19 @@ export default {
         1: "收到货",
         2: "货物不符",
         3: "未收到货",
-      };
-      return statusMap[status];
+      }
+      return statusMap[status]
     },
   },
   data() {
     return {
       isDisable: false, //防止多次点击
       loading: false,
-      activeName: '-2',
+      activeName: "-2",
       searchData: {
         checkState: "", //售后审核状态
         type: "", //售后类型
+        orderId: "",
       },
       pickerOptions, // 日期数据
       pageParams: {
@@ -166,15 +146,15 @@ export default {
       dataLists: [], // 列表数据
       multipleSelection: [], // 选中的数据
       selectedId: [], // 选中的数据的id
-    };
+    }
   },
   created() {
-    this.getList();
+    this.getList()
     document.onkeyup = (e) => {
       if (e.keyCode === 13) {
-        this.getList();
+        this.getList()
       }
-    };
+    }
   },
   computed: {
     ...mapGetters([
@@ -190,42 +170,41 @@ export default {
   },
   methods: {
     getList() {
-      this.loading = true;
+      this.loading = true
       return new Promise((resolve) => {
         const params = {
           F_CheckStateKG: this.searchData.checkState, //售后审核状态
           F_Type: this.searchData.type, //售后类型
+          F_OrderId: this.searchData.orderId, //订单编号
           F_State: -2, //订单状态
           F_Id: "",
           pageindex: 1, // int 第几页
           pagesize: 1000000, // int 每页几条信息
           F_PayState: "-2",
-        };
+        }
         getAfterSaleListCustodian(params).then((response) => {
-          this.loading = false;
+          this.loading = false
           if (response.state.toLowerCase() === "success") {
-            this.pageParams.total = response.data.length;
+            this.pageParams.total = response.data.length
             this.dataLists = response.data
           }
-        });
-        resolve();
-      });
+        })
+        resolve()
+      })
     },
     //售后审核
     btn_review(rowid) {
-      this.isDisable = true;
-      setTimeout(() => {
-        this.$layer.iframe({
-          content: {
-            content: review, // 传递的组件对象
-            parent: this, // 当前的vue对象
-            data: { rowid: rowid }, // props
-          },
-          area: ["40%", "50%"],
-          title: "售后审核",
-        });
-        this.isDisable = false;
-      }, 1500);
+      this.isDisable = true
+      this.$layer.iframe({
+        content: {
+          content: review, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: rowid }, // props
+        },
+        area: ["40%", "50%"],
+        title: "售后审核",
+      })
+      this.isDisable = false
     },
     // 详情
     btn_after_sale_detail(editId) {
@@ -233,45 +212,47 @@ export default {
         content: {
           content: afterSaleDetail, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: editId } // props
+          data: { rowid: editId }, // props
         },
-        area: ['80%', '90%'],
-        title: '售后列表详情'
+        area: ["80%", "90%"],
+        title: "售后列表详情",
       })
     },
     //导入
-    btn_import_receiving () {
+    btn_import_receiving() {
       this.$layer.iframe({
         content: {
           content: importReceiving, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: "" } // props
+          data: { rowid: "" }, // props
         },
         area: ["30%", "30%"],
-        title: "导入"
-      });
+        title: "导入",
+      })
     },
     //导出
     btn_export() {
       return new Promise((resolve) => {
         const params = {
-          isdc: 1
+          isdc: 1,
         }
-        exportAfterSaleCustodian(params).then(res => {
+        exportAfterSaleCustodian(params).then((res) => {
           const content = res
           const blob = new Blob([content])
-          const fileName = '快递信息.xlsx'
-          if ('download' in document.createElement('a')) { // 非IE下载
-            const elink = document.createElement('a')
+          const fileName = "快递信息.xlsx"
+          if ("download" in document.createElement("a")) {
+            // 非IE下载
+            const elink = document.createElement("a")
             elink.download = fileName
-            elink.style.display = 'none'
+            elink.style.display = "none"
             elink.href = URL.createObjectURL(blob)
             document.body.appendChild(elink)
             elink.click()
             URL.revokeObjectURL(elink.href) // 释放URL 对象
             document.body.removeChild(elink)
-            this.$message.success('恭喜你，文件导出成功!')
-          } else { // IE10+下载
+            this.$message.success("恭喜你，文件导出成功!")
+          } else {
+            // IE10+下载
             navigator.msSaveBlob(blob, fileName)
           }
         })
@@ -280,8 +261,8 @@ export default {
       // window.location.href = this.$store.getters.serverConfig.BASE_API + "api/AfterSale/getaftersalebypagesh?isdc=1" + "&Authorization=" + this.token
     },
     btn_search() {
-      this.pageParams.pageindex = 1;
-      this.getList();
+      this.pageParams.pageindex = 1
+      this.getList()
     },
     hadndleOrderCode(ordercode) {
       this.$layer.iframe({
@@ -292,27 +273,27 @@ export default {
         },
         area: ["80%", "90%"],
         title: "订单详情",
-      });
+      })
     },
     //售后审核设置
     aftersales(state) {
       if (state == 0) {
-        return true;
+        return true
       } else {
-        return false;
+        return false
       }
     },
     //选择多个
     handleSelectionChange(val) {
-      const ids = [];
-      this.multipleSelection = val;
+      const ids = []
+      this.multipleSelection = val
       for (let i = 0; i < this.multipleSelection.length; i++) {
-        ids.push(this.multipleSelection[i].id);
+        ids.push(this.multipleSelection[i].id)
       }
-      this.selectedPhone = ids;
+      this.selectedPhone = ids
     },
     handleTabClick() {
-      this.pageParams.pageindex=1
+      this.pageParams.pageindex = 1
       if (this.activeName === "0") {
         this.searchData.checkState = "0"
       } else if (this.activeName === "1") {
@@ -322,10 +303,10 @@ export default {
       } else {
         this.searchData.checkState = "-2"
       }
-      this.getList();
-    }
+      this.getList()
+    },
   },
-};
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

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

@@ -55,7 +55,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="F_Money" label="变动金额" align="center" />
-      <el-table-column prop="F_TrackingNo" 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" />
       <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">

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

@@ -985,6 +985,7 @@ export default {
       this.commodityTableData.splice(index, 1)
       this.getTotalAmountFun()
       if (this.activityAccountData.length > 0 && this.commodityTableData.length > 0) {
+        this.activityAccountData = []
         this.getActivityAccountList()
       } else {
         this.activityAccountData = []
@@ -1364,4 +1365,7 @@ export default {
   margin-top: 20px;
   padding-top: 40px;
 }
+.vlicon-max {
+  display: none;
+}
 </style>

CallCenterWeb.UI/src/views/orderManagement/changeCollectionOrderList/addOrEdit.vue

@@ -0,0 +1,500 @@
+<template>
+  <div v-loading="loading">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="order_form">
+      <el-form-item label="订单编号" prop="F_OrderId">
+        <el-input v-model="ruleForm.F_OrderId" :disabled="true" />
+      </el-form-item>
+      <el-form-item label="售后类型" prop="F_Type">
+        <el-select v-model="ruleForm.F_Type" class="form_select" filterable clearable placeholder="请选择售后类型">
+          <!-- <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="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="9"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="变动金额" prop="F_Money">
+        <el-input-number v-model="ruleForm.F_Money" controls-position="right" class="form_input_number"></el-input-number>
+      </el-form-item>
+      <el-form-item label="售后原因" prop="F_ReturnType">
+        <el-select v-model="ruleForm.F_ReturnType" class="form_select" filterable clearable placeholder="请选择售后原因">
+          <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" >
+        <el-input v-model="ruleForm.F_ReturnDes" />
+      </el-form-item> -->
+      <el-form-item label="退回商品状态" prop="F_ProductStatus">
+        <el-input v-model="ruleForm.F_ProductStatus" placeholder="请输入退回商品状态" />
+      </el-form-item>
+      <el-form-item label="处理原因" prop="F_Reason">
+        <el-input v-model="ruleForm.F_Reason" placeholder="请输入处理原因" />
+      </el-form-item>
+      <el-form-item label="客户意愿" prop="F_Aspiration">
+        <el-input v-model="ruleForm.F_Aspiration" placeholder="请输入客户意愿" />
+      </el-form-item>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="商品分类" prop="parentids">
+            <el-cascader v-model="parentids" :options="commodityTypeLists" :props="typeDropProps" placeholder="请选择商品分类" clearable filterable change-on-select @change="commodityTypeChange" style="width: 100%" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="商品" prop="productName">
+            <el-select v-model="commoditySearchData.productName" class="filter-item" value-key="F_ProductId" clearable placeholder="请选择商品" @change="commodityListChange">
+              <el-option v-for="item in commodityListLists" :key="item.F_ProductId" :label="item.F_ProductName" :value="item"> </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="商品数量" prop="num">
+            <el-input-number v-model="commoditySearchData.num" :min="1" label="描述文字"></el-input-number>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-form-item>
+          <el-button type="primary" @click="addCommodity">添加商品</el-button>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="补发商品">
+            <el-table :data="commodityTableData" stripe style="width: 100%">
+              <el-table-column prop="F_ProductName" label="商品名称" align="center"></el-table-column>
+              <el-table-column prop="F_Count" label="商品数量" align="center"></el-table-column>
+              <el-table-column prop="F_DealPrice" label="商品单价" align="center"></el-table-column>
+              <el-table-column prop="F_TotlePrice" label="商品总价" align="center"></el-table-column>
+              <el-table-column label="操作" align="center">
+                <template slot-scope="scope">
+                  <el-button type="text" @click="btn_deleteCommodity(scope.row)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="退回商品">
+            <el-table :data="oldCommodityTableData" stripe style="width: 100%" @selection-change="handleSelectionChange" ref="oldCommodityTable">
+              <el-table-column type="selection" width="55"></el-table-column>
+              <el-table-column prop="F_ProductName" label="商品名称" align="center"></el-table-column>
+              <el-table-column prop="F_Count" label="商品数量" align="center"></el-table-column>
+              <el-table-column prop="F_Price" label="商品单价" align="center"></el-table-column>
+              <el-table-column prop="F_DealPrice" label="商品总价" align="center"></el-table-column>
+              <el-table-column label="操作" align="center">
+                <template slot-scope="scope">
+                  <el-button type="text" @click="btn_editCommodityNum(scope.row)">修改数量</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="售后备注展示" prop="F_Remark">
+        <span>{{ ruleForm.F_RemarkShow }}</span>
+      </el-form-item>
+      <el-form-item label="售后备注" prop="F_Remark">
+        <el-input :autosize="{ minRows: 4 }" v-model="ruleForm.F_Remark" type="textarea" placeholder="请输入售后备注" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm(0)">保存</el-button>
+        <!-- <el-button type="primary" @click="submitForm(1)">提交</el-button> -->
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { getDictionaryValueList } from "@/api/commonAPI"
+import { getOrder } from "@/api/orderManagement/orderList"
+import { getCommodityType } from "@/api/commodityManagement/commodityType"
+import { getCommodityList } from "@/api/commodityManagement/commodityList"
+import { addAfterSaleList, editAfterSaleList, afterSaleListDetail, getAfterSaleOrderReturnCommodityList } from "@/api/afterSaleManagement/afterSaleList"
+import { getTotalAmount } from "@/api/orderManagement/orderList"
+import editCommodityNum from "./editCommodityNum"
+
+export default {
+  name: "AfterSale",
+  props: {
+    rowid: {
+      type: String,
+      default: "",
+    },
+    layerid: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      parentids: [],
+      afterSaleReasonsList: [], //售后原因类型
+      commodityTypeLists: [], //商品分类下拉数据
+      // 自定义菜单下拉数据的key值
+      typeDropProps: {
+        value: "id",
+        label: "text",
+      },
+      commodityTableData: [], //添加商品
+      commodityListLists: [], //商品列表
+      commoditySearchData: {
+        //商品搜索数据
+        classId: "", // 商品分类id
+        className: "", // 商品分类名称
+        productName: "", //商品名称
+        productId: "", //商品id
+        num: 1, //商品数量
+      },
+      oldCommodityTableData: [], //退回商品列表
+      oldDetailListSelection: [], // 退回商品选中数据
+      ruleForm: {
+        F_Id: "", //售后id
+        F_OrderId: "", //订单编号
+        F_DetailList: "", //补发产品列表
+        F_OldDetailList: "", //退回产品列表
+        F_Type: "", //售后类型
+        F_Money: "", //变动金额
+        F_Remark: "", //售后备注
+        F_RemarkShow: "", //售后备注展示
+        F_ReturnType: "", //售后原因类型
+        F_ReturnDes: "", //售后原因
+        F_ProductStatus: "", //退回商品状态
+        F_CheckStateSH: "", //0保存 1提交按钮 2不通过
+        F_Reason: "", //处理原因
+        F_Aspiration: "", //客户意愿
+      },
+      rules: {
+        order1: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "请输入订单编号1",
+          },
+        ],
+        order2: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "请输入订单编号2",
+          },
+        ],
+        F_Type: [
+          {
+            required: true,
+            trigger: "change",
+            message: "请选择售后类型",
+          },
+        ],
+        F_Money: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "请输入变动金额",
+          },
+        ],
+        F_ReturnType: [
+          {
+            required: true,
+            trigger: "change",
+            message: "请选择售后原因类型",
+          },
+        ],
+        // F_ReturnDes: [{
+        //   required: true,
+        //   trigger: 'blur',
+        //   message: '请输入售后原因',
+        // }],
+      },
+      loading: false,
+    }
+  },
+  created() {
+    this.getCommodityTypeSelect()
+    Promise.all([]).then(() => {
+      if (this.rowid) {
+        this.ruleForm.F_Id = this.rowid
+        this.getDetail(this.rowid)
+      }
+    })
+  },
+  methods: {
+    submitForm(state) {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          this.loading = true
+          this.ruleForm.F_CheckStateSH = state
+          // 编辑
+          editAfterSaleList(this.ruleForm)
+            .then((response) => {
+              this.loading = false
+              if (response.state.toLowerCase() === "success") {
+                this.$parent.$layer.close(this.layerid)
+                this.$parent.getList() // 重新加载父级数据
+                this.$message.success("恭喜你，编辑成功!")
+              }
+            })
+            .catch(() => {
+              this.loading = false
+            })
+        } else {
+          this.$message.error("请输入有效的必填项信息!")
+          return false
+        }
+      })
+    },
+    //获取商品分类
+    getCommodityTypeSelect() {
+      this.loading = true
+      return new Promise((resolve) => {
+        const data = {
+          pageindex: 1, // int 第几页
+          pagesize: 300, // int 每页几条信息
+          ParentId: 0,
+        }
+        getCommodityType(data).then((response) => {
+          this.loading = false
+          if (response.state.toLowerCase() === "success") {
+            this.commodityTypeLists = response.data
+          }
+        })
+        resolve()
+      })
+    },
+    commodityTypeChange(item) {
+      this.commoditySearchData.classId = this.parentids[this.parentids.length - 1]
+      this.getCommodityListSelect()
+    },
+    commodityListChange(item) {
+      this.commoditySearchData.productId = item.F_ProductId
+      this.commoditySearchData.productName = item.F_ProductName
+    },
+    //获取商品
+    getCommodityListSelect() {
+      this.loading = true
+      return new Promise((resolve) => {
+        const params = {
+          pageindex: 1, // int 第几页,
+          pagesize: 300, // int 每页几条信息,
+          ProductId: "",
+          ClassId: this.commoditySearchData.classId === "" ? 0 : this.commoditySearchData.classId,
+          ClassName: "",
+          ProductName: "",
+          PinyinShort: "",
+          ProductNumber: "",
+          ProductShortName: "",
+          tag: "",
+          // issale: 1,
+        }
+        getCommodityList(params).then((response) => {
+          this.loading = false
+          if (response.state.toLowerCase() === "success") {
+            this.commodityListLists = response.data.Rows
+          }
+        })
+        resolve()
+      })
+    },
+    addCommodity() {
+      if (this.commoditySearchData.productName === "") {
+        this.$message({
+          message: "请选择商品！",
+          type: "warning",
+        })
+        return
+      }
+      if (this.commodityTableData.length > 0) {
+        for (let i = 0; i < this.commodityTableData.length; i++) {
+          if (this.commodityTableData[i].F_ProductId === this.commoditySearchData.productId) {
+            this.commodityTableData[i].F_Count = this.commodityTableData[i].F_Count + this.commoditySearchData.num
+            this.getTotalAmountFun()
+            return
+          }
+        }
+      }
+      let data = {
+        F_ProductId: this.commoditySearchData.productId,
+        F_ProductName: this.commoditySearchData.productName,
+        F_Count: this.commoditySearchData.num,
+        F_DealPrice: 0,
+        F_TotlePrice: 0,
+      }
+      this.commodityTableData.push(data)
+      let idsQuantity = []
+      for (let i = 0; i < this.commodityTableData.length; i++) {
+        idsQuantity.push(this.commodityTableData[i].F_ProductId + "," + this.commodityTableData[i].F_Count)
+      }
+      this.ruleForm.F_DetailList = idsQuantity.join("|") //补发产品列表
+      this.getTotalAmountFun()
+    },
+    //删除商品
+    btn_deleteCommodity(val) {
+      if (this.commodityTableData.length <= 1) {
+        this.$message({
+          message: "不能删除所有商品！",
+          type: "warning",
+        })
+        return
+      }
+      let index = this.commodityTableData.indexOf(val)
+      this.commodityTableData.splice(index, 1)
+      this.getTotalAmountFun()
+    },
+    //修改商品数量
+    btn_editCommodityNum(row) {
+      this.$layer.iframe({
+        content: {
+          content: editCommodityNum, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { row: row }, // props
+        },
+        area: ["30%", "30%"],
+        title: "修改商品数量",
+      })
+    },
+    editCommodityNum(count, row) {
+      this.$refs.oldCommodityTable.clearSelection()
+      this.oldCommodityTableData.forEach((e, i) => {
+        if (e.F_ProductId == row.F_ProductId) {
+          e.F_Count = count
+        }
+      })
+      this.getReturnGoodsAmount()
+    },
+    //获取售后订单详情
+    getDetail(rid) {
+      const params = {
+        F_Id: rid,
+      }
+      afterSaleListDetail(params).then((response) => {
+        if (response.state.toLowerCase() === "success") {
+          const res = response.data
+          this.ruleForm.F_OrderId = res.F_OrderId //订单编号
+          this.ruleForm.F_OldDetailList = res.F_OldDetailList //退回产品列表
+          this.ruleForm.F_Type = res.F_Type + "" //售后类型
+          this.ruleForm.F_Money = res.F_Money //变动金额
+          // this.ruleForm.F_Remark = res.F_Remark //售后备注
+          this.ruleForm.F_RemarkShow = res.F_Remark //售后备注展示
+          this.ruleForm.F_ReturnType = res.F_ReturnType //售后原因类型
+          this.ruleForm.F_ReturnDes = res.F_ReturnDes //售后原因
+          this.ruleForm.F_ProductStatus = res.F_ProductStatus //退回商品状态
+          this.ruleForm.F_Reason = res.F_Reason //处理原因
+          this.ruleForm.F_Aspiration = res.F_Aspiration //客户意愿
+          this.getAfterSaleOrderCommodity(rid)
+          this.getReissueGoods(res.F_DetailList) //补发商品
+          this.getTotalAmountFun()
+        }
+      })
+    },
+    getReissueGoods(goodsData) {
+      let reissueGoods = goodsData.split("|")
+      for (let i = 1; i < reissueGoods.length; i++) {
+        let reissueGoodsDetail = reissueGoods[i].split(",")
+        let data = {
+          F_ProductId: reissueGoodsDetail[0],
+          F_ProductName: reissueGoodsDetail[2],
+          F_Count: parseInt(reissueGoodsDetail[1]),
+        }
+        this.commodityTableData.push(data)
+      }
+    },
+    // 售后订单商品列表
+    getAfterSaleOrderCommodity(rid) {
+      const params = {
+        orderid: rid,
+      }
+      getAfterSaleOrderReturnCommodityList(params).then((response) => {
+        if (response.state.toLowerCase() === "success") {
+          const res = response.data
+          this.oldCommodityTableData = res
+          this.$nextTick(() => {
+            this.oldCommodityTableData.forEach((row, index) => {
+              this.$refs.oldCommodityTable.toggleRowSelection(row)
+            })
+          }, 1)
+        }
+      })
+    },
+    //售后原因类型
+    getAfterSaleReasons(code) {
+      return new Promise((resolve) => {
+        const params = {
+          pagesize: 10000,
+          isleaf: true,
+          code: code,
+        }
+        getDictionaryValueList(params).then((response) => {
+          if (response.state.toLowerCase() === "success") {
+            this.afterSaleReasonsList = response.data.Rows
+          }
+        })
+      })
+    },
+    //选择多个
+    handleSelectionChange(selection) {
+      let idsQuantity = []
+      this.oldDetailListSelection = selection
+      for (let i = 0; i < this.oldDetailListSelection.length; i++) {
+        idsQuantity.push(this.oldDetailListSelection[i].F_ProductId + "," + this.oldDetailListSelection[i].F_Count)
+      }
+      this.ruleForm.F_OldDetailList = idsQuantity.join("|")
+    },
+    // 获取金额总数
+    getTotalAmountFun() {
+      return new Promise((resolve) => {
+        const params = {
+          OrderDetailList: this.commodityTableData,
+          UseActList: this.ruleForm.UseActList,
+          F_ExpressFee: this.ruleForm.F_ExpressFee == "" ? 0 : this.ruleForm.F_ExpressFee,
+        }
+        getTotalAmount(params).then((response) => {
+          const res = response.orderDetails
+          this.totalAmount = response.totle
+          res.forEach((e, i) => {
+            this.commodityTableData.forEach((k, m) => {
+              if (e.F_ProductId == k.F_ProductId) {
+                k.F_DealPrice = e.F_DealPrice
+                k.F_TotlePrice = e.F_TotlePrice
+              }
+            })
+          })
+        })
+        resolve()
+      })
+    },
+    // 获取退回商品价格
+    getReturnGoodsAmount() {
+      return new Promise((resolve) => {
+        const params = {
+          OrderDetailList: this.oldCommodityTableData,
+          UseActList: [],
+          F_ExpressFee: 0,
+        }
+        getTotalAmount(params).then((response) => {
+          const res = response.orderDetails
+          res.forEach((e, i) => {
+            this.oldCommodityTableData.forEach((k, m) => {
+              if (e.F_ProductId == k.F_ProductId) {
+                k.F_DealPrice = e.F_DealPrice
+                k.F_TotlePrice = e.F_TotlePrice
+              }
+            })
+          })
+        })
+        resolve()
+      })
+    },
+  },
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.order_form .form_select {
+  width: 100%;
+}
+</style>

CallCenterWeb.UI/src/views/orderManagement/changeCollectionOrderList/editCommodityNum.vue

@@ -32,7 +32,6 @@ export default {
   },
   created() {
     if (this.row) {
-      console.log("this.row", this.row)
       this.ruleForm.quantity = this.row.F_Count
     }
   },

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

@@ -12,7 +12,7 @@
         <el-option label="漏发" value="8"/>
       </el-select> -->
       <!-- <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button> -->
-      <el-button v-permission="'HY_import_waybill_number'" type="primary" class="filter-item" @click="btn_import_waybill_number">导入运单号</el-button>
+      <el-button v-permission="'HY_import_waybill_number'" type="primary" class="filter-item" @click="btn_import_waybill_number">导入寄回运单号</el-button>
     </div>
     <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick">
       <div>
@@ -88,7 +88,7 @@
           </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_TrackingNo" label="寄回运单号" align="center" />
           <el-table-column prop="F_Remark" label="备注" align="center" />
           <el-table-column prop="F_AddTime" label="下单日期" align="center" />
           <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
@@ -99,7 +99,7 @@
           </el-table-column>
         </el-table>
       </el-tab-pane>
-      <el-tab-pane label="已处理" name="1">
+      <el-tab-pane label="已同意" name="1">
         <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange">
           <el-table-column type="selection" />
           <el-table-column type="index" label="编号" align="center" fixed width="80" />
@@ -125,7 +125,7 @@
           </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_TrackingNo" label="寄回运单号" align="center" />
           <el-table-column prop="F_Remark" label="备注" align="center" />
           <el-table-column prop="F_AddTime" label="下单日期" align="center" />
           <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
@@ -136,7 +136,7 @@
           </el-table-column>
         </el-table>
       </el-tab-pane>
-      <el-tab-pane label="已拒收" name="2">
+      <el-tab-pane label="退回" name="4">
         <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange">
           <el-table-column type="selection" />
           <el-table-column type="index" label="编号" align="center" fixed width="80" />
@@ -162,18 +162,19 @@
           </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_TrackingNo" label="寄回运单号" align="center" />
           <el-table-column prop="F_Remark" label="备注" align="center" />
           <el-table-column prop="F_AddTime" label="下单日期" align="center" />
           <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
             <template slot-scope="scope">
               <el-button v-permission="'HY_after_sale_detail'" type="text" @click="btn_after_sale_detail(scope.row.F_Id)">详情</el-button>
+              <el-button v-permission="'HY_after_sale_edit'" type="text" @click="btn_after_sale_edit(scope.row.F_Id)">编辑</el-button>
               <el-button v-permission="'HY_waybill_number'" v-if="authority_waybill_number(scope.row.F_ReturnType)" type="text" @click="btn_waybill_number(scope.row.F_Id)">寄回运单号</el-button>
             </template>
           </el-table-column>
         </el-table>
       </el-tab-pane>
-      <el-tab-pane label="已提交" name="3">
+      <el-tab-pane label="已签收" name="3">
         <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange">
           <el-table-column type="selection" />
           <el-table-column type="index" label="编号" align="center" fixed width="80" />
@@ -199,7 +200,7 @@
           </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_TrackingNo" label="寄回运单号" align="center" />
           <el-table-column prop="F_Remark" label="备注" align="center" />
           <el-table-column prop="F_AddTime" label="下单日期" align="center" />
           <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
@@ -210,7 +211,7 @@
           </el-table-column>
         </el-table>
       </el-tab-pane>
-      <el-tab-pane label="退回" name="4">
+      <el-tab-pane label="已拒收" name="2">
         <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange">
           <el-table-column type="selection" />
           <el-table-column type="index" label="编号" align="center" fixed width="80" />
@@ -236,7 +237,7 @@
           </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_TrackingNo" label="寄回运单号" align="center" />
           <el-table-column prop="F_Remark" label="备注" align="center" />
           <el-table-column prop="F_AddTime" label="下单日期" align="center" />
           <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
@@ -257,6 +258,7 @@ import { getAfterSaleList, deleteAfterSaleList } from "@/api/afterSaleManagement
 import { pickerOptions, formatterContent } from "@/utils"
 import importWaybillnumber from "./importWaybillnumber"
 import afterSale from "./afterSale"
+import addOrEdit from "./addOrEdit"
 import waybillnumber from "./waybillnumber"
 import Pagination from "@/components/Pagination" // 对el-pagination 二次封装
 import detail from "@/views/orderManagement/orderList/detail"
@@ -437,6 +439,18 @@ export default {
         title: "售后列表详情",
       })
     },
+    // 编辑
+    btn_after_sale_edit(editId) {
+      this.$layer.iframe({
+        content: {
+          content: addOrEdit, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: editId }, // props
+        },
+        area: ["80%", "90%"],
+        title: "编辑",
+      })
+    },
     // 添加售后
     btn_add_aftersale(id) {
       this.$layer.iframe({
@@ -506,8 +520,8 @@ export default {
         this.searchData.returnType = "改代收"
         this.getList()
       } else if (this.activeName == "3") {
-        this.searchData.woState = "1"
-        this.searchData.isSignfor = ""
+        this.searchData.woState = ""
+        this.searchData.isSignfor = "1"
         this.searchData.returnType = "改代收"
         this.getList()
       } else if (this.activeName == "4") {
@@ -562,13 +576,6 @@ export default {
       }
       this.selectedPhone = ids
     },
-    authority_edit(checkStateSH) {
-      if (checkStateSH == 0 || checkStateSH == 2) {
-        return true
-      } else {
-        return false
-      }
-    },
     authority_delete(checkStateSH) {
       if (checkStateSH == 0 || checkStateSH == 2) {
         return true

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

@@ -31,7 +31,7 @@
             <el-col :md="6" class="order_detail_item"> 实付金额：{{ orderDetailData.F_RealPrice }} </el-col>
             <el-col :md="6" class="order_detail_item"> 应付金额：{{ orderDetailData.F_ShouldPrice }} </el-col>
             <el-col :md="6" class="order_detail_item"> 媒体名称：{{ orderDetailData.F_MediaName }} </el-col>
-            <el-col :md="6" class="order_detail_item"> 寄回运单号：{{ orderDetailData.F_SendbackTrackingNo }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 寄回运单号：{{ orderDetailData.F_NewTrackingNo }} </el-col>
             <el-col :md="6" class="order_detail_item"> 销售：{{ orderDetailData.F_BelongName }} </el-col>
             <el-col :md="6" class="order_detail_item"> 中心：{{ orderDetailData.F_CoreName }} </el-col>
             <el-col :md="6" class="order_detail_item"> 小组：{{ orderDetailData.F_GroupName }} </el-col>
@@ -171,7 +171,7 @@ export default {
         F_TotlePrice: "", // 商品金额
         commodityTotlePrice: "", // 商品合计金额
         F_MediaName: "", // 媒体名称
-        F_SendbackTrackingNo: "", // 寄回运单号
+        F_NewTrackingNo: "", // 寄回运单号
         F_BelongName: "", //销售
         F_CoreName: "", //中心
         F_GroupName: "", //小组
@@ -310,7 +310,7 @@ export default {
         this.orderDetailData.F_RemarkXS = res.OrderMoney.F_RemarkXS // 备注
         this.orderDetailData.F_ShouldPrice = res.F_ShouldPrice // 应付金额
         this.orderDetailData.F_MediaName = res.F_MediaName // 媒体名称
-        this.orderDetailData.F_SendbackTrackingNo = res.F_SendbackTrackingNo // 寄回运单号
+        this.orderDetailData.F_NewTrackingNo = res.F_NewTrackingNo // 寄回运单号
         this.orderDetailData.F_BelongName = res.F_BelongName // 销售
         this.orderDetailData.F_CoreName = res.F_CoreName // 中心
         this.orderDetailData.F_GroupName = res.F_GroupName // 小组

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

@@ -938,6 +938,7 @@ export default {
       this.commodityTableData.splice(index, 1)
       this.getTotalAmountFun()
       if (this.activityAccountData.length > 0 && this.commodityTableData.length > 0) {
+        this.activityAccountData = []
         this.getActivityAccountList()
       } else {
         this.activityAccountData = []

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

@@ -1,13 +1,7 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-select
-        v-model="searchData.type"
-        class="filter-item"
-        filterable
-        clearable
-        placeholder="请选择售后类型"
-      >
+      <el-select v-model="searchData.type" class="filter-item" filterable clearable placeholder="请选择售后类型">
         <el-option label="调换" value="1" />
         <el-option label="退货" value="2" />
         <!-- <el-option label="部分退货" value="3"/> -->
@@ -18,13 +12,7 @@
         <!-- <el-option label="漏发" value="8"/> -->
         <!-- <el-option label="改代收" value="9" /> -->
       </el-select>
-      <el-button
-        type="primary"
-        class="filter-item"
-        icon="el-icon-search"
-        @click="btn_search"
-        >搜索</el-button
-      >
+      <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <!-- <el-button type="primary" v-permission="'HY_import_waybill_number'" class="filter-item" @click="btn_import_waybill_number">导入运单号</el-button> -->
     </div>
     <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick">
@@ -35,49 +23,17 @@
     <div>
       <span>订单数量：{{ pageParams.total }}</span>
     </div>
-    <el-table
-      v-loading="loading"
-      :data="dataLists"
-      border
-      stripe
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange">
       <el-table-column type="selection" />
-      <el-table-column
-        type="index"
-        label="编号"
-        align="center"
-        fixed
-        width="80"
-      />
-      <el-table-column
-        prop="F_OrderId"
-        label="订单编号"
-        align="center"
-        min-width="180"
-      >
+      <el-table-column type="index" label="编号" align="center" fixed width="80" />
+      <el-table-column prop="F_OrderId" label="订单编号" align="center" min-width="180">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="hadndleOrderCode(scope.row.F_OrderId)"
-            >{{ scope.row.F_OrderId }}</el-button
-          >
+          <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_OrderId)">{{ scope.row.F_OrderId }}</el-button>
         </template>
       </el-table-column>
-      <el-table-column
-        prop="F_AboutOrderId"
-        label="关联订单编号"
-        align="center"
-        min-width="180"
-      >
+      <el-table-column prop="F_AboutOrderId" label="关联订单编号" align="center" min-width="180">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="hadndleOrderCode(scope.row.F_AboutOrderId)"
-            >{{ scope.row.F_AboutOrderId }}</el-button
-          >
+          <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_AboutOrderId)">{{ scope.row.F_AboutOrderId }}</el-button>
         </template>
       </el-table-column>
       <el-table-column label="售后类型" align="center">
@@ -100,20 +56,9 @@
       <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" />
-      <el-table-column
-        label="操作"
-        width="240"
-        align="center"
-        class-name="oparate_btn"
-        fixed="right"
-      >
+      <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
-          <el-button
-            v-permission="'HY_after_sale_detail'"
-            type="text"
-            @click="btn_after_sale_detail(scope.row.F_Id)"
-            >详情</el-button
-          >
+          <el-button v-permission="'HY_after_sale_detail'" type="text" @click="btn_after_sale_detail(scope.row.F_Id)">详情</el-button>
           <!-- <el-button
             v-permission="'HY_waybill_number'"
             type="text"
@@ -135,51 +80,52 @@
 </template>
 
 <script>
-import { getDictionaryValueList } from "@/api/commonAPI";
-import { getAfterSaleList, deleteAfterSaleList } from "@/api/afterSaleManagement/afterSaleList";
-import { pickerOptions, formatterContent } from "@/utils";
-import importWaybillnumber from "./importWaybillnumber";
-import waybillnumber from "./waybillnumber";
-import Pagination from "@/components/Pagination"; // 对el-pagination 二次封装
-import detail from "@/views/orderManagement/orderList/detail";
-import afterSaleDetail from "@/views/afterSaleManagement/afterSaleList/afterSaleDetail";
+import { getDictionaryValueList } from "@/api/commonAPI"
+import { getAfterSaleList, deleteAfterSaleList } from "@/api/afterSaleManagement/afterSaleList"
+import { pickerOptions, formatterContent } from "@/utils"
+import importWaybillnumber from "./importWaybillnumber"
+import waybillnumber from "./waybillnumber"
+import Pagination from "@/components/Pagination" // 对el-pagination 二次封装
+import detail from "@/views/orderManagement/orderList/detail"
+import afterSaleDetail from "@/views/afterSaleManagement/afterSaleList/afterSaleDetail"
 
 export default {
   name: "ConsolidateOrderList",
   components: {
-    Pagination
+    Pagination,
   },
   filters: {
     judgmentStateName(status) {
       const statusMap = {
-        "1": "调换货",
-        "2": "退货",
-        "3": "部分退货",
-        "4": "对发货",
-        "5": "补发货",
-        "6": "补差额",
-        "7": "错发",
-        "8": "漏发"
-      };
-      return statusMap[status];
+        1: "调换货",
+        2: "退货",
+        3: "部分退货",
+        4: "对发货",
+        5: "补发货",
+        6: "补差额",
+        7: "错发",
+        8: "漏发",
+        9: "改代收",
+      }
+      return statusMap[status]
     },
     judgmentAfterSaleCheckState(status) {
       const statusMap = {
-        "0": "保存",
-        "1": "审核通过",
-        "2": "审核未通过"
-      };
-      return statusMap[status];
+        0: "保存",
+        1: "审核通过",
+        2: "审核未通过",
+      }
+      return statusMap[status]
     },
     judgmentCustodianStateName(status) {
       const statusMap = {
-        "0": "未审核",
-        "1": "收到货",
-        "2": "货物不符",
-        "3": "未收到货"
-      };
-      return statusMap[status];
-    }
+        0: "未审核",
+        1: "收到货",
+        2: "货物不符",
+        3: "未收到货",
+      }
+      return statusMap[status]
+    },
   },
   data() {
     return {
@@ -189,32 +135,32 @@ export default {
         type: "", // 售后类型
         isSignfor: "", // 是否签入
         woState: "", // 是否提交
-        returnType: "" // 退回状态
+        returnType: "", // 退回状态
       },
       activeName: "0",
       pickerOptions, // 日期数据
       pageParams: {
         pageindex: 1, // 当前第几页
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-        total: 0 // 总共多少数据
+        total: 0, // 总共多少数据
       },
       dataLists: [], // 列表数据
       multipleSelection: [], // 选中的数据
-      selectedId: [] // 选中的数据的id
-    };
+      selectedId: [], // 选中的数据的id
+    }
   },
   created() {
-    this.getList();
-    document.onkeyup = e => {
+    this.getList()
+    document.onkeyup = (e) => {
       if (e.keyCode === 13) {
-        this.getList();
+        this.getList()
       }
-    };
+    }
   },
   methods: {
     getList() {
-      this.loading = true;
-      return new Promise(resolve => {
+      this.loading = true
+      return new Promise((resolve) => {
         const params = {
           F_CheckStateSH: this.searchData.checkState, // 售后审核状态
           F_Type: this.searchData.type, // 售后类型
@@ -225,17 +171,17 @@ export default {
           F_PayState: "-2",
           F_ReturnType: this.searchData.returnType,
           IsSignfor: this.searchData.isSignfor, // 是否签入
-          F_WoState: this.searchData.woState // 是否提交
-        };
-        getAfterSaleList(params).then(response => {
-          this.loading = false;
+          F_WoState: this.searchData.woState, // 是否提交
+        }
+        getAfterSaleList(params).then((response) => {
+          this.loading = false
           if (response.state.toLowerCase() === "success") {
-            this.pageParams.total = response.data.length;
-            this.dataLists = response.data;
+            this.pageParams.total = response.data.length
+            this.dataLists = response.data
           }
-        });
-        resolve();
-      });
+        })
+        resolve()
+      })
     },
     // 导入运单号
     btn_import_waybill_number() {
@@ -243,11 +189,11 @@ export default {
         content: {
           content: importWaybillnumber, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: "" } // props
+          data: { rowid: "" }, // props
         },
         area: ["30%", "30%"],
-        title: "导入运单号"
-      });
+        title: "导入运单号",
+      })
     },
     // 详情
     btn_after_sale_detail(editId) {
@@ -255,11 +201,11 @@ export default {
         content: {
           content: afterSaleDetail, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: editId } // props
+          data: { rowid: editId }, // props
         },
         area: ["80%", "90%"],
-        title: "售后列表详情"
-      });
+        title: "售后列表详情",
+      })
     },
     // 运单号
     btn_waybill_number(id) {
@@ -267,93 +213,93 @@ export default {
         content: {
           content: waybillnumber, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: id } // props
+          data: { rowid: id }, // props
         },
         area: ["30%", "30%"],
-        title: "运单号"
-      });
+        title: "运单号",
+      })
     },
     btn_delete(id) {
       this.$confirm("您确定删除吗?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
           const data = {
-            ids: id
-          };
-          deleteAfterSaleList(data).then(response => {
+            ids: id,
+          }
+          deleteAfterSaleList(data).then((response) => {
             if (response.state.toLowerCase() === "success") {
-              this.getList();
-              this.$message.success("删除成功!");
+              this.getList()
+              this.$message.success("删除成功!")
             }
-          });
+          })
         })
         .catch(() => {
-          this.$message.info("已取消删除");
-        });
+          this.$message.info("已取消删除")
+        })
     },
     btn_search() {
-      this.pageParams.pageindex = 1;
-      this.getList();
+      this.pageParams.pageindex = 1
+      this.getList()
     },
     hadndleOrderCode(ordercode) {
       this.$layer.iframe({
         content: {
           content: detail, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: ordercode } // props
+          data: { rowid: ordercode }, // props
         },
         area: ["80%", "90%"],
-        title: "订单详情"
-      });
+        title: "订单详情",
+      })
     },
     handleTabClick() {
-      this.pageParams.pageindex = 1;
+      this.pageParams.pageindex = 1
       if (this.activeName === "0") {
-        this.searchData.checkState = "0";
+        this.searchData.checkState = "0"
       } else if (this.activeName === "1") {
-        this.searchData.checkState = "1";
+        this.searchData.checkState = "1"
       } else if (this.activeName === "2") {
-        this.searchData.checkState = "2";
+        this.searchData.checkState = "2"
       } else {
-        this.searchData.checkState = "-2";
+        this.searchData.checkState = "-2"
       }
-      this.getList();
+      this.getList()
     },
     // 选择多个
     handleSelectionChange(val) {
-      const ids = [];
-      this.multipleSelection = val;
+      const ids = []
+      this.multipleSelection = val
       for (let i = 0; i < this.multipleSelection.length; i++) {
-        ids.push(this.multipleSelection[i].id);
+        ids.push(this.multipleSelection[i].id)
       }
-      this.selectedPhone = ids;
+      this.selectedPhone = ids
     },
     authority_edit(checkStateSH) {
       if (checkStateSH == 0 || checkStateSH == 2) {
-        return true;
+        return true
       } else {
-        return false;
+        return false
       }
     },
     authority_delete(checkStateSH) {
       if (checkStateSH == 0 || checkStateSH == 2) {
-        return true;
+        return true
       } else {
-        return false;
+        return false
       }
     },
     authority_waybill_number(returnType) {
       if (returnType == "改代收") {
-        return true;
+        return true
       } else {
-        return false;
+        return false
       }
-    }
-  }
-};
+    },
+  },
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

CallCenterWeb.UI/src/views/taskManagement/taskList/common/detail.vue

@@ -5,36 +5,22 @@
         <el-card shadow="hover">
           <el-col :md="21">
             <h1 class="title"><svg-icon class="title_icon" icon-class="hongqi" />任务信息</h1>
-            <p class="title_sub"><span class="green">{{ name }}</span> 	足力健 </p>
+            <p class="title_sub">
+              <span class="green">{{ name }}</span> 足力健
+            </p>
           </el-col>
           <el-col :md="24" class="order_detail_content">
-            <el-col :md="6" class="order_detail_item">
-              任务名称：{{ name }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              任务人：{{ taskName }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              目标金额：{{ targetAmount }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              任务进度：{{ taskProgress }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              开始时间：{{ startTime }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              结束时间：{{ endTime }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              任务内容：{{ content }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              任务状态：{{ state }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              任务类型：{{ type }}
-            </el-col>
+            <el-col :md="6" class="order_detail_item"> 任务名称：{{ name }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 中心：{{ teamName }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 小组：{{ groupName }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 任务人：{{ taskName }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 目标金额：{{ targetAmount }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 任务进度：{{ taskProgress }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 开始时间：{{ startTime }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 结束时间：{{ endTime }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 任务内容：{{ content }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 任务状态：{{ state }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 任务类型：{{ type }} </el-col>
           </el-col>
         </el-card>
       </el-col>
@@ -59,40 +45,40 @@
 </template>
 
 <script>
-import { getTask} from '@/api/taskManagement/taskManagement'
-import { mapGetters } from 'vuex'
-import { filterContent } from '@/utils'
+import { getTask } from "@/api/taskManagement/taskManagement"
+import { mapGetters } from "vuex"
+import { filterContent } from "@/utils"
 
 export default {
-  name: 'Detail',
+  name: "Detail",
   props: {
     rowid: {
       type: String,
-      default: ''
+      default: "",
     },
     layerid: {
       type: String,
-      default: ''
-    }
+      default: "",
+    },
   },
   data() {
     return {
-        activeName:0,
-        name:'',
-        taskName:'',
-        targetAmount:'',
-        taskProgress:'',
-        startTime:'',
-        endTime:'',
-        content:'',
-        state:'',
-        type:'',
+      activeName: 0,
+      name: "",
+      teamName: "",
+      groupName: "",
+      taskName: "",
+      targetAmount: "",
+      taskProgress: "",
+      startTime: "",
+      endTime: "",
+      content: "",
+      state: "",
+      type: "",
     }
   },
   computed: {
-    ...mapGetters([
-      'avatar'
-    ])
+    ...mapGetters(["avatar"]),
   },
   created() {
     if (this.rowid) {
@@ -105,178 +91,180 @@ export default {
     },
     // 获取详情
     getDetail(rid) {
-      getTask(rid).then(response => {
-        if (response.state.toLowerCase() === 'success') {
+      getTask(rid).then((response) => {
+        if (response.state.toLowerCase() === "success") {
           const res = response.data
           this.name = res.F_Name
+          this.teamName = res.F_TeamName
+          this.groupName = res.F_GroupName
           this.taskName = res.F_TaskerName
           this.targetAmount = res.F_Money
           this.startTime = res.F_StartTime
           this.endTime = res.F_EndTime
-          this.taskProgress = res.F_Taskprogress?res.F_Taskprogress+'%':''
+          this.taskProgress = res.F_Taskprogress ? res.F_Taskprogress + "%" : ""
           this.content = res.F_Content
-          if(res.F_State==0){
-              this.state='开始'
-          }else if(res.F_State==1){
-              this.state='暂停'
-          }else{
-              this.state='终止'
+          if (res.F_State == 0) {
+            this.state = "开始"
+          } else if (res.F_State == 1) {
+            this.state = "暂停"
+          } else {
+            this.state = "终止"
           }
-          if(res.F_Type==0){
-              this.type='日任务'
-          }else if(res.F_Type==1){
-              this.type='周任务'
-          }else{
-              this.type='月任务'
+          if (res.F_Type == 0) {
+            this.type = "日任务"
+          } else if (res.F_Type == 1) {
+            this.type = "周任务"
+          } else {
+            this.type = "月任务"
           }
         }
       })
     },
-  }
+  },
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-	.order_detail{
-		.el-col{
-			margin-bottom: 20px;
-		}
-		.el-icon-time{
-			color: #d81e06;
-		}
-		.el-card__header{
-			padding-top: 14px;
-			padding-bottom: 14px;
-			background-color: #F5F5F6;
-		}
-		.order_file{
-			.el-card__body{
-				padding: 22px 0 0 0;
-				text-align: center;
-			}
-		}
-		.order_steps{
-			.el-step__icon-inner{
-				display: none;
-			}
-		}
-		.order_record {
-			.el-card__body{
-				padding: 0;
-			}
-			.el-tabs__header{
-				padding: 0px 20px;
-				background-color: #F5F5F6;
-					.el-tabs__item{
-						font-size: 16px;
-						height: 47px;
-						line-height: 47px;
-					}
-			}
-		}
-	}
+.order_detail {
+  .el-col {
+    margin-bottom: 20px;
+  }
+  .el-icon-time {
+    color: #d81e06;
+  }
+  .el-card__header {
+    padding-top: 14px;
+    padding-bottom: 14px;
+    background-color: #f5f5f6;
+  }
+  .order_file {
+    .el-card__body {
+      padding: 22px 0 0 0;
+      text-align: center;
+    }
+  }
+  .order_steps {
+    .el-step__icon-inner {
+      display: none;
+    }
+  }
+  .order_record {
+    .el-card__body {
+      padding: 0;
+    }
+    .el-tabs__header {
+      padding: 0px 20px;
+      background-color: #f5f5f6;
+      .el-tabs__item {
+        font-size: 16px;
+        height: 47px;
+        line-height: 47px;
+      }
+    }
+  }
+}
 </style>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-	.order_detail{
-		.order_detail_body{
-			margin-bottom: 20px;
-			.round_img{
-				width: 90px;
-				height: 90px;
-				border-radius: 50%;
-				overflow: hidden;
-				margin: 14px;
-				img{
-					width: 100%;
-					height: 100%;
-				}
-			}
-			.title{
-				font-size: 20px;
-				.title_icon{
-					color: #d81e06;
-					font-size: 16px;
-					margin-right: 20px;
-				}
-			}
-			.title_sub{
-				font-size: 14px;
-				color: #666666;
-			}
-			.order_detail_content{
-				background-color: #F5F5F6;
-				padding-top: 20px;
-				color: #4c4c4c;
-				font-size: 14px;
-				.order_detail_item{
-					margin-bottom: 10px;
-					.order_content{
-						margin-top: 10px;
-					}
-					.order_file {
-						position: relative;
-						cursor: pointer;
-						.img_mask {
-							display: none;
-							position: absolute;
-							left: 0px;
-							top: 0px;
-							background-color: rgba(0, 0, 0, 0.3);
-							width: 100%;
-							height: 22px;
-							text-align: right;
-							z-index: 1;
-							i {
-								font-size: 20px;
-								line-height: 22px;
-								display: inline-block;
-								margin-right: 15px;
-								color: #fff;
-							}
-						}
-						p {
-							margin-top: 5px;
-							padding-left: 14px;
-							padding-right: 14px;
-							white-space: nowrap;
-							overflow: hidden;
-							text-overflow: ellipsis;
-						}
-						.file_icon{
-							height: 68px;
-							line-height: 68px;
-							font-size: 68px;
-							color: #409EFF;
-						}
-					}
-					.order_file:hover .img_mask {
-						display: block;
-					}
-				}
-			}
-		}
-		.green {
-			color: #00c1de;
-		}
-		.done {
-			color: #198120;
-		}
-		.red {
-			color: #d81e06;
-		}
-		.yellow{
-			color: #e6a23c;
-		}
-		.order_steps{
-			// height: 240px;
-			.el-step__icon-inner{
-				display: none;
-			}
-		}
+.order_detail {
+  .order_detail_body {
+    margin-bottom: 20px;
+    .round_img {
+      width: 90px;
+      height: 90px;
+      border-radius: 50%;
+      overflow: hidden;
+      margin: 14px;
+      img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .title {
+      font-size: 20px;
+      .title_icon {
+        color: #d81e06;
+        font-size: 16px;
+        margin-right: 20px;
+      }
+    }
+    .title_sub {
+      font-size: 14px;
+      color: #666666;
+    }
+    .order_detail_content {
+      background-color: #f5f5f6;
+      padding-top: 20px;
+      color: #4c4c4c;
+      font-size: 14px;
+      .order_detail_item {
+        margin-bottom: 10px;
+        .order_content {
+          margin-top: 10px;
+        }
+        .order_file {
+          position: relative;
+          cursor: pointer;
+          .img_mask {
+            display: none;
+            position: absolute;
+            left: 0px;
+            top: 0px;
+            background-color: rgba(0, 0, 0, 0.3);
+            width: 100%;
+            height: 22px;
+            text-align: right;
+            z-index: 1;
+            i {
+              font-size: 20px;
+              line-height: 22px;
+              display: inline-block;
+              margin-right: 15px;
+              color: #fff;
+            }
+          }
+          p {
+            margin-top: 5px;
+            padding-left: 14px;
+            padding-right: 14px;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+          .file_icon {
+            height: 68px;
+            line-height: 68px;
+            font-size: 68px;
+            color: #409eff;
+          }
+        }
+        .order_file:hover .img_mask {
+          display: block;
+        }
+      }
+    }
+  }
+  .green {
+    color: #00c1de;
+  }
+  .done {
+    color: #198120;
+  }
+  .red {
+    color: #d81e06;
+  }
+  .yellow {
+    color: #e6a23c;
+  }
+  .order_steps {
+    // height: 240px;
+    .el-step__icon-inner {
+      display: none;
+    }
+  }
 
-		.tab_body{
-			padding: 0 20px 20px 20px;
-		}
-	}
+  .tab_body {
+    padding: 0 20px 20px 20px;
+  }
+}
 </style>

CallCenterWeb.UI/src/views/taskManagement/taskList/index.vue

@@ -20,6 +20,8 @@
       <el-table-column prop="F_DeptName" label="部门名称" align="center" min-width="" />
       <el-table-column prop="F_ParentName" label="父级任务名称" align="center" min-width="" />
       <el-table-column prop="F_Name" label="任务名称" align="center" min-width="" />
+      <el-table-column prop="F_TeamName" label="中心" align="center" min-width="" />
+      <el-table-column prop="F_GroupName" label="小组" align="center" min-width="" />
       <el-table-column prop="F_TaskerName" label="任务人" align="center" min-width="" />
       <el-table-column prop="F_Money" label="目标金额" align="center" min-width="" />
       <el-table-column label="任务进度" align="center">

CallCenterWeb.UI/src/views/telCall/numberTransferPool/index.vue

@@ -120,8 +120,8 @@ export default {
           pagesize: this.pageParams.pagesize, // 每页几条信息
           name: this.searchData.name.replace(/\s+/g, ""), //媒体中转池
           dept: this.parentids[this.parentids.length - 1], //部门
-          team: this.groupid, //中心
-          group: this.deptteamid, //小组
+          team: this.deptteamid, //中心
+          group: this.groupid, //小组
           type: this.activeName, //媒体中转
         }
         getNumberTransferPoolList(params).then((response) => {
@@ -146,7 +146,7 @@ export default {
           data: { rowid: "" }, // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
         },
         area: ["60%", "90%"],
-        title: "添加用户信息",
+        title: "添加",
       })
     },
     btn_edit(editId) {
@@ -174,13 +174,13 @@ export default {
     },
     //批量分配
     btn_batch_distribution() {
-      // if (this.selectTableId.length < 1) {
-      //   this.$message({
-      //     message: "请选择数据！",
-      //     type: "warning",
-      //   })
-      //   return
-      // }
+      if (this.selectTableId.length < 1) {
+        this.$message({
+          message: "请选择数据！",
+          type: "warning",
+        })
+        return
+      }
       const ids = this.selectTableId.join(",").replace(/\s+/g, "")
       this.$layer.iframe({
         content: {
@@ -245,7 +245,7 @@ export default {
       const ids = []
       this.multipleSelection = val
       for (let i = 0; i < this.multipleSelection.length; i++) {
-        ids.push(this.multipleSelection[i].F_Id)
+        ids.push(this.multipleSelection[i].F_ID)
       }
       this.selectTableId = ids
     },