Merge branch 'main' of http://62.234.3.186:3000/sxyanzhu/YanZhuProject

# Conflicts:
#	yanzhu-mapper/src/main/resources/mapper/base/BaseAssetsTypeMapper.xml

yanzhu-common/src/main/java/com/yanzhu/common/core/domain/entity/SysDept.java

@@ -52,6 +52,16 @@ public class SysDept extends BaseEntity
     /** 父部门名称 */
     private String parentName;
     
+    private String unit;
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
     /** 子部门 */
     private List<SysDept> children = new ArrayList<SysDept>();
 
@@ -197,7 +207,7 @@ public class SysDept extends BaseEntity
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
+            .append("unit", getUnit())
             .toString();
     }
 }

yanzhu-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -20,10 +20,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="createTime" column="create_time" />
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
+		<result property="unit" column="unit" />
 	</resultMap>
 	
 	<sql id="selectDeptVo">
-        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
+        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time,d.unit
         from sys_dept d
     </sql>
     
@@ -99,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="email != null and email != ''">email,</if>
  			<if test="status != null">status,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
+			<if test="unit != null and unit != ''">unit,</if>
  			create_time
  		)values(
  			<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -111,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="email != null and email != ''">#{email},</if>
  			<if test="status != null">#{status},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
+		    <if test="unit != null and unit != ''">#{unit},</if>
  			sysdate()
  		)
 	</insert>
@@ -127,6 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="email != null">email = #{email},</if>
  			<if test="status != null and status != ''">status = #{status},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+			<if test="unit != null and unit != ''">unit = #{unit},</if>
  			update_time = sysdate()
  		</set>
  		where dept_id = #{deptId}

yanzhu-ui/src/views/base/assetsType/index.vue

@@ -1,57 +1,29 @@
 <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="parentId">
+      <el-form-item label="公司名称" prop="compyId">
-        <el-input
+        <el-select v-model="queryParams.compyId" placeholder="请选择公司名称" @change="doCompyChange">
-          v-model="queryParams.parentId"
+          <el-option v-for="it in compyOpts" :key="it.deptId" :label="it.deptName" :value="it.deptId" />
-          placeholder="请输入父级分类"
+        </el-select>
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
-      <el-form-item label="单位主键" prop="deptId">
+
-        <el-input
+      <el-form-item label="项目名称" prop="defaultDeptId">
-          v-model="queryParams.deptId"
+        <el-select v-model="queryParams.defaultDeptId" placeholder="请选择项目名称">
-          placeholder="请输入单位主键"
+          <el-option v-for="it in prjOpts" :key="it.deptId" :label="it.deptName" :value="it.deptId" />
-          clearable
+        </el-select>
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
+
       <el-form-item label="资产类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择资产类型" clearable>
-          <el-option
+          <el-option v-for="dict in dict.type.pro_assets_type" :key="dict.value" :label="dict.label"
-            v-for="dict in dict.type.pro_assets_type"
+            :value="dict.value" />
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
         </el-select>
       </el-form-item>
       <el-form-item label="资产名称" prop="name">
-        <el-input
+        <el-input v-model="queryParams.name" placeholder="请输入资产名称" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.name"
-          placeholder="请输入资产名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="资产单位" prop="unit">
-        <el-input
+        <el-input v-model="queryParams.unit" placeholder="请输入资产单位" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.unit"
-          placeholder="请输入资产单位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否删除" prop="isDel">
-        <el-select v-model="queryParams.isDel" placeholder="请选择是否删除" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_is_del"
-            :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>
@@ -61,95 +33,53 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          type="primary"
+          v-hasPermi="['base:assetsType:add']">新增</el-button>
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['base:assetsType:add']"
-        >新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          type="success"
+          v-hasPermi="['base:assetsType:edit']">修改</el-button>
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['base:assetsType:edit']"
-        >修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          type="danger"
+          v-hasPermi="['base:assetsType:remove']">删除</el-button>
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['base:assetsType:remove']"
-        >删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          type="warning"
+          v-hasPermi="['base:assetsType:export']">导出</el-button>
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['base:assetsType:export']"
-        >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="assetsTypeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="主键" align="center" prop="id" width="55"/>
-      <el-table-column label="父级分类" align="center" prop="parentId" />
+      <el-table-column label="资产类型" align="center" prop="type" width="120">
-      <el-table-column label="单位主键" align="center" prop="deptId" />
-      <el-table-column label="资产类型" align="center" prop="type">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.pro_assets_type" :value="scope.row.type" />
         </template>
       </el-table-column>
