合并主分支内容

src/HManagement/ecycle/customer/index.vue

@@ -10,7 +10,7 @@
     >
       <template #titleLight>
         <batchDeletion v-if="tool.checkAuth($route.name,'batchDeletion')" ref="batchDeletion" :ownerids="selectData" :sys_object="application" @delSuccess="queryData"></batchDeletion>
-        <batchRecovery v-if="tool.checkAuth($route.name,'batchRecovery')" ref="batchRecovery" :ownerids="selectData" :sys_object="application" @recoverySuccess="queryData"></batchRecovery>
+<!--        <batchRecovery v-if="tool.checkAuth($route.name,'batchRecovery')" ref="batchRecovery" :ownerids="selectData" :sys_object="application" @recoverySuccess="queryData"></batchRecovery>-->
       </template>
       <template #custom>
         <div class="mt-10">
@@ -305,4 +305,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/HManagement/ecycle/modules/recovery.vue

@@ -20,7 +20,7 @@ export default {
       }).catch(() => {
         this.$message({
           type: 'info',
-          message: '已取消删除'
+          message: '已取消恢复'
         });
       });
     },
@@ -42,4 +42,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/HManagement/task/index.vue

@@ -57,13 +57,13 @@
           <div v-else-if="scope.data.column.columnname === 'remindday'">
             <p>{{scope.data.column.data.remindday?scope.data.column.data.remindday + '天':'无需提醒'}}</p>
           </div>
-          <div v-else-if="scope.data.column.columnname === 'title'">
-            <div v-if="scope.data.column.data.ownertable" style="color:#3874f6">
-              <el-button type="text" @click="detailGo(scope.column.data)">
-                {{scope.data.column.data[scope.data.column.columnname]}}
+          <div v-else-if="scope.data.column.columnname === 'applicationData'">
+            <p v-if="scope.data.column.data.systemapp.length > 0">
+              <el-button type="text" @click="detailGo(scope.data.column.data)">
+                {{scope.data.column.data.systemapp[0].systemappname}}
               </el-button>
