基础管理

This reverts commit d6af3ebf80.

package.json

@@ -36,7 +36,7 @@
     "url": "http://192.168.0.56:3000/bonus/Bonus-Cloud.git"
   },
   "dependencies": {
-    "@riophae/vue-treeselect": "0.4.0",
+    "@riophae/vue-treeselect": "^0.4.0",
     "axios": "0.24.0",
     "clipboard": "2.0.8",
     "core-js": "^3.38.1",

src/api/base/base.js

@@ -0,0 +1,325 @@
+import request from '@/utils/request'
+
+// 工程项目-列表
+export function getProjectList(query) {
+  return request({
+    url: '/material/bm_project/list',
+    method: 'get',
+    params: query
+  })
+}
+//工程项目--新增
+export function addProject(data) {
+  return request({
+    url: '/material/bm_project',
+    method: 'post',
+    data: data
+  })
+}
+
+// 工程项目--修改
+export function updateProject(data) {
+  return request({
+    url: '/material/bm_project',
+    method: 'put',
+    data: data
+  })
+}
+// //工程项目--删除
+export function delProject(proId) {
+  return request({
+    url: '/material/bm_project/' + proId,
+    method: 'delete'
+  })
+}
+
+// 工程项目
+export function getProjectUserList(query) {
+  return request({
+    url: '/material/bm_unit_person/getDeptUserTree',
+    method: 'get',
+    params: {
+      query,  
+      isTree: 1 // 添加 isTree 参数
+    }
+  });
+}
+// 标段工程-列表
+export function ProjectLotList(query) {
+  return request({
+    url: '/material/base/bmProjectLot/projectLotAll',
+    method: 'get',
+    params: query
+  })
+}
+//标段工程--新增
+export function addProjectLot(data) {
+  return request({
+    url: '/material/base/bmProjectLot',
+    method: 'post',
+    data: data
+  })
+}
+
+// 标段工程--修改
+export function updateProjectLot(data) {
+  return request({
+    url: '/material/base/bmProjectLot',
+    method: 'put',
+    data: data
+  })
+}
+//标段工程--删除
+export function delProjectLot(lotId) {
+  return request({
+    url: '/material/base/bmProjectLot/' + lotId,
+    method: 'delete'
+  })
+}
+//工程项目下拉数据
+export function getProjectSelect(data) {
+  return request({
+    url: '/material/base/bmProjectInfo/getProjectLot',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 往来单位-列表
+export function unitInfoAll(query) {
+  return request({
+    url: '/material/bm_unit/list',
+    method: 'get',
+    params: query
+  })
+}
+//往来单位--新增
+export function addUnit(data) {
+  return request({
+    url: '/material/bm_unit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 往来单位--修改
+export function updateUnit(data) {
+  return request({
+    url: '/material/bm_unit',
+    method: 'put',
+    data: data
+  })
+}
+// 往来单位--删除
+export function delUnit(unitId) {
+  return request({
+    url: '/material/bm_unit/' + unitId,
+    method: 'delete'
+  })
+}
+
+
+// 往来单位-人员配置-左侧人员
+export function getUserList(query) {
+  return request({
+    url: '/material/bm_unit_person/getDeptUserTree',
+    method: 'get',
+    params: query
+  })
+}
+
+// 往来单位-人员配置-右侧单位
+export function getTypeList(query) {
+  return request({
+    url: '/material/bm_unit/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 往来单位-人员配置-保存按钮
+export function unitPersonAll(query) {
+  return request({
+    url: '/material/bm_unit_person/bind',
+    method: 'post',
+    data: query
+  })
+}
+
+// 往来单位-人员配置-解绑
+export function delUnitPerson(unitId) {
+  return request({
+    url: '/material/bm_unit_person/' + unitId,
+    method: 'delete'
+  })
+}
+
+
+// 字典表数据库
+// 单位类型-列表
+export function unitTypeList(query) {
+  return request({
+    url: '/material/bm_unit_type/list',
+    method: 'get',
+    params: query
+  })
+}
+// 单位类型-列表-下拉
+export function unitTypeListAll(query) {
+  return request({
+    url: '/material/bm_unit_type/list',
+    method: 'get',
+    params: query
+  })
+}
+// 标签编号-列表
+export function getMaMachineLabelApi(query) {
+  return request({
+    url: '/material/base/maMachineLabel/list',
+    method: 'get',
+    params: query
+  })
+}
+//单位类型--新增
+export function addMaMachineLabelApi(data) {
+  return request({
+    url: '/material/bm_unit_type',
+    method: 'post',
+    data: data
+  })
+}
+// 单位类型-详情
+export function unitTypeDetail(typeId) {
+  return request({
+    url: `/material/bm_unit_type/${typeId}`,
+    method: 'get',
+  })
+}
+//单位类型--新增
+export function addUnitType(data) {
+  return request({
+    url: '/material/bm_unit_type',
+    method: 'post',
+    data: data
+  })
+}
+
+// 单位类型--修改
+export function updateUnitType(data) {
+  return request({
+    url: '/material/bm_unit_type',
+    method: 'put',
+    data: data
+  })
+}
+
+export function statusUnitType(data) {
+  return request({
+    url: '/material/base/dic/status',
+    method: 'put',
+    params: data
+  })
+}
+
+//单位类型--删除
+export function delUnitType(typeIds) {
+  return request({
+    url: '/material/bm_unit_type/' + typeIds,
+    method: 'delete'
+  })
+}
+
+
+
+// 资产属性管理-列表
+export function propInfoList(query) {
+  return request({
+    url: '/material/bm_asset_attributes/list',
+    method: 'get',
+    params: query
+  })
+}
+//资产属性管理--新增
+export function addPropInfo(data) {
+  return request({
+    url: '/material/bm_asset_attributes',
+    method: 'post',
+    data: data
+  })
+}
+
+// 资产属性管理--修改
+export function updatePropInfo(data) {
+  return request({
+    url: '/material/bm_asset_attributes',
+    method: 'put',
+    data: data
+  })
+}
+//资产属性管理--删除
+export function delPropInfo(id) {
+  return request({
+    url: `/material/bm_asset_attributes/${id}`,
+    method: 'delete'
+  })
+}
+
+// 资产属性管理-详情
+export function PropDetail(id) {
+  return request({
+    url: `/material/bm_asset_attributes/${id}`,
+    method: 'get',
+  })
+}
+
+
+
+// // 资产属性配置-左侧人员
+// export function getProLists(query) {
+//   return request({
+//     url: '/material/base/maPropInfo/lists',
+//     method: 'get',
+//     params: query
+//   })
+// }
+
+// // 资产属性配置-右侧list
+// export function getMaTypeList(query) {
+//   return request({
+//     url: '/material/base/maPropInfo/getMaTypeList',
+//     method: 'get',
+//     params: query
+//   })
+// }
+
+// // 资产属性配置-保存按钮
+// export function savePropInfo(query) {
+//   return request({
+//     url: '/material/base/maPropInfo/save',
+//     method: 'post',
+//     data: query
+//   })
+// }
+
+// // 资产属性配置-解绑
+// export function UnbindPropInfo(unitId) {
+//   return request({
+//     url: '/material/base/maPropSet/' + unitId,
+//     method: 'delete'
+//   })
+// }
+
+
+// 获取设备信息-qrCode
+export function getMachineByQrCode(query) {
+  return request({
+    url: '/material/base/machine/getMachineByQrCode',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
+

src/views/base/assetAttributeManagement/index.vue

@@ -0,0 +1,395 @@
+<template>
+  <div class="app-container" id="assetAttributeManagement">
+      <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="100px"
+      >
+          <el-form-item label="资产类型名称" prop="assetName">
+              <el-input
+                  v-model="queryParams.assetName"
+                  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-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-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="propInfoList"
+          border
+          @selection-change="handleSelectionChange"
+      >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column
+              align="center"
+              label="序号"
+              type="index"
+              prop="id"
+          />
+          <el-table-column
+              label="资产类型名称"
+              align="center"
+              prop="assetName"
+              :show-overflow-tooltip="true"
+          />
+          <!-- <el-table-column
+              label="所属上级"
+              align="center"
+              prop="deptName"
+              :show-overflow-tooltip="true"
+          /> -->
+          <el-table-column
+              label="资产编码"
+              align="center"
+              prop="assetCode"
+              :show-overflow-tooltip="true"
+          />
+
+          <!-- <el-table-column
+              label="状态"
+              align="center"
+              prop="status"
+              width="140"
+          >
+              <template slot-scope="scope">
+                  <el-switch
+                      active-value="0"
+                      inactive-value="1"
+                      @change="changeStatus(scope.row)"
+                      v-model="scope.row.status"
+                  ></el-switch>
+              </template>
+          </el-table-column> -->
+          <el-table-column label="操作" align="center" width="140">
+              <template slot-scope="scope">
+                  <el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-edit"
+                      @click="handleUpdate(scope.row)"
+                      >编辑</el-button
+                  >
+                  <el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-delete"
+                      @click="handleDelete(scope.row)"
+                      >删除</el-button
+                  >
+              </template>
+          </el-table-column>
+      </el-table>
+
+      <!-- 添加或修改参数配置对话框 -->
+      <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="assetName">
+                  <el-input
+                      v-model="form.assetName"
+                      placeholder="请输入资产类型名称"
+                      maxlength="60"
+                  />
+              </el-form-item>
+          
+              <el-form-item label="资产编码" prop="assetCode">
+                  <el-input
+                      v-model="form.assetCode"
+                      placeholder="请输入资产编码"
+                      maxlength="60"
+                  />
+              </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 {
+//   refreshCache,
+// } from '@/api/system/dict/type'
+import {
+  addPropInfo,
+  delPropInfo,
+  propInfoList,
+  updatePropInfo,
+} from '@/api/base/base'
+// import { deptTreeSelect } from '@/api/system/user'
+// import Treeselect from '@riophae/vue-treeselect'
+// import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+export default {
+  name: 'AssetAttributeManagement',
+  dicts: ['sys_normal_disable'],
+  // components: { Treeselect },
+  data() {
+      return {
+          // 遮罩层
+          loading: true,
+          // 选中数组
+          ids: [],
+          // 非单个禁用
+          single: true,
+          // 非多个禁用
+          multiple: true,
+          // 显示搜索条件
+          showSearch: true,
+          // 总条数
+          total: 0,
+          assetCode:'',
+          assetName:'',
+          // 字典表格数据
+          propInfoList: [],
+          deptOptions: [],
+          // 弹出层标题
+          title: '',
+          // 是否显示弹出层
+          open: false,
+          // 日期范围
+          dateRange: [],
+          // 查询参数
+          queryParams: {
+              pageNum: 1,
+              pageSize: 10,
+              assetName: undefined,
+              assetCode: undefined,
+              dictType: undefined,
+              status: undefined,
+          },
+          // 表单参数
+          form: {
+              id: undefined,
+              assetName: undefined,
+              assetCode: undefined,
+          },
+          // 表单校验
+          rules: {
+            assetName: [
+                  {
+                      required: true,
+                      message: '资产类型名称不能为空',
+                      trigger: 'blur',
+                  },
+              ],
+              // deptId: [
+              //     {
+              //         required: true,
+              //         message: '所属上级不能为空',
+              //         trigger: 'blur',
+              //     },
+              // ],
+              assetCode: [
+                  {
+                      required: true,
+                      message: '资产类型编码不能为空',
+                      trigger: 'blur',
+                  },
+              ],
+          },
+      }
+  },
+  created() {
+      this.getList()
+      // this.getDeptTree()
+  },
+  methods: {
+      // /** 查询部门下拉树结构 */
+      // getDeptTree() {
+      //     deptTreeSelect().then((response) => {
+      //         this.deptOptions = response.data
+      //     })
+      // },
+      //更新状态
+      changeStatus(row) {
+          let param = {
+              id: row.id,
+        
+          }
+          updatePropInfo(param).then((response) => {
+              this.getList()
+          })
+      },
+      /** 查询列表 */
+      getList() {
+          this.loading = true
+          propInfoList(this.queryParams).then((response) => {
+              this.propInfoList = response.rows
+              this.total = response.total
+              this.loading = false
+          })
+      },
+      // 取消按钮
+      cancel() {
+          this.open = false
+          this.reset()
+      },
+      // 表单重置
+      reset() {
+          this.form = {}
+          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.id)
+          this.single = selection.length != 1
+          this.multiple = !selection.length
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+          this.form.assetName = row.assetName
+          this.form.assetCode = row.assetCode
+          this.form.id = row.id
+          console.log(row,"row")
+          propInfoList({ id: row.id }).then((response) => {
+              this.form.id = response.row.id
+          })
+          this.open = true
+          this.title = '编辑'
+      },
+      /** 提交按钮 */
+      submitForm: function () {
+          this.$refs['form'].validate((valid) => {
+              if (valid) {
+                  if (this.form.id != undefined) {
+                      updatePropInfo(this.form).then((response) => {
+                        console.log(response,"response")
+                          this.$modal.msgSuccess('修改成功')
+                          this.open = false
+                          this.getList()
+                      })
+                  } else {
+                      console.log(this.form)
+                      addPropInfo(this.form).then((response) => {
+                          this.$modal.msgSuccess('新增成功')
+                          this.open = false
+                          this.getList()
+                      })
+                  }
+              }
+          })
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+          const propIds = row.id
+          this.$modal
+              .confirm('是否确认删除该数据项？')
+              .then(function () {
+                  return delPropInfo(propIds)
+              })
+              .then(() => {
+                  this.getList()
+                  this.$modal.msgSuccess('删除成功')
+              })
+              .catch(() => {})
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+          this.download(
+              'material/base/maPropInfo/export',
+              {
+                  ...this.queryParams,
+                  dataCondition: this.ids,
+              },
+              `资产属性_${new Date().getTime()}.xlsx`,
+          )
+      },
+      /** 刷新缓存按钮操作 */
+      // handleRefreshCache() {
+      //     refreshCache().then(() => {
+      //         this.$modal.msgSuccess('刷新成功')
+      //         this.$store.dispatch('dict/cleanDict')
+      //     })
+      // },
+  },
+}
+</script>

src/views/base/comeAndGo/index.vue

@@ -47,16 +47,16 @@
                     >新建</el-button
                 >
             </el-col>
-            <!-- <el-col :span="1.5">
+            <el-col :span="1.5">
                 <el-button
-                    type="success"
+                    type="primary"
                     plain
-                    icon="el-icon-edit"
+                    icon="el-icon-plus"
                     size="mini"
                     @click="handlePeople"
                     >人员配置</el-button
                 >
-            </el-col> -->
+            </el-col>
             <el-col :span="1.5">
                 <el-button
                     type="warning"
@@ -64,7 +64,17 @@
                     icon="el-icon-download"
                     size="mini"
                     @click="handleExport"
-                    >导出</el-button
+                    >导入数据</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>
 
@@ -82,12 +92,10 @@
         >
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column
-                align="center"
                 label="序号"
-                type="index"
+                prop="unitId"
-                :index="
+                width="100"
-                    indexContinuation(queryParams.pageNum, queryParams.pageSize)
+                align="center"
-                "
             />
             <el-table-column
                 label="单位名称"
@@ -102,9 +110,9 @@
                 :show-overflow-tooltip="true"
             />
             <el-table-column
-                label="所属上级"
+                label="所属分公司"
                 align="center"
-                prop="deptName"
+                prop="deptId"
                 :show-overflow-tooltip="true"
             />
             <el-table-column
@@ -119,7 +127,7 @@
                 prop="telphone"
                 :show-overflow-tooltip="true"
             />
-            <el-table-column
+            <!-- <el-table-column
                 label="状态"
                 align="center"
                 prop="status"
@@ -134,7 +142,7 @@
                     >
                     </el-switch>
                 </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="操作" align="center" width="140">
                 <template slot-scope="scope">
                     <el-button
@@ -195,21 +203,21 @@
                     >
                         <el-option
                             v-for="item in typeList"
-                            :key="item.id"
+                            :key="item.typeId"
-                            :label="item.name"
+                            :label="item.typeName"
-                            :value="item.id"
+                            :value="item.typeId"
                             v-if="item.status != '1'"
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="所属上级" prop="deptId">
+                <el-form-item label="所属分公司" prop="deptId">
                     <treeselect
                         v-model="form.deptId"
                         :options="deptOptions"
                         noChildrenText="没有数据了"
                         noOptionsText="没有数据"
                         noResultsText="没有搜索结果"
-                        placeholder="请选择所属上级"
+                        placeholder="请选择所属分公司"
                         @select="select"
                         @input="resetValidation"
                     />
@@ -244,8 +252,8 @@
 </template>
 
 <script>
-// import { addUnit, delUnit, unitInfoAll, updateUnit } from '@/api/base/base'
+import { addUnit, delUnit, unitInfoAll, updateUnit } from '@/api/base/base'
-// import { unitTypeListAll } from '@/api/base/base'
+import { unitTypeListAll } from '@/api/base/base'
 import { deptTreeSelect } from '@/api/system/user'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
@@ -291,6 +299,7 @@ export default {
                 dictType: undefined,
                 status: undefined,
                 dataCondition: [],
+                typeId:undefined
             },
             // 表单参数
             form: {},
@@ -313,7 +322,7 @@ export default {
                 deptId: [
                     {
                         required: true,
-                        message: '所属上级不能为空',
+                        message: '所属分公司不能为空',
                         trigger: 'blur',
                     },
                 ],
@@ -328,14 +337,14 @@ export default {
     methods: {
         //获取单位类型
         getType() {
-            unitTypeListAll({ id: '1' }).then((response) => {
+            unitTypeListAll({}).then((response) => {
-                this.typeList = response.rows
+                this.typeList = response.data.rows
             })
         },
-        selecType(id) {
+        selecType(typeId) {
             this.typeList.forEach((item) => {
-                if (item.id == id) {
+                if (item.typeId === typeId) {
-                    this.form.typeName = item.name
+                    this.form.typeName = item.typeName
                 }
             })
         },
@@ -384,6 +393,8 @@ export default {
                 dictType: undefined,
                 status: '0',
                 remark: undefined,
+                typeId: undefined,
+                typeName: undefined
             }
             this.resetForm('form')
         },
@@ -405,7 +416,9 @@ export default {
             this.title = '新建'
         },
         handlePeople(row) {
-            this.$router.push('/material/base/comeAndGoPeople')
+            this.$router.push({
+                path:'/base/comeAndGoPeople'
+            })
         },
         // 多选框选中数据
         handleSelectionChange(selection) {

src/views/base/comeAndGo/people.vue

@@ -17,7 +17,6 @@
         <div class="head-container">
           <el-tree
             :data="deptOptions"
-            :props="defaultProps"
             :expand-on-click-node="false"
             :filter-node-method="filterNode"
             ref="tree"
@@ -69,11 +68,11 @@
               icon="el-icon-plus"
               size="mini"
               @click="handleSave"
-              >保存</el-button
+              >绑定</el-button
             >
           </el-col>
 
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button
               type="info"
               plain
@@ -82,7 +81,7 @@
               @click="handleImport"
               >导入</el-button
             >
-          </el-col>
+          </el-col> -->
           <!-- <el-col :span="1.5">
             <el-button
               type="warning"
@@ -123,7 +122,7 @@
             prop="typeName"
           />
           <el-table-column
-            label="所属上级"
+            label="所属分公司"
             align="center"
             key="deptName"
             prop="deptName"
@@ -160,7 +159,7 @@
             width="160"
             class-name="small-padding fixed-width"
           >
-            <template slot-scope="scope" v-if="scope.row.userId !== 1">
+            <template slot-scope="scope" v-if="scope.row.isBind === 1">
               <el-button
                 size="mini"
                 type="text"
@@ -382,10 +381,9 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
-// import { getUserList, getTypeList, unitPersonAll, delUnitPerson } from "@/api/base/base";
-
 
+import { deptTreeSelect } from "@/api/system/user";
+import { getUserList, getTypeList, unitPersonAll, delUnitPerson } from "@/api/base/base";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -430,10 +428,10 @@ export default {
       roleOptions: [],
       // 表单参数
       form: {},
-      defaultProps: {
+      // defaultProps: {
-        children: "children",
+      //   children: "children",
-        label: "nickName"
+      //   // label: "nickName"
-      },
+      // },
       // 用户导入参数
       upload: {
         // 是否显示弹出层（用户导入）
@@ -510,7 +508,8 @@ export default {
     /** 查询人员列表 */
     getUserList() {
       getUserList({ userName: this.userName }).then(response => {
-        this.deptOptions = response.rows;
+        console.log('response',response)
+        this.deptOptions = response.data
         // this.total = response.total;
       }
       );
@@ -539,8 +538,8 @@ export default {
     },
     // 节点单击事件
     handleNodeClick(data) {
-      console.log(data)
+      console.log('data',data)
-      this.chosenUserId = data.userId;
+      this.chosenUserId = data.id;
       this.queryParams.userId = data.userId;
       // this.getList()
       // this.queryParams.deptId = data.id;
@@ -592,10 +591,21 @@ export default {
     handleSave() {
       console.log(this.chosenUserId, 'chosenUserId')
       console.log(this.ids, 'ids')
-      if(this.chosenUserId){
+
+      if( this.ids.length < 1) {
+        this.$modal.msgError('请勾选需要绑定的单位!')
+        return
+      }
+
+      if(!this.chosenUserId) {
+        this.$modal.msgError("请先选择配置人员！")
+        return
+      }
+
+      
       let param = {
           userId: this.chosenUserId,
-          unitId: this.ids[0]
+          unitIdList: this.ids
         }
         unitPersonAll(param).then(response => {
           if (response.code == 200) {
@@ -605,11 +615,7 @@ export default {
             })
             this.getList();
           }
-        });
+        })
-      }else{
-        this.$modal.msgError("请先选择配置人员！");
-      }
-    
     },
 
     /** 修改按钮操作 */
@@ -664,11 +670,11 @@ export default {
         ...this.queryParams
       }, `user_${new Date().getTime()}.xlsx`)
     },
-    /** 导入按钮操作 */
+    // /** 导入按钮操作 */
-    handleImport() {
+    // handleImport() {
-      this.upload.title = "用户导入";
+    //   this.upload.title = "用户导入";
-      this.upload.open = true;
+    //   this.upload.open = true;
-    },
+    // },
     /** 下载模板操作 */
     importTemplate() {
       this.download('system/user/importTemplate', {

src/views/base/project/index.vue

@@ -0,0 +1,584 @@
+<template>
+    <div class="app-container" id="project">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="100px"
+        >
+            <el-form-item label="工程项目名称" prop="proName">
+                <el-input
+                    v-model="queryParams.proName"
+                    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-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-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="projectList"
+            @selection-change="handleSelectionChange"
+            border
+        >
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column
+                align="center"
+                label="序号"
+                type="index"
+                prop="id"
+            />
+            <el-table-column
+                label="工程项目名称"
+                align="center"
+                prop="proName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="实施单位"
+                align="center"
+                prop="typeName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="工程类型"
+                align="center"
+                prop="typeName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="i8工程编码"
+                align="center"
+                prop="deptName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="是否匹配i8工程"
+                align="center"
+                prop="linkMan"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="合同主体"
+                align="center"
+                prop="linkMan"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="项目经理"
+                align="center"
+                prop="linkMan"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="联系电话"
+                align="center"
+                prop="telphone"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="工程状态"
+                align="center"
+                prop="status"
+                width="140"
+            >
+                <template slot-scope="scope">
+                    <el-switch
+                        active-value="0"
+                        inactive-value="1"
+                        @change="changeStatus(scope.row)"
+                        v-model="scope.row.status"
+                    ></el-switch>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="140">
+                <template slot-scope="scope">
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-edit"
+                        @click="handleUpdate(scope.row)"
+                        >编辑</el-button
+                    >
+                    <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="新建工程"
+            :visible.sync="open"
+            width="700px"
+            append-to-body
+            :close-on-click-modal="false"
+        >
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          label-width="120px"
+        >
+          <el-form-item label="工程名称" prop="proName">
+            <el-input
+              v-model="form.proName"
+              placeholder="请输入工程名称"
+              maxlength="50"
+            />
+          </el-form-item>
+          <el-form-item label="实施单位" prop="projectStatus">
+            <el-select
+              v-model="form.projectStatus"
+              filterable
+              placeholder="请选择实施单位"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="status in unitList"
+                :key="status.value"
+                :label="status.label"
+                :value="status.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="工程状态" prop="projectStatus">
+            <el-select
+              v-model="form.projectStatus"
+              filterable
+              placeholder="请选择工程状态"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="status in projectStatuses"
+                :key="status.value"
+                :label="status.label"
+                :value="status.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="项目经理" prop="projectManager">
+            <el-input
+              v-model="form.projectManager"
+              placeholder="请输入项目经理姓名"
+              maxlength="20"
+            />
+          </el-form-item>
+          <el-form-item label="合同主体单位" prop="contractingEntity">
+            <el-input
+              v-model="form.contractingEntity"
+              placeholder="请输入合同主体单位"
+              maxlength="50"
+            />
+          </el-form-item>
+          <el-form-item label="i8工程ID" prop="i8ProjectId">
+            <el-input
+              v-model="form.i8ProjectId"
+              placeholder="请输入i8工程ID"
+              maxlength="50"
+            />
+          </el-form-item>
+        <el-form-item label="备注" prop="i8ProjectId">
+          <el-input
+            type="textarea"
+            placeholder="请输入内容"
+            v-model="textarea"
+            maxlength="100"
+            show-word-limit
+            >
+         </el-input>
+        </el-form-item>
+        </el-form>
+      </el-col>
+      
+      <el-col :span="12">
+        <el-form
+          label-width="120px"
+        >
+          <el-form-item label="工程编号" prop="projectNo">
+            <el-input
+              v-model="form.projectNo"
+              placeholder="请输入工程编号"
+              maxlength="50"
+            />
+          </el-form-item>
+          <el-form-item label="工程类型" prop="projectStatus">
+            <el-select
+              v-model="form.projectStatus"
+              filterable
+              placeholder="请选择工程状态"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="status in projectStatuses"
+                :key="status.value"
+                :label="status.label"
+                :value="status.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="工程性质" prop="projectNature">
+            <el-select
+              v-model="form.projectNature"
+              filterable
+              placeholder="请选择工程性质"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="nature in projectNatures"
+                :key="nature.value"
+                :label="nature.label"
+                :value="nature.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="联系电话" prop="telephone">
+            <el-input
+              v-model="form.telephone"
+              placeholder="请输入联系电话"
+              maxlength="11"
+              onkeyup="this.value = this.value.replace(/[^\d]/g, '')"
+            />
+          </el-form-item>
+          <el-form-item label="所属项目中心" prop="projectCenter">
+            <el-input
+              v-model="form.projectCenter"
+              placeholder="请输入所属项目中心"
+              maxlength="50"
+            />
+          </el-form-item>
+          <el-form-item label="关联i8工程" prop="relatedI8Project">
+            <el-input
+              v-model="form.relatedI8Project"
+              placeholder="输入搜索关键词"
+            />
+          </el-form-item>
+        </el-form>
+      </el-col>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="submitForm" :loading="isLoading">确 定</el-button>
+      <el-button @click="cancel">取 消</el-button>
+    </div>
+  </el-dialog>
+    </div>
+</template>
+
+<script>
+import {
+    addProject,
+    delProject,
+    getProjectList,
+    updateProject,
+    getProjectUserList,
+} from '@/api/base/base'
+// import { unitTypeList } from '@/api/base/base'
+// import { deptTreeSelect } from '@/api/system/user'
+// import Treeselect from '@riophae/vue-treeselect'
+// import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+export default {
+    name: 'Project',
+    dicts: ['sys_normal_disable'],
+    // components: { Treeselect },
+    data() {
+        return {
+            textarea: '',
+            isLoading: false,
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 表格数据
+            projectList: [],
+            //字典数据
+            typeList: [],
+            unitList:[],
+            // 部门树选项
+            deptOptions: undefined,
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            // 日期范围
+            dateRange: [],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                proName: undefined,
+            },
+            // 表单参数
+            form: {},
+            chosenData: {},
+            // 表单校验
+            rules: {
+                proName: [
+                    {
+                        required: true,
+                        message: '工程项目名称不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                typeId: [
+                    {
+                        required: true,
+                        message: '单位类型不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                deptId: [
+                    {
+                        required: true,
+                        message: '所属上级不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+            },
+        }
+    },
+    created() {
+        // this.getType()
+        // this.getDeptTree()
+        this.getList()
+    },
+    methods: {
+        // //获取工程类型
+        // getType() {
+        //     unitTypeList({ id: '5' }).then((response) => {
+        //         this.typeList = response.rows
+        //     })
+        // },
+        selecType(id) {
+            // this.typeList.forEach(item => {
+            //   if(item.id == id){
+            //     this.form.typeName = item.name
+            //   }
+            // });
+        },
+        /** 查询部门下拉树结构 */
+        getDeptTree() {
+            deptTreeSelect().then((response) => {
+                this.deptOptions = response.data
+            })
+        },
+        select(row) {
+            // console.log(row.label)
+            // this.form.deptName = row.label;
+        },
+
+        /** 查询字典类型列表 */
+        getList() {
+            this.loading = true
+            getProjectList(this.queryParams).then((response) => {
+                this.projectList = response.rows
+                this.total = response.total
+                this.loading = false
+            })
+        },
+        // 取消按钮
+        cancel() {
+            this.form = this.chosenData
+            this.open = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                proId: undefined,
+                proName: 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.proId)
+            this.single = selection.length != 1
+            this.multiple = !selection.length
+        },
+        changeStatus(row) {
+            let param = {
+                proId: row.proId,
+                status: row.status,
+            }
+            updateProject(param).then((response) => {
+                this.getList()
+            })
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset()
+            getProjectList({ proId: row.proId }).then((response) => {
+                this.form = response.rows[0]
+            })
+            this.open = true
+            this.title = '编辑'
+            // });
+        },
+        /** 提交按钮 */
+        submitForm: function () {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    this.isLoading = true
+                    if (this.form.proId != undefined) {
+                        updateProject(this.form)
+                            .then((response) => {
+                                this.$modal.msgSuccess('修改成功')
+                                this.open = false
+                                this.isLoading = false
+                                this.getList()
+                            })
+                            .catch(() => {
+                                this.isLoading = false
+                            })
+                    } else {
+                        addProject(this.form)
+                            .then((response) => {
+                                this.$modal.msgSuccess('新增成功')
+                                this.open = false
+                                this.isLoading = false
+                                this.getList()
+                            })
+                            .catch(() => {
+                                this.isLoading = false
+                            })
+                    }
+                }
+            })
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const proIds = row.proId || this.ids
+            this.$modal
+                .confirm('是否确认删除所选择的数据项？')
+                .then(function () {
+                    return delProject(proIds)
+                })
+                .then(() => {
+                    this.getList()
+                    this.$modal.msgSuccess('删除成功')
+                })
+                .catch(() => {})
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download(
+                'material/base/bmProjectInfo/export',
+                {
+                    ...this.queryParams,
+                    dataCondition: this.ids,
+                },
+                `工程项目_${new Date().getTime()}.xlsx`,
+            )
+        },
+        /** 刷新缓存按钮操作 */
+        // handleRefreshCache() {
+        //     refreshCache().then(() => {
+        //         this.$modal.msgSuccess('刷新成功')
+        //         this.$store.dispatch('dict/cleanDict')
+        //     })
+        // },
+    },
+}
+</script>

src/views/base/unit/index.vue

@@ -0,0 +1,441 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+    >
+      <el-form-item prop="typeName">
+        <el-input
+          v-model="queryParams.typeName"
+          placeholder="请输入类型名称"
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+        >查询</el-button
+        >
+        <el-button
+          icon="el-icon-refresh"
+          size="mini"
+          @click="resetQuery"
+        >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:role:add']"
+        >新增</el-button
+        >
+      </el-col>
+
+      <el-col :span="1.5">
+        <el-button
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:role:export']"
+        >导入数据</el-button
+        >
+      </el-col>
+
+      <el-col :span="1.5">
+        <el-button
+          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"
+      border
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="序号"
+        prop="typeId"
+        width="100"
+        align="center"
+      />
+      <el-table-column
+        align="center"
+        label="单位类型"
+        prop="typeName"
+        :show-overflow-tooltip="true"
+        width="1000"
+      />
+
+<!--      <el-table-column label="状态" align="center">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-switch-->
+<!--            v-model="scope.row.status"-->
+<!--            active-value="0"-->
+<!--            inactive-value="1"-->
+<!--            @change="handleStatusChange(scope.row)"-->
+<!--          ></el-switch>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+
+      <el-table-column label="操作" align="center">
+        <template slot-scope="scope">
+          <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-dropdown>
+        </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
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="100px"
+      >
+        <el-form-item label="单位类型名称:" prop="typeName" label-width="130px">
+          <el-input
+            v-model="form.typeName"
+            placeholder="请输入单位类型名称"
+
+          />
+        </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
+      :close-on-click-modal="false"
+    >
+      <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"
+            @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 {
+  addUnitType,
+  delUnitType,
+  unitTypeList,
+  updateUnitType,
+  statusUnitType,
+  unitTypeDetail,
+} from '@/api/base/base'
+
+export default {
+  name: 'Unit',
+  dicts: ['sys_normal_disable'],
+  data() {
+    return {
+      isLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 字典表格数据
+      typeList: [],
+      // 弹出层标题
+      title: '',
+      typeId:'',
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        // id: '1',
+        name: '',
+      },
+      // 表单参数
+      form: {
+        pId: '1',
+        typeName: undefined,
+        typeId:undefined
+      },
+      // 表单校验
+      rules: {
+        typeName: [
+          {
+            required: true,
+            message: '单位类型名称不能为空',
+            trigger: 'blur',
+          },
+        ],
+        // dictType: [
+        //   { required: true, message: "字典类型不能为空", trigger: "blur" }
+        // ]
+      },
+      roleList:[]
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询字典类型列表 */
+    getList() {
+      this.loading = true
+      unitTypeList(this.queryParams).then((response) => {
+        this.roleList = response.data.rows
+        this.total = response.data.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        // pId: '1',
+        status: '0',
+        // name: 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.id)
+      this.single = selection.length != 1
+      this.multiple = !selection.length
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      // this.reset()
+      this.form.typeName = row.typeName
+      console.log('修改',typeof row.typeId)
+      unitTypeDetail(row.typeId).then((response) => {
+        // this.form = response.rows[0]
+        this.form.typeId=response.data.typeId
+      })
+      // this.form = row;
+      this.open = true
+      this.title = '编辑'
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.isLoading = true
+
+          if (this.form.typeId != undefined) {
+            updateUnitType(this.form)
+              .then((response) => {
+                this.$modal.msgSuccess('修改成功')
+                this.open = false
+                this.isLoading = false
+                this.getList()
+              })
+              .catch(() => {
+                this.isLoading = false
+              })
+          } else {
+            addUnitType(this.form)
+              .then((response) => {
+                this.$modal.msgSuccess('新增成功')
+                this.open = false
+                this.isLoading = false
+                this.getList()
+              })
+              .catch(() => {
+                this.isLoading = false
+              })
+          }
+        }
+      })
+    },
+    changeStatus(row) {
+      let param = {
+        id: row.id,
+        status: row.status,
+      }
+      statusUnitType(param).then((response) => {
+        this.getList()
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const pIds = row.typeId || this.ids
+      this.$modal
+        .confirm('是否确认删除所选择的数据项？')
+        .then(function () {
+          return delUnitType(pIds)
+        })
+        .then(() => {
+          this.getList()
+          this.$modal.msgSuccess('删除成功')
+        })
+        .catch(() => {})
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        '/material/base/dic/export',
+        {
+          ...this.queryParams,
+          dataCondition: this.ids,
+        },
+        `单位类型_${new Date().getTime()}.xlsx`,
+      )
+    },
+  },
+}
+</script>