-      <el-table-column label="资产名称" align="center" prop="name" />
+      <el-table-column label="资产名称" align="left" prop="name">
-      <el-table-column label="资产单位" align="center" prop="unit" />
-      <el-table-column label="是否删除" align="center" prop="isDel">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_is_del" :value="scope.row.isDel"/>
+          <el-tag v-if="!scope.row.deptId" effect="dark" type="danger">系统</el-tag>
+          {{ scope.row.name }}                      
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="资产单位" align="center" prop="unit" />            
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
         <template slot-scope="scope">
-          <el-button
+          <template v-if="scope.row.deptId">
-            size="mini"
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            type="text"
+            v-hasPermi="['base:assetsType:edit']">修改</el-button>
-            icon="el-icon-edit"
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            @click="handleUpdate(scope.row)"
+            v-hasPermi="['base:assetsType:remove']">删除</el-button>
-            v-hasPermi="['base:assetsType:edit']"
+          </template>
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['base:assetsType:remove']"
-          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      v-show="total>0"
+      @pagination="getList" />
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改物资类型对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -162,12 +92,8 @@
         </el-form-item>
         <el-form-item label="资产类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择资产类型">
-            <el-option
+            <el-option v-for="dict in dict.type.pro_assets_type" :key="dict.value" :label="dict.label"
-              v-for="dict in dict.type.pro_assets_type"
+              :value="dict.value"></el-option>
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="资产名称" prop="name">
@@ -178,12 +104,8 @@
         </el-form-item>
         <el-form-item label="是否删除" prop="isDel">
           <el-select v-model="form.isDel" placeholder="请选择是否删除">
-            <el-option
+            <el-option v-for="dict in dict.type.sys_is_del" :key="dict.value" :label="dict.label"
-              v-for="dict in dict.type.sys_is_del"
+              :value="dict.value"></el-option>
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -200,12 +122,15 @@
 
 <script>
 import { listAssetsType, getAssetsType, delAssetsType, addAssetsType, updateAssetsType } from "@/api/base/assetsType";
-
+import { listDept } from '@/api/system/dept'
 export default {
   name: "AssetsType",
   dicts: ['pro_assets_type', 'sys_is_del'],
   data() {
     return {
+      depOpts: [],
+      compyOpts: [],
+      prjOpts: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -229,7 +154,8 @@ export default {
         pageNum: 1,
         pageSize: 10,
         parentId: null,
-        deptId: null,
+        compyId: null,
+        defaultDeptId: null,
         type: null,
         name: null,
         unit: null,
@@ -243,9 +169,27 @@ export default {
     };
   },
   created() {
+    listDept().then(d => {
+      this.depOpts = d.data || [];
+      this.compyOpts = this.depOpts.filter(it => it.parentId == 100)
+      if (this.compyOpts.length > 0) {
+        this.queryParams.compyId = this.compyOpts[0].deptId;
+        this.prjOpts = this.depOpts.filter(it => it.parentId == this.queryParams.compyId);
+        if (this.prjOpts.length > 0) {
+          this.queryParams.defaultDeptId = this.prjOpts[0].deptId;
           this.getList();
+        }
+      }
+    });
+
   },
   methods: {
+    doCompyChange(a) {
+      this.prjOpts = this.depOpts.filter(it => it.parentId == this.queryParams.compyId);
+      if (this.prjOpts.length > 0) {
+        this.queryParams.defaultDeptId = this.prjOpts[0].deptId;
+      }
+    },
     /** 查询物资类型列表 */
     getList() {
       this.loading = true;
@@ -289,7 +233,8 @@ export default {
       this.handleQuery();
     },
     // 多选框选中数据
-    handleSelectionChange(selection) {
+    handleSelectionChange(sel) {
+      let selection=sel.filter(d=>d.deptId);
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length