chenrui 7 ماه پیش
والد
کامیت
c705da601b
33فایلهای تغییر یافته به همراه302 افزوده شده و 778 حذف شده
  1. 16 495
      src/views/allocationManagement/chainTransferOut/list.vue
  2. 17 16
      src/views/allocationManagement/storeTransferOut/list.vue
  3. 22 22
      src/views/bulkManagement/bulkReturnGoods/list.vue
  4. 12 12
      src/views/bulkManagement/bulkWarehousingOrder/list.vue
  5. 12 12
      src/views/chainReportData/chainCallReport/detailList.vue
  6. 10 10
      src/views/chainReportData/chainCallReport/list.vue
  7. 7 7
      src/views/chainReportData/chainCustomerReport/list.vue
  8. 5 5
      src/views/chainReportData/chainPurchaseReceiptReport/purchaseReceiptDetail.vue
  9. 5 5
      src/views/chainReportData/chainPurchaseReceiptReport/purchaseReceiptOrder.vue
  10. 11 11
      src/views/chainReportData/chainReceivedSendStorageReport/list.vue
  11. 11 11
      src/views/chainReportData/chainSalesDetailReport/list.vue
  12. 1 1
      src/views/chainReportData/chainSalesDetailsCountReport/list.vue
  13. 15 15
      src/views/chainReportData/chainSalesReport/list.vue
  14. 1 1
      src/views/chainReportData/chainSalesReturnDetailReport/list.vue
  15. 5 5
      src/views/chainReportData/chainStockExpenditureReport/list.vue
  16. 6 5
      src/views/chainReportData/chainStockIncomeReport/list.vue
  17. 14 14
      src/views/chainReportData/chainTransferReport/detailList.vue
  18. 2 2
      src/views/chainReportData/chainTransferReport/list.vue
  19. 14 14
      src/views/customerManagement/customerInfo/list.vue
  20. 16 15
      src/views/financialManagement/companyCollectionPayment/list.vue
  21. 5 5
      src/views/financialManagement/expenseManagement/list.vue
  22. 5 5
      src/views/financialManagement/inventoryCheckAudit/list.vue
  23. 7 7
      src/views/financialManagement/warehousingAudit/list.vue
  24. 9 9
      src/views/inventoryManagement/inventoryChecking/list.vue
  25. 5 5
      src/views/productManagement/productOnlineInfo/list.vue
  26. 1 1
      src/views/promotionManagement/promotionalProducts/list.vue
  27. 16 16
      src/views/reportData/bulkReturnReport/detailList.vue
  28. 10 10
      src/views/reportData/salesDetailReport/list.vue
  29. 12 12
      src/views/reportData/salesReport/list.vue
  30. 10 10
      src/views/reportData/stockImportReport/detailList.vue
  31. 5 5
      src/views/reportData/stockImportReport/list.vue
  32. 10 10
      src/views/reportData/storeTransferOutReport/detailList.vue
  33. 5 5
      src/views/reportData/storeTransferOutReport/list.vue

+ 16 - 495
src/views/allocationManagement/chainTransferOut/list.vue

@@ -1,482 +1,3 @@
- jianguan-web / qpls-md-html
-
-list.vue 20 KB
-
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100
-101
-102
-103
-104
-105
-106
-107
-108
-109
-110
-111
-112
-113
-114
-115
-116
-117
-118
-119
-120
-121
-122
-123
-124
-125
-126
-127
-128
-129
-130
-131
-132
-133
-134
-135
-136
-137
-138
-139
-140
-141
-142
-143
-144
-145
-146
-147
-148
-149
-150
-151
-152
-153
-154
-155
-156
-157
-158
-159
-160
-161
-162
-163
-164
-165
-166
-167
-168
-169
-170
-171
-172
-173
-174
-175
-176
-177
-178
-179
-180
-181
-182
-183
-184
-185
-186
-187
-188
-189
-190
-191
-192
-193
-194
-195
-196
-197
-198
-199
-200
-201
-202
-203
-204
-205
-206
-207
-208
-209
-210
-211
-212
-213
-214
-215
-216
-217
-218
-219
-220
-221
-222
-223
-224
-225
-226
-227
-228
-229
-230
-231
-232
-233
-234
-235
-236
-237
-238
-239
-240
-241
-242
-243
-244
-245
-246
-247
-248
-249
-250
-251
-252
-253
-254
-255
-256
-257
-258
-259
-260
-261
-262
-263
-264
-265
-266
-267
-268
-269
-270
-271
-272
-273
-274
-275
-276
-277
-278
-279
-280
-281
-282
-283
-284
-285
-286
-287
-288
-289
-290
-291
-292
-293
-294
-295
-296
-297
-298
-299
-300
-301
-302
-303
-304
-305
-306
-307
-308
-309
-310
-311
-312
-313
-314
-315
-316
-317
-318
-319
-320
-321
-322
-323
-324
-325
-326
-327
-328
-329
-330
-331
-332
-333
-334
-335
-336
-337
-338
-339
-340
-341
-342
-343
-344
-345
-346
-347
-348
-349
-350
-351
-352
-353
-354
-355
-356
-357
-358
-359
-360
-361
-362
-363
-364
-365
-366
-367
-368
-369
-370
-371
-372
-373
-374
-375
-376
-377
-378
-379
-380
-381
-382
-383
-384
-385
-386
-387
-388
-389
-390
-391
-392
-393
-394
-395
-396
-397
-398
-399
-400
-401
-402
-403
-404
-405
-406
-407
-408
-409
-410
-411
-412
-413
-414
-415
-416
-417
-418
-419
-420
-421
-422
-423
-424
-425
-426
-427
-428
-429
-430
-431
-432
-433
-434
-435
-436
-437
-438
-439
-440
-441
-442
-443
-444
-445
-446
-447
-448
-449
-450
-451
-452
-453
-454
-455
-456
-457
-458
-459
-460
-461
-462
-463
-464
-465
-466
-467
-468
-469
-470
-471
-472
-473
-474
-475
 <template>
   <a-card size="small" :bordered="false" class="chainTransferOutList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
