KouJin 1 vuosi sitten
vanhempi
commit
5a5db86d07

+ 15 - 9
src/views/DeliveryWarehouse/LibraryManagement/compontents/Crkxx.vue

@@ -1,8 +1,10 @@
1 1
 <script lang="ts" setup>
2 2
 import {LibraryManagementApi} from "@/api/DeliveryWarehouse/LibraryManagement";
3 3
 import FileForm from "@/views/DeliveryWarehouse/LibraryManagement/compontents/FileForm.vue"
4
-import CreatCrkxxForm from "@/views/DeliveryWarehouse/LibraryManagement/compontents/CreatCrkxxForm.vue"
4
+import CreatCrkxxForm
5
+  from "@/views/DeliveryWarehouse/LibraryManagement/compontents/CreatCrkxxForm.vue"
5 6
 import {DICT_TYPE} from "@/utils/dict";
7
+
6 8
 const queryParams = ref({
7 9
   pageNo: 1,
8 10
   pageSize: 10,
@@ -17,7 +19,11 @@ const handleQuery = async () => {
17 19
   loading.value = true
18 20
   await nextTick();
19 21
   try {
20
-    const data = await LibraryManagementApi.getCrkxxPage({id: row.value.id, ...queryParams.value})
22
+    const data = await LibraryManagementApi.getCrkxxPage({
23
+      id: row.value.id,
24
+      cfId: row.value.id,
25
+      ...queryParams.value
26
+    })
21 27
     list.value = data.list;
22 28
     total.value = data.total;
23 29
   } catch (err) {
@@ -48,7 +54,7 @@ const updateCrkxx = async (row: any) => {
48 54
 const parseStr = (str: any) => {
49 55
   return '/'
50 56
   if (str.fileIds) {
51
-    console.log(JSON.parse(JSON.stringify(str.fileIds)).split(',').length , 'length')
57
+    console.log(JSON.parse(JSON.stringify(str.fileIds)).split(',').length, 'length')
52 58
     return JSON.parse(JSON.stringify(str.fileIds)).split(',').length
53 59
   } else {
54 60
     return ''
@@ -71,7 +77,7 @@ onMounted(async () => {
71 77
       <el-row>
72 78
         <el-col :span="22">
73 79
           <el-form-item label="出入库类型" prop="crklx">
74
-            <el-select @change="handleQuery" v-model="queryParams.crklx" class="w-200px!">
80
+            <el-select v-model="queryParams.crklx" class="w-200px!" @change="handleQuery">
75 81
               <el-option :value="0" label="出库"/>
76 82
               <el-option :value="1" label="入库"/>
77 83
             </el-select>
@@ -101,7 +107,7 @@ onMounted(async () => {
101 107
       <el-table-column align="center" label="业务时间" min-width="100" prop="rmsj">
102 108
         <template #default="scope">
103 109
           <div v-if="queryParams.crklx ==0 ">{{ scope.row.cmsj }}</div>
104
-          <div v-if="queryParams.crklx ==1 ">{{scope.row.rmsj}}</div>
110
+          <div v-if="queryParams.crklx ==1 ">{{ scope.row.rmsj }}</div>
105 111
         </template>
106 112
       </el-table-column>
107 113
       <el-table-column align="center" label="粮食品种" min-width="100" prop="lspzmc">
@@ -118,9 +124,9 @@ onMounted(async () => {
118 124
       <el-table-column align="center" label="净重(公斤)" min-width="180" prop="jz"/>
119 125
       <el-table-column align="center" label="车船号" min-width="180" prop="cch"/>
120 126
       <el-table-column align="center" label="出入库类型" min-width="120" prop="crklx">
121
-         <template #default="scope">
127
+        <template #default="scope">
122 128
           <div
123
-         >{{ scope.row.crklx === 0 ? '出库' : '入库' }}
129
+          >{{ scope.row.crklx === 0 ? '出库' : '入库' }}
124 130
           </div>
125 131
         </template>
126 132
       </el-table-column>
@@ -150,8 +156,8 @@ onMounted(async () => {
150 156
       :total="total"
151 157
       @pagination="handleQuery"
152 158
     />
153
-    <CreatCrkxxForm ref="creatCrkxxFormRef" @success="handleQuery" />
154
-    <FileForm  ref="fileFormRef" @success="handleQuery" />
159
+    <CreatCrkxxForm ref="creatCrkxxFormRef" @success="handleQuery"/>
160
+    <FileForm ref="fileFormRef" @success="handleQuery"/>
155 161
   </div>
156 162
 
157 163
 </template>

+ 59 - 4
src/views/DeliveryWarehouse/compontents/Form.vue

@@ -10,6 +10,28 @@
10 10
         :row-selection="rowSelection"
11 11
         row-key="id"
12 12
       >
13
+        <template #kqmc-filter="{ filterValue, setFilterValue, handleFilterConfirm, handleFilterReset}">
14
+          <div class="custom-filter">
15
+            <a-space direction="vertical">
16
+              <a-input :model-value="filterValue[0]" @input="(value)=>setFilterValue([value])" />
17
+              <div class="custom-filter-footer">
18
+                <a-button type="primary"  @click="handleFilterConfirm">搜索</a-button>
19
+                <a-button @click="handleFilterReset">取消</a-button>
20
+              </div>
21
+            </a-space>
22
+          </div>
23
+        </template>
24
+        <template #cfmc-filter="{ filterValue, setFilterValue, handleFilterConfirm, handleFilterReset}">
25
+          <div class="custom-filter">
26
+            <a-space direction="vertical">
27
+              <a-input :model-value="filterValue[0]" @input="(value)=>setFilterValue([value])" />
28
+              <div class="custom-filter-footer">
29
+                <a-button type="primary"  @click="handleFilterConfirm">搜索</a-button>
30
+                <a-button @click="handleFilterReset">取消</a-button>
31
+              </div>
32
+            </a-space>
33
+          </div>
34
+        </template>
13 35
         <template #cflx="{record }">
14 36
           <dict-tag :type="DICT_TYPE.SYSTEM_CFLX" :value="record.cflx"/>
15 37
         </template>
@@ -39,6 +61,7 @@ import {DeliveryWarehouseSelectApi} from '@/api/DeliveryWarehouse/DeliveryWareho
39 61
 import {DICT_TYPE} from '@/utils/dict'
40 62
 import {TableColumnData, TableRowSelection} from "@arco-design/web-vue";
41 63
 import {YxcfEnum} from "@/enum/yxcfEnum";
64
+import {IconSearch} from "@arco-design/web-vue/es/icon";
42 65
 
43 66
 // 接口定义
44 67
 interface QueryParams {
@@ -94,12 +117,22 @@ const tableColumns = ref<TableColumnData[]>([
94 117
   {
95 118
     title: '库区名称',
96 119
     dataIndex: 'kqmc',
97
-    align: 'center'
120
+    align: 'center',
121
+    filterable: {
122
+      filter: (value, record) => record.kqmc.includes(value),
123
+      slotName: 'kqmc-filter',
124
+      icon: () => h(IconSearch)
125
+    }
98 126
   },
99 127
   {
100 128
     title: '仓房名称',
101 129
     dataIndex: 'cfmc',
102
-    align: 'center'
130
+    align: 'center',
131
+    filterable: {
132
+      filter: (value, record) => record.cfmc.includes(value),
133
+      slotName: 'cfmc-filter',
134
+      icon: () => h(IconSearch)
135
+    }
103 136
   },
104 137
   {
105 138
     title: '仓房类型',
@@ -123,12 +156,22 @@ const tableColumnsTemp: TableColumnData[] = [
123 156
   {
124 157
     title: '库区名称',
125 158
     dataIndex: 'kqmc',
126
-    align: 'center'
159
+    align: 'center',
160
+    filterable: {
161
+      filter: (value, record) => record.kqmc.includes(value),
162
+      slotName: 'kqmc-filter',
163
+      icon: () => h(IconSearch)
164
+    }
127 165
   },
128 166
   {
129 167
     title: '仓房名称',
130 168
     dataIndex: 'cfmc',
131
-    align: 'center'
169
+    align: 'center',
170
+    filterable: {
171
+      filter: (value, record) => record.cfmc.includes(value),
172
+      slotName: 'cfmc-filter',
173
+      icon: () => h(IconSearch)
174
+    }
132 175
   },
133 176
   {
134 177
     title: '仓房类型',
@@ -332,4 +375,16 @@ const emit = defineEmits(['success'])
332 375
   border-right: 1px solid var(--color-neutral-3);
333 376
   background: var(--color-fill-2);
334 377
 }
378
+.custom-filter {
379
+  padding: 20px;
380
+  background: var(--color-bg-5);
381
+  border: 1px solid var(--color-neutral-3);
382
+  border-radius: var(--border-radius-medium);
383
+  box-shadow: 0 2px 5px rgb(0 0 0 / 10%);
384
+}
385
+
386
+.custom-filter-footer {
387
+  display: flex;
388
+  justify-content: space-between;
389
+}
335 390
 </style>