huangbin 4 lat temu
rodzic
commit
59a296a900

+ 8 - 1
src/views/report/components/filter/index.vue

@@ -27,11 +27,12 @@
                        :format="dateFormat" />
       </a-space>
       <a-select label-in-value
+                v-if="showUser"
                 class="conditionSelect ml10"
                 style="width: 120px"
                 v-model:value="selectedUser"
                 @change="userChange"
-                placeholder="请选择报表类型">
+                placeholder="请选择交易用户">
         <a-select-option v-for="item in userList"
                          :key="item.value">
           {{item.lable}}
@@ -55,6 +56,12 @@ import { handleReprotType } from '../../setup';
 export default defineComponent({
     name: 'report-common-filter-table',
     components: { FilterOption },
+    props: {
+        showUser: {
+            type: Boolean,
+            default: true,
+        },
+    },
     setup(props, context) {
         const { selectedReportType, reportType, reportTypeChange, isMonth, timeChange, dateFormat, time, selectedUser, userChange } = handleReprotType(context);
         const loading = ref<boolean>(false);

+ 4 - 9
src/views/report/inventory-report/components/filterTable/index.vue

@@ -1,9 +1,10 @@
 <template>
   <!-- 过滤客户资料表格 -->
-  <Filter @update="update">
+  <Filter @update="update"
+          :showUser="false">
     <!-- <FilterOption :selectList="selectList"
-                    :inputList="[]"
-                    :fixedBtnList="fixedBtnList" /> -->
+                  :inputList="[]"
+                  :fixedBtnList="fixedBtnList" /> -->
   </Filter>
 </template>
 
@@ -28,12 +29,6 @@ export default defineComponent({
         const select: SelectList[] = [
             {
                 value: undefined,
-                key: 'userId',
-                placeholder: '全部交易用户',
-                list: [],
-            },
-            {
-                value: undefined,
                 key: 'warehousetype',
                 placeholder: '全部套保品种',
                 list: [],