From 367a5fad28602c0741b750d8085fc664f784a79f Mon Sep 17 00:00:00 2001
From: 15036302109 <zhp5211314>
Date: Wed, 31 Jul 2024 13:51:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E6=80=A5=E6=95=91=E6=8F=B4=E7=89=A9?=
 =?UTF-8?q?=E8=B5=84--=E5=BD=95=E5=85=A5=E7=89=A9=E8=B5=84=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E8=8B=A5=E6=9C=AC=E9=83=A8=E9=97=A8=E5=B7=B2=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E7=9B=B8=E5=90=8C=E7=89=A9=E8=B5=84=E5=88=99=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E7=89=A9=E8=B5=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/ehs/ehsMaterial.js          | 18 +++++++
 ruoyi-ui/src/utils/request.js                |  3 ++
 ruoyi-ui/src/views/ehs/ehsMaterial/index.vue | 52 +++++++++++++++++---
 3 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/ruoyi-ui/src/api/ehs/ehsMaterial.js b/ruoyi-ui/src/api/ehs/ehsMaterial.js
index becc31b..07b0b77 100644
--- a/ruoyi-ui/src/api/ehs/ehsMaterial.js
+++ b/ruoyi-ui/src/api/ehs/ehsMaterial.js
@@ -26,6 +26,24 @@ export function addEhsMaterial(data) {
   })
 }
 
+// 检查新增时物资信息是否重复
+export function checkRepeat(data) {
+  return request({
+    url: '/ehsMaterial/ehsMaterial/checkRepeat',
+    method: 'post',
+    data: data
+  })
+}
+
+// 合并物资
+export function merageMaterial(data) {
+  return request({
+    url: '/ehsMaterial/ehsMaterial/merge',
+    method: 'post',
+    data: data
+  })
+}
+
 // 修改物资信息包含  通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”
 export function updateEhsMaterial(data) {
   return request({
diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js
index ffb0d21..de7dbdd 100644
--- a/ruoyi-ui/src/utils/request.js
+++ b/ruoyi-ui/src/utils/request.js
@@ -6,6 +6,7 @@ import errorCode from '@/utils/errorCode'
 import { tansParams, blobValidate } from "@/utils/ruoyi";
 import cache from '@/plugins/cache'
 import { saveAs } from 'file-saver'
+import data from '@/views/system/dict/data.vue'
 
 let downloadLoadingInstance;
 // 是否显示重新登录
@@ -100,6 +101,8 @@ service.interceptors.response.use(res => {
     } else if (code === 601) {
       Message({ message: msg, type: 'warning' })
       return Promise.reject('error')
+    } else if (code === 209) {
+      return res.data;
     } else if (code !== 200) {
       Notification.error({ title: msg })
       return Promise.reject('error')
diff --git a/ruoyi-ui/src/views/ehs/ehsMaterial/index.vue b/ruoyi-ui/src/views/ehs/ehsMaterial/index.vue
index 52a18d3..cf98f58 100644
--- a/ruoyi-ui/src/views/ehs/ehsMaterial/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsMaterial/index.vue
@@ -436,15 +436,27 @@
       <p>验证码: {{ captcha }}</p>
       <el-input v-model="captchaInput" placeholder="请输入验证码"></el-input>
       <span slot="footer" class="dialog-footer">
-    <el-button @click="deleteDialogVisible = false">取消</el-button>
-    <el-button type="primary" @click="confirmDelete">确定</el-button>
-  </span>
+        <el-button @click="deleteDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="confirmDelete">确定</el-button>
+      </span>
     </el-dialog>
+
+    <el-dialog
+      title="提示"
+      :visible.sync="mergeVisible"
+      width="30%">
+      <span>已有相同的物资,是否合并?</span>
+      <span slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="merage()">合 并</el-button>
+          <el-button @click="nomerage()">不合并</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-  import { listEhsMaterial, getEhsMaterial, delEhsMaterial, addEhsMaterial, updateEhsMaterial } from "@/api/ehs/ehsMaterial";
+  import { listEhsMaterial, getEhsMaterial, delEhsMaterial, addEhsMaterial, updateEhsMaterial, checkRepeat, merageMaterial } from "@/api/ehs/ehsMaterial";
   import {listAllDept } from "@/api/system/dept";
   import {addEhsMaterialDetail,listEhsMaterialDetail, updateEhsMaterialDetail , delEhsMaterialDetail} from "@/api/ehs/EhsMaterialDetail";
   import { getMaterialClassJson } from "@/api/ehs/materialClassMaster";
@@ -553,6 +565,7 @@
         materialQuantity: '',
         deleteDialogVisible: false,
         materialToDelete: null,
+        mergeVisible: false,
         // 表单校验
         rules: {
           materialQuantity: [
@@ -670,6 +683,24 @@
           this.loading = false;
         });
       },
+      // 不合并
+      nomerage() {
+        this.mergeVisible = false;
+        addEhsMaterial(this.form).then(resp => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        })
+      },
+      // 合并
+      merage() {
+        this.mergeVisible = false;
+        merageMaterial(this.form).then(resp => {
+          this.$modal.msgSuccess("合并成功");
+          this.open = false;
+          this.getList();
+        })
+      },
       /*getDictList() {
         this.loading = true;
         let str = "";
@@ -799,10 +830,15 @@
                 this.getList();
               });
             } else {
-              addEhsMaterial(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
+              checkRepeat(this.form).then(response => {
+                if (response.code === 200) {
+                  this.$modal.msgSuccess("新增成功");
+                  this.open = false;
+                  this.getList();
+                }
+                if (response.code === 209) {
+                  this.mergeVisible = true;
+                }
               });
             }
           }