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

public/development_address_config.js

@@ -13,7 +13,7 @@ window._CONFIG["casPrefixUrl"] = "http://cas.example.org:8443/cas";
 window._CONFIG["onlinePreviewDomainURL"] = "http://localhost:8012/onlinePreview";
 
 // 会议管理报名二维码地址
-window._CONFIG['singUpQRCodeURL'] = 'http://localhost:3000/signUpEntrance'
+window._CONFIG['singUpQRCodeURL'] = 'http://localhost:3000/signupentrance'
 
 // 签到二维码url
 window._CONFIG['signInUrl'] = '/meeting/payMeetingSituation/getSignInPage'

public/production_address_config.js

@@ -12,5 +12,5 @@ window._CONFIG["casPrefixUrl"] = "http://cas.example.org:8443/cas";
 window._CONFIG["onlinePreviewDomainURL"] = "http://10.10.10.46:8012/onlinePreview";
 
 // 会议管理报名二维码地址
-window._CONFIG['singUpQRCodeURL'] = 'http://10.10.10.46:8055/signUpEntrance'
+window._CONFIG['singUpQRCodeURL'] = 'http://10.10.10.46:8055/signupentrance'
 

src/App.vue

@@ -18,8 +18,27 @@ window.addEventListener('message', function (event) {
       document.getElementsByClassName('tab-layout-tabs ant-tabs ant-tabs-top')[0].style.display = 'none'
     }, 1000)
   }
-
 })
+
+document.onkeydown = keyDown
+
+function keyDown(e) {
+  console.log(navigator.userAgent)
+  // 拦截backspace按钮，谷歌浏览器不需要拦截
+  // 拦截仍然存在的问题：当input、textarea失去焦点后，仍然会后退页面
+  if (e.keyCode === 8 && navigator.userAgent.indexOf('AppleWebKit') === -1 ) {
+    // 判断是不是在input或textarea触发backspace按钮事件
+    if (window.event.srcElement.tagName.toUpperCase() === 'INPUT' || window.event.srcElement.tagName.toUpperCase() === 'TEXTAREA') {
+      // 判断输入框中是否还有值可删除
+      if (window.event.srcElement.value.length === 1) {
+        // 拦截事件
+        e.keyCode=0
+        e.returnValue=false
+      }
+    }
+  }
+}
+
 export default {
   data() {
     return {

src/api/api.js

@@ -113,7 +113,7 @@ const getContactsByCompany = (params) => getAction('/company/payContactsManageme
 // 通过企业名称获取该企业下的联系人无权限接口
 const getContactsByCompanyNoLimit = (params) => getAction('/company/payContactsManagement/queryByCompanyMeeting', params)
 // 通过联系人id获取联系人信息
-const getContactsById = (param) => getAction('/company/payContactsManagement/queryByIdMeeting', param)
+const getContactsById = (param) => getAction('/company/payContactsManagement/queryByIdGetContract', param)
 
 // 加密获取key 与 iv
 const getKeyIv = (param) => getAction('/sys/getEncryptedString',param)

src/components/ProjectDetailModal.vue

@@ -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 '缴费方式'
       }
-
-
     }
   }
 }

src/components/layouts/TabLayout.vue

@@ -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() {

src/components/page/GlobalLayout.vue

@@ -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) {

src/components/tools/UserMenu.vue

@@ -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">
@@ -79,7 +79,7 @@
       // update-begin author:sunjianlei date:20200219 for: 头部菜单搜索规范命名 --------------
       searchMenuOptions: [],
       searchMenuComp: 'span',
-        searchMenuVisible: false,
+      searchMenuVisible: false
       // update-begin author:sunjianlei date:20200219 for: 头部菜单搜索规范命名 --------------
     }
   },
@@ -126,8 +126,8 @@
       handler() {
         this.searchMenuVisible = false
         this.searchMenuComp = this.isMobile() ? 'a-modules' : 'span'
-        },
+      }
-      },
+    }
     // update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框
   },
   methods: {
@@ -164,7 +164,7 @@
           })
         },
         onCancel() {
-          },
+        }
       })
     },
     updatePassword() {
@@ -237,13 +237,20 @@
     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: 让搜索框颜色能随主题颜色变换*/
+
+.user-dropdown-menu-wrapper.ant-dropdown-menu .ant-dropdown-menu-item {
+  width: 100%;
+  text-align: center;
+}
 </style>
 
 <style scoped>

src/mixins/JeroListMixin.js

@@ -196,9 +196,13 @@ export const JeroListMixin = {
                 }
                 that.loadData()
                 that.onClearSelected()
+              } else {
+                if (res.message.indexOf('<br/>') > -1) {
+                  that.messageLineFeed('删除失败', res.message)
                 } else {
                   that.$message.warning(res.message)
                 }
+              }
             }).finally(() => {
               that.loading = false
             })