@@ -495,16 +16,28 @@ list.vue 20 KB
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="出库时间">
-                <rangeDate id="chainTransferOutList-outWareTime" ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
+              <a-form-item label="连锁调出单号">
+                <a-input id="chainTransferOutList-allocationLinkageOutNo" v-model.trim="queryParam.allocationLinkageOutNo" allowClear placeholder="请输入连锁调出单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="连锁调出单号">
-                <a-input id="chainTransferOutList-allocationLinkageOutNo" v-model.trim="queryParam.allocationLinkageOutNo" allowClear placeholder="请输入连锁调出单号"/>
+              <a-form-item label="业务状态">
+                <v-select
+                  v-model="queryParam.state"
+                  ref="state"
+                  id="chainTransferOutList-state"
+                  code="ALLOCATION_LINKAGE_OUT_STATUS"
+                  @change="setIsHomeNav($route.name, null)"
+                  placeholder="请选择业务状态"
+                  allowClear></v-select>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="出库时间">
+                  <rangeDate id="chainTransferOutList-outWareTime" ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="调往对象">
                   <getTenantList id="chainTransferOutList-putTenantSn" type="out" placeholder="请选择调往对象" v-model="queryParam.putTenantSn"></getTenantList>
@@ -521,18 +54,6 @@ list.vue 20 KB
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="业务状态">
-                  <v-select
-                    v-model="queryParam.state"
-                    ref="state"
-                    id="chainTransferOutList-state"
-                    code="ALLOCATION_LINKAGE_OUT_STATUS"
-                    @change="setIsHomeNav($route.name, null)"
-                    placeholder="请选择业务状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="财务状态">
                   <v-select

+ 17 - 16
src/views/allocationManagement/storeTransferOut/list.vue

@@ -15,20 +15,29 @@
                 <rangeDate id="storeTransferOutList-auditTime" ref="auditRangeDate" :value="auditTime" @change="auditDateChange" />
               </a-form-item>
             </a-col>
+
             <a-col :md="6" :sm="24">
-              <a-form-item label="出库时间">
-                <rangeDate id="storeTransferOutList-outWareTime" ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
+              <a-form-item label="店内调出单号">
+                <a-input id="storeTransferOutList-storeCallOutNo" v-model.trim="queryParam.storeCallOutNo" allowClear placeholder="请输入店内调出单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="店内调出单号">
-                <a-input id="storeTransferOutList-storeCallOutNo" v-model.trim="queryParam.storeCallOutNo" allowClear placeholder="请输入店内调出单号"/>
+              <a-form-item label="业务状态">
+                <v-select
+                  v-model="queryParam.state"
+                  ref="state"
+                  id="storeTransferOutList-state"
+                  @change="setIsHomeNav($route.name, null)"
+                  code="STORE_CALL_OUT_STATE"
+                  placeholder="请选择业务状态"
+                  allowClear
+                ></v-select>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="调往对象名称">
-                  <custList id="storeTransferOutList-putPersonName" ref="custList" @change="custChange"></custList>
+                <a-form-item label="出库时间">
+                  <rangeDate id="storeTransferOutList-outWareTime" ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -39,16 +48,8 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="业务状态">
-                  <v-select
-                    v-model="queryParam.state"
-                    ref="state"
-                    id="storeTransferOutList-state"
-                    @change="setIsHomeNav($route.name, null)"
-                    code="STORE_CALL_OUT_STATE"
-                    placeholder="请选择业务状态"
-                    allowClear
-                  ></v-select>
+                <a-form-item label="调往对象名称">
+                  <custList id="storeTransferOutList-putPersonName" ref="custList" @change="custChange"></custList>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">

+ 22 - 22
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -16,14 +16,25 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="出库时间">
-                <rangeDate id="bulkReturnGoodsList-outWareTime" ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
+              <a-form-item label="业务状态">
+                <v-select
+                  code="SPARE_PARTS_RETURN"
+                  id="bulkReturnGoodsList-state"
+                  @change="setIsHomeNav($route.name, null)"
+                  v-model="queryParam.state"
+                  allowClear
+                  placeholder="请选择"></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="散件退货单号">
+                <a-input id="bulkReturnGoodsList-sparePartsReturnNo" v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入散件退货单号"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="散件退货单号">
-                  <a-input id="bulkReturnGoodsList-sparePartsReturnNo" v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入散件退货单号"/>
+                <a-form-item label="出库时间">
+                  <rangeDate id="bulkReturnGoodsList-outWareTime" ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -35,29 +46,18 @@
                   ></supplier>
                 </a-form-item>
               </a-col>
-              <a-col :md="3" :sm="24">
-                <a-form-item label="是否抓单">
-                  <v-select code="FLAG" id="bulkReturnGoodsList-isGrab" v-model="queryParam.isGrab" allowClear placeholder="请选择"></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="3" :sm="24">
-                <a-form-item label="业务状态">
-                  <v-select
-                    code="SPARE_PARTS_RETURN"
-                    id="bulkReturnGoodsList-state"
-                    @change="setIsHomeNav($route.name, null)"
-                    v-model="queryParam.state"
-                    allowClear
-                    placeholder="请选择"></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="3" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="财务状态">
                   <v-select code="FINANCIAL_RECEIVE_STATUS" id="bulkReturnGoodsList-settleState" v-model="queryParam.settleState" allowClear placeholder="请选择"></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="是否抓单">
+                  <v-select code="FLAG" id="bulkReturnGoodsList-isGrab" v-model="queryParam.isGrab" allowClear placeholder="请选择"></v-select>
+                </a-form-item>
+              </a-col>
             </template>
-            <a-col :md="6" :sm="24">
+            <a-col :md="24" :sm="24" style="text-align:center;margin-bottom:10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkReturnGoodsList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="bulkReturnGoodsList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px" id="bulkReturnGoodsList-advanced">

+ 12 - 12
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -11,8 +11,16 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="入库时间">
-                <rangeDate id="bulkWarehousingOrderList-auditRangeDate" ref="auditRangeDate" :value="auditTime" @change="auditDateChange" />
+              <a-form-item label="业务状态">
+                <v-select
+                  v-model="queryParam.state"
+                  ref="state"
+                  id="bulkWarehousingOrderList-state"
+                  @change="setIsHomeNav($route.name, null)"
+                  code="SPARE_PARTS_PURCHASE"
+                  placeholder="请选择业务状态"
+                  allowClear
+                ></v-select>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -31,16 +39,8 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="业务状态">
-                  <v-select
-                    v-model="queryParam.state"
-                    ref="state"
-                    id="bulkWarehousingOrderList-state"
-                    @change="setIsHomeNav($route.name, null)"
-                    code="SPARE_PARTS_PURCHASE"
-                    placeholder="请选择业务状态"
-                    allowClear
-                  ></v-select>
+                <a-form-item label="入库时间">
+                  <rangeDate id="bulkWarehousingOrderList-auditRangeDate" ref="auditRangeDate" :value="auditTime" @change="auditDateChange" />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">

+ 12 - 12
src/views/chainReportData/chainCallReport/detailList.vue

@@ -18,20 +18,25 @@
               <rangeDate id="chainCallReportExport-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="出库时间">
-              <rangeDate id="chainCallReportExport-outTime" ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
-            </a-form-item>
-          </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="连锁调出单号">
               <a-input id="chainCallReportExport-allocationLinkageOutNo" v-model.trim="queryParam.allocationLinkageOutNo" allowClear placeholder="请输入连锁调出单号"/>
             </a-form-model-item>
           </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="调往对象">
+              <getTenantList id="chainCallReportExport-putTenantSn" type="out" state="FINISH" placeholder="请选择调往对象" v-model="queryParam.putTenantSn"></getTenantList>
+            </a-form-item>
+          </a-col>
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-item label="调往对象">
-                <getTenantList id="chainCallReportExport-putTenantSn" type="out" state="FINISH" placeholder="请选择调往对象" v-model="queryParam.putTenantSn"></getTenantList>
+              <a-form-model-item label="产品编码">
+                <a-input id="chainCallReportExport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="出库时间">
+                <rangeDate id="chainCallReportExport-outTime" ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -45,11 +50,6 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="产品编码">
-                <a-input id="chainCallReportExport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
-              </a-form-model-item>
-            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品名称">
                 <a-input id="chainCallReportExport-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>

+ 10 - 10
src/views/chainReportData/chainCallReport/list.vue

@@ -18,22 +18,17 @@
               <rangeDate id="chainCallReportExport-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="出库时间">
-              <rangeDate id="chainCallReportExport-outWareTime" ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
-            </a-form-item>
-          </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="连锁调出单号">
               <a-input id="chainCallReportExport-allocationLinkageOutNo" v-model.trim="queryParam.allocationLinkageOutNo" allowClear placeholder="请输入连锁调出单号"/>
             </a-form-model-item>
           </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="调往对象">
+              <getTenantList id="chainCallReportExport-putTenantSn" type="out" state="FINISH" placeholder="请选择调往对象" v-model="queryParam.putTenantSn"></getTenantList>
+            </a-form-item>
+          </a-col>
           <template v-if="advanced">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="调往对象">
-                <getTenantList id="chainCallReportExport-putTenantSn" type="out" state="FINISH" placeholder="请选择调往对象" v-model="queryParam.putTenantSn"></getTenantList>
-              </a-form-item>
-            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="调拨产品类型">
                 <v-select
@@ -45,6 +40,11 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="出库时间">
+                <rangeDate id="chainCallReportExport-outWareTime" ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
+              </a-form-item>
+            </a-col>
           </template>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainCallReportExport-refresh">查询</a-button>

+ 7 - 7
src/views/chainReportData/chainCustomerReport/list.vue

@@ -14,6 +14,11 @@
           :wrapperCol="wrapperCol"
           @keyup.enter.native="handleSearch" >
           <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="添加时间" prop="time">
+                <rangeDate id="customerReportList-time" ref="rangeDate" @change="dateChange" />
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="连锁店" prop="tenantId">
                 <a-select
@@ -28,11 +33,6 @@
                 </a-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="添加时间" prop="time">
-                <rangeDate id="customerReportList-time" ref="rangeDate" @change="dateChange" />
-              </a-form-model-item>
-            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品分类">
                 <ProductType id="customerReportList-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="productType"></ProductType>
@@ -44,9 +44,9 @@
                   <AreaList id="customerReportList-area" changeOnSelect ref="areaList" @change="areaChange"></AreaList>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="客户类型">
-                  <custType id="customerReportList-custType" v-model="queryParam.customerTypeSn" allowClear placeholder="请选择客户类型" style="max-width: 240px;"></custType>
+                  <custType id="customerReportList-custType" v-model="queryParam.customerTypeSn" allowClear placeholder="请选择客户类型"></custType>
                 </a-form-item>
               </a-col>
             </template>

