Просмотр исходного кода

调整组织架构新增功能

qymljy 3 лет назад
Родитель
Сommit
061fcfe2d2

+ 7 - 0
src/HManagement/clueManage/clue_private/modules/detail.vue

@@ -157,6 +157,9 @@ export default {
       console.log(this.mainData);
       
       this.changeDataStructure()
+
+      this.$refs['details'].$refs['group'].queryGroup()
+
     },
     changeDataStructure() {
       let that = this
@@ -318,6 +321,10 @@ export default {
             }
 
           },
+          /*{
+            label:'转手次数',
+            value:this.mainData.enterprisename
+          },*/
         ],
         systemInfo: [
           {label:'创建人',value:this.mainData.createBy},

+ 3 - 3
src/HManagement/clueManage/m_activity/index.vue

@@ -64,16 +64,16 @@
           <span style="color: rgb(82, 196, 26)" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '发布'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname == 'director'">
-          <span >{{scope.data.column.data.leader[0].name}}</span>
+          <span >{{scope.data.column.data.leader.length !== 0?scope.data.column.data.leader[0].name:'--'}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname == 'allocationstatus'">
           <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '待分配'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已分配'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
         <div v-else>
-          {{scope.data.column.data[[scope.data.column.columnname]]}}
+          {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
         </div>
-        <span v-if="!scope.data.column.data[scope.data.column.columnname] && scope.data.column.data[scope.data.column.columnname] !== 0">--</span>
+<!--        <span v-if="!scope.data.column.data[scope.data.column.columnname] && scope.data.column.data[scope.data.column.columnname] !== 0">&#45;&#45;</span>-->
       </template>
     </basicLayout>
   </div>

+ 2 - 1
src/SManagement/personal_target/index.vue

@@ -125,7 +125,8 @@ export default {
         }
       })
       this.tool.showMessage(res,() => {
-        window.open(res.msg,'_self')
+       /* window.open(res.msg,'_self')*/
+        window.open(res.data,'_self')
       })
     }
   },

+ 2 - 1
src/SManagement/project_target/index.vue

@@ -90,7 +90,8 @@ export default {
         }
       })
       this.tool.showMessage(res,() => {
-        window.open(res.msg,'_self')
+        console.log(res)
+        window.open(res.data,'_self')
       })
     },
     refresh(){

+ 3 - 3
src/SManagement/project_target/modules/detailInfo.vue

@@ -29,7 +29,7 @@
 
     <div slot="slot0">
       <div class="mt-10">
-        <project_add v-if="tool.checkAuth($route.name,'editProjectTask') && mainData.status === '新建'"  :id="this.$route.query.id" :year="this.$route.query.year" @onSuccess="onSuccess" :disabled="disable" class="inline-16"></project_add>
+        <project_add v-if="tool.checkAuth($route.name,'editProjectTask') && mainData.status === '新建'"  :id="this.$route.query.hrid" :year="this.$route.query.year" @onSuccess="onSuccess" :disabled="disable" class="inline-16"></project_add>
         <el-input  style="width:200px;" placeholder="请输入搜索内容" suffix-icon="el-icon-search" @input="searchChange" v-model="params.content.where.condition" @keyup.native.enter="getprojectTargetList(params.content.pageNumber = 1)" @clear="getprojectTargetList(params.content.pageNumber = 1)" size="small" class="input-with-select inline-16" clearable>
         </el-input>
       </div>
@@ -127,7 +127,7 @@ export default {
         "id": 20220906104002,
         "content": {
           "year": this.$route.query.year,
-          "hrid": this.$route.query.id,
+          "hrid": this.$route.query.hrid,
           "where": {
             "condition": ""
           },
@@ -156,7 +156,7 @@ export default {
       })
       this.mainData = res.data
       console.log(this.mainData)
-      if (this.$route.query.id === this.$route.query.ownerHrid){
+      if (this.$route.query.hrid === this.$route.query.ownerHrid){
         this.disable = false
       }else{
         this.disable = true