问题修改

CallCenterWeb.UI/src/components/TopNotice/index.vue

@@ -7,7 +7,7 @@
       <ul v-if="topNoticeData.length" class="content">
         <li v-for="(item, index) in topNoticeData" :key="index" class="proitem">
           <h5 class="proname">标题：{{ item.SMS_Title }}</h5>
-          <span class="orderendtime" :title=item.SMS_Content>内容：{{ item.SMS_Content }}</span>
+          <span class="orderendtime" :title="item.SMS_Content">内容：{{ item.SMS_Content }}</span>
           <el-button class="unread" @click="handleChange(item.SMS_Id)">未读</el-button>
         </li>
       </ul>
@@ -25,13 +25,13 @@
 
 <script>
 // import { getNotice, getSchedule } from '@/api/customer/customerInfoHY'
-import { getFileTranserLists } from "@/api/memberManagement/memberList";
-import { getMsg, getReadData } from "@/api/commonAPI";
-import daibangdetail from "@/views/todoManagement/todoList/detail";
-import orderDetail from "@/views/orderManagement/orderList/detail";
-import taskDetail from "@/views/taskManagement/taskList/common/detail";
-import memberDetail from "@/views/memberManagement/memberList/components/detail";
-import router from "@/router";
+import { getFileTranserLists } from "@/api/memberManagement/memberList"
+import { getMsg, getReadData } from "@/api/commonAPI"
+import daibangdetail from "@/views/todoManagement/todoList/detail"
+import orderDetail from "@/views/orderManagement/orderList/detail"
+import taskDetail from "@/views/taskManagement/taskList/common/detail"
+import memberDetail from "@/views/memberManagement/memberList/components/detail"
+import router from "@/router"
 export default {
   name: "TopNotice",
   data() {
@@ -45,68 +45,68 @@ export default {
       detailId: "",
       timer: "", //定时器
       timer1: "", //顶部消息定时器
-    };
+    }
   },
   created() {
-    this.getList();
-    this.getTopList();
+    this.getList()
+    this.getTopList()
   },
   methods: {
     // 项目的消息
     getTopList() {
-      this.loading = true;
-      const params={
-        istop:-1,
-        isread:0,
+      this.loading = true
+      const params = {
+        istop: -1,
+        isread: 0,
       }
       // 消息提醒
       getMsg(params).then((response) => {
         if (response.state == "success") {
-          const res = response.rows;
-          if (res&&res.length!=0) {
+          const res = response.rows
+          if (res && res.length != 0) {
             res.map((item) => {
               this.topNoticeData.unshift({
                 SMS_Title: item.SMS_Title,
                 SMS_Content: item.SMS_Content,
                 SMS_Id: item.SMS_Id,
                 F_ID: item.F_ID,
-              });
-            });
+              })
+            })
             // this.$emit('getTopNoticeNums', {
             //   num: this.noticeData.length > 99 ? '99+' : this.noticeData.length // 顶部消息数量
             // })
-          }else{
-            this.topNoticeData=[]
+          } else {
+            this.topNoticeData = []
           }
         }
-      });
+      })
     },
     getList() {
-      this.loading = true;
-      const params={
-        istop:1,
+      this.loading = true
+      const params = {
+        istop: 1,
       }
       // 消息提醒
       getMsg(params).then((response) => {
         if (response.state == "success") {
-          const res = response.rows;
-          if (res&&res.length!=0) {
+          const res = response.rows
+          if (res && res.length != 0) {
             res.map((item) => {
               this.noticeData.unshift({
                 SMS_Title: item.SMS_Title,
                 SMS_Content: item.SMS_Content,
                 SMS_Id: item.SMS_Id,
                 F_ID: item.F_ID,
-              });
-            });
+              })
+            })
             // this.$emit('getTopNoticeNums', {
             //   num: this.noticeData.length > 99 ? '99+' : this.noticeData.length // 顶部消息数量
             // })
-          }else{
-            this.noticeData=[]
+          } else {
+            this.noticeData = []
           }
         }
-      });
+      })
     },
     //已读处理
     getRead() {
@@ -116,53 +116,53 @@ export default {
         type: "warning",
       })
         .then(() => {
-          this.getReadataList();
+          this.getReadataList()
           this.$message({
             type: "success",
             message: "处理成功!",
-          });
+          })
         })
         .catch(() => {
           this.$message({
             type: "info",
             message: "已取消处理",
-          });
-        });
+          })
+        })
     },
     handleChange(val) {
       if (val) {
-        this.readId = val;
-        this.getRead();
+        this.readId = val
+        this.getRead()
       }
     },