+ 5 - 5
src/views/chainReportData/chainPurchaseReceiptReport/purchaseReceiptDetail.vue

@@ -13,6 +13,11 @@
         :wrapperCol="wrapperCol"
         @keyup.enter.native="handleSearch" >
         <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="财务审核时间" prop="time">
+              <rangeDate id="chainPurchaseReceiptDetailList-time" ref="rangeDate" @change="dateChange" />
+            </a-form-model-item>
+          </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="连锁店" prop="tenantId">
               <a-select
@@ -27,11 +32,6 @@
               </a-select>
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-model-item label="财务审核时间" prop="time">
-              <rangeDate id="chainPurchaseReceiptDetailList-time" ref="rangeDate" @change="dateChange" />
-            </a-form-model-item>
-          </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="产品品牌">
               <ProductBrand id="chainPurchaseReceiptDetailList-productBrandSn" v-model="queryParam.productEntity.productBrandSn"></ProductBrand>

+ 5 - 5
src/views/chainReportData/chainPurchaseReceiptReport/purchaseReceiptOrder.vue

@@ -13,6 +13,11 @@
         :wrapperCol="wrapperCol"
         @keyup.enter.native="handleSearch" >
         <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="财务审核时间" prop="time">
+              <rangeDate id="chainPurchaseReceiptOrderList-time" ref="rangeDate" @change="dateChange" />
+            </a-form-model-item>
+          </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="连锁店" prop="tenantId">
               <a-select
@@ -27,11 +32,6 @@
               </a-select>
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-model-item label="财务审核时间" prop="time">
-              <rangeDate id="chainPurchaseReceiptOrderList-time" ref="rangeDate" @change="dateChange" />
-            </a-form-model-item>
-          </a-col>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainPurchaseReceiptOrderList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainPurchaseReceiptOrderList-reset">重置</a-button>

+ 11 - 11
src/views/chainReportData/chainReceivedSendStorageReport/list.vue

@@ -14,6 +14,17 @@
           :wrapperCol="wrapperCol"
           @keyup.enter.native="handleSearch" >
           <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="日期" prop="auditDate">
+                <a-month-picker
+                  id="sendStorageReportList-auditDate"
+                  v-model="queryParam.auditDate"
+                  :allowClear="false"
+                  @change="onChange"
+                  :defaultValue="moment()"
+                  style="width: 100%;" />
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="连锁店" prop="tenantId">
                 <a-select
@@ -28,17 +39,6 @@
                 </a-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="日期" prop="auditDate">
-                <a-month-picker
-                  id="sendStorageReportList-auditDate"
-                  v-model="queryParam.auditDate"
-                  :allowClear="false"
-                  @change="onChange"
-                  :defaultValue="moment()"
-                  style="width: 100%;" />
-              </a-form-model-item>
-            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品编码">
                 <a-input id="sendStorageReportList-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>

+ 11 - 11
src/views/chainReportData/chainSalesDetailReport/list.vue

@@ -14,6 +14,11 @@
         :wrapperCol="wrapperCol"
         @keyup.enter.native="handleSearch" >
         <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="审核时间" prop="time">
+              <rangeDate id="chainSalesDetailReportList-time" ref="rangeDate" @change="dateChange" />
+            </a-form-model-item>
+          </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="连锁店" prop="tenantId">
               <a-select
@@ -28,22 +33,17 @@
               </a-select>
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-model-item label="审核时间" prop="time">
-              <rangeDate id="chainSalesDetailReportList-time" ref="rangeDate" @change="dateChange" />
-            </a-form-model-item>
-          </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="客户名称">
               <custList id="chainSalesDetailReportList-salesTargetName" ref="custSatelliteList" @change="custSatelliteChange"></custList>
             </a-form-model-item>
           </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="客户类型">
+              <custType id="chainSalesDetailReportList-custType" v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型"></custType>
+            </a-form-item>
+          </a-col>
           <template v-if="advanced">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="客户类型">
-                <custType id="chainSalesDetailReportList-custType" v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型"></custType>
-              </a-form-item>
-            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="收款方式">
                 <v-select
@@ -105,7 +105,7 @@
               </a-form-item>
             </a-col>
           </template>
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="24" :sm="24" style="text-align:center;margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainSalesDetailReportList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainSalesDetailReportList-reset">重置</a-button>
             <a @click="advanced=!advanced" style="margin-left: 5px" id="chainSalesDetailReportList-advanced">

+ 1 - 1
src/views/chainReportData/chainSalesDetailsCountReport/list.vue

@@ -14,7 +14,7 @@
           :wrapperCol="wrapperCol"
           @keyup.enter.native="handleSearch" >
           <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
+            <a-col :md="7" :sm="24">
               <a-form-model-item label="审核日期" prop="time">
                 <rangeDate id="chainSalesDetailsCountReportList-time" ref="rangeDate" @change="dateChange" />
               </a-form-model-item>

+ 15 - 15
src/views/chainReportData/chainSalesReport/list.vue

@@ -14,6 +14,11 @@
         :wrapperCol="wrapperCol"
         @keyup.enter.native="handleSearch" >
         <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="审核时间" prop="time">
+              <rangeDate id="chainSalesReportList-time" ref="rangeDate" @change="dateChange" />
+            </a-form-model-item>
+          </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="连锁店" prop="tenantId">
               <a-select
@@ -29,21 +34,16 @@
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
-            <a-form-model-item label="审核时间" prop="time">
-              <rangeDate id="chainSalesReportList-time" ref="rangeDate" @change="dateChange" />
+            <a-form-model-item label="客户名称">
+              <custList id="chainSalesReportList-salesTargetName" ref="custSatelliteList" @change="custSatelliteChange"></custList>
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
-            <a-form-model-item label="客户名称">
-              <custList id="chainSalesReportList-salesTargetName" ref="custSatelliteList" @change="custSatelliteChange"></custList>
+            <a-form-model-item label="单号">
+              <a-input id="chainSalesReportList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入单号"/>
             </a-form-model-item>
           </a-col>
           <template v-if="advanced">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="客户类型">
-                <custType id="chainSalesReportList-custType" v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型"></custType>
-              </a-form-item>
-            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="收款方式">
                 <v-select
@@ -55,23 +55,23 @@
                 ></v-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="单号">
-                <a-input id="chainSalesReportList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入单号"/>
-              </a-form-model-item>
-            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="业务员">
                 <a-input id="chainSalesReportList-salesManName" v-model.trim="queryParam.salesManName" allowClear placeholder="请输入业务员"/>
               </a-form-model-item>
             </a-col>
+           <a-col :md="6" :sm="24">
+             <a-form-item label="客户类型">
+               <custType id="chainSalesReportList-custType" v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型"></custType>
+             </a-form-item>
+           </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="客户所在区">
                 <AreaList id="chainSalesReportList-area" changeOnSelect ref="areaList" @change="areaChange"></AreaList>
               </a-form-item>
             </a-col>
           </template>
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="24" :sm="24" style="text-align:center;margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainSalesReportList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainSalesReportList-reset">重置</a-button>
             <a @click="advanced=!advanced" style="margin-left: 8px" id="chainSalesReportList-advanced">

+ 1 - 1
src/views/chainReportData/chainSalesReturnDetailReport/list.vue

@@ -14,7 +14,7 @@
           :wrapperCol="wrapperCol"
           @keyup.enter.native="handleSearch" >
           <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
+            <a-col :md="7" :sm="24">
               <a-form-model-item label="审核日期" prop="time">
                 <rangeDate id="reportSalesReturnBillDetail-time" ref="rangeDate" @change="dateChange" />
               </a-form-model-item>

+ 5 - 5
src/views/chainReportData/chainStockExpenditureReport/list.vue

@@ -14,6 +14,11 @@
           :wrapperCol="wrapperCol"
           @keyup.enter.native="handelSearch" >
           <a-row :gutter="15">
+            <a-col :md="7" :sm="24">
+              <a-form-model-item label="出库完成时间" prop="time">
+                <rangeDate id="chainStockExpenditureReportList-time" ref="rangeDate" @change="dateChange" />
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="连锁店" prop="tenantId">
                 <a-select
@@ -28,11 +33,6 @@
                 </a-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="出库完成时间" prop="time">
-                <rangeDate id="chainStockExpenditureReportList-time" ref="rangeDate" @change="dateChange" />
-              </a-form-model-item>
-            </a-col>
             <a-col :md="6" :sm="24">
               <a-button type="primary" @click="handelSearch" id="chainStockExpenditureReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" id="chainStockExpenditureReportList-reset">重置</a-button>

+ 6 - 5
src/views/chainReportData/chainStockIncomeReport/list.vue

@@ -14,6 +14,11 @@
           :wrapperCol="wrapperCol"
           @keyup.enter.native="handelSearch" >
           <a-row :gutter="15">
+            <a-col :md="7" :sm="24">
+              <a-form-model-item label="入库完成时间" prop="time">
+                <rangeDate id="chainStockIncomeReportList-time" ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="连锁店" prop="tenantId">
                 <a-select
@@ -28,11 +33,7 @@
                 </a-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="入库完成时间" prop="time">
-                <rangeDate id="chainStockIncomeReportList-time" ref="rangeDate" :value="queryParam.time" @change="dateChange" />
-              </a-form-model-item>
-            </a-col>
+
             <a-col :md="6" :sm="24">
               <a-button type="primary" @click="handelSearch" id="chainStockIncomeReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" id="chainStockIncomeReportList-reset">重置</a-button>

+ 14 - 14
src/views/chainReportData/chainTransferReport/detailList.vue

@@ -29,27 +29,27 @@
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
-            <a-form-item label="调拨产品类型">
-              <v-select
-                v-model="queryParam.allocationType"
-                ref="allocationType"
-                id="chainTransferInReport-allocationType"
-                code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
-                placeholder="请选择调拨产品类型"
-                allowClear></v-select>
-            </a-form-item>
+            <a-form-model-item label="产品编码">
+              <a-input id="chainTransferInReport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
+            </a-form-model-item>
           </a-col>
           <template v-if="advanced">
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="产品编码">
-                <a-input id="chainTransferInReport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
-              </a-form-model-item>
-            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品名称">
                 <a-input id="chainTransferInReport-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="调拨产品类型">
+                <v-select
+                  v-model="queryParam.allocationType"
+                  ref="allocationType"
+                  id="chainTransferInReport-allocationType"
+                  code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
+                  placeholder="请选择调拨产品类型"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="产品品牌">
                 <ProductBrand id="chainTransferInReport-productBrandSn" placeholder="请选择产品品牌" v-model="queryParam.productEntity.productBrandSn"></ProductBrand>

+ 2 - 2
src/views/chainReportData/chainTransferReport/list.vue

@@ -18,7 +18,7 @@
               <rangeDate id="chainTransferInReport-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <a-col :md="5" :sm="24">
             <a-form-model-item label="连锁调入单号">
               <a-input id="chainTransferInReport-allocationLinkagePutNo" v-model.trim="queryParam.allocationLinkagePutNo" allowClear placeholder="请输入连锁调入单号"/>
             </a-form-model-item>
