Merge branch 'blueBranch' into allTestUrgent

src/HManagement/task/index.vue

@@ -21,7 +21,15 @@
       <template #custom>
         <div  class="mt-10">
           <label class="search__label">{{ $t('任务范围') }}:</label>
-          <el-select class="inline-16" v-model="type" size="small" :placeholder="$t('请选择')" @change="selectChange" >
+          <el-select v-if="usertype == 21 || usertype == 22 " class="inline-16" v-model="type" size="small" :placeholder="$t('请选择')" @change="selectChange" >
+            <el-option
+                v-for="item in tabsPartner"
+                :key="item.value"
+                :label="$t(item.label)"
+                :value="item.value">
+            </el-option>
+          </el-select>
+          <el-select v-else class="inline-16" v-model="type" size="small" :placeholder="$t('请选择')" @change="selectChange" >
             <el-option
                 v-for="item in options"
                 :key="item.value"
@@ -97,8 +105,27 @@ export default {
           value:4
         },
       ],
+      tabsPartner:[
+        {
+          label:'全部',
+          value:0
+        },
+        {
+          label:'我负责的',
+          value:1
+        },
+        {
+          label:'我参与的',
+          value:2
+        },
+        {
+          label:'我创建的',
+          value:5
+        }
+      ],
       status:'',
-      pathData:[]
+      pathData:[],
+      usertype:JSON.parse(sessionStorage.getItem('active_account')).usertype
     }
   },
   methods:{

src/components/marketingExpenses/index.vue

@@ -231,6 +231,7 @@ export default {
     addClick() {
       this.dialogFormVisible = true;
       this.formTitle = "新建营销费用明细";
+      console.log('费用明细表',this.ownertable)
     },
     editClick(data) {
       this.dialogFormVisible = true;