修改

src/views/module_kzks/costModelWxContract/CostModelWxContractList.vue

@@ -189,12 +189,12 @@
             dataIndex: 'selectwx'
             // dataIndex: 'wxconpanyname'
           },
-          {
-            title:'外协数量',
-            align:"center",
-            dataIndex: 'baojianum' // 外协单位数量
-            // dataIndex: 'gongfangnum' // 供方数量
-          },
+          // {
+          //   title:'外协数量',
+          //   align:"center",
+          //   dataIndex: 'baojianum' // 外协单位数量
+          //   // dataIndex: 'gongfangnum' // 供方数量
+          // },
 
           // {
           //   title:'外协单号',

src/views/module_kzks/dashboard/Analysis.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="page-header-index-wide">
-    <template v-if="pageRoleNum > 2">
+    <template v-if="pageRoleNum >= 2">
       <a-empty description="请联系管理员，当前角色权限设置有误或者当前账户无权限" style="height: 210px;margin-top: 200px;"/>
     </template>
     <template v-else>
@@ -99,7 +99,7 @@
       </a-card>
 
       <!-- 第三级模块：部门指标排行 -->
-      <a-card :loading="loading" :bordered="false" :body-style="{padding: '0'}" style="margin-top: 20px;">
+      <a-card :loading="loading" :bordered="false" :body-style="{padding: '0'}" style="margin-top: 20px;" v-if="pageRoleNum===0">
         <div class="salesCard">
           <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
             <div class="extra-wrapper" slot="tabBarExtraContent">
@@ -107,7 +107,7 @@
                 <a-button :type="zbPhParams.time==='month'?'primary':'link'" @click="searchZbphChange('month')">按月查询</a-button>
                 <a-button :type="zbPhParams.time==='year'?'primary':'link'" @click="searchZbphChange('year')">按年查询</a-button>
               </div>
-              <a-month-picker v-if="zbPhParams.time === 'month'" placeholder="请选择月" :value="zbPhParams.beginDate" @change="zbphSearchChange" />
+              <a-month-picker v-if="zbPhParams.time === 'month'" placeholder="请选择月" :disabled-date="disabledYear" :value="zbPhParams.beginDate" @change="zbphSearchChange" />
               <!-- <a-date-picker  v-if="zbPhParams.time === 'year'"
                 @Change=zbphSearchChange
                 placeholder="请选择年"
@@ -122,6 +122,7 @@
                 format="YYYY"
                 :value="zbPhParams.yearValue"
                 :open="zbphYearIsopen"
+                :disabled-date="disabledYear"
                 placeholder="请选择年份"
                 @focus="changeopen"
                 @panelChange="handlePanelChange1">
@@ -417,15 +418,22 @@
       this.searchZbphChange('month')
     },
     methods: {
+      //限制选择年份
+      disabledYear(current){
+        // 不可以选择之前的日期,今天包括之后可以选，控制大于小于来实现选择之前的日期还是之后的日期
+        // return current < moment().subtract(1, 'year');
+        var timeYear = current.get('year');  // 当前年
+        return timeYear < '2023';
+      },
       getZhibiaoCollect(){
         this.loading = true
         getZhibiaoCollect().then(res => {
           console.log(res)
           if (res.success) {
-            if(res.result.auth >2){
-              // 0:所领导，1：部门领导，2：员工；3：未赋值或选了多个前面所说角色
-              // 如果是管理员，默认显示所领导的
-              this.pageRoleNum = res.result.auth
+            // 0:所领导，1：部门领导，2：员工；3：未赋值或选了多个前面所说角色
+            // 如果是管理员，默认显示所领导的
+            this.pageRoleNum = res.result.auth
+            if(res.result.auth >= 2){
               return
             }
             var arr = []
@@ -619,8 +627,15 @@
       // 获取部门指标排行数据
       deptZhibiaoPaihang(){
         deptZhibiaoPaihang(this.zbPhParams).then(res => {
-          console.log(res)
-          this.zbPhDataSource = res.result
+          if (res.success) {
+            console.log(res)
+            this.zbPhDataSource = res.result
+            // this.$message.success(res.message)
+            // this.$emit('ok')
+          } else {
+            this.$message.warning(res.message)
+          }
+        }).finally(() => {
         })
       },
       // 部门指标排行搜索

src/views/module_kzks/dashboard/components/deptZbphTable.vue

@@ -49,7 +49,10 @@
           {
             title:'当期指标',
             align:"center",
-            dataIndex: 'departKpi'
+            dataIndex: 'departKpi',
+            customRender: (text, record) => {
+              return (Number(text)/10000).toFixed(2)
+            },
           },
           // {
           //   title:'项目进度',
@@ -59,17 +62,26 @@
           {
             title:'当期合同额',
             align:"center",
-            dataIndex: 'contractAmount'
+            dataIndex: 'contractAmount',
+            customRender: (text, record) => {
+              return (Number(text)/10000).toFixed(2)
+            },
           },
           {
             title:'当期已收款',
             align:"center",
-            dataIndex: 'received'
+            dataIndex: 'received',
+            customRender: (text, record) => {
+              return (Number(text)/10000).toFixed(2)
+            },
           },
           {
             title:'完成度',
             align:"center",
-            dataIndex: 'kpiCompletRate'
+            dataIndex: 'kpiCompletRate',
+            customRender: (text, record) => {
+              return (Number(text) * 100).toFixed(0) + '%'
+            },
           },
         ],
       }

src/views/system/DepartList.vue

@@ -110,8 +110,11 @@
                   </a-radio-group>
                 </template>
               </a-form-model-item>
-              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departType" label="部门类型">
-                <j-dict-select-tag  v-model="model.departType"  placeholder="选择部门类型" :type="'radio'" dictCode="depart_type"/>
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departType" label="部门工时类型">
+                <j-dict-select-tag  v-model="model.departType"  placeholder="选择部门工时类型" :type="'radio'" dictCode="depart_type"/>
+              </a-form-model-item>
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kpideparttype" label="部门指标类型">
+                <j-dict-select-tag  v-model="model.kpideparttype"  placeholder="选择部门指标类型" :type="'radio'" dictCode="kpi_depart_type	"/>
               </a-form-model-item>
               <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="部门负责人">
                 <j-select-multi-user v-model="model.directorUserIds" valueKey="id"></j-select-multi-user>
@@ -243,7 +246,8 @@
           departName: [{required: true, message: '请输入机构/部门名称!'}],
           orgCode: [{required: true, message: '请输入机构编码!'}],
           orgCategory:[{required: true, message: '请选择机构类型!'}],
-          departType:[{required: true, message: '请选择部门类型!'}],
+          departType:[{required: true, message: '请选择部门工时类型!'}],
+          kpideparttype:[{required: true, message: '请选择部门指标类型!'}],
           mobile: Vue.prototype.rules.mobile2
         },
         url: {
@@ -400,6 +404,8 @@
         this.currSelected = Object.assign({}, record)
         this.model = this.currSelected
         this.model.departType = this.model.departType ? this.model.departType : '0'
+        // this.model.kpideparttype = this.model.kpideparttype ? this.model.kpideparttype : '0'
+        console.log(this.model)
         this.selectedKeys = [record.key]
         this.model.parentId = record.parentId
         this.setValuesToForm(record)