@@ -28,7 +28,7 @@
               <getTenantList id="chainTransferInReport-outTenantSn" state="FINISH" v-model="queryParam.outTenantSn"></getTenantList>
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :md="5" :sm="24">
             <a-form-item label="调拨产品类型">
               <v-select
                 v-model="queryParam.allocationType"

+ 14 - 14
src/views/customerManagement/customerInfo/list.vue

@@ -6,30 +6,30 @@
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="客户名称">
-                <a-input id="customerManagementList-customerName" v-model.trim="queryParam.customerName" allowClear placeholder="请输入客户名称"/>
+              <a-form-item label="最后销售时间">
+                <rangeDate id="customerManagementList-date" ref="rangeSaleDate" @change="dateSaleChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="联系人">
-                <a-input id="customerManagementList-contactName" v-model.trim="queryParam.contactName" allowClear placeholder="请输入联系人"/>
+              <a-form-item label="客户名称">
+                <a-input id="customerManagementList-customerName" v-model.trim="queryParam.customerName" allowClear placeholder="请输入客户名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="最后销售时间">
-                <rangeDate id="customerManagementList-date" ref="rangeSaleDate" @change="dateSaleChange" />
+              <a-form-item label="客户关系">
+                <v-select
+                  code="CUSTOMER_RELATION_TYPE"
+                  id="customerManagementList-relationType"
+                  v-model="queryParam.relationType"
+                  allowClear
+                  placeholder="请选择客户关系"
+                ></v-select>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="客户关系">
-                  <v-select
-                    code="CUSTOMER_RELATION_TYPE"
-                    id="customerManagementList-relationType"
-                    v-model="queryParam.relationType"
-                    allowClear
-                    placeholder="请选择客户关系"
-                  ></v-select>
+                <a-form-item label="联系人">
+                  <a-input id="customerManagementList-contactName" v-model.trim="queryParam.contactName" allowClear placeholder="请输入联系人"/>
                 </a-form-item>
               </a-col>
               <!--  <a-col :md="6" :sm="24">

+ 16 - 15
src/views/financialManagement/companyCollectionPayment/list.vue

@@ -5,6 +5,11 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="结算时间">
+                <rangeDate id="companyCollectionPaymentList-rangeDate" ref="rangeDate" @change="dateChange" />
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="客户名称">
                 <a-input id="companyCollectionPaymentList-settleClientName" v-model.trim="queryParam.settleClientNameCurrent" allowClear placeholder="请输入客户名称"/>
@@ -21,28 +26,24 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="结算类型">
-                <v-select
-                  v-model="queryParam.settleType"
-                  ref="settleType"
-                  id="companyCollectionPaymentList-settleType"
-                  code="SETTLE_TYPE"
-                  placeholder="请选择结算类型"
-                  allowClear></v-select>
-              </a-form-item>
-            </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="结算单号">
-                  <a-input id="companyCollectionPaymentList-unitSettleNo" v-model.trim="queryParam.unitSettleNo" allowClear placeholder="请输入结算单号"/>
+                <a-form-item label="结算类型">
+                  <v-select
+                    v-model="queryParam.settleType"
+                    ref="settleType"
+                    id="companyCollectionPaymentList-settleType"
+                    code="SETTLE_TYPE"
+                    placeholder="请选择结算类型"
+                    allowClear></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="结算时间">
-                  <rangeDate id="companyCollectionPaymentList-rangeDate" ref="rangeDate" @change="dateChange" />
+                <a-form-item label="结算单号">
+                  <a-input id="companyCollectionPaymentList-unitSettleNo" v-model.trim="queryParam.unitSettleNo" allowClear placeholder="请输入结算单号"/>
                 </a-form-item>
               </a-col>
+
               <a-col :md="6" :sm="24">
                 <a-form-item label="结算方式">
                   <v-select

+ 5 - 5
src/views/financialManagement/expenseManagement/list.vue

@@ -5,16 +5,16 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
-            <a-col :md="4" :sm="24">
-              <a-form-item label="费用单号">
-                <a-input id="expenseManagementList-accountExpensesNo" v-model.trim="queryParam.accountExpensesNo" allowClear placeholder="请输入费用单号"/>
-              </a-form-item>
-            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="创建时间">
                 <rangeDate id="expenseManagementList-rangeDate" ref="rangeDate" @change="dateChange" />
               </a-form-item>
             </a-col>
+            <a-col :md="4" :sm="24">
+              <a-form-item label="费用单号">
+                <a-input id="expenseManagementList-accountExpensesNo" v-model.trim="queryParam.accountExpensesNo" allowClear placeholder="请输入费用单号"/>
+              </a-form-item>
+            </a-col>
             <a-col :md="4" :sm="24">
               <a-form-item label="费用类型">
                 <a-cascader

+ 5 - 5
src/views/financialManagement/inventoryCheckAudit/list.vue

@@ -5,14 +5,14 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="盘点单号">
-                <a-input id="inventoryCheckAuditList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
+            <a-col :md="7" :sm="24">
+              <a-form-item label="盘点完成时间">
+                <rangeDate id="inventoryCheckAuditList-checkTime" ref="rangeDate" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="盘点完成时间">
-                <rangeDate id="inventoryCheckAuditList-checkTime" ref="rangeDate" @change="dateChange" />
+              <a-form-item label="盘点单号">
+                <a-input id="inventoryCheckAuditList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">

+ 7 - 7
src/views/financialManagement/warehousingAudit/list.vue

