From e1e1fc83f53a0c06aa66cadd8bc89c6e5f786b1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 23 Jul 2023 23:07:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=89=B9=E9=87=8F=E7=BC=96=E8=BE=91=E7=9A=84=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/material/MaterialList.vue       |  6 +++-
 .../material/modules/BatchSetInfoModal.vue    | 35 +++++++++++--------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/jshERP-web/src/views/material/MaterialList.vue b/jshERP-web/src/views/material/MaterialList.vue
index b0795d97..54de937d 100644
--- a/jshERP-web/src/views/material/MaterialList.vue
+++ b/jshERP-web/src/views/material/MaterialList.vue
@@ -381,7 +381,11 @@
         } else {
           let ids = "";
           for (let a = 0; a < this.selectedRowKeys.length; a++) {
-            ids += this.selectedRowKeys[a] + ",";
+            if(a === this.selectedRowKeys.length-1) {
+              ids += this.selectedRowKeys[a]
+            } else {
+              ids += this.selectedRowKeys[a] + ','
+            }
           }
           this.$refs.batchSetInfoModalForm.edit(ids);
           this.$refs.batchSetInfoModalForm.title = "批量编辑";
diff --git a/jshERP-web/src/views/material/modules/BatchSetInfoModal.vue b/jshERP-web/src/views/material/modules/BatchSetInfoModal.vue
index 3bfce66a..302ce454 100644
--- a/jshERP-web/src/views/material/modules/BatchSetInfoModal.vue
+++ b/jshERP-web/src/views/material/modules/BatchSetInfoModal.vue
@@ -124,31 +124,36 @@
         // 触发表单验证
         this.form.validateFields((err, values) => {
           if (!err) {
-            that.confirmLoading = true
             let formData = Object.assign(this.model, values)
             if(JSON.stringify(formData) === '{}') {
               that.$message.warning('抱歉，请输入要批量编辑的内容！')
-              that.confirmLoading = false
               return
             }
             if(formData.enableSerialNumber === '1' && formData.enableBatchNumber === '1' ) {
               that.$message.warning('抱歉，序列号和批号只能选择一项！')
-              that.confirmLoading = false
               return
             }
-            let paramObj = {
-              ids: this.materialIds,
-              material: JSON.stringify(formData)
-            }
-            batchUpdateMaterial(paramObj).then((res)=>{
-              if(res.code === 200){
-                that.$emit('ok')
-              }else{
-                that.$message.warning(res.data.message)
+            let idList = that.materialIds?that.materialIds.split(','):[]
+            that.$confirm({
+              title: "确认操作",
+              content: "是否操作选中的" + idList.length + "条数据?",
+              onOk: function () {
+                that.confirmLoading = true
+                let paramObj = {
+                  ids: that.materialIds,
+                  material: JSON.stringify(formData)
+                }
+                batchUpdateMaterial(paramObj).then((res)=>{
+                  if(res.code === 200){
+                    that.$emit('ok')
+                  }else{
+                    that.$message.warning(res.data.message)
+                  }
+                }).finally(() => {
+                  that.confirmLoading = false
+                  that.close()
+                })
               }
-            }).finally(() => {
-              that.confirmLoading = false
-              that.close()
             })
           }
         })