From fb19d684bcfd3d6d3e5796c1228c8bf9abd18325 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 11 Jun 2024 11:37:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E6=8F=92=E6=A7=BD=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83=E7=AD=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/.eslintrc.js                          |    5 +-
 sgzb-ui/src/api/system/user.js                |    9 +
 .../receive/receiveManageAdd.vue              | 1279 ++++++++-------
 .../claimAndRefund/receive/receiveOut.vue     |    4 +-
 .../claimAndRefund/return/returnApply.vue     |    2 +-
 .../claimAndRefund/return/returnApplyByCq.vue |    2 +-
 .../claimAndRefund/return/returnExamine.vue   |    2 +-
 .../claimAndRefund/return/returnFinshed.vue   |  479 +++---
 .../claimAndRefund/return/returnInDetail.vue  |    4 +-
 .../secondStore/secondStore.vue               |    2 +-
 .../return/apply/component/home1.vue          |    2 +-
 sgzb-ui/src/views/index.vue                   |  332 ++--
 sgzb-ui/src/views/login.vue                   |  873 +++++-----
 sgzb-ui/src/views/monitor/online/index.vue    |  267 ++--
 .../views/repairTest/brokenExamine/index.vue  |   45 +-
 sgzb-ui/src/views/repairTest/repair/index.vue |   25 +-
 .../views/repairTest/testExamine/index.vue    |   49 +-
 sgzb-ui/src/views/store/label/labelType.vue   |  673 ++++----
 .../newBuy/newAccessory/newAccessoryList.vue  |    2 +-
 .../newDevicesServiceCenterList.vue           |    2 +-
 .../newDevices/newDevicesWarehousing.vue      |    2 +-
 .../store/newBuy/newTools/newToolsArrival.vue | 1405 +++++++++--------
 sgzb-ui/src/views/store/newBuy/plan.vue       |  390 +++--
 sgzb-ui/src/views/store/newBuy/planSecond.vue | 1037 ++++++------
 24 files changed, 3809 insertions(+), 3083 deletions(-)

diff --git a/sgzb-ui/.eslintrc.js b/sgzb-ui/.eslintrc.js
index 82bbdeea..092bc243 100644
--- a/sgzb-ui/.eslintrc.js
+++ b/sgzb-ui/.eslintrc.js
@@ -23,7 +23,7 @@ module.exports = {
       }
     }],
     "vue/singleline-html-element-content-newline": "off",
-    "vue/multiline-html-element-content-newline":"off",
+    "vue/multiline-html-element-content-newline": "off",
     "vue/name-property-casing": ["error", "PascalCase"],
     "vue/no-v-html": "off",
     'accessor-pairs': 2,
@@ -48,7 +48,7 @@ module.exports = {
     'curly': [2, 'multi-line'],
     'dot-location': [2, 'property'],
     'eol-last': 2,
-    'eqeqeq': ["error", "always", {"null": "ignore"}],
+    'eqeqeq': ["error", "always", { "null": "ignore" }],
     'generator-star-spacing': [2, {
       'before': true,
       'after': true
@@ -191,6 +191,7 @@ module.exports = {
     'yoda': [2, 'never'],
     'prefer-const': 2,
     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
+    'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     'object-curly-spacing': [2, 'always', {
       objectsInObjects: false
     }],
diff --git a/sgzb-ui/src/api/system/user.js b/sgzb-ui/src/api/system/user.js
index 3e498792..b0ccdfdf 100644
--- a/sgzb-ui/src/api/system/user.js
+++ b/sgzb-ui/src/api/system/user.js
@@ -143,3 +143,12 @@ export function getUserByRoleList(data) {
     params: data
   })
 }
+
+// 库管员
+export function getMaUserList(params) {
+  return request({
+    url: '/base/maWarehouseKeeper/getMaUserList',
+    method: 'get',
+    params
+  })
+}
\ No newline at end of file
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue
index fa1e76da..c7a418b8 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue
@@ -1,588 +1,725 @@
 <template>
