From 6e1893f596d48ff9d1c0f0df69563f7e60a0b62c Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Mon, 9 Dec 2024 14:10:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E6=94=B9=E4=BB=B7=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |   21 +-
 src/api/lessor/equipType.js                   |   70 +-
 src/permission.js                             |   76 +-
 .../lessor/equipment/equipType/index.vue      | 2144 +++++++++--------
 vue.config.js                                 |    2 +-
 5 files changed, 1195 insertions(+), 1118 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index e8b1f8b7..523ffef3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,8 +7,9 @@
 
 <script>
 import ThemePicker from "@/components/ThemePicker";
-import { mapActions } from 'vuex'
-import { get } from '@/utils/config'
+import { mapActions } from "vuex";
+import { get } from "@/utils/config";
+
 // import AlertNotification from "@/views/warning/AlertNotification.vue";
 
 export default {
@@ -19,12 +20,16 @@ export default {
   },
   metaInfo() {
     return {
-      title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
-      titleTemplate: title => {
-        return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE
-      }
-    }
-  }
+      title:
+        this.$store.state.settings.dynamicTitle &&
+        this.$store.state.settings.title,
+      titleTemplate: (title) => {
+        return title
+          ? `${title} - ${process.env.VUE_APP_TITLE}`
+          : process.env.VUE_APP_TITLE;
+      },
+    };
+  },
 };
 </script>
 <style scoped>
diff --git a/src/api/lessor/equipType.js b/src/api/lessor/equipType.js
index 424e9025..bff7e64f 100644
--- a/src/api/lessor/equipType.js
+++ b/src/api/lessor/equipType.js
@@ -1,53 +1,57 @@
-import request from '@/utils/request'
-
+import request from "@/utils/request";
 
 //获取机具类型列表
 export function getListByMaType(query) {
-    return request({
-        url: '/material-mall/type/getListByMaType',
-        method: 'get',
-        params: query,
-    })
+  return request({
+    url: "/material-mall/type/getListByMaType",
+    method: "get",
+    params: query,
+  });
 }
 //机具类型管理
 export function getMaTypeList(query) {
-    return request({
-        url: '/material-mall/type/getMaTypeList',
-        method: 'get',
-        params: query,
-    })
+  return request({
+    url: "/material-mall/type/getMaTypeList",
+    method: "get",
+    params: query,
+  });
 }
 
 //机具类型-详情
 export function getMaType(typeId) {
-    return request({
-        url: '/material-mall/type/' + typeId,
-        method: 'get',
-    })
+  return request({
+    url: "/material-mall/type/" + typeId,
+    method: "get",
+  });
 }
 
 //机具类型--新增
 export function addMaType(data) {
-    return request({
-        url: '/material-mall/type',
-        method: 'post',
-        data: data,
-    })
+  return request({
+    url: "/material-mall/type",
+    method: "post",
+    data: data,
+  });
 }
 // 机具类型--修改
 export function updateMaType(data) {
-    return request({
-        url: '/material-mall/type',
-        method: 'put',
-        data: data,
-    })
+  return request({
+    url: "/material-mall/type",
+    method: "put",
+    data: data,
+  });
 }
- //供应商管理--删除
+//供应商管理--删除
 export function delMaType(typeId) {
-    return request({
-        url: '/material-mall/type/' + typeId,
-        method: 'delete',
-    })
+  return request({
+    url: "/material-mall/type/" + typeId,
+    method: "delete",
+  });
+}
+export function updateLeasePriceApi(data) {
+  return request({
+    url: "/material-mall/type/updateLeasePrice",
+    method: "post",
+    data,
+  });
 }
-
-
diff --git a/src/permission.js b/src/permission.js
index c2d913e5..e34a85c0 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -1,61 +1,61 @@
-import router from './router'
-import store from './store'
-import { Message } from 'element-ui'
-import NProgress from 'nprogress'
-import 'nprogress/nprogress.css'
-import { getToken } from '@/utils/auth'
-import { isRelogin } from '@/utils/request'
+import router from "./router";
+import store from "./store";
+import { Message } from "element-ui";
+import NProgress from "nprogress";
+import "nprogress/nprogress.css";
+import { getToken, setToken } from "@/utils/auth";
+import { isRelogin } from "@/utils/request";
 
-NProgress.configure({ showSpinner: false })
+NProgress.configure({ showSpinner: false });
 
-const whiteList = [
-  '/login', '/register',
-  '/qrCode/qrCodePage',
-]
+const whiteList = ["/login", "/register", "/qrCode/qrCodePage"];
 
 router.beforeEach((to, from, next) => {
-  NProgress.start()
+  NProgress.start();
   if (getToken()) {
-    to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
+    to.meta.title && store.dispatch("settings/setTitle", to.meta.title);
     /* has token*/
-    if (to.path === '/login') {
-      next({ path: '/' })
-      NProgress.done()
+    if (to.path === "/login") {
+      next({ path: "/" });
+      NProgress.done();
     } else if (whiteList.indexOf(to.path) !== -1) {
-      next()
+      next();
     } else {
       if (store.getters.roles.length === 0) {
-        isRelogin.show = true
+        isRelogin.show = true;
         // 判断当前用户是否已拉取完user_info信息
-        store.dispatch('GetInfo').then(() => {
-          isRelogin.show = false
-          store.dispatch('GenerateRoutes').then(accessRoutes => {
-            // 根据roles权限生成可访问的路由表
-            router.addRoutes(accessRoutes) // 动态添加可访问路由表
-            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
+        store
+          .dispatch("GetInfo")
+          .then(() => {
+            isRelogin.show = false;
+            store.dispatch("GenerateRoutes").then((accessRoutes) => {
+              // 根据roles权限生成可访问的路由表
+              router.addRoutes(accessRoutes); // 动态添加可访问路由表
+              next({ ...to, replace: true }); // hack方法 确保addRoutes已完成
+            });
           })
-        }).catch(err => {
-          store.dispatch('LogOut').then(() => {
-            Message.error(err)
-            next({ path: '/' })
-          })
-        })
+          .catch((err) => {
+            store.dispatch("LogOut").then(() => {
+              Message.error(err);
+              next({ path: "/" });
+            });
+          });
       } else {
-        next()
+        next();
       }
     }
   } else {
     // 没有token
     if (whiteList.indexOf(to.path) !== -1) {
       // 在免登录白名单，直接进入
-      next()
+      next();
     } else {
-      next(`/login?redirect=${encodeURIComponent(to.fullPath)}`) // 否则全部重定向到登录页
-      NProgress.done()
+      next(`/login?redirect=${encodeURIComponent(to.fullPath)}`); // 否则全部重定向到登录页
+      NProgress.done();
     }
   }
-})
+});
 
 router.afterEach(() => {
-  NProgress.done()
-})
+  NProgress.done();
+});
diff --git a/src/views/lessor/equipment/equipType/index.vue b/src/views/lessor/equipment/equipType/index.vue
index dca0a592..9d61a703 100644
--- a/src/views/lessor/equipment/equipType/index.vue
+++ b/src/views/lessor/equipment/equipType/index.vue
@@ -1,129 +1,121 @@
 <template>
   <!-- 类型管理 -->
   <div class="app-container" id="toolsType">
