暂存

src/HManagement/task/index.vue

@@ -51,6 +51,12 @@
             <p v-else-if="scope.data.column.data.status === '待执行'" style="color:#3874f6">{{scope.data.column.data.status}}</p>
             <p v-else style="color:#333333">{{scope.data.column.data.status}}</p>
           </div>
+          <div v-else-if="scope.data.column.columnname === 'endtime'">
+            <p>{{scope.data.column.data.endtime?scope.data.column.data.endtime:'无限'}}</p>
+          </div>
+          <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)">
@@ -109,7 +115,18 @@ export default {
       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)
     }
   },
   mounted () {

src/HManagement/task/modules/detail.vue

@@ -10,7 +10,7 @@
         idname="sys_taskid"
         ownertable="sys_task"
         tags=""
-        :tabs="['任务信息']"
+        :tabs="['详细信息']"
         :mainData="mainData"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
@@ -18,9 +18,39 @@
         <complete-task :data="mainData" v-if="tool.checkAuth($route.name,'complete')" style="display:inline" @onSuccess="queryMainData()"></complete-task>
         <el-button class="inline-16" v-if="tool.checkAuth($route.name,'delete') && !disable" type="primary" size="mini" @click="deleteTask">删 除</el-button>
       </div>
-      <div slot="slot0" class="task__content">
-        <p class="mt-10">标题:{{mainData.title}}</p>
-        <p>内容:{{mainData.remarks}}</p>
+      <div slot="slot0" >
+<!--        <p class="mt-10">标题:{{mainData.title}}</p>
+        <p>内容:{{mainData.remarks}}</p>-->
+        <div class="normal-panel">
+          <div class=" normal-panel normal-margin">
+            <el-descriptions title="基本信息" border :column="2" labelClassName="my-label" contentClassName="my-content">
+              <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="开始时间">{{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-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>
+          </div>
+
+          <div class="normal-panel">
+            <el-descriptions title="系统信息" border :column="2" labelClassName="my-label" contentClassName="my-content">
+              <el-descriptions-item label-class-name="my-label" label="创建人">{{mainData.createby?mainData.createby:'--'}}</el-descriptions-item>
+              <el-descriptions-item label-class-name="my-label" label="创建时间">{{mainData.createdate?mainData.createdate:'--'}}</el-descriptions-item>
+              <el-descriptions-item label-class-name="my-label" label="最近编辑人">{{mainData.changeby?mainData.changeby:'--'}}</el-descriptions-item>
+              <el-descriptions-item label-class-name="my-label" label="最近编辑时间">{{mainData.changedate?mainData.changedate:'--'}}</el-descriptions-item>
+              <el-descriptions-item label-class-name="my-label" label="完成人">{{mainData.finishby?mainData.finishby:'--'}}</el-descriptions-item>
+              <el-descriptions-item label-class-name="my-label" label="完成时间">{{mainData.finishdate?mainData.finishdate:'--'}}</el-descriptions-item>
+              <el-descriptions-item label-class-name="my-label" label="转手次数">{{mainData.leader?mainData.leader.length !== 0 ?mainData.leader[0].leadernum:'--':"--" }}</el-descriptions-item>
+            </el-descriptions>
+          </div>
+        </div>
       </div>
       <div slot="slot1" >
       </div>

vue.config.js

@@ -14,9 +14,9 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          target: 'http://61.164.207.46:8000',  // target host*/
-          // target: 'http://192.168.3.13:8080',  // 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: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets