Quellcode durchsuchen

任务调整,工商查询弹窗调整

qymljy vor 2 Jahren
Ursprung
Commit
9c8fe02d33

+ 1 - 1
src/Form/EnterpriseArchives/add.vue

@@ -27,7 +27,7 @@
                       @keyup.enter.native="businessSearch">
                     <i slot="prefix" class="el-icon-search" @click="businessSearch" ></i>
                   </el-input>
-                  <el-button type="text" style="color: #333333" icon="el-icon-close" size="mini" @click="businessShow = false"></el-button>
+                  <el-button style="color: #333333;" size="mini" @click="businessShow = false">关闭</el-button>
                 </div>
                 <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                   <el-table-column width="260" label="客户名称">

+ 1 - 3
src/Form/EnterpriseArchives/edit.vue

@@ -27,7 +27,7 @@
                       @keyup.enter.native="businessSearch">
                     <i slot="prefix" class="el-icon-search" @click="businessSearch" ></i>
                   </el-input>
-                  <el-button type="text" style="color: #333333" icon="el-icon-close" size="mini" @click="businessShow = false"></el-button>
+                  <el-button style="color: #333333;" size="mini" @click="businessShow = false">关闭</el-button>
                 </div>
                 <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                   <el-table-column width="260" label="客户名称">