-      <el-row :gutter="20">
-          <!--树数据-->
-          <el-col :span="5" :xs="24">
-              <div class="head-container">
-                  <el-input
-                      v-model="typeName"
-                      placeholder="请输入类型名称"
-                      clearable
-                      maxlength="50"
-                      size="small"
-                      prefix-icon="el-icon-search"
-                      style="margin-bottom: 20px"
-                  />
-              </div>
-              <div class="head-container" style>
-                  <el-tree
-                      style="height: 700px; overflow: scroll"
-                      :data="treeOptions"
-                      :props="defaultProps"
-                      :expand-on-click-node="false"
-                      :filter-node-method="filterNode"
-                      ref="tree"
-                      node-key="id"
-                      default-expand-all
-                      highlight-current
-                      @node-click="handleNodeClick"
-                  >
-                      <span
-                          class="custom-tree-node"
-                          slot-scope="{ node, data }"
-                          @mousemove="onMousemove(data)"
-                          @mouseleave="onMouseleave()"
-                      >
-                          <span
-                              v-if="isMousemoveId === data.id && node.label.length > 5"
-                              >{{ node.label.slice(0, 3) + '...' }}</span
-                          >
-                          <span v-else>{{ node.label }}</span>
+    <el-row :gutter="20">
+      <!--树数据-->
+      <el-col :span="5" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="typeName"
+            placeholder="请输入类型名称"
+            clearable
+            maxlength="50"
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container" style>
+          <el-tree
+            style="height: 700px; overflow: scroll"
+            :data="treeOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            node-key="id"
+            default-expand-all
+            highlight-current
+            @node-click="handleNodeClick"
+          >
+            <span
+              class="custom-tree-node"
+              slot-scope="{ node, data }"
+              @mousemove="onMousemove(data)"
+              @mouseleave="onMouseleave()"
+            >
+              <span v-if="isMousemoveId === data.id && node.label.length > 5">{{
+                node.label.slice(0, 3) + "..."
+              }}</span>
+              <span v-else>{{ node.label }}</span>
 
-                          <span
-                              class="btn-items"
-                              v-if="isMousemoveId === data.id"
-                          >
-                              <el-button
-                                  type="text"
-                                  size="mini"
-                                  icon="el-icon-plus"
-                                  @click.stop="() => appendTreeNode(data)"
-                              >
-                              </el-button>
-                              <el-button
-                                  type="text"
-                                  size="mini"
-                                  icon="el-icon-edit-outline"
-                                  style="color: #67c23a"
-                                  v-if="data.id !== 0"
-                                  @click.stop="() => editTreeNode(data)"
-                              >
-                              </el-button>
-                              <el-button
-                                  type="text"
-                                  size="mini"
-                                  icon="el-icon-delete"
-                                  style="color: #f56c6c"
-                                  v-if="data.id !== 0"
-                                  @click.stop="() => removeTreeNode(data)"
-                              >
-                              </el-button>
-                          </span>
-                      </span>
-                  </el-tree>
-              </div>
+              <span class="btn-items" v-if="isMousemoveId === data.id">
+                <el-button
+                  type="text"
+                  size="mini"
+                  icon="el-icon-plus"
+                  @click.stop="() => appendTreeNode(data)"
+                >
+                </el-button>
+                <el-button
+                  type="text"
+                  size="mini"
+                  icon="el-icon-edit-outline"
+                  style="color: #67c23a"
+                  v-if="data.id !== 0"
+                  @click.stop="() => editTreeNode(data)"
+                >
+                </el-button>
+                <el-button
+                  type="text"
+                  size="mini"
+                  icon="el-icon-delete"
+                  style="color: #f56c6c"
+                  v-if="data.id !== 0"
+                  @click.stop="() => removeTreeNode(data)"
+                >
+                </el-button>
+              </span>
+            </span>
+          </el-tree>
+        </div>
+      </el-col>
+      <!--用户数据-->
+      <el-col :span="19" :xs="24">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
+          <el-form-item label="关键字" prop="typeName">
+            <el-input
+              v-model="queryParams.typeName"
+              placeholder="请输入关键字"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >查询</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-edit"
+              size="mini"
+              @click="onBatchEditPrice"
+              >批量修改租赁价</el-button
+            >
           </el-col>
-          <!--用户数据-->
-          <el-col :span="19" :xs="24">
-              <el-form
-                  :model="queryParams"
-                  ref="queryForm"
-                  size="small"
-                  :inline="true"
-                  v-show="showSearch"
-                  label-width="68px"
-              >
-                  <el-form-item label="关键字" prop="typeName">
-                      <el-input
-                          v-model="queryParams.typeName"
-                          placeholder="请输入关键字"
-                          clearable
-                          style="width: 240px"
-                          @keyup.enter.native="handleQuery"
-                      />
-                  </el-form-item>
-
-                  <el-form-item>
-                      <el-button
-                          type="primary"
-                          icon="el-icon-search"
-                          size="mini"
-                          @click="handleQuery"
-                          >查询</el-button
-                      >
-                      <el-button
-                          icon="el-icon-refresh"
-                          size="mini"
-                          @click="resetQuery"
-                          >重置</el-button
-                      >
-                  </el-form-item>
-              </el-form>
-
-              <el-row :gutter="10" class="mb8">
-                  <!-- <el-col :span="1.5">
-                      <el-button
-                          type="primary"
-                          plain
-                          icon="el-icon-plus"
-                          size="mini"
-                          @click="handleAdd"
-                          v-hasPermi="['machinery:type:add']"
-                          >新增</el-button
-                      >
-                  </el-col> -->
-                  <!-- <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
           <el-button
             type="warning"
             plain
@@ -133,93 +125,85 @@
           >导出
           </el-button>
         </el-col>-->
-                  <right-toolbar
-                      :showSearch.sync="showSearch"
-                      @queryTable="getList"
-                  ></right-toolbar>
-              </el-row>
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+          ></right-toolbar>
+        </el-row>
 
-              <el-table
-                  v-loading="loading"
-                  :data="typeList"
-                  border
-                  @selection-change="handleSelectionChange"
-              >
-                  <!-- <el-table-column
-                      type="selection"
-                      width="50"
-                      align="center"
-                  /> -->
-                  <el-table-column
-                      label="名称"
-                      align="center"
-                      key="typeName"
-                      prop="typeName"
-                      show-overflow-tooltip
-                  />
-                  <el-table-column
-                      label="计量单位"
-                      align="center"
-                      key="unitName"
-                      prop="unitName"
-                      show-overflow-tooltip
-                  />
-                  <el-table-column
-                      label="内部租赁价"
-                      align="center"
-                      key="leasePrice"
-                      prop="leasePrice"
-                      show-overflow-tooltip
-                      width="100"
-                  />
-                  <!-- <el-table-column
+        <el-table
+          v-loading="loading"
+          :data="typeList"
+          border
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column
+            label="名称"
+            align="center"
+            key="typeName"
+            prop="typeName"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="计量单位"
+            align="center"
+            key="unitName"
+            prop="unitName"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="内部租赁价"
+            align="center"
+            key="leasePrice"
+            prop="leasePrice"
+            show-overflow-tooltip
+            width="100"
+          />
+          <!-- <el-table-column
                       label="原值"
                       align="center"
                       key="buyPrice"
                       prop="buyPrice"
                       show-overflow-tooltip
                   /> -->
-<!--                    <el-table-column-->
-<!--                        label="丢失赔偿"-->
-<!--                        align="center"-->
-<!--                        key="payPrice"-->
-<!--                        prop="payPrice"-->
-<!--                        show-overflow-tooltip-->
-<!--                    />-->
-                  <!-- <el-table-column
+          <!--                    <el-table-column-->
+          <!--                        label="丢失赔偿"-->
+          <!--                        align="center"-->
+          <!--                        key="payPrice"-->
+          <!--                        prop="payPrice"-->
+          <!--                        show-overflow-tooltip-->
+          <!--                    />-->
+          <!-- <el-table-column
                       label="库管员"
                       align="center"
                       key="keeperUserName"
                       prop="keeperUserName"
                       show-overflow-tooltip
                   /> -->