-    getReadataList(){
+    getReadataList() {
       const params = {
-            ids: this.readId,
-            state: 1,
-          };
+        ids: this.readId,
+        state: 1,
+      }
       getReadData(params)
-            .then((response) => {
-              if (response.state == "success") {
-                this.getTopList();
-              }
-            })
-            .catch((result) => {
-              console.log("处理失败");
-            });
-    }
+        .then((response) => {
+          if (response.state == "success") {
+            this.getTopList()
+          }
+        })
+        .catch((result) => {
+          console.log("处理失败")
+        })
+    },
   },
   mounted() {
-    this.timer1 = setInterval(()=>{
+    (this.timer1 = setInterval(() => {
       const params = {
-        istop:-1,
-        isread:0,
+        istop: -1,
+        isread: 0,
       }
-      getMsg(params).then((response=>{
-        if(response.state == 'success'){
-          const res = response.rows;
-          if(res&&res.length){
-            this.topNoticeData = [];
-            res.map((item)=>{
+      getMsg(params).then((response) => {
+        if (response.state == "success") {
+          const res = response.rows
+          if (res && res.length) {
+            this.topNoticeData = []
+            res.map((item) => {
               this.topNoticeData.unshift({
                 SMS_Title: item.SMS_Title,
                 SMS_Content: item.SMS_Content,
@@ -172,246 +172,232 @@ export default {
             })
           }
         }
-      }))
-    },120000),
-    this.timer = setInterval(() => {
-      const params={
-        istop:1,
-      }
-      getMsg(params).then((response) => {
-        if (response.state == "success") {
-          const res = response.rows;
-          if (res && res.length) {
-            this.noticeData = [];
-            res.map((item) => {
-              this.noticeData.unshift({
-                SMS_Title: item.SMS_Title,
-                SMS_Content: item.SMS_Content,
-                F_ID: item.F_ID,
-                SMS_Id: item.SMS_Id,
-              });
-            });
-             const infoData = res[0];
-            var a = window.localStorage.getItem("num");
-            if (a != infoData.F_ID) {
-              window.localStorage.setItem('num',infoData.F_ID)
-              if (infoData.SMS_Type == 3) {
-                this.readId = infoData.SMS_Id;
-                this.detailId = infoData.F_ID;
-                const h = this.$createElement;
-                this.$msgbox({
-                  title: "待办消息",
-                  message: h("p", null, [
-                    h("span", null, "内容是 "),
-                    h("span", null, infoData.SMS_Content),
-                  ]),
-                  customClass: "messageBox",
-                  closeOnClickModal: false,
-                  showCancelButton: true,
-                  confirmButtonText: "详情",
-                  cancelButtonText: "关闭",
+      })
+    }, 120000)),
+      (this.timer = setInterval(() => {
+        const params = {
+          istop: 1,
+        }
+        getMsg(params).then((response) => {
+          if (response.state == "success") {
+            const res = response.rows
+            if (res && res.length) {
+              this.noticeData = []
+              res.map((item) => {
+                this.noticeData.unshift({
+                  SMS_Title: item.SMS_Title,
+                  SMS_Content: item.SMS_Content,
+                  F_ID: item.F_ID,
+                  SMS_Id: item.SMS_Id,
                 })
-                  .then((action) => {
-                    this.$layer.iframe({
-                      content: {
-                        content: daibangdetail, // 传递的组件对象
-                        parent: this, // 当前的vue对象
-                        data: { rowid: infoData.F_ID.toString() }, // props
-                      },
-                      area: ["80%", "90%"],
-                      title: "详情",
-                    });
-                    this.getReadataList();
+              })
+              const infoData = res[0]
+              var a = window.localStorage.getItem("num")
+              if (a != infoData.F_ID) {
+                window.localStorage.setItem("num", infoData.F_ID)
+                if (infoData.SMS_Type == 3) {
+                  this.readId = infoData.SMS_Id
+                  this.detailId = infoData.F_ID
+                  const h = this.$createElement
+                  this.$msgbox({
+                    title: "待办消息",
+                    message: h("p", null, [h("span", null, "内容是 "), h("span", null, infoData.SMS_Content)]),
+                    customClass: "messageBox",
+                    closeOnClickModal: false,
+                    showCancelButton: true,
+                    confirmButtonText: "详情",
+                    cancelButtonText: "关闭",
                   })
-                  .catch((result) => {
-                    console.log("取消了");
-                  });
-              }else if(infoData.SMS_Type == 0){
-                this.readId = infoData.SMS_Id;
-                this.detailId = infoData.F_ID;
-                const h = this.$createElement;
-                this.$msgbox({
-                  title: "订单消息",
-                  message: h("p", null, [
-                    h("span", null, "内容是 "),
-                    h("span", null, infoData.SMS_Content),
-                  ]),
-                  customClass: "messageBox",
-                  closeOnClickModal: false,
-                  showCancelButton: true,
-                  confirmButtonText: "详情",
-                  cancelButtonText: "关闭",
-                })
-                  .then((action) => {
-                    this.$layer.iframe({
-                      content: {
-                        content: orderDetail, // 传递的组件对象
-                        parent: this, // 当前的vue对象
-                        data: { rowid: infoData.F_ID.toString() }, // props
-                      },
-                      area: ["80%", "90%"],
-                      title: "详情",
-                    });
-                    this.getReadataList();
+                    .then((action) => {
+                      this.$layer.iframe({
+                        content: {
+                          content: daibangdetail, // 传递的组件对象
+                          parent: this, // 当前的vue对象
+                          data: { rowid: infoData.F_ID.toString() }, // props
+                        },
+                        area: ["80%", "90%"],
+                        title: "详情",
+                      })
+                      this.getReadataList()
+                    })
+                    .catch((result) => {
+                      this.getReadataList()
+                      console.log("取消了")
+                    })
+                } else if (infoData.SMS_Type == 0) {
+                  this.readId = infoData.SMS_Id
+                  this.detailId = infoData.F_ID
+                  const h = this.$createElement
+                  this.$msgbox({
+                    title: "订单消息",
+                    message: h("p", null, [h("span", null, "内容是 "), h("span", null, infoData.SMS_Content)]),
+                    customClass: "messageBox",
+                    closeOnClickModal: false,
+                    showCancelButton: true,
+                    confirmButtonText: "详情",
+                    cancelButtonText: "关闭",
                   })
-                  .catch((result) => {
-                    console.log("取消了");
-                  });
-              }else if(infoData.SMS_Type == 1){
-                this.readId = infoData.SMS_Id;
-                this.detailId = infoData.F_ID;
-                const h = this.$createElement;
-                this.$msgbox({
-                  title: "媒体消息",
-                  message: h("p", null, [
-                    h("span", null, "内容是 "),
-                    h("span", null, infoData.SMS_Content),
-                  ]),
-                  customClass: "messageBox",
-                  closeOnClickModal: false,
-                  showCancelButton: true,
-                  confirmButtonText: "详情",
-                  cancelButtonText: "关闭",
-                })
-                  .then((action) => {
-                    router.push({name:'mediaInformation'})
-                    this.getReadataList();
+                    .then((action) => {
+                      this.$layer.iframe({
+                        content: {
+                          content: orderDetail, // 传递的组件对象
+                          parent: this, // 当前的vue对象
+                          data: { rowid: infoData.F_ID.toString() }, // props
+                        },
+                        area: ["80%", "90%"],
+                        title: "详情",
+                      })
+                      this.getReadataList()
+                    })
+                    .catch((result) => {
+                      this.getReadataList()
+                      console.log("取消了")
+                    })
+                } else if (infoData.SMS_Type == 1) {
+                  this.readId = infoData.SMS_Id
+                  this.detailId = infoData.F_ID
+                  const h = this.$createElement
+                  this.$msgbox({
+                    title: "媒体消息",
+                    message: h("p", null, [h("span", null, "内容是 "), h("span", null, infoData.SMS_Content)]),
+                    customClass: "messageBox",
+                    closeOnClickModal: false,
+                    showCancelButton: true,
+                    confirmButtonText: "详情",
+                    cancelButtonText: "关闭",
                   })
-                  .catch((result) => {
-                    console.log("取消了");
-                  });
-              }else if(infoData.SMS_Type == 2){
-                this.readId = infoData.SMS_Id;
-                this.detailId = infoData.F_ID;
-                const h = this.$createElement;
-                this.$msgbox({
-                  title: "任务消息",
-                  message: h("p", null, [
-                    h("span", null, "内容是 "),
-                    h("span", null, infoData.SMS_Content),
-                  ]),
-                  customClass: "messageBox",
-                  closeOnClickModal: false,
-                  showCancelButton: true,
-                  confirmButtonText: "详情",
-                  cancelButtonText: "关闭",
-                })
-                  .then((action) => {
-                    this.$layer.iframe({
-                      content: {
-                        content: taskDetail, // 传递的组件对象
-                        parent: this, // 当前的vue对象
-                        data: { rowid: infoData.F_ID.toString() }, // props
-                      },
-                      area: ["80%", "90%"],
-                      title: "详情",
-                    });
-                    this.getReadataList();
+                    .then((action) => {
+                      router.push({ name: "mediaInformation" })
+                      this.getReadataList()
+                    })
+                    .catch((result) => {
+                      this.getReadataList()
+                      console.log("取消了")
+                    })
+                } else if (infoData.SMS_Type == 2) {
+                  this.readId = infoData.SMS_Id
+                  this.detailId = infoData.F_ID
+                  const h = this.$createElement
+                  this.$msgbox({
+                    title: "任务消息",
+                    message: h("p", null, [h("span", null, "内容是 "), h("span", null, infoData.SMS_Content)]),
+                    customClass: "messageBox",
+                    closeOnClickModal: false,
+                    showCancelButton: true,
+                    confirmButtonText: "详情",
+                    cancelButtonText: "关闭",
                   })
-                  .catch((result) => {
-                    console.log("取消了");
-                  });
-              }else if(infoData.SMS_Type == 4){
-                this.readId = infoData.SMS_Id;
-                this.detailId = infoData.F_ID;
-                const h = this.$createElement;
-                this.$msgbox({
-                  title: "质检消息",
-                  message: h("p", null, [
-                    h("span", null, "内容是 "),
-                    h("span", null, infoData.SMS_Content),
-                  ]),
-                  customClass: "messageBox",
-                  closeOnClickModal: false,
-                  showCancelButton: true,
-                  confirmButtonText: "详情",
-                  cancelButtonText: "关闭",
-                })
-                  .then((action) => {
-                    this.$layer.iframe({
-                      content: {
-                        content: daibangdetail, // 传递的组件对象
-                        parent: this, // 当前的vue对象
-                        data: { rowid: infoData.F_ID.toString() }, // props
-                      },
-                      area: ["80%", "90%"],
-                      title: "详情",
-                    });
-                    this.getReadataList();
+                    .then((action) => {
+                      this.$layer.iframe({
+                        content: {
+                          content: taskDetail, // 传递的组件对象
+                          parent: this, // 当前的vue对象
+                          data: { rowid: infoData.F_ID.toString() }, // props
+                        },
+                        area: ["80%", "90%"],
+                        title: "详情",
+                      })
+                      this.getReadataList()
+                    })
+                    .catch((result) => {
+                      this.getReadataList()
+                      console.log("取消了")
+                    })
+                } else if (infoData.SMS_Type == 4) {
+                  this.readId = infoData.SMS_Id
+                  this.detailId = infoData.F_ID
+                  const h = this.$createElement
+                  this.$msgbox({
+                    title: "质检消息",
+                    message: h("p", null, [h("span", null, "内容是 "), h("span", null, infoData.SMS_Content)]),
+                    customClass: "messageBox",
+                    closeOnClickModal: false,
+                    showCancelButton: true,
+                    confirmButtonText: "详情",
+                    cancelButtonText: "关闭",
                   })
-                  .catch((result) => {
-                    console.log("取消了");
-                  });
-              }else if(infoData.SMS_Type == 5){
-                this.readId = infoData.SMS_Id;
-                this.detailId = infoData.F_ID;
-                const h = this.$createElement;
-                this.$msgbox({
-                  title: "绩效消息",
-                  message: h("p", null, [
-                    h("span", null, "内容是 "),
-                    h("span", null, infoData.SMS_Content),
-                  ]),
-                  customClass: "messageBox",
-                  closeOnClickModal: false,
-                  showCancelButton: true,
-                  confirmButtonText: "详情",
-                  cancelButtonText: "关闭",
-                })
-                  .then((action) => {
-                    this.$layer.iframe({
-                      content: {
-                        content: daibangdetail, // 传递的组件对象
-                        parent: this, // 当前的vue对象
-                        data: { rowid: infoData.F_ID.toString() }, // props
-                      },
-                      area: ["80%", "90%"],
-                      title: "详情",
-                    });
-                    this.getReadataList();
+                    .then((action) => {
+                      this.$layer.iframe({
+                        content: {
+                          content: daibangdetail, // 传递的组件对象
+                          parent: this, // 当前的vue对象
+                          data: { rowid: infoData.F_ID.toString() }, // props
+                        },
+                        area: ["80%", "90%"],
+                        title: "详情",
+                      })
+                      this.getReadataList()
+                    })
+                    .catch((result) => {
+                      this.getReadataList()
+                      console.log("取消了")
+                    })
+                } else if (infoData.SMS_Type == 5) {
+                  this.readId = infoData.SMS_Id
+                  this.detailId = infoData.F_ID
+                  const h = this.$createElement
+                  this.$msgbox({
+                    title: "绩效消息",
+                    message: h("p", null, [h("span", null, "内容是 "), h("span", null, infoData.SMS_Content)]),
+                    customClass: "messageBox",
+                    closeOnClickModal: false,
+                    showCancelButton: true,
+                    confirmButtonText: "详情",
+                    cancelButtonText: "关闭",
                   })
-                  .catch((result) => {
-                    console.log("取消了");
-                  });
-              }else if(infoData.SMS_Type == 6){
-                this.readId = infoData.SMS_Id;
-                this.detailId = infoData.F_ID;
-                const h = this.$createElement;
-                this.$msgbox({
-                  title: "转移消息",
-                  message: h("p", null, [
-                    h("span", null, "内容是 "),
-                    h("span", null, infoData.SMS_Content),
-                  ]),
-                  customClass: "messageBox",
-                  closeOnClickModal: false,
-                  showCancelButton: true,
-                  confirmButtonText: "详情",
-                  cancelButtonText: "关闭",
-                })
-                  .then((action) => {
-                    this.$layer.iframe({
-                      content: {
-                        content: memberDetail, // 传递的组件对象
-                        parent: this, // 当前的vue对象
-                        data: { rowid: infoData.F_ID.toString() }, // props
-                      },
-                      area: ["80%", "90%"],
-                      title: "详情",
-                    });
-                    this.getReadataList();
+                    .then((action) => {
+                      this.$layer.iframe({
+                        content: {
+                          content: daibangdetail, // 传递的组件对象
+                          parent: this, // 当前的vue对象
+                          data: { rowid: infoData.F_ID.toString() }, // props
+                        },
+                        area: ["80%", "90%"],
+                        title: "详情",
+                      })
+                      this.getReadataList()
+                    })
+                    .catch((result) => {
+                      this.getReadataList()
+                      console.log("取消了")
+                    })
+                } else if (infoData.SMS_Type == 6) {
+                  this.readId = infoData.SMS_Id
+                  this.detailId = infoData.F_ID
+                  const h = this.$createElement
+                  this.$msgbox({
+                    title: "转移消息",
+                    message: h("p", null, [h("span", null, "内容是 "), h("span", null, infoData.SMS_Content)]),
+                    customClass: "messageBox",
+                    closeOnClickModal: false,
+                    showCancelButton: true,
+                    confirmButtonText: "详情",
+                    cancelButtonText: "关闭",
                   })
-                  .catch((result) => {
-                    console.log("取消了");
-                  });
+                    .then((action) => {
+                      this.$layer.iframe({
+                        content: {
+                          content: memberDetail, // 传递的组件对象
+                          parent: this, // 当前的vue对象
+                          data: { rowid: infoData.F_ID.toString() }, // props
+                        },
+                        area: ["80%", "90%"],
+                        title: "详情",
+                      })
+                      this.getReadataList()
+                    })
+                    .catch((result) => {
+                      this.getReadataList()
+                      console.log("取消了")
+                    })
+                }
               }
             }
           }
-        }
-      });
-    }, 120000);
+        })
+      }, 180000))
   },
-};
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" >

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

@@ -1,115 +1,28 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-date-picker
-        v-model="searchTime"
-        :picker-options="pickerOptions"
-        class="filter-item"
-        type="daterange"
-        format="yyyy年MM月dd日"
-        value-format="yyyy-MM-dd"
-        unlink-panels
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      />
-      <el-date-picker
-        v-model="waybillTime"
-        :picker-options="pickerOptions"
-        class="filter-item"
-        type="daterange"
-        format="yyyy年MM月dd日"
-        value-format="yyyy-MM-dd"
-        unlink-panels
-        range-separator="至"
-        start-placeholder="物流开始日期"
-        end-placeholder="物流结束日期"
-      />
-      <el-cascader
-        ref="myCascader"
-        v-model="searchData.provinceCity"
-        :options="provinceCityDatas"
-        :props="props"
-        placeholder="请选择地区"
-        class="form_select area"
-        clearable
-        change-on-select
-        @change="handleItemChange"
-      />
-      <el-input v-model="searchData.minprice" placeholder="请输入最低金额" class="filter-item" />
-      <el-input v-model="searchData.maxprice" placeholder="请输入最高金额" class="filter-item" />
-      <el-select
-        v-model="searchData.F_AddDes"
-        placeholder="请选择送货说明"
-        class="form_select"
-        clearable
-      >
-        <el-option
-          v-for="item in addDesList"
-          :key="item.F_Value"
-          :label="item.F_Value"
-          :value="item.F_Value"
-        />
+      <el-date-picker v-model="searchTime" :picker-options="pickerOptions" class="filter-item" type="daterange" format="yyyy年MM月dd日" value-format="yyyy-MM-dd" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
+      <el-date-picker v-model="waybillTime" :picker-options="pickerOptions" class="filter-item" type="daterange" format="yyyy年MM月dd日" value-format="yyyy-MM-dd" unlink-panels range-separator="至" start-placeholder="物流开始日期" end-placeholder="物流结束日期" />
+      <el-cascader ref="myCascader" v-model="searchData.provinceCity" :options="provinceCityDatas" :props="props" placeholder="请选择地区" class="form_select area filter-item" clearable change-on-select @change="handleItemChange" />
+      <!-- <el-input v-model="searchData.minprice" placeholder="请输入最低金额" class="filter-item" />
+      <el-input v-model="searchData.maxprice" placeholder="请输入最高金额" class="filter-item" /> -->
+      <el-select v-model="searchData.F_AddDes" placeholder="请选择送货说明" class="filter-item form_select" clearable>
+        <el-option v-for="item in addDesList" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value" />
       </el-select>
       <el-input v-model="searchData.adFrom" placeholder="请输入消息来源" class="filter-item" />
-      <el-select
-        v-model="searchData.type"
-        class="filter-item"
-        filterable
-        clearable
-        placeholder="请选择订单类型"
-      >
-        <el-option
-          v-for="item in orderType"
-          :key="item.F_Value"
-          :label="item.F_Value"
-          :value="item.F_Value"
-        />
+      <el-select v-model="searchData.type" class="filter-item" filterable clearable placeholder="请选择订单类型">
+        <el-option v-for="item in orderType" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value" />
       </el-select>
-      <el-select
-        v-model="searchData.express"
-        class="form_select"
-        filterable
-        clearable
-        placeholder="请选择快递"
-      >
-        <el-option
-          v-for="item in expressList"
-          :key="item.F_Value"
-          :label="item.F_Value"
-          :value="item.F_Value"
-        />
+      <el-select v-model="searchData.express" class="filter-item form_select" filterable clearable placeholder="请选择快递">
+        <el-option v-for="item in expressList" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value" />
       </el-select>
-      <el-select
-        v-model="searchData.logisticsStatus"
-        class="form_select"
-        filterable
-        clearable
-        placeholder="请选择物流状态"
-      >
-        <el-option
-          v-for="item in logisticsList"
-          :key="item.F_Value"
-          :label="item.F_Remark"
-          :value="item.F_Value"
-        />
+      <el-select v-model="searchData.logisticsStatus" class="filter-item form_select" filterable clearable placeholder="请选择物流状态">
+        <el-option v-for="item in logisticsList" :key="item.F_Value" :label="item.F_Remark" :value="item.F_Value" />
       </el-select>
       <el-input v-model="searchData.id" placeholder="请输入订单编号" class="filter-item" />
       <!-- <el-input v-model="searchData.customer" placeholder="请输入客户姓名" class="filter-item" />
       <el-input v-model="searchData.customerPhone" placeholder="请输入手机号码" class="filter-item" />
       <el-input v-model="searchData.trackingNo" placeholder="请输入快递单号" class="filter-item" /> -->
-      <!-- <el-select
-        v-model="searchData.payState"
-        class="filter-item"
-        filterable
-        clearable
-        placeholder="请选择交易状态"
-      >
-        <el-option label="待回款" value="0"></el-option>
-        <el-option label="已支付" value="1"></el-option>
-        <el-option label="待退款" value="2"></el-option>
-        <el-option label="已退款" value="3"></el-option>
-      </el-select> -->
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
     </div>
     <!-- <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick">
@@ -118,29 +31,18 @@
     <div>
       <span>订单数量：{{ pageParams.total }}</span>
     </div>
-    <el-table
-      v-loading="loading"
-      :data="dataLists"
-      border
-      stripe
-      @selection-change="handleSelectionChange"
-      row-key="F_Id"
-    >
+    <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange" row-key="F_Id">
       <el-table-column type="selection" :reserve-selection="true"></el-table-column>
       <el-table-column type="index" label="编号" align="center" fixed width="80" />
       <el-table-column prop="F_Id" label="订单编号" align="center" min-width="180">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="hadndleOrderCode(scope.row.F_Id)"
-          >{{ scope.row.F_Id }}</el-button>
+          <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_Id)">{{ scope.row.F_Id }}</el-button>
         </template>
       </el-table-column>
       <el-table-column prop="F_Customer" label="客户姓名" align="center" min-width />
       <el-table-column prop="F_CustomerPhone" label="手机号码" align="center" min-width="140" />
       <el-table-column label="订购商品" align="center" min-width>
-        <template slot-scope="scope">{{ scope.row.OrderDetailList | judgmentOrderGoods}}</template>
+        <template slot-scope="scope">{{ scope.row.OrderDetailList | judgmentOrderGoods }}</template>
       </el-table-column>
       <el-table-column prop="F_AddTime" label="下单日期" align="center" />
       <el-table-column label="订单状态" align="center">
@@ -149,32 +51,22 @@
       <el-table-column label="地址" align="center">
         <template slot-scope="scope">{{ scope.row | judgmentAddress }}</template>
       </el-table-column>
-      <el-table-column prop="F_PayType" label="付款类型" align="center"/>
-      <el-table-column prop="F_RealPrice" label="付款金额" align="center"/>
-      <el-table-column prop="F_AddDes" label="送货说明" align="center"/>
+      <el-table-column prop="F_PayType" label="付款类型" align="center" />
+      <el-table-column prop="F_RealPrice" label="付款金额" align="center" sortable min-width="100" />
+      <el-table-column prop="F_AddDes" label="送货说明" align="center" />
       <el-table-column prop="F_AddUserName" label="下单员工" align="center" />
       <el-table-column prop="F_BelongName" label="归属员工" align="center" />
       <el-table-column prop="F_Type" label="订单类型" align="center" />
       <el-table-column prop="F_TrackingNo" label="运单号" align="center" />
       <el-table-column prop="F_Waybill" label="物流操作时间" align="center" />
-      <el-table-column label="物流状态" align="center" >
+      <el-table-column label="物流状态" align="center">
         <template slot-scope="scope">
           {{ scope.row.F_Status | judgmentStatusName }}
         </template>
       </el-table-column>
       <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
-          <!-- <el-button
-            v-permission="'HY_express'"
-            type="text"
-            @click="btn_express(scope.row.F_Id)"
-          >快递信息</el-button> -->
           <el-button v-permission="'HY_add_aftersale'" type="text" @click="btn_add_aftersale(scope.row.F_Id)">售后</el-button>
-          <!-- <el-button
-            v-permission="'HY_goback'"
-            type="text"
-            @click="btn_goback(scope.row.F_Id)"
-          >客服退回</el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -190,82 +82,79 @@
 </template>
 
 <script>
-import { getDictionaryValueList, getProviceCityById } from '@/api/commonAPI'
-import { getOrderListCustomerService } from "@/api/customerServiceManagement/orderListCustomerService";
-import { pickerOptions, formatterContent } from "@/utils";
-import afterSale from './afterSale'
-// import importExpress from './importExpress';
-// import goback from "./goback";
-// import express from './express';
+import { getDictionaryValueList, getProviceCityById } from "@/api/commonAPI"
+import { getOrderListCustomerService } from "@/api/customerServiceManagement/orderListCustomerService"
+import { pickerOptions, formatterContent } from "@/utils"
+import afterSale from "./afterSale"
 import detail from "@/views/orderManagement/orderList/detail"
-import Pagination from "@/components/Pagination"; // 对el-pagination 二次封装
+import Pagination from "@/components/Pagination" // 对el-pagination 二次封装
 
 export default {
   name: "OrderListCustomerService",
   components: {
-    Pagination
+    Pagination,
   },
   filters: {
-    judgmentStateName (status) {
+    judgmentStateName(status) {
       const statusMap = {
-        '0': "未提交",
-        '1': "待分仓",
-        '2': "已退回",
-        '3': "已分仓",
-        '4': "无货",
-        '5': "仓库待审核",
-        '6': "已发货",
-        '7': "付款待审核",
-        '8': "待分物流",
-        '9': "物流未通过",
+        0: "未提交",
+        1: "待分仓",
+        2: "已退回",
+        3: "已分仓",
+        4: "无货",
+        5: "仓库待审核",
+        6: "已发货",
+        7: "付款待审核",
+        8: "待分物流",
+        9: "物流未通过",
       }
       return statusMap[status]
     },
-    judgmentOrderGoods (status) {
-      let orderGoodsNameQuantity = ''
+    judgmentOrderGoods(status) {
+      let orderGoodsNameQuantity = ""
       for (let i = 0; i < status.length; i++) {
         orderGoodsNameQuantity = `${orderGoodsNameQuantity}${status[i].F_ProductName}*${status[i].F_Count},`
       }
       orderGoodsNameQuantity = orderGoodsNameQuantity.substring(0, orderGoodsNameQuantity.length - 1)
       return orderGoodsNameQuantity
     },
-    judgmentAddress (data) {
-      let addProvince = data.F_AddProvince === null ? '' : data.F_AddProvince //省
-      let addCity = data.F_AddCity === null ? '' : data.F_AddCity //市
-      let addArea = data.F_AddArea === null ? '' : data.F_AddArea //县/区
-      let addTown = data.F_AddTown === null ? '' : data.F_AddTown //乡/镇
-      let address = data.F_Address === null ? '' : data.F_Address //详细地址
+    judgmentAddress(data) {
+      let addProvince = data.F_AddProvince === null ? "" : data.F_AddProvince //省
+      let addCity = data.F_AddCity === null ? "" : data.F_AddCity //市
+      let addArea = data.F_AddArea === null ? "" : data.F_AddArea //县/区
+      let addTown = data.F_AddTown === null ? "" : data.F_AddTown //乡/镇
+      let address = data.F_Address === null ? "" : data.F_Address //详细地址
       let addressStr = addProvince + addCity + addArea + addTown + address // 地址
       return addressStr
     },
     judgmentStatusName(status) {
       const statusMap = {
-        '0': '未发出',
-        '1': '未签收',
-        '2': '签收',
-        '3': '改代收',
-        '4': '拒收',
+        0: "未发出",
+        1: "未签收",
+        2: "签收",
+        3: "改代收",
+        4: "拒收",
       }
       return statusMap[status]
     },
   },
-  data () {
+  data() {
     return {
       loading: false,
       searchData: {
-        adFrom: '', //消息/广告媒体来源
-        type: '', //订单类型
-        id: '', //订单号
-        customer: '', //客户姓名
-        customerPhone: '', //客户手机号
-        trackingNo: '', //运单号
-        payState: '', //交易状态
+        adFrom: "", //消息/广告媒体来源
+        type: "", //订单类型
+        id: "", //订单号
+        customer: "", //客户姓名
+        customerPhone: "", //客户手机号
+        trackingNo: "", //运单号
+        payState: "", //交易状态
         provinceCity: [], // 省市县
-        minprice: '', // 最低金额
-        maxprice: '', // 最高金额
-        F_AddDes: '', // 送货说明
-        express: '', //快递
-        logisticsStatus: '', //物流状态
+        minprice: "", // 最低金额
+        maxprice: "", // 最高金额
+        F_AddDes: "", // 送货说明
+        express: "", //快递
+        logisticsStatus: "", //物流状态
       },
       searchTime: [], //订单时间
       waybillTime: [], //物流时间
@@ -274,32 +163,32 @@ export default {
       provinceCityText: [], // 省市下拉绑定的值
       props: {
         // 自定义省市下拉数据的key值
-        value: 'id',
-        label: 'text',
-        children: 'children'
+        value: "id",
+        label: "text",
+        children: "children",
       },
       addDesList: [], // 送货说明
       pickerOptions, // 日期数据
       pageParams: {
         pageindex: 1, // 当前第几页
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-        total: 0 // 总共多少数据
+        total: 0, // 总共多少数据
       },
       dataLists: [], // 列表数据
       multipleSelection: [], // 选中的数据
       selectedId: [], // 选中的数据的id
-      orderType: [],//订单类型
+      orderType: [], //订单类型
       logisticsList: [], //物流状态
       expressList: [], //快递
       selectOrderId: [], //合并订单id
-    };
+    }
   },
   watch: {
     searchTime(newVal, oldVal) {
       !newVal && (this.searchTime = [])
-    }
+    },
   },
-  created () {
+  created() {
     if (this.$route.params.id) {
       this.activeName = this.$route.params.id
     }
@@ -310,16 +199,16 @@ export default {
     this.getAddDesList()
     this.getLogistics()
     this.getExpress()
-    document.onkeyup = e => {
+    document.onkeyup = (e) => {
       if (e.keyCode === 13) {
-        this.getList();
+        this.getList()
       }
-    };
+    }
   },
   methods: {
-    getList () {
-      this.loading = true;
-      return new Promise(resolve => {
+    getList() {
+      this.loading = true
+      return new Promise((resolve) => {
         const params = {
           F_State: this.activeName, //订单状态
           pageindex: 1, // int 第几页
@@ -334,7 +223,7 @@ export default {
           SearchEndTime: this.searchTime && this.searchTime[1], //添加结束时间
           PayState: this.searchData.payState, //交易状态
           F_IsExpress: -2, //-2全部 0客服未分配快递 1已分配
-          state: '',
+          state: "",
           F_AddProvince: this.provinceCityText && this.provinceCityText[0], // 省份
           F_AddCity: this.provinceCityText[1] && this.provinceCityText[1], // 市
           F_AddArea: this.provinceCityText[2] && this.provinceCityText[2], // 县区
@@ -346,52 +235,52 @@ export default {
           F_Status: this.searchData.logisticsStatus, //物流状态
           startWaybill: this.waybillTime && this.waybillTime[0],
           endWaybill: this.waybillTime && this.waybillTime[1],
-        };
-        getOrderListCustomerService(params).then(response => {
-          this.loading = false;
+        }
+        getOrderListCustomerService(params).then((response) => {
+          this.loading = false
           if (response.state.toLowerCase() === "success") {
-            this.pageParams.total = response.data.Totals;
-            this.dataLists = response.data.Rows;
+            this.pageParams.total = response.data.Totals
+            this.dataLists = response.data.Rows
           }
-        });
-        resolve();
-      });
+        })
+        resolve()
+      })
     },
     //处理默认选中当前日期
     getNowTime() {
-      let now = new Date();
-      let year = now.getFullYear(); //得到年份
-      let month = now.getMonth() + 1; //得到月份
-      let date = now.getDate(); //得到日期
-      let hour =" 00:00:00"; //默认时分秒 如果传给后台的格式为年月日时分秒，就需要加这个，如若不需要，此行可忽略
-      month = month.toString().padStart(2, "0");
-      date = date.toString().padStart(2, "0");
-      let defaultDate = `${year}-${month}-${date}`;
+      let now = new Date()
+      let year = now.getFullYear() //得到年份
+      let month = now.getMonth() + 1 //得到月份
+      let date = now.getDate() //得到日期
+      let hour = " 00:00:00" //默认时分秒 如果传给后台的格式为年月日时分秒，就需要加这个，如若不需要，此行可忽略
+      month = month.toString().padStart(2, "0")
+      date = date.toString().padStart(2, "0")
+      let defaultDate = `${year}-${month}-${date}`
       this.searchTime = [defaultDate, defaultDate]
     },
     // 获取订单类型
-    getOrderType () {
-      return new Promise(resolve => {
+    getOrderType() {
+      return new Promise((resolve) => {
         const params = {
           isleaf: true,
-          code: 'ORDERTYPE'
+          code: "ORDERTYPE",
         }
-        getDictionaryValueList(params).then(response => {
-          if (response.state.toLowerCase() === 'success') {
+        getDictionaryValueList(params).then((response) => {
+          if (response.state.toLowerCase() === "success") {
             this.orderType = response.data.Rows
           }
         })
       })
     },
     // 物流状态
-    getLogistics () {
-      return new Promise(resolve => {
+    getLogistics() {
+      return new Promise((resolve) => {
         const params = {
           isleaf: true,
-          code: 'OrderF_State'
+          code: "OrderF_State",
         }
-        getDictionaryValueList(params).then(response => {
-          if (response.state.toLowerCase() === 'success') {
+        getDictionaryValueList(params).then((response) => {
+          if (response.state.toLowerCase() === "success") {
             const res = response.data.Rows
             res.forEach((e, i) => {
               if (e.F_Remark === "未签收") {
@@ -407,14 +296,14 @@ export default {
       })
     },
     // 快递
-    getExpress () {
-      return new Promise(resolve => {
+    getExpress() {
+      return new Promise((resolve) => {
         const params = {
           isleaf: true,
-          code: 'EXPRESS'
+          code: "EXPRESS",
         }
-        getDictionaryValueList(params).then(response => {
-          if (response.state.toLowerCase() === 'success') {
+        getDictionaryValueList(params).then((response) => {
+          if (response.state.toLowerCase() === "success") {
             this.expressList = response.data.Rows
           }
         })
@@ -425,10 +314,10 @@ export default {
       return new Promise((resolve) => {
         const params = {
           isleaf: true,
-          code: 'DELIVERYDES'
+          code: "DELIVERYDES",
         }
         getDictionaryValueList(params).then((response) => {
-          if (response.state.toLowerCase() === 'success') {
+          if (response.state.toLowerCase() === "success") {
             this.addDesList = response.data.Rows
           }
         })
@@ -441,41 +330,41 @@ export default {
     //   }
     //   this.getList();
     // },
-    btn_search () {
-      this.pageParams.pageindex = 1;
-      this.getList();
+    btn_search() {
+      this.pageParams.pageindex = 1
+      this.getList()
     },
     // 批量退回
-    btn_bulk_goback () {
+    btn_bulk_goback() {
       if (this.selectOrderId.length < 1) {
         this.$message({
           message: "请选择订单！",
           type: "warning",
-        });
-        return;
+        })
+        return
       }
-      let orderids = this.selectOrderId.join(',').replace(/\s+/g, '')
+      let orderids = this.selectOrderId.join(",").replace(/\s+/g, "")
       this.$layer.iframe({
         content: {
           content: goback, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: orderids } // props
+          data: { rowid: orderids }, // props
         },
         area: ["30%", "30%"],
-        title: "退回订单"
-      });
+        title: "退回订单",
+      })
     },
     //退回订单
-    btn_goback (orderid) {
+    btn_goback(orderid) {
       this.$layer.iframe({
         content: {
           content: goback, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: orderid } // props
+          data: { rowid: orderid }, // props
         },
         area: ["30%", "30%"],
-        title: "退回订单"
-      });
+        title: "退回订单",
+      })
     },
     // 添加售后
     btn_add_aftersale(id) {
@@ -483,26 +372,26 @@ export default {
         content: {
           content: afterSale, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: id.toString() } // props
+          data: { rowid: id.toString() }, // props
         },
-        area: ['70%', '80%'],
-        title: '添加售后'
+        area: ["70%", "80%"],
+        title: "添加售后",
       })
     },
     //订单详情
-    hadndleOrderCode (ordercode) {
+    hadndleOrderCode(ordercode) {
       this.$layer.iframe({
         content: {
           content: detail, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { 'rowid': ordercode }// props
+          data: { rowid: ordercode }, // props
         },
-        area: ['80%', '90%'],
-        title: '订单详情'
+        area: ["80%", "90%"],
+        title: "订单详情",
       })
     },
     //选择多个
-    handleSelectionChange (val) {
+    handleSelectionChange(val) {
       const ids = []
       this.multipleSelection = val
       for (let i = 0; i < this.multipleSelection.length; i++) {
@@ -518,19 +407,15 @@ export default {
         .catch((err) => {})
     },
     handleItemChange(val) {
-      this.provinceCityText = this.$refs['myCascader'].currentLabels
+      this.provinceCityText = this.$refs["myCascader"].currentLabels
       const pid = val ? val[val.length - 1] : 1 // id值
       this.level = val.length + 1 // 判断第几级
-      this.provinceCityDatas = this.handleData(
-        this.provinceCityDatas,
-        pid,
-        this.level
-      )
+      this.provinceCityDatas = this.handleData(this.provinceCityDatas, pid, this.level)
     },
     handleData(data, val, level) {
       for (let i = 0; i < data.length; i++) {
         if (!data[i].children) {
-          this.$set(data[i], 'children', [])
+          this.$set(data[i], "children", [])
         }
         if (data[i].id === val) {
           getProviceCityById({ pid: val })
@@ -539,7 +424,7 @@ export default {
                 data[i].children = res.data
                 if (this.level !== 4) {
                   data[i].children.forEach((ele) => {
-                    this.$set(ele, 'children', [])
+                    this.$set(ele, "children", [])
                   })
                 }
               } else {
@@ -555,11 +440,25 @@ export default {
       }
       return data
     },
-  }
-};
+  },
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+.filter-container {
+  .el-select {
+    margin-right: 10px;
+  }
+  .el-date-editor {
+    margin-right: 10px;
+  }
+  .el-cascader {
+    margin-right: 10px;
+  }
+  .filter-item {
+    vertical-align: top;
+  }
+}
 .el {
   cursor: pointer;
 }

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

@@ -61,7 +61,7 @@
               推荐人：{{ orderDetailData.F_RecommendName }}
             </el-col>
             <el-col :md="6" class="order_detail_item">
-              运单号：{{ orderDetailData.F_FlowNum }}
+              运单号：{{ orderDetailData.F_TrackingNo }}
             </el-col>
             <el-col :md="6" class="order_detail_item">
               归属人：{{ orderDetailData.F_BelongName }}
@@ -195,7 +195,6 @@ export default {
         F_Score: '', //使用积分
         F_AddTime: '', //添加时间
         F_AddUserName: '', //下单员工
-        F_FlowNum: '', //运单号
         F_RecommendName: '', //推荐人名称
         F_BelongName: '', //归属人名称
         F_Remark: '', //备注
@@ -327,7 +326,6 @@ export default {
         this.orderDetailData.F_VipId = res.F_VipId //关联会员id
         this.orderDetailData.F_Score = res.F_UseScore //使用积分
         this.orderDetailData.F_AddTime = res.F_AddTime //添加时间
-        this.orderDetailData.F_FlowNum = res.F_TrackingNo  //运单号
         this.orderDetailData.F_RecommendName = res.F_RecommendName//推荐人名称
         this.orderDetailData.F_AddUserName = res.F_AddUserName //下单员工
         this.orderDetailData.F_BelongName = res.F_BelongName //归属员工

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

@@ -1,88 +1,24 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-date-picker
-        v-model="searchTime"
-        :picker-options="pickerOptions"
-        class="filter-item"
-        type="daterange"
-        format="yyyy年MM月dd日"
-        value-format="yyyy-MM-dd"
-        unlink-panels
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      />
-        <!-- :clearable="false" -->
-        <!-- align="left" -->
-      <el-cascader
-        ref="myCascader"
-        v-model="searchData.provinceCity"
-        :options="provinceCityDatas"
-        :props="props"
-        placeholder="请选择地区"
-        class="form_select area"
-        clearable
-        change-on-select
-        @change="handleItemChange"
-      />
-      <el-input v-model="searchData.minprice" placeholder="请输入最低金额" class="filter-item" />
-      <el-input v-model="searchData.maxprice" placeholder="请输入最高金额" class="filter-item" />
-      <el-select
-        v-model="searchData.F_AddDes"
-        placeholder="请选择送货说明"
-        class="form_select"
-        clearable
-      >
-        <el-option
-          v-for="item in addDesList"
-          :key="item.F_Value"
-          :label="item.F_Value"
-          :value="item.F_Value"
-        />
+      <el-date-picker v-model="searchTime" :picker-options="pickerOptions" class="filter-item" type="daterange" format="yyyy年MM月dd日" value-format="yyyy-MM-dd" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
+      <!-- :clearable="false" -->
+      <!-- align="left" -->
+      <el-cascader ref="myCascader" v-model="searchData.provinceCity" :options="provinceCityDatas" :props="props" placeholder="请选择地区" class="filter-item form_select area" clearable change-on-select @change="handleItemChange" />
+      <!-- <el-input v-model="searchData.minprice" placeholder="请输入最低金额" class="filter-item" />
+      <el-input v-model="searchData.maxprice" placeholder="请输入最高金额" class="filter-item" /> -->
+      <el-select v-model="searchData.F_AddDes" placeholder="请选择送货说明" class="filter-item form_select" clearable>
+        <el-option v-for="item in addDesList" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value" />
       </el-select>
       <el-input v-model="searchData.adFrom" placeholder="请输入消息来源" class="filter-item" />
-      <el-select
-        v-model="searchData.type"
-        class="filter-item"
-        filterable
-        clearable
-        placeholder="请选择订单类型"
-      >
-        <el-option
-          v-for="item in orderType"
-          :key="item.F_Value"
-          :label="item.F_Value"
-          :value="item.F_Value"
-        />
+      <el-select v-model="searchData.type" class="filter-item" filterable clearable placeholder="请选择订单类型">
+        <el-option v-for="item in orderType" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value" />
       </el-select>
-      <el-select
-        v-model="searchData.express"
-        class="form_select"
-        filterable
-        clearable
-        placeholder="请选择快递"
-      >
-        <el-option
-          v-for="item in expressList"
-          :key="item.F_Value"
-          :label="item.F_Value"
-          :value="item.F_Value"
-        />
+      <el-select v-model="searchData.express" class="filter-item form_select" filterable clearable placeholder="请选择快递">
+        <el-option v-for="item in expressList" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value" />
       </el-select>
-      <el-select
-        v-model="searchData.logisticsStatus"
-        class="form_select"
-        filterable
-        clearable
-        placeholder="请选择物流状态"
-      >
-        <el-option
-          v-for="item in logisticsList"
-          :key="item.F_Value"
-          :label="item.F_Remark"
-          :value="item.F_Value"
-        />
+      <el-select v-model="searchData.logisticsStatus" class="filter-item form_select" filterable clearable placeholder="请选择物流状态">
+        <el-option v-for="item in logisticsList" :key="item.F_Value" :label="item.F_Remark" :value="item.F_Value" />
       </el-select>
       <el-input v-model="searchData.id" placeholder="请输入订单编号" class="filter-item" />
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
@@ -95,29 +31,18 @@
     <div>
       <span>订单数量：{{ pageParams.total }}</span>
     </div>
-    <el-table
-      v-loading="loading"
-      :data="dataLists"
-      border
-      stripe
-      @selection-change="handleSelectionChange"
-      row-key="F_Id"
-    >
+    <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange" row-key="F_Id">
       <el-table-column type="selection" :reserve-selection="true"></el-table-column>
       <el-table-column type="index" label="编号" align="center" fixed width="80" />
       <el-table-column prop="F_Id" label="订单编号" align="center" min-width="180">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="hadndleOrderCode(scope.row.F_Id)"
-          >{{ scope.row.F_Id }}</el-button>
+          <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_Id)">{{ scope.row.F_Id }}</el-button>
         </template>
       </el-table-column>
       <el-table-column prop="F_Customer" label="客户姓名" align="center" min-width />
       <el-table-column prop="F_CustomerPhone" label="手机号码" align="center" min-width="140" />
       <el-table-column label="订购商品" align="center" min-width>
-        <template slot-scope="scope">{{ scope.row.OrderDetailList | judgmentOrderGoods}}</template>
+        <template slot-scope="scope">{{ scope.row.OrderDetailList | judgmentOrderGoods }}</template>
       </el-table-column>
       <el-table-column prop="F_AddTime" label="下单日期" align="center" />
       <el-table-column label="订单状态" align="center">
@@ -126,21 +51,18 @@
       <el-table-column label="地址" align="center">
         <template slot-scope="scope">{{ scope.row | judgmentAddress }}</template>
       </el-table-column>
+      <el-table-column prop="F_RealPrice" label="付款金额" align="center" sortable min-width="100" />
       <el-table-column prop="F_AddUserName" label="下单员工" align="center" />
       <el-table-column prop="F_BelongName" label="归属员工" align="center" />
       <el-table-column prop="F_Type" label="订单类型" align="center" />
-      <el-table-column label="物流状态" align="center" >
+      <el-table-column label="物流状态" align="center">
         <template slot-scope="scope">
           {{ scope.row.F_Status | judgmentStatusName }}
         </template>
       </el-table-column>
       <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
-          <el-button
-            v-permission="'HY_warehousing'"
-            type="text"
-            @click="btn_warehousing(scope.row.F_Id)"
-          >入库</el-button>
+          <el-button v-permission="'HY_warehousing'" type="text" @click="btn_warehousing(scope.row.F_Id)">入库</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -156,81 +78,81 @@
 </template>
 
 <script>
-import { getDictionaryValueList, getProviceCityById } from '@/api/commonAPI'
+import { getDictionaryValueList, getProviceCityById } from "@/api/commonAPI"
 import { getOrderListCustomerService } from "@/api/customerServiceManagement/orderListCustomerService"
 import { warehousingOrderCustodian } from "@/api/custodianManagement/orderListCustodian"
-import { pickerOptions, formatterContent } from "@/utils";
+import { pickerOptions, formatterContent } from "@/utils"
 import detail from "@/views/orderManagement/orderList/detail"
 import importWarehousing from "./importWarehousing"
-import Pagination from "@/components/Pagination"; // 对el-pagination 二次封装
+import Pagination from "@/components/Pagination" // 对el-pagination 二次封装
 
 export default {
   name: "CustodianReturnStorage",
   components: {
-    Pagination
+    Pagination,
   },
   filters: {
-    judgmentStateName (status) {
+    judgmentStateName(status) {
       const statusMap = {
-        '0': "未提交",
-        '1': "待分仓",
-        '2': "已退回",
-        '3': "已分仓",
-        '4': "无货",
-        '5': "仓库待审核",
-        '6': "已发货",
-        '7': "付款待审核",
-        '8': "待分物流",
-        '9': "物流未通过",
+        0: "未提交",
+        1: "待分仓",
+        2: "已退回",
+        3: "已分仓",
+        4: "无货",
+        5: "仓库待审核",
+        6: "已发货",
+        7: "付款待审核",
+        8: "待分物流",
+        9: "物流未通过",
       }
       return statusMap[status]
     },
-    judgmentOrderGoods (status) {
-      let orderGoodsNameQuantity = ''
+    judgmentOrderGoods(status) {
+      let orderGoodsNameQuantity = ""
       for (let i = 0; i < status.length; i++) {
         orderGoodsNameQuantity = `${orderGoodsNameQuantity}${status[i].F_ProductName}*${status[i].F_Count},`
       }
       orderGoodsNameQuantity = orderGoodsNameQuantity.substring(0, orderGoodsNameQuantity.length - 1)
       return orderGoodsNameQuantity
     },
-    judgmentAddress (data) {
-      let addProvince = data.F_AddProvince === null ? '' : data.F_AddProvince //省
-      let addCity = data.F_AddCity === null ? '' : data.F_AddCity //市
-      let addArea = data.F_AddArea === null ? '' : data.F_AddArea //县/区
-      let addTown = data.F_AddTown === null ? '' : data.F_AddTown //乡/镇
-      let address = data.F_Address === null ? '' : data.F_Address //详细地址
+    judgmentAddress(data) {
+      let addProvince = data.F_AddProvince === null ? "" : data.F_AddProvince //省
+      let addCity = data.F_AddCity === null ? "" : data.F_AddCity //市
+      let addArea = data.F_AddArea === null ? "" : data.F_AddArea //县/区
+      let addTown = data.F_AddTown === null ? "" : data.F_AddTown //乡/镇
+      let address = data.F_Address === null ? "" : data.F_Address //详细地址
       let addressStr = addProvince + addCity + addArea + addTown + address // 地址
       return addressStr
     },
     judgmentStatusName(status) {
       const statusMap = {
-        '0': '未发出',
-        '1': '未签收',
-        '2': '签收',
-        '3': '改代收',
-        '4': '拒收',
+        0: "未发出",
+        1: "未签收",
+        2: "签收",
+        3: "改代收",
+        4: "拒收",
       }
       return statusMap[status]
     },
   },
-  data () {
+  data() {
     return {
       loading: false,
       searchData: {
-        adFrom: '', //消息/广告媒体来源
-        type: '', //订单类型
-        id: '', //订单号
-        customer: '', //客户姓名
-        customerPhone: '', //客户手机号
-        trackingNo: '', //运单号
-        payState: '', //交易状态
+        adFrom: "", //消息/广告媒体来源
+        type: "", //订单类型
+        id: "", //订单号
+        customer: "", //客户姓名
+        customerPhone: "", //客户手机号
+        trackingNo: "", //运单号
+        payState: "", //交易状态
         provinceCity: [], // 省市县
-        minprice: '', // 最低金额
-        maxprice: '', // 最高金额
-        F_AddDes: '', // 送货说明
-        express: '', //快递
-        logisticsStatus: '', //物流状态
-        warehousing: '', // 是否入库
+        minprice: "", // 最低金额
+        maxprice: "", // 最高金额
+        F_AddDes: "", // 送货说明
+        express: "", //快递
+        logisticsStatus: "", //物流状态
+        warehousing: "", // 是否入库
       },
       searchTime: [], //订单时间
       activeName: "6", //标签切换首页
@@ -238,32 +160,32 @@ export default {
       provinceCityText: [], // 省市下拉绑定的值
       props: {
         // 自定义省市下拉数据的key值
-        value: 'id',
-        label: 'text',
-        children: 'children'
+        value: "id",
+        label: "text",
+        children: "children",
       },
       addDesList: [], // 送货说明
       pickerOptions, // 日期数据
       pageParams: {
         pageindex: 1, // 当前第几页
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-        total: 0 // 总共多少数据
+        total: 0, // 总共多少数据
       },
       dataLists: [], // 列表数据
       multipleSelection: [], // 选中的数据
       selectedId: [], // 选中的数据的id
-      orderType: [],//订单类型
+      orderType: [], //订单类型
       logisticsList: [], //物流状态
       expressList: [], //快递
       selectOrderId: [], //合并订单id
-    };
+    }
   },
   watch: {
     searchTime(newVal, oldVal) {
       !newVal && (this.searchTime = [])
-    }
+    },
   },
-  created () {
+  created() {
     if (this.$route.params.id) {
       this.activeName = this.$route.params.id
     }
@@ -274,16 +196,16 @@ export default {
     this.getAddDesList()
     this.getLogistics()
     this.getExpress()
-    document.onkeyup = e => {
+    document.onkeyup = (e) => {
       if (e.keyCode === 13) {
-        this.getList();
+        this.getList()
       }
-    };
+    }
   },
   methods: {
-    getList () {
-      this.loading = true;
-      return new Promise(resolve => {
+    getList() {
+      this.loading = true
+      return new Promise((resolve) => {
         const params = {
           F_State: this.activeName, //订单状态
           pageindex: 1, // int 第几页
@@ -294,11 +216,11 @@ export default {
           F_Customer: this.searchData.customer, //客户姓名
           F_CustomerPhone: this.searchData.customerPhone, //客户手机号
           F_TrackingNo: this.searchData.trackingNo, //运单号
-          SearchStartTime: this.searchTime[0] == null ? '' : this.searchTime[0], //添加开始时间
-          SearchEndTime: this.searchTime[1] == null ? '' : this.searchTime[1], //添加结束时间
+          SearchStartTime: this.searchTime[0] == null ? "" : this.searchTime[0], //添加开始时间
+          SearchEndTime: this.searchTime[1] == null ? "" : this.searchTime[1], //添加结束时间
           PayState: this.searchData.payState, //交易状态
           F_IsExpress: -2, //-2全部 0客服未分配快递 1已分配
-          state: '',
+          state: "",
           F_AddProvince: this.provinceCityText && this.provinceCityText[0], // 省份
           F_AddCity: this.provinceCityText[1] && this.provinceCityText[1], // 市
           F_AddArea: this.provinceCityText[2] && this.provinceCityText[2], // 县区
@@ -309,27 +231,27 @@ export default {
           F_Express: this.searchData.express, //快递
           F_Status: this.searchData.logisticsStatus, //物流状态
           Warehousing: 0, //是否入库 -- 0未入库
-        };
-        getOrderListCustomerService(params).then(response => {
-          this.loading = false;
+        }
+        getOrderListCustomerService(params).then((response) => {
+          this.loading = false
           if (response.state.toLowerCase() === "success") {
-            this.pageParams.total = response.data.Totals;
-            this.dataLists = response.data.Rows;
+            this.pageParams.total = response.data.Totals
+            this.dataLists = response.data.Rows
           }
-        });
-        resolve();
-      });
+        })
+        resolve()
+      })
     },
     //处理默认选中当前日期
     getNowTime() {
-      let now = new Date();
-      let year = now.getFullYear(); //得到年份
-      let month = now.getMonth() + 1; //得到月份
-      let date = now.getDate(); //得到日期
-      let hour =" 00:00:00"; //默认时分秒 如果传给后台的格式为年月日时分秒，就需要加这个，如若不需要，此行可忽略
-      month = month.toString().padStart(2, "0");
-      date = date.toString().padStart(2, "0");
-      let defaultDate = `${year}-${month}-${date}`;
+      let now = new Date()
+      let year = now.getFullYear() //得到年份
+      let month = now.getMonth() + 1 //得到月份
+      let date = now.getDate() //得到日期
+      let hour = " 00:00:00" //默认时分秒 如果传给后台的格式为年月日时分秒，就需要加这个，如若不需要，此行可忽略
+      month = month.toString().padStart(2, "0")
+      date = date.toString().padStart(2, "0")
+      let defaultDate = `${year}-${month}-${date}`
       this.searchTime = [defaultDate, defaultDate]
     },
     // 导入入库
@@ -338,11 +260,11 @@ export default {
         content: {
           content: importWarehousing, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: '' } // props
+          data: { rowid: "" }, // props
         },
         area: ["30%", "30%"],
-        title: "导入入库"
-      });
+        title: "导入入库",
+      })
     },
     // 批量入库
     btn_bulk_warehousing() {
@@ -350,8 +272,8 @@ export default {
         this.$message({
           message: "请选择订单！",
           type: "warning",
-        });
-        return;
+        })
+        return
       }
       this.$confirm("确定入库吗?", "提示", {
         confirmButtonText: "确定",
@@ -360,21 +282,21 @@ export default {
       })
         .then(() => {
           const data = {
-            orderids: this.selectOrderId.join(',').replace(/\s+/g, ''),
-          };
+            orderids: this.selectOrderId.join(",").replace(/\s+/g, ""),
+          }
           warehousingOrderCustodian(data).then((response) => {
             if (response.state.toLowerCase() === "success") {
-              this.getList();
-              this.$message.success("入库成功!");
+              this.getList()
+              this.$message.success("入库成功!")
             }
-          });
+          })
         })
         .catch(() => {
           this.$message({
             type: "info",
             message: "已取消入库",
-          });
-        });
+          })
+        })
     },
     // 入库
     btn_warehousing(id) {
@@ -386,44 +308,44 @@ export default {
         .then(() => {
           const data = {
             orderids: id,
-          };
+          }
           warehousingOrderCustodian(data).then((response) => {
             if (response.state.toLowerCase() === "success") {
-              this.getList();
-              this.$message.success("入库成功!");
+              this.getList()
+              this.$message.success("入库成功!")
             }
-          });
+          })
         })
         .catch(() => {
           this.$message({
             type: "info",
             message: "已取消入库",
-          });
-        });
+          })
+        })
     },
     // 获取订单类型
-    getOrderType () {
-      return new Promise(resolve => {
+    getOrderType() {
+      return new Promise((resolve) => {
         const params = {
           isleaf: true,
-          code: 'ORDERTYPE'
+          code: "ORDERTYPE",
         }
-        getDictionaryValueList(params).then(response => {
-          if (response.state.toLowerCase() === 'success') {
+        getDictionaryValueList(params).then((response) => {
+          if (response.state.toLowerCase() === "success") {
             this.orderType = response.data.Rows
           }
         })
       })
     },
     // 物流状态
-    getLogistics () {
-      return new Promise(resolve => {
+    getLogistics() {
+      return new Promise((resolve) => {
         const params = {
           isleaf: true,
-          code: 'OrderF_State'
+          code: "OrderF_State",
         }
-        getDictionaryValueList(params).then(response => {
-          if (response.state.toLowerCase() === 'success') {
+        getDictionaryValueList(params).then((response) => {
+          if (response.state.toLowerCase() === "success") {
             const res = response.data.Rows
             res.forEach((e, i) => {
               // if (e.F_Remark === "未签收") {
@@ -442,14 +364,14 @@ export default {
       })
     },
     // 快递
-    getExpress () {
-      return new Promise(resolve => {
+    getExpress() {
+      return new Promise((resolve) => {
         const params = {
           isleaf: true,
-          code: 'EXPRESS'
+          code: "EXPRESS",
         }
-        getDictionaryValueList(params).then(response => {
-          if (response.state.toLowerCase() === 'success') {
+        getDictionaryValueList(params).then((response) => {
+          if (response.state.toLowerCase() === "success") {
             this.expressList = response.data.Rows
           }
         })
@@ -460,37 +382,37 @@ export default {
       return new Promise((resolve) => {
         const params = {
           isleaf: true,
-          code: 'DELIVERYDES'
+          code: "DELIVERYDES",
         }
         getDictionaryValueList(params).then((response) => {
-          if (response.state.toLowerCase() === 'success') {
+          if (response.state.toLowerCase() === "success") {
             this.addDesList = response.data.Rows
           }
         })
       })
     },
-    handleTabClick (tab, event) {
-      this.pageParams.pageindex=1
-      this.getList();
+    handleTabClick(tab, event) {
+      this.pageParams.pageindex = 1
+      this.getList()
     },
-    btn_search () {
-      this.pageParams.pageindex = 1;
-      this.getList();
+    btn_search() {
+      this.pageParams.pageindex = 1
+      this.getList()
     },
     //订单详情
-    hadndleOrderCode (ordercode) {
+    hadndleOrderCode(ordercode) {
       this.$layer.iframe({
         content: {
           content: detail, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { 'rowid': ordercode }// props
+          data: { rowid: ordercode }, // props
         },
-        area: ['80%', '90%'],
-        title: '订单详情'
+        area: ["80%", "90%"],
+        title: "订单详情",
       })
     },
     //选择多个
-    handleSelectionChange (val) {
+    handleSelectionChange(val) {
       const ids = []
       this.multipleSelection = val
       for (let i = 0; i < this.multipleSelection.length; i++) {
@@ -506,19 +428,15 @@ export default {
         .catch((err) => {})
     },
     handleItemChange(val) {
-      this.provinceCityText = this.$refs['myCascader'].currentLabels
+      this.provinceCityText = this.$refs["myCascader"].currentLabels
       const pid = val ? val[val.length - 1] : 1 // id值
       this.level = val.length + 1 // 判断第几级
-      this.provinceCityDatas = this.handleData(
-        this.provinceCityDatas,
-        pid,
-        this.level
-      )
+      this.provinceCityDatas = this.handleData(this.provinceCityDatas, pid, this.level)
     },
     handleData(data, val, level) {
       for (let i = 0; i < data.length; i++) {
         if (!data[i].children) {
-          this.$set(data[i], 'children', [])
+          this.$set(data[i], "children", [])
         }
         if (data[i].id === val) {
           getProviceCityById({ pid: val })
@@ -527,7 +445,7 @@ export default {
                 data[i].children = res.data
                 if (this.level !== 4) {
                   data[i].children.forEach((ele) => {
-                    this.$set(ele, 'children', [])
+                    this.$set(ele, "children", [])
                   })
                 }
               } else {
@@ -543,12 +461,26 @@ export default {
       }
       return data
     },
-  }
-};
+  },
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+.filter-container {
+  .el-select {
+    margin-right: 10px;
+  }
+  .el-date-editor {
+    margin-right: 10px;
+  }
+  .el-cascader {
+    margin-right: 10px;
+  }
+  .filter-item {
+    vertical-align: top;
+  }
+}
 .el {
   cursor: pointer;
 }
-</style>
+</style>

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

@@ -56,7 +56,7 @@
           {{ scope.row.F_State | judgmentStateName }}
         </template>
       </el-table-column>
-      <el-table-column prop="F_FlowNum" label="运单号" align="center" min-width />
+      <el-table-column prop="F_TrackingNo" label="运单号" align="center" min-width />
       <el-table-column prop="F_AddUserName" label="下单员工" align="center" />
       <el-table-column prop="F_BelongName" label="归属员工" align="center" />
       <el-table-column prop="F_Type" label="订单类型" align="center" />

CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerServiceEMS/goback.vue

@@ -0,0 +1,95 @@
+<template>
+  <div>
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="80px">
+      <el-form-item label="退回" prop="state">
+        <el-select
+          v-model="ruleForm.state"
+          class="form_select"
+          filterable
+          clearable
+          placeholder="请选择退回"
+          @change="selectback"
+        >
+          <el-option label="退回上一级" value="0" />
+          <el-option label="退回销售" value="1" />
+        </el-select>
+      </el-form-item>
+      <el-form-item v-show="ishow" label="退回原因">
+        <el-input v-model="ruleForm.remark" type="textarea" placeholder="退回原因"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm()">提交</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+import { gobackOrderCustomerService } from '@/api/customerServiceManagement/orderListCustomerService'
+export default {
+  props: {
+    rowid: {
+      type: String,
+      default: ''
+    },
+    layerid: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      ishow: true, // 原因显隐
+      ruleForm: {
+        orderids: '', // 订单编号
+        remark: '', // 备注
+        state: ''
+      },
+      rules: {
+        state: [
+          {
+            required: true,
+            trigger: 'change',
+            message: '请选择退回'
+          }
+        ]
+      }
+    }
+  },
+  created() {
+    if (this.rowid) {
+      this.ruleForm.orderids = this.rowid
+    }
+  },
+  methods: {
+    submitForm() {
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          gobackOrderCustomerService(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
+            })
+        }
+      })
+    },
+    selectback(e) {
+      if (e === '0') {
+        this.ishow = false
+      } else {
+        this.ishow = true
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.form_select {
+  width: 100%
+}
+</style>

CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerServiceEMS/importSubmit.vue

@@ -0,0 +1,129 @@
+<template>
+  <div class="importFile">
+    <el-alert title="选取的EXCEL文件需要严格按照下载的EXCEL模板进行填写！选择好文件后点击导入即可！" type="warning" class="md" show-icon/>
+    <el-row>
+      <el-col :lg="7" class="md">
+        <a :href="downloadUrl" download="提交导入模板.xlsx" class="download_btn" title="点击下载EXCEL模板" rel="nofollow">
+          下载EXCEL模板
+        </a>
+      </el-col>
+      <el-col :lg="17" class="md">
+        <el-upload
+          ref="upload"
+          :limit="1"
+          :file-list="uploadData.fileList"
+          :action= "uploadData.uploadUrl"
+          :data = "uploadData.uploaderFiles"
+          :on-success="uploadSuccess"
+          :on-error="uploadError"
+          :on-exceed="uploadExceed"
+          :auto-upload="false"
+          :headers = "uploadData.uploadHeader"
+          class="uploadFiles"
+          list-type="text"
+          name="upFile"
+          accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel">
+          <el-button slot="trigger" size="small" type="primary">选取EXCEL文件</el-button>
+          <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">导入</el-button>
+          <!-- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div> -->
+        </el-upload>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getToken } from '@/utils/auth'
+
+export default {
+  name: 'ImportFile',
+  props: {
+    rowid: {
+      type: String,
+      default: ''
+    },
+    layerid: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      downloadUrl: '/static/xls/importCustomerServiceSubmit.xlsx',
+      uploadData: {// 文件上传数据
+        uploadHeader: {
+          Authorization: getToken(),
+        },
+        uploadUrl: this.$store.getters.serverConfig.BASE_API + 'api/KFOrder/importordersubmitexcel',
+        uploaderFiles: {// 上传文件的参数
+        
+        },
+        fileList: [], // 展示文件的数据
+      }
+    }
+  },
+  created() {
+  },
+  methods: {
+    submitUpload() {
+      this.$refs.upload.submit()
+    },
+    // 文件上传
+    uploadSuccess(response, file, fileList) {
+      if (response.state.toLowerCase() === 'success') {
+        this.$parent.$layer.close(this.layerid)
+        this.$parent.getList() // 重新加载父级数据
+        this.$message.success('恭喜你，导入成功!')
+      } else {
+        this.$message.error(response.message)
+      }
+    },
+    uploadExceed(file, fileList) {
+      this.$message.warning('只能选择一个文件!')
+    },
+    uploadError(err, file, fileList) {
+      this.$message.error(err)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+	.importFile{
+		.md{
+			margin-bottom: 20px;
+		}
+		.download_btn{
+			display: inline-block;
+			line-height: 1;
+			white-space: nowrap;
+			cursor: pointer;
+			border: 1px solid #dcdfe6;
+			-webkit-appearance: none;
+			text-align: center;
+			-webkit-box-sizing: border-box;
+			box-sizing: border-box;
+			outline: 0;
+			margin: 0;
+			-webkit-transition: .1s;
+			transition: .1s;
+			font-weight: 500;
+			padding: 9px 15px;
+			font-size: 12px;
+			border-radius: 4px;
+			color: #fff;
+			background-color: #409EFF;
+			border-color: #409EFF;
+			&:hover{
+				background: #66b1ff;
+				border-color: #66b1ff;
+				color: #fff;
+			}
+			&:active{
+				background: #66b1ff;
+				border-color: #66b1ff;
+				color: #fff;
+			}
+		}
+	}
+</style>

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

@@ -0,0 +1,376 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <el-date-picker
+        v-model="searchData.searchTime"
+        :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="searchData.expressTime"
+        :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-input v-model="searchData.adFrom" placeholder="请输入消息/广告媒体来源" class="filter-item" />
+      <el-select v-model="searchData.type" class="filter-item" filterable clearable placeholder="请选择订单类型">
+        <el-option v-for="item in orderType" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value"/>
+      </el-select>
+      <el-input v-model="searchData.id" placeholder="请输入订单号" class="filter-item" />
+      <el-input v-model="searchData.customer" placeholder="请输入客户姓名" class="filter-item" />
+      <el-input v-model="searchData.customerPhone" placeholder="请输入客户手机号" class="filter-item" />
+      <!-- <el-input v-model="searchData.trackingNo" 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_bulk_submit'" type="primary" class="filter-item" @click="btn_bulk_submit">批量提交</el-button>
+      <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量退回</el-button>
+      <el-button v-permission="'HY_export'" type="primary" class="filter-item" @click="btn_export">导出</el-button>
+      <el-button v-permission="'HY_import_submit'" type="primary" class="filter-item" @click="btn_import_submit">导入附件提交</el-button>
+    </div>
+    <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick" >
+      <el-tab-pane label="全部" name="3"/>
+    </el-tabs>
+    <div>
+      <span>订单数量：{{ pageParams.total }}</span>
+    </div>
+    <el-table v-loading="loading" :data="dataLists" border stripe row-key="F_Id" @selection-change="handleSelectionChange">
+      <el-table-column :reserve-selection="true" type="selection"/>
+      <el-table-column type="index" label="编号" align="center" fixed width="80" />
+      <el-table-column prop="F_Id" label="订单编号" align="center" min-width="180" >
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_Id)">{{ scope.row.F_Id }}</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column prop="F_Customer" label="客户姓名" align="center" min-width />
+      <el-table-column prop="F_CustomerPhone" label="手机号码" align="center" min-width="140" />
+      <el-table-column label="订购商品" align="center" min-width>
+        <template slot-scope="scope">
+          {{ scope.row.OrderDetailList | judgmentOrderGoods }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="F_AddTime" label="下单日期" align="center" />
+      <el-table-column label="订单状态" align="center" >
+        <template slot-scope="scope">
+          {{ scope.row.F_State | judgmentStateName }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="F_PayType" label="付款类型" align="center"/>
+      <el-table-column prop="F_RealPrice" label="付款金额" align="center"/>
+      <el-table-column prop="F_AddDes" label="送货说明" align="center"/>
+      <el-table-column prop="F_AddUserName" label="下单员工" align="center" />
+      <el-table-column prop="F_BelongName" label="归属员工" align="center" />
+      <el-table-column prop="F_Type" label="订单类型" align="center" />
+      <el-table-column prop="F_Express" label="快递公司" align="center" />
+      <el-table-column prop="F_ExpressTime" 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_submit'"
+            type="text"
+            @click="btn_submit(scope.row.F_Id)"
+          >提交</el-button>
+          <el-button
+            v-permission="'HY_goback'"
+            type="text"
+            @click="btn_goback(scope.row.F_Id)"
+          >客服退回</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- <pagination
+      v-show="pageParams.total > 0"
+      :total="pageParams.total"
+      :pageindex.sync="pageParams.pageindex"
+      :pagesize.sync="pageParams.pagesize"
+      class="pagination"
+      @pagination="getList"
+    /> -->
+  </div>
+</template>
+
+<script>
+import { getDictionaryValueList } from '@/api/commonAPI'
+import { getOrderListCustomerService, submitOrderCustomerService } from '@/api/customerServiceManagement/orderListCustomerService'
+import { pickerOptions, formatterContent } from '@/utils'
+import goback from './goback'
+import importSubmit from './importSubmit'
+import detail from '@/views/orderManagement/orderList/detail'
+import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
+export default {
+  name: 'OrderListCustomerService',
+  components: {
+    Pagination
+  },
+  filters: {
+    judgmentStateName(status) {
+      const statusMap = {
+        '0': '未提交',
+        '1': '待分仓',
+        '2': '已退回',
+        '3': '已分仓',
+        '4': '无货',
+        '5': '仓库待审核',
+        '6': '已发货',
+        '7': '付款待审核',
+        '8': '待分物流',
+        '9': '物流未通过'
+      }
+      return statusMap[status]
+    },
+    judgmentOrderGoods(status) {
+      let orderGoodsNameQuantity = ''
+      for (let i = 0; i < status.length; i++) {
+        orderGoodsNameQuantity = `${orderGoodsNameQuantity}${status[i].F_ProductName}*${status[i].F_Count},`
+      }
+      orderGoodsNameQuantity = orderGoodsNameQuantity.substring(0, orderGoodsNameQuantity.length - 1)
+      return orderGoodsNameQuantity
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      searchData: {
+        adFrom: '', // 消息/广告媒体来源
+        type: '', // 订单类型
+        id: '', // 订单号
+        customer: '', // 客户姓名
+        customerPhone: '', // 客户手机号
+        trackingNo: '', // 运单号
+        searchTime: '', // 订单时间
+        expressTime: '', // 快递分物流时间
+      },
+      activeName: '3', // 标签切换首页
+      pickerOptions, // 日期数据
+      pageParams: {
+        pageindex: 1, // 当前第几页
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+        total: 0 // 总共多少数据
+      },
+      dataLists: [], // 列表数据
+      multipleSelection: [], // 选中的数据
+      orderType: [], // 订单类型
+      selectOrderId: [] // 选中id
+    }
+  },
+  created() {
+    this.getOrderType()
+    this.getList()
+    document.onkeyup = e => {
+      if (e.keyCode === 13) {
+        this.getList()
+      }
+    }
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      return new Promise(resolve => {
+        const params = {
+          F_State: this.activeName, // 订单状态 -2全部
+          pageindex: 1, // int 第几页
+          pagesize: 1000000, // int 每页几条信息
+          F_ADFrom: this.searchData.adFrom, // 消息/广告来源
+          F_Type: this.searchData.type, // 订单类型
+          F_Id: this.searchData.id, // 订单号
+          F_Customer: this.searchData.customer, // 客户姓名
+          F_CustomerPhone: this.searchData.customerPhone, // 客户手机号
+          F_TrackingNo: this.searchData.trackingNo, // 运单号
+          SearchStartTime: this.searchData.searchTime && this.searchData.searchTime[0], // 添加开始时间
+          SearchEndTime: this.searchData.searchTime && this.searchData.searchTime[1], // 添加结束时间
+          F_IsExpress: 1, // -2全部 0客服未分配快递 1已分配
+          startexpress: this.searchData.expressTime && this.searchData.expressTime[0],
+          endexpress: this.searchData.expressTime && this.searchData.expressTime[1],
+          F_Express: 'EMS'
+        }
+        getOrderListCustomerService(params).then(response => {
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            this.pageParams.total = response.data.Totals
+            this.dataLists = response.data.Rows
+          }
+        })
+        resolve()
+      })
+    },
+    // 获取订单类型
+    getOrderType() {
+      return new Promise(resolve => {
+        const params = {
+          isleaf: true,
+          code: 'ORDERTYPE'
+        }
+        getDictionaryValueList(params).then(response => {
+          if (response.state.toLowerCase() === 'success') {
+            this.orderType = response.data.Rows
+          }
+        })
+      })
+    },
+    handleTabClick(tab, event) {
+      this.getList()
+    },
+    btn_search() {
+      this.pageParams.pageindex = 1
+      this.getList()
+    },
+    // 提交
+    btn_submit(orderId) {
+      this.isDisable = true
+      setTimeout(() => {
+        this.$confirm('您确定提交吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            this.isDisable = false
+            const data = {
+              orderids: orderId
+            }
+            submitOrderCustomerService(data).then((response) => {
+              if (response.state.toLowerCase() === 'success') {
+                this.getList()
+                this.$message.success('提交成功!')
+              }
+            })
+          })
+          .catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消提交'
+            })
+          })
+        this.isDisable = false
+      }, 300)
+    },
+    // 批量退回
+    btn_bulk_goback() {
+      if (this.selectOrderId.length < 1) {
+        this.$message({
+          message: '请选择订单！',
+          type: 'warning'
+        })
+        return
+      }
+      const orderids = this.selectOrderId.join(',').replace(/\s+/g, '')
+      this.$layer.iframe({
+        content: {
+          content: goback, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: orderids } // props
+        },
+        area: ['30%', '30%'],
+        title: '退回订单'
+      })
+    },
+
+    // 批量提交
+    btn_bulk_submit() {
+      if (this.selectOrderId.length < 1) {
+        this.$message({
+          message: '请选择订单！',
+          type: 'warning'
+        })
+        return
+      }
+      this.isDisable = true
+      setTimeout(() => {
+        this.$confirm('您确定提交吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            this.isDisable = false
+            const data = {
+              orderids: this.selectOrderId.join(',').replace(/\s+/g, '')
+            }
+            submitOrderCustomerService(data).then((response) => {
+              if (response.state.toLowerCase() === 'success') {
+                this.getList()
+                this.$message.success('提交成功!')
+              }
+            })
+          })
+          .catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消提交'
+            })
+          })
+        this.isDisable = false
+      }, 300)
+    },
+    // 退回订单
+    btn_goback(orderid) {
+      this.$layer.iframe({
+        content: {
+          content: goback, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: orderid } // props
+        },
+        area: ['30%', '30%'],
+        title: '退回订单'
+      })
+    },
+    // 导出
+    btn_export() {
+      const SearchStartTime = this.searchData.searchTime[0] == undefined ? '' : this.searchData.searchTime[0]
+      const SearchEndTime = this.searchData.searchTime[1] == undefined ? '' : this.searchData.searchTime[1]
+      window.location.href = this.$store.getters.serverConfig.BASE_API + 'api/order/getorderlistbykfpage?isdc=1' + '&F_State=' + this.activeName + '&SearchStartTime=' + SearchStartTime + '&SearchEndTime=' + SearchEndTime + '&F_Express=' + '京东快递'
+    },
+    // 导入附件提交
+    btn_import_submit() {
+      this.$layer.iframe({
+        content: {
+          content: importSubmit, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: '' } // props
+        },
+        area: ['30%', '30%'],
+        title: '导入附件提交'
+      })
+    },
+    hadndleOrderCode(ordercode) {
+      this.$layer.iframe({
+        content: {
+          content: detail, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { 'rowid': ordercode }// props
+        },
+        area: ['80%', '90%'],
+        title: '订单详情'
+      })
+    },
+    // 选择多个
+    handleSelectionChange(val) {
+      const ids = []
+      this.multipleSelection = val
+      for (let i = 0; i < this.multipleSelection.length; i++) {
+        ids.push(this.multipleSelection[i].F_Id)
+      }
+      this.selectOrderId = ids
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el{
+  cursor: pointer;
+}
+</style>

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

@@ -195,7 +195,7 @@ export default {
           F_PayState: -2, // 支付状态-2 全部0待回款 1已完成 2待退款 3已完成
           startexpress: this.searchData.expressTime && this.searchData.expressTime[0],
           endexpress: this.searchData.expressTime && this.searchData.expressTime[1],
-          F_Express: '韵达快递'
+          F_Express: '京东袜子'
         }
         getOrderListCustomerService(params).then(response => {
           this.loading = false

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

@@ -196,7 +196,7 @@ export default {
           F_PayState: -2, // 支付状态-2 全部0待回款 1已完成 2待退款 3已完成
           startexpress: this.searchData.expressTime && this.searchData.expressTime[0],
           endexpress: this.searchData.expressTime && this.searchData.expressTime[1],
-          F_Express: '申通快递'
+          F_Express: '汇通袜子'
         }
         getOrderListCustomerService(params).then(response => {
           this.loading = false

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

@@ -196,7 +196,7 @@ export default {
           F_PayState: -2, // 支付状态-2 全部0待回款 1已完成 2待退款 3已完成
           startexpress: this.searchData.expressTime && this.searchData.expressTime[0],
           endexpress: this.searchData.expressTime && this.searchData.expressTime[1],
-          F_Express: '圆通快递'
+          F_Express: '汇通快递'
         }
         getOrderListCustomerService(params).then(response => {
           this.loading = false

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

@@ -197,7 +197,7 @@ export default {
           F_PayState: -2, // 支付状态-2 全部0待回款 1已完成 2待退款 3已完成
           startexpress: this.searchData.expressTime && this.searchData.expressTime[0],
           endexpress: this.searchData.expressTime && this.searchData.expressTime[1],
-          F_Express: '中通快递'
+          F_Express: '邮政小包'
         }
         getOrderListCustomerService(params).then(response => {
           this.loading = false

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

@@ -1,60 +1,16 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-date-picker
-        v-model="searchTime"
-        :picker-options="pickerOptions"
-        class="filter-item"
-        type="daterange"
-        format="yyyy年MM月dd日"
-        value-format="yyyy-MM-dd"
-        unlink-panels
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      />
-      <!-- :clearable="false" -->
-      <!-- align="left" -->
-      <el-cascader
-        ref="myCascader"
-        v-model="searchData.provinceCity"
-        :options="provinceCityDatas"
-        :props="props"
-        placeholder="请选择地区"
-        class="form_select area"
-        clearable
-        change-on-select
-        @change="handleItemChange"
-      />
-      <el-input v-model="searchData.minprice" placeholder="请输入最低金额" class="filter-item" />
-      <el-input v-model="searchData.maxprice" placeholder="请输入最高金额" class="filter-item" />
-      <el-select
-        v-model="searchData.F_AddDes"
-        placeholder="请选择送货说明"
-        class="form_select"
-        clearable
-      >
-        <el-option
-          v-for="item in addDesList"
-          :key="item.F_Value"
-          :label="item.F_Value"
-          :value="item.F_Value"
-        />
+      <el-date-picker v-model="searchTime" :picker-options="pickerOptions" class="filter-item" type="daterange" format="yyyy年MM月dd日" value-format="yyyy-MM-dd" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
+      <el-cascader ref="myCascader" v-model="searchData.provinceCity" :options="provinceCityDatas" :props="props" placeholder="请选择地区" class="form_select area filter-item" clearable change-on-select @change="handleItemChange" />
+      <!-- <el-input v-model="searchData.minprice" placeholder="请输入最低金额" class="filter-item" />
+      <el-input v-model="searchData.maxprice" placeholder="请输入最高金额" class="filter-item" /> -->
+      <el-select v-model="searchData.F_AddDes" placeholder="请选择送货说明" class="form_select filter-item" clearable>
+        <el-option v-for="item in addDesList" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value" />
       </el-select>
       <el-input v-model="searchData.adFrom" placeholder="请输入消息来源" class="filter-item" />
-      <el-select
-        v-model="searchData.type"
-        class="filter-item"
-        filterable
-        clearable
-        placeholder="请选择订单类型"
-      >
-        <el-option
-          v-for="item in orderType"
-          :key="item.F_Value"
-          :label="item.F_Value"
-          :value="item.F_Value"
-        />
+      <el-select v-model="searchData.type" class="filter-item" filterable clearable placeholder="请选择订单类型">
+        <el-option v-for="item in orderType" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value" />
       </el-select>
       <el-input v-model="searchData.id" placeholder="请输入订单编号" class="filter-item" />
       <!-- <el-input v-model="searchData.customer" placeholder="请输入客户姓名" class="filter-item" />
@@ -72,56 +28,27 @@
         <el-option label="待退款" value="2"></el-option>
         <el-option label="已退款" value="3"></el-option>
       </el-select> -->
-      <el-select
-        v-model="searchData.stock"
-        class="filter-item"
-        filterable
-        clearable
-        placeholder="请选择仓库"
-        @change="changeStock"
-      >
-        <el-option
-          v-for="item in warehouseNameList"
-          :key="item.F_Value"
-          :label="item.F_Value"
-          :value="item.F_Value"
-        />
+      <el-select v-model="searchData.stock" class="filter-item" filterable clearable placeholder="请选择仓库" @change="changeStock">
+        <el-option v-for="item in warehouseNameList" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value" />
       </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"
-        @click="btn_waybill_number_import"
-      >运单号导入</el-button> -->
-      <!-- <el-button v-permission="'HY_merge'" type="primary" class="filter-item" @click="btn_merge">合并</el-button> -->
       <el-button v-permission="'HY_bulk_logistics'" type="primary" class="filter-item" @click="btn_bulk_logistics">批量分物流</el-button>
       <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量退回</el-button>
       <el-button v-permission="'HY_export'" type="primary" class="filter-item" @click="btn_export">导出</el-button>
       <el-button v-permission="'HY_import_goback'" type="primary" class="filter-item" @click="btn_import_goback">导入附件退回</el-button>
     </div>
     <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick">
-      <el-tab-pane label="待分物流" name="8"/>
+      <el-tab-pane label="待分物流" name="8" />
     </el-tabs>
     <div>
       <span>订单数量：{{ pageParams.total }}</span>
     </div>
-    <el-table
-      v-loading="loading"
-      :data="dataLists"
-      border
-      stripe
-      row-key="F_Id"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column :reserve-selection="true" type="selection"/>
+    <el-table v-loading="loading" :data="dataLists" border stripe row-key="F_Id" @selection-change="handleSelectionChange">
+      <el-table-column :reserve-selection="true" type="selection" />
       <el-table-column type="index" label="编号" align="center" fixed width="80" />
       <el-table-column prop="F_Id" label="订单编号" align="center" min-width="180">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="hadndleOrderCode(scope.row.F_Id)"
-          >{{ scope.row.F_Id }}</el-button>
+          <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_Id)">{{ scope.row.F_Id }}</el-button>
         </template>
       </el-table-column>
       <el-table-column prop="F_Customer" label="客户姓名" align="center" min-width />
@@ -136,25 +63,16 @@
       <el-table-column label="地址" align="center">
         <template slot-scope="scope">{{ scope.row | judgmentAddress }}</template>
       </el-table-column>
-      <el-table-column prop="F_PayType" label="付款类型" align="center"/>
-      <el-table-column prop="F_RealPrice" label="付款金额" align="center"/>
-      <el-table-column prop="F_AddDes" label="送货说明" align="center"/>
+      <el-table-column prop="F_PayType" label="付款类型" align="center" />
+      <el-table-column prop="F_RealPrice" label="付款金额" align="center" sortable min-width="100" />
+      <el-table-column prop="F_AddDes" label="送货说明" align="center" />
       <el-table-column prop="F_AddUserName" label="下单员工" align="center" />
       <el-table-column prop="F_BelongName" label="归属员工" align="center" />
       <el-table-column prop="F_Type" label="订单类型" align="center" />
       <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
-          <el-button
-            v-permission="'HY_logistics'"
-            type="text"
-            @click="btn_logistics(scope.row.F_Id, scope.row.F_Stock)"
-          >分物流</el-button>
-          <el-button
-            v-permission="'HY_goback'"
-            type="text"
-            @click="btn_goback(scope.row.F_Id)"
-          >客服退回</el-button>
-
+          <el-button v-permission="'HY_logistics'" type="text" @click="btn_logistics(scope.row.F_Id, scope.row.F_Stock)">分物流</el-button>
+          <el-button v-permission="'HY_goback'" type="text" @click="btn_goback(scope.row.F_Id)">客服退回</el-button>
           <!-- <el-button v-permission="'HY_label'" type="text" @click="btn_label(scope.row.F_Id)">标签</el-button> -->
         </template>
       </el-table-column>
@@ -171,38 +89,38 @@
 </template>
 
 <script>
-import { getDictionaryValueList, getProviceCityById } from '@/api/commonAPI'
-import { getOrderListCustomerService } from '@/api/customerServiceManagement/orderListCustomerService'
-import { pickerOptions, formatterContent } from '@/utils'
-import importGoback from './importGoback'
-import goback from './goback'
-import logistics from './logistics'
-import detail from '@/views/orderManagement/orderList/detail'
-import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
-import { gobackOrderCustomerService } from '@/api/customerServiceManagement/orderListCustomerService'
+import { getDictionaryValueList, getProviceCityById } from "@/api/commonAPI"
+import { getOrderListCustomerService } from "@/api/customerServiceManagement/orderListCustomerService"
+import { pickerOptions, formatterContent } from "@/utils"
+import importGoback from "./importGoback"
+import goback from "./goback"
+import logistics from "./logistics"
+import detail from "@/views/orderManagement/orderList/detail"
+import Pagination from "@/components/Pagination" // 对el-pagination 二次封装
+import { gobackOrderCustomerService } from "@/api/customerServiceManagement/orderListCustomerService"
 export default {
-  name: 'OrderListCustomerService',
+  name: "OrderListCustomerService",
   components: {
-    Pagination
+    Pagination,
   },
   filters: {
     judgmentStateName(status) {
       const statusMap = {
-        '0': '未提交',
-        '1': '待分仓',
-        '2': '已退回',
-        '3': '已分仓',
-        '4': '无货',
-        '5': '仓库待审核',
-        '6': '已发货',
-        '7': '付款待审核',
-        '8': '待分物流',
-        '9': '物流未通过'
+        0: "未提交",
+        1: "待分仓",
+        2: "已退回",
+        3: "已分仓",
+        4: "无货",
+        5: "仓库待审核",
+        6: "已发货",
+        7: "付款待审核",
+        8: "待分物流",
+        9: "物流未通过",
       }
       return statusMap[status]
     },
     judgmentOrderGoods(status) {
-      let orderGoodsNameQuantity = ''
+      let orderGoodsNameQuantity = ""
       for (let i = 0; i < status.length; i++) {
         orderGoodsNameQuantity = `${orderGoodsNameQuantity}${status[i].F_ProductName}*${status[i].F_Count},`
       }
@@ -210,62 +128,62 @@ export default {
       return orderGoodsNameQuantity
     },
     judgmentAddress(data) {
-      const addProvince = data.F_AddProvince === null ? '' : data.F_AddProvince // 省
-      const addCity = data.F_AddCity === null ? '' : data.F_AddCity // 市
-      const addArea = data.F_AddArea === null ? '' : data.F_AddArea // 县/区
-      const addTown = data.F_AddTown === null ? '' : data.F_AddTown // 乡/镇
-      const address = data.F_Address === null ? '' : data.F_Address // 详细地址
+      const addProvince = data.F_AddProvince === null ? "" : data.F_AddProvince // 省
+      const addCity = data.F_AddCity === null ? "" : data.F_AddCity // 市
+      const addArea = data.F_AddArea === null ? "" : data.F_AddArea // 县/区
+      const addTown = data.F_AddTown === null ? "" : data.F_AddTown // 乡/镇
+      const address = data.F_Address === null ? "" : data.F_Address // 详细地址
       const addressStr = addProvince + addCity + addArea + addTown + address // 地址
       return addressStr
-    }
+    },
   },
   data() {
     return {
       loading: false,
       warehouseNameList: [], // 仓库名称
-      logisticsStock: '', // 物流仓库
+      logisticsStock: "", // 物流仓库
       searchData: {
-        adFrom: '', // 消息/广告媒体来源
-        type: '', // 订单类型
-        id: '', // 订单号
-        customer: '', // 客户姓名
-        customerPhone: '', // 客户手机号
-        trackingNo: '', // 运单号
-        payState: '', // 交易状态
+        adFrom: "", // 消息/广告媒体来源
+        type: "", // 订单类型
+        id: "", // 订单号
+        customer: "", // 客户姓名
+        customerPhone: "", // 客户手机号
+        trackingNo: "", // 运单号
+        payState: "", // 交易状态
         provinceCity: [], // 省市县
-        minprice: '', // 最低金额
-        maxprice: '', // 最高金额
-        F_AddDes: '', // 送货说明
-        stock: ''
+        minprice: "", // 最低金额
+        maxprice: "", // 最高金额
+        F_AddDes: "", // 送货说明
+        stock: "",
       },
       searchTime: [], // 订单时间
-      activeName: '8', // 标签切换首页
+      activeName: "8", // 标签切换首页
       provinceCityDatas: [], // 省市下拉数据
       provinceCityText: [], // 省市下拉绑定的值
       props: {
         // 自定义省市下拉数据的key值
-        value: 'id',
-        label: 'text',
-        children: 'children'
+        value: "id",
+        label: "text",
+        children: "children",
       },
       addDesList: [], // 送货说明
       pickerOptions, // 日期数据
       pageParams: {
         pageindex: 1, // 当前第几页
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-        total: 0 // 总共多少数据
+        total: 0, // 总共多少数据
       },
       dataLists: [], // 列表数据
       multipleSelection: [], // 选中的数据
       selectedId: [], // 选中的数据的id
       orderType: [], // 订单类型
-      selectOrderId: [] // 合并订单id
+      selectOrderId: [], // 合并订单id
     }
   },
   watch: {
     searchTime(newVal, oldVal) {
       !newVal && (this.searchTime = [])
-    }
+    },
   },
   created() {
     if (this.$route.params.id) {
@@ -277,7 +195,7 @@ export default {
     this.getProCity()
     this.getAddDesList()
     this.getwarehouseName()
-    document.onkeyup = e => {
+    document.onkeyup = (e) => {
       if (e.keyCode === 13) {
         this.getList()
       }
@@ -286,7 +204,7 @@ export default {
   methods: {
     getList() {
       this.loading = true
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         const params = {
           F_State: this.activeName, // 订单状态
           pageindex: 1, // int 第几页
@@ -297,11 +215,11 @@ export default {
           F_Customer: this.searchData.customer, // 客户姓名
           F_CustomerPhone: this.searchData.customerPhone, // 客户手机号
           F_TrackingNo: this.searchData.trackingNo, // 运单号
-          SearchStartTime: this.searchTime[0] == null ? '' : this.searchTime[0], // 添加开始时间
-          SearchEndTime: this.searchTime[1] == null ? '' : this.searchTime[1], // 添加结束时间
+          SearchStartTime: this.searchTime[0] == null ? "" : this.searchTime[0], // 添加开始时间
+          SearchEndTime: this.searchTime[1] == null ? "" : this.searchTime[1], // 添加结束时间
           PayState: this.searchData.payState, // 交易状态
           F_IsExpress: 0, // -2全部 0客服未分配快递 1已分配
-          state: '',
+          state: "",
           F_AddProvince: this.provinceCityText && this.provinceCityText[0], // 省份
           F_AddCity: this.provinceCityText[1] && this.provinceCityText[1], // 市
           F_AddArea: this.provinceCityText[2] && this.provinceCityText[2], // 县区
@@ -309,11 +227,11 @@ export default {
           minprice: this.searchData.minprice, // 最低金额
           maxprice: this.searchData.maxprice, // 最高金额
           F_AddDes: this.searchData.F_AddDes, // 送货说明
-          F_Stock: this.searchData.stock // 仓库
+          F_Stock: this.searchData.stock, // 仓库
         }
-        getOrderListCustomerService(params).then(response => {
+        getOrderListCustomerService(params).then((response) => {
           this.loading = false
-          if (response.state.toLowerCase() === 'success') {
+          if (response.state.toLowerCase() === "success") {
             this.pageParams.total = response.data.Totals
             this.dataLists = response.data.Rows
           }
@@ -327,21 +245,21 @@ export default {
       const year = now.getFullYear() // 得到年份
       let month = now.getMonth() + 1 // 得到月份
       let date = now.getDate() // 得到日期
-      const hour = ' 00:00:00' // 默认时分秒 如果传给后台的格式为年月日时分秒，就需要加这个，如若不需要，此行可忽略
-      month = month.toString().padStart(2, '0')
-      date = date.toString().padStart(2, '0')
+      const hour = " 00:00:00" // 默认时分秒 如果传给后台的格式为年月日时分秒，就需要加这个，如若不需要，此行可忽略
+      month = month.toString().padStart(2, "0")
+      date = date.toString().padStart(2, "0")
       const defaultDate = `${year}-${month}-${date}`
       this.searchTime = [defaultDate, defaultDate]
     },
     // 获取仓库名称
     getwarehouseName() {
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         const params = {
           isleaf: true,
-          code: 'STOCK'
+          code: "STOCK",
         }
-        getDictionaryValueList(params).then(response => {
-          if (response.state.toLowerCase() === 'success') {
+        getDictionaryValueList(params).then((response) => {
+          if (response.state.toLowerCase() === "success") {
             this.warehouseNameList = response.data.Rows
           }
         })
@@ -349,13 +267,13 @@ export default {
     },
     // 获取订单类型
     getOrderType() {
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         const params = {
           isleaf: true,
-          code: 'ORDERTYPE'
+          code: "ORDERTYPE",
         }
-        getDictionaryValueList(params).then(response => {
-          if (response.state.toLowerCase() === 'success') {
+        getDictionaryValueList(params).then((response) => {
+          if (response.state.toLowerCase() === "success") {
             this.orderType = response.data.Rows
           }
         })
@@ -366,10 +284,10 @@ export default {
       return new Promise((resolve) => {
         const params = {
           isleaf: true,
-          code: 'DELIVERYDES'
+          code: "DELIVERYDES",
         }
         getDictionaryValueList(params).then((response) => {
-          if (response.state.toLowerCase() === 'success') {
+          if (response.state.toLowerCase() === "success") {
             this.addDesList = response.data.Rows
           }
         })
@@ -388,10 +306,10 @@ export default {
         content: {
           content: edit, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: editId } // props
+          data: { rowid: editId }, // props
         },
-        area: ['80%', '90%'],
-        title: '编辑订单'
+        area: ["80%", "90%"],
+        title: "编辑订单",
       })
     },
     // 导入
@@ -400,31 +318,31 @@ export default {
         content: {
           content: importWaybillNumber, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { 'rowid': '' }// props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
+          data: { rowid: "" }, // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
         },
-        area: ['40%', '380px'],
+        area: ["40%", "380px"],
         shadeClose: false,
-        title: '导入订单信息'
+        title: "导入订单信息",
       })
     },
     // 批量分物流
     btn_bulk_logistics() {
       if (this.selectOrderId.length < 1) {
         this.$message({
-          message: '请选择订单！',
-          type: 'warning'
+          message: "请选择订单！",
+          type: "warning",
         })
         return
       }
-      const orderids = this.selectOrderId.join(',').replace(/\s+/g, '')
+      const orderids = this.selectOrderId.join(",").replace(/\s+/g, "")
       this.$layer.iframe({
         content: {
           content: logistics, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: orderids, stock: this.logisticsStock } // props
+          data: { rowid: orderids, stock: this.logisticsStock }, // props
         },
-        area: ['30%', '30%'],
-        title: '物流'
+        area: ["30%", "30%"],
+        title: "物流",
       })
     },
     // 分物流
@@ -433,30 +351,30 @@ export default {
         content: {
           content: logistics, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: orderid, stock: stock } // props
+          data: { rowid: orderid, stock: stock }, // props
         },
-        area: ['30%', '30%'],
-        title: '物流'
+        area: ["30%", "30%"],
+        title: "物流",
       })
     },
     // 批量退回销售
     btn_bulk_goback() {
       if (this.selectOrderId.length < 1) {
         this.$message({
-          message: '请选择订单！',
-          type: 'warning'
+          message: "请选择订单！",
+          type: "warning",
         })
         return
       }
-      const orderids = this.selectOrderId.join(',').replace(/\s+/g, '')
+      const orderids = this.selectOrderId.join(",").replace(/\s+/g, "")
       this.$layer.iframe({
         content: {
           content: goback, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: orderids } // props
+          data: { rowid: orderids }, // props
         },
-        area: ['30%', '30%'],
-        title: '退回订单'
+        area: ["30%", "30%"],
+        title: "退回订单",
       })
     },
 
@@ -466,22 +384,44 @@ export default {
         content: {
           content: goback, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: orderid } // props
+          data: { rowid: orderid }, // props
         },
-        area: ['30%', '30%'],
-        title: '退回订单'
+        area: ["30%", "30%"],
+        title: "退回订单",
       })
     },
 
     // 导出
     btn_export() {
-      const SearchStartTime = this.searchTime[0] == undefined ? '' : this.searchTime[0]
-      const SearchEndTime = this.searchTime[1] == undefined ? '' : this.searchTime[1]
-      const F_AddProvince = this.provinceCityText[0] == undefined ? '' : this.provinceCityText[0]
-      const F_AddCity = this.provinceCityText[1] == undefined ? '' : this.provinceCityText[1]
-      const F_AddArea = this.provinceCityText[2] == undefined ? '' : this.provinceCityText[2]
-      const F_AddTown = this.provinceCityText[3] == undefined ? '' : this.provinceCityText[3]
-      window.location.href = this.$store.getters.serverConfig.BASE_API + 'api/order/getorderlistbykfpage?isdc=1' + '&F_State=' + this.activeName + '&SearchStartTime=' + SearchStartTime + '&SearchEndTime=' + SearchEndTime + '&F_AddProvince=' + F_AddProvince + '&F_AddCity=' + F_AddCity + '&F_AddArea=' + F_AddArea + '&F_AddTown=' + F_AddTown + '&minprice=' + this.searchData.minprice + '&maxprice=' + this.searchData.maxprice + '&F_AddDes=' + this.searchData.F_AddDes
+      const SearchStartTime = this.searchTime[0] == undefined ? "" : this.searchTime[0]
+      const SearchEndTime = this.searchTime[1] == undefined ? "" : this.searchTime[1]
+      const F_AddProvince = this.provinceCityText[0] == undefined ? "" : this.provinceCityText[0]
+      const F_AddCity = this.provinceCityText[1] == undefined ? "" : this.provinceCityText[1]
+      const F_AddArea = this.provinceCityText[2] == undefined ? "" : this.provinceCityText[2]
+      const F_AddTown = this.provinceCityText[3] == undefined ? "" : this.provinceCityText[3]
+      window.location.href =
+        this.$store.getters.serverConfig.BASE_API +
+        "api/order/getorderlistbykfpage?isdc=1" +
+        "&F_State=" +
+        this.activeName +
+        "&SearchStartTime=" +
+        SearchStartTime +
+        "&SearchEndTime=" +
+        SearchEndTime +
+        "&F_AddProvince=" +
+        F_AddProvince +
+        "&F_AddCity=" +
+        F_AddCity +
+        "&F_AddArea=" +
+        F_AddArea +
+        "&F_AddTown=" +
+        F_AddTown +
+        "&minprice=" +
+        this.searchData.minprice +
+        "&maxprice=" +
+        this.searchData.maxprice +
+        "&F_AddDes=" +
+        this.searchData.F_AddDes
     },
     // 导入附件退回
     btn_import_goback() {
@@ -489,10 +429,10 @@ export default {
         content: {
           content: importGoback, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: '' } // props
+          data: { rowid: "" }, // props
         },
-        area: ['30%', '30%'],
-        title: '导入附件退回'
+        area: ["30%", "30%"],
+        title: "导入附件退回",
       })
     },
     // 订单详情
@@ -501,10 +441,10 @@ export default {
         content: {
           content: detail, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { 'rowid': ordercode }// props
+          data: { rowid: ordercode }, // props
         },
-        area: ['80%', '90%'],
-        title: '订单详情'
+        area: ["80%", "90%"],
+        title: "订单详情",
       })
     },
     // 选择多个
@@ -524,19 +464,15 @@ export default {
         .catch((err) => {})
     },
     handleItemChange(val) {
-      this.provinceCityText = this.$refs['myCascader'].currentLabels
+      this.provinceCityText = this.$refs["myCascader"].currentLabels
       const pid = val ? val[val.length - 1] : 1 // id值
       this.level = val.length + 1 // 判断第几级
-      this.provinceCityDatas = this.handleData(
-        this.provinceCityDatas,
-        pid,
-        this.level
-      )
+      this.provinceCityDatas = this.handleData(this.provinceCityDatas, pid, this.level)
     },
     handleData(data, val, level) {
       for (let i = 0; i < data.length; i++) {
         if (!data[i].children) {
-          this.$set(data[i], 'children', [])
+          this.$set(data[i], "children", [])
         }
         if (data[i].id === val) {
           getProviceCityById({ pid: val })
@@ -545,7 +481,7 @@ export default {
                 data[i].children = res.data
                 if (this.level !== 4) {
                   data[i].children.forEach((ele) => {
-                    this.$set(ele, 'children', [])
+                    this.$set(ele, "children", [])
                   })
                 }
               } else {
@@ -563,12 +499,26 @@ export default {
     },
     changeStock(val) {
       this.logisticsStock = val
-    }
-  }
+    },
+  },
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+.filter-container {
+  .el-select {
+    margin-right: 10px;
+  }
+  .el-date-editor {
+    margin-right: 10px;
+  }
+  .el-cascader {
+    margin-right: 10px;
+  }
+  .filter-item {
+    vertical-align: top;
+  }
+}
 .el {
   cursor: pointer;
 }

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

@@ -2,19 +2,8 @@
   <div>
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="80px">
       <el-form-item label="快递" prop="express">
-        <el-select
-          v-model="ruleForm.express"
-          class="form_select"
-          filterable
-          clearable
-          placeholder="请选择快递"
-        >
-          <el-option
-            v-for="item in expressList"
-            :key="item.F_Value"
-            :label="item.F_Value"
-            :value="item.F_Value"
-          />
+        <el-select v-model="ruleForm.express" class="form_select" filterable clearable placeholder="请选择快递">
+          <el-option v-for="item in expressList" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -25,7 +14,7 @@
 </template>
 <script>
 import { logisticsOrderCustomerService } from "@/api/customerServiceManagement/orderListCustomerService"
-import { getDictionaryValueList } from '@/api/commonAPI'
+import { getDictionaryValueList } from "@/api/commonAPI"
 export default {
   props: {
     rowid: {
@@ -38,7 +27,7 @@ export default {
     },
     stock: {
       type: String,
-      defaulat: '',
+      defaulat: "",
     },
   },
   data() {
@@ -51,60 +40,60 @@ export default {
         express: [
           {
             required: true,
-            trigger: 'change',
-            message: '请选择快递'
-          }
+            trigger: "change",
+            message: "请选择快递",
+          },
         ],
       },
       expressList: [], // 仓库名称
-    };
+    }
   },
   created() {
     this.getExpress()
     if (this.rowid) {
-      this.ruleForm.orderids = this.rowid;
+      this.ruleForm.orderids = this.rowid
     }
   },
   methods: {
     submitForm() {
-      this.$refs.ruleForm.validate(valid => {
+      this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           logisticsOrderCustomerService(this.ruleForm)
             .then((response) => {
               if (response.state.toLowerCase() === "success") {
-                this.$parent.$layer.close(this.layerid);
-                this.$parent.getList(); // 重新加载父级数据
-                this.$message.success("恭喜你，操作成功!");
+                this.$parent.$layer.close(this.layerid)
+                this.$parent.getList() // 重新加载父级数据
+                this.$message.success("恭喜你，操作成功!")
               }
             })
             .catch(() => {
-              this.loading = false;
-            });
+              this.loading = false
+            })
         }
       })
     },
     // 快递
-    getExpress () {
-      return new Promise(resolve => {
+    getExpress() {
+      return new Promise((resolve) => {
         const params = {
           isleaf: true,
-          code: 'EXPRESS'
+          code: "EXPRESS",
         }
-        getDictionaryValueList(params).then(response => {
-          if (response.state.toLowerCase() === 'success') {
+        getDictionaryValueList(params).then((response) => {
+          if (response.state.toLowerCase() === "success") {
             const res = response.data.Rows
             if (this.stock === "山西仓") {
               res.forEach((e, i) => {
                 if (e.F_Value === "山西顺丰") {
                   this.expressList.push(e)
                 }
-              });
+              })
             } else if (this.stock === "新乡仓") {
               res.forEach((e, i) => {
                 if (e.F_Value !== "山西顺丰") {
                   this.expressList.push(e)
                 }
-              });
+              })
             } else {
               this.expressList = res
             }
@@ -113,10 +102,10 @@ export default {
       })
     },
   },
-};
+}
 </script>
 <style lang="scss" scoped>
 .form_select {
   width: 100%;
 }
-</style>
+</style>

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

@@ -1,60 +1,16 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-date-picker
-        v-model="searchTime"
-        :picker-options="pickerOptions"
-        class="filter-item"
-        type="daterange"
-        format="yyyy年MM月dd日"
-        value-format="yyyy-MM-dd"
-        unlink-panels
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      />
-      <!-- :clearable="false" -->
-      <!-- align="left" -->
-      <el-cascader
-        ref="myCascader"
-        v-model="searchData.provinceCity"
-        :options="provinceCityDatas"
-        :props="props"
-        placeholder="请选择地区"
-        class="form_select area"
-        clearable
-        change-on-select
-        @change="handleItemChange"
-      />
+      <el-date-picker v-model="searchTime" :picker-options="pickerOptions" class="filter-item" type="daterange" format="yyyy年MM月dd日" value-format="yyyy-MM-dd" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
+      <el-cascader ref="myCascader" v-model="searchData.provinceCity" :options="provinceCityDatas" :props="props" placeholder="请选择地区" class="form_select area filter-item" clearable change-on-select @change="handleItemChange" />
       <!-- <el-input v-model="searchData.minprice" placeholder="请输入最低金额" class="filter-item" />
       <el-input v-model="searchData.maxprice" placeholder="请输入最高金额" class="filter-item" /> -->
-      <el-select
-        v-model="searchData.F_AddDes"
-        placeholder="请选择送货说明"
-        class="form_select"
-        clearable
-      >
-        <el-option
-          v-for="item in addDesList"
-          :key="item.F_Value"
-          :label="item.F_Value"
-          :value="item.F_Value"
-        />
+      <el-select v-model="searchData.F_AddDes" placeholder="请选择送货说明" class="form_select filter-item" clearable>
+        <el-option v-for="item in addDesList" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value" />
       </el-select>
       <el-input v-model="searchData.adFrom" placeholder="请输入消息来源" class="filter-item" />
-      <el-select
-        v-model="searchData.type"
-        class="filter-item"
-        filterable
-        clearable
-        placeholder="请选择订单类型"
-      >
-        <el-option
-          v-for="item in orderType"
-          :key="item.F_Value"
-          :label="item.F_Value"
-          :value="item.F_Value"
-        />
+      <el-select v-model="searchData.type" class="filter-item" filterable clearable placeholder="请选择订单类型">
+        <el-option v-for="item in orderType" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value" />
       </el-select>
       <el-input v-model="searchData.id" placeholder="请输入订单编号" class="filter-item" />
       <el-input v-model="searchData.keywords" placeholder="请输入关键字" class="filter-item" />
@@ -79,40 +35,28 @@
         class="filter-item"
         @click="btn_waybill_number_import"
       >运单号导入</el-button> -->
-      <!-- <el-button v-permission="'HY_merge'" type="primary" class="filter-item" @click="btn_merge">合并</el-button> -->
       <el-button v-permission="'HY_bulk_warehouse'" v-if="authority_bulk_warehouse()" type="primary" class="filter-item" @click="btn_bulk_warehouse">批量分仓</el-button>
       <el-button v-permission="'HY_bulk_review'" v-if="authority_bulk_review()" type="primary" class="filter-item" @click="btn_bulk_review">批量审核</el-button>
       <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量退回</el-button>
-      <el-button v-permission="'HY_import'" v-if="activeName==7" type="primary" class="filter-item" @click="btn_import">批量导入审核</el-button>
+      <el-button v-permission="'HY_import'" v-if="activeName == 7" type="primary" class="filter-item" @click="btn_import">批量导入审核</el-button>
       <el-button v-permission="'HY_export'" type="primary" class="filter-item" @click="btn_export">导出</el-button>
       <el-button v-permission="'HY_import_goback'" type="primary" class="filter-item" @click="btn_import_goback">导入附件退回</el-button>
     </div>
     <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick">
-      <el-tab-pane label="待分仓" name="1"/>
-      <el-tab-pane label="无货" name="4"/>
-      <el-tab-pane label="付款待审核" name="7"/>
-      <el-tab-pane label="0金额袜子" name="isZeroCommodity"/>
+      <el-tab-pane label="待分仓" name="1" />
+      <el-tab-pane label="无货" name="4" />
+      <el-tab-pane label="付款待审核" name="7" />
+      <el-tab-pane label="0金额袜子" name="isZeroCommodity" />
     </el-tabs>
     <div>
       <span>订单数量：{{ pageParams.total }}</span>
     </div>
-    <el-table
-      v-loading="loading"
-      :data="dataLists"
-      border
-      stripe
-      row-key="F_Id"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column :reserve-selection="true" type="selection"/>
+    <el-table v-loading="loading" :data="dataLists" border stripe row-key="F_Id" @selection-change="handleSelectionChange">
+      <el-table-column :reserve-selection="true" type="selection" />
       <el-table-column type="index" label="编号" align="center" fixed width="80" />
       <el-table-column prop="F_Id" label="订单编号" align="center" min-width="180">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="hadndleOrderCode(scope.row.F_Id)"
-          >{{ scope.row.F_Id }}</el-button>
+          <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_Id)">{{ scope.row.F_Id }}</el-button>
         </template>
       </el-table-column>
       <el-table-column prop="F_Customer" label="客户姓名" align="center" min-width />
@@ -127,45 +71,19 @@
       <el-table-column label="地址" align="center">
         <template slot-scope="scope">{{ scope.row | judgmentAddress }}</template>
       </el-table-column>
-      <el-table-column prop="F_PayType" label="付款类型" align="center"/>
-      <el-table-column prop="F_RealPrice" label="付款金额" align="center"/>
-      <el-table-column prop="F_AddDes" label="送货说明" align="center"/>
+      <el-table-column prop="F_PayType" label="付款类型" align="center" />
+      <el-table-column prop="F_RealPrice" label="付款金额" align="center" sortable min-width="100" />
+      <el-table-column prop="F_AddDes" label="送货说明" align="center" />
       <el-table-column prop="F_AddUserName" label="下单员工" align="center" />
       <el-table-column prop="F_BelongName" label="归属员工" align="center" />
       <el-table-column prop="F_Type" label="订单类型" align="center" />
       <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
-          <el-button
-            v-permission="'HY_edit'"
-            v-if="authority_edit(scope.row.F_State)"
-            type="text"
-            @click="btn_edit(scope.row.F_Id)"
-          >编辑</el-button>
-          <el-button
-            v-permission="'HY_warehouse'"
-            v-if="authority_warehouse(scope.row.F_State)"
-            type="text"
-            @click="btn_warehouse(scope.row.F_Id)"
-          >分仓</el-button>
-          <el-button
-            v-permission="'HY_review'"
-            v-if="authority_review(scope.row.F_State)"
-            type="text"
-            @click="btn_review(scope.row.F_Id)"
-          >审核</el-button>
-          <el-button
-            v-permission="'HY_goback'"
-            v-if="authority_goback(scope.row.F_State)"
-            type="text"
-            @click="btn_goback(scope.row.F_Id)"
-          >客服退回</el-button>
-          <el-button
-            v-permission="'HY_through'"
-            v-if="authority_through(scope.row.F_State)"
-            type="text"
-            @click="btn_through(scope.row.F_Id)"
-          >通过</el-button>
-          <!-- <el-button v-permission="'HY_label'" type="text" @click="btn_label(scope.row.F_Id)">标签</el-button> -->
+          <el-button v-permission="'HY_edit'" v-if="authority_edit(scope.row.F_State)" type="text" @click="btn_edit(scope.row.F_Id)">编辑</el-button>
+          <el-button v-permission="'HY_warehouse'" v-if="authority_warehouse(scope.row.F_State)" type="text" @click="btn_warehouse(scope.row.F_Id)">分仓</el-button>
+          <el-button v-permission="'HY_review'" v-if="authority_review(scope.row.F_State)" type="text" @click="btn_review(scope.row.F_Id)">审核</el-button>
+          <el-button v-permission="'HY_goback'" v-if="authority_goback(scope.row.F_State)" type="text" @click="btn_goback(scope.row.F_Id)">客服退回</el-button>
+          <el-button v-permission="'HY_through'" v-if="authority_through(scope.row.F_State)" type="text" @click="btn_through(scope.row.F_Id)">通过</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -181,44 +99,40 @@
 </template>
 
 <script>
-import { getDictionaryValueList, getProviceCityById } from '@/api/commonAPI'
-import { getOrderListCustomerService } from '@/api/customerServiceManagement/orderListCustomerService'
-import { pickerOptions, formatterContent } from '@/utils'
-// import through from "./through";
-// import label from "./label";
-// import edit from "./edit";
-// import merge from './merge';
-import importReceiving from './importReceiving'
-import importGoback from './importGoback'
-import goback from './goback'
-import warehouse from './warehouse'
-import review from './review'
-import detail from '@/views/orderManagement/orderList/detail'
-import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
+import { getDictionaryValueList, getProviceCityById } from "@/api/commonAPI"
+import { getOrderListCustomerService } from "@/api/customerServiceManagement/orderListCustomerService"
+import { pickerOptions, formatterContent } from "@/utils"
+import importReceiving from "./importReceiving"
+import importGoback from "./importGoback"
+import goback from "./goback"
+import warehouse from "./warehouse"
+import review from "./review"
+import detail from "@/views/orderManagement/orderList/detail"
+import Pagination from "@/components/Pagination" // 对el-pagination 二次封装
 
 export default {
-  name: 'OrderListCustomerService',
+  name: "OrderListCustomerService",
   components: {
-    Pagination
+    Pagination,
   },
   filters: {
     judgmentStateName(status) {
       const statusMap = {
-        '0': '未提交',
-        '1': '待分仓',
-        '2': '已退回',
-        '3': '已分仓',
-        '4': '无货',
-        '5': '仓库待审核',
-        '6': '已发货',
-        '7': '付款待审核',
-        '8': '待分物流',
-        '9': '物流未通过'
+        0: "未提交",
+        1: "待分仓",
+        2: "已退回",
+        3: "已分仓",
+        4: "无货",
+        5: "仓库待审核",
+        6: "已发货",
+        7: "付款待审核",
+        8: "待分物流",
+        9: "物流未通过",
       }
       return statusMap[status]
     },
     judgmentOrderGoods(status) {
-      let orderGoodsNameQuantity = ''
+      let orderGoodsNameQuantity = ""
       for (let i = 0; i < status.length; i++) {
         orderGoodsNameQuantity = `${orderGoodsNameQuantity}${status[i].F_ProductName}*${status[i].F_Count},`
       }
@@ -226,62 +140,62 @@ export default {
       return orderGoodsNameQuantity
     },
     judgmentAddress(data) {
-      const addProvince = data.F_AddProvince === null ? '' : data.F_AddProvince // 省
-      const addCity = data.F_AddCity === null ? '' : data.F_AddCity // 市
-      const addArea = data.F_AddArea === null ? '' : data.F_AddArea // 县/区
-      const addTown = data.F_AddTown === null ? '' : data.F_AddTown // 乡/镇
-      const address = data.F_Address === null ? '' : data.F_Address // 详细地址
+      const addProvince = data.F_AddProvince === null ? "" : data.F_AddProvince // 省
+      const addCity = data.F_AddCity === null ? "" : data.F_AddCity // 市
+      const addArea = data.F_AddArea === null ? "" : data.F_AddArea // 县/区
+      const addTown = data.F_AddTown === null ? "" : data.F_AddTown // 乡/镇
+      const address = data.F_Address === null ? "" : data.F_Address // 详细地址
       const addressStr = addProvince + addCity + addArea + addTown + address // 地址
       return addressStr
-    }
+    },
   },
   data() {
     return {
       loading: false,
       searchData: {
-        state: '1',
-        adFrom: '', // 消息/广告媒体来源
-        type: '', // 订单类型
-        id: '', // 订单号
-        customer: '', // 客户姓名
-        customerPhone: '', // 客户手机号
-        trackingNo: '', // 运单号
-        payState: '', // 交易状态
+        state: "1",
+        adFrom: "", // 消息/广告媒体来源
+        type: "", // 订单类型
+        id: "", // 订单号
+        customer: "", // 客户姓名
+        customerPhone: "", // 客户手机号
+        trackingNo: "", // 运单号
+        payState: "", // 交易状态
         provinceCity: [], // 省市县
-        minprice: '', // 最低金额
-        maxprice: '', // 最高金额
-        F_AddDes: '', // 送货说明
-        isZeroCommodity: '',
-        keywords: '', // 关键字
+        minprice: "", // 最低金额
+        maxprice: "", // 最高金额
+        F_AddDes: "", // 送货说明
+        isZeroCommodity: "",
+        keywords: "", // 关键字
       },
       searchTime: [], // 订单时间
-      activeName: '1', // 标签切换首页
+      activeName: "1", // 标签切换首页
       provinceCityDatas: [], // 省市下拉数据
       provinceCityText: [], // 省市下拉绑定的值
       props: {
         // 自定义省市下拉数据的key值
-        value: 'id',
-        label: 'text',
-        children: 'children'
+        value: "id",
+        label: "text",
+        children: "children",
       },
       addDesList: [], // 送货说明
       pickerOptions, // 日期数据
       pageParams: {
         pageindex: 1, // 当前第几页
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-        total: 0 // 总共多少数据
+        total: 0, // 总共多少数据
       },
       dataLists: [], // 列表数据
       multipleSelection: [], // 选中的数据
       selectedId: [], // 选中的数据的id
       orderType: [], // 订单类型
-      selectOrderId: [] // 选择订单id
+      selectOrderId: [], // 选择订单id
     }
   },
   watch: {
     searchTime(newVal, oldVal) {
       !newVal && (this.searchTime = [])
-    }
+    },
   },
   created() {
     if (this.$route.params.id) {
@@ -292,7 +206,7 @@ export default {
     this.getOrderType()
     this.getProCity()
     this.getAddDesList()
-    document.onkeyup = e => {
+    document.onkeyup = (e) => {
       if (e.keyCode === 13) {
         this.getList()
       }
@@ -301,7 +215,7 @@ export default {
   methods: {
     getList() {
       this.loading = true
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         const params = {
           F_State: this.searchData.state, // 订单状态
           pageindex: 1, // int 第几页
@@ -312,11 +226,11 @@ export default {
           F_Customer: this.searchData.customer, // 客户姓名
           F_CustomerPhone: this.searchData.customerPhone, // 客户手机号
           F_TrackingNo: this.searchData.trackingNo, // 运单号
-          SearchStartTime: this.searchTime[0] == null ? '' : this.searchTime[0], // 添加开始时间
-          SearchEndTime: this.searchTime[1] == null ? '' : this.searchTime[1], // 添加结束时间
+          SearchStartTime: this.searchTime[0] == null ? "" : this.searchTime[0], // 添加开始时间
+          SearchEndTime: this.searchTime[1] == null ? "" : this.searchTime[1], // 添加结束时间
           PayState: this.searchData.payState, // 交易状态
           F_IsExpress: -2, // -2全部 0客服未分配快递 1已分配
-          state: '',
+          state: "",
           F_AddProvince: this.provinceCityText && this.provinceCityText[0], // 省份
           F_AddCity: this.provinceCityText[1] && this.provinceCityText[1], // 市
           F_AddArea: this.provinceCityText[2] && this.provinceCityText[2], // 县区
@@ -325,11 +239,11 @@ export default {
           maxprice: this.searchData.maxprice, // 最高金额
           F_AddDes: this.searchData.F_AddDes, // 送货说明
           F_IsZeroCommodity: this.searchData.isZeroCommodity,
-          keywords: this.searchData.keywords.replace(/\s+/g, ''), //关键字
+          keywords: this.searchData.keywords.replace(/\s+/g, ""), //关键字
         }
-        getOrderListCustomerService(params).then(response => {
+        getOrderListCustomerService(params).then((response) => {
           this.loading = false
-          if (response.state.toLowerCase() === 'success') {
+          if (response.state.toLowerCase() === "success") {
             this.pageParams.total = response.data.Totals
             this.dataLists = response.data.Rows
           }
@@ -343,21 +257,21 @@ export default {
       const year = now.getFullYear() // 得到年份
       let month = now.getMonth() + 1 // 得到月份
       let date = now.getDate() // 得到日期
-      const hour = ' 00:00:00' // 默认时分秒
-      month = month.toString().padStart(2, '0')
-      date = date.toString().padStart(2, '0')
+      const hour = " 00:00:00" // 默认时分秒
+      month = month.toString().padStart(2, "0")
+      date = date.toString().padStart(2, "0")
       const defaultDate = `${year}-${month}-${date}`
       this.searchTime = [defaultDate, defaultDate]
     },
     // 获取订单类型
     getOrderType() {
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         const params = {
           isleaf: true,
-          code: 'ORDERTYPE'
+          code: "ORDERTYPE",
         }
-        getDictionaryValueList(params).then(response => {
-          if (response.state.toLowerCase() === 'success') {
+        getDictionaryValueList(params).then((response) => {
+          if (response.state.toLowerCase() === "success") {
             this.orderType = response.data.Rows
           }
         })
@@ -368,10 +282,10 @@ export default {
       return new Promise((resolve) => {
         const params = {
           isleaf: true,
-          code: 'DELIVERYDES'
+          code: "DELIVERYDES",
         }
         getDictionaryValueList(params).then((response) => {
-          if (response.state.toLowerCase() === 'success') {
+          if (response.state.toLowerCase() === "success") {
             this.addDesList = response.data.Rows
           }
         })
@@ -379,9 +293,9 @@ export default {
     },
     handleTabClick(tab, event) {
       this.pageParams.pageindex = 1
-      if (this.activeName == 'isZeroCommodity') {
+      if (this.activeName == "isZeroCommodity") {
         this.searchData.isZeroCommodity = 1
-        this.searchData.state = ''
+        this.searchData.state = ""
       } else {
         this.searchData.isZeroCommodity = 0
         this.searchData.state = this.activeName
@@ -398,31 +312,53 @@ export default {
         content: {
           content: importReceiving, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: '' } // props
+          data: { rowid: "" }, // props
         },
-        area: ['30%', '30%'],
-        title: '导入'
+        area: ["30%", "30%"],
+        title: "导入",
       })
     },
     // 导出
     btn_export() {
-      const SearchStartTime = this.searchTime[0] == undefined ? '' : this.searchTime[0]
-      const SearchEndTime = this.searchTime[1] == undefined ? '' : this.searchTime[1]
-      const F_AddProvince = this.provinceCityText[0] == undefined ? '' : this.provinceCityText[0]
-      const F_AddCity = this.provinceCityText[1] == undefined ? '' : this.provinceCityText[1]
-      const F_AddArea = this.provinceCityText[2] == undefined ? '' : this.provinceCityText[2]
-      const F_AddTown = this.provinceCityText[3] == undefined ? '' : this.provinceCityText[3]
-      window.location.href = this.$store.getters.serverConfig.BASE_API + 'api/order/getorderlistbykfpage?isdc=1' + '&F_State=' + this.activeName + '&SearchStartTime=' + SearchStartTime + '&SearchEndTime=' + SearchEndTime + '&F_AddProvince=' + F_AddProvince + '&F_AddCity=' + F_AddCity + '&F_AddArea=' + F_AddArea + '&F_AddTown=' + F_AddTown + '&minprice=' + this.searchData.minprice + '&maxprice=' + this.searchData.maxprice + '&F_AddDes=' + this.searchData.F_AddDes
+      const SearchStartTime = this.searchTime[0] == undefined ? "" : this.searchTime[0]
+      const SearchEndTime = this.searchTime[1] == undefined ? "" : this.searchTime[1]
+      const F_AddProvince = this.provinceCityText[0] == undefined ? "" : this.provinceCityText[0]
+      const F_AddCity = this.provinceCityText[1] == undefined ? "" : this.provinceCityText[1]
+      const F_AddArea = this.provinceCityText[2] == undefined ? "" : this.provinceCityText[2]
+      const F_AddTown = this.provinceCityText[3] == undefined ? "" : this.provinceCityText[3]
+      window.location.href =
+        this.$store.getters.serverConfig.BASE_API +
+        "api/order/getorderlistbykfpage?isdc=1" +
+        "&F_State=" +
+        this.activeName +
+        "&SearchStartTime=" +
+        SearchStartTime +
+        "&SearchEndTime=" +
+        SearchEndTime +
+        "&F_AddProvince=" +
+        F_AddProvince +
+        "&F_AddCity=" +
+        F_AddCity +
+        "&F_AddArea=" +
+        F_AddArea +
+        "&F_AddTown=" +
+        F_AddTown +
+        "&minprice=" +
+        this.searchData.minprice +
+        "&maxprice=" +
+        this.searchData.maxprice +
+        "&F_AddDes=" +
+        this.searchData.F_AddDes
     },
     btn_edit(editId) {
       this.$layer.iframe({
         content: {
           content: edit, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: editId } // props
+          data: { rowid: editId }, // props
         },
-        area: ['80%', '90%'],
-        title: '编辑订单'
+        area: ["80%", "90%"],
+        title: "编辑订单",
       })
     },
     // 导入
@@ -431,31 +367,31 @@ export default {
         content: {
           content: importWaybillNumber, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { 'rowid': '' }// props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
+          data: { rowid: "" }, // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
         },
-        area: ['40%', '380px'],
+        area: ["40%", "380px"],
         shadeClose: false,
-        title: '导入订单信息'
+        title: "导入订单信息",
       })
     },
     // 批量分仓
     btn_bulk_warehouse() {
       if (this.selectOrderId.length < 1) {
         this.$message({
-          message: '请选择订单！',
-          type: 'warning'
+          message: "请选择订单！",
+          type: "warning",
         })
         return
       }
-      const orderids = this.selectOrderId.join(',').replace(/\s+/g, '')
+      const orderids = this.selectOrderId.join(",").replace(/\s+/g, "")
       this.$layer.iframe({
         content: {
           content: warehouse, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: orderids } // props
+          data: { rowid: orderids }, // props
         },
-        area: ['30%', '30%'],
-        title: '分仓'
+        area: ["30%", "30%"],
+        title: "分仓",
       })
     },
     // 分仓
@@ -464,30 +400,30 @@ export default {
         content: {
           content: warehouse, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: orderid } // props
+          data: { rowid: orderid }, // props
         },
-        area: ['30%', '30%'],
-        title: '分仓'
+        area: ["30%", "30%"],
+        title: "分仓",
       })
     },
     // 批量审核
     btn_bulk_review() {
       if (this.selectOrderId.length < 1) {
         this.$message({
-          message: '请选择订单！',
-          type: 'warning'
+          message: "请选择订单！",
+          type: "warning",
         })
         return
       }
-      const orderids = this.selectOrderId.join(',').replace(/\s+/g, '')
+      const orderids = this.selectOrderId.join(",").replace(/\s+/g, "")
       this.$layer.iframe({
         content: {
           content: review, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: orderids } // props
+          data: { rowid: orderids }, // props
         },
-        area: ['30%', '30%'],
-        title: '审核'
+        area: ["30%", "30%"],
+        title: "审核",
       })
     },
     // 审核
@@ -496,30 +432,30 @@ export default {
         content: {
           content: review, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: orderid } // props
+          data: { rowid: orderid }, // props
         },
-        area: ['30%', '30%'],
-        title: '审核'
+        area: ["30%", "30%"],
+        title: "审核",
       })
     },
     // 批量退回
     btn_bulk_goback() {
       if (this.selectOrderId.length < 1) {
         this.$message({
-          message: '请选择订单！',
-          type: 'warning'
+          message: "请选择订单！",
+          type: "warning",
         })
         return
       }
-      const orderids = this.selectOrderId.join(',').replace(/\s+/g, '')
+      const orderids = this.selectOrderId.join(",").replace(/\s+/g, "")
       this.$layer.iframe({
         content: {
           content: goback, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: orderids } // props
+          data: { rowid: orderids }, // props
         },
-        area: ['30%', '30%'],
-        title: '退回订单'
+        area: ["30%", "30%"],
+        title: "退回订单",
       })
     },
     // 退回订单
@@ -528,10 +464,10 @@ export default {
         content: {
           content: goback, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: orderid } // props
+          data: { rowid: orderid }, // props
         },
-        area: ['30%', '30%'],
-        title: '退回订单'
+        area: ["30%", "30%"],
+        title: "退回订单",
       })
     },
     // 导入附件退回
@@ -540,10 +476,10 @@ export default {
         content: {
           content: importGoback, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: '' } // props
+          data: { rowid: "" }, // props
         },
-        area: ['30%', '30%'],
-        title: '导入附件退回'
+        area: ["30%", "30%"],
+        title: "导入附件退回",
       })
     },
     // 通过订单
@@ -552,10 +488,10 @@ export default {
         content: {
           content: through, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: orderid } // props
+          data: { rowid: orderid }, // props
         },
-        area: ['30%', '30%'],
-        title: '通过订单'
+        area: ["30%", "30%"],
+        title: "通过订单",
       })
     },
     // 订单详情
@@ -564,10 +500,10 @@ export default {
         content: {
           content: detail, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { 'rowid': ordercode }// props
+          data: { rowid: ordercode }, // props
         },
-        area: ['80%', '90%'],
-        title: '订单详情'
+        area: ["80%", "90%"],
+        title: "订单详情",
       })
     },
     // 选择多个
@@ -587,19 +523,15 @@ export default {
         .catch((err) => {})
     },
     handleItemChange(val) {
-      this.provinceCityText = this.$refs['myCascader'].currentLabels
+      this.provinceCityText = this.$refs["myCascader"].currentLabels
       const pid = val ? val[val.length - 1] : 1 // id值
       this.level = val.length + 1 // 判断第几级
-      this.provinceCityDatas = this.handleData(
-        this.provinceCityDatas,
-        pid,
-        this.level
-      )
+      this.provinceCityDatas = this.handleData(this.provinceCityDatas, pid, this.level)
     },
     handleData(data, val, level) {
       for (let i = 0; i < data.length; i++) {
         if (!data[i].children) {
-          this.$set(data[i], 'children', [])
+          this.$set(data[i], "children", [])
         }
         if (data[i].id === val) {
           getProviceCityById({ pid: val })
@@ -608,7 +540,7 @@ export default {
                 data[i].children = res.data
                 if (this.level !== 4) {
                   data[i].children.forEach((ele) => {
-                    this.$set(ele, 'children', [])
+                    this.$set(ele, "children", [])
                   })
                 }
               } else {
@@ -680,12 +612,26 @@ export default {
       } else {
         return false
       }
-    }
-  }
+    },
+  },
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+.filter-container {
+  .el-select {
+    margin-right: 10px;
+  }
+  .el-date-editor {
+    margin-right: 10px;
+  }
+  .el-cascader {
+    margin-right: 10px;
+  }
+  .filter-item {
+    vertical-align: top;
+  }
+}
 .el {
   cursor: pointer;
 }

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

@@ -1,304 +1,140 @@
 <template>
   <div class="app-container">
-    <search-filter
-      :search-datas.sync="searchDatas"
-      :selected-id="selectedId"
-      showadd
-      @transfer="btn_transfer"
-      @search="btn_search"
-      @delorders="btn_deletes"
-      @export="btn_export"
-      @merge="btn_file_merge"
-      @split="btn_file_split"
-    />
+    <search-filter :search-datas.sync="searchDatas" :selected-id="selectedId" showadd @transfer="btn_transfer" @search="btn_search" @delorders="btn_deletes" @export="btn_export" @merge="btn_file_merge" @split="btn_file_split" />
     <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick">
-      <el-tab-pane label="全部" name="0"/>
-      <el-tab-pane label="已联系客户" name="1"/>
-      <el-tab-pane label="未联系客户" name="2"/>
+      <el-tab-pane label="全部" name="0" />
+      <el-tab-pane label="已联系客户" name="1" />
+      <el-tab-pane label="未联系客户" name="2" />
     </el-tabs>
-    <el-table
-      v-loading="loading"
-      :data="dataLists"
-      border
-      stripe
-      @selection-change="changeSelects"
-    >
-      <el-table-column type="selection" width="40" fixed/>
-      <el-table-column
-        prop="F_Name"
-        label="客户姓名"
-        align="center"
-        width=""
-      />
-      <el-table-column
-        prop="F_Sex"
-        label="客户性别"
-        align="center"
-        width=""
-      />
-      <el-table-column
-        prop="F_Age"
-        label="客户年龄"
-        align="center"
-        width=""
-      />
+    <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="changeSelects">
+      <el-table-column type="selection" width="40" fixed />
+      <el-table-column prop="F_Name" label="客户姓名" align="center" width="" />
+      <el-table-column prop="F_Sex" label="客户性别" align="center" width="" />
+      <el-table-column prop="F_Age" label="客户年龄" align="center" width="" />
       <el-table-column label="主号码" align="center" width="100px">
         <template slot-scope="scope">
           {{ scope.row.F_Phone | phoneFilter }}
-          <i
-            v-if="scope.row.F_Phone"
-            class="el-icon-tickets phoneIcon"
-            @click="clickCut(scope.row.F_ID)"
-          />
-          <i
-            v-if="scope.row.F_Phone"
-            class="el-icon-phone phoneIcon"
-            @click="clickCallOut(scope.row.F_Phone)"
-          />
+          <i v-if="scope.row.F_Phone" class="el-icon-tickets phoneIcon" @click="clickCut(scope.row.F_ID)" />
+          <i v-if="scope.row.F_Phone" class="el-icon-phone phoneIcon" @click="clickCallOut(scope.row.F_Phone)" />
         </template>
       </el-table-column>
       <el-table-column label="备用号码" align="center" width="">
         <template slot-scope="scope">
           {{ scope.row.F_Mobile | mobileFilter }}
-          <i
-            v-if="scope.row.F_Mobile"
-            class="el-icon-tickets phoneIcon"
-            @click="clickCut2(scope.row.F_ID)"
-          />
-          <i
-            v-if="scope.row.F_Mobile"
-            class="el-icon-phone phoneIcon"
-            @click="clickMobile(scope.row.F_Mobile)"
-          />
+          <i v-if="scope.row.F_Mobile" class="el-icon-tickets phoneIcon" @click="clickCut2(scope.row.F_ID)" />
+          <i v-if="scope.row.F_Mobile" class="el-icon-phone phoneIcon" @click="clickMobile(scope.row.F_Mobile)" />
         </template>
       </el-table-column>
-      <el-table-column
-        prop="F_Label"
-        label="会员标签"
-        align="center"
-        width=""
-      />
-      <el-table-column
-        prop="F_Membership"
-        label="会员类型"
-        align="center"
-        width=""
-      />
-      <el-table-column
-        prop="F_Class"
-        label="会员分类"
-        align="center"
-        width=""
-      />
-      <el-table-column
-        prop="F_ShoeSize"
-        label="鞋码"
-        align="center"
-        width=""
-      />
-      <el-table-column
-        prop="Birthday"
-        label="会员生日"
-        align="center"
-        width="100px"
-      />
-      <el-table-column
-        prop="F_Score"
-        label="会员积分"
-        align="center"
-        width=""
-      />
-      <el-table-column
-        prop="F_Recommender"
-        label="推荐人"
-        align="center"
-        width=""
-      />
-      <el-table-column
-        prop="F_Saleperson"
-        label="销售负责人"
-        align="center"
-        width="90px"
-      />
-      <el-table-column
-        prop="F_Money"
-        label="累计消费金额"
-        align="center"
-        width=""
-      />
-      <el-table-column
-        prop="F_Firstcalltime"
-        label="首次通话记录"
-        align="center"
-        width=""
-      />
-      <el-table-column
-        prop="F_Lastholetime"
-        label="末联通话记录"
-        align="center"
-        width=""
-      />
-      <el-table-column
-        prop="F_TotalScore"
-        label="累计积分"
-        align="center"
-        width=""
-      />
-      <el-table-column
-        prop="F_Money"
-        label="总金额"
-        align="center"
-        width=""
-      />
-      <el-table-column label="地址" align="center"  min-width="180">
+      <el-table-column prop="F_Label" label="会员标签" align="center" width="" />
+      <el-table-column prop="F_Membership" label="会员类型" align="center" width="" />
+      <el-table-column prop="F_Class" label="会员分类" align="center" width="" />
+      <el-table-column prop="F_ShoeSize" label="鞋码" align="center" width="" />
+      <el-table-column prop="Birthday" label="会员生日" align="center" width="100px" />
+      <el-table-column prop="F_Score" label="会员积分" align="center" width="" />
+      <el-table-column prop="F_Recommender" label="推荐人" align="center" width="" />
+      <el-table-column prop="F_Saleperson" label="销售负责人" align="center" width="90px" />
+      <el-table-column prop="F_Money" label="累计消费金额" align="center" width="" />
+      <el-table-column prop="F_Firstcalltime" label="首次通话记录" align="center" width="" />
+      <el-table-column prop="F_Lastholetime" label="末联通话记录" align="center" width="" />
+      <el-table-column prop="F_TotalScore" label="累计积分" align="center" width="" />
+      <el-table-column prop="F_Money" label="总金额" align="center" width="" />
+      <el-table-column label="地址" align="center" min-width="180">
         <template slot-scope="scope">{{ scope.row | judgmentAddress }}</template>
       </el-table-column>
-      <el-table-column
-        prop="F_Count"
-        label="购买次数"
-        align="center"
-        width=""
-      />
-      <el-table-column
-        prop="F_CreateOn"
-        label="建档日期"
-        align="center"
-        width=""
-      />
-      <el-table-column
-        label="操作"
-        width="180"
-        align="center"
-        class-name="oparate_btn"
-        fixed="right"
-      >
+      <el-table-column prop="F_Count" label="购买次数" align="center" width="" />
+      <el-table-column prop="F_CreateOn" label="建档日期" align="center" width="" />
+      <el-table-column label="操作" width="180" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
-          <el-button
-            v-permission="'HY_add_order'"
-            type="text"
-            @click="btn_add_order(scope.row.F_ID)"
-          >添加订单</el-button
-          >
-          <el-button
-            v-permission="'HY_addTodo'"
-            type="text"
-            @click="btn_addTodo(scope.row.F_Phone,scope.row.F_Name)"
-          >添加待办</el-button
-          >
-          <el-button
-            v-permission="'HY_detail'"
-            type="text"
-            @click="btn_detail(scope.row.F_ID.toString())"
-          >详情</el-button
-          >
-          <el-button
-            v-permission="'HY_edit'"
-            type="text"
-            @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"
-            @click="btn_delete(scope.row.F_ID)"
-          >删除</el-button
-          >
+          <el-button v-permission="'HY_add_order'" type="text" @click="btn_add_order(scope.row.F_ID)">添加订单</el-button>
+          <el-button v-permission="'HY_addTodo'" type="text" @click="btn_addTodo(scope.row.F_Phone, scope.row.F_Name)">添加待办</el-button>
+          <el-button v-permission="'HY_detail'" type="text" @click="btn_detail(scope.row.F_ID.toString())">详情</el-button>
+          <el-button v-permission="'HY_edit'" type="text" @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" @click="btn_delete(scope.row.F_ID)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    <pagination
-      v-show="pageParams.total > 0"
-      :total="pageParams.total"
-      :pageindex.sync="pageParams.pageindex"
-      :pagesize.sync="pageParams.pagesize"
-      class="pagination"
-      @pagination="getList"
-    />
+    <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex" :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getList" />
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import { getOrderLists, deleteOrder, deletesMember, encryptphone, split } from '@/api/memberManagement/memberList'
-import searchFilter from './components/searchFilter'
-import addOrEdit from './components/addOrEdit'
-import addTodo from './components/addTodo'
-import callOut from './components/callOut'
-import detail from './components/detail'
-import transfer from './components/transfer'
-import addOrder from './components/addOrder'
-import addOrEditRemark from './components/addOrEditRemark'
-import { formatterContent } from '@/utils'
-import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
-import mergeId from './components/mergeId'
-import { getCallOutprefix } from '@/api/teloperation'
-import { Send } from '@/utils/telWebsocket'
-import store from '@/store'
+import { mapGetters } from "vuex"
+import { getOrderLists, deleteOrder, deletesMember, encryptphone, split } from "@/api/memberManagement/memberList"
+import searchFilter from "./components/searchFilter"
+import addOrEdit from "./components/addOrEdit"
+import addTodo from "./components/addTodo"
+import callOut from "./components/callOut"
+import detail from "./components/detail"
+import transfer from "./components/transfer"
+import addOrder from "./components/addOrder"
+import addOrEditRemark from "./components/addOrEditRemark"
+import { formatterContent } from "@/utils"
+import Pagination from "@/components/Pagination" // 对el-pagination 二次封装
+import mergeId from "./components/mergeId"
+import { getCallOutprefix } from "@/api/teloperation"
+import { Send } from "@/utils/telWebsocket"
+import store from "@/store"
 
 export default {
-  name: 'MemberLabel',
+  name: "MemberLabel",
   components: {
     Pagination,
-    searchFilter
+    searchFilter,
   },
   filters: {
     phoneFilter(status) {
       if (status) {
-        const mtel = status.substr(0, 3) + '****' + status.substr(7)
+        const mtel = status.substr(0, 3) + "****" + status.substr(7)
         return mtel
       }
     },
     mobileFilter(status) {
       if (status) {
-        const arr = status.split(',')
-        var mtel = ''
+        const arr = status.split(",")
+        var mtel = ""
         for (let i = 0; i < arr.length; i++) {
-          mtel += arr[i].substr(0, 3) + '****' + arr[i].substr(7) + ','
+          mtel += arr[i].substr(0, 3) + "****" + arr[i].substr(7) + ","
         }
         return mtel.substr(0, mtel.length - 1)
       }
     },
     judgmentAddress(data) {
-      const addProvince = data.F_Province === null ? '' : data.F_Province // 省
-      const addCity = data.F_City === null ? '' : data.F_City // 市
-      const addArea = data.F_Area === null ? '' : data.F_Area // 县/区
-      const addTown = data.F_Town === null ? '' : data.F_Town // 乡/镇
-      const address = data.F_Address === null ? '' : data.F_Address // 详细地址
+      const addProvince = data.F_Province === null ? "" : data.F_Province // 省
+      const addCity = data.F_City === null ? "" : data.F_City // 市
+      const addArea = data.F_Area === null ? "" : data.F_Area // 县/区
+      const addTown = data.F_Town === null ? "" : data.F_Town // 乡/镇
+      const address = data.F_Address === null ? "" : data.F_Address // 详细地址
       const addressStr = addProvince + addCity + addArea + addTown + address // 地址
       return addressStr
-    }
+    },
   },
 
   data() {
     return {
-      phoneOne: '', // 加密主号码
-      phoneOne2: '', // 加密备用号码
-      phoneNumOne: '',
+      phoneOne: "", // 加密主号码
+      phoneOne2: "", // 加密备用号码
+      phoneNumOne: "",
       searchDatas: {
-        VIPCode: '', // 会员卡编号
-        customerName: '', // 客户姓名
-        phoneNumber: '', // 手机号码
-        labelList: '', // 会员标签
-        province: '', // 省份
-        city: '', // 市
-        county: '', // 县区
-        township: '', // 乡镇
-        address: '', // 详细地址
-        birthday: '', // 会员生日
-        referrer: '', // 推荐人
-        saleperson: '', // 销售负责人
+        VIPCode: "", // 会员卡编号
+        customerName: "", // 客户姓名
+        phoneNumber: "", // 手机号码
+        labelList: "", // 会员标签
+        province: "", // 省份
+        city: "", // 市
+        county: "", // 县区
+        township: "", // 乡镇
+        address: "", // 详细地址
+        birthday: "", // 会员生日
+        referrer: "", // 推荐人
+        saleperson: "", // 销售负责人
         // contactFrequency: '', //联系频次
         provinceCity: [], // 省市下拉绑定的值
         provinceCityText: [], // 省市下拉绑定文本值
         memberBirthday: [], // 会员生日
         contactTime: [],
-        membership: '', //会员类型
-        class: '', // 会员分类
+        membership: "", //会员类型
+        class: "", // 会员分类
         searchTime: [], //建档日期
         firstcalltime: [], // 首次通话时间
         lastholetime: [], // 末联通话时间
@@ -307,13 +143,13 @@ export default {
       pageParams: {
         pageindex: 1, // 当前第几页
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-        total: 0 // 总共多少数据
+        total: 0, // 总共多少数据
       },
       dataLists: [], // 列表数据
       multipleSelection: [], // 选中的数据
       selectedId: [], // 选中的id
       namesData: [],
-      activeName: '0'
+      activeName: "0",
     }
   },
   created() {
@@ -326,14 +162,14 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'token',
-      'usercode', // 工号
-      'extension', // 分机号
-      'sidebar',
-      'avatar',
-      'telCallType', // 通话类型
-      'telIsVisCallout' // 外呼面板是否显示
-    ])
+      "token",
+      "usercode", // 工号
+      "extension", // 分机号
+      "sidebar",
+      "avatar",
+      "telCallType", // 通话类型
+      "telIsVisCallout", // 外呼面板是否显示
+    ]),
   },
   methods: {
     getList() {
@@ -345,25 +181,17 @@ export default {
           name: this.searchDatas.customerName.trim(), // 客户姓名
           phone: this.searchDatas.phoneNumber.trim(), // 手机号码
           label: this.searchDatas.labelList, // 会员标签
-          province:
-            this.searchDatas.provinceCityText &&
-            this.searchDatas.provinceCityText[0], // 省份
-          city:
-            this.searchDatas.provinceCityText[1] &&
-            this.searchDatas.provinceCityText[1], // 市
-          area:
-            this.searchDatas.provinceCityText[2] &&
-            this.searchDatas.provinceCityText[2], // 县区
-          town:
-            this.searchDatas.provinceCityText[3] &&
-            this.searchDatas.provinceCityText[3], // 乡镇
+          province: this.searchDatas.provinceCityText && this.searchDatas.provinceCityText[0], // 省份
+          city: this.searchDatas.provinceCityText[1] && this.searchDatas.provinceCityText[1], // 市
+          area: this.searchDatas.provinceCityText[2] && this.searchDatas.provinceCityText[2], // 县区
+          town: this.searchDatas.provinceCityText[3] && this.searchDatas.provinceCityText[3], // 乡镇
           address: this.searchDatas.address.trim(), // 详细地址
           SearchStartTime: this.searchDatas.memberBirthday && this.searchDatas.memberBirthday[0], // 会员生日
           SearchEndTime: this.searchDatas.memberBirthday && this.searchDatas.memberBirthday[1], // 会员生日
           recommender: this.searchDatas.referrer.trim(), // 推荐人
           saleperson: this.searchDatas.saleperson.trim(), // 销售负责人
-          laststartholetime: this.searchDatas.contactTime[0] == undefined ? '' : this.searchDatas.contactTime[0],
-          Lastendholetime: this.searchDatas.contactTime[1] == undefined ? '' : this.searchDatas.contactTime[1],
+          laststartholetime: this.searchDatas.contactTime[0] == undefined ? "" : this.searchDatas.contactTime[0],
+          Lastendholetime: this.searchDatas.contactTime[1] == undefined ? "" : this.searchDatas.contactTime[1],
           F_Membership: this.searchDatas.membership, // 会员类型
           F_Class: this.searchDatas.class, // 会员分类
           AddStartTime: this.searchDatas.searchTime && this.searchDatas.searchTime[0], // 建档日期
@@ -376,7 +204,7 @@ export default {
         }
         getOrderLists(params).then((response) => {
           this.loading = false
-          if (response.state.toLowerCase() === 'success') {
+          if (response.state.toLowerCase() === "success") {
             this.pageParams.total = response.rows.Totals
             this.dataLists = response.rows.Rows
           }
@@ -391,17 +219,17 @@ export default {
       const year = date.getFullYear()
       let month = date.getMonth() + 1
       const day = date.getDate()
-      const hour = '00:00:00'
-      month = month.toString().padStart(2, '0')
-      date = date.toString().padStart(2, '0')
+      const hour = "00:00:00"
+      month = month.toString().padStart(2, "0")
+      date = date.toString().padStart(2, "0")
       const defaultDate = `${year}-${month}-${day} ${hour}`
 
       if (this.activeName == 2) {
-        this.searchDatas.contactTime = ['', defaultDate]
+        this.searchDatas.contactTime = ["", defaultDate]
       } else if (this.activeName == 1) {
-        this.searchDatas.contactTime = ['1970-01-01 00:00:00', defaultDate]
+        this.searchDatas.contactTime = ["1970-01-01 00:00:00", defaultDate]
       } else {
-        this.searchDatas.contactTime = ['', '']
+        this.searchDatas.contactTime = ["", ""]
       }
       this.getList()
     },
@@ -414,36 +242,28 @@ export default {
       this.searchDatas.provinceCityText = data
       window.location.href =
         this.$store.getters.serverConfig.BASE_API +
-        'api/vipinfo/exportexcel?name=' +
+        "api/vipinfo/exportexcel?name=" +
         this.searchDatas.customerName +
-        '&phone=' +
+        "&phone=" +
         this.searchDatas.phoneNumber + // 手机号码
-        '&province=' +
-        (this.searchDatas.provinceCityText.length > 0
-          ? this.searchDatas.provinceCityText[0]
-          : '') +
-        '&city=' +
-        (this.searchDatas.provinceCityText.length > 1
-          ? this.searchDatas.provinceCityText[1]
-          : '') +
-        '&area=' +
-        (this.searchDatas.provinceCityText.length > 2
-          ? this.searchDatas.provinceCityText[2]
-          : '') +
-        '&town=' +
-        (this.searchDatas.provinceCityText.length > 3
-          ? this.searchDatas.provinceCityText[3]
-          : '') +
-        '&label=' +
+        "&province=" +
+        (this.searchDatas.provinceCityText.length > 0 ? this.searchDatas.provinceCityText[0] : "") +
+        "&city=" +
+        (this.searchDatas.provinceCityText.length > 1 ? this.searchDatas.provinceCityText[1] : "") +
+        "&area=" +
+        (this.searchDatas.provinceCityText.length > 2 ? this.searchDatas.provinceCityText[2] : "") +
+        "&town=" +
+        (this.searchDatas.provinceCityText.length > 3 ? this.searchDatas.provinceCityText[3] : "") +
+        "&label=" +
         this.searchDatas.labelList + // 会员类型
-        '&address=' +
+        "&address=" +
         this.searchDatas.address + // 地址
-        '&recommender=' +
+        "&recommender=" +
         this.searchDatas.referrer + // 推荐人
-        '&saleperson=' +
+        "&saleperson=" +
         this.searchDatas.saleperson + // 销售负责人
         // '&token=' + this.token +
-        '&birthday=' +
+        "&birthday=" +
         this.searchDatas.birthday
     },
     clickMobile(number) {
@@ -451,10 +271,10 @@ export default {
         content: {
           content: callOut, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: number } // props
+          data: { rowid: number }, // props
         },
-        area: ['30%', '30%'],
-        title: '外呼'
+        area: ["30%", "30%"],
+        title: "外呼",
       })
     },
     btn_detail(editId) {
@@ -462,10 +282,10 @@ export default {
         content: {
           content: detail, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: editId } // props
+          data: { rowid: editId }, // props
         },
-        area: ['80%', '90%'],
-        title: '详情'
+        area: ["80%", "90%"],
+        title: "详情",
       })
     },
     btn_edit(editId) {
@@ -473,10 +293,10 @@ export default {
         content: {
           content: addOrEdit, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: editId.toString() } // props
+          data: { rowid: editId.toString() }, // props
         },
-        area: ['80%', '90%'],
-        title: '编辑会员信息'
+        area: ["80%", "90%"],
+        title: "编辑会员信息",
       })
     },
     // 添加订单
@@ -485,10 +305,10 @@ export default {
         content: {
           content: addOrder, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: id.toString() } // props
+          data: { rowid: id.toString() }, // props
         },
-        area: ['80%', '90%'],
-        title: '添加订单'
+        area: ["80%", "90%"],
+        title: "添加订单",
       })
     },
     // 添加待办
@@ -497,113 +317,113 @@ export default {
         content: {
           content: addTodo, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowPhone: phone, rowName: name } // props
+          data: { rowPhone: phone, rowName: name }, // props
         },
-        area: ['40%', '70%'],
-        title: '添加待办信息'
+        area: ["40%", "70%"],
+        title: "添加待办信息",
       })
     },
     // 批量删除
     btn_deletes() {
       if (this.selectedId.length == 0) {
-        this.$message('请选择一个选项')
+        this.$message("请选择一个选项")
         return
       } else {
-        this.$confirm('您确定要删除吗?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
+        this.$confirm("您确定要删除吗?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
           .then(() => {
             deletesMember(this.selectedId).then((response) => {
-              if (response.state.toLowerCase() === 'success') {
+              if (response.state.toLowerCase() === "success") {
                 this.getList()
-                this.$message.success('删除成功!')
+                this.$message.success("删除成功!")
               }
             })
           })
           .catch(() => {
-            this.$message.info('已取消删除')
+            this.$message.info("已取消删除")
           })
       }
     },
     // 档案合并
     btn_file_merge() {
       if (this.selectedId.length <= 1 || this.selectedId.length > 2) {
-        this.$message('请选择两个选项')
+        this.$message("请选择两个选项")
         return
       } else {
         this.$layer.iframe({
           content: {
             content: mergeId, // 传递的组件对象
             parent: this, // 当前的vue对象
-            data: { name: this.namesData, ids: this.selectedId } // props
+            data: { name: this.namesData, ids: this.selectedId }, // props
           },
-          area: ['40%', '70%'],
-          title: '选择主档案'
+          area: ["40%", "70%"],
+          title: "选择主档案",
         })
       }
     },
     // 档案拆分
     btn_file_split() {
       if (this.selectedId.length == 0) {
-        this.$message('请选择一个选项')
+        this.$message("请选择一个选项")
         return
       } else {
-        this.$confirm('您确定要拆分吗?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
+        this.$confirm("您确定要拆分吗?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
           .then(() => {
             const params = {
-              id: this.selectedId[0]
+              id: this.selectedId[0],
             }
             split(params).then((response) => {
-              if (response.state.toLowerCase() === 'success') {
+              if (response.state.toLowerCase() === "success") {
                 this.getList()
-                this.$message.success('拆分成功!')
+                this.$message.success("拆分成功!")
               }
             })
           })
           .catch(() => {
-            this.$message.info('已取消拆分')
+            this.$message.info("已取消拆分")
           })
       }
     },
     // 转移
     btn_transfer() {
       if (this.selectedId.length == 0) {
-        this.$message('请选择一个选项')
+        this.$message("请选择一个选项")
         return
       } else {
         this.$layer.iframe({
           content: {
             content: transfer, // 传递的组件对象
             parent: this, // 当前的vue对象
-            data: { rowid: this.selectedId } // props
+            data: { rowid: this.selectedId }, // props
           },
-          area: ['40%', '40%'],
-          title: '转移档案'
+          area: ["40%", "40%"],
+          title: "转移档案",
         })
       }
     },
     btn_delete(editId) {
-      this.$confirm('您确定要将此会员删除吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("您确定要将此会员删除吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
           deletesMember(editId).then((response) => {
-            if (response.state.toLowerCase() === 'success') {
+            if (response.state.toLowerCase() === "success") {
               this.getList()
-              this.$message.success('删除成功!')
+              this.$message.success("删除成功!")
             }
           })
         })
         .catch(() => {
-          this.$message.info('已取消删除')
+          this.$message.info("已取消删除")
         })
     },
     // 添加备注
@@ -612,10 +432,10 @@ export default {
         content: {
           content: addOrEditRemark, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: id } // props
+          data: { rowid: id }, // props
         },
-        area: ['40%', '50%'],
-        title: '添加备注'
+        area: ["40%", "50%"],
+        title: "添加备注",
       })
     },
     changeSelects(val) {
@@ -634,50 +454,48 @@ export default {
     clickCut(id) {
       const params = {
         id: id,
-        type: 0
+        type: 0,
       }
       encryptphone(params)
         .then((response) => {
-          if (response.state.toLowerCase() === 'success') {
+          if (response.state.toLowerCase() === "success") {
             this.phoneOne = response.data
             this.$copyText(this.phoneOne).then(
               (e) => {
-                this.$message.success(
-                  '号码复制成功,请联系管理员进行解密!'
-                )
+                this.$message.success("号码复制成功,请联系管理员进行解密!")
               },
               (e) => {
-                this.$toast('复制失败')
+                this.$toast("复制失败")
               }
             )
           }
         })
         .catch(() => {
-          this.$message.info('查询失败')
+          this.$message.info("查询失败")
         })
     },
     // 备用号码解密
     clickCut2(id) {
       const params = {
         id: id,
-        type: 1
+        type: 1,
       }
       encryptphone(params)
         .then((response) => {
-          if (response.state.toLowerCase() === 'success') {
+          if (response.state.toLowerCase() === "success") {
             this.phoneOne2 = response.data
             this.$copyText(this.phoneOne2).then(
               (e) => {
-                this.$message.success('号码复制成功,请联系管理员进行解密!')
+                this.$message.success("号码复制成功,请联系管理员进行解密!")
               },
               (e) => {
-                this.$toast('复制失败')
+                this.$toast("复制失败")
               }
             )
           }
         })
         .catch(() => {
-          this.$message.info('查询失败')
+          this.$message.info("查询失败")
         })
     },
     // 外呼
@@ -688,29 +506,29 @@ export default {
     callOut(phoneNumber) {
       if (phoneNumber) {
         getCallOutprefix(phoneNumber).then((response) => {
-          if (response.state.toLowerCase() === 'success') {
+          if (response.state.toLowerCase() === "success") {
             const res = response.data
             this.scoketDatas = {
-              Type: 'MakeCall',
+              Type: "MakeCall",
               AgentID: this.usercode,
               AgentExten: this.extension,
               Header: res.fix, // 号码前缀 用于截断前缀得到真实号码
-              DestinationNumber: res.phone //
+              DestinationNumber: res.phone, //
             }
-            store.dispatch('ChangeCallNum', phoneNumber)
+            store.dispatch("ChangeCallNum", phoneNumber)
             Send(this.scoketDatas)
-            store.dispatch('UpdateCalloutScreen', false) // 关闭外呼面板
-            store.dispatch('UpdateOutboundScreen', false) // 关闭外呼弹屏
+            store.dispatch("UpdateCalloutScreen", false) // 关闭外呼面板
+            store.dispatch("UpdateOutboundScreen", false) // 关闭外呼弹屏
           }
         })
       } else {
         this.$message({
-          message: '请先输入电话号码！',
-          type: 'warning'
+          message: "请先输入电话号码！",
+          type: "warning",
         })
       }
-    }
-  }
+    },
+  },
 }
 </script>
 

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

@@ -9,87 +9,34 @@
             <p class="title_sub">催单次数：<span class="red">10</span>次 | 工单状态： <span class="done">已完成</span></p> -->
           </el-col>
           <el-col :md="24" class="order_detail_content">
-            <el-col :md="6" class="order_detail_item">
-              客户姓名：{{ orderDetailData.F_Customer }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              手机号码：{{ orderDetailData.F_CustomerPhone }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              消息来源：{{ orderDetailData.F_ADFrom }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              下单日期：{{ orderDetailData.F_AddTime }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              下单员工：{{ orderDetailData.F_AddUserName }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              订单类型：{{ orderDetailData.F_Type }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              地址：{{ orderDetailData.address }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              出货仓库：{{ orderDetailData.F_Stock }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              收件人：{{ orderDetailData.F_Addressee }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              收件人手机号：{{ orderDetailData.F_AddPhone }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              送货说明：{{ orderDetailData.F_AddDes }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              快递：{{ orderDetailData.F_Express }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              运费：{{ orderDetailData.F_ExpressFee }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              支付方式：{{ orderDetailData.F_PayType }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              使用积分：{{ orderDetailData.F_Score }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              推荐人：{{ orderDetailData.F_RecommendName }}
-            </el-col>
-            <el-col :md="6" class="order_detail_item">
-              运单号：{{ orderDetailData.F_FlowNum }}
-            </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_TotlePrice }}
-            </el-col>
-            <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_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>
-            <el-col :md="6" class="order_detail_item">
-              备注：{{ orderDetailData.F_Remark }}
-            </el-col>
+            <el-col :md="6" class="order_detail_item"> 客户姓名：{{ orderDetailData.F_Customer }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 手机号码：{{ orderDetailData.F_CustomerPhone }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 消息来源：{{ orderDetailData.F_ADFrom }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 下单日期：{{ orderDetailData.F_AddTime }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 下单员工：{{ orderDetailData.F_AddUserName }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 订单类型：{{ orderDetailData.F_Type }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 地址：{{ orderDetailData.address }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 出货仓库：{{ orderDetailData.F_Stock }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 收件人：{{ orderDetailData.F_Addressee }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 收件人手机号：{{ orderDetailData.F_AddPhone }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 送货说明：{{ orderDetailData.F_AddDes }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 快递：{{ orderDetailData.F_Express }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 运费：{{ orderDetailData.F_ExpressFee }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 支付方式：{{ orderDetailData.F_PayType }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 使用积分：{{ orderDetailData.F_Score }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 推荐人：{{ orderDetailData.F_RecommendName }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 运单号：{{ orderDetailData.F_TrackingNo }} </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_TotlePrice }} </el-col>
+            <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_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>
+            <el-col :md="6" class="order_detail_item"> 备注：{{ orderDetailData.F_Remark }} </el-col>
+            <el-col :md="6" class="order_detail_item"> 支付备注：{{ orderDetailData.F_RemarkXS }} </el-col>
             <el-col :md="24">
               <el-table :data="orderDetailData.OrderDetailList" stripe border style="width: 100%">
                 <el-table-column prop="F_ProductName" label="商品名称" align="center"></el-table-column>
@@ -98,19 +45,17 @@
                 <el-table-column prop="F_TotlePrice" label="商品总价" align="center"></el-table-column>
               </el-table>
             </el-col>
-            <el-col :offset="16" :span="8" class="order_detail_item">
-                合计：{{ orderDetailData.commodityTotlePrice }}
-            </el-col>
+            <el-col :offset="16" :span="8" class="order_detail_item"> 合计：{{ orderDetailData.commodityTotlePrice }} </el-col>
             <el-col v-if="isChatList" :md="24">
               <el-table :data="ChatList" stripe border style="width: 100%">
-                <el-table-column prop="F_Content" label="备注内容" align="center"/>
+                <el-table-column prop="F_Content" 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 prop="F_AddTime" label="添加时间" align="center"/>
-                <el-table-column prop="F_AddUserName" label="创建人" align="center"/>
+                <el-table-column prop="F_AddTime" label="添加时间" align="center" />
+                <el-table-column prop="F_AddUserName" 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_edit_remark'" type="text" @click="btn_edit_remark(scope.row.F_WoID, scope.row.F_ID)">修改</el-button> -->
@@ -130,24 +75,12 @@
             <h1 class="title">工单流转</h1>
           </el-col>
 
-          <el-table
-            :data="workOrderCirculationList"
-            border
-            stripe
-            row-key="F_Id"
-          >
+          <el-table :data="workOrderCirculationList" border stripe row-key="F_Id">
             <el-table-column prop="F_CreateUser" label="创建人" align="center" min-width />
             <el-table-column prop="F_CreateTime" label="创建时间" align="center" min-width />
             <el-table-column prop="F_OptContent" label="内容" align="center" min-width />
           </el-table>
-          <Pagination
-            v-show="pageParams.total > 0"
-            :total="pageParams.total"
-            :pageindex.sync="pageParams.pageindex"
-            :pagesize.sync="pageParams.pagesize"
-            class="pagination"
-            @pagination="paginationFun"
-          />
+          <Pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex" :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="paginationFun" />
         </el-card>
       </el-col>
     </el-row>
@@ -155,107 +88,105 @@
 </template>
 
 <script>
-import { getOrder } from '@/api/orderManagement/orderList'
-import { mapGetters } from 'vuex'
-import { deleteAfterSaleListChatLog } from '@/api/afterSaleManagement/afterSaleList'
-import addOrEditRemark from './addOrEditRemark'
-import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
+import { getOrder } from "@/api/orderManagement/orderList"
+import { mapGetters } from "vuex"
+import { deleteAfterSaleListChatLog } from "@/api/afterSaleManagement/afterSaleList"
+import addOrEditRemark from "./addOrEditRemark"
+import Pagination from "@/components/Pagination" // 对el-pagination 二次封装
 
 export default {
-  name: 'Detail',
+  name: "Detail",
   components: {
-    Pagination
+    Pagination,
   },
   filters: {
     judgmentIsSo(status) {
       const statusMap = {
-        '0': '否',
-        '1': '是'
+        0: "否",
+        1: "是",
       }
       return statusMap[status]
-    }
+    },
   },
   props: {
     rowid: {
       type: String,
-      default: ''
+      default: "",
     },
     layerid: {
       type: String,
-      default: ''
-    }
+      default: "",
+    },
   },
   data() {
     return {
-      activeName: 'first',
+      activeName: "first",
       ChatList: [], // 备注详情列表
       isChatList: false, // 备注列表是否展示
       orderDetailData: {
-        F_Customer: '', // 客户姓名
-        F_CustomerPhone: '', // 手机号码
-        F_ADFrom: '', // 消息来源
-        F_Type: '', // 订单类型
-        F_Id: '', // 订单号
+        F_Customer: "", // 客户姓名
+        F_CustomerPhone: "", // 手机号码
+        F_ADFrom: "", // 消息来源
+        F_Type: "", // 订单类型
+        F_Id: "", // 订单号
         OrderDetailList: [], // 订单详情list
         UseActList: [], // 活动详情list
-        F_State: '', // 订单状态
-        F_TrackingNo: '', // 快递单号
-        F_Addressee: '', // 收件人
-        F_AddPhone: '', // 收件人手机号
-        F_AddDes: '', // 送货说明
-        F_Express: '', // 选择的快递
-        F_ExpressFee: '', // 运费
-        F_PayType: '', // 支付方式
-        F_Stock: '', // 出货仓库
-        F_RealPrice: '', // 实收金额
-        F_VipId: '', // 关联会员id
-        F_Score: '', // 使用积分
-        F_AddTime: '', // 添加时间
-        F_AddUserName: '', // 下单员工
-        F_FlowNum: '', // 运单号
-        F_RecommendName: '', // 推荐人名称
-        F_BelongName: '', // 归属人名称
-        F_Remark: '', // 备注
-        address: '', // 地址
-        F_ShouldPrice: '', // 应付金额
-        F_TotlePrice: '', // 商品金额
-        commodityTotlePrice: '', // 商品合计金额
-        F_MediaName: '', // 媒体名称
-        F_SendbackTrackingNo: '', // 寄回运单号
-        F_BelongName: '', //销售
-        F_CoreName: '', //中心
-        F_GroupName: '', //小组
+        F_State: "", // 订单状态
+        F_TrackingNo: "", // 快递单号
+        F_Addressee: "", // 收件人
+        F_AddPhone: "", // 收件人手机号
+        F_AddDes: "", // 送货说明
+        F_Express: "", // 选择的快递
+        F_ExpressFee: "", // 运费
+        F_PayType: "", // 支付方式
+        F_Stock: "", // 出货仓库
+        F_RealPrice: "", // 实收金额
+        F_VipId: "", // 关联会员id
+        F_Score: "", // 使用积分
+        F_AddTime: "", // 添加时间
+        F_AddUserName: "", // 下单员工
+        F_RecommendName: "", // 推荐人名称
+        F_BelongName: "", // 归属人名称
+        F_Remark: "", // 备注
+        F_RemarkXS: "", // 支付备注
+        address: "", // 地址
+        F_ShouldPrice: "", // 应付金额
+        F_TotlePrice: "", // 商品金额
+        commodityTotlePrice: "", // 商品合计金额
+        F_MediaName: "", // 媒体名称
+        F_SendbackTrackingNo: "", // 寄回运单号
+        F_BelongName: "", //销售
+        F_CoreName: "", //中心
+        F_GroupName: "", //小组
       },
-      ordercode: '', // 工单编号
-      name: '', // 姓名
-      phone: '', // 电话
-      sex: '', // 性别
-      address: '', // 地址
-      sourcename: '', // 工单来源
-      sourcetype: '', // 工单类型
-      content: '', // 工单内容
-      createtime: '', // 创建时间
-      createuser: '', // 创建人
+      ordercode: "", // 工单编号
+      name: "", // 姓名
+      phone: "", // 电话
+      sex: "", // 性别
+      address: "", // 地址
+      sourcename: "", // 工单来源
+      sourcetype: "", // 工单类型
+      content: "", // 工单内容
+      createtime: "", // 创建时间
+      createuser: "", // 创建人
       pageParams: {
         pageindex: 1, // 当前第几页
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-        total: 0 // 总共多少数据
+        total: 0, // 总共多少数据
       },
       workOrderCirculationList: [], // 工单流转
       workOrderCirculationListAll: [], // 工单流转
-      orderlists: []
+      orderlists: [],
     }
   },
   computed: {
-    ...mapGetters([
-      'rolecode'
-    ])
+    ...mapGetters(["rolecode"]),
   },
   created() {
     if (this.rowid) {
       this.getDetail(this.rowid)
     }
-    if (window.localStorage.getItem('roleCode') === 'GLY' || window.localStorage.getItem('roleCode') === 'SH' || window.localStorage.getItem('roleCode') === 'XS') {
+    if (window.localStorage.getItem("roleCode") === "GLY" || window.localStorage.getItem("roleCode") === "SH" || window.localStorage.getItem("roleCode") === "XS") {
       this.isChatList = true
     } else {
       this.isChatList = false
@@ -271,36 +202,36 @@ export default {
         content: {
           content: addOrEditRemark, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: id, remarkId: remarkId } // props
+          data: { rowid: id, remarkId: remarkId }, // props
         },
-        area: ['40%', '50%'],
-        title: '编辑备注'
+        area: ["40%", "50%"],
+        title: "编辑备注",
       })
     },
     // 删除备注
     btn_delete_remark(id) {
       setTimeout(() => {
-        this.$confirm('确定删除吗?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
+        this.$confirm("确定删除吗?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
           .then(() => {
             this.isDisable = false
             const data = {
-              orderids: id
+              orderids: id,
             }
             deleteAfterSaleListChatLog(data).then((response) => {
-              if (response.state.toLowerCase() === 'success') {
+              if (response.state.toLowerCase() === "success") {
                 this.getDetail(this.rowid)
-                this.$message.success('删除成功!')
+                this.$message.success("删除成功!")
               }
             })
           })
           .catch(() => {
             this.$message({
-              type: 'info',
-              message: '已取消删除'
+              type: "info",
+              message: "已取消删除",
             })
           })
         this.isDisable = false
@@ -320,7 +251,7 @@ export default {
     },
     // 详情
     getDetail(rid) {
-      getOrder(rid).then(response => {
+      getOrder(rid).then((response) => {
         this.ChatList = response.ChatList
         this.workOrderCirculationListAll = response.ItemList
         this.orderlists = response.modelreturn.OrderDetailList[0]
@@ -335,19 +266,19 @@ export default {
         this.orderDetailData.F_Id = res.F_Id // 订单号
         this.orderDetailData.UseActList = res.UseActList // 活动详情list
         this.activityAccountData = res.UseActList
-        this.orderDetailData.F_State = res.F_State + ''// 订单状态
+        this.orderDetailData.F_State = res.F_State + "" // 订单状态
         this.orderDetailData.F_TrackingNo = res.F_TrackingNo // 快递单号
         this.orderDetailData.F_Addressee = res.F_Addressee // 收件人
         this.orderDetailData.F_AddPhone = res.F_AddPhone // 收件人手机号
         this.orderDetailData.F_AddDes = res.F_AddDes // 送货说明
         this.orderDetailData.F_TotlePrice = res.F_TotlePrice // 商品金额
-        res.F_AddProvince = res.F_AddProvince === null ? '' : res.F_AddProvince // 省
-        res.F_AddCity = res.F_AddCity === null ? '' : res.F_AddCity // 市
-        res.F_AddArea = res.F_AddArea === null ? '' : res.F_AddArea // 县/区
-        res.F_AddTown = res.F_AddTown === null ? '' : res.F_AddTown // 乡/镇
-        res.F_Address = res.F_Address === null ? '' : res.F_Address // 详细地址
+        res.F_AddProvince = res.F_AddProvince === null ? "" : res.F_AddProvince // 省
+        res.F_AddCity = res.F_AddCity === null ? "" : res.F_AddCity // 市
+        res.F_AddArea = res.F_AddArea === null ? "" : res.F_AddArea // 县/区
+        res.F_AddTown = res.F_AddTown === null ? "" : res.F_AddTown // 乡/镇
+        res.F_Address = res.F_Address === null ? "" : res.F_Address // 详细地址
         this.orderDetailData.address = res.F_AddProvince + res.F_AddCity + res.F_AddArea + res.F_AddTown + res.F_Address // 地址
-        this.orderDetailData.F_Express = res.F_Express + '' // 选择的快递
+        this.orderDetailData.F_Express = res.F_Express + "" // 选择的快递
         this.orderDetailData.F_ExpressFee = res.F_ExpressFee // 运费
         this.orderDetailData.F_PayType = res.F_PayType // 支付方式
         this.orderDetailData.F_Stock = res.F_Stock // 出货仓库
@@ -355,12 +286,12 @@ export default {
         this.orderDetailData.F_VipId = res.F_VipId // 关联会员id
         this.orderDetailData.F_Score = res.F_UseScore // 使用积分
         this.orderDetailData.F_AddTime = res.F_AddTime // 添加时间
-        this.orderDetailData.F_FlowNum = res.F_TrackingNo // 运单号
-        this.orderDetailData.F_RecommendName = res.F_RecommendName// 推荐人名称
+        this.orderDetailData.F_RecommendName = res.F_RecommendName // 推荐人名称
         this.orderDetailData.F_AddUserName = res.F_AddUserName // 下单员工
         this.orderDetailData.F_BelongName = res.F_BelongName // 归属员工
         this.orderDetailData.F_Type = res.F_Type // 订单类型
         this.orderDetailData.F_Remark = res.F_Remark // 备注
+        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 // 寄回运单号
@@ -375,153 +306,153 @@ export default {
     },
     edit() {
       debugger
-      this.$router.push({ path: '/edit', query: { id: this.ordercode }})
-    }
-  }
+      this.$router.push({ path: "/edit", query: { id: this.ordercode } })
+    },
+  },
 }
 </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/systemSetup/roleSetting/menuSetup/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-input v-model="keyword" placeholder="请输入关键字" class="filter-item"/>
+      <el-input v-model="keyword" 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_add'" type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
     </div>
@@ -11,12 +11,13 @@
       :eval-func="func"
       :eval-args="args"
       :expand-all="false"
-      row-key='id'
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      row-key="id"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       border
       element-loading-text="拼命加载中..."
       element-loading-spinner="el-icon-loading"
-      element-loading-background="rgba(0, 0, 0, 0.6)">
+      element-loading-background="rgba(0, 0, 0, 0.6)"
+    >
       <el-table-column label="菜单名称" align="center" width="200">
         <template slot-scope="scope">
           {{ scope.row.name }}
@@ -32,11 +33,11 @@
           {{ scope.row.code }}
         </template>
       </el-table-column>
-      <el-table-column :formatter="formatterTarget" prop="target" label="菜单类型" align="center" width="100"/>
+      <el-table-column :formatter="formatterTarget" prop="target" label="菜单类型" align="center" width="100" />
       <el-table-column label="是否启用" align="center" width="100">
         <template slot-scope="scope">
-          <i v-if="scope.row.stateFlag === 1" class="el-icon-success target_color1"/>
-          <i v-else-if="scope.row.stateFlag === 0" class="el-icon-warning target_color2"/>
+          <i v-if="scope.row.stateFlag === 1" class="el-icon-success target_color1" />
+          <i v-else-if="scope.row.stateFlag === 0" class="el-icon-warning target_color2" />
         </template>
       </el-table-column>
       <el-table-column label="介绍" align="center">
@@ -56,15 +57,15 @@
 </template>
 
 <script>
-import { getMenuLists, deleteMenu } from '@/api/systemSetup/roleSetting/menuSetup'
-import treeTable from '@/components/TreeTable'
-import treeToArray from './customEval'
-import addOrEditMenu from './components/addOrEditMenu'
-import menuBtn from './menuBtn'
+import { getMenuLists, deleteMenu } from "@/api/systemSetup/roleSetting/menuSetup"
+import treeTable from "@/components/TreeTable"
+import treeToArray from "./customEval"
+import addOrEditMenu from "./components/addOrEditMenu"
+import menuBtn from "./menuBtn"
 export default {
-  name: 'MenuSetup',
+  name: "MenuSetup",
   components: {
-    treeTable
+    treeTable,
   },
   data() {
     return {
@@ -72,9 +73,9 @@ export default {
       func: treeToArray,
       expandAll: true,
       args: [null, null],
-      keyword: '',
+      keyword: "",
       menuData: [],
-      parentids: []
+      parentids: [],
     }
   },
   created() {
@@ -87,27 +88,27 @@ export default {
   },
   methods: {
     getDatas() {
-      const keyword = this.keyword.replace(/\s+/g, '')
-      getMenuLists(keyword).then(response => {
+      const keyword = this.keyword.replace(/\s+/g, "")
+      getMenuLists(keyword).then((response) => {
         this.loading = false
         this.menuData = this.$options.methods.buildTree(response.rows)
-        console.log('this.menuData', this.menuData)
+        console.log("this.menuData", this.menuData)
       })
     },
     formatterTarget(row, column) {
-      let targetTxt = ''
+      let targetTxt = ""
       switch (row.target) {
-        case 'expand':
-          targetTxt = '无页面'
+        case "expand":
+          targetTxt = "无页面"
           break
-        case 'iframe':
-          targetTxt = '框架页'
+        case "iframe":
+          targetTxt = "框架页"
           break
-        case 'open':
-          targetTxt = '弹出页'
+        case "open":
+          targetTxt = "弹出页"
           break
-        case 'blank':
-          targetTxt = '新窗口'
+        case "blank":
+          targetTxt = "新窗口"
           break
         default:
           break
@@ -122,29 +123,29 @@ export default {
         content: {
           content: addOrEditMenu, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { 'rowid': '' }// props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
+          data: { rowid: "" }, // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
         },
-        area: ['80%', '90%'],
+        area: ["80%", "90%"],
         shadeClose: false,
-        title: '添加菜单'
+        title: "添加菜单",
       })
     },
     btn_edit(row) {
-      console.log("row",row)
+      console.log("row", row)
       this.parentids = []
       if (row.parent) {
         this.getParents(row.parent)
       } else {
-        this.parentids.push('000000000000000000000000')
+        this.parentids.push("000000000000000000000000")
       }
       this.$layer.iframe({
         content: {
           content: addOrEditMenu, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { 'rowid': row.id, 'parentidArr': this.parentids }// props
+          data: { rowid: row.id, parentidArr: this.parentids }, // props
         },
-        area: ['80%', '90%'],
-        title: '编辑菜单'
+        area: ["80%", "90%"],
+        title: "编辑菜单",
       })
     },
     btn_button(row) {
@@ -152,33 +153,35 @@ export default {
         content: {
           content: menuBtn, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { 'rowid': row.id }// props
+          data: { rowid: row.id }, // props
         },
-        area: ['80%', '90%'],
-        title: `${row.name} 的按钮管理`
+        area: ["80%", "90%"],
+        title: `${row.name} 的按钮管理`,
       })
     },
     btn_delete(editId) {
-      this.$confirm('此操作将永久删除当前菜单, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleteMenu(editId).then(response => {
-          if (response.state.toLowerCase() === 'success') {
-            this.getDatas()
-            this.$message.success('删除成功!')
-          }
-        })
-      }).catch(() => {
-        this.$message.info('已取消删除')
+      this.$confirm("此操作将永久删除当前菜单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
+        .then(() => {
+          deleteMenu(editId).then((response) => {
+            if (response.state.toLowerCase() === "success") {
+              this.getDatas()
+              this.$message.success("删除成功!")
+            }
+          })
+        })
+        .catch(() => {
+          this.$message.info("已取消删除")
+        })
     },
     /**
-			 * 将一维的扁平数组转换为多层级对象
-			 * @param  {[type]} list 一维数组，数组中每一个元素需包含id和parent_id两个属性
-			 * @return {[type]} tree 多层级树状结构
-			 */
+     * 将一维的扁平数组转换为多层级对象
+     * @param  {[type]} list 一维数组，数组中每一个元素需包含id和parent_id两个属性
+     * @return {[type]} tree 多层级树状结构
+     */
     buildTree(list) {
       const temp = {}
       const tree = {}
@@ -195,8 +198,6 @@ export default {
           tree[temp[i].F_Id] = temp[i]
         }
       }
-      console.log('temp', temp)
-      console.log('tree', tree)
       return this.filterMenuDatas(tree)
     },
     // 处理数据格式
@@ -205,7 +206,7 @@ export default {
       let j = -1
       for (const i in menudatas) {
         j++
-        if (menudatas[i].F_ParentId === '000000000000000000000000') {
+        if (menudatas[i].F_ParentId === "000000000000000000000000") {
           accessedRouters.push({
             id: menudatas[i].F_Id,
             path: menudatas[i].F_OptUrl,
@@ -215,7 +216,7 @@ export default {
             stateFlag: menudatas[i].F_State, // 是否启用
             remark: menudatas[i].F_Remark, // 介绍
             sort: menudatas[i].F_Sort, //排序
-            children: []
+            children: [],
           })
         } else {
           accessedRouters.push({
@@ -233,7 +234,7 @@ export default {
           accessedRouters[j].children = this.filterMenuDatas(menudatas[i].childnodes)
         }
       }
-      accessedRouters.sort(function(x, y) {
+      accessedRouters.sort(function (x, y) {
         return x.sort - y.sort
       })
       return accessedRouters
@@ -244,19 +245,19 @@ export default {
       if (poptions.parent) {
         this.getParents(poptions.parent)
       }
-    }
-  }
+    },
+  },
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-	.target_color1 {
-		color: #13ce66;
-		font-size: 16px;
-	}
+.target_color1 {
+  color: #13ce66;
+  font-size: 16px;
+}
 
-	.target_color2 {
-		color: #ff4949;
-		font-size: 16px;
-	}
+.target_color2 {
+  color: #ff4949;
+  font-size: 16px;
+}
 </style>

CallCenterWeb.UI/src/views/systemSetup/roleSetting/roleSetup/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container role_setup">
     <div class="filter-container">
-      <el-input v-model="keyword" placeholder="请输入角色代码" class="filter-item"/>
+      <el-input v-model="keyword" 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_add'" type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
       <el-button v-permission="'HY_edit'" type="primary" class="filter-item" icon="el-icon-edit" @click="btn_edit">编辑</el-button>
@@ -10,75 +10,50 @@
     </div>
     <el-row :gutter="20">
       <el-col :span="12">
-        <el-alert
-          :closable="false"
-          title="角色列表"
-          type="success"/>
-        <el-table
-          v-loading="loading"
-          :data="roleLists"
-          border
-          stripe
-          highlight-current-row
-          @row-click="handleTableClick">
-          <el-table-column type="index" label="编号" align="center" fixed width="80"/>
-          <el-table-column prop="F_RoleName" label="用户角色" align="center" min-width=""/>
-          <el-table-column prop="F_RoleCode" label="角色代码" align="center" min-width=""/>
-          <el-table-column prop="F_CreateOn" label="创建时间" align="center" min-width=""/>
-          <el-table-column prop="F_LastModifyOn" label="最后修改时间" align="center" min-width=""/>
-          <el-table-column prop="F_Remark" label="备注" align="center" min-width=""/>
+        <el-alert :closable="false" title="角色列表" type="success" />
+        <el-table v-loading="loading" :data="roleLists" border stripe highlight-current-row @row-click="handleTableClick">
+          <el-table-column type="index" label="编号" align="center" fixed width="80" />
+          <el-table-column prop="F_RoleName" label="用户角色" align="center" min-width="" />
+          <el-table-column prop="F_RoleCode" label="角色代码" align="center" min-width="" />
+          <el-table-column prop="F_CreateOn" label="创建时间" align="center" min-width="" />
+          <el-table-column prop="F_LastModifyOn" label="最后修改时间" align="center" min-width="" />
+          <el-table-column prop="F_Remark" label="备注" align="center" min-width="" />
         </el-table>
-        <pagination
-          v-show="pageParams.total > 0"
-          :total="pageParams.total"
-          :pageindex.sync="pageParams.pageindex"
-          :pagesize.sync="pageParams.pagesize"
-          class="pagination"
-          @pagination="getList" />
+        <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex" :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getList" />
       </el-col>
       <el-col :span="12">
-        <el-alert
-          :closable="false"
-          title="权限树"
-          type="success"/>
-        <el-tree
-          ref="treeRef"
-          :data="treelists"
-          show-checkbox
-          node-key="id"
-          check-strictly
-          highlight-current/>
+        <el-alert :closable="false" title="权限树" type="success" />
+        <el-tree ref="treeRef" :data="treelists" show-checkbox node-key="id" check-strictly highlight-current />
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
-
-import { getRoleLists, deleteRole, saveRoleList, getRoleTree } from '@/api/systemSetup/roleSetting/roleSetup'
-import addOrEditRole from './addOrEditRole'
-import { pickerOptions } from '@/utils'
-import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
+import { getRoleLists, deleteRole, saveRoleList, getRoleTree } from "@/api/systemSetup/roleSetting/roleSetup"
+import addOrEditRole from "./addOrEditRole"
+import { pickerOptions } from "@/utils"
+import Pagination from "@/components/Pagination" // 对el-pagination 二次封装
 
 export default {
-  name: 'RoleSetup',
+  name: "RoleSetup",
   components: {
-    Pagination
+    Pagination,
   },
   data() {
     return {
       loading: false,
-      searchDate: '',
-      keyword: '',
+      searchDate: "",
+      keyword: "",
       pageParams: {
         pageindex: 1, // 当前第几页
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-        total: 0 // 总共多少数据
+        total: 0, // 总共多少数据
       },
       pickerOptions, // 日期选择器快捷选项
       roleLists: [], // 角色列表数据
       treelists: [], // 菜单树数据
-      role_id: '' // 角色id
+      role_id: "", // 角色id
     }
   },
   created() {
@@ -94,21 +69,21 @@ export default {
   methods: {
     getList() {
       this.loading = true
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         const params = {
           pageindex: this.pageParams.pageindex, // 第几页
           pagesize: this.pageParams.pagesize, // 每页几条信息
-          keyword: this.keyword.replace(/\s+/g, ''), //	项目名称，项目类型，项目负责人
+          keyword: this.keyword.replace(/\s+/g, ""), //	项目名称，项目类型，项目负责人
           stime: this.searchDate && this.searchDate[0],
-          etime: this.searchDate && this.searchDate[1]
+          etime: this.searchDate && this.searchDate[1],
         }
-        getRoleLists(params).then(response => {
+        getRoleLists(params).then((response) => {
           this.loading = false
-          if (response.state.toLowerCase() === 'success') {
+          if (response.state.toLowerCase() === "success") {
             this.pageParams.total = response.data.Totals
             this.roleLists = response.data.Rows
-            this.$refs.treeRef.setCheckedKeys([])// 清空权限树的选中状态
-            this.role_id = ''
+            this.$refs.treeRef.setCheckedKeys([]) // 清空权限树的选中状态
+            this.role_id = ""
           }
         })
         resolve()
@@ -128,77 +103,79 @@ export default {
         content: {
           content: addOrEditRole, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { 'rowid': '' }// props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
+          data: { rowid: "" }, // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
         },
-        area: ['40%', '400px'],
+        area: ["40%", "400px"],
         shadeClose: false,
-        title: '添加用户角色'
+        title: "添加用户角色",
       })
     },
     btn_edit() {
       if (!this.role_id) {
-        this.$message.warning('请先选择要编辑的用户角色!')
+        this.$message.warning("请先选择要编辑的用户角色!")
         return
       }
       this.$layer.iframe({
         content: {
           content: addOrEditRole, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { 'rowid': this.role_id }// props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
+          data: { rowid: this.role_id }, // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
         },
-        area: ['40%', '400px'],
+        area: ["40%", "400px"],
         shadeClose: false,
-        title: '编辑用户角色'
+        title: "编辑用户角色",
       })
     },
     btn_delete() {
       if (!this.role_id) {
-        this.$message.warning('请先选择要删除的用户角色!')
+        this.$message.warning("请先选择要删除的用户角色!")
         return
       }
-      if (this.role_id === '5aaa5a54b9c1893cb015df26') {
-        this.$message.warning('系统维护不能删除!')
+      if (this.role_id === "5aaa5a54b9c1893cb015df26") {
+        this.$message.warning("系统维护不能删除!")
         return
       }
-      this.$confirm('此操作将永久删除当前角色, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleteRole(this.role_id).then(response => {
-          if (response.state.toLowerCase() === 'success') {
-            this.getList()
-            this.$message.success('删除成功!')
-          }
-        })
-      }).catch(() => {
-        this.$message.info('已取消删除')
+      this.$confirm("此操作将永久删除当前角色, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
+        .then(() => {
+          deleteRole(this.role_id).then((response) => {
+            if (response.state.toLowerCase() === "success") {
+              this.getList()
+              this.$message.success("删除成功!")
+            }
+          })
+        })
+        .catch(() => {
+          this.$message.info("已取消删除")
+        })
     },
     btn_save() {
       if (!this.role_id) {
-        this.$message.warning('请先选择用户角色!')
+        this.$message.warning("请先选择用户角色!")
         return
       }
       if (this.$refs.treeRef.getCheckedKeys().length === 0) {
-        this.$message.warning('请选择权限!')
+        this.$message.warning("请选择权限!")
         return
       }
       // console.log(this.$refs.treeRef.getCheckedKeys())//返回目前被选中的节点的 key 所组成的数组
       saveRoleList({
         role_id: this.role_id, // 角色id
-        ids: this.$refs.treeRef.getCheckedKeys()//	选中权限树的id值,
-      }).then(response => {
-        if (response.state.toLowerCase() === 'success') {
-          this.$message.success('恭喜你，角色权限保存成功!')
+        ids: this.$refs.treeRef.getCheckedKeys(), //	选中权限树的id值,
+      }).then((response) => {
+        if (response.state.toLowerCase() === "success") {
+          this.$message.success("恭喜你，角色权限保存成功!")
         }
       })
     },
     // 权限树
     getTreeList() {
-      return new Promise(resolve => {
-        getRoleTree(this.role_id).then(response => {
-          if (response.state.toLowerCase() === 'success') {
+      return new Promise((resolve) => {
+        getRoleTree(this.role_id).then((response) => {
+          if (response.state.toLowerCase() === "success") {
             this.treelists = this.buildTree(response.data)
             if (this.role_id) {
               // 获取ischecked数组 设置选中
@@ -221,10 +198,10 @@ export default {
       return checkedArr
     },
     /**
-		* 将一维的扁平数组转换为多层级对象
-		* @param  {[type]} list 一维数组，数组中每一个元素需包含id和pid两个属性
-		* @return {[type]} tree 多层级树状结构
-		*/
+     * 将一维的扁平数组转换为多层级对象
+     * @param  {[type]} list 一维数组，数组中每一个元素需包含id和pid两个属性
+     * @return {[type]} tree 多层级树状结构
+     */
     buildTree(list) {
       const temp = {}
       const tree = {}
@@ -234,7 +211,7 @@ export default {
       }
       for (const i in temp) {
         // if (temp[i].pid !== 'Moudle_000000000000000000000000') {
-        if (temp[i].pid !== 'Moudle_0') {
+        if (temp[i].pid !== "Moudle_0") {
           if (!temp[temp[i].pid].children) {
             temp[temp[i].pid].children = []
           }
@@ -254,30 +231,28 @@ export default {
         accessedRouters.push({
           id: treeDatas[i].id,
           label: treeDatas[i].name,
-          children: []
+          children: [],
         })
         if (treeDatas[i].children) {
           accessedRouters[j].children = this.filterTreeDatas(treeDatas[i].children)
         }
       }
-
       return accessedRouters
-    }
-  }
+    },
+  },
 }
 </script>
 
 <!-- 需要注意的是，修改elementUI的默认样式的css不能使用scoped. -->
 <style rel="stylesheet/scss" lang="scss">
-	.role_setup{
-		.el-table tr{
-			cursor: pointer;
-		}
-		.el-table__body tr.current-row>td {
-			background: rgba(185, 221, 249, .75);
-		}
-	}
+.role_setup {
+  .el-table tr {
+    cursor: pointer;
+  }
+  .el-table__body tr.current-row > td {
+    background: rgba(185, 221, 249, 0.75);
+  }
+}
 </style>
 <style rel="stylesheet/scss" lang="scss" scoped>
-
 </style>