Merge branch 'branch20211008' of http://10.10.10.43:9090/income_payments/income_payments_client into xuqiubangeng1026

Conflicts: src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
2021-10-28 09:19:19 +08:00
parent 8801eb6388 09ad243c8f
commit 16a4842ebe
21 changed files with 373 additions and 258 deletions
@@ -26,7 +26,7 @@
        </a-col>
      </a-row>
      <!--      来款方式为合同的显示-->
-      <a-row :gutter="24" v-if="!!basicInfo.contractNum">
+      <a-row :gutter="24" v-if="basicInfo.chargeWay === 2">
        <a-col :span="12" class="detail-item">
          <label>{{ createIncomeType(basicInfo.projectType) }}：</label>
          <span>{{ basicInfo.chargeWay_dictText }}</span>
@@ -356,8 +356,6 @@ export default {
      } else {
        return '缴费方式'
      }
-
-
    }
  }
 }
@@ -4,6 +4,7 @@
    <contextmenu :itemList="menuItemList" :visible.sync="menuVisible" style="z-index: 9999;" @select="onMenuSelect"/>
    <!-- update-end- author:sunjianlei --- date:20191009 --- for: 提升右键菜单的层级 -->
    <a-tabs
+      v-show="showMenu"
      @contextmenu.native="e => onContextmenu(e)"
      v-if="multipage"
      :active-key="activePage"
@@ -39,6 +40,7 @@
  const indexKey = '/dashboard/analysis'
  import Vue from 'vue'
  import { CACHE_INCLUDED_ROUTES } from '@/store/mutation-types'
+  import {mapState} from 'vuex'

  export default {
    name: 'TabLayout',
@@ -77,6 +79,13 @@
        } else {
          return this.$store.state.app.multipage
        }