-                  <el-table-column
-                      label="管理模式"
-                      align="center"
-                      key="manageType"
-                      prop="manageType"
-                  >
-                      <template slot-scope="{ row }">
-                          <el-tag size="mini" v-if="row.manageType == '0'">
-                              编码管理
-                          </el-tag>
-                          <el-tag
-                              size="mini"
-                              type="success"
-                              v-if="row.manageType == '1'"
-                          >
-                              数量管理
-                          </el-tag>
-<!--                            <el-tag-->
-<!--                                size="mini"-->
-<!--                                type="warning"-->
-<!--                                v-if="row.manageType == '2'"-->
-<!--                            >-->
-<!--                                成套管理-->
-<!--                            </el-tag>-->
-                      </template>
-                  </el-table-column>
-                  <!-- <el-table-column
+          <el-table-column
+            label="管理模式"
+            align="center"
+            key="manageType"
+            prop="manageType"
+          >
+            <template slot-scope="{ row }">
+              <el-tag size="mini" v-if="row.manageType == '0'">
+                编码管理
+              </el-tag>
+              <el-tag size="mini" type="success" v-if="row.manageType == '1'">
+                数量管理
+              </el-tag>
+              <!--                            <el-tag-->
+              <!--                                size="mini"-->
+              <!--                                type="warning"-->
+              <!--                                v-if="row.manageType == '2'"-->
+              <!--                            >-->
+              <!--                                成套管理-->
+              <!--                            </el-tag>-->
+            </template>
+          </el-table-column>
+          <!-- <el-table-column
                       label="图片"
                       align="center"
                       key="photoName"
@@ -234,7 +218,7 @@
                           >
                       </template>
                   </el-table-column> -->
-                  <!-- <el-table-column
+          <!-- <el-table-column
                       label="文档资料"
                       align="center"
                       key="documentName"
@@ -258,85 +242,87 @@
                       prop="propName"
                       show-overflow-tooltip
                   /> -->
-                  <el-table-column
-                      label="厂家规格型号"
-                      align="center"
-                      key="facModel"
-                      prop="facModel"
-                      show-overflow-tooltip
-                  />
-                  <el-table-column
-                      label="备注信息"
-                      align="center"
-                      key="remark"
-                      prop="remark"
-                      show-overflow-tooltip
-                  />
+          <el-table-column
+            label="厂家规格型号"
+            align="center"
+            key="facModel"
+            prop="facModel"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="备注信息"
+            align="center"
+            key="remark"
+            prop="remark"
+            show-overflow-tooltip
+          />
 
-                  <el-table-column label="操作" align="center" width="180">
-                      <template
-                          slot-scope="scope"
-                          v-if="scope.row.typeId !== 1"
-                      >
-                          <el-button
-                              size="mini"
-                              type="text"
-                              icon="el-icon-edit"
-                              @click="handleConfig(scope.row)"
-                              v-hasPermi="['machinery:type:config']"
-                          >
-                              配置
-                          </el-button>
-                          <el-button
-                              size="mini"
-                              type="text"
-                              icon="el-icon-edit"
-                              @click="handleUpdate(scope.row)"
-                              v-hasPermi="['machinery:type:edit']"
-                          >
-                              修改
-                          </el-button>
-                          <el-button
-                              size="mini"
-                              type="text"
-                              icon="el-icon-delete"
-                              @click="handleDelete(scope.row)"
-                              v-hasPermi="['machinery:type:del']"
-                          >
-                              删除
-                          </el-button>
-                      </template>
-                  </el-table-column>
-              </el-table>
+          <el-table-column label="操作" align="center" width="180">
+            <template slot-scope="scope" v-if="scope.row.typeId !== 1">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleConfig(scope.row)"
+                v-hasPermi="['machinery:type:config']"
+              >
+                配置
+              </el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['machinery:type:edit']"
+              >
+                修改
+              </el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['machinery:type:del']"
+              >
+                删除
+              </el-button>
 
-              <pagination
-                  v-show="total > 0"
-                  :total="total"
-                  :page.sync="queryParams.pageNum"
-                  :limit.sync="queryParams.pageSize"
-                  @pagination="getList"
-              />
-          </el-col>
-      </el-row>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdateLeasePrice(scope.row)"
+                v-hasPermi="['machinery:type:edit']"
+              >
+                租赁改价
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
 
-      <!-- 添加或修改用户配置对话框 -->
-      <el-dialog
-          :title="title"
-          :visible.sync="open"
-          width="850px"
-          append-to-body
-          :close-on-click-modal="false"
-      >
-          <el-form
-              ref="form"
-              :model="form"
-              :rules="rules"
-              label-width="100px"
-          >
-              <el-row>
-                  <el-col :span="12">
-                      <el-form-item label="所属上级" prop="parentId">
-                          <!-- <treeselect
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+
+    <!-- 添加或修改用户配置对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="850px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="所属上级" prop="parentId">
+              <!-- <treeselect
                               v-model="form.parentId"
                               :options="treeOptions"
                               :show-count="true"
@@ -345,51 +331,47 @@
                               noResultsText="没有搜索结果"
                               placeholder="请选择所属上级分类"
                               @select="treeChange"
-                          /> --> 
-                          <el-input v-model="form.label" disabled />
-                      </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                      <el-form-item label="名称" prop="typeName">
-                          <el-input
-                              v-model="form.typeName"
-                              placeholder="请输入名称"
-                              maxlength="30"
-                          />
-                      </el-form-item>
-                  </el-col> 
-              </el-row>
-              <el-row> 
-                <el-col :span="12">
-                      <el-form-item label="内部租赁价" prop="leasePrice">
-                          <el-input
-                              v-model="form.leasePrice"
-                              type="number"
-                              placeholder="请输入租赁价格"
-                              maxlength="10"
-                          />
-                      </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                      <el-form-item label="管理模式" prop="manageType">
-                          <el-select
-                              v-model="form.manageType"
-                              filterable
-                              placeholder="请选择管理模式"
-                              style="width: 100%"
-                          >
-                              <el-option value="0" label="编码管理"
-                                  >编码管理</el-option
-                              >
-                              <el-option value="1" label="数量管理"
-                                  >数量管理</el-option
-                              > 
-                          </el-select>
-                      </el-form-item>
-                  </el-col>
-              </el-row>
+                          /> -->
+              <el-input v-model="form.label" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="typeName">
+              <el-input
+                v-model="form.typeName"
+                placeholder="请输入名称"
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="内部租赁价" prop="leasePrice">
+              <el-input
+                v-model="form.leasePrice"
+                type="number"
+                placeholder="请输入租赁价格"
+                maxlength="10"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="管理模式" prop="manageType">
+              <el-select
+                v-model="form.manageType"
+                filterable
+                placeholder="请选择管理模式"
+                style="width: 100%"
+              >
+                <el-option value="0" label="编码管理">编码管理</el-option>
+                <el-option value="1" label="数量管理">数量管理</el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-              <!-- <el-row> 
+        <!-- <el-row> 
                    <el-col :span="12">
                       <el-form-item label="原值" prop="buyPrice">
                           <el-input
@@ -401,7 +383,7 @@
                       </el-form-item>
                   </el-col> -->
 
-              <!-- <el-col :span="12">
+        <!-- <el-col :span="12">
                       <el-form-item label="外部租赁价" prop="rentPrice">
                           <el-input
                               v-model="form.rentPrice"
@@ -413,27 +395,27 @@
                   </el-col> 
               </el-row>-->
 
-              <el-row>
-                  <el-col :span="12">
-                      <el-form-item label="计量单位" prop="unitName">
-                          <el-input
-                              v-model="form.unitName"
-                              placeholder="请输入计量单位"
-                              maxlength="20"
-                          />
-                      </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                      <el-form-item label="厂家规格型号" prop="facModel">
-                          <el-input
-                              v-model="form.facModel"
-                              placeholder="请输入厂家规格型号"
-                              maxlength="100"
-                          ></el-input>
-                      </el-form-item>
-                  </el-col>
-              </el-row>
-              <!-- <el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="计量单位" prop="unitName">
+              <el-input
+                v-model="form.unitName"
+                placeholder="请输入计量单位"
+                maxlength="20"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="厂家规格型号" prop="facModel">
+              <el-input
+                v-model="form.facModel"
+                placeholder="请输入厂家规格型号"
+                maxlength="100"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row>
                   <el-col :span="12">
                       <el-form-item label="资产属性" prop="propId">
                           <el-select