-            </div>
-            <p v-else style="color:#333333">{{scope.data.column.data.title}}</p>
+            </p>
+            <p v-else>--</p>
           </div>
           <span v-else>{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
@@ -114,19 +114,21 @@ export default {
       this.$refs.basicLayout.param.content.where.status = this.status
       this.$refs['basicLayout'].listData()
     },
-    detailGo(){
-      console.log(row,'输出')
-      this.$store.dispatch('changeDetailDrawer',false)
-      setTimeout(()=>{
-        this.$router.replace({
-          path:'/quotedPriceDetail',
-          query:{
-            id:row.sa_quotedpriceid,
-            rowindex:row.rowindex
-          }
-        })
-        this.$store.dispatch('changeDetailDrawer',true)
-      },500)
+    detailGo(data){
+      this.$store.dispatch('changeDetailDrawer',true)
+      let path = data.systemapp[0].apppath_index
+      let route = this.$route
+      if (route.path !== path.slice(1)){
+        this.oldRoute = {path:route.path,query:route.query}
+        this.$store.dispatch('setHistoryRouter',this.oldRoute)
+      }
+      this.$router.replace({
+        path:path,
+        query:{
+          id:data.ownerid,
+          rowindex:data.rowindex
+        }
+      })
     }
   },
   mounted () {

src/HManagement/task/modules/detail.vue

@@ -12,6 +12,7 @@
         tags=""
         :tabs="['详细信息']"
         :mainData="mainData"
+        @teamList="teamList"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="customOperation">
@@ -27,15 +28,30 @@
               <el-descriptions-item label-class-name="my-label" label="任务标题">{{mainData.title?mainData.title:'--'}}</el-descriptions-item>
               <el-descriptions-item label-class-name="my-label" label="任务内容">{{mainData.remarks?mainData.remarks:'--'}}</el-descriptions-item>
               <el-descriptions-item label-class-name="my-label" label="执行人">{{mainData.title?mainData.title:'--'}}</el-descriptions-item>
-              <el-descriptions-item label-class-name="my-label" label="协助人">{{mainData.title}}</el-descriptions-item>
+              <el-descriptions-item label-class-name="my-label" label="协助人">
+                <span v-if="team.length > 0">
+                  <span v-for="(item,index) in team">
+                    <span v-if="index === team.length - 1">
+                      {{item.name}}
+                    </span>
+                    <span v-else>{{item.name + ','}}</span>
+                  </span>
+                </span>
+                <span v-else>--</span>
+              </el-descriptions-item>
               <el-descriptions-item label-class-name="my-label" label="开始时间">{{mainData.starttime?mainData.starttime:'--'}}</el-descriptions-item>
               <el-descriptions-item label-class-name="my-label" label="结束时间">{{mainData.endtime?mainData.endtime:'无限'}}</el-descriptions-item>
               <el-descriptions-item label-class-name="my-label" label="提醒时间">{{mainData.remindday? mainData.remindday + '天' :'无需提醒'}}</el-descriptions-item>
               <el-descriptions-item label-class-name="my-label" label="关联应用数据">
-                <el-button type="text">{{mainData.systemapp?mainData.systemapp.length !== 0 ? mainData.systemapp[0].systemappname:'--':'--'}}</el-button>
+                <el-button type="text" v-if="mainData.systemapp.length !== 0" @click="onGoto">{{mainData.systemapp[0].systemappname}}</el-button>
+                <span v-else>--</span>
               </el-descriptions-item>
               <el-descriptions-item label-class-name="my-label" label="负责人">{{mainData.leader?mainData.leader.length !== 0 ?mainData.leader[0].name:'--':"--" }}</el-descriptions-item>
-              <el-descriptions-item label-class-name="my-label" label="状态">{{mainData.status?mainData.status:'--'}}</el-descriptions-item>
+              <el-descriptions-item label-class-name="my-label" label="状态" >
+                <span :style="{color:mainData.status == '待执行'?'#3874f6':mainData.status == '进行中'?'#52c41a':'#333333'}">
+                  {{mainData.status?mainData.status:'--'}}
+                </span>
+              </el-descriptions-item>
             </el-descriptions>
           </div>
 
@@ -68,7 +84,8 @@ export default {
     return {
       mainData:{},
       mainAreaData:{},
-      disable:false
+      disable:false,
+      team:[]
     }
   },
   computed:{
@@ -97,7 +114,6 @@ export default {
     },
     changeDataStructure() {
       let that = this
-      this.mainData.systemapp.length>0?
       this.mainAreaData = [
         {
           label:'创建人',
@@ -142,63 +158,13 @@ export default {
         },
         {
           label:'关联应用数据',
-          value:this.mainData.systemapp?this.mainData.systemapp[0].systemappname:'',
+          value:this.mainData.systemapp?this.mainData.systemapp.length>0?this.mainData.systemapp[0].systemappname:'':'',
           style:()=>{
-            let color = '#3874f6'
+            let color = this.mainData.systemapp?this.mainData.systemapp.length>0?'#3874f6':'':''
             return {color: color}
-          }
-        },
-      ]:this.mainAreaData = [
-            {
-              label:'创建人',
-              value:this.mainData.createby
-            },
-            {
-              label:'创建时间',
-              value:this.mainData.createdate
-            },
-            {
-              label:'开始时间',
-              value:this.mainData.starttime
-            },
-            {
-              label:'结束时间',
-              value:this.mainData.endtime?this.mainData.endtime:'无限'
-            },
-            {
-              label:'提醒时间',
-              value:this.mainData.remindday?`${this.mainData.remindday}天`:'无需提醒'
-            },
-            {
-              label:'状态',
-              value:this.mainData.status,
-              style:()=>{
-                let color = ''
-                switch (this.mainData.status) {
-                  case '待执行':
-                    color = '#3874f6'
-                    break;
-                  case '进行中':
-                    color = '#52c41a'
-                    break;
-                  case '已完成':
-                    color = '#333333'
-                    break;
-                  default:
-                    break;
-                }
-                return{color:color}
-              }
-            },
-            /*{
-              label:'关联应用数据',
-              value:this.mainData.systemapp?this.mainData.systemapp[0].systemappname:'',
-              style:()=>{
-                let color = '#3874f6'
-                return {color: color}
-              }
-            },*/
-          ]
+          },
+        }
+      ]
     },
     // 监听切换数据,上一页,下一页
     pageChange (id,rowindex,tabIndex) {
@@ -235,7 +201,31 @@ export default {
             message: '已取消删除'
           });
         });
