From 44f4f442ef903945437f53331f877c22274660ae Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Sat, 4 Nov 2023 11:24:57 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=A6=84=20refactor:=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E5=8A=A0=E9=85=8D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../checkInventoryTask/createTask.vue         | 131 ++++++++----------
 .../distributionStockArticleMarket.vue        |  26 ++--
 2 files changed, 71 insertions(+), 86 deletions(-)

diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue
index 94b344f9..94cda1ce 100644
--- a/src/views/distribution/checkInventoryTask/createTask.vue
+++ b/src/views/distribution/checkInventoryTask/createTask.vue
@@ -141,7 +141,11 @@
         <!-- 表单按钮 -->
         <template #footer>
           <span class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
+            <el-button
+              type="primary"
+              icon="el-icon-circle-check"
+              @click="handleSubmit"
+              :loading="buttonLoadingList.createTaskButton"
               >提 交</el-button
             >
             <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
@@ -327,6 +331,12 @@ export default {
 
       // 字典表
       typeData: [],
+
+      // 按钮加载列表
+      buttonLoadingList: {
+        // 创建盘点任务按钮
+        createTaskButton: false,
+      },
     };
   },
   mounted() {
@@ -617,45 +627,57 @@ export default {
 
     // 提交
     async handleSubmit() {
-      // 检测是否选择时间
-      if (!this.form.time || this.form.time.length === 0) {
-        return this.$message({
-          type: 'error',
-          message: '请选择盘点时间',
-        });
-      }
+      try {
+        this.buttonLoadingList.createTaskButton = true;
+
+        // 检测是否选择时间
+        if (!this.form.time || this.form.time.length === 0) {
+          return this.$message({
+            type: 'error',
+            message: '请选择盘点时间',
+          });
+        }
+
+        const formData = {};
+        formData.list = [];
+
+        // 商场名称列表
+        console.log('this.form.selectList :>> ', this.form.selectList);
+        // 解决第二次提交报错
+        const _clientList = this.form.clientList || [];
+        // 筛选出被选中的商场
+        if (this.form.selectList.length !== 0) {
+          this.form.selectList.forEach(val => {
+            if (_clientList.includes(val.id))
+              formData.list.push({
+                refId: val.id,
+                refName: val.clientName,
+              });
+          });
+        }
+        // 开始时间
+        formData.startTime = this.form.time[0].toLocaleString();
+        // 结束时间
+        formData.endTime = this.form.time[1].toLocaleString();
+        console.log('formData :>> ', formData);
 
-      const formData = {};
-      formData.list = [];
+        const res = await postAddtaskQuest(formData);
+        const { code, msg } = res.data;
 
-      // 商场名称列表
-      if (this.form.selectList.length !== 0) {
-        this.form.selectList.forEach(val => {
-          if (this.form.clientList.includes(val.id))
-            formData.list.push({
-              refId: val.id,
-              refName: val.clientName,
-            });
-        });
+        if (code === 200)
+          this.$message({
+            message: msg,
+            type: 'success',
+          });
+        // 初始化页面
+        this.onLoad();
+        // 关闭弹窗
+        this.box = false;
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.buttonLoadingList.createTaskButton = false;
       }
-      // 开始时间
-      formData.startTime = this.form.time[0].toLocaleString();
-      // 结束时间
-      formData.endTime = this.form.time[1].toLocaleString();
-      console.log('formData :>> ', formData);
-
-      const res = await postAddtaskQuest(formData);
-      const { code, msg } = res.data;
-
-      if (code === 200)
-        this.$message({
-          message: msg,
-          type: 'success',
-        });
-      // 初始化页面
-      this.onLoad();
-      // 关闭弹窗
-      this.box = false;
     },
 
     /**
@@ -698,41 +720,6 @@ export default {
       });
     },
 
-    /**
-     * 编辑单个任务
-     */
-    async handleEditCheck(row) {
-      this.title = '编辑盘点任务';
-      this.isEdit = true; // 此次为修改提交
-      this.box = true; // 开启弹窗
-      console.log('row :>> ', row);
-      this.form.brandName = row.brandName;
-      this.form.time = [row.startTime, row.endTime];
-      this.form.clientList = row.list.map(val => val.refId);
-      this.form.dictKey = row.questStatus;
-      this.form.selectList = [];
-      this.form.id = row.id;
-
-      console.log('this.form :>> ', this.form);
-
-      // 请求商场名称
-      const res = await getDictList();
-      const { code, data } = res.data;
-      if (code === 200 && !!data) {
-        console.log('data :>> ', data);
-        this.form.selectList = data.map(item => {
-          return {
-            // 商城名称
-            clientName: item.clientName,
-            // 商场id
-            id: item.id,
-            // 商场下品牌名
-            brandName: item.brandName,
-          };
-        });
-      }
-    },
-
     beforeClose(done) {
       done();
       this.form = {};
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
index 477bb5b5..f3eeb2a4 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
@@ -81,7 +81,7 @@
               >转预约单</el-button
             >
             <el-button type="primary" icon="el-icon-edit" @click="handleStockList" v-if="handler"
-              >批量加配转库存品</el-button
+              >批量转库存品</el-button
             >
             <el-button
               type="danger"
@@ -117,7 +117,9 @@
               v-if="!handler"
               >通知提货</el-button
             >
-            <el-button type="danger" icon="el-icon-plus" @click="handleExport" plain>导 出</el-button>
+            <el-button type="danger" icon="el-icon-plus" @click="handleExport" plain
+              >导 出</el-button
+            >
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -392,7 +394,8 @@ import {
   add,
   update,
   remove,
-  addStock, stockArticExport
+  addStock,
+  stockArticExport,
 } from '@/api/distribution/distributionStockArticle';
 import { getListOwn } from '@/api/distribution/distributionParcelList';
 import { addCallDelivery } from '@/api/distribution/distrilbutionCallDelivery';
@@ -1007,17 +1010,15 @@ export default {
   methods: {
     //导出
     handleExport() {
-      let row = {  };
-      if(!!this.ids){
+      let row = {};
+      if (!!this.ids) {
         row.ids = this.ids;
-
       }
-      row.typeService ="2";
-      stockArticExport(row).then( res =>{
+      row.typeService = '2';
+      stockArticExport(row).then(res => {
         console.log(res.data);
         downloadXls(res.data, '市配订单数据.xlsx');
       });
-
     },
     showdrawer(value) {
       this.drawerShow = value;
@@ -1173,8 +1174,8 @@ export default {
         }
 
         if (item.isZero === '1') {
-          this.$message.warning(item.orderCode + ' - 为零担订单，暂无法转为库存品')
-          return false
+          this.$message.warning(item.orderCode + ' - 为零担订单，暂无法转为库存品');
+          return false;
         }
 
         ids.push(item.id);
@@ -1494,9 +1495,6 @@ export default {
         type: 'error',
         message: '功能还在开发中',
       });
-      this.title = '新增';
-      this.form = {};
-      this.box = true;
     },
     handleEdit(row) {
       this.title = '编辑';