@@ -470,19 +452,18 @@
                       </el-form-item>
                   </el-col>
               </el-row> -->
-              <el-row>
-                  
-                  <el-col :span="12">
-                      <el-form-item label="备注" prop="remark">
-                          <el-input
-                              v-model="form.remark"
-                              type="textarea"
-                              placeholder="请输入备注内容"
-                              maxlength="150"
-                          ></el-input>
-                      </el-form-item>
-                  </el-col>
-                  <!-- <el-col :span="12">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入备注内容"
+                maxlength="150"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="12">
                       <el-form-item label="文档资料" prop="field101">
                           <el-upload
                               ref="field101"
@@ -504,8 +485,8 @@
                           </el-upload>
                       </el-form-item>
                   </el-col> -->
-              </el-row>
-              <!-- <el-row>
+        </el-row>
+        <!-- <el-row>
                   <el-col :span="12">
                       <el-form-item label="图片" prop="photoName">
                           <el-upload
@@ -535,130 +516,147 @@
                       </el-form-item>
                   </el-col>
               </el-row> -->
-          </el-form>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitForm">确 定</el-button>
-              <el-button @click="cancel">取 消</el-button>
-          </div>
-      </el-dialog>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
 
-      <el-dialog :visible.sync="dialogVisible">
-          <img width="100%" height="650px" :src="dialogImageUrl" alt />
-      </el-dialog>
+    <el-dialog :visible.sync="dialogVisible">
+      <img width="100%" height="650px" :src="dialogImageUrl" alt />
+    </el-dialog>
 
-      <!--    配置弹窗  -->
-      <el-dialog
-          :title="title"
-          :visible.sync="configOpen"
-          width="650px"
-          append-to-body
-          :close-on-click-modal="false"
+    <!--    配置弹窗  -->
+    <el-dialog
+      :title="title"
+      :visible.sync="configOpen"
+      width="650px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form ref="cform" :model="cform" :rules="crules" label-width="110px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="调整前价格">
+              <el-input
+                v-model="leasePrice"
+                placeholder="调整前价格"
+                disabled
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="调整后价格" prop="leasePrice">
+              <el-input-number
+                v-model="cform.leasePrice"
+                style="width: 100%"
+                controls-position="right"
+                :min="0"
+                maxlength="10"
+              ></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="开始使用日期" prop="effTime">
+              <el-date-picker
+                v-model="cform.effTime"
+                style="width: 100%"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                type="datetime"
+                placeholder="开始使用日期"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitConfig">确 定</el-button>
+        <el-button @click="cancelConfig">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 新增弹框 -->
+    <el-dialog
+      :title="addTitle"
+      :visible.sync="addTitleVisible"
+      v-if="addTitleVisible"
+      width="50%"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        label-width="80px"
+        :model="addFormParams"
+        :rules="addFormParamsRules"
+        ref="addFormParamsRef"
       >
-          <el-form
-              ref="cform"
-              :model="cform"
-              :rules="crules"
-              label-width="110px"
-          >
-              <el-row>
-                  <el-col :span="24">
-                      <el-form-item label="调整前价格">
-                          <el-input
-                              v-model="leasePrice"
-                              placeholder="调整前价格"
-                              disabled
-                          ></el-input>
-                      </el-form-item>
-                  </el-col>
-              </el-row>
-              <el-row>
-                  <el-col :span="24">
-                      <el-form-item label="调整后价格" prop="leasePrice">
-                          <el-input-number
-                              v-model="cform.leasePrice"
-                              style="width: 100%"
-                              controls-position="right"
-                              :min="0"
-                              maxlength="10"
-                          ></el-input-number>
-                      </el-form-item>
-                  </el-col>
-              </el-row>
-              <el-row>
-                  <el-col :span="24">
-                      <el-form-item label="开始使用日期" prop="effTime">
-                          <el-date-picker
-                              v-model="cform.effTime"
-                              style="width: 100%"
-                              value-format="yyyy-MM-dd HH:mm:ss"
-                              type="datetime"
-                              placeholder="开始使用日期"
-                          ></el-date-picker>
-                      </el-form-item>
-                  </el-col>
-              </el-row>
-          </el-form>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitConfig"
-                  >确 定</el-button
-              >
-              <el-button @click="cancelConfig">取 消</el-button>
-          </div>
-      </el-dialog>
+        <el-row :gutter="24">
+          <el-col :span="12" v-if="addTitle === '新增'">
+            <el-form-item label="所属上级">
+              <el-input
+                style="width: 100%"
+                disabled
+                v-model="addFormParams.label"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="typeName">
+              <el-input style="width: 100%" v-model="addFormParams.typeName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <!-- 新增弹框 -->
-      <el-dialog
-          :title="addTitle"
-          :visible.sync="addTitleVisible"
-          v-if="addTitleVisible"
-          width="50%"
-          append-to-body
-          :close-on-click-modal="false"
+        <el-row style="text-align: right">
+          <el-form-item>
+            <el-button size="small" type="primary" @click="onSubmit"
+              >确 定</el-button
+            >
+            <el-button size="small" @click="onCancel">取 消</el-button>
+          </el-form-item>
+        </el-row>
+      </el-form>
+    </el-dialog>
+
+    <!-- 修改价格弹框 -->
+    <el-dialog
+      title="修改租赁价"
+      :visible.sync="editLeasePriceVisible"
+      v-if="editLeasePriceVisible"
+      width="30%"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        :inline="true"
+        :model="editPriceForm"
+        ref="editPriceFormRef"
+        :rules="editPriceFormRules"
       >
-          <el-form
-              label-width="80px"
-              :model="addFormParams"
-              :rules="addFormParamsRules"
-              ref="addFormParamsRef"
-          >
-              <el-row :gutter="24">
-                  <el-col :span="12" v-if="addTitle === '新增'">
-                      <el-form-item label="所属上级">
-                          <el-input
-                              style="width: 100%"
-                              disabled
-                              v-model="addFormParams.label"
-                          />
-                      </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                      <el-form-item label="名称" prop="typeName">
-                          <el-input
-                              style="width: 100%"
-                              v-model="addFormParams.typeName"
-                          />
-                      </el-form-item>
-                  </el-col>
-              </el-row>
-
-              <el-row style="text-align: right">
-                  <el-form-item>
-                      <el-button size="small" type="primary" @click="onSubmit"
-                          >确 定</el-button
-                      >
-                      <el-button size="small" @click="onCancel"
-                          >取 消</el-button
-                      >
-                  </el-form-item>
-              </el-row>
-          </el-form>
-      </el-dialog>
+        <el-form-item label="修改后租赁价" prop="leasePrice">
+          <el-input v-model="editPriceForm.leasePrice" />
+        </el-form-item>
+        <el-row style="text-align: right">
+          <el-form-item>
+            <el-button size="small" @click="onEditCancel">取 消</el-button>
+            <el-button size="small" type="primary" @click="onEditSubmit"
+              >确 定</el-button
+            >
+          </el-form-item>
+        </el-row>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {
   getListByMaType,
   getMaTypeList,
@@ -666,599 +664,669 @@ import {
   addMaType,
   updateMaType,
   delMaType,
-} from '@/api/lessor/equipType'
- 
+  updateLeasePriceApi,
+} from "@/api/lessor/equipType";
+
 // import { getUserByRoleList, getMaUserList } from '@/api/system/user'
 // import { getProLists } from '@/api/base/base'
