任务调整

src/HManagement/task/modules/add.vue

@@ -19,14 +19,14 @@
                 <el-input v-model="form.title" placeholder="请输入任务标题" ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="20">
+            <el-col :span="24">
               <el-form-item label="关联应用数据:" prop="tableName">
                 <el-input v-model="form.tableName" placeholder="请选择关联应用数据" @focus="$refs.applicationRef.dialogTableVisible = true;$refs.applicationRef.listData()" readonly></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+<!--            <el-col :span="4">
               <el-button type="primary" size="mini" @click="$refs.followRef.dialogTableVisible = true;$refs.followRef.listData()" :disabled="followParam.content.ownerid === ''">同步跟进内容</el-button>
-            </el-col>
+            </el-col>-->
             <el-col :span="24">
               <el-form-item label="任务内容:" prop="remarks">
                 <el-input  class="normal-margin" v-model="form.remarks" placeholder="输入任务内容" :autosize="{minRows:6}" type="textarea" show-word-limit maxlength="500" size="small"></el-input>

src/HManagement/task/modules/completeTask.vue

@@ -1,9 +1,13 @@
 <template>
   <div>
-    <el-button :disabled="data.status == '已完成'" class="inline-16" :type="data.status == '已完成'?'':'primary'" size="mini" @click="dialogFormVisible = true" >完成任务</el-button>
-    <el-dialog title="完成任务" :visible.sync="dialogFormVisible" append-to-body width="500px">
-      <el-form :model="form" label-position="top" label-width="90px">
-        <el-form-item label="完成说明">
+    <el-button :disabled="data.status == '已完成'" :type="data.status == '已完成'?'':'primary'" size="mini" @click="onFinish" >完成任务</el-button>
+    <el-dialog title="完成任务" :visible.sync="dialogFormVisible" append-to-body width="450px">
+      <div style="display: flex;justify-content: space-between">
+        <span>完成说明</span>
+        <el-button type="primary" size="mini" @click="$refs.followRef.dialogTableVisible = true;$refs.followRef.listData()" :disabled="followParam.content.ownerid === ''">同步跟进内容</el-button>
+      </div>
+      <el-form :model="form" label-position="top" label-width="90px" style="margin-top: 10px">
+        <el-form-item>
           <el-input v-model="form.finishnotes" type="textarea" :autosize="{minRows:5}" autocomplete="off" placeholder="输入任务完成说明"></el-input>
         </el-form-item>
       </el-form>
@@ -12,10 +16,12 @@
         <el-button type="primary" @click="completeTask" size="small">确 定</el-button>
       </div>
     </el-dialog>
+    <followData ref="followRef" :param="followParam" @follow="follow"></followData>
   </div>
 </template>
 
 <script>
+import followData from "@/HManagement/task/components/followData";
 export default {
   props:['data'],
   data () {
@@ -24,10 +30,24 @@ export default {
       form:{
         finishnotes:''
       },
-      nowUserid: JSON.parse(sessionStorage.getItem('active_account')).userid
+      nowUserid: JSON.parse(sessionStorage.getItem('active_account')).userid,
+      /*跟进列表*/
+      followParam:{
+        "id": 20231207130504,
+        "content": {
+          "ownertable": "",
+          "ownerid": ""
+        },
+      }
     }
   },
+  components:{followData},
   methods:{
+    onFinish(){
+      this.dialogFormVisible = true
+      this.followParam.content.ownerid = this.data.ownerid
+      this.followParam.content.ownertable = this.data.ownertable
+    },
     async completeTask () {
       const res = await this.$api.requested({
         "id":20221211112501,
@@ -41,10 +61,36 @@ export default {
         this.form.finishnotes = ''
         this.$emit('onSuccess')
       })
+    },
+    follow(content,type,contacts,data){
+      if (this.followParam.content.ownertable === 'sa_customers' || this.followParam.content.ownertable === 'sa_project'){
+        if (contacts.length === 0){
+          this.form.finishnotes = '跟进类型：'+type+'\n'+ '跟进对象：'+'\n' + content
+        }else {
+          let obj = ''
+          contacts.forEach((item,index)=>{
+            if (index === contacts.length -1){
+              obj = obj + item
+            }else {
+              obj = obj + item + ','
+            }
+          })
+          this.form.finishnotes = '跟进类型：'+type+'\n'+ '跟进对象：'+obj+'\n' + content
+        }
+      }else if (this.followParam.content.ownertable === 'sa_customers'){
+        this.form.finishnotes = '跟进类型：'+ data.followupmode+'\n'+ content
+      } else {
+        this.form.finishnotes =  content
+      }
+
     }
   }
 }
 
 </script>
-<style>
+<style scoped>
+  /deep/ .el-dialog__footer {
+    padding: 0px 20px 20px 20px;
+    text-align: center;
+  }
 </style>

src/HManagement/task/modules/detail.vue

@@ -16,7 +16,7 @@
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="customOperation">
-        <complete-task :data="mainData" v-if="tool.checkAuth($route.name,'complete') && mainData.disabled" style="display:inline" @onSuccess="queryMainData()"></complete-task>
+        <complete-task :data="mainData" class="inline-16" v-if="tool.checkAuth($route.name,'complete') && mainData.disabled" style="display:inline" @onSuccess="queryMainData()"></complete-task>
         <el-button class="inline-16" v-if="tool.checkAuth($route.name,'delete') && nowUserid === mainData.createuserid" type="primary" size="mini" @click="deleteTask">删 除</el-button>
       </div>
       <div slot="slot0" >
@@ -55,6 +55,7 @@
                   {{mainData.status?mainData.status:'--'}}
                 </span>
               </el-descriptions-item>
+              <el-descriptions-item label-class-name="my-label" label="完成说明">{{mainData.finishnotes?mainData.finishnotes:'--'}}</el-descriptions-item>
             </el-descriptions>
           </div>
 

src/components/normal-basic-layout/details/modules/task/addTask.vue

@@ -14,14 +14,14 @@
       <div class="drawer__panel">
         <el-row :gutter="10">
           <el-form :model="form" :rules="rules" ref="form" label-width="125px" label-position="right" size="mini">
-            <div v-if="typeTask == '' || typeTask == undefined">
+            <div >
               <el-col :span="24" >
                 <el-form-item label="任务标题:" prop="title">
                   <el-input v-model="form.title" placeholder="请输入任务标题" ></el-input>
                 </el-form-item>
               </el-col>
             </div>
-             <div v-else>
+<!--             <div v-else>
                <el-col :span="20" >
                  <el-form-item label="任务标题:" prop="title">
                    <el-input v-model="form.title" placeholder="请输入任务标题" ></el-input>
@@ -30,7 +30,7 @@
                <el-col :span="4" >
                  <el-button type="primary" size="mini" @click="$refs.followRef.dialogTableVisible = true;$refs.followRef.listData()" :disabled="followParam.content.ownerid === ''">同步跟进内容</el-button>
                </el-col>
-             </div>
+             </div>-->
             <el-col :span="24">
               <el-form-item label="任务内容:" prop="remarks">
                 <el-input  class="normal-margin" v-model="form.remarks" placeholder="输入任务内容" :autosize="{minRows:6}" type="textarea" show-word-limit maxlength="500" size="small"></el-input>