问题修改

CallCenterWeb.UI/config/prod.env.js

@@ -3,7 +3,7 @@
 module.exports = {
   NODE_ENV: '"production"',
   ENV_CONFIG: '"prod"',
-  BASE_API: '"http://117.160.143.199:1029/"', // 生产环境API
+  BASE_API: '"http://36.99.161.186:1028/"', // 生产环境API
   SOCKET_IP: '"36.99.169.138"', // WebSocket通讯ip
   SOCKET_PORT: '"9000"', // WebSocket通讯端口
   LineChat_SOCKET_IP: '"192.168.5.42"', // 在线客服WebSocket通讯ip

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

@@ -7,8 +7,8 @@
       <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="2"></el-option>
-          <el-option label="部分退货" value="3"></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> -->

CallCenterWeb.UI/src/views/afterSaleManagement/afterSaleListNotPass/failed.vue

@@ -0,0 +1,85 @@
+<template>
+  <div>
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="order_form">
+      <el-form-item label="状态" prop="Failed">
+        <el-select
+          v-model="ruleForm.Failed"
+          class="form_select"
+          filterable
+          clearable
+          placeholder="请选择状态"
+        >
+          <el-option label="原返" value="1"></el-option>
+          <el-option label="入残" value="2"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="备注" prop="FailedRemark">
+        <el-input v-model="ruleForm.FailedRemark" type="textarea" placeholder="备注"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm()">提交</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+import { operatingFailedAfterSaleCustodian } from "@/api/custodianManagement/orderListCustodian";
+import failed from './failed'
+export default {
+  props: {
+    rowid: {
+      type: String,
+      default: "",
+    },
+    layerid: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      ruleForm: {
+        id: "", //订单编号
+        Failed: "", //状态
+        FailedRemark: "",
+      },
+      rules: {
+        Failed: [{
+          required: true,
+          trigger: 'change',
+          message: '请选择状态',
+        }],
+      },
+    };
+  },
+  created() {
+    if (this.rowid) {
+      this.ruleForm.id = this.rowid;
+    }
+  },
+  methods: {
+    submitForm() {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          operatingFailedAfterSaleCustodian(this.ruleForm)
+          .then((response) => {
+            if (response.state.toLowerCase() === "success") {
+              this.$parent.$layer.close(this.layerid);
+              this.$parent.getList(); // 重新加载父级数据
+              this.$message.success(response.message);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+        }
+      })
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.form_select {
+  width: 100%;
+}
+</style>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-select v-model="searchData.checkState" class="filter-item" filterable clearable placeholder="请选择售后审核状态">
+      <el-select v-model="searchData.checkState" class="filter-item" filterable placeholder="请选择售后审核状态">
         <el-option label="全部" value="-2"/>
         <el-option label="保存" value="0"/>
         <el-option label="审核通过" value="1"/>
@@ -17,6 +17,11 @@
         <el-option label="错发" value="7"/>
         <!-- <el-option label="漏发" value="8"/> -->
       </el-select>
+      <el-select v-model="searchData.failed" class="filter-item" filterable clearable placeholder="请选择状态">
+        <el-option label="全部" value="0"/>
+        <el-option label="原返" value="1"/>
+        <el-option label="入残" value="2"/>
+      </el-select>
       <el-input v-model="searchData.user" class="filter-item" placeholder="请输入工号"></el-input>
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
     </div>
@@ -31,12 +36,21 @@
           <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 label="状态" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.F_Failed | judgmentFailed }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="F_FailedRemark" label="操作备注" align="center" />
+      <el-table-column prop="F_CustomerPhone" label="手机号码" align="center" min-width="140">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_AboutOrderId)">{{ scope.row.F_AboutOrderId }}</el-button>
+          {{ scope.row.F_CustomerPhone}}
+          <i
+            class="el-icon-phone phoneIcon"
+            @click="clickCallOut(scope.row.F_CustomerPhone)"
+          ></i>
         </template>
       </el-table-column>
-      <el-table-column prop="F_CustomerPhone" label="客户电话" align="center" />
       <el-table-column label="售后类型" align="center">
         <template slot-scope="scope">
           {{ scope.row.F_Type | judgmentStateName }}
@@ -55,13 +69,12 @@
       <el-table-column prop="F_Money" 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_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_failed'" type="text" @click="btn_failed(scope.row.F_Id)">操作</el-button>
         </template>
-      </el-table-column> -->
+      </el-table-column>
     </el-table>
     <!-- <pagination
       v-show="pageParams.total > 0"
@@ -78,11 +91,15 @@
 import { getDictionaryValueList } from '@/api/commonAPI'
 import { getAfterSaleList, deleteAfterSaleList } from '@/api/afterSaleManagement/afterSaleList'
 import { pickerOptions, formatterContent } from '@/utils'
-import { mapGetters } from 'vuex'
+import { Send } from "@/utils/telWebsocket";
+import { getCallOutprefix } from "@/api/teloperation";
+import { mapGetters } from "vuex";
+import store from "@/store";
+
 import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
-// import addOrEdit from './addOrEdit'
 import afterSaleDetail from '@/views/afterSaleManagement/afterSaleList/afterSaleDetail'
 import detail from '@/views/orderManagement/orderList/detail'
+import failed from './failed'
 
 export default {
   name: 'ConsolidateOrderList',
@@ -90,6 +107,13 @@ export default {
     Pagination
   },
   filters: {
+    judgmentFailed(status) {
+      const statusMap = {
+        '1': '原返',
+        '2': '入残',
+      }
+      return statusMap[status]
+    },
     judgmentStateName(status) {
       const statusMap = {
         '1': '调换货',
@@ -126,6 +150,7 @@ export default {
         checkState: '-2', // 售后审核状态
         type: '', // 售后类型
         user: '', // 工号
+        failed: '', // 入残
       },
       pickerOptions, // 日期数据
       pageParams: {
@@ -148,7 +173,14 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'username', // 坐席工号
+      "username", // 坐席工号
+      "usercode", // 工号
+      "extension", // 分机号
+      "sidebar",
+      "avatar",
+      "telCallType", // 通话类型
+      "telIsVisCallout", // 外呼面板是否显示
+
     ]),
   },
   methods: {
@@ -165,6 +197,7 @@ export default {
           pagesize: 1000000, // int 每页几条信息
           F_PayState: '-2',
           F_CheckStateKG: 2, //仓库未通过
+          F_Failed: this.searchData.failed, 
         }
         getAfterSaleList(params).then(response => {
           this.loading = false
@@ -188,35 +221,16 @@ export default {
         title: '售后列表详情'
       })
     },
-    // 编辑
-    btn_edit(editId) {
+    // 操作
+    btn_failed(id) {
       this.$layer.iframe({
         content: {
-          content: addOrEdit, // 传递的组件对象
+          content: failed, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: editId } // props
+          data: { rowid: id } // props
         },
-        area: ['80%', '90%'],
-        title: '编辑售后'
-      })
-    },
-    btn_delete(id) {
-      this.$confirm('您确定删除吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        const data = {
-          ids: id
-        }
-        deleteAfterSaleList(data).then(response => {
-          if (response.state.toLowerCase() === 'success') {
-            this.getList()
-            this.$message.success('删除成功!')
-          }
-        })
-      }).catch(() => {
-        this.$message.info('已取消删除')
+        area: ['30%', '40%'],
+        title: '操作'
       })
     },
     btn_search() {
@@ -256,7 +270,37 @@ export default {
       } else {
         return false
       }
-    }
+    },
+    //外呼
+    clickCallOut(phoneNumber) {
+      this.callOut(phoneNumber);
+    },
+    // 外呼
+    callOut(phoneNumber) {
+      if (phoneNumber) {
+        getCallOutprefix(phoneNumber).then((response) => {
+          if (response.state.toLowerCase() === "success") {
+            const res = response.data;
+            this.scoketDatas = {
+              Type: "MakeCall",
+              AgentID: this.usercode,
+              AgentExten: this.extension,
+              Header: res.fix, // 号码前缀 用于截断前缀得到真实号码
+              DestinationNumber: res.phone, //
+            };
+            store.dispatch("ChangeCallNum", phoneNumber);
+            Send(this.scoketDatas);
+            store.dispatch("UpdateCalloutScreen", false); // 关闭外呼面板
+            store.dispatch("UpdateOutboundScreen", false); // 关闭外呼弹屏
+          }
+        });
+      } else {
+        this.$message({
+          message: "请先输入电话号码！",
+          type: "warning",
+        });
+      }
+    },
   }
 }
 </script>
@@ -265,4 +309,7 @@ export default {
 .el{
   cursor: pointer;
 }
+.phoneIcon {
+  cursor: pointer;
+}
 </style>

CallCenterWeb.UI/src/views/afterSaleManagement/saleOrderList/components/addOrEditRemark.vue

@@ -0,0 +1,92 @@
+<template>
+  <div>
+    <el-form ref="ruleForm" :model="ruleForm" label-width="80px">
+      <!-- <el-form-item label="是否可见">
+        <el-select v-model="ruleForm.F_IsSo" class="form_select" filterable clearable placeholder="是否可见" >
+          <el-option label="否" value="0"></el-option>
+          <el-option label="是" value="1"></el-option>
+        </el-select>
+      </el-form-item> -->
+      <el-form-item label="备注内容">
+        <el-input v-model="ruleForm.F_Content" type="textarea" placeholder="备注内容"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm()">提交</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+import { addAfterSaleListChatLog, editAfterSaleListChatLog } from "@/api/afterSaleManagement/afterSaleList";
+export default {
+  props: {
+    rowid: {
+      type: Number,
+      default: 0,
+    },
+    layerid: {
+      type: String,
+      default: "",
+    },
+    remarkId: {
+      type: String,
+      default: "",
+    }
+  },
+  data() {
+    return {
+      ruleForm: {
+        F_ID: "", // id
+        F_WoID: "", //订单编号
+        F_IsSo: 1, // 是否可见  0-否 1-是
+        F_Content: '', // 备注内容
+        F_State: 1,
+      },
+    };
+  },
+  created() {
+    if (this.rowid) {
+      this.ruleForm.F_WoID = this.rowid
+      if (this.remarkId) {
+        this.ruleForm.F_ID = this.remarkId
+      }
+    }
+  },
+  methods: {
+    submitForm() {
+      //添加
+      if (!this.ruleForm.F_ID) {
+        addAfterSaleListChatLog(this.ruleForm)
+          .then((response) => {
+            if (response.state.toLowerCase() === "success") {
+              this.$parent.$layer.close(this.layerid);
+              this.$parent.getList(); // 重新加载父级数据
+              this.$message.success("添加成功!");
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+        return
+      }
+      //编辑
+      editAfterSaleListChatLog(this.ruleForm)
+        .then((response) => {
+          if (response.state.toLowerCase() === "success") {
+            this.$parent.$layer.close(this.layerid);
+            this.$parent.getDetail(this.ruleForm.F_WoID); // 重新加载父级数据
+            this.$message.success("编辑成功!");
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.form_select{
+  width: 100%;
+}
+</style>

CallCenterWeb.UI/src/views/afterSaleManagement/saleOrderList/components/detail.vue

@@ -285,6 +285,15 @@
             />
           </div>
         </el-tab-pane>
+        <el-tab-pane label="备注" name="fifth">
+          <div class="tab_body">
+            <el-table :data="remarkDataLists" border stripe>
+              <el-table-column prop="F_Content" label="备注内容" align="center"></el-table-column>
+              <el-table-column prop="F_AddTime" label="添加时间" align="center"></el-table-column>
+              <el-table-column prop="F_AddUserName" label="创建人" align="center"></el-table-column>
+            </el-table>
+          </div>
+        </el-tab-pane>
       </el-tabs>
     </el-card>
 
@@ -301,6 +310,8 @@ import { getCallRecords } from '@/api/trafficData/trafficData'
 import audioPlayer from '@/components/audioPlayer'
 import { getFileTranserLists } from '@/api/memberManagement/memberList'
 import afterSale from '@/views/afterSaleManagement/addAfterSale/afterSale'
+import { getChatLogList } from '@/api/afterSaleManagement/afterSaleList'
+
 
 export default {
   name: 'Detail',
@@ -467,6 +478,7 @@ export default {
       dataLists: [], // 列表数据
       workOrderCirculationList: [],
       workOrderCirculationList2: [],
+      remarkDataLists: [], //备注数据列表
       calldataLists: [], // 通话记录列表数据
       filedataLists: [], // 档案转移记录列表数据
       pageParams: {
@@ -499,6 +511,7 @@ export default {
   created() {
     this.getCallList()
     this.getList()
+    this.getRemarkList()
     if (this.rowid) {
       this.getDetail(this.rowid)
     }
@@ -600,6 +613,23 @@ export default {
         resolve()
       })
     },
+    //备注列表
+    getRemarkList () {
+      this.loading = true
+      return new Promise(resolve => {
+        const params = {
+          woid: this.rowid,
+          state: 1, //	否	string	模糊查询（呼叫号码）
+        }
+        getChatLogList(params).then(response => {
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            this.remarkDataLists = response.rows.Rows
+          }
+        })
+        resolve()
+      })
+    },
     // 通话记录列表
     getCallList() {
       this.loading = true

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

@@ -188,6 +188,11 @@
             @click="btn_edit(scope.row.F_ID)"
           >编辑</el-button
           >
+          <el-button 
+            v-permission="'HY_add_remark'" 
+            type="text" 
+            @click="btn_add_remark(scope.row.F_ID)"
+          >备注</el-button>
           <el-button
             v-permission="'HY_delete'"
             type="text"
@@ -227,6 +232,7 @@ import afterSale from './components/afterSale'
 import { formatterContent } from '@/utils'
 import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
 import mergeId from './components/mergeId'
+import addOrEditRemark from "./components/addOrEditRemark"
 export default {
   name: 'MemberLabel',
   components: {
@@ -569,6 +575,18 @@ export default {
           this.$message.info('已取消删除')
         })
     },
+    // 添加备注
+    btn_add_remark(id) {
+      this.$layer.iframe({
+        content: {
+          content: addOrEditRemark, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: id } // props
+        },
+        area: ["40%", "50%"],
+        title: "添加备注"
+      });
+    },
     changeSelects(val) {
       const ids = []
       const names = []

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

@@ -1,11 +1,12 @@
 <template>
   <div v-loading="loading">
     <el-table :data="dataLists" border stripe>
-      <el-table-column prop="F_IsSo" label="是否可见" align="center">
+      <el-table-column prop="F_Content" label="备注内容" align="center"></el-table-column>
+      <!-- <el-table-column prop="F_IsSo" label="是否可见" align="center">
         <template slot-scope="scope">
           {{ scope.row.F_IsSo | judgmentIsSo}}
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column prop="F_AddTime" label="添加时间" align="center"></el-table-column>
       <el-table-column prop="F_AddUserName" label="创建人" align="center"></el-table-column>
       <!-- <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
@@ -15,7 +16,7 @@
         </template>
       </el-table-column> -->
     </el-table>
-    <pagination
+    <!-- <pagination
       v-show="pageParams.total > 0"
       :total="pageParams.total"
       :pageindex.sync="pageParams.pageindex"
@@ -23,7 +24,7 @@
       :auto-scroll="false"
       class="pagination"
       @pagination="getList"
-    />
+    /> -->
   </div>
 </template>
 
@@ -77,15 +78,15 @@ export default {
       this.loading = true
       return new Promise(resolve => {
         const params = {
-          pageindex: this.pageParams.pageindex, // 第几页
-          pagesize: this.pageParams.pagesize, // 每页几条信息
+          // pageindex: this.pageParams.pageindex, // 第几页
+          // pagesize: this.pageParams.pagesize, // 每页几条信息
           woid: this.customerId,
           state: 1, //	否	string	模糊查询（呼叫号码）
         }
         getChatLogList(params).then(response => {
           this.loading = false
           if (response.state.toLowerCase() === 'success') {
-            this.pageParams.total = response.Totals
+            // this.pageParams.total = response.total
             this.dataLists = response.rows.Rows
           }
         })

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

@@ -72,7 +72,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_failed'" type="text" @click="btn_failed(scope.row.F_Id)">操作</el-button>
+          <!-- <el-button v-permission="'HY_failed'" type="text" @click="btn_failed(scope.row.F_Id)">操作</el-button> -->
         </template>
       </el-table-column>
     </el-table>

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

@@ -78,6 +78,7 @@
         filterable
         clearable
         placeholder="请选择仓库"
+        @change="changeStock"
       >
         <el-option
           v-for="item in warehouseNameList"
@@ -221,6 +222,7 @@ export default {
     return {
       loading: false,
       warehouseNameList: [], // 仓库名称
+      logisticsStock: '', // 物流仓库
       searchData: {
         adFrom: '', //消息/广告媒体来源
         type: '', //订单类型
@@ -418,7 +420,7 @@ export default {
         content: {
           content: logistics, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: orderids, stock: "" } // props
+          data: { rowid: orderids, stock: this.logisticsStock } // props
         },
         area: ["30%", "30%"],
         title: "物流"
@@ -556,6 +558,9 @@ export default {
       }
       return data
     },
+    changeStock(val) {
+      this.logisticsStock = val
+    },
   }
 };
 </script>

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

@@ -1,12 +1,12 @@
 <template>
   <div>
     <el-form ref="ruleForm" :model="ruleForm" label-width="80px">
-      <el-form-item label="是否可见">
+      <!-- <el-form-item label="是否可见">
         <el-select v-model="ruleForm.F_IsSo" class="form_select" filterable clearable placeholder="是否可见" >
           <el-option label="否" value="0"></el-option>
           <el-option label="是" value="1"></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="备注内容">
         <el-input v-model="ruleForm.F_Content" type="textarea" placeholder="备注内容"></el-input>
       </el-form-item>
@@ -21,8 +21,8 @@ import { addAfterSaleListChatLog, editAfterSaleListChatLog } from "@/api/afterSa
 export default {
   props: {
     rowid: {
-      type: String,
-      default: "",
+      type: Number,
+      default: 0,
     },
     layerid: {
       type: String,
@@ -38,7 +38,7 @@ export default {
       ruleForm: {
         F_ID: "", // id
         F_WoID: "", //订单编号
-        F_IsSo: '', // 是否可见
+        F_IsSo: 1, // 是否可见  0-否 1-是
         F_Content: '', // 备注内容
         F_State: 1,
       },

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

@@ -286,6 +286,15 @@
             />
           </div>
         </el-tab-pane>
+        <el-tab-pane label="备注" name="fifth">
+          <div class="tab_body">
+            <el-table :data="remarkDataLists" border stripe>
+              <el-table-column prop="F_Content" label="备注内容" align="center"></el-table-column>
+              <el-table-column prop="F_AddTime" label="添加时间" align="center"></el-table-column>
+              <el-table-column prop="F_AddUserName" label="创建人" align="center"></el-table-column>
+            </el-table>
+          </div>
+        </el-tab-pane>
       </el-tabs>
     </el-card>
 
@@ -302,6 +311,7 @@ import { getCallRecords } from '@/api/trafficData/trafficData'
 import audioPlayer from '@/components/audioPlayer'
 import { getFileTranserLists } from '@/api/memberManagement/memberList'
 import afterSale from './afterSale'
+import { getChatLogList } from '@/api/afterSaleManagement/afterSaleList'
 
 export default {
   name: 'Detail',
@@ -470,6 +480,7 @@ export default {
       filedataLists: [], // 档案转移记录列表数据
       workOrderCirculationList: [],
       workOrderCirculationList2: [],
+      remarkDataLists: [], //备注数据列表
       pageParams: {
         pageindex: 1, // 当前第几页
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
@@ -500,6 +511,7 @@ export default {
   created() {
     this.getCallList()
     this.getList()
+    this.getRemarkList()
     if (this.rowid) {
       this.getDetail(this.rowid)
     }
@@ -601,6 +613,23 @@ export default {
         resolve()
       })
     },
+    //备注列表
+    getRemarkList () {
+      this.loading = true
+      return new Promise(resolve => {
+        const params = {
+          woid: this.rowid,
+          state: 1, //	否	string	模糊查询（呼叫号码）
+        }
+        getChatLogList(params).then(response => {
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            this.remarkDataLists = response.rows.Rows
+          }
+        })
+        resolve()
+      })
+    },
     // 通话记录列表
     getCallList() {
       this.loading = true

CallCenterWeb.UI/src/views/memberManagement/memberList/index.vue

@@ -242,7 +242,7 @@ import addTodo from './components/addTodo'
 import detail from './components/detail'
 import transfer from './components/transfer'
 import addOrder from './components/addOrder'
-import addOrEditRemark from "./components/addOrEditRemark";
+import addOrEditRemark from "./components/addOrEditRemark"
 import { formatterContent } from '@/utils'
 import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
 import mergeId from './components/mergeId'

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

@@ -87,11 +87,11 @@
             <el-col :md="24" v-if="isChatList">
               <el-table :data="ChatList" stripe border style="width: 100%">
                 <el-table-column prop="F_Content" label="备注内容" align="center"></el-table-column>
-                <el-table-column prop="F_IsSo" label="是否可见" align="center">
+                <!-- <el-table-column prop="F_IsSo" label="是否可见" align="center">
                   <template slot-scope="scope">
                     {{ scope.row.F_IsSo | judgmentIsSo}}
                   </template>
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column prop="F_AddTime" label="添加时间" align="center"></el-table-column>
                 <el-table-column prop="F_AddUserName" label="创建人" align="center"></el-table-column>
                 <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">

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

@@ -14,6 +14,11 @@
       <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">
+      <el-tab-pane label="未审核" name="0"></el-tab-pane>
+      <el-tab-pane label="已审核" name="1"></el-tab-pane>
+      <el-tab-pane label="未通过" name="2"></el-tab-pane>
+    </el-tabs>
     <div>
       <span>订单数量：{{ pageParams.total }}</span>
     </div>
@@ -124,13 +129,13 @@ export default {
     return {
       loading: false,
       searchData: {
-        checkState: '-2', // 售后审核状态
+        checkState: '0', // 售后审核状态
         type: '', // 售后类型
         isSignfor: '', // 是否签入
         woState: '',  // 是否提交
         returnType: '', // 退回状态
       },
-      activeName: '-2',
+      activeName: '0',
       pickerOptions, // 日期数据
       pageParams: {
         pageindex: 1, // 当前第几页
@@ -246,6 +251,19 @@ export default {
         title: '订单详情'
       })
     },
+    handleTabClick() {
+      this.pageParams.pageindex=1
+      if (this.activeName === "0") {
+        this.searchData.checkState = "0"
+      } else if (this.activeName === "1") {
+        this.searchData.checkState = "1"
+      } else if (this.activeName === "2") {
+        this.searchData.checkState = "2"
+      } else {
+        this.searchData.checkState = "-2"
+      }
+      this.getList();
+    },
     // 选择多个
     handleSelectionChange(val) {
       const ids = []