From ff3d23e5d47afd763ec96c747430e2a779f24e21 Mon Sep 17 00:00:00 2001
From: wangyan <3594713855@qq.com>
Date: Mon, 26 Aug 2024 17:52:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/douyin/after_sale/index.vue         | 14 ++++++--
 .../douyin/quick_intercept_service/index.vue  | 32 +++++++++++++------
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/views/douyin/after_sale/index.vue b/src/views/douyin/after_sale/index.vue
index 70670f4..269f3f4 100644
--- a/src/views/douyin/after_sale/index.vue
+++ b/src/views/douyin/after_sale/index.vue
@@ -39,7 +39,7 @@
       append-to-body
     >
       <el-upload
-        ref="upload"
+        ref="upload2"
         :limit="1"
         :headers="upload2.headers"
         :action="upload2.url"
@@ -58,7 +58,7 @@
         <el-button
           :loading="upload2.isUploading"
           type="primary"
-          @click="submitFileForm"
+          @click="submitFileForm2"
           >确 定</el-button
         >
         <el-button @click="upload2.open = false">取 消</el-button>
@@ -478,13 +478,21 @@ export default {
       this.upload2.open = false;
       this.upload2.isUploading = false;
       this.$refs.upload2.clearFiles();
-      this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+      this.$notify({
+        title: "导入成功",
+        type: "success",
+        duration: 2500
+      });
+
       this.init();
     },
     // 提交上传文件
     submitFileForm() {
       this.$refs.upload.submit();
     },
+    submitFileForm2() {
+      this.$refs.upload2.submit();
+    },
     toQuery0() {
       this.page = 0;
       this.url = "/api/douyinAfterSales/specQuery";
diff --git a/src/views/douyin/quick_intercept_service/index.vue b/src/views/douyin/quick_intercept_service/index.vue
index 4bf9daf..dc24342 100644
--- a/src/views/douyin/quick_intercept_service/index.vue
+++ b/src/views/douyin/quick_intercept_service/index.vue
@@ -76,7 +76,7 @@
         </el-col>
         <el-col :span="6">
           <el-select
-            v-model="query.resolution"
+            v-model="query.expressCompany"
             style="width:100%"
             clearable
             placeholder="快递公司"
@@ -175,7 +175,13 @@
       <af-table-column prop="expressCompany" label="快递公司" />
       <af-table-column prop="afterSalesNumber" label="售后单号" />
       <af-table-column prop="initiator" label="发起人" />
-      <af-table-column prop="interceptTime" label="发起拦截时间" />
+      <af-table-column prop="interceptTime" label="发起拦截时间">
+        <template slot-scope="scope">
+          <span>{{
+            parseTime(scope.row.interceptTime, "{y}-{m}-{d} {h}:{i}:{s}")
+          }}</span>
+        </template>
+      </af-table-column>
       <af-table-column prop="interceptStatus" label="拦截状态" />
       <!-- <af-table-column prop="interceptCost" label="拦截费用（元）" /> -->
       <!-- <af-table-column prop="interceptLocation" label="拦截网点" />
@@ -184,8 +190,19 @@
       <af-table-column prop="returnFailureReason" label="退回失败原因" />
       <af-table-column prop="createBy" label="创建人" />
       <af-table-column prop="createTime" label="创建时间" /> -->
-      <af-table-column prop="resolution" label="处理结果" />
-      <af-table-column prop="resolutionTime" label="处理结果时间" />
+      <af-table-column prop="resolution" label="处理结果">
+        <template slot-scope="scope">
+          <span v-if="scope.row.resolution == '0'">未处理</span>
+          <span v-if="scope.row.resolution == '1'">已处理</span>
+        </template>
+      </af-table-column>
+      <af-table-column prop="resolutionTime" label="处理结果时间">
+        <template slot-scope="scope">
+          <span>{{
+            parseTime(scope.row.resolutionTime, "{y}-{m}-{d} {h}:{i}:{s}")
+          }}</span>
+        </template>
+      </af-table-column>
       <af-table-column prop="resolutionUser" label="处理人" />
     </el-table>
     <!--分页组件-->
@@ -319,12 +336,7 @@ export default {
       this.url = "api/quickInterceptService";
       const sort = "id,desc";
       this.params = { page: this.page, size: this.size, sort: sort };
-      const query = this.query;
-      const type = query.type;
-      const value = query.value;
-      if (type && value) {
-        this.params[type] = value;
-      }
+      Object.assign(this.params, this.query);
       return true;
     },
     subDelete(id) {