Merge remote-tracking branch 'origin/master'

src/components/page/GlobalHeader.vue

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

src/components/tools/UserMenu.vue

@@ -26,11 +26,11 @@
     <!-- update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框 -->
     <!-- update-end author:sunjianlei date:20191220 for: 解决全局样式冲突的问题 -->
     <!-- update_end  author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
-    <span class="action">
+    <!-- <span class="action">
       <a class="logout_title" target="_blank" href="http://doc.jeecg.com">
         <a-icon type="question-circle-o"></a-icon>
       </a>
-    </span>
+    </span> -->
     <header-notice class="action"/>
     <a-dropdown>
       <span class="action action-full ant-dropdown-link user-dropdown-menu">
@@ -38,7 +38,7 @@
         <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>
       </span>
       <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
-        <a-menu-item key="0">
+        <!-- <a-menu-item key="0">
           <router-link :to="{ name: 'account-center' }">
             <a-icon type="user"/>
             <span>个人中心</span>
@@ -49,7 +49,7 @@
             <a-icon type="setting"/>
             <span>账户设置</span>
           </router-link>
-        </a-menu-item>
+        </a-menu-item> -->
         <a-menu-item key="3"  @click="systemSetting">
            <a-icon type="tool"/>
            <span>系统设置</span>

src/views/module_kzks/projectCostList/ProjectCostList.vue

@@ -268,7 +268,10 @@
 </template>
 
 <script>
-  import Vue from 'vue'
+  import Vue from 'vue';
+  // import VueDraggableResizable from 'vue-draggable-resizable';
+  // Vue.component('vue-draggable-resizable', VueDraggableResizable);
+
   import { columnsSelect, columnsEdit, proCostYSKdetail, proCostContractdetail, getDbList, getHjList, getDbClList } from '@/api/kzksApi.js'
 
   import '@/assets/less/TableExpand.less'
@@ -278,8 +281,8 @@
   import AllList from '../projectContrastList/allList.vue'
   import WuliaoList from '../projectContrastList/wuliaoList.vue'
   import { getAction } from '@/api/manage'
-import ContrastModal from '../projectXushiContrast/contrastModal.vue'
-import ProjectImportListModal from '../projectImportList/modules/ProjectImportListModal.vue'
+  import ContrastModal from '../projectXushiContrast/contrastModal.vue'
+  import ProjectImportListModal from '../projectImportList/modules/ProjectImportListModal.vue'
 
   export default {
     name: 'ProjectCostList',

src/views/module_kzks/projectCostList/modulesDetail/PichanTaskList.vue

@@ -12,8 +12,8 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
-      <a-button type="primary" icon="download" @click="handleExportXls('批产任务')">导出</a-button>
-      <span style="float: right;">占比：{{ pichanInfo.proportion * 100 + '%' }}</span>
+      <!-- <a-button type="primary" icon="download" @click="handleExportXls('批产任务')">导出</a-button> -->
+      <span style="float: right;font-weight: bold;margin-bottom: 10px;">占比：{{ pichanInfo.proportion * 100 + '%' }}</span>
       <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload> -->
@@ -118,7 +118,7 @@
         columns: [],
         // settingColumns: ['taskno', 'pccode', 'taskname', 'zjcb', 'scgs', 'contractfpe', 'estimationcoat', 'costPercent', 'processpercent', 'sjgs', 'clf', 'zyf', 'swf', 'wxf', 'taskmoney', 'oneIncome', 'oneProfit', 'lrl', 'xhname', 'yzjdname', 'jhwcsj', 'yzsl', 'oneCost', 'lre', 'zcb', 'glf', 'lbsy', 'zrbm', 'gdzczj', 'gzjlwf', 'rldlf', 'tasktype', 'jycs', 'workhour', 'hxzxname', 'auditprice', 'brief', 'blcode', 'businessman', 'bccode', 'reftaskno', 'iflag'],
         settingColumns: ['taskno', 'pccode', 'taskname', 'estimationcoat', 'costPercent', 'processpercent', 'oneIncome', 'oneProfit', 'lrl', 'xhname', 'yzjdname', 'jhwcsj', 'yzsl', 'oneCost', 'lre', 'zcb', 'glf', 'lbsy', 'zrbm', 'gdzczj', 'gzjlwf', 'rldlf', 'tasktype', 'jycs', 'hxzxname', 'auditprice', 'brief', 'blcode', 'businessman', 'bccode', 'reftaskno', 'iflag'],
-        //  'scgs', 'sjgs',  
+        //  'scgs', 'sjgs',
         defColumns: [
           {
             title: '序号',

src/views/system/UserList.vue

@@ -106,6 +106,7 @@
         ref="table"
         bordered
         size="middle"
+        :scroll="{x:true}"
         rowKey="id"
         :columns="columns"
         :dataSource="dataSource"
@@ -222,13 +223,15 @@
             align: "center",
             dataIndex: 'username',
             width: 120,
-            sorter: true
+            sorter: true,
+            fixed: 'left'
           },
           {
             title: '用户姓名',
             align: "center",
             width: 100,
             dataIndex: 'realname',
+            fixed: 'left'
           },
           {
             title: '头像',
@@ -280,7 +283,8 @@
             dataIndex: 'action',
             scopedSlots: {customRender: 'action'},
             align: "center",
-            width: 170
+            width: 170,
+            fixed: 'right'
           }
 
         ],

src/views/system/modules/UserModal.vue

@@ -67,14 +67,14 @@
         </a-form-model-item>
 
         <!--租户分配-->
-        <a-form-model-item label="租户分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
+        <!-- <a-form-model-item label="租户分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
           <j-multi-select-tag
                   :disabled="disableSubmit"
                   v-model="model.relTenantIds"
                   :options="tenantsOptions"
                   placeholder="请选择租户">
           </j-multi-select-tag>
-        </a-form-model-item>
+        </a-form-model-item> -->
 
         <a-form-model-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-radio-group  v-model="model.userIdentity"  @change="identityChange">
@@ -119,9 +119,9 @@
           <a-input placeholder="请输入座机" v-model="model.telephone" />
         </a-form-model-item>
 
-        <a-form-model-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <!-- <a-form-model-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <j-dict-select-tag  v-model="model.activitiSync"  placeholder="请选择是否同步工作流引擎" :type="'radio'" dictCode="activiti_sync"/>
-        </a-form-model-item>
+        </a-form-model-item> -->
 
       </a-form-model>
     </a-spin>