Merge remote-tracking branch 'origin/master'

src/components/layouts/TabLayout.vue

@@ -8,7 +8,7 @@
       v-if="multipage"
       :active-key="activePage"
       class="tab-layout-tabs"
-      style="height:52px"
+      style="height:52px; border: none;"
       :hide-add="true"
       type="editable-card"
       @change="changePage"

src/components/page/GlobalHeader.vue

@@ -18,7 +18,7 @@
         @click="toggle"/>
 
       <span v-if="device === 'desktop'">欢迎进入 可知可视项目平台</span>
-      <span v-else>可知可视项</span>
+      <span v-else>可知可视项目平台</span>
 
       <user-menu :theme="theme"/>
     </div>

src/components/page/GlobalLayout.vue

@@ -57,7 +57,7 @@
     <!-- 改变框架 -->
     <a-layout
       :class="[layoutMode, `content-width-${contentWidth}`]"
-      :style="{ paddingLeft: fixSiderbar && isDesktop() ? `${sidebarOpened ? 200 : 80}px` : '0', height: '100vh', overflow: 'auto', display: 'block', }">
+      :style="{ paddingLeft: fixSiderbar && isDesktop() ? `${sidebarOpened ? 208 : 80}px` : '0', height: '100vh', overflow: 'auto', display: 'block', }">
       <!-- layout header -->
       <global-header
         :mode="layoutMode"

src/defaultSettings.js

@@ -18,8 +18,8 @@ export default {
   navTheme: 'light', // theme for nav menu
   layout: 'sidemenu', // nav menu position: sidemenu or topmenu
   contentWidth: 'Fixed', // layout of content: Fluid or Fixed, only works when layout is topmenu
-  fixedHeader: false, // sticky header
-  fixSiderbar: false, // sticky siderbar
+  fixedHeader: true, // sticky header default:false
+  fixSiderbar: true, // sticky siderbar default:false
   autoHideHeader: false, //  auto hide header
   colorWeak: false,
   multipage: true, //默认多页签模式

src/views/dashboard/Analysis.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <index-chart v-if="indexStyle==1"></index-chart>
+    <!-- <index-chart v-if="indexStyle==1"></index-chart>
     <index-bdc v-if="indexStyle==2"></index-bdc>
     <index-task v-if="indexStyle==3"></index-task>
     <div style="width: 100%;text-align: right;margin-top: 20px">
@@ -10,7 +10,8 @@
         <a-radio :value="2">统计图表2</a-radio>
         <a-radio :value="3">任务表格</a-radio>
       </a-radio-group>
-    </div>
+    </div> -->
+    <a-empty :description="false" style="height: 210px;margin-top: 200px;"/>
   </div>
 </template>
 

src/views/module_kzks/projectCostList/ProjectCostList.vue

@@ -216,7 +216,14 @@
 
         <span slot="action" slot-scope="text, record">
           <!-- <a @click="handleEdit(record)">编辑</a> -->
-          <a @click="handleXushi(record)">预算执行</a>
+          <a-tooltip v-if="record.id !== 'amount' && record.ji === 1">
+            <template slot="title">
+              汇集层无预算执行
+            </template>
+            <span style="color: rgba(0,0,0,.25);">预算执行</span>
+          </a-tooltip>
+          <a @click="handleXushi(record)" v-if="record.ji === 2">预算执行</a>
+          <!-- <a @click="handleXushi(record)" v-if="record.id !== 'amount'" :disabled="record.ji === 1">预算执行</a> -->
 
           <!-- <a-divider type="vertical" />
           <a-dropdown>
@@ -587,8 +594,8 @@
             fixed:"right",
             width:147,
             scopedSlots: {
-              filterDropdown: 'filterDropdown',
-              filterIcon: 'filterIcon',
+              // filterDropdown: 'filterDropdown',
+              // filterIcon: 'filterIcon',
               customRender: 'action',
             }
           }
@@ -703,11 +710,10 @@
       },
       initColumns(){
         //权限过滤（列权限控制时打开，修改第二个参数为授权码前缀）
-        //this.defColumns = colAuthFilter(this.defColumns,'testdemo:');
+        // this.defColumns = colAuthFilter(this.defColumns,'testdemo:');
         columnsSelect().then(res => {
           let colSettings = res
-          console.log(colSettings)
-          if(colSettings==null||colSettings==undefined){
+          if(colSettings==null||colSettings==undefined || colSettings.length === 0){
             let allSettingColumns = [];
             this.defColumns.forEach(function (item,i,array ) {
               allSettingColumns.push(item.dataIndex);
@@ -801,7 +807,7 @@
             console.log(res)
             this.duibiList = res
             this.duibiclList = []
-          })
+})
           var selectTasknos = this.selectionRows.map( res => {
             return res.taskno
           })

src/views/module_kzks/projectImportList/ProjectImportListList.vue

@@ -18,10 +18,10 @@
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
+              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              </a> -->
             </span>
           </a-col>
         </a-row>
@@ -139,7 +139,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,

src/views/module_kzks/projectKmbh/KzksProjectKmbhList.vue

@@ -145,16 +145,16 @@
         description: '科目编号管理页面',
         // 表头
         columns: [
-          // {
-          //   title: '#',
-          //   dataIndex: '',
-          //   key:'rowIndex',
-          //   width:60,
-          //   align:"center",
-          //   customRender:function (t,r,index) {
-          //     return parseInt(index)+1;
-          //   }
-          // },
+          {
+            title: '序号',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
           {
             title:'年度',
             align:"center",

src/views/module_kzks/projectPushList/ProjectPushListList.vue

@@ -11,19 +11,19 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
       <a-button type="primary" icon="download" @click="handleExportXls('推送列表')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+      <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+      </a-upload> -->
       <!-- 高级查询区域 -->
       <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
+      <!-- <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
+      </a-dropdown> -->
     </div>
 
     <!-- table区域-begin -->
@@ -31,6 +31,9 @@
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+        <span style="float:right;">
+          <a @click="loadData()"><a-icon type="sync" />刷新</a>
+        </span>
       </div>
 
       <a-table
@@ -43,9 +46,9 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap"
         @change="handleTableChange">
+        <!-- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" -->
 
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
@@ -67,7 +70,7 @@
           </a-button>
         </template>
 
-        <span slot="action" slot-scope="text, record">
+        <!-- <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
           <a-divider type="vertical" />
@@ -84,7 +87,7 @@
               </a-menu-item>
             </a-menu>
           </a-dropdown>
-        </span>
+        </span> -->
 
       </a-table>
     </div>
@@ -112,7 +115,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,
@@ -127,6 +130,11 @@
             dataIndex: 'taskno'
           },
           {
+            title:'部门',
+            align:"center",
+            dataIndex: 'sysOrgCode'
+          },
+          {
             title:'任务名称',
             align:"center",
             dataIndex: 'taskname'
@@ -146,19 +154,19 @@
             align:"center",
             dataIndex: 'content'
           },
-          {
-            title:'推送状态',
-            align:"center",
-            dataIndex: 'status'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
+          // {
+          //   title:'推送状态',
+          //   align:"center",
+          //   dataIndex: 'status'
+          // },
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:147,
+          //   scopedSlots: { customRender: 'action' }
+          // }
         ],
         url: {
           list: "/projectPushList/projectPushList/list",

src/views/module_kzks/projectPushSet/ProjectPushSetList.vue

@@ -19,10 +19,10 @@
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
+              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              </a> -->
             </span>
           </a-col>
         </a-row>
@@ -134,7 +134,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,