任务优化，项目数据，客户数据优化

src/HDrpManagement/customerData/index.vue

@@ -1011,6 +1011,7 @@ export default {
           "type": '',
           "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
+          "enddate":new Date().getFullYear() + '-' + (new Date().getMonth() + 1)  + '-' + new Date().getDate(),
           "dataType":"",// 默认为 客户类型
           "where": {
               "tradingstatus": "",//成交状态
@@ -1025,6 +1026,7 @@ export default {
           "type": '',
           "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
+          "enddate":new Date().getFullYear() + '-' + (new Date().getMonth() + 1)  + '-' + new Date().getDate(),
           "pageSize":20,
           "pageNumber":1,
           "where": {

src/HDrpManagement/projectData/index.vue

@@ -1072,7 +1072,7 @@
               <div class="panel-header">
                 <div class="title">
                   项目生命周期分析
-                  <el-tooltip class="item" effect="dark" content="统计项目生命周期中的会个关键节点之间平均周期" placement="top">
+                  <el-tooltip class="item" effect="dark" content="统计项目生命周期中的各个关键节点之间平均周期" placement="top">
                     <img style="vertical-align: middle" src="@/assets/icons/prompt_icon.svg" alt="">
                   </el-tooltip>
                 </div>
@@ -1492,6 +1492,7 @@ export default {
             "type": '',
             "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
             "dataid": '',
+            "enddate":new Date().getFullYear() + '-' + (new Date().getMonth() + 1)  + '-' + new Date().getDate(),
             "where": {
                 "projecttype":""
             }
@@ -1503,6 +1504,7 @@ export default {
           "type": '',
           "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
+          "enddate":new Date().getFullYear() + '-' + (new Date().getMonth() + 1)  + '-' + new Date().getDate(),
           "where": {
               "projecttype":"",
               "dateType":""

src/HDrpManagement/rebatesettlement/index.vue

@@ -1,13 +1,13 @@
 
 <template>
   <div>
-    <basicLayout 
-      ref="basicLayout" 
+    <basicLayout
+      ref="basicLayout"
       :oldFormPath="{
         add:'HDrpManagement/rebatesettlement/modules'
       }"
-      tableName="rebatesettlement" 
-      idName="sa_rebatesettlementid" 
+      tableName="rebatesettlement"
+      idName="sa_rebatesettlementid"
       :apiId="{query:20230104194002,del:20230104193402}"
       :options="options"
       :detailPath="{
@@ -51,15 +51,15 @@
  * @param {string} formPath 新建,编辑组件所在文件夹名称,以后所有列表新增修改文件统一放入Form文件夹下面,并创建与开发应用相同的名称的子文件夹
  * @param {string} tableName 开发端配置的表格名称
  * @param {String} idName 数据主id名称
- * @param {object} apiId:{query:查询的接口id,del:删除的接口id} 
- * @param {Array} options:{label:描述,value:值} 
+ * @param {object} apiId:{query:查询的接口id,del:删除的接口id}
+ * @param {Array} options:{label:描述,value:值}
  */
 export default {
   data () {
     return {
       options:[],
       dateSelect:[]
-      
+
     }
   },
   mounted() {
@@ -82,4 +82,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/HDrpManagement/rebatesettlement/modules/add.vue

@@ -7,6 +7,7 @@
     direction="rtl"
     append-to-body
     :show-close="false"
+    @close="resetForm"
     size="900px">
     <div class="drawer__panel">
       <el-row :gutter="20">
@@ -47,7 +48,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input type="textarea" :autosize="{minRows:4}" placeholder="请输入备注"></el-input>
+              <el-input type="textarea" v-model="form.remarks" :autosize="{minRows:4}" placeholder="请输入备注"></el-input>
             </el-form-item>
           </el-col>
         </el-form>
@@ -67,7 +68,7 @@ import contractTemp from '@/template/rebateCanUseContract/index.vue'
 import orderTemp from '@/template/rebateCanUseOrder/index.vue'
 
 export default {
-  
+
   data() {
     var checkSacontractid = (rule, value, callback) => {
       if (!this.form.sys_enterpriseid) {
@@ -129,6 +130,7 @@ export default {
       const res = await this.$api.requested({"id": "20230104180102","content":this.form})
       this.tool.showMessage(res,()=>{
         this.drawer = false
+        this.$refs.form.resetFields()
         this.$emit('onSuccess')
       })
     },
@@ -154,7 +156,18 @@ export default {
     },
     resetForm () {
       this.$refs.ent.form = this.$refs.con.form = this.$refs.order.form = {}
+      this.$refs.form.resetFields()
+      this.form = {
+        "sa_rebatesettlementid": 0,
+            "sys_enterpriseid": "", //结算企业档案ID
+            "ownertable": "sa_order", //数据表
+            "ownerid": "", //数据id
+            "billdate": (new Date()).toISOString().split('T')[0], //结算日期
+            "remarks": "",
+            "sa_contractid": "", //居间合同ID
+            "settlementmode": "线上" //结算方式，线下、在线（在线时生成收入凭证）
+      }
     }
   }
 }
-</script>
+</script>

src/HDrpManagement/rebatesettlement/modules/edit.vue

@@ -7,6 +7,7 @@
     direction="rtl"
     append-to-body
     :show-close="false"
+    @close="resetForm"
     size="900px">
     <div class="drawer__panel">
       <el-row :gutter="20">
@@ -47,7 +48,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input type="textarea" :autosize="{minRows:4}" placeholder="请输入备注"></el-input>
+              <el-input type="textarea" v-model="form.remarks" :autosize="{minRows:4}" placeholder="请输入备注"></el-input>
             </el-form-item>
           </el-col>
         </el-form>
@@ -125,12 +126,20 @@ export default {
     onShow () {
       this.drawer = true
       this.form = Object.assign({},this.form,this.data)
-      setTimeout(() => {
+      this.form.settlementmode = '线上'
+      this.form.remarks = ''
+      this.form.billdate = (new Date()).toISOString().split('T')[0]
+      this.$nextTick(()=>{
         this.$refs.ent.form.enterprisename = this.data.enterprisename
         this.$refs.con.form.title = this.data.billno_contract
         this.$refs.order.form.sonum = this.data.sonum
-      }, 500);
-      
+      })
+     /* setTimeout(() => {
+        this.$refs.ent.form.enterprisename = this.data.enterprisename
+        this.$refs.con.form.title = this.data.billno_contract
+        this.$refs.order.form.sonum = this.data.sonum
+      }, 500);*/
+
     },
     async submitForm() {
       this.$refs['form'].validate((valid) => {
@@ -163,8 +172,14 @@ export default {
       });
     },
     resetForm () {
-      this.$refs.ent.form = this.$refs.con.form = this.$refs.order.form = {}
+      /*this.$refs.ent.form = this.$refs.con.form = this.$refs.order.form = {}*/
+      this.$refs.ent.form.enterprisename = ''
+      this.$refs.con.form.title = ''
+      this.$refs.order.form.sonum = ''
+      this.form.settlementmode = '线上'
+      this.form.remarks = ''
+      this.form.billdate = (new Date()).toISOString().split('T')[0]
     }
   }
 }
-</script>
+</script>

src/HManagement/task/modules/add.vue

@@ -73,7 +73,7 @@
             <el-col :span="24">
               <el-form-item label="执行人:" prop="leaderuserid">
                 <el-popover
-                    placement="right"
+                    placement="top"
                     trigger="manual"
                     width="400"
                     v-model="leaderShow">
@@ -86,7 +86,7 @@
             <el-col :span="24">
               <el-form-item label="协助人:" prop="remindday">
                 <el-popover
-                    placement="right"
+                    placement="top"
                     trigger="manual"
                     width="400"
                     v-model="assistShow">
@@ -270,6 +270,8 @@ export default {
       this.leader = {}
       this.assistPerson = ''
       this.assist = []
+      this.leaderShow = false
+      this.assistShow = false
       this.$refs.form.resetFields()
     },
     selectApplication(ownerid,ownertable,data){

src/HManagement/task/modules/edit.vue

@@ -73,7 +73,7 @@
             <el-col :span="24">
               <el-form-item label="执行人:" prop="leaderuserid">
                 <el-popover
-                    placement="right"
+                    placement="top"
                     trigger="manual"
                     width="400"
                     v-model="leaderShow">
@@ -86,7 +86,7 @@
             <el-col :span="24">
               <el-form-item label="协助人:" prop="remindday">
                 <el-popover
-                    placement="right"
+                    placement="top"
                     trigger="manual"
                     width="400"
                     v-model="assistShow">
@@ -318,6 +318,8 @@ export default {
       this.leader = {}
       this.assistPerson = ''
       this.assist = []
+      this.leaderShow = false
+      this.assistShow = false
       this.$refs.form.resetFields()
     },
     selectApplication(ownerid,ownertable,data){

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -26,18 +26,18 @@
     </div>
     <div>
       <el-row>
-        <el-col :span="14">
+        <el-col :xs="15" :sm="15" :md="15" :lg="15" :xl="14">
           <p class="title">销售漏斗图</p>
           <div class="re-panel">
             <div id="containerFunnel" style="height: calc(60vh)"></div>
           </div>
         </el-col>
-        <el-col :span="10">
+        <el-col :offset="1" :xs="8" :sm="8" :md="8" :lg="8" :xl="9">
           <div>
             <p class="title">表格数据</p>
             <el-table
                 :data="tableData"
-                style="width: 750px"
+                style="width: 100%"
                 size="small"
                 :header-cell-style="{height:'60px',fontWeight:'400',fontSize:'22px',color:'#333333',background:'#ddebf7'}"
                 :cell-style="{height:'40px',fontWeight:'400',fontSize:'18px'}"
@@ -45,7 +45,7 @@
               <el-table-column
                   prop="stagename"
                   label="阶段"
-                  width="180">
+                  width="150">
               </el-table-column>
               <el-table-column
                   prop="projectqty"
@@ -326,7 +326,7 @@ export default {
               const group = new G.Group({});
               const content = ()=>{
                 if (this.tableData[0]) {
-                  const text = `${datum.stagename}  当前项目数: ${datum.projectqty} 项目数: ${datum.sequence1} 转化率: ${datum.zhl?Math.round((datum.zhl* 100)*100)/100 + '%':'--'}  预计签约金额: ${datum.signamount_due}万元 项目成交金额: ${datum.dealamount}万元`
+                  const text = `${datum.stagename}  当前项目数: ${datum.projectqty} 项目数: ${datum.sequence1} 转化率: ${datum.zhl?Math.round((datum.zhl* 100)*100)/100 + '%':'--'}  预计签约金额: ${datum.signamount_due}万元  项目成交金额: ${datum.dealamount}万元`
                   const lines = text.split('  ');
                   return lines.join('\n');
                 }
@@ -416,7 +416,7 @@ export default {
               const group = new G.Group({});
               const content = ()=>{
                 if (this.tableData[0]) {
-                  const text = `${datum.stagename}  当前项目数: ${datum.projectqty} 项目数: ${datum.sequence1} 转化率: ${datum.zhl?Math.round((datum.zhl* 100)*100)/100 + '%':'--'}  预计签约金额: ${datum.signamount_due}万元 项目成交金额: ${datum.dealamount}万元`
+                  const text = `${datum.stagename}  当前项目数: ${datum.projectqty} 项目数: ${datum.sequence1} 转化率: ${datum.zhl?Math.round((datum.zhl* 100)*100)/100 + '%':'--'}  预计签约金额: ${datum.signamount_due}万元  项目成交金额: ${datum.dealamount}万元`
                   const lines = text.split('  ');
                   return lines.join('\n');
                 }
@@ -506,7 +506,7 @@ export default {
               const group = new G.Group({});
               const content = ()=>{
                 if (this.tableData[0]) {
-                  const text = `${datum.stagename}  当前项目数: ${datum.projectqty} 项目数: ${datum.sequence1} 转化率: ${datum.zhl?Math.round((datum.zhl* 100)*100)/100 + '%':'--'}  预计签约金额: ${datum.signamount_due}万元 项目成交金额: ${datum.dealamount}万元`
+                  const text = `${datum.stagename}  当前项目数: ${datum.projectqty} 项目数: ${datum.sequence1} 转化率: ${datum.zhl?Math.round((datum.zhl* 100)*100)/100 + '%':'--'}  预计签约金额: ${datum.signamount_due}万元  项目成交金额: ${datum.dealamount}万元`
                   const lines = text.split('  ');
                   return lines.join('\n');
                 }
@@ -597,7 +597,7 @@ export default {
               const group = new G.Group({});
               const content = ()=>{
                 if (this.tableData[0]) {
-                  const text = `${datum.stagename}  当前项目数: ${datum.projectqty} 项目数: ${datum.sequence1} 转化率: ${datum.zhl?Math.round((datum.zhl* 100)*100)/100 + '%':'--'}  预计签约金额: ${datum.signamount_due}万元 项目成交金额: ${datum.dealamount}万元`
+                  const text = `${datum.stagename}  当前项目数: ${datum.projectqty} 项目数: ${datum.sequence1} 转化率: ${datum.zhl?Math.round((datum.zhl* 100)*100)/100 + '%':'--'}  预计签约金额: ${datum.signamount_due}万元  项目成交金额: ${datum.dealamount}万元`
                   const lines = text.split('  ');
                   return lines.join('\n');
                 }