@@ -262,7 +262,6 @@ export default {
     async businessSearch(){
       this.businessParam.content.keyword = this.form.enterprisename
       const res = await this.$api.requested(this.businessParam)
-      console.log(res,"工商查询结果")
       this.businessData = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
@@ -270,7 +269,6 @@ export default {
     },
     /*选择工商信息*/
     businessSelect(val){
-      console.log("选择的工商信息",val)
       this.$confirm('是否以查询的工商信息更新客户信息?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',

+ 1 - 2
src/Form/QuotedPrice/editCopy copy.vue

@@ -368,7 +368,6 @@ export default {
   },
   methods:{
     onShow(){
-      console.log('弹窗')
       this.drawer = true
       /*this.form = this.data*/
       this.form = Object.assign({},this.form,this.data)
@@ -582,4 +581,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

+ 1 - 1
src/Form/competitor/add.vue

@@ -39,7 +39,7 @@
                       @keyup.enter.native="businessSearch">
                     <i slot="prefix" class="el-icon-search" @click="businessSearch" ></i>
                   </el-input>
-                  <el-button type="text" style="color: #333333" icon="el-icon-close" size="mini" @click="businessShow = false"></el-button>
+                  <el-button style="color: #333333;" size="mini" @click="businessShow = false">关闭</el-button>
                 </div>
                 <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                   <el-table-column width="260" label="客户名称">

+ 1 - 1
src/Form/competitor/edit.vue

@@ -39,7 +39,7 @@
                       @keyup.enter.native="businessSearch">
                     <i slot="prefix" class="el-icon-search" @click="businessSearch"></i>
                   </el-input>
-                  <el-button type="text" style="color: #333333" icon="el-icon-close" size="mini" @click="businessShow = false"></el-button>
+                  <el-button style="color: #333333;" size="mini" @click="businessShow = false">关闭</el-button>
                 </div>
                 <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                   <el-table-column width="260" label="客户名称">

+ 0 - 1
src/Form/contractManage/add.vue

@@ -68,7 +68,6 @@ export default {
   methods:{
     closeDrawer () {
       this.$store.dispatch('DrawerShowChange',false)
-      console.log("关闭1111")
     },
     addBtn (type) {
       this.$store.dispatch('DrawerShowChange',true)

+ 0 - 2
src/Form/projectChange/editcopy.vue

@@ -377,7 +377,6 @@ export default {
           this.disabled = true
         }
       }
-      console.log("权限结果",this.disabled)
     }
   },
   methods:{
@@ -601,7 +600,6 @@ export default {
       this.param.content.sa_projectid = this.$route.query.id
       this.param.content.where.condition = this.form.projectname
       const res = await this.$api.requested(this.param)
-      console.log(res.data,'是否重复')
       this.repeats = res.data
       this.total = res.total
       this.$refs.form.validateField('projectname')

+ 1 - 1
src/Form/publicCustomer/add.vue

@@ -35,7 +35,7 @@
                       @keyup.enter.native="businessSearch">
                     <i slot="prefix" class="el-icon-search" @click="businessSearch" ></i>
                   </el-input>
-                  <el-button type="text" style="color: #333333" icon="el-icon-close" size="mini" @click="businessShow = false"></el-button>
+                  <el-button style="color: #333333;" size="mini" @click="businessShow = false">关闭</el-button>
                 </div>
                 <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                   <el-table-column width="260" label="客户名称">

+ 1 - 1
src/Form/publicCustomer/addCopy.vue

@@ -35,7 +35,7 @@
                       @keyup.enter.native="businessSearch">
                     <i slot="prefix" class="el-icon-search" @click="businessSearch" ></i>
                   </el-input>
-                  <el-button type="text" style="color: #333333" icon="el-icon-close" size="mini" @click="businessShow = false"></el-button>
+                  <el-button style="color: #333333;" size="mini" @click="businessShow = false">关闭</el-button>
                 </div>
                 <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                   <el-table-column width="260" label="客户名称">

+ 1 - 1
src/Form/publicCustomer/edit.vue

@@ -35,7 +35,7 @@
                       @keyup.enter.native="businessSearch">
                     <i slot="prefix" class="el-icon-search" @click="businessSearch" ></i>
                   </el-input>
-                  <el-button type="text" style="color: #333333" icon="el-icon-close" size="mini" @click="businessShow = false"></el-button>
+                  <el-button style="color: #333333;" size="mini" @click="businessShow = false">关闭</el-button>
                 </div>
                 <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                   <el-table-column width="260" label="客户名称">

+ 1 - 1
src/Form/salerPrivatecustomer/add.vue

@@ -34,7 +34,7 @@
                       @keyup.enter.native="businessSearch">
                     <i slot="prefix" class="el-icon-search" @click="businessSearch" ></i>
                   </el-input>
-                  <el-button type="text" style="color: #333333" icon="el-icon-close" size="mini" @click="businessShow = false"></el-button>
+                  <el-button style="color: #333333;" size="mini" @click="businessShow = false">关闭</el-button>
                 </div>
                 <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                   <el-table-column width="260" label="客户名称">

+ 1 - 1
src/Form/salerPrivatecustomer/edit.vue

@@ -34,7 +34,7 @@
                       @keyup.enter.native="businessSearch">
                     <i slot="prefix" class="el-icon-search" @click="businessSearch" ></i>
                   </el-input>
-                  <el-button type="text" style="color: #333333" icon="el-icon-close" size="mini" @click="businessShow = false"></el-button>
+                  <el-button style="color: #333333;" size="mini" @click="businessShow = false">关闭</el-button>
                 </div>
                 <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                   <el-table-column width="260" label="客户名称">

+ 7 - 7
src/HManagement/task/components/applicationData.vue

@@ -112,7 +112,7 @@
               <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:scope.column.columnname == 'operation'?'':'--'}}</p>
             </div>
             <!--     项目商机配置       -->
-            <div v-else-if="value === 'sa_porject'">
+            <div v-else-if="value === 'sa_project'">
               <div v-if="scope.column.columnname === 'status'">
                 <span style="color:#52c41a" v-if="scope.column.data[[scope.column.columnname]] == '跟进中'">{{scope.column.data[[scope.column.columnname]]}}</span>
                 <span style="color:#fa8c16" v-else-if="scope.column.data[[scope.column.columnname]] == '已成交'">{{scope.column.data[[scope.column.columnname]]}}</span>
@@ -265,7 +265,7 @@ export default {
         this.list = res.data
         this.total = res.total
         this.currentPage = res.pageNumber
-      }else if (this.value === 'sa_porject'){
+      }else if (this.value === 'sa_project'){
         const res = await this.$api.requested(this.projectParam)
         this.list = res.data
         this.total = res.total
@@ -279,7 +279,7 @@ export default {
         this.tablecols = this.tool.tabelCol(this.$route.name).orderclueList.tablecols
       }else if (this.value === 'sa_customers'){
         this.tablecols = this.tool.tabelCol(this.$route.name).myCustomerTable.tablecols
-      }else if (this.value === 'sa_porject'){
+      }else if (this.value === 'sa_project'){
         this.tablecols = this.tool.tabelCol(this.$route.name).projectTable.tablecols
       }
       this.listData()
@@ -291,7 +291,7 @@ export default {
         this.$emit('selectApplication',data.sat_orderclueid,this.value)
       }else if (this.value === 'sa_customers'){
         this.$emit('selectApplication',data.sa_customersid,this.value)
-      }else if (this.value === 'sa_porject'){
+      }else if (this.value === 'sa_project'){
         this.$emit('selectApplication',data.sa_projectid,this.value)
       }
       this.dialogTableVisible = false
@@ -303,7 +303,7 @@ export default {
       }else if (this.value === 'sa_customers'){
         this.customerParam.content.where.condition = this.input
         this.customerParam.content.pageNumber = 1
-      }else if (this.value === 'sa_porject'){
+      }else if (this.value === 'sa_project'){
         this.projectParam.content.where.condition = this.input
         this.projectParam.content.pageNumber = 1
       }
@@ -315,7 +315,7 @@ export default {
         this.clueParam.content.pageSize = val
       }else if (this.value === 'sa_customers'){
         this.customerParam.content.pageSize = val
-      }else if (this.value === 'sa_porject'){
+      }else if (this.value === 'sa_project'){
         this.projectParam.content.pageSize = val
       }
       this.listData()
@@ -326,7 +326,7 @@ export default {
         this.clueParam.content.pageNumber = val
       }else if (this.value === 'sa_customers'){
         this.customerParam.content.pageNumber = val
-      }else if (this.value === 'sa_porject'){
+      }else if (this.value === 'sa_project'){
         this.projectParam.content.pageNumber = val
       }
       this.listData()

+ 361 - 0
src/HManagement/task/components/applicationDataCopy.vue

@@ -0,0 +1,361 @@
+<template>
+  <div>
+    <el-dialog title="选择应用数据" :visible.sync="dialogTableVisible" append-to-body width="70%">
+      <el-divider></el-divider>
+      <div style="display: flex;justify-content: space-between;padding: 16px">
+        <div>
+          <span style="color:red">*</span>
+          <span class="search__label">选择应用:</span>
+          <el-select v-model="value" placeholder="请选择" size="small" @change="onChange">
+            <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+            </el-option>
+          </el-select>
+        </div>
+        <div>
+          <span class="search__label">搜索:</span>
+          <el-input v-model="input" placeholder="请输入搜索内容" style="width: 300px" size="small" @keyup.native.enter="searchData" @clear="searchData" clearable></el-input>
+        </div>
+      </div>
+      <div style="padding: 0px 16px 16px 16px">
+        <!--     销售线索配置       -->
+        <table-new-layout v-if="value === 'sat_orderclue'" :layout="tablecols" :checkbox="false"  :data="list" :opwidth="200" height="calc(100vh - 550px)" :width="true" :custom="true" fixedName="operation">
+          <template v-slot:customcol="scope">
+            <div v-if="scope.column.columnname == 'status'">
+              <span style="color:#999999" v-if="scope.column.data[[scope.column.columnname]] == '已过期'">{{scope.column.data[[scope.column.columnname]]}}</span>
+              <span style="color:#52c41a" v-else-if="scope.column.data[[scope.column.columnname]] == '跟进中'">{{scope.column.data[[scope.column.columnname]]}}</span>
+              <span style="color:#3874f6" v-else-if="scope.column.data[[scope.column.columnname]] == '待跟进'">{{scope.column.data[[scope.column.columnname]]}}</span>
+              <span style="color:#333333" v-else-if="scope.column.data[[scope.column.columnname]] == '已无效'">{{scope.column.data[[scope.column.columnname]]}}</span>
+              <span style="color:#fa8c16" v-else-if="scope.column.data[[scope.column.columnname]] == '已转化'">{{scope.column.data[[scope.column.columnname]]}}</span>
+              <span v-else>{{scope.column.data[[scope.column.columnname]]}}</span>
+            </div>
+            <div v-else-if="scope.column.columnname == 'totalinvestment'">
+              <span>{{scope.column.data[[scope.column.columnname]] !== 0?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):'--'}}</span>
+            </div>
+            <div v-else-if="scope.column.columnname === 'tag'">
+              <div v-if="scope.column.data.sys_tag">
+                <div v-for="item in scope.column.data.sys_tag" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
+                  <el-tag  color="#3874F6" size="mini" type="primary" effect="dark">
+                    <span>{{item}}</span>
+                  </el-tag>
+                </div>
+                <div v-for="item in scope.column.data.tag" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
+                  <el-tag color="#FA8C16" size="mini" type="warning" effect="dark">
+                    <span>{{item}}</span>
+                  </el-tag>
+                </div>
+              </div>
+              <div v-else>--</div>
+            </div>
+            <div v-else-if="scope.column.columnname == 'scale'">
+              <span>{{scope.column.data[[scope.column.columnname]] !== '' &&  scope.column.data[[scope.column.columnname]] !== 0?scope.column.data[[scope.column.columnname]]+scope.column.data.unitname:'--'}}</span>
+            </div>
+            <div v-else-if="scope.column.columnname == 'costofconstruction'">
+              <span>{{scope.column.data[[scope.column.columnname]] !== 0?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):'--'}}</span>
+            </div>
+            <div v-else-if="scope.column.columnname == 'leader'">
+              <span v-if="scope.column.data[[scope.column.columnname]].length !== 0">{{scope.column.data[[scope.column.columnname]].length > 0 && scope.column.data[[scope.column.columnname]][0].name}}</span>
+              <span v-else>--</span>
+            </div>
+            <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:scope.column.columnname == 'operation'?'':'--'}}</p>
+          </template>
+          <template v-slot:opreation="scope">
+            <el-button type="text" @click="onSelect(scope.data)">选择</el-button>
+          </template>
+        </table-new-layout>
+        <!--     我的客户配置       -->
+        <table-new-layout v-else-if="value === 'sa_customers'" :layout="tablecols" :checkbox="false"  :data="list" :opwidth="200" height="calc(100vh - 550px)" :width="true" :custom="true" fixedName="operation">
+          <template v-slot:customcol="scope">
+            <div v-if="scope.column.columnname === 'isleader'">
+              <span v-if="scope.column.data['leader'].length !== 0">已分配</span>
+              <span v-else>未分配</span>
+            </div>
+            <div v-else-if="scope.column.columnname === 'tag'">
+              <div v-for="item in scope.column.data.tag_sys" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
+                <el-tag  color="#3874F6" size="mini" type="primary" effect="dark">
+                  <span>{{item}}</span>
+                </el-tag>
+              </div>
+              <div v-for="item in scope.column.data.tag" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
+                <el-tag color="#FA8C16" size="mini" type="warning" effect="dark">
+                  <span>{{item}}</span>
+                </el-tag>
+              </div>
+            </div>
+            <div v-else-if="scope.column.columnname === 'industry'">
+              <span v-if="JSON.stringify(scope.column.data.industry) !== '[]' && scope.column.data.industry">
+                <div v-for="item in scope.column.data.industry" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
+                  <el-tag size="mini"  effect="dark">
+                    <span>{{item}}</span>
+                  </el-tag>
+                </div>
+              </span>
+              <div v-else>
+                {{'--'}}
+              </div>
+            </div>
+            <div v-else-if="scope.column.columnname === 'tradingstatus'">
+              <span style="color:#3874f6" v-if="scope.column.data[[scope.column.columnname]] == '未成交'">{{scope.column.data[[scope.column.columnname]]}}</span>
+              <span style="color:#fa8c16" v-else-if="scope.column.data[[scope.column.columnname]] == '已成交'">{{scope.column.data[[scope.column.columnname]]}}</span>
+              <span style="color:#333333" v-else-if="scope.column.data[[scope.column.columnname]] == '多次成交'">{{scope.column.data[[scope.column.columnname]]}}</span>
+            </div>
+            <div v-else-if="scope.column.columnname === 'status'">
+              <span style="color:#3874f6" v-if="scope.column.data[[scope.column.columnname]] == '潜在'">{{scope.column.data[[scope.column.columnname]]}}</span>
+              <span style="color:#52c41a" v-else-if="scope.column.data[[scope.column.columnname]] == '合作中'">{{scope.column.data[[scope.column.columnname]]}}</span>
+              <span style="color:#999999" v-else-if="scope.column.data[[scope.column.columnname]] == '已终止'">{{scope.column.data[[scope.column.columnname]]}}</span>
+            </div>
+            <div v-else-if="scope.column.columnname === 'leader'">
+              <span>{{scope.column.data['leader'][0]?scope.column.data['leader'][0].name:'--'}}</span>
+            </div>
+            <div v-else-if="scope.column.columnname === 'depname'">
+              <span>{{scope.column.data['leader'][0]?scope.column.data['leader'][0].depname?scope.column.data['leader'][0].depname:'--':'--'}}</span>
+            </div>
+            <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:scope.column.columnname == 'operation'?'':'--'}}</p>
+          </template>
+          <template v-slot:opreation="scope">
+            <el-button type="text" @click="onSelect(scope.data)">选择</el-button>
+          </template>
+        </table-new-layout>
+        <!--     项目商机配置       -->
+        <table-new-layout v-else-if="value === 'sa_project'" :layout="tablecols" :checkbox="false"  :data="list" :opwidth="200" height="calc(100vh - 550px)" :width="true" :custom="true" fixedName="operation">
+          <template v-slot:customcol="scope">
+              <div v-if="scope.column.columnname === 'status'">
+                <span style="color:#52c41a" v-if="scope.column.data[[scope.column.columnname]] == '跟进中'">{{scope.column.data[[scope.column.columnname]]}}</span>
+                <span style="color:#fa8c16" v-else-if="scope.column.data[[scope.column.columnname]] == '已成交'">{{scope.column.data[[scope.column.columnname]]}}</span>
+                <span style="color:#999999" v-else-if="scope.column.data[[scope.column.columnname]] == '已失败'">{{scope.column.data[[scope.column.columnname]]}}</span>
+                <span style="color:#999999" v-else-if="scope.column.data[[scope.column.columnname]] == '已结案'">{{scope.column.data[[scope.column.columnname]]}}</span>
+              </div>
+              <div v-else-if="scope.column.columnname === 'reportstatus'">
+                <span style="color:#3874f6" v-if="scope.column.data[[scope.column.columnname]] == '已报备'">{{scope.column.data[[scope.column.columnname]]}}</span>
+                <span style="color:#52c41a" v-else-if="scope.column.data[[scope.column.columnname]] == '报备中'">{{scope.column.data[[scope.column.columnname]]}}</span>
+                <span style="color:#999999" v-else-if="scope.column.data[[scope.column.columnname]] == '未报备'">{{scope.column.data[[scope.column.columnname]]}}</span>
+              </div>
+              <div v-else-if="scope.column.columnname === 'tag_sys'">
+                <div v-for="item in scope.column.data.tag_sys" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
+                  <el-tag  color="#3874F6" size="mini" type="primary" effect="dark">
+                    <span>{{item}}</span>
+                  </el-tag>
+                </div>
+                <div v-for="item in scope.column.data.tag" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
+                  <el-tag color="#FA8C16" size="mini" type="warning" effect="dark">
+                    <span>{{item}}</span>
+                  </el-tag>
+                </div>
+              </div>
+              <div v-else-if="scope.column.columnname === 'leader'">
+                {{scope.column.data.leader[0] && scope.column.data.leader[0].name}}
+              </div>
+              <div v-else-if="scope.column.columnname === 'projecttype'">
+                {{scope.column.data.projecttype + '-' + scope.column.data.projecttype_remarks}}
+              </div>
+              <div v-else-if="scope.column.columnname == 'totalinvestment'">
+                <span>{{scope.column.data[[scope.column.columnname]] ?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):'--'}}</span>
+              </div>
+              <div v-else-if="scope.column.columnname == 'costofconstruction'">
+                <span>{{scope.column.data[[scope.column.columnname]] ?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):'--'}}</span>
+              </div>
+              <div v-else-if="scope.column.columnname == 'budgetary'">
+                <span>{{scope.column.data[[scope.column.columnname]] ?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):'--'}}</span>
+              </div>
+              <div v-else-if="scope.column.columnname == 'signamount_due'">
+                <span>{{scope.column.data[[scope.column.columnname]] ?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):'--'}}</span>
+              </div>
+              <div v-else-if="scope.column.columnname == 'begdate_due'">
+                <span>{{scope.column.data[[scope.column.columnname]] ? scope.column.data[[scope.column.columnname]] !== 'NaN-NaN'?scope.column.data[[scope.column.columnname]]:'--' :'--'}}</span>
+              </div>
+              <div v-else-if="scope.column.columnname == 'enddate_due'">
+                <span>{{scope.column.data[[scope.column.columnname]] ? scope.column.data[[scope.column.columnname]] !== 'NaN-NaN'?scope.column.data[[scope.column.columnname]]:'--' :'--'}}</span>
+              </div>
+              <div v-else-if="scope.column.columnname == 'scale'">
+                <span>{{scope.column.data[[scope.column.columnname]]?scope.column.data[[scope.column.columnname]] + scope.column.data.unitname:'--'}}</span>
+              </div>
+              <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:scope.column.columnname == 'operation'?'':'--'}}</p>
+          </template>
+          <template v-slot:opreation="scope">
+            <el-button type="text" @click="onSelect(scope.data)">选择</el-button>
+          </template>
+        </table-new-layout>
+        <div class="container normal-panel" style="text-align:right;padding-bottom: 0">
+          <el-pagination
+              background
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="currentPage"
+              :page-sizes="[20, 50, 100, 200]"
+              :page-size="20"
+              layout="total,sizes, prev, pager, next, jumper"
+              :total="total">
+          </el-pagination>
+        </div>
+      </div>
+
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "applicationData",
+  data() {
+    return {
+      dialogTableVisible:false,
+      options: [{
+        value: 'sat_orderclue',
+        label: '销售线索'
+      }, {
+        value: 'sa_customers',
+        label: '我的客户'
+      }, {
+        value: 'sa_project',
+        label: '项目商机'
+      }],
+      value: 'sat_orderclue',
+      input:"",
+      tablecols:[],
+      list:[],
+      total:0,
+      currentPage:0,
+      /*销售线索*/
+      clueParam:{
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+            "condition": ""
+          },
+          "type": 1,
+          "isAll":0
+        },
+        "id": 20221101094502,
+      },
+      /*我的客户*/
+      customerParam:{
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+            "condition": ""
+          },
+          "type": 1,
+          "deleted": 0,
+          "isend": 0,
+          "isExport":0
+        },
+        "id": 20221012164402,
+      },
+      /*项目商机*/
+      projectParam:{
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+            "condition": ""
+          },
+          "type": 1,
+          "deleted": 0
+        },
+        "id": 20221020143502,
+      }
+    }
+  },
+  methods:{
+    async listData(){
+      if (this.value === 'sat_orderclue'){
+        const res = await this.$api.requested(this.clueParam)
+        this.list = res.data
+        this.total = res.total
+        this.currentPage = res.pageNumber
+      }else if (this.value === 'sa_customers'){
+        const res = await this.$api.requested(this.customerParam)
+        this.list = res.data
+        this.total = res.total
+        this.currentPage = res.pageNumber
+      }else if (this.value === 'sa_project'){
+        const res = await this.$api.requested(this.projectParam)
+        this.list = res.data
+        this.total = res.total
+        this.currentPage = res.pageNumber
+      }
+
+    },
+    /*选择应用*/
+    onChange(){
+      if (this.value === 'sat_orderclue'){
+        this.tablecols = this.tool.tabelCol(this.$route.name).orderclueList.tablecols
+      }else if (this.value === 'sa_customers'){
+        this.tablecols = this.tool.tabelCol(this.$route.name).myCustomerTable.tablecols
+      }else if (this.value === 'sa_project'){
+        this.tablecols = this.tool.tabelCol(this.$route.name).projectTable.tablecols
+      }
+      this.listData()
+    },
+    /*选择应用中的数据*/
+    onSelect(data){
+      console.log(data)
+      if (this.value === 'sat_orderclue'){
+        this.$emit('selectApplication',data.sat_orderclueid,this.value)
+      }else if (this.value === 'sa_customers'){
+        this.$emit('selectApplication',data.sa_customersid,this.value)
+      }else if (this.value === 'sa_project'){
+        this.$emit('selectApplication',data.sa_projectid,this.value)
+      }
+      this.dialogTableVisible = false
+    },
+    searchData(){
+      if (this.value === 'sat_orderclue'){
+        this.clueParam.content.where.condition = this.input
+        this.clueParam.content.pageNumber = 1
+      }else if (this.value === 'sa_customers'){
+        this.customerParam.content.where.condition = this.input
+        this.customerParam.content.pageNumber = 1
+      }else if (this.value === 'sa_project'){
+        this.projectParam.content.where.condition = this.input
+        this.projectParam.content.pageNumber = 1
+      }
+      this.listData()
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      if (this.value === 'sat_orderclue'){
+        this.clueParam.content.pageSize = val
+      }else if (this.value === 'sa_customers'){
+        this.customerParam.content.pageSize = val
+      }else if (this.value === 'sa_project'){
+        this.projectParam.content.pageSize = val
+      }
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      if (this.value === 'sat_orderclue'){
+        this.clueParam.content.pageNumber = val
+      }else if (this.value === 'sa_customers'){
+        this.customerParam.content.pageNumber = val
+      }else if (this.value === 'sa_project'){
+        this.projectParam.content.pageNumber = val
+      }
+      this.listData()
+    },
+  },
+  mounted() {
+  },
+  created() {
+    this.tablecols = this.tool.tabelCol(this.$route.name).orderclueList.tablecols
+  }
+}
+</script>
+
+<style scoped>
+  /deep/ .el-dialog__body {
+    padding: 0px !important;
+  }
+  /deep/ .el-divider--horizontal {
+    display: block;
+    height: 1px;
+    width: 100%;
+    margin: 0;
+  }
+</style>

