From 96ce1e48a7cb418a1566a4e6f41d4763f8cc6f28 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Mon, 7 Apr 2025 23:26:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=8D=E5=88=B6=E5=95=86=E5=93=81=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/material/MaterialList.vue       | 17 +++++--
 .../views/material/modules/MaterialModal.vue  | 44 ++++++++++++++++---
 2 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/jshERP-web/src/views/material/MaterialList.vue b/jshERP-web/src/views/material/MaterialList.vue
index bce32a20..4882e0f3 100644
--- a/jshERP-web/src/views/material/MaterialList.vue
+++ b/jshERP-web/src/views/material/MaterialList.vue
@@ -174,9 +174,7 @@
             <span slot="action" slot-scope="text, record">
               <a @click="handleEdit(record)">编辑</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-              <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                <a>删除</a>
-              </a-popconfirm>
+              <a v-if="btnEnableList.indexOf(1)>-1" @click="handleCopyAdd(record)">复制</a>
             </span>
             <template slot="customPic" slot-scope="text, record">
               <a-popover placement="right" trigger="click">
@@ -480,7 +478,14 @@
           this.$refs.batchSetInfoModalForm.title = "批量编辑";
         }
       },
+      handleAdd: function () {
+        this.$refs.modalForm.action = "add";
+        this.$refs.modalForm.add();
+        this.$refs.modalForm.title = "新增";
+        this.$refs.modalForm.disableSubmit = false;
+      },
       handleEdit: function (record) {
+        this.$refs.modalForm.action = "edit";
         this.$refs.modalForm.edit(record);
         this.$refs.modalForm.title = "编辑";
         this.$refs.modalForm.disableSubmit = false;
@@ -488,6 +493,12 @@
           this.$refs.modalForm.showOkFlag = false
         }
       },
+      handleCopyAdd(record) {
+        this.$refs.modalForm.action = "copyAdd";
+        this.$refs.modalForm.edit(record);
+        this.$refs.modalForm.title = "复制新增";
+        this.$refs.modalForm.disableSubmit = false;
+      },
       getImgUrl(imgName, type) {
         if(imgName && imgName.split(',')) {
           type = type? type + '/':''
diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue
index 10c02e19..dbf91aa2 100644
--- a/jshERP-web/src/views/material/modules/MaterialModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialModal.vue
@@ -288,9 +288,16 @@
   import UnitModal from '../../system/modules/UnitModal'
   import JEditableTable from '@/components/jeecg/JEditableTable'
   import { FormTypes, getRefPromise, VALIDATE_NO_PASSED, validateFormAndTables } from '@/utils/JEditableTableUtil'
-  import { checkMaterial, checkMaterialBarCode, getMaterialAttributeNameList,
-    getMaterialAttributeValueListById, getMaxBarCode, queryMaterialCategoryTreeList, changeNameToPinYin } from '@/api/api'
-  import { removeByVal, autoJumpNextInput, handleIntroJs } from '@/utils/util'
+  import {
+    changeNameToPinYin,
+    checkMaterial,
+    checkMaterialBarCode,
+    getMaterialAttributeNameList,
+    getMaterialAttributeValueListById,
+    getMaxBarCode,
+    queryMaterialCategoryTreeList
+  } from '@/api/api'
+  import { autoJumpNextInput, handleIntroJs, removeByVal } from '@/utils/util'
   import { getAction, httpAction } from '@/api/manage'
   import JImageUpload from '@/components/jeecg/JImageUpload'
   import JDate from '@/components/jeecg/JDate'
@@ -316,6 +323,7 @@
         width: '1300px',
         visible: false,
         modalStyle: '',
+        action: '',
         categoryTree: [],
         unitList: [],
         depotList: [],
@@ -495,9 +503,11 @@
         if(JSON.stringify(record) === '{}') {
           this.fileList = []
         } else {
-          setTimeout(() => {
-            this.fileList = record.imgName
-          }, 5)
+          if(this.action === 'edit') {
+            setTimeout(() => {
+              this.fileList = record.imgName
+            }, 5)
+          }
         }
         this.$nextTick(() => {
           this.form.setFieldsValue(pick(this.model, 'name', 'standard', 'unit', 'unitId', 'model', 'color', 'brand', 'mnemonic',
@@ -545,6 +555,21 @@
             }
           }
           tab.dataSource = res.data.rows || []
+          //复制新增商品-初始化条码信息
+          if(this.action === 'copyAdd') {
+            getMaxBarCode({}).then((res)=> {
+              if (res && res.code === 200) {
+                let maxBarCode = res.data.barCode - 0
+                let meTableData = []
+                for (let i = 0; i < tab.dataSource.length; i++) {
+                  let meInfo = tab.dataSource[i]
+                  meInfo.barCode = maxBarCode + i + 1
+                  meTableData.push(meInfo)
+                }
+                tab.dataSource = meTableData
+              }
+            })
+          }
         }).finally(() => {
           tab.loading = false
         })
@@ -609,6 +634,13 @@
       },
       /** 发起新增或修改的请求 */
       requestAddOrEdit(formData) {
+        //复制新增商品-初始化id和租户id
+        if(this.action === 'copyAdd') {
+          this.model.id = ''
+          this.model.tenantId = ''
+          formData.id = ''
+          formData.tenantId = ''
+        }
         if(formData.meList.length === 0) {
           this.$message.warning('抱歉，请输入条码信息！');
           return;