冲突

liuyg

2021-08-10 17bed3a7f7e90b23afb5def223fd7a285ff6cc24

 src/views/zc/zc.vue

@@ -27,15 +27,23 @@
                   @click="handleDelete">删 除
        </el-button>
      </template>
    <template slot-scope="{row}" slot="type">
      <template slot-scope="{row}" slot="type">
        <el-tag>{{row.type==='0'?'未审核':row.type==='1'?'审核通过':'审核未通过'}}</el-tag>
      </template>
      <template slot-scope="{ row }" slot="examination_type">
        正常
      </template>

      <template slot-scope="{ row }" slot="examination_mx">
        正常
      </template>

      <template slot-scope="{row}"
                slot="roleName">
        <el-tag>{{row.roleName}}</el-tag>
      </template>
      <template slot-scope="scope" slot="menu">
        <el-button icon="el-icon-check" size="small"  @click.stop="handleEdit(scope.row,scope.index)">审核</el-button>
        <el-button icon="el-icon-check" size="small" @click.stop="handleEdit(scope.row,scope.index)">审核</el-button>
      </template>
    </avue-crud>

@@ -61,11 +69,11 @@
        },
        selectionList: [],
        option: {
          height:'auto',
          height: 'auto',
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,
          searchMenuSpan: 4,
          border: true,
          index: true,
          viewBtn: true,
@@ -76,8 +84,10 @@
          column: [
            {
              label: "账号",
              search: true,
              searchSpan: 4,
              display: false,
              disabled:true,
              disabled: true,
              prop: "username",
            },
            {
@@ -90,13 +100,17 @@
            {
              label: "姓名",
              display: false,
              disabled:true,
              searchSpan: 4,
              search: true,
              disabled: true,
              prop: "sname",
            },
            {
              label: "性别",
              display: false,
              disabled:true,
              searchSpan: 4,
              search: true,
              disabled: true,
              prop: "sex",
              type: "select",
              dicData: [
@@ -108,40 +122,43 @@
                  label: "女",
                  value: "2"
                }
            ],
              ],
            },
            {
              label: "手机号码",
              disabled:true,
              disabled: true,
              display: false,
              prop: "phone",
            },
            {
              label: "部门",
              disabled:true,
              display: false,
              prop: "deptid",
              type: "tree",
              dicUrl: "/api/blade-system/dept/selectInfo",
              props: {
                label: "dept_name",
                value: "deptid"
              },
              prop: "deptName",
              // type: "tree",
              // dicUrl: "/api/blade-system/dept/selectInfo",
              // props: {
              //   label: "title",
              //   value: "value"
              // },
            }, {
              label: "辖区",
              prop: "jurisdiction",
            },
            {
              label: "角色",
              prop: "parentId",
              hide: true,
              dicData: [],
              type: "tree",
              prop: "parentId",
              dicUrl: "/api/blade-system/role/tree",
              props: {
                label: "title"
                label: "title",
                value: "value"
              },
            },
            {
              label: "审核状态",
              prop: "type",
              search: true,
              slot: true,
              searchSpan: 4,
              type: "select",
              dicData: [
                {
@@ -158,7 +175,31 @@
                }

              ],
            }, {
              label: "审查状态",
              prop: "examination_type",
              slot: true,
              search: true,
              searchSpan: 4,
              display: false,
              type: "select",
              dicData: [
                {
                  label: "正常",
                  value: "0",
                },
                {
                  label: "异常",
                  value: "1",
                },
              ],
            },
            {
              label: "审查明细",
              prop: "examination_mx",
              display: false,
              slot: true,
            }
          ]
        },
        data: []
@@ -168,7 +209,7 @@
      ...mapGetters(["permission"]),
      permissionList() {
        return {
         addBtn: this.vaildData(this.permission.zc_add, false),
          addBtn: this.vaildData(this.permission.zc_add, false),
          viewBtn: this.vaildData(this.permission.zc_view, true),
          delBtn: this.vaildData(this.permission.zc_delete, false),
          editBtn: this.vaildData(this.permission.zc_edit, false)
@@ -183,14 +224,14 @@
      }
    },
    methods: {
      initData(){
      initData() {
        getRoleTree().then(res => {
          const column = this.findObject(this.option.column, "parentId");
          column.dicData = res.data.data;
        });
      },
      handleEdit (row, index) {
        this.initData();
      handleEdit(row, index) {
        // this.initData();
        this.$refs.crud.rowEdit(row, index);
      },
      rowSave(row, done, loading) {
@@ -283,10 +324,10 @@
        this.selectionList = [];
        this.$refs.crud.toggleSelection();
      },
      currentChange(currentPage){
      currentChange(currentPage) {
        this.page.currentPage = currentPage;
      },
      sizeChange(pageSize){
      sizeChange(pageSize) {
        this.page.pageSize = pageSize;
      },
      refreshChange() {