From 9a6f26e519f38cb83ebd5658371b20e2ff1dfab7 Mon Sep 17 00:00:00 2001
From: laozt <2721205210@qq.com>
Date: Tue, 26 Dec 2023 10:36:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                         |  4 +--
 src/views/components/AddDialog/tab2.vue | 46 +++++++++++++++++--------
 src/views/yingji/planManage.vue         | 33 ++++++++++++++----
 vue.config.js                           |  4 +--
 4 files changed, 62 insertions(+), 25 deletions(-)

diff --git a/.env.production b/.env.production
index 1dc3907..84401d1 100644
--- a/.env.production
+++ b/.env.production
@@ -6,8 +6,8 @@ ENV = 'production'
 
 # 苏州市应急执法计划管理系统/生产环境
 # VUE_APP_BASE_API = 'http://192.168.0.105:9033'
-VUE_APP_BASE_API = 'http://39.101.188.84:9033'
-# VUE_APP_BASE_API = 'http://180.108.205.123:13002'
+# VUE_APP_BASE_API = 'http://39.101.188.84:9033'
+VUE_APP_BASE_API = 'http://180.108.205.123:13002'
 
 # 统一登录-内网
 VUE_APP_SSO_LOGIN_N = 'http://2.46.4.197:8090/sso-server/oauth2/sso?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F&response_type=code'
diff --git a/src/views/components/AddDialog/tab2.vue b/src/views/components/AddDialog/tab2.vue
index 39e80f3..550341f 100644
--- a/src/views/components/AddDialog/tab2.vue
+++ b/src/views/components/AddDialog/tab2.vue
@@ -82,7 +82,13 @@
       </el-form>
     </div>
     <div class="tables">
-      <el-table v-loading="loading" :data="newList" height="350">
+      <el-table
+        v-loading="loading"
+        :data="newList"
+        height="350"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" align="center" />
         <el-table-column
           label="企业名称"
           align="center"
@@ -144,12 +150,6 @@
                 <span>加入草稿箱</span>
               </div>
             </div>
-            <!-- <div class="tabs-btns">
-                      <div class="look" @click="handleInfo(scope.row)">
-                        <img src="@/assets/images/lookInfo.png" alt="" />
-                        <span>查看详情</span>
-                      </div>
-                    </div> -->
           </template>
         </el-table-column>
       </el-table>
@@ -168,6 +168,7 @@
         草稿箱(<span> {{ enterpriseTotal }} 家</span>)
       </div>
       <div class="btn" ref="next" @click="btnNext">下一步</div>
+      <div class="btn-add" ref="next" @click="btnAdd">批量加入草稿箱</div>
     </div>
 
     <firm-dialog ref="firmDialog"></firm-dialog>
@@ -290,6 +291,12 @@ export default {
     this.refreshList();
   },
   methods: {
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
     refreshList() {
       let userInfo = JSON.parse(sessionStorage.getItem("USER_INFO"));
       if (userInfo.lawLevel == "县级" || userInfo.lawLevel == "镇级") {
@@ -321,6 +328,7 @@ export default {
     btnNext() {
       this.$emit("nextTab", 2);
     },
+    btnAdd() {},
     // 加入草稿箱
     handleAddDrafts(row) {
       this.resetPlanEnterprise();
@@ -545,7 +553,6 @@ export default {
       }
     }
     .tables {
-      // background-color: #eaf2fd;
       .tabs-btns {
         display: flex;
         align-items: center;
@@ -585,13 +592,6 @@ export default {
           font-family: "Alibaba PuHuiTi";
           font-weight: bold;
           color: #525966;
-          .el-checkbox {
-            display: none;
-          }
-        }
-        .el-table__body-wrapper {
-          // height: 448px !important;
-          overflow-y: auto;
         }
       }
       ::v-deep .el-table::before {
@@ -727,6 +727,22 @@ export default {
         color: #2378ec;
         cursor: pointer;
       }
+      .btn-add {
+        width: 150px;
+        height: 30px;
+        border: 1px solid #3ecaa7;
+        border-radius: 2px;
+        background-color: #eff6ff;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 15px;
+        font-family: "Alibaba PuHuiTi";
+        font-weight: 400;
+        color: #48e1bb;
+        cursor: pointer;
+        margin-left: 10px;
+      }
       .selectBtn {
         background-color: #2378ec;
         color: #ffffff;
diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue
index b521605..47ef81e 100644
--- a/src/views/yingji/planManage.vue
+++ b/src/views/yingji/planManage.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-04 10:20:06
  * @LastEditors: laozt 2721205210@qq.com
- * @LastEditTime: 2023-12-19 11:19:09
+ * @LastEditTime: 2023-12-26 10:34:38
 -->
 <template>
   <div class="plan-management">
@@ -94,6 +94,14 @@
           <el-button class="btn-reset" size="mini" @click="resetQuery"
             >重置</el-button
           >
+          <el-button
+            size="mini"
+            class="btn-del"
+            icon="el-icon-delete"
+            :disabled="multiple"
+            @click="handleDelete"
+            >批量删除</el-button
+          >
         </el-form-item>
       </el-form>
 
@@ -108,7 +116,6 @@
         </div>
       </div>
     </div>
-
     <div class="plan-tables">
       <el-table
         v-loading="loading"
@@ -118,7 +125,9 @@
         row-key="id"
         :row-class-name="tableRowClassName"
         height="430"
+        @selection-change="handleSelectionChange"
       >
+        <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="计划年月" align="center" prop="plannedYear">
           <template slot-scope="scope">
             <span>
@@ -336,6 +345,12 @@ export default {
     };
   },
   methods: {
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
     resetPwd() {
       this.isResetPwdDialog = true;
     },
@@ -426,7 +441,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id;
+      const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除计划企业的数据项？")
         .then(function () {
@@ -551,9 +566,6 @@ export default {
         font-family: "Alibaba PuHuiTi";
         font-weight: bold;
         color: #525966;
-        .el-checkbox {
-          display: none;
-        }
       }
     }
     ::v-deep .el-table::before {
@@ -640,5 +652,14 @@ export default {
     border-radius: 2px;
     border: none;
   }
+
+  .btn-del {
+    background: #f71052;
+    color: #ffffff;
+    font-size: 15px;
+    font-family: Alibaba PuHuiTi;
+    border-radius: 2px;
+    border: none;
+  }
 }
 </style>
diff --git a/vue.config.js b/vue.config.js
index d637a6e..ece6d59 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,8 +25,8 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "/demo/suzhouyingjiPC/" : "/",
-  // publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
+  // publicPath: process.env.NODE_ENV === "production" ? "/demo/suzhouyingjiPC/" : "/",
+  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: "dist",
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）