提交代码

2024-08-29 23:22:38 +08:00 · 2024-08-29 23:22:38 +08:00 · c45600e26a
parent fcf673fdae
commit c45600e26a
1 changed files with 2 additions and 47 deletions
--- a/yanzhu-ui/src/views/base/assetsType/index.vue
+++ b/yanzhu-ui/src/views/base/assetsType/index.vue
@ -6,13 +6,11 @@
          <el-option v-for="it in compyOpts" :key="it.deptId" :label="it.deptName" :value="it.deptId" />
        </el-select>
      </el-form-item>
-
      <el-form-item label="项目名称" prop="defaultDeptId">
        <el-select v-model="queryParams.defaultDeptId" placeholder="请选择项目名称" @change="doPrjChange">
          <el-option v-for="it in prjOpts" :key="it.deptId" :label="it.deptName" :value="it.deptId" />
        </el-select>
      </el-form-item>
-
      <el-form-item label="资产类型" prop="type">
        <el-select v-model="queryParams.type" placeholder="请选择资产类型" clearable>
          <el-option v-for="dict in dict.type.sys_process_category" :key="dict.value" :label="dict.label"
@ -62,8 +60,7 @@
      <el-table-column label="资产名称" align="left" prop="name">
        <template slot-scope="scope">
          <el-tag v-if="!scope.row.deptId" effect="dark" type="danger">系统</el-tag>
-          {{ scope.row.name }}
-          <span style="margin-left:10px;"><span v-if="scope.row.parentId">{{scope.row.parentName +' > '}}</span>{{scope.row.name }}<span>
+          <span style="margin-left:10px;"><span v-if="scope.row.parentId">{{scope.row.parentName +' > '}}</span>{{scope.row.name}}</span>
        </template>
      </el-table-column>
      <el-table-column label="资产单位" align="center" prop="unit" />
@ -75,7 +72,6 @@
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
        <template slot-scope="scope">
-          <template v-if="scope.row.deptId">
          <template v-if="scope.row.deptId || !nonAdmin">
            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
              v-hasPermi="['base:assetsType:edit']">修改</el-button>
@ -96,25 +92,18 @@
    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body custom-class="assets-type-dialog" :close-on-click-modal="false"
             :close-on-press-escape="false">
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="公司名称">
        <el-form-item label="公司名称" v-if="nonAdmin">
          <el-input v-model="form.compName" disabled />
        </el-form-item>
-        <el-form-item label="项目名称">
        <el-form-item label="项目名称" v-if="nonAdmin">
          <el-input v-model="form.deptName" disabled />
        </el-form-item>
-        <el-form-item label="一级分类" prop="type">
-          <el-select v-model="form.type" placeholder="请选择资产类型" @change="doLvl1Change">
        <el-form-item label="资产类型" prop="type">
          <el-select v-model="form.type" placeholder="请选择资产类型" @change="doLvl1Change" style="width:100%">
            <el-option v-for="dict in dict.type.sys_process_category" :key="dict.value" :label="dict.label"
              :value="dict.value"></el-option>
          </el-select>
        </el-form-item>
-        <el-form-item label="二级分类" prop="parentId">
-          <el-select v-model="form.parentId" placeholder="请选择资产类型">
-            <el-option v-for="it in lvl2Opts" :key="it.id" :label="it.name" :value="it.id"></el-option>
        <el-form-item label="父级分类" prop="parentId">
          <el-select v-model="form.parentId" placeholder="请选择父级分类" style="width:100%">
            <el-option v-for="item in parentTypeOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
@ -123,11 +112,9 @@
        <el-form-item label="资产名称" prop="name">
          <el-input v-model="form.name" placeholder="请输入资产名称" />
        </el-form-item>
-        <el-form-item label="资产单位" prop="sunit">
        <el-form-item label="资产单位" prop="sunit" v-if="form.parentId">
          <el-input v-model="form.sunit" placeholder="请输入资产单位" />
        </el-form-item>