@@ -224,9 +228,13 @@ export const JeroListMixin = {
                 that.ipagination.current -= 1
               }
               that.loadData()
+            } else {
+              if (res.message.indexOf('<br/>') > -1) {
+                that.messageLineFeed('删除失败', res.message)
               } else {
                 that.$message.warning(res.message)
               }
+            }
           })
         }
       })
@@ -322,19 +330,7 @@ export const JeroListMixin = {
           }
           this.loadData()
         } else {
-          const messageArr = info.file.response.message.split('<br/>')
+          this.messageLineFeed('文件导入错误', info.file.response.message)
-          let htmlDom = []
-          messageArr.map(tt => {
-            if (tt) {
-              htmlDom.push((<div>{tt}</div>))
-            }
-          })
-          this.$warning({
-            title: '文件导入错误',
-            content: (h) => <div>
-              {htmlDom}
-            </div>
-          })
           // this.$message.error(`${info.file.name} ${info.file.response.message}.`);
         }
       } else if (info.file.status === 'error') {
@@ -386,6 +382,26 @@ export const JeroListMixin = {
       let url = getFileAccessHttpUrl(text)
       window.open(url)
     },
+    /**
+     * 对包含<br/>的后端错误信息进行处理
+     * @param title
+     * @param content
+     */
+    messageLineFeed(title, content) {
+      const messageArr = content.split('<br/>')
+      let htmlDom = []
+      messageArr.map(tt => {
+        if (tt) {
+          htmlDom.push((<div>{tt}</div>))
+        }
+      })
+      this.$warning({
+        title: title,
+        content: (h) => <div>
+          {htmlDom}
+        </div>
+      })
+    }
   }
 
 }

src/permission.js

