Merge branch 'mergeBranch' into nextUpdateNext

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="客户名称">

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: '取消',

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>

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="客户名称">

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="客户名称">

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)

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')

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="客户名称">

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="客户名称">

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="客户名称">

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="客户名称">

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="客户名称">

src/HDrpManagement/competitor/detail/index.vue

@@ -8,6 +8,7 @@
         :mainAreaData="mainAreaData"
         turnPageId="20221018164302"
         idname="sa_competitorid"
+        typeTask="竞争对手"
         :tags="[]"
         :tabs="['详细信息','参与竞争项目','联系人','地址管理']"
         @pageChange="pageChange"
@@ -134,4 +135,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/HDrpManagement/contractManage/modules/detail.vue

@@ -7,6 +7,7 @@
         :mainAreaData="mainAreaData"
         turnPageId="20221121201502"
         idname="sa_contractid"
+        typeTask="合同"
         ownertable="sa_contract"
         :tabs="mainData.type === '项目' ? ['产品明细折扣','产品类别折扣','详细信息'] : mainData.type === '框架' ? ['产品明细折扣','产品类别折扣','业绩目标','详细信息'] : mainData.type === '居间' ? ['详细信息'] : mainData.type === '直销' ? ['产品明细折扣','产品类别折扣','业绩目标','详细信息'] : ['工具清单','详细信息']"
 

src/HDrpManagement/projectChange/modules/detail.vue

@@ -8,6 +8,7 @@
     :mainAreaData="mainAreaData"
     :turnPageId="20221020143502"
     idname="sa_projectid"
+    typeTask="项目商机"
     :tags="[]"
     :tabs="['详细信息','关联客户','联系人','产品配置单','报价单','竞争对手','合同','关联线索','报备进度','项目评估']"
     :status="mainData.status"

src/HDrpManagement/publicCustomer/modules/detail.vue

@@ -9,6 +9,7 @@
         :turnPageId="20221011133602"
         idname="sa_customersid"
         :tabs="['详细信息','联系人信息','客户地址','开票信息','项目商机','报价单','关联合同','账户余额','银行卡信息','线索']"
+        typeTask="公海客户"
         @pageChange="pageChange"
         @onEditSuccess="onEditSuccess"
         @sysTag="sysTag">

src/HDrpManagement/salerPortrait/modules/detail.vue

@@ -99,10 +99,10 @@
             <showIsNone title="订单明细">
               <div style="float: right;margin-bottom: 10px;margin-top: -40px">
                 <el-button-group>
-                  <el-button :type="param2.content.sort[0].sortid == '172'?'primary':''"  size="mini" @click="sortChange('订单')">订单</el-button>
-                  <el-button :type="param2.content.sort[0].sortid == '173'?'primary':''"  size="mini" @click="sortChange('出货')">出货</el-button>
-                  <el-button :type="param2.content.sort[0].sortid == '174'?'primary':''"  size="mini" @click="sortChange('开票')">开票</el-button>
-                  <el-button :type="param2.content.sort[0].sortid == '175'?'primary':''"  size="mini" @click="sortChange('回款')">回款</el-button>
+                  <el-button :type="param2.content.sort[0].sortid == '174'?'primary':''"  size="mini" @click="sortChange('订单')">订单</el-button>
+                  <el-button :type="param2.content.sort[0].sortid == '175'?'primary':''"  size="mini" @click="sortChange('出货')">出货</el-button>
+                  <el-button :type="param2.content.sort[0].sortid == '176'?'primary':''"  size="mini" @click="sortChange('开票')">开票</el-button>
+                  <el-button :type="param2.content.sort[0].sortid == '177'?'primary':''"  size="mini" @click="sortChange('回款')">回款</el-button>
                 </el-button-group>
                 <img v-if="param2.content.sort[0].reversed == 0" @click="upSort('down')" width="28" height="28" src="../../../assets/icons/upSort.svg" alt="" style="vertical-align: middle;margin-left: 10px;">
                 <img v-if="param2.content.sort[0].reversed == 1" @click="upSort('up')" width="28" height="28" src="../../../assets/icons/downSort.svg" alt="" style="vertical-align: middle;margin-left: 10px;">
@@ -122,16 +122,16 @@
                     {{scope.data.data.sumamount && tool.formatAmount(scope.data.data.sumamount || 0,2,'￥')  }}
                   </div>
                   <div v-else-if="scope.data.columnname == 'writeoffamount'">
-                    <span :style="{color:param2.content.sort[0].sortid == '175'?'#3874F6':''}">{{scope.data.data.writeoffamount && tool.formatAmount(scope.data.data.writeoffamount || 0,2,'￥')  }}</span>
+                    <span :style="{color:param2.content.sort[0].sortid == '177'?'#3874F6':''}">{{scope.data.data.writeoffamount && tool.formatAmount(scope.data.data.writeoffamount || 0,2,'￥')  }}</span>
                   </div>
                   <div v-else-if="scope.data.columnname == 'unoutOrderamount'">
-                    <span :style="{color:param2.content.sort[0].sortid == '172'?'#3874F6':''}">{{scope.data.data.unoutOrderamount && tool.formatAmount(scope.data.data.unoutOrderamount || 0,2,'￥')  }}</span>
+                    <span :style="{color:param2.content.sort[0].sortid == '174'?'#3874F6':''}">{{scope.data.data.unoutOrderamount && tool.formatAmount(scope.data.data.unoutOrderamount || 0,2,'￥')  }}</span>
                   </div>
                   <div v-else-if="scope.data.columnname == 'uninvoicamount'">
-                    <span :style="{color:param2.content.sort[0].sortid == '173'?'#3874F6':''}">{{scope.data.data.uninvoicamount && tool.formatAmount(scope.data.data.uninvoicamount || 0,2,'￥')  }}</span>
+                    <span :style="{color:param2.content.sort[0].sortid == '175'?'#3874F6':''}">{{scope.data.data.uninvoicamount && tool.formatAmount(scope.data.data.uninvoicamount || 0,2,'￥')  }}</span>
                   </div>
                   <div v-else-if="scope.data.columnname == 'unwriteoffamount'">
-                    <span :style="{color:param2.content.sort[0].sortid == '174'?'#3874F6':''}">{{scope.data.data.unwriteoffamount && tool.formatAmount(scope.data.data.unwriteoffamount || 0,2,'￥')  }}</span>
+                    <span :style="{color:param2.content.sort[0].sortid == '176'?'#3874F6':''}">{{scope.data.data.unwriteoffamount && tool.formatAmount(scope.data.data.unwriteoffamount || 0,2,'￥')  }}</span>
                   </div>
                   <div v-else>
                     {{ scope.data.data[scope.data.columnname] }}
@@ -473,7 +473,7 @@ export default {
           "sort":[{
             "reversed": 1,//1降序，0升序
             "sorted": 1,
-            "sortid": 172,//订单：172,出货：173,开票：174,回款：175
+            "sortid": 174,//订单：174,出货：175,开票：176,回款：177
           }]
         }
       },
@@ -627,13 +627,13 @@ export default {
     /*订单明细排序*/
     sortChange(val){
       if (val === '订单'){
-        this.param2.content.sort[0].sortid = 172
+        this.param2.content.sort[0].sortid = 174
       }else if (val === '出货'){
-        this.param2.content.sort[0].sortid = 173
+        this.param2.content.sort[0].sortid = 175
       }else if (val === '开票'){
-        this.param2.content.sort[0].sortid = 174
+        this.param2.content.sort[0].sortid = 176
       }else if (val === '回款'){
-        this.param2.content.sort[0].sortid = 175
+        this.param2.content.sort[0].sortid = 177
       }
       this.$refs.dingdan.listData()
     },

src/HManagement/ecycle/agentManage/index.vue

@@ -0,0 +1,249 @@
+<template>
+  <div>
+    <basicLayout
+        ref="basicLayout"
+        tableName="agentTable"
+        idName="sa_agentsid"
+        :apiId="{query:20221011144903,del:''}"
+        :autoQuery="false"
+        @checkboxCallBack="checkboxCallBack"
+    >
+      <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>
+      </template>
+      <template #custom>
+        <div class="mt-10">
+          <p class="search__label">应用:</p>
+          <el-select
+              class="inline-24"
+              size="small"
+              v-model="application"
+              placeholder="请选择范围"
+              @change="applicationChange"
+          >
+            <el-option
+                v-for="item in applicationList"
+                :key="item.index"
+                :label="item.label"
+                :value="item.value"
+            ></el-option>
+          </el-select>
+        </div>
+        <div class="mt-10">
+          <p class="search__label">合作伙伴类型:</p>
+          <el-select
+              class="inline-16"
+              ref="sle"
+              v-model="selectParam.type"
+              placeholder="请选择合作伙伴类别"
+              size="small"
+              @change="selectChange"
+              clearable
+          >
+            <el-option
+                v-for="item in agent_type"
+                :key="item.value"
+                :label="item.value"
+                :value="item.value"
+            >
+              <span style="float: left">{{ item.value }}</span>
+             <span style="float: right; color: #8492a6; font-size: 12px">{{ item.helptips?item.helptips:'暂无描述' }}</span>
+            </el-option>
+          </el-select>
+        </div>
+        <div class="mt-10">
+          <p class="search__label">合作状态:</p>
+          <el-select
+              class="inline-16"
+              ref="sle"
+              v-model="selectParam.cooperationstatus"
+              placeholder="请选择合作状态"
+              size="small"
+              @change="selectChange"
+              clearable
+          >
+            <el-option
+                v-for="item in cooperationstatus"
+                :key="item.label"
+                :label="item.label"
+                :value="item.label"
+            >
+            </el-option>
+          </el-select>
+        </div>
+      </template>
+      <template v-slot:tbList="scope">
+        <div>
+          <p v-if="scope.data.column.columnname === 'province'">
+            {{`${scope.data.column.data.province}-${scope.data.column.data.city}-${scope.data.column.data.county}`}}
+          </p>
+          <p v-else-if="scope.data.column.columnname === 'type'">
+              <span v-if="scope.data.column.data.type">
+               <span v-for="(item,index) in scope.data.column.data.type" :key="index">
+                  <span v-if="scope.data.column.data.type.length - 1 === index">
+                    {{item}}
+                  </span>
+                  <span v-else>
+                    {{item + ','}}
+                  </span>
+                </span>
+             </span>
+            <span v-else>
+               --
+             </span>
+          </p>
+          <p v-else-if="scope.data.column.columnname === 'status'">
+            <span style="color:#d90a0a" v-if="scope.data.column.data[[scope.data.column.columnname]] == '禁用'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+            <span style="color:#52C41A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '启用'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          </p>
+          <p v-else-if="scope.data.column.columnname === 'isservice'">
+            {{scope.data.column.data.isservice ? '是' : '否'}}
+          </p>
+          <p v-else>{{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}</p>
+        </div>
+      </template>
+      <template v-slot:tbOpreation="scope">
+        <delData class="inline-16" :ownerid="scope.data.data.sa_agentsid" :sys_object="application" @delSuccess="queryData"></delData>
+        <recovery type="合作伙伴" class="inline-16" :ownerid="scope.data.data.sa_agentsid" :sys_object="application" @recoverySuccess="queryData"></recovery>
+      </template>
+    </basicLayout>
+  </div>
+</template>
+
+<script>
+import recovery from "@/HManagement/ecycle/modules/recovery";
+import delData from "@/HManagement/ecycle/modules/delData";
+import batchDeletion from "@/HManagement/ecycle/modules/batchDeletion";
+import batchRecovery from "@/HManagement/ecycle/modules/batchRecovery";
+
+export default {
+  name: "index",
+  data () {
+    return {
+      application:'6',
+      applicationList:[
+        {
+          label: '销售线索',
+          value: "1",
+        },
+        {
+          label: '客户',
+          value: "2",
+        },
+        {
+          label: '合同',
+          value: "3",
+        },
+        {
+          label: '项目商机',
+          value: "4",
+        },
+        {
+          label: '报价单',
+          value: "5",
+        },
+        {
+          label: '合作伙伴',
+          value: "6",
+        }
+      ],
+      dateSelect:'',
+      typeList:[],
+      area:'1',
+      tabIndex:"1",
+      condition:'',
+      selectParam: {
+        status: "",
+        type: "",
+        cooperationstatus:"",
+      },
+      selectData:[],
+      statusList:[],
+      agent_type:[],
+      cooperationstatus:[
+        {
+          label:'正式'
+        },
+        {
+          label:'意向'
+        },
+      ],
+    }
+  },
+  components:{recovery,delData,batchDeletion,batchRecovery},
+  methods:{
+    queryData(){
+      this.$refs.basicLayout.param.content.isAll = 1
+      this.$refs.basicLayout.param.content.type = 0
+      this.$refs.basicLayout.param.content.isdeleted = 1
+      this.$refs.basicLayout.param.content.containssub = 1
+      this.$refs.basicLayout.param.content.sa_saleareaids = []
+      this.$refs.basicLayout.listData()
+    },
+    applicationChange(val){
+      console.log(val)
+      this.$emit("changeApplication",val)
+    },
+    async userstatus() {
+      let param = {
+        classname: "sysmanage.develop.optiontype.optiontype",
+        method: "optiontypeselect",
+        content: {
+          pageNumber: 1,
+          pageSize: 20,
+          typename: "userstatus",
+          parameter: {},
+        },
+      };
+      const res = await this.$api.requested(param);
+      this.statusList = res.data;
+    },
+    async bindImportOrder (id) {
+      const res = await this.$api.requested({
+        "id": 20230311163004,
+        "content": {
+          "attachmentid":id
+        }
+      })
+      if (res.data !== '成功') {
+        this.errorUrl = res.data
+      }
+      this.tool.showMessage(res,() => {
+        this.$refs.basicLayout.listData()
+      })
+    },
+    /*合作伙伴类型*/
+    async queryType(){
+      const res = await this.$store.dispatch('optiontypeselect','agenttypemx')
+      this.agent_type = res.data
+      console.log(this.agent_type,'agent_type')
+    },
+    selectChange () {
+      this.$refs.basicLayout.param.content.where = this.selectParam
+      this.$refs.basicLayout.listData()
+    },
+    checkboxCallBack(val){
+      this.selectData = []
+      val.forEach((item,index) => {
+        this.selectData[index] = item.sa_agentsid
+      })
+      this.$refs.batchDeletion.length = this.selectData.length
+      this.$refs.batchRecovery.length = this.selectData.length
+      console.log(this.selectData)
+    }
+  },
+  mounted() {
+    this.queryData()
+    this.userstatus()
+    this.queryType()
+  },
+  created () {
+    // this.getAgentList()
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

src/HManagement/ecycle/contract/index.vue

@@ -154,6 +154,10 @@ export default {
         {
           label: '报价单',
           value: "5",
+        },
+        {
+          label: '合作伙伴',
+          value: "6",
         }
       ],
       dateSelect:'',

src/HManagement/ecycle/customer/index.vue

@@ -163,6 +163,10 @@ export default {
         {
           label: '报价单',
           value: "5",
+        },
+        {
+          label: '合作伙伴',
+          value: "6",
         }
       ],
       option:{

src/HManagement/ecycle/index.vue

@@ -5,6 +5,7 @@
     <quotedPrice v-if="quotedPriceShow" @changeApplication="onChange"></quotedPrice>
     <contract v-if="contractShow" @changeApplication="onChange"></contract>
     <customer v-if="customerShow" @changeApplication="onChange"></customer>
+    <agenter v-if="agenerShow" @changeApplication="onChange"></agenter>
   </div>
 </template>
 
@@ -14,16 +15,18 @@ import projectChange from './projectChange/index'
 import quotedPrice from './quotedPrice/index'
 import contract from './contract/index'
 import customer from './customer/index'
+import agenter from './agentManage/index'
 export default {
   name: "index",
-  components:{saleClue,projectChange,quotedPrice,contract,customer},
+  components:{saleClue,projectChange,quotedPrice,contract,customer,agenter},
   data(){
     return {
       salClueShow:true,
       projectChangeShow:false,
       quotedPriceShow:false,
       contractShow:false,
-      customerShow:false
+      customerShow:false,
+      agenerShow:false
     }
   },
   methods:{
@@ -35,30 +38,42 @@ export default {
         this.quotedPriceShow = false
         this.contractShow = false
         this.customerShow = false
+        this.agenerShow = false
       }else if (val === '2') {
         this.customerShow = true
         this.salClueShow = false
         this.projectChangeShow = false
         this.quotedPriceShow = false
         this.contractShow = false
+        this.agenerShow = false
       }else if (val === '3'){
         this.contractShow = true
         this.quotedPriceShow = false
         this.salClueShow = false
         this.projectChangeShow = false
         this.customerShow = false
+        this.agenerShow = false
       }else if (val === '4'){
         this.projectChangeShow = true
         this.quotedPriceShow = false
         this.salClueShow = false
         this.contractShow = false
         this.customerShow = false
+        this.agenerShow = false
       }else if (val === '5'){
         this.quotedPriceShow = true
         this.customerShow = false
         this.contractShow = false
         this.salClueShow = false
         this.projectChangeShow = false
+        this.agenerShow = false
+      }else if (val === '6'){
+        this.agenerShow = true
+        this.customerShow = false
+        this.contractShow = false
+        this.salClueShow = false
+        this.projectChangeShow = false
+        this.quotedPriceShow = false
       }
       console.log(this.projectChangeShow,this.salClueShow)
     }
@@ -68,4 +83,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/HManagement/ecycle/projectChange/index.vue

@@ -161,6 +161,10 @@ export default {
         {
           label: '报价单',
           value: "5",
+        },
+        {
+          label: '合作伙伴',
+          value: "6",
         }
       ],
       projectType:'',

src/HManagement/ecycle/quotedPrice/index.vue

@@ -147,6 +147,10 @@ export default {
         {
           label: '报价单',
           value: "5",
+        },
+        {
+          label: '合作伙伴',
+          value: "6",
         }
       ],
       dateSelect:'',

src/HManagement/ecycle/saleClue/index.vue

@@ -105,6 +105,10 @@ export default {
         {
           label: '报价单',
           value: "5",
+        },
+        {
+          label: '合作伙伴',
+          value: "6",
         }
       ],
       status:'',

src/HManagement/marketing2/agent/details/index.vue

@@ -51,6 +51,7 @@
           dialogTitle="作废原因"
           @onSuccess="$store.dispatch('changeDetailDrawer',false);$router.back()"
           class="inline-16"
+          delType="合作伙伴"
           v-if="mainData.status == '禁用' && tool.checkAuth($route.name,'delete')"
         />
     </div>

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,20 +279,19 @@ 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()
     },
     /*选择应用中的数据*/
     onSelect(data){
-      console.log(data)
       if (this.value === 'sat_orderclue'){
-        this.$emit('selectApplication',data.sat_orderclueid,this.value)
+        this.$emit('selectApplication',data.sat_orderclueid,this.value,data)
       }else if (this.value === 'sa_customers'){
-        this.$emit('selectApplication',data.sa_customersid,this.value)
-      }else if (this.value === 'sa_porject'){
-        this.$emit('selectApplication',data.sa_projectid,this.value)
+        this.$emit('selectApplication',data.sa_customersid,this.value,data)
+      }else if (this.value === 'sa_project'){
+        this.$emit('selectApplication',data.sa_projectid,this.value,data)
       }
       this.dialogTableVisible = false
     },
@@ -303,7 +302,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 +314,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 +325,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()

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>

src/HManagement/task/components/followData.vue

@@ -4,7 +4,7 @@
       <el-divider></el-divider>
       <div style="display: flex;justify-content: space-between;padding: 16px">
         <div>
-          <span >总计:{{total}}</span>
+          <span style="font-size: 13px">总计:{{total}}个</span>
         </div>
       </div>
       <div style="padding: 0px 16px 16px 16px">
@@ -49,15 +49,13 @@ export default {
   methods:{
     async listData(){
       const res = await this.$api.requested(this.param)
-      console.log(res.data,'跟进内容')
       this.list = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
     },
     onSelect(data){
-      console.log(data)
       this.dialogTableVisible = false
-      this.$emit('follow',data.content)
+      this.$emit('follow',data.content,data.type,data.contacts,data)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/HManagement/task/modules/add.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="small" type="primary" @click="dialogTableVisible = true">
+    <el-button size="small" type="primary" @click="dialogTableVisible = true;$refs.applicationRef.value = 'sat_orderclue';$refs.applicationRef.onChange()">
         创建任务
     </el-button>
     <el-drawer
@@ -19,17 +19,17 @@
                 <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="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">
@@ -225,7 +225,7 @@ export default {
         this.$refs['upload'].toUpload()*/
         this.$emit('onSuccess')
 				this.dialogTableVisible = false
-				this.refresh()
+				this.onClose()
 				this.errormsg = ''
        /* this.insertAssist(res.data.sys_taskid)*/
       })
@@ -272,15 +272,32 @@ export default {
       this.assist = []
       this.$refs.form.resetFields()
     },
-    selectApplication(ownerid,ownertable){
+    selectApplication(ownerid,ownertable,data){
       this.followParam.content.ownertable = ownertable
       this.followParam.content.ownerid = ownerid
       this.form.ownertable = ownertable
       this.form.ownerid = ownerid
-      this.form.tableName = ownertable === 'sat_orderclue'?'销售线索':ownertable === 'sa_customers'?'我的客户':ownertable === 'sa_porject'?'项目商机':''
+      this.form.tableName = ownertable === 'sat_orderclue'?'销售线索':ownertable === 'sa_customers'?'我的客户':ownertable === 'sa_project'?'项目商机':''
     },
-    follow(data){
-      this.form.remarks = data
+    follow(content,type,contacts,data){
+      if (this.form.ownertable === 'sa_customers' || this.form.ownertable === 'sa_project'){
+        if (contacts.length === 0){
+          this.form.remarks = '跟进类型：'+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.remarks = '跟进类型：'+type+'\n'+ '跟进对象：'+obj+'\n' + content
+        }
+      }else {
+        this.form.remarks = '跟进类型：'+ data.followupmode+'\n'+ content
+      }
+
     }
 	}
 }

src/HManagement/task/modules/completeTask.vue

@@ -1,21 +1,27 @@
 <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" @close="dialogFormVisible = false;form.finishnotes = ''">
+      <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>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible = false" size="small">取 消</el-button>
+        <el-button @click="dialogFormVisible = false;form.finishnotes = ''" size="small">取 消</el-button>
         <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 === 'sat_orderclue'){
+        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>
 
@@ -159,7 +160,6 @@ export default {
       console.log("权限结果", this.mainData.disabled)
     },
     changeDataStructure() {
-      console.log("输出执行")
       let that = this
       this.mainAreaData = [
         {
@@ -278,25 +278,21 @@ export default {
       const res = await this.$store.dispatch('optiontypeselect','gotopath')
       this.pathData = res.data
       if (this.pathData){
-        console.log("执行")
+        console.log("执行",this.pathData)
+        console.log(this.mainData.ownertable,'表名')
         this.pathData.forEach(item=>{
           if (item.remarks == this.mainData.ownertable){
-            console.log("执行12345")
             if (this.mainData.ownertable == 'sat_orderclue'){
-              this.customerPath(this.mainData.ownerid)
+              this.cluePath(this.mainData.ownerid)
             }else if (this.mainData.ownertable == 'sa_salesforecastbill'){
               this.predictionPath(this.mainData.ownerid)
             }else if (this.mainData.ownertable == 'sa_customers'){
               this.customerPath(this.mainData.ownerid)
             } else {
-              console.log("执行12】、")
               this.mainData.tableName = item.subvalues[0]
               this.mainData.path = item.value
               this.changeDataStructure()
             }
-          }else {
-            console.log("111执行45")
-            this.changeDataStructure()
           }
         })
 
@@ -305,6 +301,7 @@ export default {
     },
     /*判断销售线索路径*/
     async cluePath(id){
+      console.log("执行销售线索")
       const res = await this.$api.requested({
         "classname": "webmanage.saletool.orderclue.publicclue.PublicClue",
         "method": "selectDetail",
@@ -313,8 +310,8 @@ export default {
         }
       })
       if (res.data){
-        this.mainData.tableName = res.data.isprivate == '1' ? '销售线索':'公海线索'
-        this.mainData.path = res.data.isprivate == '1' ? '/orderclue_detail':'/clueDetail'
+        this.mainData.tableName = res.data.allocationstatus == '已分配' ? '销售线索':'公海线索'
+        this.mainData.path = res.data.allocationstatus == '已分配' ? '/orderclue_detail':'/clueDetail'
         this.changeDataStructure()
       }
 

src/HManagement/task/modules/edit.vue

@@ -19,17 +19,17 @@
                 <el-input v-model="form.title" placeholder="请输入任务标题" ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="20">
+<!--            <el-col :span="20">
               <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-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="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">
@@ -201,8 +201,12 @@ export default {
 	},
 	methods:{
 		onShow () {
+      console.log(this.data,'data111')
 			this.form = Object.assign({},this.form,this.data)
-      console.log(this.form,'form表单数据')
+      this.$refs.applicationRef.value = 'sat_orderclue'
+      this.$refs.applicationRef.onChange()
+      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
@@ -221,7 +225,6 @@ export default {
 			this.leaderShow = false
 		},
     setAssist (val) {
-      console.log(val)
       this.assistPerson = ''
       this.assist = []
       val.forEach((item,index)=>{
@@ -285,7 +288,6 @@ export default {
           "ownerid":id
         }
       })
-      console.log(res,"团队")
       let arr = []
       res.data[0].team.forEach((e,index)=>{
         if (e.isleader === 0){
@@ -298,8 +300,6 @@ export default {
         }
         this.assist[index] = e.userid
       })
-      console.log(arr)
-      console.log(this.assistPerson)
     },
     async insertAssist(id){
       const res = await this.$api.requested({
@@ -320,15 +320,33 @@ export default {
       this.assist = []
       this.$refs.form.resetFields()
     },
-    selectApplication(ownerid,ownertable){
+    selectApplication(ownerid,ownertable,data){
       this.followParam.content.ownertable = ownertable
       this.followParam.content.ownerid = ownerid
       this.form.ownertable = ownertable
       this.form.ownerid = ownerid
-      this.form.tableName = ownertable === 'sat_orderclue'?'销售线索':ownertable === 'sa_customers'?'我的客户':ownertable === 'sa_porject'?'项目商机':''
+      this.form.tableName = ownertable === 'sat_orderclue'?'销售线索':ownertable === 'sa_customers'?'我的客户':ownertable === 'sa_project'?'项目商机':''
     },
-    follow(data){
-      this.form.remarks = data
+    follow(content,type,contacts,data){
+      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 = '跟进类型：'+ data.followupmode+'\n'+ content
+      }
+
     }
 	}
 }

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -10,6 +10,7 @@
         delApiId="20221020165503"
         idname="sa_quotedpriceid"
         ownertable="sa_quotedprice"
+        typeTask="报价单"
         :statusCheck="[{key:'status',value:'审核'},{key:'status',value:'提交'}]"
         :tags="[]"
         :tabs="['产品明细折扣','产品类别折扣','详细信息','其他费用','历史报价']"

src/SDrpManagement/invoicePrediction/detail/subordinate.vue

@@ -6,6 +6,7 @@
         :editData="mainData"
         :mainAreaData="mainAreaData"
         idname="sa_salesforecastbillid"
+        typeTask="出货开票预测"
         :pageChange="true"
         :tags="[]"
         :tabs="['订单','项目','客户']"

src/SDrpManagement/projectPrediction/detail/index.vue

@@ -7,6 +7,7 @@
         :mainAreaData="mainAreaData"
         idname="sa_salesforecastbillid"
         :pageChange="true"
+        typeTask="我的客户"
         :tags="[]"
         :tabs="['项目产品清单']"
         @onEditSuccess="queryMainData(id)"

src/SDrpManagement/projectPrediction/detail/subordinate.vue

@@ -6,6 +6,7 @@
         :editData="mainData"
         :mainAreaData="mainAreaData"
         idname="sa_salesforecastbillid"
+        typeTask="项目成交预测"
         :tags="[]"
         :pageChange="true"
         :tabs="['项目产品清单']"

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -9,6 +9,7 @@
         turnPageId="20221012164402"
         idname="sa_customersid"
         tags=""
+        typeTask="我的客户"
         :tabs="['详细信息','联系人信息','客户地址','开票信息','项目商机','报价单','关联合同','账户余额','银行卡信息','关联线索']"
         @pageChange="pageChange"
         @onEditSuccess="onEditSuccess"

src/SDrpManagement/salerPrivatecustomer/detail/index.vue

@@ -8,6 +8,7 @@
         :mainAreaData="mainAreaData"
         turnPageId="20221012164402"
         idname="sa_customersid"
+        typeTask="我的客户"
         tags=""
         :tabs="['详细信息','联系人信息','客户地址','客户财务信息','工商信息','项目商机','报价单']"
         @pageChange="pageChange"

src/SManagement/orderclue_detail/index.vue

@@ -11,6 +11,7 @@
         tags=""
         :tabs="['跟进记录','详细信息','来源线索']"
         :justsaler="1"
+        typeTask="销售线索"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)"
         @detailCreate="detailCreate">

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="客户名称">

src/components/customBtn/index.vue

@@ -26,7 +26,8 @@ export default {
     dialogTitle:String,
     dialogKey:String,
     checkContent: Boolean,
-    size: String
+    size: String,
+    delType:String
   },
   data() {
     return {
@@ -54,9 +55,23 @@ export default {
           })
           param.content[this.dialogKey] = value
           let res = await this.$api.requested(param)
-          this.tool.showMessage(res,() => {
-            this.$emit('onSuccess',res.data)
-          })
+          if (this.delType === '合作伙伴'){
+            if (res.code === 0){
+              this.$message({
+                message: res.data[0].errmsg,
+                type: 'error'
+              });
+            }else {
+              this.tool.showMessage(res,() => {
+                this.$emit('onSuccess',res.data)
+              })
+            }
+          }else {
+            this.tool.showMessage(res,() => {
+              this.$emit('onSuccess',res.data)
+            })
+          }
+
         })
       } else {
         this.$confirm(this.message,'提示',{
@@ -78,7 +93,7 @@ export default {
           })
         })
       }
-      
+
     }
   },
 };

src/components/dynamic-newTable/index.vue

@@ -7,7 +7,7 @@
           type="selection"
           width="35" fixed v-if="checkbox">
       </el-table-column>
-      <el-table-column v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="!width ? 150 : col.width" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false">
+      <el-table-column show-overflow-tooltip v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="!width ? 150 : col.width" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false">
         <template v-slot:header="{ column,$index }" v-if="customHeader">
           <slot name="header" :data="column"></slot>
         </template>

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

@@ -68,7 +68,7 @@
           <slot name="custom"></slot>
         </el-col>
         <el-col v-if="collapse" style="width:400px;" :span="6">
-          <taskTemp v-if="activeApp.istask" :status="status" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)">
+          <taskTemp v-if="activeApp.istask" :status="status" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" :typeTask="typeTask">
             <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" @teamList="teamList">
@@ -98,7 +98,7 @@ import taskTemp from './modules/task/index.vue'
 import reportCenter from '../reportCenter/index'
 import {mapGetters} from 'vuex'
 export default {
-  props:['titleText','mainAreaData','turnPageId','delApiId','idname','ownertable','formPath','oldFormPath','editData','tags','tabs','statusCheck','pageChange','justsaler','mainData','status'],
+  props:['titleText','mainAreaData','turnPageId','delApiId','idname','ownertable','formPath','oldFormPath','editData','tags','tabs','statusCheck','pageChange','justsaler','mainData','status','typeTask'],
   data () {
     return {
       isTop:true,

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

@@ -3,92 +3,112 @@
     <el-button size="small" type="text" @click="onShow" :disabled="status === '已结案' || status === '已失败'">
         创建任务
     </el-button>
-    <el-dialog title="创建任务" append-to-body :visible.sync="dialogTableVisible" width="700px" :before-close="onCancel">
-			<el-alert
-				v-if="errormsg"
-				class="normal-margin"
-				:title="errormsg"
-				type="error">
-			</el-alert>
-			<el-input class="normal-margin" v-model="form.title" placeholder="输入任务标题" type="text" show-word-limit maxlength="40" size="small"></el-input>
-			<el-input  class="normal-margin" v-model="form.remarks" placeholder="输入任务内容" :autosize="{minRows:6}" type="textarea" show-word-limit maxlength="100" size="small"></el-input>
-			<div class="flex-align-center flex-between normal-margin">
-				<p class="task__label"><i class="el-icon-time"></i>&emsp;开始：</p>
-				<el-date-picker
-					v-model="form.starttime"
-					type="date"
-					placeholder="选择日期"
-					value-format="yyyy-MM-dd"
-					size="small">
-				</el-date-picker>
-				&emsp;- &emsp;
-				<p class="task__label">结束：</p>
-				<el-date-picker
-					v-model="form.endtime"
-					type="date"
-					placeholder="选择日期"
-					value-format="yyyy-MM-dd"
-					size="small">
-				</el-date-picker>
-			</div>
-			<div class="normal-margin flex-align-center">
-				<p class="task__label"><i class="el-icon-bell"></i>&emsp;提醒时间：结束前&emsp;</p>
-				<el-input :disabled="!form.endtime" v-model="form.remindday" size="small" style="width:90px"></el-input>
-				<p>&emsp;天</p>
-			</div>
-<!--			<div class="normal-margin">
-				<p class="task__label"><i class="el-icon-upload2"></i>&emsp;上传附件</p>
-				<upload
-					ref="upload"
-					:folderid="folderid"
-					:bindData="bindData"
-					type="button">
-				</upload>
-			</div>-->
-			<!-- <div class="normal-margin">
-				<p class="mt-10 task__label">关联项目/客户</p>
-				<el-input placeholder="请输入内容" disabled v-model="input3" class="input-with-select" size="small">
-					<el-select v-model="form.nat" slot="prepend" style="width:100px" placeholder="请选择">
-						<el-option label="不关联" value="1"></el-option>
-						<el-option label="项目" value="2"></el-option>
-						<el-option label="客户" value="3"></el-option>
-					</el-select>
-				</el-input>
-			</div> -->
-			<div>
-<!--				<p class="mt-10 task__label">执行人员</p>-->
-				<div class="flex-align-center flex-between">
-					<el-popover
-						placement="right"
-						trigger="manual"
-						width="400"
-						v-model="leaderShow">
-						<member ref="member" :param="param" :radio="true" @onSelect="setLeader" @onCancel="onCancel" source="task"></member>
-						<el-input placeholder="请输入内容" readonly v-model="leader.name" class="input-with-select" size="small" slot="reference" @focus="showMenber">
-							<p slot="prepend">执行人</p>
-						</el-input>
-					</el-popover>
-          <el-popover
-              placement="right"
-              trigger="manual"
-              width="400"
-              v-model="assistShow">
-            <member ref="memberAssist" :param="param" :implement="form.leaderuserid" :radio="false" @onSelect="setAssist" @onCancel="assistShow = false"></member>
-            <el-input placeholder="请输入内容" readonly v-model="assistPerson" class="input-with-select" size="small" slot="reference" @focus="showMenberAssist">
-              <p slot="prepend">协助人</p>
-            </el-input>
-          </el-popover>
-					<!-- &emsp;
-					<el-input placeholder="请输入内容" v-model="input3" class="input-with-select" size="small">
-						<p slot="prepend">协 办</p>
-					</el-input> -->
-				</div>
-			</div>
-			<div slot="footer" class="dialog-footer">
+    <el-drawer
+        title="创建任务"
+        :visible.sync="dialogTableVisible"
+        size="700px"
+        direction="rtl"
+        append-to-body
+        :show-close="false"
+        @close="onCancel">
+      <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 >
+              <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>
+               <el-col :span="20" >
+                 <el-form-item label="任务标题:" prop="title">
+                   <el-input v-model="form.title" placeholder="请输入任务标题" ></el-input>
+                 </el-form-item>
+               </el-col>
+               <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>-->
+            <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>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="开始:" prop="starttime">
+                <el-date-picker
+                    v-model="form.starttime"
+                    type="date"
+                    placeholder="选择日期"
+                    value-format="yyyy-MM-dd"
+                    size="small">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="结束:" prop="endtime">
+                <el-date-picker
+                    v-model="form.endtime"
+                    type="date"
+                    placeholder="选择日期"
+                    value-format="yyyy-MM-dd"
+                    size="small">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="提醒时间：结束前" prop="remindday">
+                <el-input :disabled="!form.endtime" v-model="form.remindday" size="small" style="width:90px"></el-input>
+                <span>&emsp;天</span>
+              </el-form-item>
+            </el-col>
+            <!--            <el-col :span="24">
+                          <el-form-item label="上传附件:" prop="remindday">
+                            <upload
+                                ref="upload"
+                                :folderid="folderid"
+                                :bindData="bindData"
+                                type="button">
+                            </upload>
+                          </el-form-item>
+                        </el-col>-->
+            <el-col :span="24">
+              <el-form-item label="执行人:" prop="leaderuserid">
+                <el-popover
+                    placement="right"
+                    trigger="manual"
+                    width="400"
+                    v-model="leaderShow">
+                  <member ref="member" :param="param" :radio="true" @onSelect="setLeader" @onCancel="leaderShow = false"></member>
+                  <el-input placeholder="请输入内容" readonly v-model="leader.name" class="input-with-select" size="small" slot="reference" @focus="showMenber">
+                  </el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="协助人:" prop="remindday">
+                <el-popover
+                    placement="right"
+                    trigger="manual"
+                    width="400"
+                    v-model="assistShow">
+                  <member ref="memberAssist" :param="param" :implement="form.leaderuserid" :radio="false" @onSelect="setAssist" @onCancel="assistShow = false"></member>
+                  <el-input placeholder="请输入内容" readonly v-model="assistPerson" class="input-with-select" size="small" slot="reference" @focus="showMenberAssist">
+                  </el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
         <el-button size="small" style="width:120px" @click="onCancel">取 消</el-button>
-        <el-button type="warning" size="small" style="width:120px" @click="validateInput">创 建</el-button>
+        <el-button type="primary" size="small" style="width:120px" @click="validateInput">确 定</el-button>
       </div>
-    </el-dialog>
+    </el-drawer>
+    <followData v-if="typeTask !== '' && typeTask !== undefined" ref="followRef" :param="followParam" @follow="follow"></followData>
   </div>
 </template>
 <script>
@@ -96,11 +116,14 @@
 import member from '@/template/menber/index'
 
 import upload from '@/components/upload/preview_upload.vue';
+
+import followData from "@/HManagement/task/components/followData";
 export default {
-	props:['ownertable','status'],
+	props:['ownertable','status','typeTask','followData'],
 	components:{
 		upload,
-		member
+		member,
+    followData
 	},
 	data () {
 		return {
@@ -124,6 +147,17 @@ export default {
           "userids":[],
         }
 			},
+      rules: {
+        title: [
+          {required: true, message: '请输入任务标题', trigger: 'blur'},
+        ],
+        starttime: [
+          {required: true, message: '请选择开始时间', trigger: 'change'},
+        ],
+        leaderuserid: [
+          {required: true, message: '请选择执行人', trigger: 'change'},
+        ],
+      },
 			// 查询团队人员参数
 			params:{
         "id": 20220930103501,
@@ -154,13 +188,24 @@ export default {
 			leader:{},
       assist:[],
       assistPerson:'',
-      implement:''
+      implement:'',
+      /*跟进列表*/
+      followParam:{
+        "id": 20231207130504,
+        "content": {
+          "ownertable": "",
+          "ownerid": ""
+        },
+      }
 		}
 	},
 	methods:{
     onShow(){
+      console.log(this.typeTask,'typeTask')
       this.dialogTableVisible = true
       this.queryTeam()
+      this.followParam.content.ownertable = this.ownertable
+      this.followParam.content.ownerid = this.$route.query.id
     },
     /*获取团队信息*/
     async queryTeam(){
@@ -188,15 +233,10 @@ export default {
       }
     },
 		validateInput () {
-			if (!this.form.title) {
-				this.errormsg = '请输入标题'
-				return false
-			} else if (!this.form.starttime) {
-				this.errormsg = '请选择开始日期'
-				return false
-			} else {
-				this.submit()
-			}
+      this.$refs.form.validate((valid)=>{
+        if (!valid) return false
+        this.submit()
+      })
 		},
 		setLeader (val) {
 			this.leader = val[0]
@@ -229,12 +269,13 @@ export default {
       })
       this.tool.showMessage(res,()=>{
 				this.param.content.ownerid = res.data.sys_taskid
-        this.bindData = {
+        this.$refs.form.resetFields()
+      /*  this.bindData = {
           "ownertable": 'sys_task',
           "ownerid": res.data.sys_taskid,
           "usetype": 'default',
         }
-        this.$refs['upload'].toUpload()
+        this.$refs['upload'].toUpload()*/
         this.$emit('onSuccess')
 				this.dialogTableVisible = false
 				this.refresh()
@@ -277,9 +318,34 @@ export default {
       })
     },
     onCancel(){
+      this.$refs.form.resetFields()
       this.assistShow = false
       this.leaderShow = false
       this.dialogTableVisible = false
+      this.form.remarks = ''
+    },
+    follow(content,type,contacts){
+      if (this.typeTask === '我的客户' || this.typeTask === '项目商机' || this.typeTask === '公海客户'){
+        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 if (this.typeTask === '销售线索'){
+        this.form.remarks = '跟进类型：'+type+'\n'+ content
+      }else {
+        this.form.remarks = content
+      }
+
     }
 		/*onCancel (done) {
       console.log("关闭")

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

@@ -0,0 +1,298 @@
+<template>
+  <div>
+    <el-button size="small" type="text" @click="onShow" :disabled="status === '已结案' || status === '已失败'">
+        创建任务
+    </el-button>
+    <el-dialog title="创建任务" append-to-body :visible.sync="dialogTableVisible" width="700px" :before-close="onCancel">
+			<el-alert
+				v-if="errormsg"
+				class="normal-margin"
+				:title="errormsg"
+				type="error">
+			</el-alert>
+			<el-input class="normal-margin" v-model="form.title" placeholder="输入任务标题" type="text" show-word-limit maxlength="40" size="small"></el-input>
+			<el-input  class="normal-margin" v-model="form.remarks" placeholder="输入任务内容" :autosize="{minRows:6}" type="textarea" show-word-limit maxlength="100" size="small"></el-input>
+			<div class="flex-align-center flex-between normal-margin">
+				<p class="task__label"><i class="el-icon-time"></i>&emsp;开始：</p>
+				<el-date-picker
+					v-model="form.starttime"
+					type="date"
+					placeholder="选择日期"
+					value-format="yyyy-MM-dd"
+					size="small">
+				</el-date-picker>
+				&emsp;- &emsp;
+				<p class="task__label">结束：</p>
+				<el-date-picker
+					v-model="form.endtime"
+					type="date"
+					placeholder="选择日期"
+					value-format="yyyy-MM-dd"
+					size="small">
+				</el-date-picker>
+			</div>
+			<div class="normal-margin flex-align-center">
+				<p class="task__label"><i class="el-icon-bell"></i>&emsp;提醒时间：结束前&emsp;</p>
+				<el-input :disabled="!form.endtime" v-model="form.remindday" size="small" style="width:90px"></el-input>
+				<p>&emsp;天</p>
+			</div>
+<!--			<div class="normal-margin">
+				<p class="task__label"><i class="el-icon-upload2"></i>&emsp;上传附件</p>
+				<upload
+					ref="upload"
+					:folderid="folderid"
+					:bindData="bindData"
+					type="button">
+				</upload>
+			</div>-->
+			<!-- <div class="normal-margin">
+				<p class="mt-10 task__label">关联项目/客户</p>
+				<el-input placeholder="请输入内容" disabled v-model="input3" class="input-with-select" size="small">
+					<el-select v-model="form.nat" slot="prepend" style="width:100px" placeholder="请选择">
+						<el-option label="不关联" value="1"></el-option>
+						<el-option label="项目" value="2"></el-option>
+						<el-option label="客户" value="3"></el-option>
+					</el-select>
+				</el-input>
+			</div> -->
+			<div>
+<!--				<p class="mt-10 task__label">执行人员</p>-->
+				<div class="flex-align-center flex-between">
+					<el-popover
+						placement="right"
+						trigger="manual"
+						width="400"
+						v-model="leaderShow">
+						<member ref="member" :param="param" :radio="true" @onSelect="setLeader" @onCancel="onCancel" source="task"></member>
+						<el-input placeholder="请输入内容" readonly v-model="leader.name" class="input-with-select" size="small" slot="reference" @focus="showMenber">
+							<p slot="prepend">执行人</p>
+						</el-input>
+					</el-popover>
+          <el-popover
+              placement="right"
+              trigger="manual"
+              width="400"
+              v-model="assistShow">
+            <member ref="memberAssist" :param="param" :implement="form.leaderuserid" :radio="false" @onSelect="setAssist" @onCancel="assistShow = false"></member>
+            <el-input placeholder="请输入内容" readonly v-model="assistPerson" class="input-with-select" size="small" slot="reference" @focus="showMenberAssist">
+              <p slot="prepend">协助人</p>
+            </el-input>
+          </el-popover>
+					<!-- &emsp;
+					<el-input placeholder="请输入内容" v-model="input3" class="input-with-select" size="small">
+						<p slot="prepend">协 办</p>
+					</el-input> -->
+				</div>
+			</div>
+			<div slot="footer" class="dialog-footer">
+        <el-button size="small" style="width:120px" @click="onCancel">取 消</el-button>
+        <el-button type="warning" size="small" style="width:120px" @click="validateInput">创 建</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+// import member from './groupMenber.vue'
+import member from '@/template/menber/index'
+
+import upload from '@/components/upload/preview_upload.vue';
+export default {
+	props:['ownertable','status','typeTask'],
+	components:{
+		upload,
+		member
+	},
+	data () {
+		return {
+      leaderShow:false,
+      assistShow:false,
+			dialogTableVisible:false,
+			folderid:JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
+			form:{
+				"sys_taskid":0,
+        "title":"",
+        "remarks":"",
+        "starttime":"",
+        "remindday":0,
+        "ownertable":"",
+        "ownerid":this.$route.query.id,
+        "endtime":"",
+				"leaderuserid":"",
+        "systemappid":JSON.parse(sessionStorage.getItem('activeApp')).systemappid,
+        "team":{
+          "justuserids":true,
+          "userids":[],
+        }
+			},
+			// 查询团队人员参数
+			params:{
+        "id": 20220930103501,
+        "content": {
+          "ownertable":this.ownertable,
+          "ownerid":this.$route.query.id,
+					"where":{
+						condition:''
+					}
+        }
+      },
+      // 查询可选择人员参数
+      param:{
+        id:'20221018122201',
+        content: {
+          "ownertable":'sys_task',
+          "ownerid":0,
+          "pageSize":20,
+          "where":{
+            "condition":"",
+            "withoutselect":0,
+
+          }
+        }
+      },
+			errormsg:'',
+			bindData:{},
+			leader:{},
+      assist:[],
+      assistPerson:'',
+      implement:''
+		}
+	},
+	methods:{
+    onShow(){
+      this.dialogTableVisible = true
+      this.queryTeam()
+    },
+    /*获取团队信息*/
+    async queryTeam(){
+      const res = await this.$api.requested(this.params)
+      console.log(res,"团队信息")
+      if (res.data.length !== 0){
+        this.leader = res.data[0].teamleader[0]
+        this.implement = res.data[0].teamleader[0].userid
+        this.form.leaderuserid = res.data[0].teamleader[0].userid
+        this.assistPerson = ''
+        this.assist = []
+        res.data[0].team.forEach((item,index)=>{
+          console.log(index,item,"获取协助")
+          console.log(res.data.length)
+          if (res.data.length !== 1){
+            if (index === 1){
+              this.assistPerson = item.name
+            }else {
+              this.assistPerson = this.assistPerson + ',' + item.name
+            }
+            this.assist[index] = item.userid
+          }
+
+        })
+      }
+    },
+		validateInput () {
+			if (!this.form.title) {
+				this.errormsg = '请输入标题'
+				return false
+			} else if (!this.form.starttime) {
+				this.errormsg = '请选择开始日期'
+				return false
+			} else {
+				this.submit()
+			}
+		},
+		setLeader (val) {
+			this.leader = val[0]
+			this.form.leaderuserid = val[0].userid
+      this.implement = this.form.leaderuserid
+			this.leaderShow = false
+		},
+    setAssist (val) {
+      console.log(val)
+      this.assistPerson = ''
+      this.assist = []
+      val.forEach((item,index)=>{
+
+        if (index === 0){
+          this.assistPerson = item.name
+        }else {
+          this.assistPerson = this.assistPerson + ',' + item.name
+        }
+        this.assist[index] = item.userid
+      })
+      console.log(this.assistPerson)
+      this.assistShow = false
+    },
+		async submit () {
+			this.form.ownertable = this.ownertable
+      this.form.team.userids = this.assist
+			const res = await this.$api.requested({
+        "id": 20221211112101,
+        "content":this.form
+      })
+      this.tool.showMessage(res,()=>{
+				this.param.content.ownerid = res.data.sys_taskid
+        this.bindData = {
+          "ownertable": 'sys_task',
+          "ownerid": res.data.sys_taskid,
+          "usetype": 'default',
+        }
+        this.$refs['upload'].toUpload()
+        this.$emit('onSuccess')
+				this.dialogTableVisible = false
+				this.refresh()
+				this.errormsg = ''
+     /*   this.insertAssist(res.data.sys_taskid)*/
+      })
+		},
+		refresh () {
+			this.form = {
+				"sys_taskid":0,
+        "title":"任务标题",
+        "remarks":"任务说明",
+        "starttime":"",
+        "remindday":0,
+        "ownertable":"",
+        "ownerid":this.$route.query.id,
+        "endtime":""
+			}
+		},
+		showMenber () {
+			this.leaderShow = true
+      this.assistShow = false
+			// this.validateInput()
+		},
+    showMenberAssist () {
+      this.assistShow = true
+      this.leaderShow = false
+      this.$refs.memberAssist.listData()
+      // this.validateInput()
+    },
+    async insertAssist(id){
+      const res = await this.$api.requested({
+        "id": 20220930103601,
+        "content": {
+          "ownertable":"sys_task",
+          "ownerid":id,
+          "userids":this.assist,
+          "justuserids":true
+        }
+      })
+    },
+    onCancel(){
+      this.assistShow = false
+      this.leaderShow = false
+      this.dialogTableVisible = false
+    }
+		/*onCancel (done) {
+      console.log("关闭")
+      this.assistShow = false
+      this.leaderShow = false
+			done?done():""
+		}*/
+	}
+}
+
+</script>
+<style scoped>
+.task__label{
+	color:rgb(173, 172, 172);
+}
+</style>

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

@@ -6,7 +6,7 @@
           <slot name="collapse"></slot>
           任务事项
         </div>
-        <addTask :ownertable="ownertable" @onSuccess="listData" :status="status"></addTask>
+        <addTask :ownertable="ownertable" @onSuccess="listData" :status="status" :typeTask="typeTask"></addTask>
       </div>
       <div v-if="list.length === 0">
         <el-empty description="暂无记录" :image-size="40"></el-empty>
@@ -27,7 +27,7 @@
 
   import addTask from './addTask.vue'
   export default {
-    props:['ownertable','status'],
+    props:['ownertable','status','typeTask'],
     components:{
       addTask
     },

src/template/addProductContract/index.vue

@@ -18,7 +18,7 @@
               trigger="click"
               v-model="queryShow"
               @show="queryQuotationData">
-            <el-input  style="width:200px;" placeholder="单号、提交人"
+            <el-input  style="width:200px;" placeholder="单号、负责人"
                        :suffix-icon="quotationParams.content.where.condition?quotationParams.content.where.condition.length > 0?'':'':'el-icon-search'"
                        v-model="quotationParams.content.where.condition" @keyup.native.enter="queryQuotationData(quotationParams.content.pageNumber = 1)"
                        @clear="queryQuotationData(quotationParams.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>

src/views/salesData/modules/uninvoiceAmountAnalysis.vue

@@ -53,10 +53,10 @@ const meta = {
   threetosix: {
     alias: '3-6月出货未开票金额(万元)',
   },
-  twelveup:{
+  sixtotwelve:{
     alias: '6-12月出货未开票金额(万元)'
   },
-  sixtotwelve:{
+  twelveup:{
     alias: '一年以上出货未开票金额(万元)'
   },
 };
@@ -106,15 +106,15 @@ export default {
           "zerotothree":Math.round(((item.zerotothree/10000)*100)/100),
           "threetosix":Math.round(((item.threetosix/10000)*100)/100),
           "date":item.date,
+          "sixtotwelve":Math.round(((item.sixtotwelve/10000)*100)/100),
           "twelveup":Math.round(((item.twelveup/10000)*100)/100),
-          "sixtotwelve":Math.round(((item.sixtotwelve/10000)*100)/100)
         }
       })
-      this.chartLine.changeData(this.processData(this.list, ['zerotothree', 'threetosix','twelveup','sixtotwelve'], meta))
+      this.chartLine.changeData(this.processData(this.list, ['zerotothree', 'threetosix','sixtotwelve','twelveup'], meta))
     },
     renderPie(val){
       this.chartLine = new Line('uninvoiceAmountChart',{
-        data:this.processData(this.list, ['zerotothree', 'threetosix','twelveup','sixtotwelve'], meta),
+        data:this.processData(this.list, ['zerotothree', 'threetosix','sixtotwelve','twelveup',], meta),
         xField: 'date',
         yField: valueKey,
         seriesField: seriesKey,