Merge branch 'orangeUrgent' into allTestUrgent

src/HManagement/clueManage/clue_private/index.vue

@@ -140,6 +140,30 @@
             </el-option>
           </el-select>
         </div>
+        <div class="mt-10">
+          <p class="search__label">{{ $t("来源") }}:</p>
+          <el-select
+              v-model="cluesource"
+              clearable
+              style="margin-right: 10px"
+              size="small"
+              :placeholder="$t('请选择来源')"
+              @change="
+              $refs.basicLayout.param.content.pageNumber = 1;
+              $refs.basicLayout.param.content.where.cluesource = cluesource;
+              $refs.basicLayout.listData();
+              param = $refs.basicLayout.param
+            "
+          >
+            <el-option
+                v-for="item in cluesourceList"
+                :label="$t(item.value)"
+                :key="item.rowindex"
+                :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
       </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
@@ -280,6 +304,8 @@ export default {
           isExport: 0,
         },
       },
+      cluesource:"",
+      cluesourceList:[]
     };
   },
   provide() {
@@ -295,6 +321,8 @@ export default {
     this.statusList = res2.data;
     const res3 = await this.$store.dispatch("optiontypeselect", "tradefield");
     this.tradefields = res3.data;
+    const res4 = await this.$store.dispatch("optiontypeselect", "cluesource");
+    this.cluesourceList = res4.data;
     console.log(
       this.tool.tabelCol(this.$route.name).cluePrivateSalerTable.tablecols
     );

src/HManagement/clueManage/clue_public/index.vue

@@ -41,6 +41,30 @@
           </el-option>
         </el-select>
       </div>
+      <div class="mt-10">
+        <p class="search__label">{{ $t("来源") }}:</p>
+        <el-select
+            v-model="cluesource"
+            clearable
+            style="margin-right: 10px"
+            size="small"
+            :placeholder="$t('请选择来源')"
+            @change="
+              $refs.basicLayout.param.content.pageNumber = 1;
+              $refs.basicLayout.param.content.where.cluesource = cluesource;
+              $refs.basicLayout.listData();
+              param = $refs.basicLayout.param
+            "
+        >
+          <el-option
+              v-for="item in cluesourceList"
+              :label="$t(item.value)"
+              :key="item.rowindex"
+              :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
     </template>
       <div slot="titleRight" >
         <!-- <distribution class="inline-16" v-if="tool.checkAuth($route.name,'distribution')" @onSuccess="$refs.basicLayout.listData()"></distribution> -->
@@ -116,7 +140,9 @@ export default {
       selectList:[],
       tagData:[],
       tag:'',
-      tablecols:''
+      tablecols:'',
+      cluesource:"",
+      cluesourceList:[]
     }
   },
   provide() {
@@ -132,6 +158,8 @@ export default {
     this.statusList = res2.data
     const res3 = await this.$store.dispatch('optiontypeselect','tradefield')
     this.tradefields = res3.data
+    const res4 = await this.$store.dispatch("optiontypeselect", "cluesource");
+    this.cluesourceList = res4.data;
     this.query_arealist()
     this.tagList()
     this.tablecols = this.tool.tabelCol(this.$route.name)['cluePublicTable'].tablecols

src/SManagement/orderclue/index.vue

@@ -61,6 +61,30 @@
           </el-option>
         </el-select>
       </div>
+      <div class="mt-10">
+        <p class="search__label">{{ $t("来源") }}:</p>
+        <el-select
+            v-model="cluesource"
+            clearable
+            style="margin-right: 10px"
+            size="small"
+            :placeholder="$t('请选择来源')"
+            @change="
+              $refs.list.param.content.pageNumber = 1;
+              $refs.list.param.content.where.cluesource = cluesource;
+              $refs.list.listData();
+              param = $refs.list.param
+            "
+        >
+          <el-option
+              v-for="item in cluesourceList"
+              :label="$t(item.value)"
+              :key="item.rowindex"
+              :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
     </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
@@ -129,7 +153,9 @@ export default {
       tagData:[],
       tag:'',
       param:{},
-      tablecols:[]
+      tablecols:[],
+      cluesource:"",
+      cluesourceList:[]
     }
   },
   provide() {
@@ -151,6 +177,8 @@ export default {
     this.statusList = res2.data
     const res3 = await this.$store.dispatch('optiontypeselect','tradefield')
     this.tradefields = res3.data
+    const res4 = await this.$store.dispatch("optiontypeselect", "cluesource");
+    this.cluesourceList = res4.data;
     console.log(this.statusList);
     this.tablecols = this.tool.tabelCol(this.$route.name).orderclueList.tablecols
   },