@@ -5,6 +5,11 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="入库时间">
+                <rangeDate id="warehousingAuditList-auditTime" ref="rangeDate" :value="auditTime" @change="dateChange" />
+              </a-form-item>
+            </a-col>
             <a-col :md="4" :sm="24">
               <a-form-item label="采购单号">
                 <a-input id="warehousingAuditList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
@@ -15,12 +20,7 @@
                 <a-input id="warehousingAuditList-receivingBillNo" v-model.trim="queryParam.receivingBillNo" allowClear placeholder="请输入发货单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="入库时间">
-                <rangeDate id="warehousingAuditList-auditTime" ref="rangeDate" :value="auditTime" @change="dateChange" />
-              </a-form-item>
-            </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-item label="入库审核状态">
                 <v-select
                   v-model="queryParam.auditState"
@@ -32,7 +32,7 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="5" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="warehousingAuditList-refresh">查询</a-button>
                 <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="warehousingAuditList-reset">重置</a-button>

+ 9 - 9
src/views/inventoryManagement/inventoryChecking/list.vue

@@ -4,6 +4,11 @@
     <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="创建时间">
+              <rangeDate id="inventoryCheckingList-time" ref="rangeDate" :value="[queryParam.beginDate, queryParam.endDate]" @change="dateChange" />
+            </a-form-item>
+          </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="盘点单号">
               <a-input id="inventoryCheckingList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
@@ -14,20 +19,15 @@
               <v-select code="CHECK_WAREHOUSE_TYPE" id="inventoryCheckingList-checkType" v-model="queryParam.checkType" allowClear placeholder="请选择盘点类型"></v-select>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="是否区分仓库">
-              <v-select code="FLAG" id="inventoryCheckingList-warehouseFlag" v-model="queryParam.warehouseFlag" allowClear placeholder="请选择"></v-select>
-            </a-form-item>
-          </a-col>
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-item label="盘点状态">
-                <v-select code="CHECK_WAREHOUSE_STATE" id="inventoryCheckingList-state" v-model="queryParam.state" allowClear placeholder="请选择盘点状态"></v-select>
+              <a-form-item label="是否区分仓库">
+                <v-select code="FLAG" id="inventoryCheckingList-warehouseFlag" v-model="queryParam.warehouseFlag" allowClear placeholder="请选择"></v-select>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="创建时间">
-                <rangeDate id="inventoryCheckingList-time" ref="rangeDate" :value="[queryParam.beginDate, queryParam.endDate]" @change="dateChange" />
+              <a-form-item label="盘点状态">
+                <v-select code="CHECK_WAREHOUSE_STATE" id="inventoryCheckingList-state" v-model="queryParam.state" allowClear placeholder="请选择盘点状态"></v-select>
               </a-form-item>
             </a-col>
           </template>

+ 5 - 5
src/views/productManagement/productOnlineInfo/list.vue

@@ -5,6 +5,11 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="上线时间'">
+                <rangeDate id="productInfoList-date" ref="rangeDate" @change="dateChange" />
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="产品编码">
                 <a-input id="productInfoList-code" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
@@ -15,11 +20,6 @@
                 <a-input id="productInfoList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="上线时间'">
-                <rangeDate id="productInfoList-date" ref="rangeDate" @change="dateChange" />
-              </a-form-model-item>
-            </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="产品品牌">

+ 1 - 1
src/views/promotionManagement/promotionalProducts/list.vue

@@ -16,7 +16,7 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="品牌">
+              <a-form-item label="产品品牌">
                 <productBrand id="promoProducts-productBrandSn" v-model="queryParam.productBrandSn"></productBrand>
               </a-form-item>
             </a-col>

+ 16 - 16
src/views/reportData/bulkReturnReport/detailList.vue

@@ -18,34 +18,34 @@
               <rangeDate id="bulkInList-auditTime" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="出库时间">
-              <rangeDate id="bulkInList-outWareTime" ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
-            </a-form-item>
-          </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="散件退货单号">
               <a-input id="bulkInList-sparePartsReturnNo" v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入单号"/>
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
-            <a-form-model-item label="供应商">
-              <supplier
-                id="bulkInList-supplierSn"
-                placeholder="请选择供应商"
-                v-model="queryParam.supplierSn"
-              ></supplier>
+            <a-form-model-item label="产品名称">
+              <a-input id="bulkInList-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="产品编码">
+              <a-input id="bulkInList-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
             </a-form-model-item>
           </a-col>
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="产品编码">
-                <a-input id="bulkInList-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
-              </a-form-model-item>
+              <a-form-item label="出库时间">
+                <rangeDate id="bulkInList-outWareTime" ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
+              </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="产品名称">
-                <a-input id="bulkInList-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
+              <a-form-model-item label="供应商">
+                <supplier
+                  id="bulkInList-supplierSn"
+                  placeholder="请选择供应商"
+                  v-model="queryParam.supplierSn"
+                ></supplier>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">

+ 10 - 10
src/views/reportData/salesDetailReport/list.vue

@@ -19,16 +19,6 @@
               <rangeDate id="salesDetailReportList-creatDate" ref="creatDate" v-model="creatTime" @change="creatDateChange" />
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-model-item label="审核时间">
-              <rangeDate id="salesDetailReportList-rangeDate" ref="rangeDate" v-model="time" @change="dateChange" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="出库时间">
-              <rangeDate id="salesDetailReportList-outWareTime" ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
-            </a-form-item>
-          </a-col>
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="客户名称">
@@ -51,6 +41,11 @@
                 ></v-select>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="审核时间">
+                <rangeDate id="salesDetailReportList-rangeDate" ref="rangeDate" v-model="time" @change="dateChange" />
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="产品品牌">
                 <ProductBrand id="salesDetailReportList-productBrandSn" placeholder="请选择产品品牌" v-model="queryParam.productEntity.productBrandSn"></ProductBrand>