-    }
+    },
+    /*任务协助人*/
+    teamList(val){
+      console.log(val,'任务协助人')
+      this.team = []
+      if (val[0].team){
+        this.team = val[0].team
+      }
+    },
+    /*任务页面跳转*/
+    onGoto(){
+      let path = this.mainData.systemapp[0].apppath_index
+      let route = this.$route
+      if (route.path !== path.slice(1)){
+        this.oldRoute = {path:route.path,query:route.query}
+        this.$store.dispatch('setHistoryRouter',this.oldRoute)
+      }
+      this.$router.push({
+        path:path,
+        query:{
+          id:this.mainData.ownerid,
+          rowindex:this.mainData.rowindex
+        }
+      })
+    },
   },
   mounted () {
     this.queryMainData(this.$route.query.id)

src/components/normal-basic-layout/details/index.vue

@@ -63,7 +63,7 @@
           <taskTemp v-if="activeApp.istask" :status="status" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)">
             <el-button slot="collapse" type="text" icon="el-icon-s-unfold" class="inline-16" @click="onCollapse"></el-button>
           </taskTemp>
-          <group v-if="activeApp.isdatateam" :status="status" ref="group" style="margin-bottom:10px" :justsaler="justsaler" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess">
+          <group v-if="activeApp.isdatateam" :status="status" ref="group" style="margin-bottom:10px" :justsaler="justsaler" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess" @teamList="teamList">
             <el-button slot="collapse" type="text" icon="el-icon-s-unfold" class="inline-16" @click="onCollapse"></el-button>
           </group>
           <follow-up v-if="activeApp.isdatafollowup" :status="status" ref="follow" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)">
@@ -359,6 +359,10 @@ export default {
           rowindex:this.mainData.rowindex
         }
       })
+    },
+    /*任务协助人*/
+    teamList(val){
+      this.$emit('teamList',val)
     }
   },
   mounted () {

src/components/normal-basic-layout/details/modules/group/group.vue

@@ -133,7 +133,7 @@ export default {
         }
       ]:this.list=[]
       console.log(this.list,'list')
-
+      this.$emit('teamList',this.list)
 
 
     },

src/components/normal-basic-layout/drawerDetail/drawer.vue

@@ -36,6 +36,7 @@ export default {
   },
   methods:{
     closeDrawer (done) {
+      console.log(this.historyRouter,'historyRouter')
       if (this.historyRouter) {
         if (this.$route.query.isPredicion){
 
@@ -53,7 +54,7 @@ export default {
           }
 
         }else {
-          if (this.historyRouter.path === '/message' || this.historyRouter.path === '/salesData'){
+          if (this.historyRouter.path === '/message' || this.historyRouter.path === '/salesData' || this.historyRouter.path === '/task'){
             this.$store.dispatch('changeDetailDrawer',false)
             this.$router.replace(this.historyRouter)
             this.$store.dispatch('setHistoryRouter',null)
@@ -65,6 +66,7 @@ export default {
         }
 
       } else {
+
         this.$store.dispatch('changeDetailDrawer',false)
         this.$router.go(-1)
       }

vue.config.js

@@ -14,9 +14,9 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          // target: 'http://61.164.207.46:8000',  // target host*/
+          target: 'http://61.164.207.46:8000',  // target host*/
           // target: 'http://192.168.3.13:8080',  // target host*!
-          target: 'http://192.168.3.9:8090',  // target host*!
+          // target: 'http://192.168.3.9:8090',  // target host*!
           // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets