Merge branch 'xiaoqin' into mergeBranch

src/HManagement/clueManage/clue_public/modules/list.vue

@@ -88,6 +88,8 @@ export default {
     async listData () {
       const res = await this.$api.requested(this.params)
       this.list = res.data
+      console.log(this.list);
+      
       this.total = res.total
       this.currentPage = res.pageNumber
     },

src/SManagement/project_target/components/table.vue

@@ -33,6 +33,24 @@
           <p>{{scope.row.position?scope.row.position:'--'}}</p>
         </template>
       </el-table-column>
+      <el-table-column
+        prop="projectnum"
+        label="项目数量"
+        width="100"
+        fixed>
+        <template slot-scope="scope">
+          <p>{{scope.row.projectnum?scope.row.projectnum:'--'}}</p>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="projectname"
+        label="项目名称"
+        width="100"
+        fixed>
+        <template slot-scope="scope">
+          <p>{{scope.row.projectname?scope.row.projectname:'--'}}</p>
+        </template>
+      </el-table-column>
       <el-table-column
         label="目标/实际"
         width="100">

src/SManagement/sales_forecast/index.vue

@@ -36,6 +36,7 @@
     <div class="container normal-panel" style="margin-top:16px">
       <p class="normal-title normal-margin">销售预测记录</p>
       <div class="header-handle">
+        <Search @searchActive="searchActive2" @clearData="clearData2" />
         <time-select @clearSelect="clearTime" @timeChange="timeChange" title="提报时间:"></time-select>
       </div>
       <tableLayout :layout="tablecols2" :data="historyList" :custom="true" height="30vh">
@@ -101,7 +102,8 @@ export default {
       /* 开始时间 */
       begindate: '',
       /* 结束时间 */
-      enddate: ''
+      enddate: '',
+      condition:''
     };
   },
   components: { Header, Search, DownSelect, TimeSelect, Pagination },
@@ -142,7 +144,8 @@ export default {
           "sa_salesforecastmodelid": this.selectPanelId,
           "where": {
             "begindate": this.begindate,
-            "enddate": this.enddate
+            "enddate": this.enddate,
+            "condition":this.condition
           }
         }
       })
@@ -151,16 +154,7 @@ export default {
     },
     async rowClick (data) {
       this.selectPanelId = data.sa_salesforecastmodelid
-      let res = await this.$api.requested({
-        "id": 20220908134403,
-        "version": 1,
-        "content": {
-          "nocache": true,
-          "sa_salesforecastmodelid": this.selectPanelId
-        }
-      })
-      this.historyList = res.data
-      console.log(this.historyList);
+      this.getSalesDetail()
 
     },
     /* 创建提报 */
@@ -207,18 +201,30 @@ export default {
       this.params.content.pageNumber = n
       this.getSalesPanel()
     },
-    /* 搜索 */
+    /* 模板搜索 */
     searchActive (data) {
       this.params.content.where.condition = data
       this.params.content.pageNumber = 1
       this.getSalesPanel()
     },
-    /* 清除搜索 */
+    /* 模板清除搜索 */
     clearData () {
       this.params.content.where.condition = ''
       this.params.content.pageNumber = 1
       this.getSalesPanel()
     },
+    /* 提报搜索 */
+    searchActive2 (data) {
+      this.condition = data
+      this.params.content.pageNumber = 1
+      this.getSalesDetail()
+    },
+    /* 提报清除搜索 */
+    clearData2 () {
+      this.condition = ''
+      this.params.content.pageNumber = 1
+      this.getSalesDetail()
+    },
     /* 清除分类 */
     clearCategory () {
       this.params.content.where.baseonproject = ''