@@ -72,6 +67,11 @@
                 <a-input id="salesDetailReportList-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="出库时间">
+                <rangeDate id="salesDetailReportList-outWareTime" ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品名称">
                 <a-input id="salesDetailReportList-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>

+ 12 - 12
src/views/reportData/salesReport/list.vue

@@ -19,16 +19,6 @@
               <rangeDate id="salesReportList-creatDate" ref="creatDate" v-model="creatTime" @change="creatDateChange" />
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-model-item label="审核时间">
-              <rangeDate id="salesReportList-rangeDate" ref="rangeDate" v-model="time" @change="dateChange" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="出库时间">
-              <rangeDate id="salesReportList-outWareTime" ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
-            </a-form-item>
-          </a-col>
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="客户名称">
@@ -52,8 +42,8 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="单号">
-                <a-input id="salesReportList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入单号"/>
+              <a-form-model-item label="审核时间">
+                <rangeDate id="salesReportList-rangeDate" ref="rangeDate" v-model="time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -61,11 +51,21 @@
                 <a-input id="salesReportList-salesManName" v-model.trim="queryParam.salesManName" allowClear placeholder="请输入业务员"/>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="单号">
+                <a-input id="salesReportList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入单号"/>
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="客户所在区">
                 <AreaList id="salesReportList-areaList" changeOnSelect ref="areaList" @change="areaChange"></AreaList>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="出库时间">
+                <rangeDate id="salesReportList-outWareTime" ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
+              </a-form-item>
+            </a-col>
           </template>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesReportList-refresh">查询</a-button>

+ 10 - 10
src/views/reportData/stockImportReport/detailList.vue

@@ -13,6 +13,11 @@
         :wrapperCol="wrapperCol"
         @keyup.enter.native="handleSearch" >
         <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="导入时间">
+              <rangeDate id="stockImport-rangeDate" ref="rangeDate" @change="dateChange" />
+            </a-form-model-item>
+          </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="导入单号">
               <a-input id="stockImport-stockImportNo" v-model.trim="queryParam.stockImportNo" allowClear placeholder="请输入导入单号"/>
@@ -44,12 +49,12 @@
               ></supplier>
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-model-item label="产品编码">
-              <a-input id="stockImport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
-            </a-form-model-item>
-          </a-col>
           <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="产品编码">
+                <a-input id="stockImport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品名称">
                 <a-input id="stockImport-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
@@ -65,11 +70,6 @@
                 <ProductType id="stockImport-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="queryParam.productType"></ProductType>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="导入时间">
-                <rangeDate id="stockImport-rangeDate" ref="rangeDate" @change="dateChange" />
-              </a-form-model-item>
-            </a-col>
           </template>
           <a-col :md="24" :sm="24" style="text-align:center;margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="stockImport-refresh">查询</a-button>

+ 5 - 5
src/views/reportData/stockImportReport/list.vue

@@ -13,6 +13,11 @@
         :wrapperCol="wrapperCol"
         @keyup.enter.native="handleSearch" >
         <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="导入时间">
+              <rangeDate ref="rangeDate" @change="dateChange" id="stockImport-rangeDate"/>
+            </a-form-model-item>
+          </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="导入类型">
               <a-select
@@ -29,11 +34,6 @@
               </a-select>
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-model-item label="导入时间">
-              <rangeDate ref="rangeDate" @change="dateChange" id="stockImport-rangeDate"/>
-            </a-form-model-item>
-          </a-col>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="stockImport-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="stockImport-reset">重置</a-button>

+ 10 - 10
src/views/reportData/storeTransferOutReport/detailList.vue

@@ -18,16 +18,6 @@
               <rangeDate id="storeTransOutReport-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="出库时间">
-              <rangeDate id="storeTransOutReport-outWareTime" ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-model-item label="店内调出单号">
-              <a-input id="storeTransOutReport-storeCallOutNo" v-model.trim="queryParam.storeCallOutNo" allowClear placeholder="请输入店内调出单号"/>
-            </a-form-model-item>
-          </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="调往对象">
               <custList id="storeTransOutReport-putPersonName" ref="custList" @change="custChange"></custList>
@@ -46,6 +36,11 @@
                 <a-input id="storeTransOutDetailReport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="出库时间">
+                <rangeDate id="storeTransOutReport-outWareTime" ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品名称">
                 <a-input id="storeTransOutDetailReport-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
@@ -61,6 +56,11 @@
                 <ProductType id="storeTransOutDetailReport-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="queryParam.productType"></ProductType>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="店内调出单号">
+                <a-input id="storeTransOutReport-storeCallOutNo" v-model.trim="queryParam.storeCallOutNo" allowClear placeholder="请输入店内调出单号"/>
+              </a-form-model-item>
+            </a-col>
           </template>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="storeTransOutDetailReport-refresh">查询</a-button>

+ 5 - 5
src/views/reportData/storeTransferOutReport/list.vue

@@ -18,11 +18,6 @@
               <rangeDate id="storeTransOutReport-time" ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="出库时间">
-              <rangeDate id="storeTransOutReport-outWareTime" ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
-            </a-form-item>
-          </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="店内调出单号">
               <a-input id="storeTransOutReport-storeCallOutNo" v-model.trim="queryParam.storeCallOutNo" allowClear placeholder="请输入店内调出单号"/>
@@ -40,6 +35,11 @@
               </a-select>
             </a-form-item>
           </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="出库时间">
+              <rangeDate id="storeTransOutReport-outWareTime" ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
+            </a-form-item>
+          </a-col>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="storeTransOutReport-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="storeTransOutReport-reset">重置</a-button>