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()
-        } else {
+        // } else {
-          callback('请输入数字')
+        //   callback('请输入数字')
-        }
+        // }
         return
       }
       callback('请输入银行账号')

src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue

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

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 = '导出文件'