+      },
+      ...mapState({
+        // 系统名称 目的是监听是否是会员系统，会员系统隐藏菜单
+        system: state => state.user.system
+      }),
+      showMenu() {
+        return this.system !== 'member'
      }
    },
    created() {
@@ -1,6 +1,5 @@
 <template>
  <a-layout class="layout" :class="[device]">
-
    <template v-if="layoutMode === 'sidemenu'">
      <a-drawer
        v-if="device === 'mobile'"
@@ -22,7 +21,7 @@
      </a-drawer>

      <side-menu
-        v-show="device === 'desktop'"
+        v-show="device === 'desktop' && showMenu"
        mode="inline"
        :menus="menus"
        @menuSelect="myMenuSelect"
@@ -33,6 +32,7 @@
    <!-- 下次优化这些代码 -->
    <template v-else>
      <a-drawer
+        v-show="showMenu"
        v-if="device === 'mobile'"
        :wrapClassName="'drawer-sider ' + navTheme"
        placement="left"
@@ -62,6 +62,7 @@
        :collapsed="collapsed"
        :device="device"
        @toggle="toggle"
+        v-show="showMenu"
      />

      <!-- layout content -->
@@ -119,8 +120,13 @@ export default {
      // 主路由
      mainRouters: state => state.permission.addRouters,
      // 后台菜单
-      permissionMenuList: state => state.user.permissionList
-    })
+      permissionMenuList: state => state.user.permissionList,
+      // 系统名称 目的是监听是否是会员系统，会员系统隐藏菜单
+      system: state => state.user.system
+    }),
+    showMenu() {
+      return this.system !== 'member'
+    }
  },
  watch: {
    sidebarOpened(val) {
@@ -4,7 +4,7 @@
    <a-dropdown>
      <span class="action action-full ant-dropdown-link user-dropdown-menu">
        <a-avatar class="avatar" size="small" :src="getAvatar()"/>
-        <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>
+        <span v-if="isDesktop()"><j-ellipsis :value="`欢迎您，${nickname()}`" :length="10"></j-ellipsis></span>
      </span>
      <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
        <a-menu-item key="0">
@@ -19,9 +19,9 @@
            <span>账户设置</span>
          </router-link>
        </a-menu-item>
-        <a-menu-item key="3"  @click="systemSetting">
-           <a-icon type="tool"/>
-           <span>系统设置</span>
+        <a-menu-item key="3" @click="systemSetting">
+          <a-icon type="tool"/>
+          <span>系统设置</span>
        </a-menu-item>
        <a-menu-item key="4" @click="updatePassword">
          <a-icon type="setting"/>
@@ -35,17 +35,17 @@
          <a-icon type="sync"/>
          <span>清理缓存</span>
        </a-menu-item>
-       <!-- <a-menu-item key="2" disabled>
-          <a-icon type="setting"/>
-          <span>测试</span>
-        </a-menu-item>
-        <a-menu-divider/>
-        <a-menu-item key="3">
-          <a href="javascript:;" @click="handleLogout">
-            <a-icon type="logout"/>
-            <span>退出登录</span>
-          </a>
-        </a-menu-item>-->
+        <!-- <a-menu-item key="2" disabled>
+           <a-icon type="setting"/>
+           <span>测试</span>
+         </a-menu-item>
+         <a-menu-divider/>
+         <a-menu-item key="3">
+           <a href="javascript:;" @click="handleLogout">
+             <a-icon type="logout"/>
+             <span>退出登录</span>
+           </a>
+         </a-menu-item>-->
      </a-menu>
    </a-dropdown>
    <span class="action">
@@ -61,194 +61,201 @@
 </template>

 <script>
-  import HeaderNotice from './HeaderNotice'
-  import UserPassword from './UserPassword'
-  import SettingDrawer from '@/components/setting/SettingDrawer'
-  import DepartSelect from './DepartSelect'
-  import { mapActions, mapGetters,mapState } from 'vuex'
-  import { mixinDevice } from '@/utils/mixin.js'
-  import { getFileAccessHttpUrl,getAction } from '@/api/manage'
-  import Vue from 'vue'
-  import { UI_CACHE_DB_DICT_DATA } from '@/store/mutation-types'
+import HeaderNotice from './HeaderNotice'
+import UserPassword from './UserPassword'
+import SettingDrawer from '@/components/setting/SettingDrawer'
+import DepartSelect from './DepartSelect'
+import { mapActions, mapGetters, mapState } from 'vuex'
+import { mixinDevice } from '@/utils/mixin.js'
+import { getFileAccessHttpUrl, getAction } from '@/api/manage'
+import Vue from 'vue'
+import { UI_CACHE_DB_DICT_DATA } from '@/store/mutation-types'

-  export default {
-    name: 'UserMenu',
-    mixins: [mixinDevice],
-    data(){
-      return{
-        // update-begin author:sunjianlei date:20200219 for: 头部菜单搜索规范命名 --------------
-        searchMenuOptions:[],
-        searchMenuComp: 'span',
-        searchMenuVisible: false,
-        // update-begin author:sunjianlei date:20200219 for: 头部菜单搜索规范命名 --------------
+export default {
+  name: 'UserMenu',
+  mixins: [mixinDevice],
+  data() {
+    return {
+      // update-begin author:sunjianlei date:20200219 for: 头部菜单搜索规范命名 --------------
+      searchMenuOptions: [],
+      searchMenuComp: 'span',
+      searchMenuVisible: false
+      // update-begin author:sunjianlei date:20200219 for: 头部菜单搜索规范命名 --------------
+    }
+  },
+  components: {
+    HeaderNotice,
+    UserPassword,
+    DepartSelect,
+    SettingDrawer
+  },
+  props: {
+    theme: {
+      type: String,
+      required: false,
+      default: 'dark'
+    }
+  },
+  /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
+  created() {
+    let lists = []
+    this.searchMenus(lists, this.permissionMenuList)
+    this.searchMenuOptions = [...lists]
+  },
+  mounted() {
+    //如果是单点登录模式
+    if (process.env.VUE_APP_SSO == 'true') {
+      let depart = this.userInfo().orgCode
+      if (!depart) {
+        this.updateCurrentDepart()
      }
-    },
-    components: {
-      HeaderNotice,
-      UserPassword,
-      DepartSelect,
-      SettingDrawer
-    },
-    props: {
-      theme: {
-        type: String,
-        required: false,
-        default: 'dark'
+    }
+  },
+  computed: {
+    ...mapState({
+      // 后台菜单
+      permissionMenuList: state => state.user.permissionList
+
+    })
+  },
+  /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
+  watch: {
+    // update-begin author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框
+    device: {
+      immediate: true,
+      handler() {
+        this.searchMenuVisible = false
+        this.searchMenuComp = this.isMobile() ? 'a-modules' : 'span'
      }
-    },
+    }
+    // update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框
+  },
+  methods: {
    /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-    created() {
-      let lists = []
-      this.searchMenus(lists,this.permissionMenuList)
-      this.searchMenuOptions=[...lists]
+    showClick() {
+      this.searchMenuVisible = true
    },
-    mounted() {
-      //如果是单点登录模式
-      if (process.env.VUE_APP_SSO == 'true') {
-        let depart = this.userInfo().orgCode
-        if (!depart) {
-          this.updateCurrentDepart()
-        }
-      }
-    },
-    computed: {
-      ...mapState({
-        // 后台菜单
-        permissionMenuList: state => state.user.permissionList
-
-      })
+    hiddenClick() {
+      this.shows = false
    },
    /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-    watch: {
-      // update-begin author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框
-      device: {
-        immediate: true,
-        handler() {
-          this.searchMenuVisible = false
-          this.searchMenuComp = this.isMobile() ? 'a-modules' : 'span'
-        },
-      },
-      // update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框
+    ...mapActions(['Logout']),
+    ...mapGetters(['nickname', 'avatar', 'userInfo']),
+    getAvatar() {
+      return getFileAccessHttpUrl(this.avatar())
    },
-    methods: {
-      /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-      showClick() {
-        this.searchMenuVisible = true
-      },
-      hiddenClick(){
-        this.shows = false
-      },
-      /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-      ...mapActions(['Logout']),
-      ...mapGetters(['nickname', 'avatar','userInfo']),
-      getAvatar(){
-        return getFileAccessHttpUrl(this.avatar())
-      },
-      handleLogout() {
-        const that = this
+    handleLogout() {
+      const that = this

-        this.$confirm({
-          title: '提示',
-          content: '真的要注销登录吗 ?',
-          onOk() {
-            return that.Logout({}).then(() => {
-              // update-begin author:wangshuai date:20200601 for: 退出登录跳转登录页面
-              that.$router.push({ path: '/user/login' })
-              // update-end author:wangshuai date:20200601 for: 退出登录跳转登录页面
-              //window.location.reload()
-            }).catch(err => {
-              that.$message.error({
-                title: '错误',
-                description: err.message
-              })
+      this.$confirm({
+        title: '提示',
+        content: '真的要注销登录吗 ?',
+        onOk() {
+          return that.Logout({}).then(() => {
+            // update-begin author:wangshuai date:20200601 for: 退出登录跳转登录页面
+            that.$router.push({ path: '/user/login' })
+            // update-end author:wangshuai date:20200601 for: 退出登录跳转登录页面
+            //window.location.reload()
+          }).catch(err => {
+            that.$message.error({
+              title: '错误',
+              description: err.message
            })
-          },
-          onCancel() {
-          },
-        })
-      },
-      updatePassword(){
-        let username = this.userInfo().username
-        this.$refs.userPassword.show(username)
-      },
-      updateCurrentDepart(){
-        this.$refs.departSelect.show()
-      },
-      systemSetting(){
-        this.$refs.settingDrawer.showDrawer()
-      },
-      /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-      searchMenus(arr,menus){
-        for(let i of menus){
-          if(!i.hidden && 'layouts/RouteView'!==i.component){
-           arr.push(i)
-          }
-          if(i.children&& i.children.length>0){
-            this.searchMenus(arr,i.children)
-          }
+          })
+        },
+        onCancel() {
        }
-      },
-      filterOption(input, option) {
-        return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      },
-      // update_begin author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题
-      searchMethods(value) {
-        let route = this.searchMenuOptions.filter(item => item.id === value)[0]
-        if (route.meta.internalOrExternal === true || route.component.includes('layouts/IframePageView')) {
-          window.open(route.meta.url, '_blank')
-        } else {
-          this.$router.push({ path: route.path })
+      })
+    },
+    updatePassword() {
+      let username = this.userInfo().username
+      this.$refs.userPassword.show(username)
+    },
+    updateCurrentDepart() {
+      this.$refs.departSelect.show()
+    },
+    systemSetting() {
+      this.$refs.settingDrawer.showDrawer()
+    },
+    /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
+    searchMenus(arr, menus) {
+      for (let i of menus) {
+        if (!i.hidden && 'layouts/RouteView' !== i.component) {
+          arr.push(i)
+        }
+        if (i.children && i.children.length > 0) {
+          this.searchMenus(arr, i.children)
        }
-        this.searchMenuVisible = false
-      },
-      // update_end author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题
-      /*update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-      /*update_begin author:liushaoqian date:20200507 for: 刷新缓存*/
-      clearCache(){
-        getAction('sys/dict/refleshCache').then((res) => {
-          if (res.success) {
-            //重新加载缓存
-            getAction('sys/dict/queryAllDictItems').then((res) => {
-              if (res.success) {
-                Vue.ls.remove(UI_CACHE_DB_DICT_DATA)
-                Vue.ls.set(UI_CACHE_DB_DICT_DATA, res.result, 7 * 24 * 60 * 60 * 1000)
-              }
-            })
-            this.$message.success('刷新缓存完成！')
-          }
-        }).catch(e=>{
-          this.$message.warn('刷新缓存失败！')
-          console.log('刷新失败',e)
-        })
      }
-      /*update_end author:liushaoqian date:20200507 for: 刷新缓存*/
+    },
+    filterOption(input, option) {
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    },
+    // update_begin author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题
+    searchMethods(value) {
+      let route = this.searchMenuOptions.filter(item => item.id === value)[0]
+      if (route.meta.internalOrExternal === true || route.component.includes('layouts/IframePageView')) {
+        window.open(route.meta.url, '_blank')
+      } else {
+        this.$router.push({ path: route.path })
+      }
+      this.searchMenuVisible = false
+    },
+    // update_end author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题
+    /*update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
+    /*update_begin author:liushaoqian date:20200507 for: 刷新缓存*/
+    clearCache() {
+      getAction('sys/dict/refleshCache').then((res) => {
+        if (res.success) {
+          //重新加载缓存
+          getAction('sys/dict/queryAllDictItems').then((res) => {
+            if (res.success) {
+              Vue.ls.remove(UI_CACHE_DB_DICT_DATA)
+              Vue.ls.set(UI_CACHE_DB_DICT_DATA, res.result, 7 * 24 * 60 * 60 * 1000)
+            }
+          })
+          this.$message.success('刷新缓存完成！')
+        }
+      }).catch(e => {
+        this.$message.warn('刷新缓存失败！')
+        console.log('刷新失败', e)
+      })
    }
+    /*update_end author:liushaoqian date:20200507 for: 刷新缓存*/
  }
+}
 </script>

 <style lang="less" scoped>
-  /* update_begin author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
-  /* update-begin author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
-  .user-wrapper .search-input {
-    width: 180px;
-    color: inherit;
+/* update_begin author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
+/* update-begin author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
+.user-wrapper .search-input {
+  width: 180px;
+  color: inherit;

-    /deep/ .ant-select-selection {
-      background-color: inherit;
-      border: 0;
-      border-bottom: 1px solid white;
-      &__placeholder, &__field__placeholder {
-        color: inherit;
-      }
+  /deep/ .ant-select-selection {
+    background-color: inherit;
+    border: 0;
+    border-bottom: 1px solid white;
+
+    &__placeholder, &__field__placeholder {
+      color: inherit;
    }
  }
-  /* update-end author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
-  /* update_end author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
+}
+
+/* update-end author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
+/* update_end author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
+
+.user-dropdown-menu-wrapper.ant-dropdown-menu .ant-dropdown-menu-item {
+  width: 100%;
+  text-align: center;
+}
 </style>

 <style scoped>
-  .logout_title {
-    color: inherit;
-    text-decoration: none;
-  }
+.logout_title {
+  color: inherit;
+  text-decoration: none;
+}
 </style>