-  <div class="app-container" id="receiveManageAdd">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-row>
-        <el-form-item label="领料单位" prop="roleName">
-          <el-input
-            v-model="queryParams.roleName"
-            placeholder="请输入领料单位"
-            clearable
-            style="width: 240px;"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="领料工程" prop="status">
-          <el-select
-            v-model="queryParams.status"
-            placeholder="领料工程"
-            clearable filterable 
-            style="width: 240px"
-          >
-            <el-option
-              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
+    <div class="app-container" id="receiveManageAdd">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+        >
+            <el-row>
+                <el-form-item label="领料单位" prop="roleName">
+                    <el-input
+                        v-model="queryParams.roleName"
+                        placeholder="请输入领料单位"
+                        clearable
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </el-form-item>
+                <el-form-item label="领料工程" prop="status">
+                    <el-select
+                        v-model="queryParams.status"
+                        placeholder="领料工程"
+                        clearable
+                        filterable
+                        style="width: 240px"
+                    >
+                        <el-option
+                            v-for="dict in dict.type.sys_normal_disable"
+                            :key="dict.value"
+                            :label="dict.label"
+                            :value="dict.value"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="物品类型" prop="status">
+                    <el-select
+                        v-model="queryParams.status"
+                        placeholder="物品类型"
+                        clearable
+                        filterable
+                        style="width: 240px"
+                    >
+                        <el-option
+                            v-for="dict in dict.type.sys_normal_disable"
+                            :key="dict.value"
+                            :label="dict.label"
+                            :value="dict.value"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="领料人" prop="roleName">
+                    <el-input
+                        v-model="queryParams.roleName"
+                        placeholder="请输入领料人"
+                        clearable
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </el-form-item>
+                <el-form-item label="备注" prop="roleName">
+                    <el-input
+                        v-model="queryParams.roleName"
+                        placeholder="请输入备注"
+                        clearable
+                        type="textarea"
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </el-form-item>
+            </el-row>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="primary" plain icon="el-icon-plus" size="mini"
+                    >保存</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="success"
+                    plain
+                    icon="el-icon-edit"
+                    size="mini"
+                    @click="handleBack"
+                    >领料管理</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="warning"
+                    plain
+                    icon="el-icon-download"
+                    size="mini"
+                    @click="handleExport"
+                    >导出</el-button
+                >
+            </el-col>
+            <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+            ></right-toolbar>
+        </el-row>
+
+        <el-table
+            v-loading="loading"
+            :data="roleList"
+            @selection-change="handleSelectionChange"
+        >
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column
+                label="序号"
+                align="center"
+                width="100"
+                type="index"
+            >
+                <template slot-scope="scope">
+                    <span>{{
+                        (queryParams.pageNum - 1) * 10 + scope.$index + 1
+                    }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="类型名称"
+                prop="roleName"
+                :show-overflow-tooltip="true"
             />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="物品类型" prop="status">
-          <el-select
-            v-model="queryParams.status"
-            placeholder="物品类型"
-            clearable filterable 
-            style="width: 240px"
-          >
-            <el-option
-              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
+            <el-table-column
+                label="规格型号"
+                prop="roleKey"
+                :show-overflow-tooltip="true"
             />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="领料人" prop="roleName">
-          <el-input
-            v-model="queryParams.roleName"
-            placeholder="请输入领料人"
-            clearable
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="备注" prop="roleName">
-          <el-input
-            v-model="queryParams.roleName"
-            placeholder="请输入备注"
-            clearable
-            type="textarea"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-      </el-row>
+            <el-table-column label="计量单位" prop="unitName" width="100" />
+            <el-table-column
+                label="当前库存"
+                prop="roleSort"
+                align="center"
+                width="100"
+            />
+            <el-table-column
+                label="预领数量"
+                align="center"
+                prop="createTime"
+                width="180"
+            >
+                <template slot-scope="scope">
+                    <el-input
+                        v-model="scope.row.roleSort"
+                        placeholder="请输入预领数量"
+                        clearable
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </template>
+            </el-table-column>
+            <el-table-column label="出库数量" prop="roleSort" width="100" />
+            <el-table-column label="出库状态" prop="roleSort" width="100" />
+            <el-table-column
+                label="备注"
+                align="center"
+                prop="createTime"
+                width="180"
+            >
+                <template slot-scope="scope">
+                    <el-input
+                        v-model="scope.row.roleSort"
+                        placeholder="请输入备注"
+                        clearable
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="操作"
+                align="center"
+                class-name="small-padding fixed-width"
+            >
+                <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-delete"
+                        @click="handleDelete(scope.row)"
+                        >删除</el-button
+                    >
+                </template>
+            </el-table-column>
+        </el-table>
 
-    </el-form>
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
+        <!-- 添加或修改角色配置对话框 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="open"
+            width="500px"
+            append-to-body
+        >
+            <el-form
+                ref="form"
+                :model="form"
+                :rules="rules"
+                label-width="100px"
+            >
+                <el-form-item label="角色名称" prop="roleName">
+                    <el-input
+                        v-model="form.roleName"
+                        placeholder="请输入角色名称"
+                    />
+                </el-form-item>
+                <el-form-item prop="roleKey">
+                    <span slot="label">
+                        <el-tooltip
+                            content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)"
+                            placement="top"
+                        >
+                            <i class="el-icon-question"></i>
+                        </el-tooltip>
+                        权限字符
+                    </span>
+                    <el-input
+                        v-model="form.roleKey"
+                        placeholder="请输入权限字符"
+                    />
+                </el-form-item>
+                <el-form-item label="角色顺序" prop="roleSort">
+                    <el-input-number
+                        v-model="form.roleSort"
+                        controls-position="right"
+                        :min="0"
+                    />
+                </el-form-item>
+                <el-form-item label="状态">
+                    <el-radio-group v-model="form.status">
+                        <el-radio
+                            v-for="dict in dict.type.sys_normal_disable"
+                            :key="dict.value"
+                            :label="dict.value"
+                            >{{ dict.label }}</el-radio
+                        >
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="备注">
+                    <el-input
+                        v-model="form.remark"
+                        type="textarea"
+                        placeholder="请输入内容"
+                    ></el-input>
+                </el-form-item>
+            </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-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          @click="handleBack"
-        >领料管理</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" width="100" type="index">
-        <template scope="scope">
-        <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="类型名称" prop="roleName" :show-overflow-tooltip="true"   />
-      <el-table-column label="规格型号" prop="roleKey" :show-overflow-tooltip="true" />
-      <el-table-column label="计量单位" prop="unitName" width="100" />
-      <el-table-column label="当前库存" prop="roleSort" align="center" width="100" />
-      <el-table-column label="预领数量" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <el-input
-            v-model="scope.row.roleSort"
-            placeholder="请输入预领数量"
-            clearable
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="出库数量" prop="roleSort" width="100" />
-      <el-table-column label="出库状态" prop="roleSort" width="100" />
-      <el-table-column label="备注" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <el-input
-            v-model="scope.row.roleSort"
-            placeholder="请输入备注"
-            clearable
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="角色名称" prop="roleName">
-          <el-input v-model="form.roleName" placeholder="请输入角色名称" />
-        </el-form-item>
-        <el-form-item prop="roleKey">
-          <span slot="label">
-            <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-            权限字符
-          </span>
-          <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
-        </el-form-item>
-        <el-form-item label="角色顺序" prop="roleSort">
-          <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
-        </el-form-item>
-        <el-form-item label="状态">
-          <el-radio-group v-model="form.status">
-            <el-radio
-              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="备注">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-        </el-form-item>
-      </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 :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
-      <el-form :model="form" label-width="80px">
-        <el-form-item label="角色名称">
-          <el-input v-model="form.roleName" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="权限字符">
-          <el-input v-model="form.roleKey" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="权限范围">
-          <el-select v-model="form.dataScope" filterable @change="dataScopeSelectChange">
-            <el-option
-              v-for="item in dataScopeOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="数据权限" v-show="form.dataScope == 2">
-          <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
-          <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
-          <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
-          <el-tree
-            class="tree-border"
-            :data="deptOptions"
-            show-checkbox
-            default-expand-all
-            ref="dept"
-            node-key="id"
-            :check-strictly="!form.deptCheckStrictly"
-            empty-text="加载中，请稍候"
-            :props="defaultProps"
-          ></el-tree>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitDataScope">确 定</el-button>
-        <el-button @click="cancelDataScope">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
+        <!-- 分配角色数据权限对话框 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="openDataScope"
+            width="500px"
+            append-to-body
+        >
+            <el-form :model="form" label-width="80px">
+                <el-form-item label="角色名称">
+                    <el-input v-model="form.roleName" :disabled="true" />
+                </el-form-item>
+                <el-form-item label="权限字符">
+                    <el-input v-model="form.roleKey" :disabled="true" />
+                </el-form-item>
+                <el-form-item label="权限范围">
+                    <el-select
+                        v-model="form.dataScope"
+                        filterable
+                        @change="dataScopeSelectChange"
+                    >
+                        <el-option
+                            v-for="item in dataScopeOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="数据权限" v-show="form.dataScope == 2">
+                    <el-checkbox
+                        v-model="deptExpand"
+                        @change="handleCheckedTreeExpand($event, 'dept')"
+                        >展开/折叠</el-checkbox
+                    >
+                    <el-checkbox
+                        v-model="deptNodeAll"
+                        @change="handleCheckedTreeNodeAll($event, 'dept')"
+                        >全选/全不选</el-checkbox
+                    >
+                    <el-checkbox
+                        v-model="form.deptCheckStrictly"
+                        @change="handleCheckedTreeConnect($event, 'dept')"
+                        >父子联动</el-checkbox
+                    >
+                    <el-tree
+                        class="tree-border"
+                        :data="deptOptions"
+                        show-checkbox
+                        default-expand-all
+                        ref="dept"
+                        node-key="id"
+                        :check-strictly="!form.deptCheckStrictly"
+                        empty-text="加载中，请稍候"
+                        :props="defaultProps"
+                    ></el-tree>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitDataScope"
+                    >确 定</el-button
+                >
+                <el-button @click="cancelDataScope">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
-import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+import {
+    listRole,
+    getRole,
+    delRole,
+    addRole,
+    updateRole,
+    dataScope,
+    changeRoleStatus,
+    deptTreeSelect,
+} from '@/api/system/role'
+import {
+    treeselect as menuTreeselect,
+    roleMenuTreeselect,
+} from '@/api/system/menu'
 
 export default {
-  name: "ReceiveManageAdd",
-  dicts: ['sys_normal_disable'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 角色表格数据
-      roleList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 是否显示弹出层（数据权限）
-      openDataScope: false,
-      menuExpand: false,
-      menuNodeAll: false,
-      deptExpand: true,
-      deptNodeAll: false,
-      // 日期范围
-      dateRange: [],
-      // 数据范围选项
-      dataScopeOptions: [
-        {
-          value: "1",
-          label: "全部数据权限"
-        },
-        {
-          value: "2",
-          label: "自定数据权限"
-        },
-        {
-          value: "3",
-          label: "本部门数据权限"
-        },
-        {
-          value: "4",
-          label: "本部门及以下数据权限"
-        },
-        {
-          value: "5",
-          label: "仅本人数据权限"
+    name: 'ReceiveManageAdd',
+    dicts: ['sys_normal_disable'],
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 角色表格数据
+            roleList: [],
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            // 是否显示弹出层（数据权限）
+            openDataScope: false,
+            menuExpand: false,
+            menuNodeAll: false,
+            deptExpand: true,
+            deptNodeAll: false,
+            // 日期范围
+            dateRange: [],
+            // 数据范围选项
+            dataScopeOptions: [
+                {
+                    value: '1',
+                    label: '全部数据权限',
+                },
+                {
+                    value: '2',
+                    label: '自定数据权限',
+                },
+                {
+                    value: '3',
+                    label: '本部门数据权限',
+                },
+                {
+                    value: '4',
+                    label: '本部门及以下数据权限',
+                },
+                {
+                    value: '5',
+                    label: '仅本人数据权限',
+                },
+            ],
+            // 菜单列表
+            menuOptions: [],
+            // 部门列表
+            deptOptions: [],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                roleName: undefined,
+                roleKey: undefined,
+                status: undefined,
+            },
+            // 表单参数
+            form: {},
+            defaultProps: {
+                children: 'children',
+                label: 'label',
+            },
+            // 表单校验
+            rules: {
+                roleName: [
+                    {
+                        required: true,
+                        message: '角色名称不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                roleKey: [
+                    {
+                        required: true,
+                        message: '权限字符不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                roleSort: [
+                    {
+                        required: true,
+                        message: '角色顺序不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+            },
         }
-      ],
-      // 菜单列表
-      menuOptions: [],
-      // 部门列表
-      deptOptions: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        roleName: undefined,
-        roleKey: undefined,
-        status: undefined
-      },
-      // 表单参数
-      form: {},
-      defaultProps: {
-        children: "children",
-        label: "label"
-      },
-      // 表单校验
-      rules: {
-        roleName: [
-          { required: true, message: "角色名称不能为空", trigger: "blur" }
-        ],
-        roleKey: [
-          { required: true, message: "权限字符不能为空", trigger: "blur" }
-        ],
-        roleSort: [
-          { required: true, message: "角色顺序不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    handleBack(){
-      this.$router.replace("/claimAndRefund/receive/receiveManage");
     },
-    /** 查询角色列表 */
-    getList() {
-      this.loading = true;
-      listRole(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.roleList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
+    created() {
+        this.getList()
     },
-    /** 查询菜单树结构 */
-    getMenuTreeselect() {
-      menuTreeselect().then(response => {
-        this.menuOptions = response.data;
-      });
-    },
-    // 所有菜单节点数据
-    getMenuAllCheckedKeys() {
-      // 目前被选中的菜单节点
-      let checkedKeys = this.$refs.menu.getCheckedKeys();
-      // 半选中的菜单节点
-      let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
-      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
-      return checkedKeys;
-    },
-    // 所有部门节点数据
-    getDeptAllCheckedKeys() {
-      // 目前被选中的部门节点
-      let checkedKeys = this.$refs.dept.getCheckedKeys();
-      // 半选中的部门节点
-      let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys();
-      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
-      return checkedKeys;
-    },
-    /** 根据角色ID查询菜单树结构 */
-    getRoleMenuTreeselect(roleId) {
-      return roleMenuTreeselect(roleId).then(response => {
-        this.menuOptions = response.menus;
-        return response;
-      });
-    },
-    /** 根据角色ID查询部门树结构 */
-    getDeptTree(roleId) {
-      return deptTreeSelect(roleId).then(response => {
-        this.deptOptions = response.depts;
-        return response;
-      });
-    },
-    // 角色状态修改
-    handleStatusChange(row) {
-      let text = row.status === "0" ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗？').then(function() {
-        return changeRoleStatus(row.roleId, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "0" ? "1" : "0";
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 取消按钮（数据权限）
-    cancelDataScope() {
-      this.openDataScope = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      if (this.$refs.menu != undefined) {
-        this.$refs.menu.setCheckedKeys([]);
-      }
-      this.menuExpand = false,
-        this.menuNodeAll = false,
-        this.deptExpand = true,
-        this.deptNodeAll = false,
-        this.form = {
-          roleId: undefined,
-          roleName: undefined,
-          roleKey: undefined,
-          roleSort: 0,
-          status: "0",
-          menuIds: [],
-          deptIds: [],
-          menuCheckStrictly: true,
-          deptCheckStrictly: true,
-          remark: undefined
-        };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.roleId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    // 更多操作触发
-    handleCommand(command, row) {
-      switch (command) {
-        case "handleDataScope":
-          this.handleDataScope(row);
-          break;
-        case "handleAuthUser":
-          this.handleAuthUser(row);
-          break;
-        default:
-          break;
-      }
-    },
-    // 树权限（展开/折叠）
-    handleCheckedTreeExpand(value, type) {
-      if (type == 'menu') {
-        let treeList = this.menuOptions;
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
-        }
-      } else if (type == 'dept') {
-        let treeList = this.deptOptions;
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
-        }
-      }
-    },
-    // 树权限（全选/全不选）
-    handleCheckedTreeNodeAll(value, type) {
-      if (type == 'menu') {
-        this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
-      } else if (type == 'dept') {
-        this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
-      }
-    },
-    // 树权限（父子联动）
-    handleCheckedTreeConnect(value, type) {
-      if (type == 'menu') {
-        this.form.menuCheckStrictly = value ? true: false;
-      } else if (type == 'dept') {
-        this.form.deptCheckStrictly = value ? true: false;
-      }
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.getMenuTreeselect();
-      this.open = true;
-      this.title = "添加角色";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const roleId = row.roleId || this.ids
-      const roleMenu = this.getRoleMenuTreeselect(roleId);
-      getRole(roleId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.$nextTick(() => {
-          roleMenu.then(res => {
-            let checkedKeys = res.checkedKeys
-            checkedKeys.forEach((v) => {
-              this.$nextTick(()=>{
-                this.$refs.menu.setChecked(v, true ,false);
-              })
+    methods: {
+        handleBack() {
+            this.$router.replace('/claimAndRefund/receive/receiveManage')
+        },
+        /** 查询角色列表 */
+        getList() {
+            this.loading = true
+            listRole(this.addDateRange(this.queryParams, this.dateRange)).then(
+                (response) => {
+                    this.roleList = response.rows
+                    this.total = response.total
+                    this.loading = false
+                },
+            )
+        },
+        /** 查询菜单树结构 */
+        getMenuTreeselect() {
+            menuTreeselect().then((response) => {
+                this.menuOptions = response.data
             })
-          });
-        });
-        this.title = "修改角色";
-      });
+        },
+        // 所有菜单节点数据
+        getMenuAllCheckedKeys() {
+            // 目前被选中的菜单节点
+            let checkedKeys = this.$refs.menu.getCheckedKeys()
+            // 半选中的菜单节点
+            let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys()
+            checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
+            return checkedKeys
+        },
+        // 所有部门节点数据
+        getDeptAllCheckedKeys() {
+            // 目前被选中的部门节点
+            let checkedKeys = this.$refs.dept.getCheckedKeys()
+            // 半选中的部门节点
+            let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys()
+            checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
+            return checkedKeys
+        },
+        /** 根据角色ID查询菜单树结构 */
+        getRoleMenuTreeselect(roleId) {
+            return roleMenuTreeselect(roleId).then((response) => {
+                this.menuOptions = response.menus
+                return response
+            })
+        },
+        /** 根据角色ID查询部门树结构 */
+        getDeptTree(roleId) {
+            return deptTreeSelect(roleId).then((response) => {
+                this.deptOptions = response.depts
+                return response
+            })
+        },
+        // 角色状态修改
+        handleStatusChange(row) {
+            let text = row.status === '0' ? '启用' : '停用'
+            this.$modal
+                .confirm('确认要"' + text + '""' + row.roleName + '"角色吗？')
+                .then(function () {
+                    return changeRoleStatus(row.roleId, row.status)
+                })
+                .then(() => {
+                    this.$modal.msgSuccess(text + '成功')
+                })
+                .catch(function () {
+                    row.status = row.status === '0' ? '1' : '0'
+                })
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 取消按钮（数据权限）
+        cancelDataScope() {
+            this.openDataScope = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            if (this.$refs.menu != undefined) {
+                this.$refs.menu.setCheckedKeys([])
+            }
+            ;(this.menuExpand = false),
+                (this.menuNodeAll = false),
+                (this.deptExpand = true),
+                (this.deptNodeAll = false),
+                (this.form = {
+                    roleId: undefined,
+                    roleName: undefined,
+                    roleKey: undefined,
+                    roleSort: 0,
+                    status: '0',
+                    menuIds: [],
+                    deptIds: [],
+                    menuCheckStrictly: true,
+                    deptCheckStrictly: true,
+                    remark: undefined,
+                })
+            this.resetForm('form')
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.dateRange = []
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item.roleId)
+            this.single = selection.length != 1
+            this.multiple = !selection.length
+        },
+        // 更多操作触发
+        handleCommand(command, row) {
+            switch (command) {
+                case 'handleDataScope':
+                    this.handleDataScope(row)
+                    break
+                case 'handleAuthUser':
+                    this.handleAuthUser(row)
+                    break
+                default:
+                    break
+            }
+        },
+        // 树权限（展开/折叠）
+        handleCheckedTreeExpand(value, type) {
+            if (type == 'menu') {
+                let treeList = this.menuOptions
+                for (let i = 0; i < treeList.length; i++) {
+                    this.$refs.menu.store.nodesMap[treeList[i].id].expanded =
+                        value
+                }
+            } else if (type == 'dept') {
+                let treeList = this.deptOptions
+                for (let i = 0; i < treeList.length; i++) {
+                    this.$refs.dept.store.nodesMap[treeList[i].id].expanded =
+                        value
+                }
+            }
+        },
+        // 树权限（全选/全不选）
+        handleCheckedTreeNodeAll(value, type) {
+            if (type == 'menu') {
+                this.$refs.menu.setCheckedNodes(value ? this.menuOptions : [])
+            } else if (type == 'dept') {
+                this.$refs.dept.setCheckedNodes(value ? this.deptOptions : [])
+            }
+        },
+        // 树权限（父子联动）
+        handleCheckedTreeConnect(value, type) {
+            if (type == 'menu') {
+                this.form.menuCheckStrictly = value ? true : false
+            } else if (type == 'dept') {
+                this.form.deptCheckStrictly = value ? true : false
+            }
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset()
+            this.getMenuTreeselect()
+            this.open = true
+            this.title = '添加角色'
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset()
+            const roleId = row.roleId || this.ids
+            const roleMenu = this.getRoleMenuTreeselect(roleId)
+            getRole(roleId).then((response) => {
+                this.form = response.data
+                this.open = true
+                this.$nextTick(() => {
+                    roleMenu.then((res) => {
+                        let checkedKeys = res.checkedKeys
+                        checkedKeys.forEach((v) => {
+                            this.$nextTick(() => {
+                                this.$refs.menu.setChecked(v, true, false)
+                            })
+                        })
+                    })
+                })
+                this.title = '修改角色'
+            })
+        },
+        /** 选择角色权限范围触发 */
+        dataScopeSelectChange(value) {
+            if (value !== '2') {
+                this.$refs.dept.setCheckedKeys([])
+            }
+        },
+        /** 分配数据权限操作 */
+        handleDataScope(row) {
+            this.reset()
+            const deptTreeSelect = this.getDeptTree(row.roleId)
+            getRole(row.roleId).then((response) => {
+                this.form = response.data
+                this.openDataScope = true
+                this.$nextTick(() => {
+                    deptTreeSelect.then((res) => {
+                        this.$refs.dept.setCheckedKeys(res.checkedKeys)
+                    })
+                })
+                this.title = '分配数据权限'
+            })
+        },
+        /** 分配用户操作 */
+        handleAuthUser: function (row) {
+            const roleId = row.roleId
+            this.$router.push('/system/role-auth/user/' + roleId)
+        },
+        /** 提交按钮 */
+        submitForm: function () {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    if (this.form.roleId != undefined) {
+                        this.form.menuIds = this.getMenuAllCheckedKeys()
+                        updateRole(this.form).then((response) => {
+                            this.$modal.msgSuccess('修改成功')
+                            this.open = false
+                            this.getList()
+                        })
+                    } else {
+                        this.form.menuIds = this.getMenuAllCheckedKeys()
+                        addRole(this.form).then((response) => {
+                            this.$modal.msgSuccess('新增成功')
+                            this.open = false
+                            this.getList()
+                        })
+                    }
+                }
+            })
+        },
+        /** 提交按钮（数据权限） */
+        submitDataScope: function () {
+            if (this.form.roleId != undefined) {
+                this.form.deptIds = this.getDeptAllCheckedKeys()
+                dataScope(this.form).then((response) => {
+                    this.$modal.msgSuccess('修改成功')
+                    this.openDataScope = false
+                    this.getList()
+                })
+            }
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const roleIds = row.roleId || this.ids
+            this.$modal
+                .confirm('是否确认删除所选择的数据项？')
+                .then(function () {
+                    return delRole(roleIds)
+                })
+                .then(() => {
+                    this.getList()
+                    this.$modal.msgSuccess('删除成功')
+                })
+                .catch(() => {})
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download(
+                'system/role/export',
+                {
+                    ...this.queryParams,
+                },
+                `role_${new Date().getTime()}.xlsx`,
+            )
+        },
     },
-    /** 选择角色权限范围触发 */
-    dataScopeSelectChange(value) {
-      if(value !== '2') {
-        this.$refs.dept.setCheckedKeys([]);
-      }
-    },
-    /** 分配数据权限操作 */
-    handleDataScope(row) {
-      this.reset();
-      const deptTreeSelect = this.getDeptTree(row.roleId);
-      getRole(row.roleId).then(response => {
-        this.form = response.data;
-        this.openDataScope = true;
-        this.$nextTick(() => {
-          deptTreeSelect.then(res => {
-            this.$refs.dept.setCheckedKeys(res.checkedKeys);
-          });
-        });
-        this.title = "分配数据权限";
-      });
-    },
-    /** 分配用户操作 */
-    handleAuthUser: function(row) {
-      const roleId = row.roleId;
-      this.$router.push("/system/role-auth/user/" + roleId);
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.roleId != undefined) {
-            this.form.menuIds = this.getMenuAllCheckedKeys();
-            updateRole(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            this.form.menuIds = this.getMenuAllCheckedKeys();
-            addRole(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 提交按钮（数据权限） */
-    submitDataScope: function() {
-      if (this.form.roleId != undefined) {
-        this.form.deptIds = this.getDeptAllCheckedKeys();
-        dataScope(this.form).then(response => {
-          this.$modal.msgSuccess("修改成功");
-          this.openDataScope = false;
-          this.getList();
-        });
-      }
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const roleIds = row.roleId || this.ids;
-      this.$modal.confirm('是否确认删除所选择的数据项？').then(function() {
-        return delRole(roleIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/role/export', {
-        ...this.queryParams
-      }, `role_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
+}
 </script>
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
index 5567cd72..4fb11302 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
@@ -105,7 +105,7 @@
                 width="80"
                 type="index"
             >
-                <template scope="scope">
+                <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
@@ -400,7 +400,7 @@
                     width="80"
                     type="index"
                 >
-                    <template scope="scope">
+                    <template slot-scope="scope">
                         <span>{{
                             (outQuery.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
index 65fb8a3f..6f02888b 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
@@ -446,7 +446,7 @@
                     width="80"
                     type="index"
                 >
-                    <template scope="scope">
+                    <template slot-scope="scope">
                         <span>{{
                             (dialogQueryParams.pageNum - 1) * 10 +
                             scope.$index +
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue
index 1f2c3739..3f61501e 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue
@@ -449,7 +449,7 @@
                     width="80"
                     type="index"
                 >
-                    <template scope="scope">
+                    <template slot-scope="scope">
                         <span>{{
                             (dialogQueryParams.pageNum - 1) * 10 +
                             scope.$index +
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
index 8aa3b8ff..37c9420a 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
@@ -438,7 +438,7 @@
                     width="80"
                     type="index"
                 >
-                    <template scope="scope">
+                    <template slot-scope="scope">
                         <span>{{
                             (dialogQueryParams.pageNum - 1) * 10 +
                             scope.$index +
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue b/sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue
index e05d5bc3..0d8e3826 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue
@@ -123,9 +123,16 @@
             @selection-change="handleSelectionChange"
         >
             <el-table-column type="selection" width="55" align="center" />
-            <el-table-column label="序号" align="center" width="80" type="index">
-                <template scope="scope">
-                <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
+            <el-table-column
+                label="序号"
+                align="center"
+                width="80"
+                type="index"
+            >
+                <template slot-scope="scope">
+                    <span>{{
+                        (queryParams.pageNum - 1) * 10 + scope.$index + 1
+                    }}</span>
                 </template>
             </el-table-column>
             <el-table-column
@@ -422,249 +429,249 @@
 </template>
 
 <script>
-    import {
-        listType,
-        getType,
-        delType,
-        addType,
-        updateType,
-        refreshCache,
-    } from '@/api/system/dict/type'
-    import dialogForm from './dialogForm.vue'
-    export default {
-        components: { dialogForm },
-        name: 'ReturnFinshed',
-        dicts: ['sys_normal_disable'],
-        data() {
-            return {
-                fullscreenLoading: false,
-                openOne: false,
-                openTwo: false,
-                openTextOne: '',
-                openTextTwo: '',
-                openTextThree: '',
-                isShowOneFlag: false,
-                // 遮罩层
-                loading: false,
-                // 选中数组
-                ids: [],
-                // 非单个禁用
-                single: true,
-                // 非多个禁用
-                multiple: true,
-                // 显示搜索条件
-                showSearch: true,
-                // 总条数
-                total: 0,
-                // 字典表格数据
-                typeList: [],
-                // 弹出层标题
-                title: '',
-                // 是否显示弹出层
-                open: false,
-                // 日期范围
-                dateRange: [],
-                // 查询参数
-                queryParams: {
-                    pageNum: 1,
-                    pageSize: 10,
-                    dictName: undefined,
-                    dictType: undefined,
-                    status: undefined,
-                    keyWord: '',
-                    unitName: '',
-                    proName: '',
-                    maType: '',
-                    agreementId: '',
-                    status: '',
-                    sTime: '',
-                },
-                // 表单参数
-                form: {},
-                // 表单校验
-                rules: {
-                    dictName: [
-                        {
-                            required: true,
-                            message: '字典名称不能为空',
-                            trigger: 'blur',
-                        },
-                    ],
-                    dictType: [
-                        {
-                            required: true,
-                            message: '字典类型不能为空',
-                            trigger: 'blur',
-                        },
-                    ],
-                },
+import {
+    listType,
+    getType,
+    delType,
+    addType,
+    updateType,
+    refreshCache,
+} from '@/api/system/dict/type'
+import dialogForm from './dialogForm.vue'
+export default {
+    components: { dialogForm },
+    name: 'ReturnFinshed',
+    dicts: ['sys_normal_disable'],
+    data() {
+        return {
+            fullscreenLoading: false,
+            openOne: false,
+            openTwo: false,
+            openTextOne: '',
+            openTextTwo: '',
+            openTextThree: '',
+            isShowOneFlag: false,
+            // 遮罩层
+            loading: false,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 字典表格数据
+            typeList: [],
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            // 日期范围
+            dateRange: [],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                dictName: undefined,
+                dictType: undefined,
+                status: undefined,
+                keyWord: '',
+                unitName: '',
+                proName: '',
+                maType: '',
+                agreementId: '',
+                status: '',
+                sTime: '',
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+                dictName: [
+                    {
+                        required: true,
+                        message: '字典名称不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                dictType: [
+                    {
+                        required: true,
+                        message: '字典类型不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+            },
+        }
+    },
+    created() {
+        // this.getList();
+    },
+    methods: {
+        /** 查询字典类型列表 */
+        getList() {
+            this.loading = true
+            // listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+            //   this.typeList = response.rows;
+            //   this.total = response.total;
+            this.loading = false
+            // }
+            // );
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                dictId: undefined,
+                dictName: undefined,
+                dictType: undefined,
+                status: '0',
+                remark: undefined,
             }
+            this.resetForm('form')
         },
-        created() {
-            // this.getList();
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
         },
-        methods: {
-            /** 查询字典类型列表 */
-            getList() {
-                this.loading = true
-                // listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-                //   this.typeList = response.rows;
-                //   this.total = response.total;
-                this.loading = false
-                // }
-                // );
-            },
-            // 取消按钮
-            cancel() {
-                this.open = false
-                this.reset()
-            },
-            // 表单重置
-            reset() {
-                this.form = {
-                    dictId: undefined,
-                    dictName: undefined,
-                    dictType: undefined,
-                    status: '0',
-                    remark: undefined,
-                }
-                this.resetForm('form')
-            },
-            /** 搜索按钮操作 */
-            handleQuery() {
-                this.queryParams.pageNum = 1
-                this.getList()
-            },
-            /** 重置按钮操作 */
-            resetQuery() {
-                this.dateRange = []
-                this.resetForm('queryForm')
-                this.handleQuery()
-            },
-            /** 新增按钮操作 */
-            handleAdd() {
-                this.reset()
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.dateRange = []
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset()
+            this.open = true
+            this.title = '计划借调'
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item.dictId)
+            this.single = selection.length != 1
+            this.multiple = !selection.length
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset()
+            const dictId = row.dictId || this.ids
+            getType(dictId).then((response) => {
+                this.form = response.data
                 this.open = true
-                this.title = '计划借调'
-            },
-            // 多选框选中数据
-            handleSelectionChange(selection) {
-                this.ids = selection.map((item) => item.dictId)
-                this.single = selection.length != 1
-                this.multiple = !selection.length
-            },
-            /** 修改按钮操作 */
-            handleUpdate(row) {
-                this.reset()
-                const dictId = row.dictId || this.ids
-                getType(dictId).then((response) => {
-                    this.form = response.data
-                    this.open = true
-                    this.title = '修改'
-                })
-            },
-            // 退料单
-            handleUpdateOrder() {
-                this.title = '查看'
-                this.isShowOneFlag = true
-            },
-            // 完成退料
-            handleFinish() {
-                // this.title = "确认操作";
-                // this.openTextOne = "确认完成退料么?";
-                // this.openTextTwo = "确认完成退料么?";
-                // this.openOne = true
-            },
-            submitOpenOneForm() {
-                this.openTextThree = '完成退料成功！'
-                this.openTwo = true
-            },
-            /** 提交按钮 */
-            submitForm: function () {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        if (this.form.dictId != undefined) {
-                            updateType(this.form).then((response) => {
-                                this.$modal.msgSuccess('修改成功')
-                                this.open = false
-                                this.getList()
-                            })
-                        } else {
-                            addType(this.form).then((response) => {
-                                this.$modal.msgSuccess('新增成功')
-                                this.open = false
-                                this.getList()
-                            })
-                        }
-                    }
-                })
-            },
-            /** 删除按钮操作 */
-            handleDelete(row) {
-                const dictIds = row.dictId || this.ids
-                this.$modal
-                    .confirm('是否确认删除所选择的数据项？')
-                    .then(function () {
-                        return delType(dictIds)
-                    })
-                    .then(() => {
-                        this.getList()
-                        this.$modal.msgSuccess('删除成功')
-                    })
-                    .catch(() => {})
-            },
-            /** 导出按钮操作 */
-            handleExport() {
-                // this.download('system/dict/type/export', {
-                //   ...this.queryParams
-                // }, `type_${new Date().getTime()}.xlsx`)
-            },
-            /** 刷新缓存按钮操作 */
-            handleRefreshCache() {
-                refreshCache().then(() => {
-                    this.$modal.msgSuccess('刷新成功')
-                    this.$store.dispatch('dict/cleanDict')
-                })
-            },
+                this.title = '修改'
+            })
         },
-    }
+        // 退料单
+        handleUpdateOrder() {
+            this.title = '查看'
+            this.isShowOneFlag = true
+        },
+        // 完成退料
+        handleFinish() {
+            // this.title = "确认操作";
+            // this.openTextOne = "确认完成退料么?";
+            // this.openTextTwo = "确认完成退料么?";
+            // this.openOne = true
+        },
+        submitOpenOneForm() {
+            this.openTextThree = '完成退料成功！'
+            this.openTwo = true
+        },
+        /** 提交按钮 */
+        submitForm: function () {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    if (this.form.dictId != undefined) {
+                        updateType(this.form).then((response) => {
+                            this.$modal.msgSuccess('修改成功')
+                            this.open = false
+                            this.getList()
+                        })
+                    } else {
+                        addType(this.form).then((response) => {
+                            this.$modal.msgSuccess('新增成功')
+                            this.open = false
+                            this.getList()
+                        })
+                    }
+                }
+            })
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const dictIds = row.dictId || this.ids
+            this.$modal
+                .confirm('是否确认删除所选择的数据项？')
+                .then(function () {
+                    return delType(dictIds)
+                })
+                .then(() => {
+                    this.getList()
+                    this.$modal.msgSuccess('删除成功')
+                })
+                .catch(() => {})
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            // this.download('system/dict/type/export', {
+            //   ...this.queryParams
+            // }, `type_${new Date().getTime()}.xlsx`)
+        },
+        /** 刷新缓存按钮操作 */
+        handleRefreshCache() {
+            refreshCache().then(() => {
+                this.$modal.msgSuccess('刷新成功')
+                this.$store.dispatch('dict/cleanDict')
+            })
+        },
+    },
+}
 </script>
 <style lang="scss" scoped>
-    .submit_box {
+.submit_box {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+
+    .submit_box_title {
         display: flex;
-        justify-content: flex-start;
-        align-items: center;
+        flex-direction: column;
+        margin-left: 15px;
 
-        .submit_box_title {
-            display: flex;
-            flex-direction: column;
-            margin-left: 15px;
-
-            :first-child {
-                font-size: 14px;
-                font-weight: 600;
-            }
-
-            :last-child {
-                margin-top: 6px;
-                font-size: 12px;
-            }
-        }
-    }
-
-    .submit_box_two {
-        display: flex;
-        flex-direction: row;
-        flex-wrap: nowrap;
-        align-items: center;
-        margin-left: 30%;
-
-        .submit_box_title {
-            display: flex;
-            flex-direction: column;
-            margin-left: 10px;
-            font-size: 18px;
+        :first-child {
+            font-size: 14px;
             font-weight: 600;
         }
+
+        :last-child {
+            margin-top: 6px;
+            font-size: 12px;
+        }
     }
+}
+
+.submit_box_two {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    align-items: center;
+    margin-left: 30%;
+
+    .submit_box_title {
+        display: flex;
+        flex-direction: column;
+        margin-left: 10px;
+        font-size: 18px;
+        font-weight: 600;
+    }
+}
 </style>
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
index 1b4ef023..ceeeef6f 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
@@ -88,7 +88,7 @@
                 width="80"
                 type="index"
             >
-                <template scope="scope">
+                <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
@@ -317,7 +317,7 @@
                     width="80"
                     type="index"
                 >
-                    <template scope="scope">
+                    <template slot-scope="scope">
                         <span>{{
                             (codeQuery.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
index b243b090..2f0a808c 100644
--- a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
+++ b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
@@ -461,7 +461,7 @@
                     width="80"
                     type="index"
                 >
-                    <template scope="scope">
+                    <template slot-scope="scope">
                         <span>{{
                             (dialogQuery.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/component/home1.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/component/home1.vue
index 29e726b9..3ef34a29 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/apply/component/home1.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/apply/component/home1.vue
@@ -451,7 +451,7 @@
                     width="80"
                     type="index"
                 >
-                    <template scope="scope">
+                    <template slot-scope="scope">
                         <span>{{
                             (dialogQueryParams.pageNum - 1) * 10 +
                             scope.$index +
diff --git a/sgzb-ui/src/views/index.vue b/sgzb-ui/src/views/index.vue
index 560fd09d..9ae1c758 100644
--- a/sgzb-ui/src/views/index.vue
+++ b/sgzb-ui/src/views/index.vue
@@ -135,7 +135,7 @@
                 width="80"
                 type="index"
             >
-                <template scope="scope">
+                <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
@@ -263,187 +263,187 @@
 </template>
 
 <script>
-    import {
-        getToDoList,
-        getTaskTypeList,
-        getToPersonInfoAp,
-        sendUrgingMessageApi,
-    } from '@/api/index'
-    export default {
-        name: 'myIndex',
-        data() {
-            return {
-                // 遮罩层
-                loading: false,
-                // 显示搜索条件
-                showSearch: true,
-                // 总条数
-                total: 0,
-                // 字典表格数据
-                typeList: [],
-                // 日期范围
-                dateRange: [],
-                taskTypeList: [],
-                // 查询参数
-                queryParams: {
-                    pageNum: 1,
-                    pageSize: 10,
-                    keyWord: '',
-                    taskCode: '',
-                    taskTypeId: '',
-                },
+import {
+    getToDoList,
+    getTaskTypeList,
+    getToPersonInfoAp,
+    sendUrgingMessageApi,
+} from '@/api/index'
+export default {
+    name: 'myIndex',
+    data() {
+        return {
+            // 遮罩层
+            loading: false,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 字典表格数据
+            typeList: [],
+            // 日期范围
+            dateRange: [],
+            taskTypeList: [],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                keyWord: '',
+                taskCode: '',
+                taskTypeId: '',
+            },
 
-                /* 列表查看跳转的路由地址 */
-                previewRouterList: [
-                    /* 新购任务 */
-                    {
-                        taskTypeId: 23,
-                        routerPath: 'store/newBuy/newDevicesList',
-                    },
-                    /* 领料任务 */
-                    {
-                        taskTypeId: 29,
-                        routerPath: 'claimAndRefund/receive/receiveManage',
-                    },
-                    /* 退料任务 */
-                    {
-                        taskTypeId: 36,
-                        routerPath: 'claimAndRefund/return/returnApply',
-                    },
-                    /* 维修任务 */
-                    {
-                        taskTypeId: 41,
-                        routerPath: 'repairTest/repair/repair',
-                    },
-                ],
-
-                /* 催办弹框 */
-                urgingDialogVisible: false,
-                /* 待办人信息 */
-                toPersonInfo: [],
-                /* 发送参数 */
-                sendMessageParams: {
-                    taskId: '',
-                    message: '',
-                    // 接收人
-                    bmNoticeInfoList: [],
+            /* 列表查看跳转的路由地址 */
+            previewRouterList: [
+                /* 新购任务 */
+                {
+                    taskTypeId: 23,
+                    routerPath: 'store/newBuy/newDevicesList',
                 },
+                /* 领料任务 */
+                {
+                    taskTypeId: 29,
+                    routerPath: 'claimAndRefund/receive/receiveManage',
+                },
+                /* 退料任务 */
+                {
+                    taskTypeId: 36,
+                    routerPath: 'claimAndRefund/return/returnApply',
+                },
+                /* 维修任务 */
+                {
+                    taskTypeId: 41,
+                    routerPath: 'repairTest/repair/repair',
+                },
+            ],
+
+            /* 催办弹框 */
+            urgingDialogVisible: false,
+            /* 待办人信息 */
+            toPersonInfo: [],
+            /* 发送参数 */
+            sendMessageParams: {
+                taskId: '',
+                message: '',
+                // 接收人
+                bmNoticeInfoList: [],
+            },
+        }
+    },
+    created() {
+        this.getList()
+        this.getTaskTypeList()
+    },
+    methods: {
+        getTaskTypeList() {
+            getTaskTypeList().then((response) => {
+                this.taskTypeList = response.data
+            })
+        },
+        /** 查询字典类型列表 */
+        getList() {
+            this.loading = true
+            console.log(this.dateRange)
+            if (this.dateRange && this.dateRange.length > 0) {
+                this.queryParams.startTime = this.dateRange[0]
+                this.queryParams.endTime = this.dateRange[1]
+            } else {
+                this.queryParams.startTime = ''
+                this.queryParams.endTime = ''
             }
+            getToDoList(this.queryParams).then((response) => {
+                this.typeList = response.rows
+                this.total = response.total
+                this.loading = false
+            })
         },
-        created() {
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
             this.getList()
-            this.getTaskTypeList()
         },
-        methods: {
-            getTaskTypeList() {
-                getTaskTypeList().then((response) => {
-                    this.taskTypeList = response.data
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.dateRange = []
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+
+        /**
+         * 列表查看操作===========================================================
+         */
+        handlePreview(id, key) {
+            const [routerInfo] = this.previewRouterList.filter(
+                (e) => e.taskTypeId == id,
+            )
+            this.$router.push({
+                path: routerInfo.routerPath,
+                query: {
+                    keyWord: key,
+                },
+            })
+        },
+
+        /* 催办按钮 */
+        async handleUrging(id, taskCode, taskStatus, taskId) {
+            /* 先获取催办人信息 */
+            const { data: res } = await getToPersonInfoAp({
+                taskStatus,
+            })
+            res.map((e) => {
+                this.toPersonInfo.push({
+                    noticeUser: e.userId,
+                    phone: e.phonenumber,
+                    modelName: '领料催办',
+                    companyId: e.companyId,
+                    v_name: e.nickName,
                 })
-            },
-            /** 查询字典类型列表 */
-            getList() {
-                this.loading = true
-                console.log(this.dateRange)
-                if (this.dateRange && this.dateRange.length > 0) {
-                    this.queryParams.startTime = this.dateRange[0]
-                    this.queryParams.endTime = this.dateRange[1]
-                } else {
-                    this.queryParams.startTime = ''
-                    this.queryParams.endTime = ''
-                }
-                getToDoList(this.queryParams).then((response) => {
-                    this.typeList = response.rows
-                    this.total = response.total
-                    this.loading = false
-                })
-            },
-            /** 搜索按钮操作 */
-            handleQuery() {
-                this.queryParams.pageNum = 1
-                this.getList()
-            },
-            /** 重置按钮操作 */
-            resetQuery() {
-                this.dateRange = []
-                this.resetForm('queryForm')
-                this.handleQuery()
-            },
+            })
 
-            /**
-             * 列表查看操作===========================================================
-             */
-            handlePreview(id, key) {
-                const [routerInfo] = this.previewRouterList.filter(
-                    (e) => e.taskTypeId == id,
-                )
-                this.$router.push({
-                    path: routerInfo.routerPath,
-                    query: {
-                        keyWord: key,
-                    },
-                })
-            },
+            this.sendMessageParams.message = `宁夏送变电工程有限公司提示：您有一条任务单号为 <span style="color:#529b2e">${taskCode}</span> 的待办任务未处理，请及时处理。`
+            this.sendMessageParams.taskId = taskId
 
-            /* 催办按钮 */
-            async handleUrging(id, taskCode, taskStatus, taskId) {
-                /* 先获取催办人信息 */
-                const { data: res } = await getToPersonInfoAp({
-                    taskStatus,
-                })
-                res.map((e) => {
-                    this.toPersonInfo.push({
-                        noticeUser: e.userId,
-                        phone: e.phonenumber,
-                        modelName: '领料催办',
-                        companyId: e.companyId,
-                        v_name: e.nickName,
-                    })
-                })
+            this.urgingDialogVisible = true
+        },
 
-                this.sendMessageParams.message = `宁夏送变电工程有限公司提示：您有一条任务单号为 <span style="color:#529b2e">${taskCode}</span> 的待办任务未处理，请及时处理。`
-                this.sendMessageParams.taskId = taskId
+        /* 取消其中某一个待办人 */
+        handleDeleteToPerson(v) {
+            this.toPersonInfo.splice(v, 1)
+        },
 
-                this.urgingDialogVisible = true
-            },
-
-            /* 取消其中某一个待办人 */
-            handleDeleteToPerson(v) {
-                this.toPersonInfo.splice(v, 1)
-            },
-
-            /* 催办发送 */
-            async submitForm() {
-                this.sendMessageParams.bmNoticeInfoList = this.toPersonInfo
-                const res = await sendUrgingMessageApi(this.sendMessageParams)
-                if (res.code == 200) {
-                    this.$message.success('发送成功！')
-                    this.toPersonInfo = []
-                    this.urgingDialogVisible = false
-                } else {
-                    this.$message.error(res.msg)
-                }
-            },
-            /* 弹框右上角关闭按钮 */
-            handleCloseUrgingDialog() {
+        /* 催办发送 */
+        async submitForm() {
+            this.sendMessageParams.bmNoticeInfoList = this.toPersonInfo
+            const res = await sendUrgingMessageApi(this.sendMessageParams)
+            if (res.code == 200) {
+                this.$message.success('发送成功！')
                 this.toPersonInfo = []
                 this.urgingDialogVisible = false
-            },
+            } else {
+                this.$message.error(res.msg)
+            }
         },
-    }
+        /* 弹框右上角关闭按钮 */
+        handleCloseUrgingDialog() {
+            this.toPersonInfo = []
+            this.urgingDialogVisible = false
+        },
+    },
+}
 </script>
 
 <style scoped>
-    .message-info {
-        height: 100px;
-        padding: 0 10px;
-        border: 1px solid #ccc;
-        letter-spacing: 1px;
-        border-radius: 3px;
-        font-size: 16px;
-        font-weight: bold;
-    }
+.message-info {
+    height: 100px;
+    padding: 0 10px;
+    border: 1px solid #ccc;
+    letter-spacing: 1px;
+    border-radius: 3px;
+    font-size: 16px;
+    font-weight: bold;
+}
 
-    .addressee {
-        margin-left: 3px;
-    }
+.addressee {
+    margin-left: 3px;
+}
 </style>
diff --git a/sgzb-ui/src/views/login.vue b/sgzb-ui/src/views/login.vue
index be4ce030..d54f1621 100644
--- a/sgzb-ui/src/views/login.vue
+++ b/sgzb-ui/src/views/login.vue
@@ -1,124 +1,194 @@
 <template>
-  <div class="login">
-    <div class="login-bar">
-      <div class="form-bar">
-        <h3 class="title">智慧仓储管理平台</h3>
-        <el-tabs v-model="activeName" style="width: 82%; margin: 0 auto">
-          <el-tab-pane label="账号登录" name="account"></el-tab-pane>
-          <el-tab-pane label="手机登录" name="phone"></el-tab-pane>
-        </el-tabs>
-        <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-          <el-form-item prop="username" v-if="activeName == 'account'">
-            <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
-              <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
-            </el-input>
-          </el-form-item>
-          <el-form-item prop="password" v-if="activeName == 'account'">
-            <el-input
-              v-model="loginForm.password"
-              type="password"
-              auto-complete="off"
-              placeholder="密码"
-              show-password
-              @keyup.enter.native="handleLogin"
-            >
-              <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
-            </el-input>
-          </el-form-item>
-          <el-form-item prop="code" v-if="captchaEnabled && activeName == 'account'">
-            <el-input
-              v-model="loginForm.code"
-              auto-complete="off"
-              placeholder="验证码"
-              style="width: 63%"
-              @keyup.enter.native="handleLogin"
-            >
-              <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
-            </el-input>
-            <div class="login-code">
-              <img :src="codeUrl" @click="getCode" class="login-code-img" />
-            </div>
-          </el-form-item>
-          <el-form-item style="width: 100%" v-if="activeName == 'account'">
-            <el-button
-              :loading="loading"
-              size="medium"
-              type="primary"
-              style="width: 100%"
-              @click.native.prevent="handleLogin"
-            >
-              <span v-if="!loading">登 录</span>
-              <span v-else>登 录 中...</span>
-            </el-button>
-            <div style="float: right" v-if="register">
-              <!--          <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>-->
-              <router-link class="link-type" :to="'/register'">立即注册</router-link>
-            </div>
-          </el-form-item>
+    <div class="login">
+        <div class="login-bar">
+            <div class="form-bar">
+                <h3 class="title">智慧仓储管理平台</h3>
+                <el-tabs
+                    v-model="activeName"
+                    style="width: 82%; margin: 0 auto"
+                >
+                    <el-tab-pane label="账号登录" name="account"></el-tab-pane>
+                    <el-tab-pane label="手机登录" name="phone"></el-tab-pane>
+                </el-tabs>
+                <el-form
+                    ref="loginForm"
+                    :model="loginForm"
+                    :rules="loginRules"
+                    class="login-form"
+                >
+                    <el-form-item
+                        prop="username"
+                        v-if="activeName == 'account'"
+                    >
+                        <el-input
+                            v-model="loginForm.username"
+                            type="text"
+                            auto-complete="off"
+                            placeholder="账号"
+                        >
+                            <svg-icon
+                                slot="prefix"
+                                icon-class="user"
+                                class="el-input__icon input-icon"
+                            />
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item
+                        prop="password"
+                        v-if="activeName == 'account'"
+                    >
+                        <el-input
+                            v-model="loginForm.password"
+                            type="password"
+                            auto-complete="off"
+                            placeholder="密码"
+                            show-password
+                            @keyup.enter.native="handleLogin"
+                        >
+                            <svg-icon
+                                slot="prefix"
+                                icon-class="password"
+                                class="el-input__icon input-icon"
+                            />
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item
+                        prop="code"
+                        v-if="captchaEnabled && activeName == 'account'"
+                        class="code-box"
+                    >
+                        <el-input
+                            v-model="loginForm.code"
+                            auto-complete="off"
+                            placeholder="图形验证码"
+                            style="width: 65%"
+                            @keyup.enter.native="handleLogin"
+                        >
+                            <svg-icon
+                                slot="prefix"
+                                icon-class="validCode"
+                                class="el-input__icon input-icon"
+                            />
+                        </el-input>
+                        <div class="login-code">
+                            <img
+                                :src="codeUrl"
+                                @click="getCode"
+                                class="login-code-img"
+                            />
+                        </div>
+                    </el-form-item>
+                    <el-form-item
+                        style="width: 100%"
+                        v-if="activeName == 'account'"
+                    >
+                        <el-button
+                            :loading="loading"
+                            size="medium"
+                            type="primary"
+                            style="width: 100%"
+                            @click.native.prevent="handleLogin"
+                        >
+                            <span v-if="!loading">登 录</span>
+                            <span v-else>登 录 中...</span>
+                        </el-button>
+                        <div style="float: right" v-if="register">
+                            <!--          <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>-->
+                            <router-link class="link-type" :to="'/register'"
+                                >立即注册</router-link
+                            >
+                        </div>
+                    </el-form-item>
 
-          <el-form-item prop="phone" v-if="activeName == 'phone'">
-            <el-input
-              v-model="loginForm.phone"
-              type="text"
-              :readonly="readonlyFlag"
-              @focus="handleInputClick"
-              auto-complete="off"
-              placeholder="手机号"
-            >
-              <svg-icon slot="prefix" icon-class="phone" class="el-input__icon input-icon" />
-            </el-input>
-          </el-form-item>
-          <el-form-item prop="textCode" v-if="activeName == 'phone'">
-            <el-input v-model="loginForm.textCode" auto-complete="off" placeholder="验证码" style="width: 63%">
-              <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
-            </el-input>
-            <div class="login-code">
-              <!-- <div class="login-code-img" style="border: 1px solid rgb(220, 223, 230);" @click="getTextCode">获取验证码</div> -->
-              <div
-                class="login-code-img"
-                style="border: 1px solid rgb(220, 223, 230)"
-                v-show="show === 1"
-                @click="getTextCode"
-              >
-                获取验证码
-              </div>
-              <div class="login-code-img" style="border: 1px solid rgb(220, 223, 230)" v-show="show === 2">
-                {{ count }} s
-              </div>
-              <div
-                class="login-code-img"
-                style="border: 1px solid rgb(220, 223, 230)"
-                v-show="show === 3"
-                @click="getTextCode"
-              >
-                重发
-              </div>
+                    <el-form-item prop="phone" v-if="activeName == 'phone'">
+                        <el-input
+                            v-model="loginForm.phone"
+                            type="text"
+                            :readonly="readonlyFlag"
+                            @focus="handleInputClick"
+                            auto-complete="off"
+                            placeholder="手机号"
+                        >
+                            <svg-icon
+                                slot="prefix"
+                                icon-class="phone"
+                                class="el-input__icon input-icon"
+                            />
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item
+                        prop="textCode"
+                        v-if="activeName == 'phone'"
+                        class="code-box"
+                    >
+                        <el-input
+                            v-model="loginForm.textCode"
+                            auto-complete="off"
+                            placeholder="短信验证码"
+                            style="width: 65%"
+                        >
+                            <svg-icon
+                                slot="prefix"
+                                icon-class="validCode"
+                                class="el-input__icon input-icon"
+                            />
+                        </el-input>
+                        <div class="login-code">
+                            <!-- <div class="login-code-img" style="border: 1px solid rgb(220, 223, 230);" @click="getTextCode">获取验证码</div> -->
+                            <div
+                                class="login-code-img"
+                                style="border: 1px solid rgb(220, 223, 230)"
+                                v-show="show === 1"
+                                @click="getTextCode"
+                            >
+                                获取验证码
+                            </div>
+                            <div
+                                class="login-code-img"
+                                style="border: 1px solid rgb(220, 223, 230)"
+                                v-show="show === 2"
+                            >
+                                {{ count }} s
+                            </div>
+                            <div
+                                class="login-code-img"
+                                style="border: 1px solid rgb(220, 223, 230)"
+                                v-show="show === 3"
+                                @click="getTextCode"
+                            >
+                                重发
+                            </div>
+                        </div>
+                    </el-form-item>
+                    <el-form-item
+                        style="width: 100%"
+                        v-if="activeName == 'phone'"
+                    >
+                        <el-button
+                            :loading="loading"
+                            size="medium"
+                            type="primary"
+                            style="width: 100%"
+                            @click.native.prevent="textLogin"
+                        >
+                            <span v-if="!loading">登 录</span>
+                            <span v-else>登 录 中...</span>
+                        </el-button>
+                        <div style="float: right" v-if="register">
+                            <!--          <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>-->
+                            <router-link class="link-type" :to="'/register'"
+                                >立即注册</router-link
+                            >
+                        </div>
+                    </el-form-item>
+                </el-form>
             </div>
-          </el-form-item>
-          <el-form-item style="width: 100%" v-if="activeName == 'phone'">
-            <el-button
-              :loading="loading"
-              size="medium"
-              type="primary"
-              style="width: 100%"
-              @click.native.prevent="textLogin"
-            >
-              <span v-if="!loading">登 录</span>
-              <span v-else>登 录 中...</span>
-            </el-button>
-            <div style="float: right" v-if="register">
-              <!--          <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>-->
-              <router-link class="link-type" :to="'/register'">立即注册</router-link>
-            </div>
-          </el-form-item>
-        </el-form>
-      </div>
+        </div>
+        <!--  底部  -->
+        <div class="el-login-footer">
+            <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
+        </div>
     </div>
-    <!--  底部  -->
-    <div class="el-login-footer">
-      <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
-    </div>
-  </div>
 </template>
 
 <script>
@@ -127,297 +197,366 @@ import Cookies from 'js-cookie'
 import { encrypt, decrypt } from '@/utils/jsencrypt'
 
 export default {
-  name: 'Login',
-  data() {
-    return {
-      codeUrl: '',
-      loginForm: {
-        username: '',
-        password: '',
-        phone: '',
-        rememberMe: false,
-        code: '',
-        uuid: '',
-      },
-      loginRules: {
-        username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }],
-        phone: [{ required: true, trigger: 'blur', message: '请输入您的手机号' }],
-        textCode: [{ required: true, trigger: 'blur', message: '请输入短信验证码' }],
-        password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }],
-        code: [{ required: true, trigger: 'change', message: '请输入验证码' }],
-      },
-      loading: false,
-      // 验证码开关
-      captchaEnabled: true,
-      // 注册开关
-      register: false,
-      redirect: undefined,
-      activeName: 'account',
-      readonlyFlag: true,
-      show: 1,
-      count: '',
-      timer: null,
-      loginParams: {}, //登录页面地址栏参数
-    }
-  },
-  watch: {
-    $route: {
-      handler: function (route) {
-        this.redirect = route.query && route.query.redirect
-        // console.log(this.$route.query.redirect.split("?"))
-        // console.log(this.$route.query.redirect.split("?")[1].split("&"))
-        if (this.$route.query.redirect.split('?').length > 1) {
-          let arr = this.$route.query.redirect.split('?')[1].split('&') || []
-          arr.forEach((item, index) => {
-            this.$set(this.loginParams, item.split('=')[0] + '', item.split('=')[1])
-          })
+    name: 'Login',
+    data() {
+        return {
+            codeUrl: '',
+            loginForm: {
+                username: '',
+                password: '',
+                phone: '',
+                rememberMe: false,
+                code: '',
+                uuid: '',
+            },
+            loginRules: {
+                username: [
+                    {
+                        required: true,
+                        trigger: 'blur',
+                        message: '请输入您的账号',
+                    },
+                ],
+                phone: [
+                    {
+                        required: true,
+                        trigger: 'blur',
+                        message: '请输入您的手机号',
+                    },
+                ],
+                textCode: [
+                    {
+                        required: true,
+                        trigger: 'blur',
+                        message: '请输入短信验证码',
+                    },
+                ],
+                password: [
+                    {
+                        required: true,
+                        trigger: 'blur',
+                        message: '请输入您的密码',
+                    },
+                ],
+                code: [
+                    {
+                        required: true,
+                        trigger: 'change',
+                        message: '请输入验证码',
+                    },
+                ],
+            },
+            loading: false,
+            // 验证码开关
+            captchaEnabled: true,
+            // 注册开关
+            register: false,
+            redirect: undefined,
+            activeName: 'account',
+            readonlyFlag: true,
+            show: 1,
+            count: '',
+            timer: null,
+            loginParams: {}, //登录页面地址栏参数
         }
-      },
-      immediate: true,
     },
-  },
-  created() {
-    // console.log(this.$route.query.redirect.split("?")[1])
-    if (JSON.stringify(this.loginParams) != '{}') {
-      this.jumpLogin()
-    }
-    this.getCode()
-    this.getCookie()
-  },
-  methods: {
-    getCode() {
-      getCodeImg().then(res => {
-        this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled
-        if (this.captchaEnabled) {
-          this.codeUrl = 'data:image/gif;base64,' + res.img
-          this.loginForm.uuid = res.uuid
-        }
-      })
-    },
-    //防止手机号自动充填
-    handleInputClick() {
-      this.readonlyFlag = false
-    },
-    //获取短信验证码
-    getTextCode() {
-      const regExp = /^1[3456789]\d{9}$/
-      if (regExp.test(this.loginForm.phone)) {
-        console.log('手机号格式正确')
-        sendCode({ phone: this.loginForm.phone }).then(res => {
-          if (res.code == 200) {
-            this.$modal.msgSuccess('发送成功')
-            const TIME_COUNT = 60
-            if (!this.timer) {
-              this.count = TIME_COUNT
-              this.show = 2
-              this.timer = setInterval(() => {
-                if (this.count > 0 && this.count <= TIME_COUNT) {
-                  this.count--
-                } else {
-                  this.show = 3
-                  clearInterval(this.timer)
-                  this.timer = null
+    watch: {
+        $route: {
+            handler: function (route) {
+                this.redirect = route.query && route.query.redirect
+                // console.log(this.$route.query.redirect.split("?"))
+                // console.log(this.$route.query.redirect.split("?")[1].split("&"))
+                if (this.$route.query.redirect.split('?').length > 1) {
+                    let arr =
+                        this.$route.query.redirect.split('?')[1].split('&') ||
+                        []
+                    arr.forEach((item, index) => {
+                        this.$set(
+                            this.loginParams,
+                            item.split('=')[0] + '',
+                            item.split('=')[1],
+                        )
+                    })
                 }
-              }, 1000)
+            },
+            immediate: true,
+        },
+    },
+    created() {
+        // console.log(this.$route.query.redirect.split("?")[1])
+        if (JSON.stringify(this.loginParams) != '{}') {
+            this.jumpLogin()
+        }
+        this.getCode()
+        this.getCookie()
+    },
+    methods: {
+        getCode() {
+            getCodeImg().then((res) => {
+                this.captchaEnabled =
+                    res.captchaEnabled === undefined ? true : res.captchaEnabled
+                if (this.captchaEnabled) {
+                    this.codeUrl = 'data:image/gif;base64,' + res.img
+                    this.loginForm.uuid = res.uuid
+                }
+            })
+        },
+        //防止手机号自动充填
+        handleInputClick() {
+            this.readonlyFlag = false
+        },
+        //获取短信验证码
+        getTextCode() {
+            const regExp = /^1[3456789]\d{9}$/
+            if (regExp.test(this.loginForm.phone)) {
+                console.log('手机号格式正确')
+                sendCode({ phone: this.loginForm.phone }).then((res) => {
+                    if (res.code == 200) {
+                        this.$modal.msgSuccess('发送成功')
+                        const TIME_COUNT = 60
+                        if (!this.timer) {
+                            this.count = TIME_COUNT
+                            this.show = 2
+                            this.timer = setInterval(() => {
+                                if (
+                                    this.count > 0 &&
+                                    this.count <= TIME_COUNT
+                                ) {
+                                    this.count--
+                                } else {
+                                    this.show = 3
+                                    clearInterval(this.timer)
+                                    this.timer = null
+                                }
+                            }, 1000)
+                        }
+                    }
+                })
+            } else {
+                this.$modal.msgError('请输入正确手机号')
             }
-          }
-        })
-      } else {
-        this.$modal.msgError('请输入正确手机号')
-      }
-    },
-    //短信登录
-    textLogin() {
-      // checkCode
-      console.log(this.loginForm)
-      this.$refs.loginForm.validate(valid => {
-        if (valid) {
-          this.loading = true
-          if (this.loginForm.rememberMe) {
-            Cookies.set('username', this.loginForm.username, { expires: 30 })
-            Cookies.set('password', encrypt(this.loginForm.password), { expires: 30 })
-            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 })
-          } else {
-            Cookies.remove('username')
-            Cookies.remove('password')
-            Cookies.remove('rememberMe')
-          }
-          console.log(this.loginForm)
-          this.$store
-            .dispatch('textLogin', this.loginForm)
-            .then(() => {
-              this.$router.push({ path: '/' }).catch(() => {})
+        },
+        //短信登录
+        textLogin() {
+            // checkCode
+            console.log(this.loginForm)
+            this.$refs.loginForm.validate((valid) => {
+                if (valid) {
+                    this.loading = true
+                    if (this.loginForm.rememberMe) {
+                        Cookies.set('username', this.loginForm.username, {
+                            expires: 30,
+                        })
+                        Cookies.set(
+                            'password',
+                            encrypt(this.loginForm.password),
+                            { expires: 30 },
+                        )
+                        Cookies.set('rememberMe', this.loginForm.rememberMe, {
+                            expires: 30,
+                        })
+                    } else {
+                        Cookies.remove('username')
+                        Cookies.remove('password')
+                        Cookies.remove('rememberMe')
+                    }
+                    console.log(this.loginForm)
+                    this.$store
+                        .dispatch('textLogin', this.loginForm)
+                        .then(() => {
+                            this.$router.push({ path: '/' }).catch(() => {})
+                        })
+                        .catch(() => {
+                            this.loading = false
+                        })
+                }
             })
-            .catch(() => {
-              this.loading = false
+        },
+        //南网登录
+        jumpLogin() {
+            this.loading = true
+            let param = {
+                token: this.loginParams.token,
+                username: this.loginParams.userName,
+            }
+            // console.log(param)
+            this.$store
+                .dispatch('ssoLogin', param)
+                .then(() => {
+                    //成功后会跳转页面入首页
+                    this.$router.push({ path: '/' }).catch(() => {})
+                })
+                .catch(() => {
+                    this.loading = false
+                    //失败返回南网登录页面
+                    // window.location.replace('https://test-sso.csgmall.com.cn/?client_id=549OWptc&theme=zhgc_storage&response_type=code&redirect_uri=https%3A%2F%2Ftest-cc.zhgkxt.com')
+                })
+        },
+        getCookie() {
+            const username = Cookies.get('username')
+            const password = Cookies.get('password')
+            const rememberMe = Cookies.get('rememberMe')
+            this.loginForm = {
+                username:
+                    username === undefined ? this.loginForm.username : username,
+                password:
+                    password === undefined
+                        ? this.loginForm.password
+                        : decrypt(password),
+                rememberMe:
+                    rememberMe === undefined ? false : Boolean(rememberMe),
+            }
+        },
+        handleLogin() {
+            this.$refs.loginForm.validate((valid) => {
+                if (valid) {
+                    this.loading = true
+                    if (this.loginForm.rememberMe) {
+                        Cookies.set('username', this.loginForm.username, {
+                            expires: 30,
+                        })
+                        Cookies.set(
+                            'password',
+                            encrypt(this.loginForm.password),
+                            { expires: 30 },
+                        )
+                        Cookies.set('rememberMe', this.loginForm.rememberMe, {
+                            expires: 30,
+                        })
+                    } else {
+                        Cookies.remove('username')
+                        Cookies.remove('password')
+                        Cookies.remove('rememberMe')
+                    }
+                    this.$store
+                        .dispatch('Login', this.loginForm)
+                        .then(() => {
+                            if (localStorage.getItem('isCode') == 1) {
+                                this.$router
+                                    .push({ path: '/resetPassword' })
+                                    .catch(() => {})
+                            } else {
+                                this.$router.push({ path: '/' }).catch(() => {})
+                            }
+                        })
+                        .catch(() => {
+                            this.loading = false
+                            if (this.captchaEnabled) {
+                                this.getCode()
+                            }
+                        })
+                }
             })
-        }
-      })
+        },
     },
-    //南网登录
-    jumpLogin() {
-      this.loading = true
-      let param = {
-        token: this.loginParams.token,
-        username: this.loginParams.userName,
-      }
-      // console.log(param)
-      this.$store
-        .dispatch('ssoLogin', param)
-        .then(() => {
-          //成功后会跳转页面入首页
-          this.$router.push({ path: '/' }).catch(() => {})
-        })
-        .catch(() => {
-          this.loading = false
-          //失败返回南网登录页面
-          // window.location.replace('https://test-sso.csgmall.com.cn/?client_id=549OWptc&theme=zhgc_storage&response_type=code&redirect_uri=https%3A%2F%2Ftest-cc.zhgkxt.com')
-        })
+    watch: {
+        activeName: {
+            handler(newVal) {
+                this.$refs['loginForm'].clearValidate()
+            },
+        },
     },
-    getCookie() {
-      const username = Cookies.get('username')
-      const password = Cookies.get('password')
-      const rememberMe = Cookies.get('rememberMe')
-      this.loginForm = {
-        username: username === undefined ? this.loginForm.username : username,
-        password: password === undefined ? this.loginForm.password : decrypt(password),
-        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
-      }
-    },
-    handleLogin() {
-      this.$refs.loginForm.validate(valid => {
-        if (valid) {
-          this.loading = true
-          if (this.loginForm.rememberMe) {
-            Cookies.set('username', this.loginForm.username, { expires: 30 })
-            Cookies.set('password', encrypt(this.loginForm.password), { expires: 30 })
-            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 })
-          } else {
-            Cookies.remove('username')
-            Cookies.remove('password')
-            Cookies.remove('rememberMe')
-          }
-          this.$store
-            .dispatch('Login', this.loginForm)
-            .then(() => {
-              if (localStorage.getItem('isCode') == 1) {
-                this.$router
-                  .push({ path: '/resetPassword' })
-                  .catch(() => {})
-              } else {
-                this.$router.push({ path: '/' }).catch(() => {})
-              }
-            })
-            .catch(() => {
-              this.loading = false
-              if (this.captchaEnabled) {
-                this.getCode()
-              }
-            })
-        }
-      })
-    },
-  },
-  watch: {
-    activeName: {
-      handler(newVal) {
-        this.$refs['loginForm'].clearValidate()
-      },
-    },
-  },
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
 .login {
-  //display: flex;
-  //justify-content: center;
-  //align-items: center;
-  position: relative;
-  height: 100%;
-  background-image: url('../assets/images/login.png');
-  background-size: 100% 100%;
-  //background: #1891FF;
+    //display: flex;
+    //justify-content: center;
+    //align-items: center;
+    position: relative;
+    height: 100%;
+    background-image: url('../assets/images/login.png');
+    background-size: 100% 100%;
+    //background: #1891FF;
 }
 
 .title {
-  margin: 0px auto 30px auto;
-  //text-align: center;
-  color: #707070;
+    margin: 0px auto 30px auto;
+    //text-align: center;
+    color: #707070;
 }
 
 .login-bar {
-  position: absolute;
-  height: auto;
-  top: 20%;
-  left: 14%;
-  width: auto;
-  height: 500px;
-  border-radius: 6px;
-  display: flex;
-  background: #fff;
-  text-align: center;
-  padding-top: 40px;
+    position: absolute;
+    height: auto;
+    top: 20%;
+    left: 14%;
+    width: auto;
+    height: 500px;
+    border-radius: 6px;
+    display: flex;
+    background: #fff;
+    text-align: center;
+    padding-top: 40px;
 }
 
 .form-bar {
-  //height: 500px;
-  background: #fff;
+    //height: 500px;
+    background: #fff;
 }
 
 .login-form {
-  //border-radius: 6px;
-  //height: 100%;
-  background: #ffffff;
-  width: 400px;
-  padding: 25px 25px 5px 25px;
+    //border-radius: 6px;
+    //height: 100%;
+    background: #ffffff;
+    width: 400px;
+    padding: 25px 25px 5px 25px;
 
-  .el-input {
-    height: 45px;
+    .el-input {
+        height: 45px;
 
-    input {
-      height: 38px;
+        input {
+            height: 38px;
+        }
     }
-  }
 
-  .input-icon {
-    height: 39px;
-    width: 14px;
-    margin-left: 2px;
-  }
+    .input-icon {
+        height: 39px;
+        width: 14px;
+        margin-left: 2px;
+    }
 }
 
 .login-tip {
-  font-size: 13px;
-  text-align: center;
-  color: #bfbfbf;
+    font-size: 13px;
+    text-align: center;
+    color: #bfbfbf;
 }
 
 .login-code {
-  width: 33%;
-  height: 38px;
-  float: right;
+    // width: 30%;
+    flex: 1;
+    height: 38px;
+    // float: right;
+    margin-left: 12px;
 
-  img {
-    cursor: pointer;
-    vertical-align: middle;
-  }
+    img {
+        width: 100%;
+        cursor: pointer;
+        vertical-align: middle;
+    }
 }
 
 .el-login-footer {
-  height: 40px;
-  line-height: 40px;
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  text-align: center;
-  color: #fff;
-  font-family: Arial;
-  font-size: 12px;
-  letter-spacing: 1px;
+    height: 40px;
+    line-height: 40px;
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    text-align: center;
+    color: #fff;
+    font-family: Arial;
+    font-size: 12px;
+    letter-spacing: 1px;
 }
 
 .login-code-img {
-  height: 38px;
+    height: 38px;
+    width: 100%;
+}
+
+.code-box .el-form-item__content {
+    display: flex;
 }
 </style>
diff --git a/sgzb-ui/src/views/monitor/online/index.vue b/sgzb-ui/src/views/monitor/online/index.vue
index d12a538e..8372fe19 100644
--- a/sgzb-ui/src/views/monitor/online/index.vue
+++ b/sgzb-ui/src/views/monitor/online/index.vue
@@ -1,118 +1,173 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
-      <el-form-item label="登录地址" prop="ipaddr">
-        <el-input
-          v-model="queryParams.ipaddr"
-          placeholder="请输入登录地址"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用户名称" prop="userName">
-        <el-input
-          v-model="queryParams.userName"
-          placeholder="请输入用户名称"
-          clearable
-          @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>
+    <div class="app-container">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            label-width="68px"
+        >
+            <el-form-item label="登录地址" prop="ipaddr">
+                <el-input
+                    v-model="queryParams.ipaddr"
+                    placeholder="请输入登录地址"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="用户名称" prop="userName">
+                <el-input
+                    v-model="queryParams.userName"
+                    placeholder="请输入用户名称"
+                    clearable
+                    @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-table
+            v-loading="loading"
+            :data="list.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
+            style="width: 100%"
+        >
+            <el-table-column
+                label="序号"
+                align="center"
+                width="80"
+                type="index"
+            >
+                <template slot-scope="scope">
+                    <span>{{ (pageNum - 1) * 10 + scope.$index + 1 }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="会话编号"
+                align="center"
+                prop="tokenId"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="登录名称"
+                align="center"
+                prop="userName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="主机"
+                align="center"
+                prop="ipaddr"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="登录时间"
+                align="center"
+                prop="loginTime"
+                width="180"
+            >
+                <template slot-scope="scope">
+                    <span>{{ parseTime(scope.row.loginTime) }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="操作"
+                align="center"
+                class-name="small-padding fixed-width"
+            >
+                <template slot-scope="scope">
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-delete"
+                        @click="handleForceLogout(scope.row)"
+                        v-hasPermi="['monitor:online:forceLogout']"
+                        >强退</el-button
+                    >
+                </template>
+            </el-table-column>
+        </el-table>
 
-    </el-form>
-    <el-table
-      v-loading="loading"
-      :data="list.slice((pageNum-1)*pageSize,pageNum*pageSize)"
-      style="width: 100%;"
-    >
-      <el-table-column label="序号" align="center" width="80" type="index">
-          <template scope="scope">
-          <span>{{ (pageNum - 1) * 10 + scope.$index + 1 }}</span>
-          </template>
-      </el-table-column>
-      <el-table-column label="会话编号" align="center" prop="tokenId" :show-overflow-tooltip="true" />
-      <el-table-column label="登录名称" align="center" prop="userName" :show-overflow-tooltip="true" />
-      <el-table-column label="主机" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
-      <el-table-column label="登录时间" align="center" prop="loginTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.loginTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleForceLogout(scope.row)"
-            v-hasPermi="['monitor:online:forceLogout']"
-          >强退</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
-  </div>
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="pageNum"
+            :limit.sync="pageSize"
+        />
+    </div>
 </template>
 
 <script>
-import { list, forceLogout } from "@/api/monitor/online";
+import { list, forceLogout } from '@/api/monitor/online'
 
 export default {
-  name: "Online",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      pageNum: 1,
-      pageSize: 10,
-      // 查询参数
-      queryParams: {
-        ipaddr: undefined,
-        userName: undefined
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询登录日志列表 */
-    getList() {
-      this.loading = true;
-      list(this.queryParams).then(response => {
-        this.list = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+    name: 'Online',
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 总条数
+            total: 0,
+            // 表格数据
+            list: [],
+            pageNum: 1,
+            pageSize: 10,
+            // 查询参数
+            queryParams: {
+                ipaddr: undefined,
+                userName: undefined,
+            },
+        }
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.pageNum = 1;
-      this.getList();
+    created() {
+        this.getList()
     },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
+    methods: {
+        /** 查询登录日志列表 */
+        getList() {
+            this.loading = true
+            list(this.queryParams).then((response) => {
+                this.list = response.rows
+                this.total = response.total
+                this.loading = false
+            })
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.pageNum = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        /** 强退按钮操作 */
+        handleForceLogout(row) {
+            this.$modal
+                .confirm('是否确认强退名称为"' + row.userName + '"的用户？')
+                .then(function () {
+                    return forceLogout(row.tokenId)
+                })
+                .then(() => {
+                    this.getList()
+                    this.$modal.msgSuccess('强退成功')
+                })
+                .catch(() => {})
+        },
     },
-    /** 强退按钮操作 */
-    handleForceLogout(row) {
-      this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的用户？').then(function() {
-        return forceLogout(row.tokenId);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("强退成功");
-      }).catch(() => {});
-    }
-  }
-};
+}
 </script>
 
diff --git a/sgzb-ui/src/views/repairTest/brokenExamine/index.vue b/sgzb-ui/src/views/repairTest/brokenExamine/index.vue
index 8458f24e..94289bfb 100644
--- a/sgzb-ui/src/views/repairTest/brokenExamine/index.vue
+++ b/sgzb-ui/src/views/repairTest/brokenExamine/index.vue
@@ -6,7 +6,7 @@
             size="small"
             :inline="true"
             v-show="showSearch"
-            label-width="120px"
+            label-width="100px"
         >
             <el-form-item label="关键字" prop="keyword">
                 <el-input
@@ -127,7 +127,7 @@
                 >
             </el-form-item>
         </el-form>
-        <el-row :gutter="10" class="mb8" style="margin-left: 3%">
+        <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
                 <el-button
                     type="primary"
@@ -159,6 +159,7 @@
             v-loading="loading"
             :data="typeList"
             @selection-change="handleSelectionChange"
+            border
         >
             <el-table-column
                 type="selection"
@@ -182,77 +183,63 @@
             <el-table-column
                 label="报废审核单号"
                 align="center"
-                sortable
                 prop="scrapNum"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="单位名称"
                 align="center"
                 prop="unitName"
-                sortable
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="工程名称"
-                sortable
                 align="center"
                 prop="projectName"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="机具类型"
                 align="center"
                 prop="itemType"
-                sortable
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="任务创建人"
-                sortable
                 align="center"
                 prop="createBy"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="任务创建时间"
-                sortable
                 align="center"
                 prop="createTime"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="维修单号"
                 align="center"
-                sortable
                 prop="repairNum"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
 
             <el-table-column
                 label="审核状态"
                 align="center"
-                sortable
                 prop="taskStatusName"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="不通过原因"
                 align="center"
-                sortable
                 prop="remark"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
-            <el-table-column
-                label="操作"
-                align="center"
-                class-name="small-padding fixed-width"
-                width="200px"
-            >
+            <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
                     <el-button
                         size="mini"
-                        type="primary"
+                        type="text"
                         icon="el-icon-zoom-in"
                         @click="handleSee(scope.row, 'see')"
                         >查看</el-button
@@ -260,7 +247,7 @@
                     <!--  -->
                     <el-button
                         size="mini"
-                        type="warning"
+                        type="text"
                         icon="el-icon-circle-check"
                         :disabled="scope.row.taskStatus !== 58"
                         @click="handleUpdate(scope.row, 'update')"
@@ -381,7 +368,7 @@
                     width="80"
                     type="index"
                 >
-                    <template scope="scope">
+                    <template slot-scope="scope">
                         <span>{{
                             (dialogQueryParams.pageNum - 1) * 10 +
                             scope.$index +
diff --git a/sgzb-ui/src/views/repairTest/repair/index.vue b/sgzb-ui/src/views/repairTest/repair/index.vue
index ca963293..e4a26262 100644
--- a/sgzb-ui/src/views/repairTest/repair/index.vue
+++ b/sgzb-ui/src/views/repairTest/repair/index.vue
@@ -6,7 +6,7 @@
             size="small"
             :inline="true"
             v-show="showSearch"
-            label-width="120px"
+            label-width="100px"
         >
             <el-form-item label="关键字" prop="keyword">
                 <el-input
@@ -264,9 +264,11 @@
         <!-- 维修对话框 -->
         <el-dialog
             :visible.sync="open"
-            width="1650px"
+            v-if="open"
+            width="80%"
             append-to-body
             :before-close="onClose"
+            :title="repairTitle"
         >
             <el-form
                 :model="dialogQueryParams"
@@ -359,15 +361,21 @@
                 v-loading="loading"
                 :data="repairList"
                 @selection-change="selectionChange"
+                border
             >
-                <el-table-column type="selection" width="55" align="center" />
+                <el-table-column
+                    type="selection"
+                    width="55"
+                    align="center"
+                    v-if="repairTitle == '维修'"
+                />
                 <el-table-column
                     label="序号"
                     align="center"
                     width="80"
                     type="index"
                 >
-                    <template scope="scope">
+                    <template slot-scope="scope">
                         <span>{{
                             (dialogQueryParams.pageNum - 1) * 10 +
                             scope.$index +
@@ -379,19 +387,16 @@
                     label="类型名称"
                     align="center"
                     prop="typeName"
-                    sortable
                     :show-overflow-tooltip="true"
                 />
                 <el-table-column
                     label="规格型号"
                     align="center"
                     prop="type"
-                    sortable
                     :show-overflow-tooltip="true"
                 />
                 <el-table-column
                     label="编码"
-                    sortable
                     align="center"
                     prop="code"
                     width="200"
@@ -400,7 +405,6 @@
                 <el-table-column
                     label="维修总量"
                     align="center"
-                    sortable
                     prop="repairNum"
                     :show-overflow-tooltip="true"
                 />
@@ -408,14 +412,12 @@
                 <el-table-column
                     label="维修合格数量"
                     align="center"
-                    sortable
                     prop="repairedNum"
                     :show-overflow-tooltip="true"
                 />
                 <el-table-column
                     label="报废数量"
                     align="center"
-                    sortable
                     prop="scrapNum"
                     :show-overflow-tooltip="true"
                 />
@@ -654,6 +656,7 @@ export default {
             // 表单校验
             rules: {},
             defaultData: {},
+            repairTitle: '查看',
         }
     },
     created() {
@@ -798,6 +801,7 @@ export default {
             this.taskId = row.taskId
             this.getDialogList()
             this.$eventBus.$emit('taskId', row.taskId)
+            this.repairTitle = '维修'
             this.open = true
             this.type = type
             this.selectionList = []
@@ -809,6 +813,7 @@ export default {
         handleSee(row, type) {
             this.taskId = row.taskId
             this.getDialogList()
+            this.repairTitle = '查看'
             this.open = true
             this.type = type
             this.selectionList = []
diff --git a/sgzb-ui/src/views/repairTest/testExamine/index.vue b/sgzb-ui/src/views/repairTest/testExamine/index.vue
index c39b46cd..a8479892 100644
--- a/sgzb-ui/src/views/repairTest/testExamine/index.vue
+++ b/sgzb-ui/src/views/repairTest/testExamine/index.vue
@@ -6,7 +6,7 @@
             size="small"
             :inline="true"
             v-show="showSearch"
-            label-width="120px"
+            label-width="100px"
         >
             <el-form-item label="关键字" prop="keyword">
                 <el-input
@@ -127,7 +127,7 @@
                 >
             </el-form-item>
         </el-form>
-        <el-row :gutter="10" class="mb8" style="margin-left: 3%">
+        <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
                 <el-button
                     type="primary"
@@ -159,6 +159,7 @@
             v-loading="loading"
             :data="typeList"
             @selection-change="handleSelectionChange"
+            border
         >
             <el-table-column
                 type="selection"
@@ -172,7 +173,7 @@
                 width="80"
                 type="index"
             >
-                <template scope="scope">
+                <template slot-scope="scope">
                     <span>{{
                         (queryParams.pageNum - 1) * 10 + scope.$index + 1
                     }}</span>
@@ -181,77 +182,63 @@
             <el-table-column
                 label="修试审核单号"
                 align="center"
-                sortable
                 prop="scrapNum"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="单位名称"
                 align="center"
                 prop="unitName"
-                sortable
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="工程名称"
-                sortable
                 align="center"
                 prop="projectName"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="机具类型"
                 align="center"
                 prop="itemType"
-                sortable
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="任务创建人"
-                sortable
                 align="center"
                 prop="createBy"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="任务创建时间"
-                sortable
                 align="center"
                 prop="createTime"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="维修单号"
                 align="center"
-                sortable
                 prop="repairNum"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
 
             <el-table-column
                 label="审核状态"
                 align="center"
-                sortable
                 prop="taskStatusName"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="不通过原因"
                 align="center"
-                sortable
                 prop="remark"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
-            <el-table-column
-                label="操作"
-                align="center"
-                class-name="small-padding fixed-width"
-                width="200px"
-            >
+            <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
                     <el-button
                         size="mini"
-                        type="primary"
+                        type="text"
                         icon="el-icon-zoom-in"
                         @click="handleSee(scope.row, 'see')"
                         >查看</el-button
@@ -259,7 +246,7 @@
                     <!--  -->
                     <el-button
                         size="mini"
-                        type="warning"
+                        type="text"
                         icon="el-icon-circle-check"
                         :disabled="scope.row.taskStatus !== 46"
                         @click="handleUpdate(scope.row, 'update')"
@@ -513,7 +500,7 @@
                     width="80"
                     type="index"
                 >
-                    <template scope="scope">
+                    <template slot-scope="scope">
                         <span>{{
                             (repairRecordParams.pageNum - 1) * 10 +
                             scope.$index +
@@ -634,7 +621,7 @@
                     width="80"
                     type="index"
                 >
-                    <template scope="scope">
+                    <template slot-scope="scope">
                         <span>{{
                             (partRecordParams.pageNum - 1) * 10 +
                             scope.$index +
diff --git a/sgzb-ui/src/views/store/label/labelType.vue b/sgzb-ui/src/views/store/label/labelType.vue
index e221a80a..7ab8c615 100644
--- a/sgzb-ui/src/views/store/label/labelType.vue
+++ b/sgzb-ui/src/views/store/label/labelType.vue
@@ -1,308 +1,399 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="关键字" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请输入关键字"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
+    <div class="app-container">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="68px"
+        >
+            <el-form-item label="关键字" prop="dictName">
+                <el-input
+                    v-model="queryParams.dictName"
+                    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"
+                    >新增</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="success"
+                    plain
+                    icon="el-icon-edit"
+                    size="mini"
+                    :disabled="single"
+                    @click="handleUpdate"
+                    >修改</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="danger"
+                    plain
+                    icon="el-icon-delete"
+                    size="mini"
+                    :disabled="multiple"
+                    @click="handleDelete"
+                    >删除</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="warning"
+                    plain
+                    icon="el-icon-download"
+                    size="mini"
+                    @click="handleExport"
+                    >导出</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="danger"
+                    plain
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="handleRefreshCache"
+                    >刷新缓存</el-button
+                >
+            </el-col>
+            <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+            ></right-toolbar>
+        </el-row>
+
+        <el-table
+            v-loading="loading"
+            :data="typeList"
+            @selection-change="handleSelectionChange"
+        >
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column
+                label="序号"
+                align="center"
+                width="80"
+                type="index"
+            >
+                <template slot-scope="scope">
+                    <span>{{
+                        (queryParams.pageNum - 1) * 10 + scope.$index + 1
+                    }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="标签种类名称"
+                align="center"
+                prop="dictName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="是否启用"
+                align="center"
+                prop="createTime"
+                width="180"
+            >
+                <template slot-scope="scope">
+                    <el-switch
+                        v-model="scope.row.status"
+                        active-text="开"
+                        inactive-text="关"
+                    >
+                    </el-switch>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="操作"
+                align="center"
+                class-name="small-padding fixed-width"
+            >
+                <template slot-scope="scope">
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        icon="el-icon-edit"
+                        @click="handleUpdate(scope.row)"
+                        >修改</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="danger"
+                        icon="el-icon-delete"
+                        @click="handleDelete(scope.row)"
+                        >删除</el-button
+                    >
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
         />
-      </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"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-refresh"
-          size="mini"
-          @click="handleRefreshCache"
-        >刷新缓存</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" width="80" type="index">
-          <template scope="scope">
-          <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
-          </template>
-      </el-table-column>
-      <el-table-column label="标签种类名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="是否启用" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <el-switch
-          v-model="scope.row.status"
-          active-text="开"
-          inactive-text="关">
-        </el-switch>
-
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="primary"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="danger"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="标签种类名称" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="请输入标签种类名称" />
-        </el-form-item>
-<!--        <el-form-item label="字典类型" prop="dictType">-->
-<!--          <el-input v-model="form.dictType" placeholder="请输入字典类型" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="状态" prop="status">-->
-<!--          <el-radio-group v-model="form.status">-->
-<!--            <el-radio-->
-<!--              v-for="dict in dict.type.sys_normal_disable"-->
-<!--              :key="dict.value"-->
-<!--              :label="dict.value"-->
-<!--            >{{dict.label}}</el-radio>-->
-<!--          </el-radio-group>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="备注" prop="remark">-->
-<!--          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>-->
-<!--        </el-form-item>-->
-      </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>
-  </div>
+        <!-- 添加或修改参数配置对话框 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="open"
+            width="600px"
+            append-to-body
+            :close-on-click-modal="false"
+        >
+            <el-form
+                ref="form"
+                :model="form"
+                :rules="rules"
+                label-width="120px"
+            >
+                <el-form-item label="标签种类名称" prop="dictName">
+                    <el-input
+                        v-model="form.dictName"
+                        placeholder="请输入标签种类名称"
+                    />
+                </el-form-item>
+                <!--        <el-form-item label="字典类型" prop="dictType">-->
+                <!--          <el-input v-model="form.dictType" placeholder="请输入字典类型" />-->
+                <!--        </el-form-item>-->
+                <!--        <el-form-item label="状态" prop="status">-->
+                <!--          <el-radio-group v-model="form.status">-->
+                <!--            <el-radio-->
+                <!--              v-for="dict in dict.type.sys_normal_disable"-->
+                <!--              :key="dict.value"-->
+                <!--              :label="dict.value"-->
+                <!--            >{{dict.label}}</el-radio>-->
+                <!--          </el-radio-group>-->
+                <!--        </el-form-item>-->
+                <!--        <el-form-item label="备注" prop="remark">-->
+                <!--          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>-->
+                <!--        </el-form-item>-->
+            </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>
+    </div>
 </template>
 
 <script>
-import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
+import {
+    listType,
+    getType,
+    delType,
+    addType,
+    updateType,
+    refreshCache,
+} from '@/api/system/dict/type'
 
 export default {
-  name: "Dict",
-  dicts: ['sys_normal_disable'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 字典表格数据
-      typeList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 日期范围
-      dateRange: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        dictName: undefined,
-        dictType: undefined,
-        status: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        dictName: [
-          { required: true, message: "字典名称不能为空", trigger: "blur" }
-        ],
-        dictType: [
-          { required: true, message: "字典类型不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询字典类型列表 */
-    getList() {
-      this.loading = true;
-      listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.typeList = response.rows;
-          this.total = response.total;
-          this.loading = false;
+    name: 'Dict',
+    dicts: ['sys_normal_disable'],
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 字典表格数据
+            typeList: [],
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            // 日期范围
+            dateRange: [],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                dictName: undefined,
+                dictType: undefined,
+                status: undefined,
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+                dictName: [
+                    {
+                        required: true,
+                        message: '字典名称不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                dictType: [
+                    {
+                        required: true,
+                        message: '字典类型不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+            },
         }
-      );
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
+    created() {
+        this.getList()
     },
-    // 表单重置
-    reset() {
-      this.form = {
-        dictId: undefined,
-        dictName: undefined,
-        dictType: undefined,
-        status: "0",
-        remark: undefined
-      };
-      this.resetForm("form");
+    methods: {
+        /** 查询字典类型列表 */
+        getList() {
+            this.loading = true
+            listType(this.addDateRange(this.queryParams, this.dateRange)).then(
+                (response) => {
+                    this.typeList = response.rows
+                    this.total = response.total
+                    this.loading = false
+                },
+            )
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                dictId: undefined,
+                dictName: undefined,
+                dictType: undefined,
+                status: '0',
+                remark: undefined,
+            }
+            this.resetForm('form')
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.dateRange = []
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset()
+            this.open = true
+            this.title = '添加字典类型'
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item.dictId)
+            this.single = selection.length != 1
+            this.multiple = !selection.length
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset()
+            const dictId = row.dictId || this.ids
+            getType(dictId).then((response) => {
+                this.form = response.data
+                this.open = true
+                this.title = '修改字典类型'
+            })
+        },
+        /** 提交按钮 */
+        submitForm: function () {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    if (this.form.dictId != undefined) {
+                        updateType(this.form).then((response) => {
+                            this.$modal.msgSuccess('修改成功')
+                            this.open = false
+                            this.getList()
+                        })
+                    } else {
+                        addType(this.form).then((response) => {
+                            this.$modal.msgSuccess('新增成功')
+                            this.open = false
+                            this.getList()
+                        })
+                    }
+                }
+            })
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const dictIds = row.dictId || this.ids
+            this.$modal
+                .confirm('是否确认删除所选择的数据项？')
+                .then(function () {
+                    return delType(dictIds)
+                })
+                .then(() => {
+                    this.getList()
+                    this.$modal.msgSuccess('删除成功')
+                })
+                .catch(() => {})
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download(
+                'system/dict/type/export',
+                {
+                    ...this.queryParams,
+                },
+                `type_${new Date().getTime()}.xlsx`,
+            )
+        },
+        /** 刷新缓存按钮操作 */
+        handleRefreshCache() {
+            refreshCache().then(() => {
+                this.$modal.msgSuccess('刷新成功')
+                this.$store.dispatch('dict/cleanDict')
+            })
+        },
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加字典类型";
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dictId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const dictId = row.dictId || this.ids
-      getType(dictId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改字典类型";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.dictId != undefined) {
-            updateType(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addType(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const dictIds = row.dictId || this.ids;
-      this.$modal.confirm('是否确认删除所选择的数据项？').then(function() {
-        return delType(dictIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/dict/type/export', {
-        ...this.queryParams
-      }, `type_${new Date().getTime()}.xlsx`)
-    },
-    /** 刷新缓存按钮操作 */
-    handleRefreshCache() {
-      refreshCache().then(() => {
-        this.$modal.msgSuccess("刷新成功");
-        this.$store.dispatch('dict/cleanDict');
-      });
-    }
-  }
-};
+}
 </script>
 <style lang="scss" scoped>
 ::v-deep.el-table .fixed-width .el-button--mini {
-  width: 60px !important;
-  margin-bottom: 10px;
+    width: 60px !important;
+    margin-bottom: 10px;
 }
 </style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue
index f15d1b19..2ff36137 100644
--- a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue
@@ -315,7 +315,7 @@
                             width="80"
                             type="index"
                         >
-                            <template scope="scope">
+                            <template slot-scope="scope">
                                 <span>{{
                                     (queryParams.pageNum - 1) * 10 +
                                     scope.$index +
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue
index e7caca61..bfa04191 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue
@@ -292,7 +292,7 @@
                     width="80"
                     type="index"
                 >
-                    <template scope="scope">
+                    <template slot-scope="scope">
                         <span>{{
                             (query.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
index 984c890c..59be1d37 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
@@ -302,7 +302,7 @@
                     width="80"
                     type="index"
                 >
-                    <template scope="scope">
+                    <template slot-scope="scope">
                         <span>{{
                             (query.pageNum - 1) * 10 + scope.$index + 1
                         }}</span>
diff --git a/sgzb-ui/src/views/store/newBuy/newTools/newToolsArrival.vue b/sgzb-ui/src/views/store/newBuy/newTools/newToolsArrival.vue
index d3680ea8..910c4d34 100644
--- a/sgzb-ui/src/views/store/newBuy/newTools/newToolsArrival.vue
+++ b/sgzb-ui/src/views/store/newBuy/newTools/newToolsArrival.vue
@@ -1,644 +1,795 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-row>
-        <el-form-item label="采购日期">
-          <el-date-picker
-              v-model="dateRange"
-              style="width: 240px"
-              value-format="yyyy-MM-dd"
-              type="date"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="到货日期">
-          <el-date-picker
-              v-model="dateRange"
-              style="width: 240px"
-              value-format="yyyy-MM-dd"
-              type="date"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="采购员" prop="roleName">
-          <el-input
-              v-model="queryParams.roleName"
-              placeholder="请输入采购员"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="备注" prop="roleName">
-          <el-input
-              v-model="queryParams.roleName"
-              placeholder="请输入采购员"
-              clearable
-              type="textarea"
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-      </el-row>
-      <el-row>
-        <el-form-item label="工器具厂家" prop="status">
-          <el-select
-              v-model="queryParams.status"
-              placeholder="机具厂家"
-              clearable filterable
-              style="width: 240px"
-          >
-            <el-option
-                v-for="dict in dict.type.sys_normal_disable"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
+    <div class="app-container">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+        >
+            <el-row>
+                <el-form-item label="采购日期">
+                    <el-date-picker
+                        v-model="dateRange"
+                        style="width: 240px"
+                        value-format="yyyy-MM-dd"
+                        type="date"
+                        range-separator="-"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期"
+                    ></el-date-picker>
+                </el-form-item>
+                <el-form-item label="到货日期">
+                    <el-date-picker
+                        v-model="dateRange"
+                        style="width: 240px"
+                        value-format="yyyy-MM-dd"
+                        type="date"
+                        range-separator="-"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期"
+                    ></el-date-picker>
+                </el-form-item>
+                <el-form-item label="采购员" prop="roleName">
+                    <el-input
+                        v-model="queryParams.roleName"
+                        placeholder="请输入采购员"
+                        clearable
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </el-form-item>
+                <el-form-item label="备注" prop="roleName">
+                    <el-input
+                        v-model="queryParams.roleName"
+                        placeholder="请输入采购员"
+                        clearable
+                        type="textarea"
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </el-form-item>
+            </el-row>
+            <el-row>
+                <el-form-item label="工器具厂家" prop="status">
+                    <el-select
+                        v-model="queryParams.status"
+                        placeholder="机具厂家"
+                        clearable
+                        filterable
+                        style="width: 240px"
+                    >
+                        <el-option
+                            v-for="dict in dict.type.sys_normal_disable"
+                            :key="dict.value"
+                            :label="dict.label"
+                            :value="dict.value"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="出厂日期">
+                    <el-date-picker
+                        v-model="dateRange"
+                        style="width: 240px"
+                        value-format="yyyy-MM-dd"
+                        type="date"
+                        range-separator="-"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期"
+                    ></el-date-picker>
+                </el-form-item>
+                <el-form-item label="工器具类型" prop="status">
+                    <el-select
+                        v-model="queryParams.status"
+                        placeholder="工器具类型"
+                        clearable
+                        filterable
+                        style="width: 240px"
+                    >
+                        <el-option
+                            v-for="dict in dict.type.sys_normal_disable"
+                            :key="dict.value"
+                            :label="dict.label"
+                            :value="dict.value"
+                        />
+                    </el-select>
+                </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-row>
+        </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="['system:role:add']"
+                    >保存</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="success"
+                    plain
+                    icon="el-icon-edit"
+                    size="mini"
+                    :disabled="single"
+                    @click="handleUpdate"
+                    v-hasPermi="['system:role:edit']"
+                    >采购验收管理</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="danger"
+                    plain
+                    icon="el-icon-delete"
+                    size="mini"
+                    :disabled="multiple"
+                    @click="handleDelete"
+                    v-hasPermi="['system:role:remove']"
+                    >删除</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="warning"
+                    plain
+                    icon="el-icon-download"
+                    size="mini"
+                    @click="handleExport"
+                    v-hasPermi="['system:role:export']"
+                    >导出</el-button
+                >
+            </el-col>
+            <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+            ></right-toolbar>
+        </el-row>
+
+        <el-table
+            v-loading="loading"
+            :data="roleList"
+            @selection-change="handleSelectionChange"
+        >
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column
+                label="序号"
+                align="center"
+                width="80"
+                type="index"
+            >
+                <template slot-scope="scope">
+                    <span>{{
+                        (queryParams.pageNum - 1) * 10 + scope.$index + 1
+                    }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="工器具类型名称"
+                prop="roleName"
+                :show-overflow-tooltip="true"
             />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="出厂日期">
-          <el-date-picker
-              v-model="dateRange"
-              style="width: 240px"
-              value-format="yyyy-MM-dd"
-              type="date"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="工器具类型" prop="status">
-          <el-select
-              v-model="queryParams.status"
-              placeholder="工器具类型"
-              clearable filterable
-              style="width: 240px"
-          >
-            <el-option
-                v-for="dict in dict.type.sys_normal_disable"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
+            <el-table-column
+                label="规格型号"
+                prop="roleKey"
+                :show-overflow-tooltip="true"
             />
-          </el-select>
-        </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-row>
-    </el-form>
+            <el-table-column label="单位" prop="roleSort" width="100" />
+            <el-table-column
+                label="购置单价(元)"
+                prop="roleSort"
+                align="center"
+                width="100"
+            />
+            <el-table-column label="采购数量" prop="roleSort" width="100" />
+            <el-table-column label="工器具厂家" prop="roleSort" width="100" />
+            <el-table-column
+                label="出厂日期"
+                align="center"
+                prop="createTime"
+                width="180"
+            >
+                <template slot-scope="scope">
+                    <span>{{ parseTime(scope.row.createTime) }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="操作"
+                align="center"
+                class-name="small-padding fixed-width"
+            >
+                <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-edit"
+                        @click="handleUpdate(scope.row)"
+                        v-hasPermi="['system:role:edit']"
+                        >修改</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-delete"
+                        @click="handleDelete(scope.row)"
+                        v-hasPermi="['system:role:remove']"
+                        >删除</el-button
+                    >
+                    <!--          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">-->
+                    <!--            <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>-->
+                    <!--            <el-dropdown-menu slot="dropdown">-->
+                    <!--              <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"-->
+                    <!--                                v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item>-->
+                    <!--              <el-dropdown-item command="handleAuthUser" icon="el-icon-user"-->
+                    <!--                                v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>-->
+                    <!--            </el-dropdown-menu>-->
+                    <!--          </el-dropdown>-->
+                </template>
+            </el-table-column>
+        </el-table>
 
-    <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="['system:role:add']"
-        >保存</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-            type="success"
-            plain
-            icon="el-icon-edit"
-            size="mini"
-            :disabled="single"
-            @click="handleUpdate"
-            v-hasPermi="['system:role:edit']"
-        >采购验收管理</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-            type="danger"
-            plain
-            icon="el-icon-delete"
-            size="mini"
-            :disabled="multiple"
-            @click="handleDelete"
-            v-hasPermi="['system:role:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            v-hasPermi="['system:role:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />
 
-    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" width="80" type="index">
-          <template scope="scope">
-          <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
-          </template>
-      </el-table-column>
-      <el-table-column label="工器具类型名称" prop="roleName" :show-overflow-tooltip="true"   />
-      <el-table-column label="规格型号" prop="roleKey" :show-overflow-tooltip="true" />
-      <el-table-column label="单位" prop="roleSort" width="100" />
-      <el-table-column label="购置单价(元)" prop="roleSort" align="center" width="100" />
-      <el-table-column label="采购数量" prop="roleSort" width="100" />
-      <el-table-column label="工器具厂家" prop="roleSort" width="100" />
-      <el-table-column label="出厂日期" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
-          <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['system:role:edit']"
-          >修改</el-button>
-          <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['system:role:remove']"
-          >删除</el-button>
-<!--          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">-->
-<!--            <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>-->
-<!--            <el-dropdown-menu slot="dropdown">-->
-<!--              <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"-->
-<!--                                v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item>-->
-<!--              <el-dropdown-item command="handleAuthUser" icon="el-icon-user"-->
-<!--                                v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>-->
-<!--            </el-dropdown-menu>-->
-<!--          </el-dropdown>-->
-        </template>
-      </el-table-column>
-    </el-table>
+        <!-- 添加或修改角色配置对话框 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="open"
+            width="500px"
+            append-to-body
+        >
+            <el-form
+                ref="form"
+                :model="form"
+                :rules="rules"
+                label-width="100px"
+            >
+                <el-form-item label="角色名称" prop="roleName">
+                    <el-input
+                        v-model="form.roleName"
+                        placeholder="请输入角色名称"
+                    />
+                </el-form-item>
+                <el-form-item prop="roleKey">
+                    <span slot="label">
+                        <el-tooltip
+                            content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)"
+                            placement="top"
+                        >
+                            <i class="el-icon-question"></i>
+                        </el-tooltip>
+                        权限字符
+                    </span>
+                    <el-input
+                        v-model="form.roleKey"
+                        placeholder="请输入权限字符"
+                    />
+                </el-form-item>
+                <el-form-item label="角色顺序" prop="roleSort">
+                    <el-input-number
+                        v-model="form.roleSort"
+                        controls-position="right"
+                        :min="0"
+                    />
+                </el-form-item>
+                <el-form-item label="状态">
+                    <el-radio-group v-model="form.status">
+                        <el-radio
+                            v-for="dict in dict.type.sys_normal_disable"
+                            :key="dict.value"
+                            :label="dict.value"
+                            >{{ dict.label }}</el-radio
+                        >
+                    </el-radio-group>
+                </el-form-item>
+                <!--        <el-form-item label="菜单权限">-->
+                <!--          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>-->
+                <!--          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>-->
+                <!--          <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>-->
+                <!--          <el-tree-->
+                <!--              class="tree-border"-->
+                <!--              :data="menuOptions"-->
+                <!--              show-checkbox-->
+                <!--              ref="menu"-->
+                <!--              node-key="id"-->
+                <!--              :check-strictly="!form.menuCheckStrictly"-->
+                <!--              empty-text="加载中，请稍候"-->
+                <!--              :props="defaultProps"-->
+                <!--          ></el-tree>-->
+                <!--        </el-form-item>-->
+                <el-form-item label="备注">
+                    <el-input
+                        v-model="form.remark"
+                        type="textarea"
+                        placeholder="请输入内容"
+                    ></el-input>
+                </el-form-item>
+            </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>
 
-    <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-    />
-
-    <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="角色名称" prop="roleName">
-          <el-input v-model="form.roleName" placeholder="请输入角色名称" />
-        </el-form-item>
-        <el-form-item prop="roleKey">
-          <span slot="label">
-            <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-            权限字符
-          </span>
-          <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
-        </el-form-item>
-        <el-form-item label="角色顺序" prop="roleSort">
-          <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
-        </el-form-item>
-        <el-form-item label="状态">
-          <el-radio-group v-model="form.status">
-            <el-radio
-                v-for="dict in dict.type.sys_normal_disable"
-                :key="dict.value"
-                :label="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-<!--        <el-form-item label="菜单权限">-->
-<!--          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>-->
-<!--          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>-->
-<!--          <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>-->
-<!--          <el-tree-->
-<!--              class="tree-border"-->
-<!--              :data="menuOptions"-->
-<!--              show-checkbox-->
-<!--              ref="menu"-->
-<!--              node-key="id"-->
-<!--              :check-strictly="!form.menuCheckStrictly"-->
-<!--              empty-text="加载中，请稍候"-->
-<!--              :props="defaultProps"-->
-<!--          ></el-tree>-->
-<!--        </el-form-item>-->
-        <el-form-item label="备注">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-        </el-form-item>
-      </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 :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
-      <el-form :model="form" label-width="80px">
-        <el-form-item label="角色名称">
-          <el-input v-model="form.roleName" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="权限字符">
-          <el-input v-model="form.roleKey" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="权限范围">
-          <el-select v-model="form.dataScope" filterable @change="dataScopeSelectChange">
-            <el-option
-                v-for="item in dataScopeOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="数据权限" v-show="form.dataScope == 2">
-          <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
-          <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
-          <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
-          <el-tree
-              class="tree-border"
-              :data="deptOptions"
-              show-checkbox
-              default-expand-all
-              ref="dept"
-              node-key="id"
-              :check-strictly="!form.deptCheckStrictly"
-              empty-text="加载中，请稍候"
-              :props="defaultProps"
-          ></el-tree>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitDataScope">确 定</el-button>
-        <el-button @click="cancelDataScope">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
+        <!-- 分配角色数据权限对话框 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="openDataScope"
+            width="500px"
+            append-to-body
+        >
+            <el-form :model="form" label-width="80px">
+                <el-form-item label="角色名称">
+                    <el-input v-model="form.roleName" :disabled="true" />
+                </el-form-item>
+                <el-form-item label="权限字符">
+                    <el-input v-model="form.roleKey" :disabled="true" />
+                </el-form-item>
+                <el-form-item label="权限范围">
+                    <el-select
+                        v-model="form.dataScope"
+                        filterable
+                        @change="dataScopeSelectChange"
+                    >
+                        <el-option
+                            v-for="item in dataScopeOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="数据权限" v-show="form.dataScope == 2">
+                    <el-checkbox
+                        v-model="deptExpand"
+                        @change="handleCheckedTreeExpand($event, 'dept')"
+                        >展开/折叠</el-checkbox
+                    >
+                    <el-checkbox
+                        v-model="deptNodeAll"
+                        @change="handleCheckedTreeNodeAll($event, 'dept')"
+                        >全选/全不选</el-checkbox
+                    >
+                    <el-checkbox
+                        v-model="form.deptCheckStrictly"
+                        @change="handleCheckedTreeConnect($event, 'dept')"
+                        >父子联动</el-checkbox
+                    >
+                    <el-tree
+                        class="tree-border"
+                        :data="deptOptions"
+                        show-checkbox
+                        default-expand-all
+                        ref="dept"
+                        node-key="id"
+                        :check-strictly="!form.deptCheckStrictly"
+                        empty-text="加载中，请稍候"
+                        :props="defaultProps"
+                    ></el-tree>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitDataScope"
+                    >确 定</el-button
+                >
+                <el-button @click="cancelDataScope">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
-import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+import {
+    listRole,
+    getRole,
+    delRole,
+    addRole,
+    updateRole,
+    dataScope,
+    changeRoleStatus,
+    deptTreeSelect,
+} from '@/api/system/role'
+import {
+    treeselect as menuTreeselect,
+    roleMenuTreeselect,
+} from '@/api/system/menu'
 
 export default {
-  name: "Role",
-  dicts: ['sys_normal_disable'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 角色表格数据
-      roleList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 是否显示弹出层（数据权限）
-      openDataScope: false,
-      menuExpand: false,
-      menuNodeAll: false,
-      deptExpand: true,
-      deptNodeAll: false,
-      // 日期范围
-      dateRange: [],
-      // 数据范围选项
-      dataScopeOptions: [
-        {
-          value: "1",
-          label: "全部数据权限"
-        },
-        {
-          value: "2",
-          label: "自定数据权限"
-        },
-        {
-          value: "3",
-          label: "本部门数据权限"
-        },
-        {
-          value: "4",
-          label: "本部门及以下数据权限"
-        },
-        {
-          value: "5",
-          label: "仅本人数据权限"
+    name: 'Role',
+    dicts: ['sys_normal_disable'],
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 角色表格数据
+            roleList: [],
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            // 是否显示弹出层（数据权限）
+            openDataScope: false,
+            menuExpand: false,
+            menuNodeAll: false,
+            deptExpand: true,
+            deptNodeAll: false,
+            // 日期范围
+            dateRange: [],
+            // 数据范围选项
+            dataScopeOptions: [
+                {
+                    value: '1',
+                    label: '全部数据权限',
+                },
+                {
+                    value: '2',
+                    label: '自定数据权限',
+                },
+                {
+                    value: '3',
+                    label: '本部门数据权限',
+                },
+                {
+                    value: '4',
+                    label: '本部门及以下数据权限',
+                },
+                {
+                    value: '5',
+                    label: '仅本人数据权限',
+                },
+            ],
+            // 菜单列表
+            menuOptions: [],
+            // 部门列表
+            deptOptions: [],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                roleName: undefined,
+                roleKey: undefined,
+                status: undefined,
+            },
+            // 表单参数
+            form: {},
+            defaultProps: {
+                children: 'children',
+                label: 'label',
+            },
+            // 表单校验
+            rules: {
+                roleName: [
+                    {
+                        required: true,
+                        message: '角色名称不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                roleKey: [
+                    {
+                        required: true,
+                        message: '权限字符不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                roleSort: [
+                    {
+                        required: true,
+                        message: '角色顺序不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+            },
         }
-      ],
-      // 菜单列表
-      menuOptions: [],
-      // 部门列表
-      deptOptions: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        roleName: undefined,
-        roleKey: undefined,
-        status: undefined
-      },
-      // 表单参数
-      form: {},
-      defaultProps: {
-        children: "children",
-        label: "label"
-      },
-      // 表单校验
-      rules: {
-        roleName: [
-          { required: true, message: "角色名称不能为空", trigger: "blur" }
-        ],
-        roleKey: [
-          { required: true, message: "权限字符不能为空", trigger: "blur" }
-        ],
-        roleSort: [
-          { required: true, message: "角色顺序不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询角色列表 */
-    getList() {
-      this.loading = true;
-      listRole(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-            this.roleList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          }
-      );
     },
-    /** 查询菜单树结构 */
-    getMenuTreeselect() {
-      menuTreeselect().then(response => {
-        this.menuOptions = response.data;
-      });
+    created() {
+        this.getList()
     },
-    // 所有菜单节点数据
-    getMenuAllCheckedKeys() {
-      // 目前被选中的菜单节点
-      let checkedKeys = this.$refs.menu.getCheckedKeys();
-      // 半选中的菜单节点
-      let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
-      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
-      return checkedKeys;
-    },
-    // 所有部门节点数据
-    getDeptAllCheckedKeys() {
-      // 目前被选中的部门节点
-      let checkedKeys = this.$refs.dept.getCheckedKeys();
-      // 半选中的部门节点
-      let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys();
-      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
-      return checkedKeys;
-    },
-    /** 根据角色ID查询菜单树结构 */
-    getRoleMenuTreeselect(roleId) {
-      return roleMenuTreeselect(roleId).then(response => {
-        this.menuOptions = response.menus;
-        return response;
-      });
-    },
-    /** 根据角色ID查询部门树结构 */
-    getDeptTree(roleId) {
-      return deptTreeSelect(roleId).then(response => {
-        this.deptOptions = response.depts;
-        return response;
-      });
-    },
-    // 角色状态修改
-    handleStatusChange(row) {
-      let text = row.status === "0" ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗？').then(function() {
-        return changeRoleStatus(row.roleId, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "0" ? "1" : "0";
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 取消按钮（数据权限）
-    cancelDataScope() {
-      this.openDataScope = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      if (this.$refs.menu != undefined) {
-        this.$refs.menu.setCheckedKeys([]);
-      }
-      this.menuExpand = false,
-          this.menuNodeAll = false,
-          this.deptExpand = true,
-          this.deptNodeAll = false,
-          this.form = {
-            roleId: undefined,
-            roleName: undefined,
-            roleKey: undefined,
-            roleSort: 0,
-            status: "0",
-            menuIds: [],
-            deptIds: [],
-            menuCheckStrictly: true,
-            deptCheckStrictly: true,
-            remark: undefined
-          };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.roleId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    // 更多操作触发
-    handleCommand(command, row) {
-      switch (command) {
-        case "handleDataScope":
-          this.handleDataScope(row);
-          break;
-        case "handleAuthUser":
-          this.handleAuthUser(row);
-          break;
-        default:
-          break;
-      }
-    },
-    // 树权限（展开/折叠）
-    handleCheckedTreeExpand(value, type) {
-      if (type == 'menu') {
-        let treeList = this.menuOptions;
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
-        }
-      } else if (type == 'dept') {
-        let treeList = this.deptOptions;
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
-        }
-      }
-    },
-    // 树权限（全选/全不选）
-    handleCheckedTreeNodeAll(value, type) {
-      if (type == 'menu') {
-        this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
-      } else if (type == 'dept') {
-        this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
-      }
-    },
-    // 树权限（父子联动）
-    handleCheckedTreeConnect(value, type) {
-      if (type == 'menu') {
-        this.form.menuCheckStrictly = value ? true: false;
-      } else if (type == 'dept') {
-        this.form.deptCheckStrictly = value ? true: false;
-      }
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.getMenuTreeselect();
-      this.open = true;
-      this.title = "添加角色";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const roleId = row.roleId || this.ids
-      const roleMenu = this.getRoleMenuTreeselect(roleId);
-      getRole(roleId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.$nextTick(() => {
-          roleMenu.then(res => {
-            let checkedKeys = res.checkedKeys
-            checkedKeys.forEach((v) => {
-              this.$nextTick(()=>{
-                this.$refs.menu.setChecked(v, true ,false);
-              })
+    methods: {
+        /** 查询角色列表 */
+        getList() {
+            this.loading = true
+            listRole(this.addDateRange(this.queryParams, this.dateRange)).then(
+                (response) => {
+                    this.roleList = response.rows
+                    this.total = response.total
+                    this.loading = false
+                },
+            )
+        },
+        /** 查询菜单树结构 */
+        getMenuTreeselect() {
+            menuTreeselect().then((response) => {
+                this.menuOptions = response.data
             })
-          });
-        });
-        this.title = "修改角色";
-      });
+        },
+        // 所有菜单节点数据
+        getMenuAllCheckedKeys() {
+            // 目前被选中的菜单节点
+            let checkedKeys = this.$refs.menu.getCheckedKeys()
+            // 半选中的菜单节点
+            let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys()
+            checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
+            return checkedKeys
+        },
+        // 所有部门节点数据
+        getDeptAllCheckedKeys() {
+            // 目前被选中的部门节点
+            let checkedKeys = this.$refs.dept.getCheckedKeys()
+            // 半选中的部门节点
+            let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys()
+            checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
+            return checkedKeys
+        },
+        /** 根据角色ID查询菜单树结构 */
+        getRoleMenuTreeselect(roleId) {
+            return roleMenuTreeselect(roleId).then((response) => {
+                this.menuOptions = response.menus
+                return response
+            })
+        },
+        /** 根据角色ID查询部门树结构 */
+        getDeptTree(roleId) {
+            return deptTreeSelect(roleId).then((response) => {
+                this.deptOptions = response.depts
+                return response
+            })
+        },
+        // 角色状态修改
+        handleStatusChange(row) {
+            let text = row.status === '0' ? '启用' : '停用'
+            this.$modal
+                .confirm('确认要"' + text + '""' + row.roleName + '"角色吗？')
+                .then(function () {
+                    return changeRoleStatus(row.roleId, row.status)
+                })
+                .then(() => {
+                    this.$modal.msgSuccess(text + '成功')
+                })
+                .catch(function () {
+                    row.status = row.status === '0' ? '1' : '0'
+                })
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 取消按钮（数据权限）
+        cancelDataScope() {
+            this.openDataScope = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            if (this.$refs.menu != undefined) {
+                this.$refs.menu.setCheckedKeys([])
+            }
+            ;(this.menuExpand = false),
+                (this.menuNodeAll = false),
+                (this.deptExpand = true),
+                (this.deptNodeAll = false),
+                (this.form = {
+                    roleId: undefined,
+                    roleName: undefined,
+                    roleKey: undefined,
+                    roleSort: 0,
+                    status: '0',
+                    menuIds: [],
+                    deptIds: [],
+                    menuCheckStrictly: true,
+                    deptCheckStrictly: true,
+                    remark: undefined,
+                })
+            this.resetForm('form')
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.dateRange = []
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item.roleId)
+            this.single = selection.length != 1
+            this.multiple = !selection.length
+        },
+        // 更多操作触发
+        handleCommand(command, row) {
+            switch (command) {
+                case 'handleDataScope':
+                    this.handleDataScope(row)
+                    break
+                case 'handleAuthUser':
+                    this.handleAuthUser(row)
+                    break
+                default:
+                    break
+            }
+        },
+        // 树权限（展开/折叠）
+        handleCheckedTreeExpand(value, type) {
+            if (type == 'menu') {
+                let treeList = this.menuOptions
+                for (let i = 0; i < treeList.length; i++) {
+                    this.$refs.menu.store.nodesMap[treeList[i].id].expanded =
+                        value
+                }
+            } else if (type == 'dept') {
+                let treeList = this.deptOptions
+                for (let i = 0; i < treeList.length; i++) {
+                    this.$refs.dept.store.nodesMap[treeList[i].id].expanded =
+                        value
+                }
+            }
+        },
+        // 树权限（全选/全不选）
+        handleCheckedTreeNodeAll(value, type) {
+            if (type == 'menu') {
+                this.$refs.menu.setCheckedNodes(value ? this.menuOptions : [])
+            } else if (type == 'dept') {
+                this.$refs.dept.setCheckedNodes(value ? this.deptOptions : [])
+            }
+        },
+        // 树权限（父子联动）
+        handleCheckedTreeConnect(value, type) {
+            if (type == 'menu') {
+                this.form.menuCheckStrictly = value ? true : false
+            } else if (type == 'dept') {
+                this.form.deptCheckStrictly = value ? true : false
+            }
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset()
+            this.getMenuTreeselect()
+            this.open = true
+            this.title = '添加角色'
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset()
+            const roleId = row.roleId || this.ids
+            const roleMenu = this.getRoleMenuTreeselect(roleId)
+            getRole(roleId).then((response) => {
+                this.form = response.data
+                this.open = true
+                this.$nextTick(() => {
+                    roleMenu.then((res) => {
+                        let checkedKeys = res.checkedKeys
+                        checkedKeys.forEach((v) => {
+                            this.$nextTick(() => {
+                                this.$refs.menu.setChecked(v, true, false)
+                            })
+                        })
+                    })
+                })
+                this.title = '修改角色'
+            })
+        },
+        /** 选择角色权限范围触发 */
+        dataScopeSelectChange(value) {
+            if (value !== '2') {
+                this.$refs.dept.setCheckedKeys([])
+            }
+        },
+        /** 分配数据权限操作 */
+        handleDataScope(row) {
+            this.reset()
+            const deptTreeSelect = this.getDeptTree(row.roleId)
+            getRole(row.roleId).then((response) => {
+                this.form = response.data
+                this.openDataScope = true
+                this.$nextTick(() => {
+                    deptTreeSelect.then((res) => {
+                        this.$refs.dept.setCheckedKeys(res.checkedKeys)
+                    })
+                })
+                this.title = '分配数据权限'
+            })
+        },
+        /** 分配用户操作 */
+        handleAuthUser: function (row) {
+            const roleId = row.roleId
+            this.$router.push('/system/role-auth/user/' + roleId)
+        },
+        /** 提交按钮 */
+        submitForm: function () {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    if (this.form.roleId != undefined) {
+                        this.form.menuIds = this.getMenuAllCheckedKeys()
+                        updateRole(this.form).then((response) => {
+                            this.$modal.msgSuccess('修改成功')
+                            this.open = false
+                            this.getList()
+                        })
+                    } else {
+                        this.form.menuIds = this.getMenuAllCheckedKeys()
+                        addRole(this.form).then((response) => {
+                            this.$modal.msgSuccess('新增成功')
+                            this.open = false
+                            this.getList()
+                        })
+                    }
+                }
+            })
+        },
+        /** 提交按钮（数据权限） */
+        submitDataScope: function () {
+            if (this.form.roleId != undefined) {
+                this.form.deptIds = this.getDeptAllCheckedKeys()
+                dataScope(this.form).then((response) => {
+                    this.$modal.msgSuccess('修改成功')
+                    this.openDataScope = false
+                    this.getList()
+                })
+            }
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const roleIds = row.roleId || this.ids
+            this.$modal
+                .confirm('是否确认删除所选择的数据项？')
+                .then(function () {
+                    return delRole(roleIds)
+                })
+                .then(() => {
+                    this.getList()
+                    this.$modal.msgSuccess('删除成功')
+                })
+                .catch(() => {})
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download(
+                'system/role/export',
+                {
+                    ...this.queryParams,
+                },
+                `role_${new Date().getTime()}.xlsx`,
+            )
+        },
     },
-    /** 选择角色权限范围触发 */
-    dataScopeSelectChange(value) {
-      if(value !== '2') {
-        this.$refs.dept.setCheckedKeys([]);
-      }
-    },
-    /** 分配数据权限操作 */
-    handleDataScope(row) {
-      this.reset();
-      const deptTreeSelect = this.getDeptTree(row.roleId);
-      getRole(row.roleId).then(response => {
-        this.form = response.data;
-        this.openDataScope = true;
-        this.$nextTick(() => {
-          deptTreeSelect.then(res => {
-            this.$refs.dept.setCheckedKeys(res.checkedKeys);
-          });
-        });
-        this.title = "分配数据权限";
-      });
-    },
-    /** 分配用户操作 */
-    handleAuthUser: function(row) {
-      const roleId = row.roleId;
-      this.$router.push("/system/role-auth/user/" + roleId);
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.roleId != undefined) {
-            this.form.menuIds = this.getMenuAllCheckedKeys();
-            updateRole(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            this.form.menuIds = this.getMenuAllCheckedKeys();
-            addRole(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 提交按钮（数据权限） */
-    submitDataScope: function() {
-      if (this.form.roleId != undefined) {
-        this.form.deptIds = this.getDeptAllCheckedKeys();
-        dataScope(this.form).then(response => {
-          this.$modal.msgSuccess("修改成功");
-          this.openDataScope = false;
-          this.getList();
-        });
-      }
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const roleIds = row.roleId || this.ids;
-      this.$modal.confirm('是否确认删除所选择的数据项？').then(function() {
-        return delRole(roleIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/role/export', {
-        ...this.queryParams
-      }, `role_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
+}
 </script>
diff --git a/sgzb-ui/src/views/store/newBuy/plan.vue b/sgzb-ui/src/views/store/newBuy/plan.vue
index 6bca242d..56b93207 100644
--- a/sgzb-ui/src/views/store/newBuy/plan.vue
+++ b/sgzb-ui/src/views/store/newBuy/plan.vue
@@ -1,72 +1,132 @@
 <template>
-  <div class="app-container" id="plan">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="80px"
-    >
-      <el-form-item label="名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入名称"
-          clearable
-          maxlength="50"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+    <div class="app-container" id="plan">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="80px"
+        >
+            <el-form-item label="名称" prop="name">
+                <el-input
+                    v-model="queryParams.name"
+                    placeholder="请输入名称"
+                    clearable
+                    maxlength="50"
+                    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-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">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
-      </el-col>
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button
+                    type="primary"
+                    plain
+                    icon="el-icon-plus"
+                    size="mini"
+                    @click="handleAdd"
+                    >新增</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="warning"
+                    plain
+                    icon="el-icon-download"
+                    size="mini"
+                    @click="handleExport"
+                    >导出</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="planList">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="序号" align="center" width="80" type="index">
-                        <template scope="scope">
-                        <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
-                        </template>
-                    </el-table-column>
-      <el-table-column
-        label="基层单位"
-        align="center"
-        prop="lenderCompany"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
-      <el-table-column
-        label="规格型号"
-        align="center"
-        prop="typeModelName"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column label="单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
-      <el-table-column
-        label="计划数"
-        align="center"
-        prop="lenderOrigPlanNum"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column label="计划单价" align="center" prop="planPrice" :show-overflow-tooltip="true" />
-      <el-table-column label="计划总价" align="center" prop="planCost" :show-overflow-tooltip="true" />
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <!-- <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+        <el-table v-loading="loading" :data="planList">
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column
+                label="序号"
+                align="center"
+                width="80"
+                type="index"
+            >
+                <template slot-scope="scope">
+                    <span>{{
+                        (queryParams.pageNum - 1) * 10 + scope.$index + 1
+                    }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="基层单位"
+                align="center"
+                prop="lenderCompany"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="物资名称"
+                align="center"
+                prop="typeName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="规格型号"
+                align="center"
+                prop="typeModelName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="单位"
+                align="center"
+                prop="unitName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="计划数"
+                align="center"
+                prop="lenderOrigPlanNum"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="计划单价"
+                align="center"
+                prop="planPrice"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="计划总价"
+                align="center"
+                prop="planCost"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="备注"
+                align="center"
+                prop="remark"
+                :show-overflow-tooltip="true"
+            />
+            <!-- <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['store:labelType:edit']">编辑</el-button>
@@ -74,118 +134,118 @@
             v-hasPermi="['store:labelType:remove']">删除</el-button>
         </template>
       </el-table-column>-->
-    </el-table>
+        </el-table>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </div>
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />
+    </div>
 </template>
 
 <script>
-import { listType } from "@/api/system/dict/type";
-import { getPlanList, planExport } from "@/api/store/newBuy";
+import { listType } from '@/api/system/dict/type'
+import { getPlanList, planExport } from '@/api/store/newBuy'
 
 export default {
-  name: "Plan",
-  dicts: ["sys_normal_disable"],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 字典表格数据
-      planList: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        dictType: undefined,
-        status: undefined
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询字典类型列表 */
-    getList() {
-      this.loading = true;
-      getPlanList(this.queryParams).then(response => {
-        this.planList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+    name: 'Plan',
+    dicts: ['sys_normal_disable'],
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 字典表格数据
+            planList: [],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                dictType: undefined,
+                status: undefined,
+            },
+        }
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+    created() {
+        this.getList()
     },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.$tab.closeOpenPage({
-        path: "/store/plan/planAdd"
-      });
-      // console.log(this.$router);
-    },
-    // 多选框选中数据
-    // handleSelectionChange(selection) {
-    //   this.ids = selection.map(item => item);
-    //   this.single = selection.length != 1;
-    //   this.multiple = !selection.length;
-    // },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      let query = { taskId: row.taskId };
-      this.$tab.closeOpenPage({ path: "/store/plan/planAdd", query });
-    },
-
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      // const dictIds = row.dictId || this.ids;
-      // this.$modal.confirm('是否确认删除该数据项？').then(function() {
-      //   return delType(dictIds);
-      // }).then(() => {
-      //   this.getList();
-      //   this.$modal.msgSuccess("删除成功");
-      // }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download(
-        "/material/planManagement/export",
-        {
-          ...this.queryParams
+    methods: {
+        /** 查询字典类型列表 */
+        getList() {
+            this.loading = true
+            getPlanList(this.queryParams).then((response) => {
+                this.planList = response.rows
+                this.total = response.total
+                this.loading = false
+            })
         },
-        `type_${new Date().getTime()}.xlsx`
-      );
-    }
-  }
-};
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.$tab.closeOpenPage({
+                path: '/store/plan/planAdd',
+            })
+            // console.log(this.$router);
+        },
+        // 多选框选中数据
+        // handleSelectionChange(selection) {
+        //   this.ids = selection.map(item => item);
+        //   this.single = selection.length != 1;
+        //   this.multiple = !selection.length;
+        // },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            let query = { taskId: row.taskId }
+            this.$tab.closeOpenPage({ path: '/store/plan/planAdd', query })
+        },
+
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            // const dictIds = row.dictId || this.ids;
+            // this.$modal.confirm('是否确认删除该数据项？').then(function() {
+            //   return delType(dictIds);
+            // }).then(() => {
+            //   this.getList();
+            //   this.$modal.msgSuccess("删除成功");
+            // }).catch(() => {});
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download(
+                '/material/planManagement/export',
+                {
+                    ...this.queryParams,
+                },
+                `type_${new Date().getTime()}.xlsx`,
+            )
+        },
+    },
+}
 </script>
 <style lang="scss" scoped>
 ::v-deep.el-table .fixed-width .el-button--mini {
-  width: 60px !important;
-  margin-bottom: 10px;
+    width: 60px !important;
+    margin-bottom: 10px;
 }
 </style>
\ No newline at end of file
diff --git a/sgzb-ui/src/views/store/newBuy/planSecond.vue b/sgzb-ui/src/views/store/newBuy/planSecond.vue
index 9367235f..5b550c63 100644
--- a/sgzb-ui/src/views/store/newBuy/planSecond.vue
+++ b/sgzb-ui/src/views/store/newBuy/planSecond.vue
@@ -1,109 +1,162 @@
 <template>
-  <div class="app-container" id="planSecond">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="80px"
-    >
-      <el-form-item label="名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入名称"
-          clearable
-          maxlength="50"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+    <div class="app-container" id="planSecond">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="80px"
+        >
+            <el-form-item label="名称" prop="name">
+                <el-input
+                    v-model="queryParams.name"
+                    placeholder="请输入名称"
+                    clearable
+                    maxlength="50"
+                    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-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="['store:labelType:add']"
-        >计划借调</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['store:labelType:export']"
-        >导出</el-button>
-      </el-col>
+        <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="['store:labelType:add']"
+                    >计划借调</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="warning"
+                    plain
+                    icon="el-icon-download"
+                    size="mini"
+                    @click="handleExport"
+                    v-hasPermi="['store:labelType:export']"
+                    >导出</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">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="序号" align="center" width="80" type="index">
-          <template scope="scope">
-          <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
-          </template>
-      </el-table-column>
-      <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
-      <el-table-column
-        label="规格型号"
-        align="center"
-        prop="typeModelName"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column label="单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
-      <el-table-column
-        label="借出方单位"
-        align="center"
-        prop="borrowerCompany"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="原计划数"
-        align="center"
-        prop="borrowerOrigPlanNum"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="现计划数"
-        align="center"
-        prop="borrowerNowPlanNum"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="借入方单位"
-        align="center"
-        prop="lenderCompany"
-        :show-overflow-tooltip="true"
-      />
+        <el-table v-loading="loading" :data="typeList">
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column
+                label="序号"
+                align="center"
+                width="80"
+                type="index"
+            >
+                <template slot-scope="scope">
+                    <span>{{
+                        (queryParams.pageNum - 1) * 10 + scope.$index + 1
+                    }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="物资名称"
+                align="center"
+                prop="typeName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="规格型号"
+                align="center"
+                prop="typeModelName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="单位"
+                align="center"
+                prop="unitName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="借出方单位"
+                align="center"
+                prop="borrowerCompany"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="原计划数"
+                align="center"
+                prop="borrowerOrigPlanNum"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="现计划数"
+                align="center"
+                prop="borrowerNowPlanNum"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="借入方单位"
+                align="center"
+                prop="lenderCompany"
+                :show-overflow-tooltip="true"
+            />
 
-      <!--      <el-table-column label="原计划数" align="center" prop="dictName" :show-overflow-tooltip="true" />-->
-      <el-table-column
-        label="现有计划数"
-        align="center"
-        prop="lenderNowPlanNum"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column label="借调数量" align="center" prop="borrowNum" :show-overflow-tooltip="true" />
-      <el-table-column label="操作人" align="center" prop="createBy" :show-overflow-tooltip="true" />
-      <el-table-column label="操作时间" align="center" prop="createTime" :show-overflow-tooltip="true" />
+            <!--      <el-table-column label="原计划数" align="center" prop="dictName" :show-overflow-tooltip="true" />-->
+            <el-table-column
+                label="现有计划数"
+                align="center"
+                prop="lenderNowPlanNum"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="借调数量"
+                align="center"
+                prop="borrowNum"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="操作人"
+                align="center"
+                prop="createBy"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="操作时间"
+                align="center"
+                prop="createTime"
+                :show-overflow-tooltip="true"
+            />
 
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+            <el-table-column
+                label="备注"
+                align="center"
+                prop="remark"
+                :show-overflow-tooltip="true"
+            />
 
-      <!-- <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+            <!-- <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -121,396 +174,440 @@
           >删除</el-button>
         </template>
       </el-table-column>-->
-    </el-table>
+        </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
-      <el-form
-        :model="dialogParams"
-        ref="dialogForm"
-        size="small"
-        :inline="true"
-        :rules="rules"
-        v-show="showSearch"
-        label-width="100px"
-      >
-        <el-form-item label="借出方单位" prop="borrowUnitId">
-          <el-select
-            v-model="dialogParams.borrowUnitId"
-            filterable
-            placeholder="请选择借出方单位"
-            style="width: 100%;"
-            @change="changeUnit"
-          >
-            <el-option
-              v-for="item in unitList"
-              :key="item.unitId"
-              :label="item.unitName"
-              :value="item.unitId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="借入方单位" prop="needUnitId">
-          <el-select
-            v-model="dialogParams.needUnitId"
-            filterable
-            placeholder="请选择借入方单位"
-            style="width: 100%;"
-            @change="changeUnit"
-          >
-            <el-option
-              v-for="item in unitList"
-              :key="item.unitId"
-              :label="item.unitName"
-              :value="item.unitId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="关键字" prop="name">
-          <el-input
-            v-model="dialogParams.name"
-            placeholder="请输入关键字"
-            clearable
-            maxlength="50"
-            style="width: 240px"
-            @keyup.enter.native="handledialogQuery"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handledialogQuery">查询</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resedialogtQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-
-      <el-table
-        ref="table"
-        v-loading="loading"
-        :data="dialogList"
-        height="500px"
-        @selection-change="handleSelectionDialog"
-      >
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" align="center" width="80" type="index">
-            <template scope="scope">
-            <span>{{ (dialogParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
-            </template>
-        </el-table-column>
-        <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
-        <el-table-column
-          label="规格型号"
-          align="center"
-          prop="typeModelName"
-          :show-overflow-tooltip="true"
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
         />
-        <el-table-column label="单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
-        <el-table-column
-          label="剩余计划数"
-          align="center"
-          prop="lenderOrigPlanNum"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="借调数量"
-          align="center"
-          class-name="small-padding fixed-width"
-          prop="borrowNum"
-          width="210"
-        >
-          <template slot-scope="scope">
-            <el-input-number
-              v-model="scope.row.borrowNum"
-              @input="validateBorrowNum(scope,'borrowNum')"
-              :min="1"
-              :max="Number(scope.row.lenderOrigPlanNum)"
-              placeholder="请输入借调数量"
-              controls-position="right"
-              clearable
-            />
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="备注"
-          prop="remark"
-          align="center"
-          class-name="small-padding fixed-width"
-          width="200"
-        >
-          <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.remark"
-              @input="validateBorrowNum(scope,'remark')"
-              placeholder="请输入备注"
-              clearable
-            />
-          </template>
-        </el-table-column>
-      </el-table>
 
-      <pagination
-        v-show="dialogtotal>0"
-        :total="dialogtotal"
-        :page.sync="dialogParams.pageNum"
-        :limit.sync="dialogParams.pageSize"
-        @pagination="getUnitList"
-      />
+        <!-- 添加或修改参数配置对话框 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="open"
+            width="1000px"
+            append-to-body
+        >
+            <el-form
+                :model="dialogParams"
+                ref="dialogForm"
+                size="small"
+                :inline="true"
+                :rules="rules"
+                v-show="showSearch"
+                label-width="100px"
+            >
+                <el-form-item label="借出方单位" prop="borrowUnitId">
+                    <el-select
+                        v-model="dialogParams.borrowUnitId"
+                        filterable
+                        placeholder="请选择借出方单位"
+                        style="width: 100%"
+                        @change="changeUnit"
+                    >
+                        <el-option
+                            v-for="item in unitList"
+                            :key="item.unitId"
+                            :label="item.unitName"
+                            :value="item.unitId"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="借入方单位" prop="needUnitId">
+                    <el-select
+                        v-model="dialogParams.needUnitId"
+                        filterable
+                        placeholder="请选择借入方单位"
+                        style="width: 100%"
+                        @change="changeUnit"
+                    >
+                        <el-option
+                            v-for="item in unitList"
+                            :key="item.unitId"
+                            :label="item.unitName"
+                            :value="item.unitId"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="关键字" prop="name">
+                    <el-input
+                        v-model="dialogParams.name"
+                        placeholder="请输入关键字"
+                        clearable
+                        maxlength="50"
+                        style="width: 240px"
+                        @keyup.enter.native="handledialogQuery"
+                    />
+                </el-form-item>
+                <el-form-item>
+                    <el-button
+                        type="primary"
+                        icon="el-icon-search"
+                        size="mini"
+                        @click="handledialogQuery"
+                        >查询</el-button
+                    >
+                    <el-button
+                        icon="el-icon-refresh"
+                        size="mini"
+                        @click="resedialogtQuery"
+                        >重置</el-button
+                    >
+                </el-form-item>
+            </el-form>
 
-      <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
+            <el-table
+                ref="table"
+                v-loading="loading"
+                :data="dialogList"
+                height="500px"
+                @selection-change="handleSelectionDialog"
+            >
+                <el-table-column type="selection" width="55" align="center" />
+                <el-table-column
+                    label="序号"
+                    align="center"
+                    width="80"
+                    type="index"
+                >
+                    <template slot-scope="scope">
+                        <span>{{
+                            (dialogParams.pageNum - 1) * 10 + scope.$index + 1
+                        }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    label="物资名称"
+                    align="center"
+                    prop="typeName"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="规格型号"
+                    align="center"
+                    prop="typeModelName"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="单位"
+                    align="center"
+                    prop="unitName"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="剩余计划数"
+                    align="center"
+                    prop="lenderOrigPlanNum"
+                    :show-overflow-tooltip="true"
+                />
+                <el-table-column
+                    label="借调数量"
+                    align="center"
+                    class-name="small-padding fixed-width"
+                    prop="borrowNum"
+                    width="210"
+                >
+                    <template slot-scope="scope">
+                        <el-input-number
+                            v-model="scope.row.borrowNum"
+                            @input="validateBorrowNum(scope, 'borrowNum')"
+                            :min="1"
+                            :max="Number(scope.row.lenderOrigPlanNum)"
+                            placeholder="请输入借调数量"
+                            controls-position="right"
+                            clearable
+                        />
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    label="备注"
+                    prop="remark"
+                    align="center"
+                    class-name="small-padding fixed-width"
+                    width="200"
+                >
+                    <template slot-scope="scope">
+                        <el-input
+                            v-model="scope.row.remark"
+                            @input="validateBorrowNum(scope, 'remark')"
+                            placeholder="请输入备注"
+                            clearable
+                        />
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <pagination
+                v-show="dialogtotal > 0"
+                :total="dialogtotal"
+                :page.sync="dialogParams.pageNum"
+                :limit.sync="dialogParams.pageSize"
+                @pagination="getUnitList"
+            />
+
+            <div slot="footer" class="dialog-footer" style="text-align: center">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
 import {
-  listType,
-  getType,
-  delType,
-  addType,
-  updateType,
-  refreshCache
-} from "@/api/system/dict/type";
-import { getunitInfoAll } from "@/api/store/tools";
+    listType,
+    getType,
+    delType,
+    addType,
+    updateType,
+    refreshCache,
+} from '@/api/system/dict/type'
+import { getunitInfoAll } from '@/api/store/tools'
 import {
-  getPlanList,
-  addOrUpdateMange,
-  getManageList
-} from "@/api/store/newBuy";
+    getPlanList,
+    addOrUpdateMange,
+    getManageList,
+} from '@/api/store/newBuy'
 
 export default {
-  name: "PlanSecond",
-  dicts: ["sys_normal_disable"],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      dialogtotal: 0,
-      //借出方单位
-      unitList: [],
-      dialogList: [],
+    name: 'PlanSecond',
+    dicts: ['sys_normal_disable'],
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            dialogtotal: 0,
+            //借出方单位
+            unitList: [],
+            dialogList: [],
 
-      // 字典表格数据
-      typeList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        name: undefined
-      },
-      //弹窗查询参数
-      dialogParams: {
-        pageNum: 1,
-        pageSize: 10,
-        borrowUnitId: undefined,
-        needUnitId: undefined,
-        name: undefined
-      },
-      // 弹窗表单
-      dialogForm: {
-        checkDetailsList: [],
-        borrowUnitId: undefined,
-        needUnitId: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        borrowUnitId: [
-          { required: true, message: "借出方单位不能为空", trigger: "blur" }
-        ],
-        needUnitId: [
-          { required: true, message: "借入方单位不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询字典类型列表 */
-    getList() {
-      this.loading = true;
-      getManageList(this.queryParams).then(response => {
-        this.typeList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    handledialogQuery() {
-      this.dialogParams.pageNum = 1;
-      this.getUnitList();
-    },
-    resedialogtQuery() {
-      this.resetForm("dialogForm");
-      this.handledialogQuery();
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        dictId: undefined,
-        dictName: undefined,
-        dictType: undefined,
-        status: "0",
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "计划借调";
-      this.getunitInfoAll();
-    },
-    // 多选框选中数据
-    // handleSelectionChange(selection) {
-    //   this.ids = selection.map(item => item);
-    //   this.single = selection.length != 1;
-    //   this.multiple = !selection.length;
-    // },
-    /** 借调单位数据 */
-    getunitInfoAll() {
-      getunitInfoAll().then(response => {
-        this.unitList = response.rows;
-      });
-      this.resedialogtQuery();
-    },
-    // 借出借入方单位改变
-    changeUnit(val) {
-      if (this.dialogParams.needUnitId == this.dialogParams.borrowUnitId) {
-        this.$modal.msgError("借入方单位不能与借出方单位相同");
-        this.dialogParams.needUnitId = undefined;
-      } else {
-        this.getUnitList();
-      }
-    },
-    //获取计划借调列表
-    getUnitList() {
-      getPlanList(this.dialogParams).then(res => {
-        this.dialogList = res.rows;
-        this.dialogtotal = res.total;
-      });
-    },
-    //多选框选中数据
-    handleSelectionDialog(checkDetailsList) {
-      this.dialogForm.checkDetailsList = checkDetailsList;
-    },
-    // 验证
-    validateBorrowNum(scope, str) {
-      const selectedRowIndex = this.dialogForm.checkDetailsList.findIndex(
-        row => row.planId === scope.row.planId
-      );
-      if (selectedRowIndex !== -1) {
-        this.dialogForm.checkDetailsList.splice(selectedRowIndex, 1);
-        this.$refs.table.toggleRowSelection(scope.row, false);
-        if (str == "remark") {
-          this.$message.warning("请先输入备注再进行勾选操作");
-        } else {
-          this.$message.warning("请先输入借调数量再进行勾选操作");
+            // 字典表格数据
+            typeList: [],
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                name: undefined,
+            },
+            //弹窗查询参数
+            dialogParams: {
+                pageNum: 1,
+                pageSize: 10,
+                borrowUnitId: undefined,
+                needUnitId: undefined,
+                name: undefined,
+            },
+            // 弹窗表单
+            dialogForm: {
+                checkDetailsList: [],
+                borrowUnitId: undefined,
+                needUnitId: undefined,
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+                borrowUnitId: [
+                    {
+                        required: true,
+                        message: '借出方单位不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                needUnitId: [
+                    {
+                        required: true,
+                        message: '借入方单位不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+            },
         }
-      }
     },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      // this.reset();
-      // const dictId = row.dictId || this.ids
-      // getType(dictId).then(response => {
-      //   this.form = response.data;
-      //   this.open = true;
-      //   this.title = "修改";
-      // });
+    created() {
+        this.getList()
     },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["dialogForm"].validate(valid => {
-        if (valid) {
-          this.dialogForm.needUnitId = this.dialogParams.needUnitId;
-          this.dialogForm.borrowUnitId = this.dialogParams.borrowUnitId;
-          if (this.dialogForm.checkDetailsList.length > 0) {
-            this.dialogForm.checkDetailsList.forEach(row => {
-              if ("lenderOrigPlanNum" in row) {
-                row.purchaseNum = row.lenderOrigPlanNum;
-                delete row.lenderOrigPlanNum;
-              }
-            });
-            addOrUpdateMange(this.dialogForm).then(res => {
-              if (res.code == 200) {
-                this.$message.success("借调成功");
-                this.open = false;
-                this.resetQuery();
-              } else {
-                this.$message.error("借调失败，请联系管理员");
-              }
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      // const dictIds = row.dictId || this.ids;
-      // this.$modal.confirm('是否确认删除该数据项？').then(function() {
-      //   return delType(dictIds);
-      // }).then(() => {
-      //   this.getList();
-      //   this.$modal.msgSuccess("删除成功");
-      // }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download(
-        "/material/planManagement/exportManage",
-        {
-          ...this.queryParams
+    methods: {
+        /** 查询字典类型列表 */
+        getList() {
+            this.loading = true
+            getManageList(this.queryParams).then((response) => {
+                this.typeList = response.rows
+                this.total = response.total
+                this.loading = false
+            })
         },
-        `type_${new Date().getTime()}.xlsx`
-      );
-    }
-  }
-};
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        handledialogQuery() {
+            this.dialogParams.pageNum = 1
+            this.getUnitList()
+        },
+        resedialogtQuery() {
+            this.resetForm('dialogForm')
+            this.handledialogQuery()
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                dictId: undefined,
+                dictName: undefined,
+                dictType: undefined,
+                status: '0',
+                remark: undefined,
+            }
+            this.resetForm('form')
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset()
+            this.open = true
+            this.title = '计划借调'
+            this.getunitInfoAll()
+        },
+        // 多选框选中数据
+        // handleSelectionChange(selection) {
+        //   this.ids = selection.map(item => item);
+        //   this.single = selection.length != 1;
+        //   this.multiple = !selection.length;
+        // },
+        /** 借调单位数据 */
+        getunitInfoAll() {
+            getunitInfoAll().then((response) => {
+                this.unitList = response.rows
+            })
+            this.resedialogtQuery()
+        },
+        // 借出借入方单位改变
+        changeUnit(val) {
+            if (
+                this.dialogParams.needUnitId == this.dialogParams.borrowUnitId
+            ) {
+                this.$modal.msgError('借入方单位不能与借出方单位相同')
+                this.dialogParams.needUnitId = undefined
+            } else {
+                this.getUnitList()
+            }
+        },
+        //获取计划借调列表
+        getUnitList() {
+            getPlanList(this.dialogParams).then((res) => {
+                this.dialogList = res.rows
+                this.dialogtotal = res.total
+            })
+        },
+        //多选框选中数据
+        handleSelectionDialog(checkDetailsList) {
+            this.dialogForm.checkDetailsList = checkDetailsList
+        },
+        // 验证
+        validateBorrowNum(scope, str) {
+            const selectedRowIndex = this.dialogForm.checkDetailsList.findIndex(
+                (row) => row.planId === scope.row.planId,
+            )
+            if (selectedRowIndex !== -1) {
+                this.dialogForm.checkDetailsList.splice(selectedRowIndex, 1)
+                this.$refs.table.toggleRowSelection(scope.row, false)
+                if (str == 'remark') {
+                    this.$message.warning('请先输入备注再进行勾选操作')
+                } else {
+                    this.$message.warning('请先输入借调数量再进行勾选操作')
+                }
+            }
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            // this.reset();
+            // const dictId = row.dictId || this.ids
+            // getType(dictId).then(response => {
+            //   this.form = response.data;
+            //   this.open = true;
+            //   this.title = "修改";
+            // });
+        },
+        /** 提交按钮 */
+        submitForm: function () {
+            this.$refs['dialogForm'].validate((valid) => {
+                if (valid) {
+                    this.dialogForm.needUnitId = this.dialogParams.needUnitId
+                    this.dialogForm.borrowUnitId =
+                        this.dialogParams.borrowUnitId
+                    if (this.dialogForm.checkDetailsList.length > 0) {
+                        this.dialogForm.checkDetailsList.forEach((row) => {
+                            if ('lenderOrigPlanNum' in row) {
+                                row.purchaseNum = row.lenderOrigPlanNum
+                                delete row.lenderOrigPlanNum
+                            }
+                        })
+                        addOrUpdateMange(this.dialogForm).then((res) => {
+                            if (res.code == 200) {
+                                this.$message.success('借调成功')
+                                this.open = false
+                                this.resetQuery()
+                            } else {
+                                this.$message.error('借调失败，请联系管理员')
+                            }
+                        })
+                    }
+                }
+            })
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            // const dictIds = row.dictId || this.ids;
+            // this.$modal.confirm('是否确认删除该数据项？').then(function() {
+            //   return delType(dictIds);
+            // }).then(() => {
+            //   this.getList();
+            //   this.$modal.msgSuccess("删除成功");
+            // }).catch(() => {});
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download(
+                '/material/planManagement/exportManage',
+                {
+                    ...this.queryParams,
+                },
+                `type_${new Date().getTime()}.xlsx`,
+            )
+        },
+    },
+}
 </script>
 <style lang="scss" scoped>
 ::v-deep.el-table .fixed-width .el-button--mini {
-  width: 60px !important;
-  margin-bottom: 10px;
+    width: 60px !important;
+    margin-bottom: 10px;
 }
 </style>
\ No newline at end of file