@@ -9,12 +9,16 @@ import { generateIndexRouter } from '@/utils/util'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
-const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration','/signUpEntrance','/signUpPage'] // no redirect whitelist
+const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration','/signupentrance','/signUpPage'] // no redirect whitelist
 
 router.beforeEach((to, from, next) => {
   if (to.query.token) {
     Vue.ls.set(ACCESS_TOKEN, to.query.token, 7 * 24 * 60 * 60 * 1000)
     store.commit('SET_TOKEN', to.query.token)
+    // 判断是否是会员系统iframe嵌入的，如果是 不先做左侧菜单和 头部标签
+    if(to.query.system === 'member') {
+      store.commit('SET_SYSTEM', to.query.system)
+    }
   }
 
   NProgress.start() // start progress bar

src/store/modules/user.js

@@ -7,6 +7,8 @@ import { getAction } from '@/api/manage'
 
 const user = {
   state: {
+    // 使用系统的名称，只有在会员系统嵌入来款系统的时候使用 传值为 member
+    system: '',
     token: '',
     username: '',
     realname: '',
@@ -18,6 +20,9 @@ const user = {
   },
 
   mutations: {
+    SET_SYSTEM: (state, system) => {
+      state.system = system
+    },
     SET_TOKEN: (state, token) => {
       state.token = token
     },

src/utils/hasPermission.js

@@ -4,7 +4,7 @@ const hasPermission = {
     install (Vue, options) {
           Vue.directive('has', {
             inserted: (el, binding, vnode)=>{
-              // console.log('binding=====',binding.value)
+              // console.log('binding=====',binding)
               if(binding.arg){
                 binding.value = binding.arg
                 // console.log(  binding.value ,'  binding.value =================')

src/views/businessManagement/BusinessManagement.vue

@@ -219,9 +219,13 @@ export default {
                     that.ipagination.current -= 1
                   }
                   that.loadData()
+                } else {
+                  if (res.message.indexOf('<br/>') > -1) {
+                    that.messageLineFeed('删除失败', res.message)
                   } else {
                     that.$message.warning(res.message)
                   }
+                }
               })
             }
           })
@@ -266,9 +270,13 @@ export default {
                     }
                     that.loadData()
                     that.onClearSelected()
+                  } else {
+                    if (res.message.indexOf('<br/>') > -1) {
+                      that.messageLineFeed('删除失败', res.message)
                     } else {
                       that.$message.warning(res.message)
                     }
+                  }
                 }).finally(() => {
                   that.loading = false
                 })

src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue

@@ -502,6 +502,7 @@ export default {
         this.accountsReceivableNum = record.accountsReceivableAmount
         this.amountReceivedNum = record.amountReceived
         this.model = Object.assign({}, record)
+        this.getUserDetailByUserId()
         // 计算未收金额和赊账状态
         this.calculateOutstandingAmount()
         this.$nextTick(() => {
@@ -809,21 +810,16 @@ export default {
       switch (type) {
         // 普通项目
         case 1:
-          this.getUserDetailByUserId().then(res => {
-            this.departId = res
           // 混入筛选条件
           this.$refs.selectProjectModule.filters = {
             chargeCompanyId: this.selectedCompany.id,
-              contractId: this.contractId,
+            contractId: this.contractId
-              departId: this.departId // 一个用户多部门情况下传给后端第一个部门id
+            // departId: this.departId // 一个用户多部门情况下传给后端第一个部门id
           }
           // 获取负责人列表
           this.$refs.selectProjectModule.departChange(this.departId)
           // 打开弹窗
           this.$refs.selectProjectModule.open()
-          }).catch((err) => {
-            this.$message.warn(err)
-          })
           break
         // 工作组项目
         case 2:
@@ -858,15 +854,13 @@ export default {
       let param = {
         id: this.model.principalId
       }
-      return new Promise((resolve, reject) => {
       queryUserByDepartId(param).then(res => {
         if (res.success) {
-            resolve(res.result[0].departIds)
+          this.departId = res.result[0].departIds
         } else {
-            reject(res.message)
+          console.log(res.message)
         }
       })
-      })
     },
     /**
      * 项目选中回调

src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue

@@ -150,6 +150,7 @@ export default {
       requird: false,
       default: null
     },
+    // 负责人id
     principal: {
       type: String,
       requird: false,
@@ -261,7 +262,6 @@ export default {
     }
   },
   methods: {
-
     /**
      * 运行年份变化
      */
@@ -278,7 +278,7 @@ export default {
       // 运行年份默认为当年
       this.queryParam.year = new Date().getFullYear().toString()
       this.lastQueryParam.year = new Date().getFullYear().toString()
-      //
+      // 默认科室、负责人
       this.queryParam.principalId = this.principal
       this.lastQueryParam.principalId = this.principal
       this.queryParam.departId = this.departId

src/views/incomePayments/meetManage/Attendance.vue

@@ -618,9 +618,9 @@ export default {
     signUpHerfUrl() {
       return `${ window._CONFIG['singUpQRCodeURL'] }?id=${ this.$route.query.id }`
     },
-    // 签到地址 只给一个会议id
+    // 签到地址 只给一个会议id 加前缀是为了区分 小程序的扫码签到是否扫描的是签到二维码
     signInUrl() {
-      return this.$route.query.id
+      return `scanSign=${this.$route.query.id}`
     }
   },
   methods: {

src/views/incomePayments/meetManage/SignUpInfoEdit.vue

@@ -204,9 +204,34 @@ export default {
       meetingType: '',
       // 会议费用是否为0
       meetingCostBool:false,
-      url:{
+      // url:{
-        add:'/meeting/payMeetingSituation/add',
+      //   add:'/meeting/payMeetingSituation/add',
-        edit:'/meeting/payMeetingSituation/edit'
+      //   edit:'/meeting/payMeetingSituation/edit'
+      // },
+      // 其他会议的url
+      otherMeetingUrl: {
+        add: '/meeting/ohterMeetingSituation/add',
+        edit:'/meeting/ohterMeetingSituation/edit'
+      },
+      // 分标委会议的url
+      committeeMeetingUrl: {
+        add: '/meeting/committeeMeetingSituation/add',
+        edit:'/meeting/committeeMeetingSituation/edit'
+      },
+      // 国际研讨会的url
+      internalMeetingUrl: {
+        add: '/meeting/internalMeetingSituation/add',
+        edit:'/meeting/internalMeetingSituation/edit'
+      },
+      // 标协会议的url
+      standardsMeetingUrl: {
+        add: '/meeting/standardsMeetingSituation/add',
+        edit:'/meeting/standardsMeetingSituation/edit'
+      },
+      // 工作组会议的url
+      workGroupMeetingUrl: {
+        add: '/meeting/workGroupMeetingSituation/add',
+        edit:'/meeting/workGroupMeetingSituation/edit'
       },
       title:'添加参会人',
     }
@@ -229,6 +254,23 @@ export default {
     }
 
   },
+  computed:{
+    // eslint-disable-next-line
+    url() {
+      switch (this.$route.query.meetingType) {
+        case '1':
+          return this.workGroupMeetingUrl
+        case '2':
+          return this.standardsMeetingUrl
+        case '3':
+          return this.internalMeetingUrl
+        case '4':
+          return this.otherMeetingUrl
+        case '5':
+          return this.committeeMeetingUrl
+      }
+    },
+  },
   methods: {
     addContactsOk() {
       this.$refs.selectContacts.getContactsList()

src/views/modules/message/SysMessageTemplateList.vue

@@ -36,7 +36,7 @@
 
      <!-- 操作按钮区域 -->
      <div class="table-operator">
-       <a-button @click="handleAdd" type="primary" icon="plus" v-has="'template:add'">新增</a-button>
+<!--       <a-button @click="handleAdd" type="primary" icon="plus" v-has="'template:add'">新增</a-button>-->
      </div>
 
      <!-- table区域-begin -->

src/views/projectManagement/modules/GeneralProjectModule.vue

@@ -110,8 +110,10 @@
           <a-col :xl="12" :sm="24">
             <a-form-item label="来款方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <span v-if="defaultChargeWay === 2 && chargeWayType === 2">合同</span>
-              <a-radio-group v-decorator="['chargeWay',validatorRules.chargeWay]" @change="handlechargeWayChange"
+              <a-radio-group v-decorator="['chargeWay',validatorRules.chargeWay]"
-                             v-else :disabled="isAssociatedContract">
+                             @change="handlechargeWayChange"
+                             v-else
+                             :disabled="isAssociatedContract">
                 <a-radio :value="1">无</a-radio>
                 <a-radio :value="2">合同</a-radio>
                 <a-radio :value="3">收费通知</a-radio>

src/views/signUp/SignUpEntrance.vue

@@ -121,7 +121,13 @@ export default {
     }
   },
   async mounted() {
-    this.singUpQRCode = await this.generateQRCode('123')
+    this.singUpQRCode = await this.generateQRCode(this.signUpHerfUrl)
+  },
+  computed:{
+    // 报名链接
+    signUpHerfUrl() {
+      return `${ window._CONFIG['singUpQRCodeURL'] }?id=${this.meetingId}`
+    },
   },
   methods: {
     /*

src/views/system/LogList.vue

@@ -13,13 +13,13 @@
       <!-- 查询区域 -->
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="searchQuery">
-          <a-row :gutter="24">
+          <a-row>
-            <a-col :xl="9" :lg="8" :md="8" :sm="24">
+            <a-col :xxl="6" :xl="9" :lg="8" :md="8" :sm="24">
               <a-form-item label="搜索日志">
                 <a-input placeholder="请输入搜索关键词" v-model="queryParam.keyWord" :maxLength="50"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="9" :lg="8" :md="8" :sm="24">
+            <a-col :xxl="6" :xl="9" :lg="8" :md="8" :sm="24">
               <a-form-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-range-picker
                   style="width: 100%"
@@ -31,20 +31,19 @@
                 />
               </a-form-item>
             </a-col>
-            <a-col :xl="9" :lg="8" :md="8" :sm="24" v-if="tabKey === '2' ">
+            <a-col :xxl="6" :xl="9" :lg="8" :md="8" :sm="24" v-if="tabKey === '2' ">
-              <a-form-item label="操作类型" style="left: 10px">
+              <a-form-item label="操作类型">
                 <j-dict-select-tag v-model="queryParam.operateType" placeholder="请选择操作类型" dictCode="operate_type"/>
               </a-form-item>
             </a-col>
+
+            <a-col :xl="6" :lg="8" :md="8" :sm="24">
              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-           <a-col :xl="4" :lg="8" :md="8" :sm="24">
+                <a-button type="primary" @click="searchQuery" icon="search" v-has="'sys:log:search'">查询</a-button>
-                <a-button type="primary" style="left: 10px" @click="searchQuery" icon="search" v-has="'sys:log:search'">查询</a-button>
                 <a-button class="reset-button" @click="searchReset" icon="reload"
-                          style="margin-left: 8px;left: 10px">重置</a-button>
+                          style="margin-left: 8px;">重置</a-button>
-
-            </a-col>
              </span>
-
+            </a-col>
           </a-row>
         </a-form>
       </div>