Merge branch 'master' into confirmed

# Conflicts:
#	src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue

src/components/layouts/TabLayout.vue

@@ -58,7 +58,7 @@
         activePage: '',
         menuVisible: false,
         menuItemList: [
-          { key: '4', icon: 'reload', text: '刷 新' },
+          // { key: '4', icon: 'reload', text: '刷 新' },
           { key: '1', icon: 'arrow-left', text: '关闭左侧' },
           { key: '2', icon: 'arrow-right', text: '关闭右侧' },
           { key: '3', icon: 'close', text: '关闭其它' }

src/views/businessManagement/BusinessManagement.vue

@@ -16,6 +16,11 @@
                 <j-dict-select-tag v-model="queryParam.status" placeholder="请选择状态" dictCode="company_aduit_status"/>
               </a-form-item>
             </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="企业信用代码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input placeholder="请输入企业信用代码" v-model="queryParam.dutyCode" :maxLength='50'></a-input>
+              </a-form-item>
+            </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" icon="search" @click="searchQuery" v-has="'company:search'">查询</a-button>

src/views/businessManagement/modules/BusinessManagementModule.vue

@@ -295,11 +295,11 @@ export default {
      */
     checkBankAccount(rules, value, callback) {
       if (value) {
-        if (number(value)) {
+        // if (number(value)) {
-          callback()
+        callback()
-        } else {
+        // } else {
-          callback('请输入数字')
+        //   callback('请输入数字')
-        }
+        // }
         return
       }
       callback('请输入银行账号')

src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue

@@ -62,7 +62,7 @@
                 <j-dict-select-tag v-model="queryParam.pack"
                                    placeholder="请选择是否打包"
                                    dictCode="yn"
-                                    />
+                />
               </a-form-item>
             </a-col>
 
@@ -168,6 +168,7 @@
     <working-group-member-unit-module ref="modalForm" @ok="modalFormOk"></working-group-member-unit-module>
     <working-group-member-set-charge-notice ref="setChargeNotic"
                                             @ok="modalFormOk"></working-group-member-set-charge-notice>
+
     <email-error-msg-modal ref="emailError"></email-error-msg-modal>
   </div>
 </template>
@@ -382,7 +383,7 @@ export default {
         id: this.workingGroupProjectId
       }
       getWorkingGroupById(param).then(res => {
-        if(res.success) {
+        if (res.success) {
           this.workingGroupDetail = res.result || {}
         }
       }).finally(() => {
@@ -513,7 +514,7 @@ export default {
       if (file && file.url) {
         const fileFullUrl = `${ window._CONFIG['domianWebSocketURL'] }/sys/common/download/${ file.id }?token=${ Vue.ls.get(ACCESS_TOKEN) }&fullfilename=${ file.fileName }`
         // let url = `${ window._CONFIG['onlinePreviewDomainURL'] }?url=${ encodeURIComponent(Base64.encode(fileFullUrl)) }`
-        let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}`
+        let url = `${ window._CONFIG['onlinePreviewDomainURL'] }?url=${ encodeURIComponent(fileFullUrl) }`
         window.open(url)
       }
     }

src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue

@@ -58,6 +58,7 @@
 
           <span slot="action" class="action-span-cell" slot-scope="text, record" v-if="canOperate">
             <a @click="handleDistribute(record.id)" v-has="'fileMaintenance:distribute'">分发</a>
+            <a @click="handleDownload(record)" v-has="'fileMaintenance:download'">下载</a>
             <a @click="handleDelete(record.id)" v-has="'fileMaintenance:delete'">删除</a>
           </span>
         </a-table>
@@ -202,6 +203,13 @@ export default {
       this.distributeModalVisible = true
       this.isBatchDistribute = false
     },
+    /**
+     * 下载
+     * @param record
+     */
+    handleDownload(record) {
+      downloadFile(`sys/common/download/${record.fileId}`, record.fileName)
+    },
     handleExportXls(fileName) {
       if (!fileName || typeof fileName != 'string') {
         fileName = '导出文件'

src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue

@@ -84,7 +84,7 @@ import EmailErrorMsgModal from '@views/projectManagement/modules/EmailErrorMsgMo
 
 export default {
   name: 'WorkingGroupMemberSetChargeNotice',
-  components: { JUpload ,EmailErrorMsgModal},
+  components: { JUpload, EmailErrorMsgModal },
   data() {
     return {
       title: '设置收费通知',
@@ -135,11 +135,11 @@ export default {
             if (res.success) {
               this.$message.success(res.message)
               // 是否有邮件发送失败 有就给出提示信息
-              if(Array.isArray(res.result) && res.result.length > 0){
+              if (Array.isArray(res.result) && res.result.length > 0) {
                 // msgWarn(this,res.result,0)
                 that.$refs.emailError.open()
                 that.$refs.emailError.msgList = res.result
-                console.log(that.$refs.emailError.msgList ,'that.$refs.emailError.msgList ')
+                console.log(that.$refs.emailError.msgList, 'that.$refs.emailError.msgList ')
 
               }
               this.$emit('ok')
@@ -182,7 +182,7 @@ export default {
           this.model.receivableAmount = item.yearCharge
           this.model.chargeNoticeId = item.chargeNoticeId
           this.model.chargeNoticeNo = item.value
-        } else if (item.type === 'chargeNoticeB' && key === 'b'){
+        } else if (item.type === 'chargeNoticeB' && key === 'b') {
           this.selectedChargeNotice = 'B'
           this.model.receivableAmount = item.yearCharge
           this.model.chargeNoticeId = item.chargeNoticeId