-        <div class="div-unit">
        <div class="div-unit" v-if="form.parentId">
          <el-tag v-for="(it, idx) in units" :class="{ 'is-selected': it.sel, 'is-del': it.del }" @close="doCloseTag(it, idx)"
            :closable="!it.sys" @click="doSelTag(it)" :key="idx">
@ -145,7 +132,6 @@
 </template>

 <script>
-import { listAssetsType, getAssetsType, delAssetsType, addAssetsType, updateAssetsType, listLevel2 } from "@/api/base/assetsType";
 import { listAssetsType, getAssetsType, delAssetsType, addAssetsType, updateAssetsType, listLevel2, findParentTypesByCategory } from "@/api/base/assetsType";
 import { listDept } from '@/api/system/dept'
 export default {
@ -179,7 +165,7 @@ export default {
      open: false,
      // 查询参数
      queryParams: {
-        parentId: -1,
+        parentId: 0,
        pageNum: 1,
        pageSize: 10,
        compyId: null,
@ -195,8 +181,6 @@ export default {
      rules: {
        type: [{ required: true, message: "资产类型不能为空", trigger: "change" }],
        name: [{ required: true, message: "资产名称不能为空", trigger: "blur" }]
-      }
-
      },
      parentTypeOptions:[],
      nonAdmin:true,
@ -241,11 +225,6 @@ export default {
      }
      tag.sel = !tag.sel;
    },
-    doLvl1Change(a) {
-      this.lvl2Opts = this.lvlDatas.filter(d => d.type == a);
-      if (this.lvl2Opts.length > 0) {
-        this.form.parentId = this.lvl2Opts[0].id;
-      }
    doLvl1Change(value) {
      // this.lvl2Opts = this.lvlDatas.filter(d => d.type == a);
      // if (this.lvl2Opts.length > 0) {
@ -309,7 +288,6 @@ export default {
      this.form = {
        id: null,
        parentId: null,
-        deptId: this.queryParams.defaultDeptId,
        deptId: this.nonAdmin?this.queryParams.defaultDeptId:null,
        type: null,
        name: null,
@ -327,14 +305,6 @@ export default {
      tmps = this.prjOpts.filter(d => d.deptId == this.form.deptId);
      this.form.deptName = tmps.length > 0 ? tmps[0].deptName : "";
      tmps = this.dict.type.sys_process_category
-      if (tmps.length > 0) {
-        this.form.type = tmps[0].value;
-        this.lvl2Opts = this.lvlDatas.filter(d => d.type == this.form.type);
-        if (this.lvl2Opts.length > 0) {
-          this.form.parentId = this.lvl2Opts[0].id;
-        }
-      }
-
      // if (tmps.length > 0) {
      //   this.form.type = tmps[0].value;
      //   this.lvl2Opts = this.lvlDatas.filter(d => d.type == this.form.type);
@ -372,20 +342,6 @@ export default {
    handleUpdate(row) {
      this.reset();
      const id = row.id || this.ids
-      let tmps=row.unit.split(",").filter(d=>d);
-      let uns=this.units.map(d=>d.text).join(",")
-      tmps.forEach(it=>{
-        if((","+uns+",").indexOf(","+it+",")==-1){
-          this.units.push({
-            text:it,
-            del:false,
-            sys:false
-          })
-        }
-      });
-      this.units.forEach(it=>{        
-        it.sel=(","+row.unit+",").indexOf(","+it.text+",")>=0;
-      });
      if(row.unit){
        let tmps=row.unit.split(",").filter(d=>d);
        let uns=this.units.map(d=>d.text).join(",")
@ -422,7 +378,6 @@ export default {
            tmps[0].unit = cusUnit;
          }
          this.doPrjChange(deptId)
-
          if (this.form.id != null) {
            updateAssetsType(this.form).then(response => {
              this.$modal.msgSuccess("修改成功");