+ 1 - 1
src/HManagement/task/components/followData.vue

@@ -57,7 +57,7 @@ export default {
     onSelect(data){
       console.log(data)
       this.dialogTableVisible = false
-      this.$emit('follow',data.content)
+      this.$emit('follow',data.content,data.type,data.contacts)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

+ 21 - 3
src/HManagement/task/modules/add.vue

@@ -29,7 +29,7 @@
             </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="100" size="small"></el-input>
+                <el-input  class="normal-margin" v-model="form.remarks" placeholder="输入任务内容" :autosize="{minRows:6}" type="textarea" show-word-limit maxlength="500" size="small"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -279,8 +279,26 @@ export default {
       this.form.ownerid = ownerid
       this.form.tableName = ownertable === 'sat_orderclue'?'销售线索':ownertable === 'sa_customers'?'我的客户':ownertable === 'sa_porject'?'项目商机':''
     },
-    follow(data){
-      this.form.remarks = data
+    follow(content,type,contacts){
+      if (this.form.tableName === '我的客户' || this.form.tableName === '项目商机'){
+        if (contacts.length === 0){
+          this.form.remarks = '跟进类型:'+type+'\n'+ content
+        }else {
+          let obj = ''
+          contacts.forEach((item,index)=>{
+            if (index === contacts.length -1){
+              obj = obj + item
+            }else {
+              obj = obj + item + ','
+            }
+          })
+          this.form.remarks = '跟进类型:'+type+'\n'+ '跟进对象:'+obj+'\n' + content
+        }
+
+      }else {
+        this.form.remarks = '跟进类型:'+type+'\n'+ content
+      }
+
     }
 	}
 }

+ 23 - 3
src/HManagement/task/modules/edit.vue

@@ -29,7 +29,7 @@
             </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="100" size="small"></el-input>
+                <el-input  class="normal-margin" v-model="form.remarks" placeholder="输入任务内容" :autosize="{minRows:6}" type="textarea" show-word-limit maxlength="500" size="small"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -203,6 +203,8 @@ export default {
 		onShow () {
 			this.form = Object.assign({},this.form,this.data)
       console.log(this.form,'form表单数据')
+      this.followParam.content.ownerid = this.form.ownerid
+      this.followParam.content.ownertable = this.form.ownertable
 			this.leader = this.data.leader[0]?this.data.leader[0]:''
       this.implement = this.data.leader[0].userid
       this.form.leaderuserid = this.data.leader[0].userid
@@ -327,8 +329,26 @@ export default {
       this.form.ownerid = ownerid
       this.form.tableName = ownertable === 'sat_orderclue'?'销售线索':ownertable === 'sa_customers'?'我的客户':ownertable === 'sa_porject'?'项目商机':''
     },
-    follow(data){
-      this.form.remarks = data
+    follow(content,type,contacts){
+      if (this.form.tableName === '我的客户' || this.form.tableName === '项目商机'){
+        if (contacts.length === 0){
+          this.form.remarks = '跟进类型:'+type+'\n'+ content
+        }else {
+          let obj = ''
+          contacts.forEach((item,index)=>{
+            if (index === contacts.length -1){
+              obj = obj + item
+            }else {
+              obj = obj + item + ','
+            }
+          })
+          this.form.remarks = '跟进类型:'+type+'\n'+ '跟进对象:'+obj+'\n' + content
+        }
+
+      }else {
+        this.form.remarks = '跟进类型:'+type+'\n'+ content
+      }
+
     }
 	}
 }

+ 1 - 1
src/components/businessMessage/index.vue

@@ -17,7 +17,7 @@
             @keyup.enter.native="businessSearch">
           <i slot="prefix" class="el-icon-search" @click="businessSearch" ></i>
         </el-input>
-        <el-button type="text" style="color: #333333" icon="el-icon-close" size="mini" @click="businessShow = false"></el-button>
+        <el-button style="color: #333333;" size="mini" @click="businessShow = false">关闭</el-button>
       </div>
       <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
         <el-table-column width="260" label="客户名称">