Browse Source

业务数据大屏,管理员登录查看调整

qymljy 11 months ago
parent
commit
18505cc98a

+ 1 - 3
src/Form/QuotedPrice/add.vue

@@ -1,9 +1,7 @@
 <template>
   <div>
     <el-dropdown :hide-on-click="false" @command="handleCommand">
-      <span class="el-dropdown-link">
-        <el-button size="small" type="primary" >{{$t('新 建')}}</el-button>
-      </span>
+      <el-button size="small" type="primary" >{{$t('新 建')}}</el-button>
       <el-dropdown-menu slot="dropdown">
         <el-dropdown-item command="项目报价">{{ $t('项目报价') }}</el-dropdown-item>
         <el-dropdown-item command="客户报价">{{ $t('客户报价') }}</el-dropdown-item>

+ 17 - 12
src/HManagement/serviceDataScreen/index.vue

@@ -243,23 +243,28 @@ export default {
     },
     /*获取当前账号是否部门负责人*/
     async queryIsLeader(hrid,userid){
-      let param = {
-        classname: "webmanage.hr.hr",
-        method: "query_hrMain",
-        content:{
-          hrid:hrid
+      if (hrid != 0){
+        let param = {
+          classname: "webmanage.hr.hr",
+          method: "query_hrMain",
+          content:{
+            hrid:hrid
+          }
         }
-      }
-      const res = await this.$api.requested(param)
-      if (res.data.isleader == 1){
+        const res = await this.$api.requested(param)
+        if (res.data.isleader == 1){
+          this.departmentid = this.deplist[0].departmentid
+          this.depment = this.deplist[0].departmentid
+          this.queryAllData(this.departmentid)
+        }else {
+          this.person = JSON.parse(window.sessionStorage.getItem('active_account')).name
+          this.queryAllData(userid)
+        }
+      }else {
         this.departmentid = this.deplist[0].departmentid
         this.depment = this.deplist[0].departmentid
         this.queryAllData(this.departmentid)
-      }else {
-        this.person = JSON.parse(window.sessionStorage.getItem('active_account')).name
-        this.queryAllData(userid)
       }
-      // console.log(res.data,'22222')
     },
     createMenu (array) {
       var that = this

+ 19 - 17
src/HManagement/siteManage/securityConfig/index.vue

@@ -90,39 +90,41 @@
     </div>
     <div class="panel" style="margin-bottom:16px">
       <div style="display: flex;justify-content: space-between">
-        <img width="72" height="72" src="../../../assets/icons/projectRule.svg" alt="">
-        <div style="margin-right: 30px">
-          <div class="text-panel">
-            <div class="explain-title">{{ $t('项目查重规则') }}</div>
-            <div>
-              <div class="explain-tips">
-                <span>{{$t(`当前设置:`)}}</span>
-                <span>{{$t(`排除文字:`)}}</span>
-                <span v-for="(item,index) in projectnameexcludefields">
+        <div style="display: flex;justify-content: left">
+          <img width="72" height="72" src="../../../assets/icons/projectRule.svg" alt="" >
+          <div style="margin-right: 30px;">
+            <div class="text-panel">
+              <div class="explain-title">{{ $t('项目查重规则') }}</div>
+              <div>
+                <div class="explain-tips">
+                  <span>{{$t(`当前设置:`)}}</span>
+                  <span>{{$t(`排除文字:`)}}</span>
+                  <span v-for="(item,index) in projectnameexcludefields">
                   <span v-if="index === projectnameexcludefields.length -1">{{$t(item)}}</span>
                   <span v-else>{{item + '、'}}</span>
                 </span>
-                ,{{ $t('第一层') }}
-                <span v-for="(item,index) in projectRule.fields1">
+                  ,{{ $t('第一层') }}
+                  <span v-for="(item,index) in projectRule.fields1">
                   <span v-if="index === projectRule.fields1.length -1">{{$t(item)}}</span>
                   <span v-else>{{item + ','}}</span>
                 </span>
-                ,{{ $t('第二层') }}
-                <span v-for="(item,index) in projectRule.fields2">
+                  ,{{ $t('第二层') }}
+                  <span v-for="(item,index) in projectRule.fields2">
                   <span v-if="index === projectRule.fields2.length -1">{{$t(item)}}</span>
                   <span v-else>{{item + ','}}</span>
                 </span>
-                ,{{ $t('第三层') }}
-                <span v-for="(item,index) in projectRule.fields3">
+                  ,{{ $t('第三层') }}
+                  <span v-for="(item,index) in projectRule.fields3">
                   <span v-if="index === projectRule.fields3.length -1">{{$t(item)}}</span>
                   <span v-else>{{item + ','}}</span>
                 </span>
-                ,{{ $t('保护期') }}:<span>{{projectprotectionperiod}}</span>
+                  ,{{ $t('保护期') }}:<span>{{projectprotectionperiod}}</span>
+                </div>
               </div>
             </div>
           </div>
         </div>
-        <projectCheckRule v-if="tool.checkAuth($route.name,'projectCheckRule')"  @queryRule="queryRule"></projectCheckRule>
+        <projectCheckRule  v-if="tool.checkAuth($route.name,'projectCheckRule')"  @queryRule="queryRule"></projectCheckRule>
       </div>
     </div>
     <div class="panel" style="margin-bottom:16px">

+ 2 - 1
src/SDrpManagement/QuotedPrice/index.vue

@@ -19,7 +19,7 @@
     >
       <template #titleRight>
         <div>
-          <exportFile :param="param" fileName="报价单" ></exportFile>
+          <exportFile :param="param" fileName="报价单" :style="{marginLeft:siteid == 'HY'?'-10px':''}"></exportFile>
         </div>
       </template>
       <template #custom>
@@ -226,6 +226,7 @@ export default {
   data() {
     return {
       issaler: false,
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
       options: [],
       tabName: "",
       tabIndex: "1",