-// import { imgUpLoad, fileUpLoad } from '@/api/system/upload' 
+// import { imgUpLoad, fileUpLoad } from '@/api/system/upload'
 export default {
-  name: 'ToolsType', 
+  name: "ToolsType",
   components: { Treeselect },
   data() {
-      return {
-          // 遮罩层
-          loading: true,
-          // 选中数组
-          ids: [],
-          // 非单个禁用
-          single: true,
-          // 非多个禁用
-          multiple: true,
-          // 显示搜索条件
-          showSearch: true,
-          // 总条数
-          total: 0,
-          // 库管员用户数据
-          keeperList: null,
-          //维修员用户数据
-          repairUserList: null,
-          //资产类型数据
-          propList: null,
-          // 类型名称
-          typeName: undefined,
-          // 树选项
-          treeOptions: undefined,
-          //列表数据
-          typeList: undefined,
-          // 是否显示弹出层
-          open: false,
-          // 弹出层标题
-          title: '',
-          // 默认密码
-          initPassword: undefined,
-          // 日期范围
-          dateRange: [],
-          // 岗位选项
-          postOptions: [],
-          // 角色选项
-          roleOptions: [],
-          // 表单参数
-          form: {
-              companyId: '',
-          },
-          chosenTypeId: '',
-          leasePrice: '',
-          uploadHeader: process.env.VUE_APP_BASE_API,
-          imageUrl: '',
-          imageName: '',
-          fileList: [],
-          field101fileList: [],
-          //上传地址
-          // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
-          // uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
-          // uploadUrl:'http://192.168.5.12:9201',//本地测试
-          uploadUrl: process.env.VUE_APP_BASE_API + '/system', // 上传的图片服务器地址
-          defaultProps: {
-              children: 'children',
-              label: 'label',
-          },
+    return {
+      editPriceForm: {
+        leasePrice: "",
+      },
+      editLeasePriceVisible: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 库管员用户数据
+      keeperList: null,
+      //维修员用户数据
+      repairUserList: null,
+      //资产类型数据
+      propList: null,
+      // 类型名称
+      typeName: undefined,
+      // 树选项
+      treeOptions: undefined,
+      //列表数据
+      typeList: undefined,
+      // 是否显示弹出层
+      open: false,
+      // 弹出层标题
+      title: "",
+      // 默认密码
+      initPassword: undefined,
+      // 日期范围
+      dateRange: [],
+      // 岗位选项
+      postOptions: [],
+      // 角色选项
+      roleOptions: [],
+      // 表单参数
+      form: {
+        companyId: "",
+      },
+      chosenTypeId: "",
+      leasePrice: "",
+      uploadHeader: process.env.VUE_APP_BASE_API,
+      imageUrl: "",
+      imageName: "",
+      fileList: [],
+      field101fileList: [],
+      //上传地址
+      // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
+      // uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
+      // uploadUrl:'http://192.168.5.12:9201',//本地测试
+      uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址
+      defaultProps: {
+        children: "children",
+        label: "label",
+      },
 
-          // 查询参数
-          queryParams: {
-              pageNum: 1,
-              pageSize: 10,
-              typeName: undefined,
-              level: 0,
-              // phonenumber: undefined,
-              // status: undefined,
-              // typeId: undefined
-          },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        typeName: undefined,
+        level: 0,
+        // phonenumber: undefined,
+        // status: undefined,
+        // typeId: undefined
+      },
 
-          // 表单校验
-          rules: {
-              typeName: [
-                  {
-                      required: true,
-                      message: '设备名称不能为空',
-                      trigger: 'blur',
-                  },
-                  {
-                      min: 2,
-                      max: 20,
-                      message: '设备名称长度必须介于 2 和 20 之间',
-                      trigger: 'blur',
-                  },
-              ],
-              parentId: [
-                  {
-                      required: true,
-                      message: '所属上级不能为空',
-                      trigger: 'blur',
-                  },
-              ],
-              manageType: [
-                  {
-                      required: true,
-                      message: '请选择管理模式',
-                      trigger: 'change',
-                  },
-              ],
-              leasePrice: [
-                  {
-                      required: true,
-                      message: '内部租赁价格不能为空',
-                      trigger: 'blur',
-                  },
-              ],
-              unitName: [
-                  {
-                      required: true,
-                      message: '计量单位不能为空',
-                      trigger: 'blur',
-                  },
-              ],
-              // buyPrice: [
-              //     {
-              //         required: true,
-              //         message: '原值不能为空',
-              //         trigger: 'blur',
-              //     },
-              // ],
-              // keeperUserId: [
-              //     {
-              //         required: true,
-              //         message: '库管员不能为空',
-              //         trigger: 'change',
-              //     },
-              // ],
-              // password: [
-              //   {required: true, message: "用户密码不能为空", trigger: "blur"},
-              //   {min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur'}
-              // ],
-              // email: [
-              //   {
-              //     type: "email",
-              //     message: "请输入正确的邮箱地址",
-              //     trigger: ["blur", "change"]
-              //   }
-              // ],
-              // phonenumber: [
-              //   {
-              //     pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-              //     message: "请输入正确的手机号码",
-              //     trigger: "blur"
-              //   }
-              // ]
+      editPriceFormRules: {
+        leasePrice: [
+          {
+            required: true,
+            message: "请输入修改后租赁价格",
+            trigger: "blur",
           },
-          companyId: undefined,
-          dialogImageUrl: '',
-          dialogVisible: false,
-          configOpen: false,
-          cform: {
-              price: '',
-              afterPrice: '',
-              useDate: '',
-          },
-          crules: {
-              leasePrice: [
-                  {
-                      required: true,
-                      message: '调整后价格不能为空',
-                      trigger: 'blur',
-                  },
-                  // { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
-              ],
-              // effTime: [
-              //   {required: true, message: "开始日期不能为空", trigger: "blur"}
-              // ],
+          {
+            pattern: /^(0(\.\d{0,2})?|([1-9]\d*)(\.\d{0,2})?)$/,
+            message: "请输入正确的费用金额，最多两位小数点",
+            trigger: "blur",
           },
+        ],
+      },
 
-          /* 新增弹框等数据源定义 */
-          addTitleVisible: false,
-          addTitle: '', // 新增弹框标题
-          addFormParams: {
-              label: '',
-              typeName: '',
-              companyId: 101,
+      // 表单校验
+      rules: {
+        typeName: [
+          {
+            required: true,
+            message: "设备名称不能为空",
+            trigger: "blur",
           },
+          {
+            min: 2,
+            max: 20,
+            message: "设备名称长度必须介于 2 和 20 之间",
+            trigger: "blur",
+          },
+        ],
+        parentId: [
+          {
+            required: true,
+            message: "所属上级不能为空",
+            trigger: "blur",
+          },
+        ],
+        manageType: [
+          {
+            required: true,
+            message: "请选择管理模式",
+            trigger: "change",
+          },
+        ],
+        leasePrice: [
+          {
+            required: true,
+            message: "内部租赁价格不能为空",
+            trigger: "blur",
+          },
+        ],
+        unitName: [
+          {
+            required: true,
+            message: "计量单位不能为空",
+            trigger: "blur",
+          },
+        ],
+        // buyPrice: [
+        //     {
+        //         required: true,
+        //         message: '原值不能为空',
+        //         trigger: 'blur',
+        //     },
+        // ],
+        // keeperUserId: [
+        //     {
+        //         required: true,
+        //         message: '库管员不能为空',
+        //         trigger: 'change',
+        //     },
+        // ],
+        // password: [
+        //   {required: true, message: "用户密码不能为空", trigger: "blur"},
+        //   {min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur'}
+        // ],
+        // email: [
+        //   {
+        //     type: "email",
+        //     message: "请输入正确的邮箱地址",
+        //     trigger: ["blur", "change"]
+        //   }
+        // ],
+        // phonenumber: [
+        //   {
+        //     pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        //     message: "请输入正确的手机号码",
+        //     trigger: "blur"
+        //   }
+        // ]
+      },
+      companyId: undefined,
+      dialogImageUrl: "",
+      dialogVisible: false,
+      configOpen: false,
+      cform: {
+        price: "",
+        afterPrice: "",
+        useDate: "",
+      },
+      crules: {
+        leasePrice: [
+          {
+            required: true,
+            message: "调整后价格不能为空",
+            trigger: "blur",
+          },
+          // { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
+        ],
+        // effTime: [
+        //   {required: true, message: "开始日期不能为空", trigger: "blur"}
+        // ],
+      },
 
-          addFormParamsRules: {
-              typeName: [
-                  {
-                      required: true,
-                      message: '名称不能为空',
-                      trigger: 'blur',
-                  },
-              ],
+      /* 新增弹框等数据源定义 */
+      addTitleVisible: false,
+      addTitle: "", // 新增弹框标题
+      addFormParams: {
+        label: "",
+        typeName: "",
+        companyId: 101,
+      },
+
+      addFormParamsRules: {
+        typeName: [
+          {
+            required: true,
+            message: "名称不能为空",
+            trigger: "blur",
           },
-          isMousemoveId: null,
-      }
+        ],
+      },
+      isMousemoveId: null,
+      editTypeIds: [],
+      batchEdit: true,
+    };
   },
   watch: {
-      // 根据名称筛选部门树
-      typeName(val) {
-          this.$refs.tree.filter(val)
-      },
+    // 根据名称筛选部门树
+    typeName(val) {
+      this.$refs.tree.filter(val);
+    },
   },
-  created() { 
-      this.getList()
-      this.getTreeData()
-      // this.getUserList()
-      // this.getPropData()
+  created() {
+    this.getList();
+    this.getTreeData();
+    // this.getUserList()
+    // this.getPropData()
   },
-  methods: { 
-      /** 查询用户列表--库管员，维修员 */
-      // getUserList() {
-      //     getMaUserList().then((response) => {
-      //         console.log(response, '库管员')
-      //         this.keeperList = response.data
-      //     })
-      //     getUserByRoleList({ roleIds: [133, 134] }).then((response) => {
-      //         console.log(response, '维修员')
-      //         this.repairUserList = response.data
-      //     })
-      // },
-      /** 查询新增页面-上级类型下拉树结构 */
-      getTreeData() {
-          getMaTypeList().then((response) => {
-              this.treeOptions = [
-                  {
-                      label: '机具类型',
-                      id: 0,
-                      children: response.data,
-                      level: 0,
-                  },
-              ]
-          })
-      },
-      /** 查询资产属性下拉 */
-      // getPropData() {
-      //     getProLists().then((response) => {
-      //         this.propList = response.rows
-      //     })
-      // },
-      /** 查询列表 */
-      getList() {
-          this.loading = true
-          getListByMaType(this.queryParams).then((response) => {
-              this.typeList = response.data.rows
-              this.total = response.data.total
-              this.loading = false
-          })
-      },
-      // 筛选节点 - 左侧树
-      filterNode(value, data) {
-          if (!value) return true
-          return data.label.indexOf(value) !== -1
-      },
-      // 节点单击事件 - 左侧树
-      handleNodeClick(data) {
-          this.queryParams.typeId = data.id
-          this.queryParams.level = data.level
-          this.handleQuery()
-      },
-      // 取消按钮
-      cancel() {
-          this.open = false
-          this.reset()
-      },
-      // 表单重置
-      reset() {
-          this.form = {
-              photoUrl: '',
-              photoName: '',
-              documentUrl: '',
-              documentName: '',
-              parentId: '',
-          }
-          this.imageUrl = ''
-          this.fileList = []
-          this.field101fileList = []
-          this.resetForm('form')
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-          // this.queryParams.pageNum = 1;
-          this.getList()
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-          this.dateRange = []
-          this.resetForm('queryForm')
-          this.queryParams.typeId = undefined
-          this.queryParams.pageNum = 1
-          this.queryParams.pageSize = 10
-          this.queryParams.level = 0
-          this.$refs.tree.setCurrentKey(null)
-          this.handleQuery()
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-          this.ids = selection.map((item) => item.typeId)
-          this.single = selection.length != 1
-          this.multiple = !selection.length
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-          this.reset()
-          this.open = true
-          this.title = '新增'
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-          this.reset()
-          const typeId = row.typeId || this.ids
-          getMaType(typeId).then((response) => {
-              if (response.data.propId == 0) {
-                  response.data.propId = null
-              }
-              if (response.data.repairUserId == 0) {
-                  response.data.repairUserId = null
-              }
-              this.form = response.data
-              if (this.form.documentUrl) {
-                  let file = {
-                      name: this.form.documentName,
-                      type: this.form.documentUrl,
-                  }
-                  this.field101fileList.push(file)
-              } else {
-                  this.field101fileList = []
-              }
+  methods: {
+    /** 查询用户列表--库管员，维修员 */
+    // getUserList() {
+    //     getMaUserList().then((response) => {
+    //         console.log(response, '库管员')
+    //         this.keeperList = response.data
+    //     })
+    //     getUserByRoleList({ roleIds: [133, 134] }).then((response) => {
+    //         console.log(response, '维修员')
+    //         this.repairUserList = response.data
+    //     })
+    // },
+    /** 查询新增页面-上级类型下拉树结构 */
+    getTreeData() {
+      getMaTypeList().then((response) => {
+        this.treeOptions = [
+          {
+            label: "机具类型",
+            id: 0,
+            children: response.data,
+            level: 0,
+          },
+        ];
+      });
+    },
+    /** 查询资产属性下拉 */
+    // getPropData() {
+    //     getProLists().then((response) => {
+    //         this.propList = response.rows
+    //     })
+    // },
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      getListByMaType(this.queryParams).then((response) => {
+        this.typeList = response.data.rows;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 筛选节点 - 左侧树
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件 - 左侧树
+    handleNodeClick(data) {
+      this.queryParams.typeId = data.id;
+      this.queryParams.level = data.level;
+      this.handleQuery();
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        photoUrl: "",
+        photoName: "",
+        documentUrl: "",
+        documentName: "",
+        parentId: "",
+      };
+      this.imageUrl = "";
+      this.fileList = [];
+      this.field101fileList = [];
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      // this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.queryParams.typeId = undefined;
+      this.queryParams.pageNum = 1;
+      this.queryParams.pageSize = 10;
+      this.queryParams.level = 0;
+      this.$refs.tree.setCurrentKey(null);
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection;
+      //   this.ids = selection.map((item) => item.typeId);
+      //   this.single = selection.length != 1;
+      //   this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "新增";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const typeId = row.typeId || this.ids;
+      getMaType(typeId).then((response) => {
+        if (response.data.propId == 0) {
+          response.data.propId = null;
+        }
+        if (response.data.repairUserId == 0) {
+          response.data.repairUserId = null;
+        }
+        this.form = response.data;
+        if (this.form.documentUrl) {
+          let file = {
+            name: this.form.documentName,
+            type: this.form.documentUrl,
+          };
+          this.field101fileList.push(file);
+        } else {
+          this.field101fileList = [];
+        }
 
-              this.imageUrl = this.form.photoUrl
+        this.imageUrl = this.form.photoUrl;
 
-              console.log(row, '---')
-              this.getParentName(this.treeOptions, row.parentId)
-              // console.log(this.form, '表单数据--')
+        console.log(row, "---");
+        this.getParentName(this.treeOptions, row.parentId);
+        // console.log(this.form, '表单数据--')
 
-              this.open = true
-              this.title = '修改'
-          })
-      },
-      /** 提交按钮 */
-      submitForm: function () {
-          console.log(this.form, '提交参数---')
-          this.$refs['form'].validate((valid) => {
-              if (valid) {
-                  if (this.form.typeId != undefined) {
-                      updateMaType(this.form).then((response) => {
-                          this.$modal.msgSuccess('修改成功')
-                          this.open = false
-                          this.getList()
-                          this.getTreeData()
-                      })
-                  } else {
-                      // this.form.companyId = this.companyId
-                      addMaType(this.form).then((response) => {
-                          this.$modal.msgSuccess('新增成功')
-                          this.open = false
-                          this.getList()
-                          this.getTreeData()
-                      })
-                  }
-              }
-          })
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-          const typeIds = row.typeId
-          this.$modal
-              .confirm('是否确认删除数据项？')
-              .then(function () {
-                  return delMaType(typeIds)
-              })
-              .then(() => {
-                  this.$modal.msgSuccess('删除成功')
-                  this.getList()
-                  this.getTreeData()
-              })
-              .catch(() => {})
-      },
-      //配置操作
-      handleConfig(row) {
-          this.resetForm('cform')
-          this.chosenTypeId = row.typeId
-          this.leasePrice = row.leasePrice
-          // this.cform.leasePrice = row.leasePrice;
-          this.$set(this.cform, 'leasePrice', row.leasePrice)
-          this.configOpen = true
-          this.title = '租赁价格调整'
-      },
-      submitConfig() {
-          let param = {
-              typeId: this.chosenTypeId,
-              effTime: this.cform.effTime,
-              leasePrice: this.cform.leasePrice,
-          }
-          console.log(param)
-          this.$refs['cform'].validate((valid) => {
-              if (valid) {
-                  updateMaType(param).then((response) => {
-                      this.$modal.msgSuccess('调整成功')
-                      this.configOpen = false
-                      this.getList()
-                      this.getTreeData()
-                  })
-              }
-          })
-          // this.configOpen = false;
-      },
-      cancelConfig() {
-          this.configOpen = false
-      },
-      // 图片上传
-      imgUpLoad(param, name, index) {
-          console.log(param, 'image')
-          param.type = 'ma'
-          // imgUpLoad(param)
-          //     .then((res) => {
-          //         if (res.code == 200) {
-          //             this.form.photoUrl = res.data.fileUrl
-          //             this.form.photoName = res.data.fileName
-          //             this.imageUrl = res.data.fileUrl
-          //             this.imageName = res.data.fileName
-          //         } else {
-          //             // this.$msgError(res.msg)
-          //             this.$modal.msgError(res.msg)
-          //         }
-          //     })
-          //     .catch((error) => {
-          //         // this.$msgError(error)
-          //         this.$modal.msgError(error)
-          //     })
-      },
-      handleAvatarSuccess(res, file) {
-          console.log('success')
-      },
-      handleRemove(file, fileList) {
-          console.log(file, fileList)
-          this.imageUrl = ''
-          this.form.photoUrl = ''
-          this.form.photoName = ''
-      },
-      //图片点击查看
-      handlePictureCardPreview(file) {
-          console.log(file)
-          this.dialogImageUrl = file.url
-          this.dialogVisible = true
-      },
-      //图片查看
-      openImg(url) {
-          this.dialogImageUrl = this.uploadUrl + url
-          this.dialogVisible = true
-      },
-      //文件上传
-      fileUpLoad(param, name, index) {
-          console.log(param, 'fileUpLoad')
-          param.type = 'ma'
-          // imgUpLoad(param)
-          //     .then((res) => {
-          //         if (res.code == 200) {
-          //             this.form.documentUrl = res.data.fileUrl
-          //             this.form.documentName = res.data.fileName
-          //             this.field101fileList[0] = param.file
-          //             console.log(this.field101fileList)
-          //         } else {
-          //             // this.$msgError(res.msg)
-          //             this.$modal.msgError(res.msg)
-          //         }
-          //     })
-          //     .catch((error) => {
-          //         // this.$msgError(error)
-          //         this.$modal.msgError(error)
-          //     })
-      },
-      exceedFile(files, fileList) {
-          this.$message.warning(
-              `只能选择 1 个文件导入，共选择了 ${
-                  files.length + fileList.length
-              } 个文件`,
-          )
-      },
-
-      /** 导出按钮操作 */
-      handleExport() {
-          // this.download('system/user/export', {
-          //   ...this.queryParams
-          // }, `user_${new Date().getTime()}.xlsx`)
-      },
-
-      /* 树节点操作 */
-      treeChange(val) {
-          console.log(val, '树节点')
-
-          this.form.companyId = val.companyId
-      },
-
-      /* 树节点增加 */
-      appendTreeNode(data) {
-          if (data.level === 3) {
-              this.reset()
-              Object.assign(this.form, data)
-              this.form.parentId = data.id
-              this.open = true
-              this.title = '新增'
+        this.open = true;
+        this.title = "修改";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      console.log(this.form, "提交参数---");
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.typeId != undefined) {
+            updateMaType(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+              this.getTreeData();
+            });
           } else {
-              Object.assign(this.addFormParams, data)
-              this.addFormParams.typeName = ''
-              this.addTitle = '新增'
-              this.addTitleVisible = true
+            // this.form.companyId = this.companyId
+            addMaType(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+              this.getTreeData();
+            });
           }
-      },
-      /* 树节点删除 */
-      removeTreeNode(data) {
-          // this.$message.success('删除--')
-          console.log(data, '删除时的数据源--')
-          this.$modal
-              .confirm('是否确认删除数据项？')
-              .then(function () {
-                  return delMaType(data.id)
-              })
-              .then(() => {
-                  this.$modal.msgSuccess('删除成功')
-                  this.getTreeData()
-              })
-              .catch(() => {})
-      },
-      /* 树节点修改 */
-      editTreeNode(data) {
-          console.log(data, '修改')
-          Object.assign(this.addFormParams, data)
-          this.addTitle = '修改'
-          this.addFormParams.typeName = data.label
-          this.addTitleVisible = true
-      },
-      /* 确定 */
-      onSubmit() {
-          const { id, typeName,parentId } = this.addFormParams
-          const addParams = {
-              parentId: id,
-              typeName,
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const typeIds = row.typeId;
+      this.$modal
+        .confirm("是否确认删除数据项？")
+        .then(function () {
+          return delMaType(typeIds);
+        })
+        .then(() => {
+          this.$modal.msgSuccess("删除成功");
+          this.getList();
+          this.getTreeData();
+        })
+        .catch(() => {});
+    },
+    //配置操作
+    handleConfig(row) {
+      this.resetForm("cform");
+      this.chosenTypeId = row.typeId;
+      this.leasePrice = row.leasePrice;
+      // this.cform.leasePrice = row.leasePrice;
+      this.$set(this.cform, "leasePrice", row.leasePrice);
+      this.configOpen = true;
+      this.title = "租赁价格调整";
+    },
+    submitConfig() {
+      let param = {
+        typeId: this.chosenTypeId,
+        effTime: this.cform.effTime,
+        leasePrice: this.cform.leasePrice,
+      };
+      console.log(param);
+      this.$refs["cform"].validate((valid) => {
+        if (valid) {
+          updateMaType(param).then((response) => {
+            this.$modal.msgSuccess("调整成功");
+            this.configOpen = false;
+            this.getList();
+            this.getTreeData();
+          });
+        }
+      });
+      // this.configOpen = false;
+    },
+    cancelConfig() {
+      this.configOpen = false;
+    },
+    // 图片上传
+    imgUpLoad(param, name, index) {
+      console.log(param, "image");
+      param.type = "ma";
+      // imgUpLoad(param)
+      //     .then((res) => {
+      //         if (res.code == 200) {
+      //             this.form.photoUrl = res.data.fileUrl
+      //             this.form.photoName = res.data.fileName
+      //             this.imageUrl = res.data.fileUrl
+      //             this.imageName = res.data.fileName
+      //         } else {
+      //             // this.$msgError(res.msg)
+      //             this.$modal.msgError(res.msg)
+      //         }
+      //     })
+      //     .catch((error) => {
+      //         // this.$msgError(error)
+      //         this.$modal.msgError(error)
+      //     })
+    },
+    handleAvatarSuccess(res, file) {
+      console.log("success");
+    },
+    handleRemove(file, fileList) {
+      console.log(file, fileList);
+      this.imageUrl = "";
+      this.form.photoUrl = "";
+      this.form.photoName = "";
+    },
+    //图片点击查看
+    handlePictureCardPreview(file) {
+      console.log(file);
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    //图片查看
+    openImg(url) {
+      this.dialogImageUrl = this.uploadUrl + url;
+      this.dialogVisible = true;
+    },
+    //文件上传
+    fileUpLoad(param, name, index) {
+      console.log(param, "fileUpLoad");
+      param.type = "ma";
+      // imgUpLoad(param)
+      //     .then((res) => {
+      //         if (res.code == 200) {
+      //             this.form.documentUrl = res.data.fileUrl
+      //             this.form.documentName = res.data.fileName
+      //             this.field101fileList[0] = param.file
+      //             console.log(this.field101fileList)
+      //         } else {
+      //             // this.$msgError(res.msg)
+      //             this.$modal.msgError(res.msg)
+      //         }
+      //     })
+      //     .catch((error) => {
+      //         // this.$msgError(error)
+      //         this.$modal.msgError(error)
+      //     })
+    },
+    exceedFile(files, fileList) {
+      this.$message.warning(
+        `只能选择 1 个文件导入，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
+    },
+
+    /** 导出按钮操作 */
+    handleExport() {
+      // this.download('system/user/export', {
+      //   ...this.queryParams
+      // }, `user_${new Date().getTime()}.xlsx`)
+    },
+
+    /* 树节点操作 */
+    treeChange(val) {
+      console.log(val, "树节点");
+
+      this.form.companyId = val.companyId;
+    },
+
+    /* 树节点增加 */
+    appendTreeNode(data) {
+      if (data.level === 3) {
+        this.reset();
+        Object.assign(this.form, data);
+        this.form.parentId = data.id;
+        this.open = true;
+        this.title = "新增";
+      } else {
+        Object.assign(this.addFormParams, data);
+        this.addFormParams.typeName = "";
+        this.addTitle = "新增";
+        this.addTitleVisible = true;
+      }
+    },
+    /* 树节点删除 */
+    removeTreeNode(data) {
+      // this.$message.success('删除--')
+      console.log(data, "删除时的数据源--");
+      this.$modal
+        .confirm("是否确认删除数据项？")
+        .then(function () {
+          return delMaType(data.id);
+        })
+        .then(() => {
+          this.$modal.msgSuccess("删除成功");
+          this.getTreeData();
+        })
+        .catch(() => {});
+    },
+    /* 树节点修改 */
+    editTreeNode(data) {
+      console.log(data, "修改");
+      Object.assign(this.addFormParams, data);
+      this.addTitle = "修改";
+      this.addFormParams.typeName = data.label;
+      this.addTitleVisible = true;
+    },
+    /* 确定 */
+    onSubmit() {
+      const { id, typeName, parentId } = this.addFormParams;
+      const addParams = {
+        parentId: id,
+        typeName,
+      };
+      const editParams = {
+        typeId: id,
+        typeName,
+        parentId,
+      };
+
+      this.$refs["addFormParamsRef"].validate(async (valid) => {
+        if (valid) {
+          if (this.addTitle === "新增") {
+            const res = await addMaType(addParams);
+            if (res.code === 200) {
+              this.$message.success("新增成功！");
+              this.addTitleVisible = false;
+              this.getTreeData();
+            }
+          } else {
+            const res = await updateMaType(editParams);
+            if (res.code === 200) {
+              this.$message.success("修改成功！");
+              this.addTitleVisible = false;
+              this.getTreeData();
+            }
           }
-          const editParams = {
-              typeId: id,
-              typeName,
-              parentId
+        }
+      });
+    },
+    /* 取消 */
+    onCancel() {
+      this.addTitleVisible = false;
+    },
+    getParentName(list, id) {
+      try {
+        list.forEach((e) => {
+          if (e.id == id) {
+            this.form.label = e.label;
+            throw new Error();
+          } else {
+            if (e.children && e.children.length > 0) {
+              this.getParentName(e.children, id);
+            }
+          }
+        });
+      } catch (error) {}
+    },
+
+    onMousemove(data) {
+      this.isMousemoveId = data.id;
+    },
+    onMouseleave() {
+      this.isMousemoveId = null;
+    },
+
+    onBatchEditPrice() {
+      this.$message.closeAll();
+      if (this.ids.length < 1) {
+        this.$message.error("请勾选改价的设备");
+        return;
+      }
+      this.editPriceForm.leasePrice = "";
+      this.batchEdit = true;
+      this.editLeasePriceVisible = true;
+    },
+    onEditSubmit() {
+      this.$refs.editPriceFormRef.validate(async (valid) => {
+        if (valid) {
+          let typeIds = [];
+          if (this.batchEdit) {
+            typeIds = this.ids.map((e) => {
+              return e.typeId;
+            });
+          } else {
+            typeIds = this.editTypeIds;
           }
 
-          this.$refs['addFormParamsRef'].validate(async (valid) => {
-              if (valid) {
-                  if (this.addTitle === '新增') {
-                      const res = await addMaType(addParams)
-                      if (res.code === 200) {
-                          this.$message.success('新增成功！')
-                          this.addTitleVisible = false
-                          this.getTreeData()
-                      }
-                  } else {
-                      const res = await updateMaType(editParams)
-                      if (res.code === 200) {
-                          this.$message.success('修改成功！')
-                          this.addTitleVisible = false
-                          this.getTreeData()
-                      }
-                  }
-              }
-          })
-      },
-      /* 取消 */
-      onCancel() {
-          this.addTitleVisible = false
-      },
-      getParentName(list, id) {
-          try {
-              list.forEach((e) => {
-                  if (e.id == id) {
-                      this.form.label = e.label
-                      throw new Error()
-                  } else {
-                      if (e.children && e.children.length > 0) {
-                          this.getParentName(e.children, id)
-                      }
-                  }
-              })
-          } catch (error) {}
-      },
-
-      onMousemove(data) {
-          this.isMousemoveId = data.id
-      },
-      onMouseleave() {
-          this.isMousemoveId = null
-      },
+          const params = {
+            typeIds,
+            leasePrice: this.editPriceForm.leasePrice * 1,
+          };
+          const res = await updateLeasePriceApi(params);
+          if (res.code === 200) {
+            this.$message.success("修改成功");
+            this.editLeasePriceVisible = false;
+            this.getList();
+          }
+        }
+      });
+    },
+    onEditCancel() {
+      this.editLeasePriceVisible = false;
+      this.$refs.editPriceFormRef.resetFields();
+    },
+    handleUpdateLeasePrice(row) {
+      this.editPriceForm.leasePrice = "";
+      this.batchEdit = false;
+      this.editTypeIds = [];
+      this.editTypeIds.push(row.typeId);
+      this.editLeasePriceVisible = true;
+    },
   },
-}
+};
 </script>
 <style lang="scss" scoped>
 ::v-deep.el-table .fixed-width .el-button--mini {
@@ -1272,7 +1340,7 @@ export default {
 .btn-items {
   margin-left: 4px;
   .el-button--text {
-      font-size: 16px;
+    font-size: 16px;
   }
 }
 ::v-deep .el-tree .el-tree-node__expand-icon.expanded {
@@ -1280,13 +1348,13 @@ export default {
   transform: rotate(0deg);
 }
 ::v-deep .el-tree .el-icon-caret-right:before {
-  content: '\e783';
+  content: "\e783";
   font-size: 16px;
 }
 ::v-deep
   .el-tree
   .el-tree-node__expand-icon.expanded.el-icon-caret-right:before {
-  content: '\e781';
+  content: "\e781";
   font-size: 16px;
   color: #1890ff;
 }
diff --git a/vue.config.js b/vue.config.js
index b9788cc1..351ba0eb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -39,7 +39,7 @@ module.exports = {
         // target: `http://192.168.2.246:18080`,//马
         // target: `http://192.168.0.110:18080`,//洪
         // target: `http://192.168.0.234:18080`,//阮
-        target: `http://192.168.0.244:28580`,//测试
+        target: `http://192.168.2.127:28080`, //测试
         // target: `http://192.168.137.1:18080`,//
         changeOrigin: true,
         pathRewrite: {