Merge branch 'feature_1.0' into qa

quanyawei

2023-09-27 656ce346afe1b0ea56b6f89e4453a49a536abef6

Merge branch 'feature_1.0' into qa

 src/locales/zh_CN.ts

@@ -91,7 +91,7 @@
    'menu.list.searchtable': '查询表格',

    'menu.list.role': '角色配置',

    'menu.list.menu': '菜单配置',

    'menu.list.unit': '系统管理',

    'menu.list.unit': '责任单位维护',

    'menu.list.devicesBasic': '设备配置',

    'menu.list.devicesVersion': '型号配置',

    'menu.list.devicesMonitorPoint': '监测站点管理',

@@ -122,7 +122,7 @@
    'menu.account.logout': '退出登录',

    'menu.list.basic':'基本信息',

    'menu.list.changeunit':'单位转换',

    'menu.system': '系统管理',

    'menu.system': '责任单位维护',

    'menu.system.account': '账户管理',

    'menu.system.logmanage':'日志管理',

    'menu.system.dictmanage':'字典管理',


 src/route/authority.router.ts

@@ -36,7 +36,7 @@
      name: '/authority/unit',

      component: () => import('@/views/list/Unit.vue'),

      meta: {

        title: '系统管理',

        title: '责任单位维护',

        routerGuard: true,

        i18n:`menu.list.unit`

      },


 src/views/list/Unit.vue

@@ -80,6 +80,7 @@
          <a-cascader
            v-model="editForm.parentCode"
            placeholder="请选择"
            change-on-select
            :options="newParentListOptions"
            @change="positionLevel"
            :disabled="pageState === 'view'"
@@ -200,7 +201,7 @@
        unitName:'',
        parentCode: [],
        areaCode:'',
        state:Number,
        state:'0',
    }

  private pagination:any={
@@ -296,6 +297,7 @@
            size: 20
        }).then(res=>{
          this.dataSource =res.data.data.item
          this.pagination.total = res.data.data.total
        })
        .catch(err=>{
            console.log(err);
@@ -326,7 +328,7 @@
            parentCode: code,
            parentCodeList:this.editForm.parentCode,
            areaCode: this.editForm.areaCode,
            state:this.editForm.state
            state:parseInt(this.editForm.state)
        }).then((res: any) => {
           this.handleSearch()
          this.visibleCreateModal = false
@@ -334,7 +336,7 @@
            unitName:'',
            parentCode: [],
            areaCode:'',
            state: Number,
            state: '0',
            parentCodeList:[]
          }
        }).catch((err)=>{
@@ -355,7 +357,7 @@
        unitName:'',
        parentCode: [],
        areaCode:'',
        state: Number,
        state: '0',
        parentCodeList:[]
      }
    }
@@ -364,7 +366,7 @@
        unitName:'',
        parentCode: [],
        areaCode:'',
        state: Number,
        state: '0',
        parentCodeList:[]
      }
      this.visibleInvalidityModal = false;
@@ -488,46 +490,8 @@
    console.log('1111',text)
    console.log('2222',record)
    console.log('333', index)
      if (record.state==='1') { 
        if (record.isInvalid ===0) {
       if (record.state ==='0') {
       return   <div>
            <a onClick = {
                () => this.handleUpdateModalVisible(true, record)
            } > 编辑 </a>
          <a-divider type='vertical' />
              <a onClick = {
                () => this.handleDetailModalVisible(true, record)
            } > 详情 </a>
            <a-divider type = 'vertical'  / >
            <a v-show="record.state !=='1'" onClick={ () => this.handleAssert(record)
              } >生效</a>
            <a-divider type = 'vertical' />
            <a v-show="record.isInvalid !=='0'" onClick = {
                () => this.handleInvalidity(record)
            } >作废</a>
            </div>
        } else {
           return   <div>
            <a onClick = {
                () => this.handleUpdateModalVisible(true, record)
            } > 编辑 </a>
          <a-divider type='vertical' />
              <a onClick = {
                () => this.handleDetailModalVisible(true, record)
            } > 详情 </a>
            <a-divider type = 'vertical'  / >
            <a v-show="record.state !=='1'" onClick={ () => this.handleAssert(record)
              } >生效</a>
           
            </div>
        }
      } else {
          if (record.isInvalid ===0) {
       return   <div>
            <a onClick = {
                () => this.handleUpdateModalVisible(true, record)
            } > 编辑 </a>
          <a-divider type='vertical' />
              <a onClick = {
                () => this.handleDetailModalVisible(true, record)
            } > 详情 </a>
@@ -539,14 +503,13 @@
        } else {
           return   <div>
            <a onClick = {
                () => this.handleUpdateModalVisible(true, record)
            } > 编辑 </a>
          <a-divider type='vertical' />
              <a onClick = {
                () => this.handleDetailModalVisible(true, record)
            } > 详情 </a>
            <a-divider type='vertical' />
             <a onClick = {
                () => this.handleUpdateModalVisible(true, record)
            } > 编辑 </a>
            </div>
        }
    }
      this.handleSearch();
    }

 src/views/passport/login/successLoginRoutee.ts

@@ -68,7 +68,7 @@
    name: '/authority/unit',

    component: () => import(/* webpackChunkName: "list" */ '@/views/list/Unit.vue'),

    meta: {

        title: '系统管理',

        title: '责任单位维护',

        routerGuard: true

    },

}