Selaa lähdekoodia

Merge commit 'd3fc71a1e3e81be3bdcf9683d6c56519066bf735' into HEAD

gitadmin 7 kuukautta sitten
vanhempi
commit
dff731fb89
60 muutettua tiedostoa jossa 556 lisäystä ja 1024 poistoa
  1. 1 1
      public/version.json
  2. 16 495
      src/views/allocationManagement/chainTransferOut/list.vue
  3. 17 16
      src/views/allocationManagement/storeTransferOut/list.vue
  4. 22 22
      src/views/bulkManagement/bulkReturnGoods/list.vue
  5. 12 12
      src/views/bulkManagement/bulkWarehousingOrder/list.vue
  6. 12 12
      src/views/chainReportData/chainCallReport/detailList.vue
  7. 10 10
      src/views/chainReportData/chainCallReport/list.vue
  8. 7 7
      src/views/chainReportData/chainCustomerReport/list.vue
  9. 5 5
      src/views/chainReportData/chainPurchaseReceiptReport/purchaseReceiptDetail.vue
  10. 5 5
      src/views/chainReportData/chainPurchaseReceiptReport/purchaseReceiptOrder.vue
  11. 11 11
      src/views/chainReportData/chainReceivedSendStorageReport/list.vue
  12. 11 11
      src/views/chainReportData/chainSalesDetailReport/list.vue
  13. 1 1
      src/views/chainReportData/chainSalesDetailsCountReport/list.vue
  14. 15 15
      src/views/chainReportData/chainSalesReport/list.vue
  15. 1 1
      src/views/chainReportData/chainSalesReturnDetailReport/list.vue
  16. 5 5
      src/views/chainReportData/chainStockExpenditureReport/list.vue
  17. 6 5
      src/views/chainReportData/chainStockIncomeReport/list.vue
  18. 14 14
      src/views/chainReportData/chainTransferReport/detailList.vue
  19. 2 2
      src/views/chainReportData/chainTransferReport/list.vue
  20. 14 14
      src/views/customerManagement/customerInfo/list.vue
  21. 16 15
      src/views/financialManagement/companyCollectionPayment/list.vue
  22. 5 5
      src/views/financialManagement/expenseManagement/list.vue
  23. 5 5
      src/views/financialManagement/inventoryCheckAudit/list.vue
  24. 7 7
      src/views/financialManagement/warehousingAudit/list.vue
  25. 9 9
      src/views/inventoryManagement/inventoryChecking/list.vue
  26. 20 13
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  27. 1 1
      src/views/numsGoodsShelves/accountManagement/list.vue
  28. 2 2
      src/views/numsGoodsShelves/approveStore/authPass.vue
  29. 6 6
      src/views/numsGoodsShelves/approveStore/list.vue
  30. 2 2
      src/views/numsGoodsShelves/customerAnalysis/list.vue
  31. 6 6
      src/views/numsGoodsShelves/easyPassShopping/index.vue
  32. 1 1
      src/views/numsGoodsShelves/recallManagement/list.vue
  33. 1 1
      src/views/numsGoodsShelves/recallStockManagement/list.vue
  34. 1 1
      src/views/numsGoodsShelves/replenishmentManagement/list.vue
  35. 35 41
      src/views/numsGoodsShelves/settlementManagement/list.vue
  36. 13 12
      src/views/numsGoodsShelves/shelfMonitoring/list.vue
  37. 10 10
      src/views/numsGoodsShelves/shelfOrder/list.vue
  38. 1 1
      src/views/numsGoodsShelves/shelfProductTempl/list.vue
  39. 1 1
      src/views/numsGoodsShelves/shelfSet/list.vue
  40. 1 1
      src/views/numsGoodsShelves/vinAnalysis/index.vue
  41. 6 6
      src/views/numsGoodsShelves/vinAnalysis/spList.vue
  42. 1 1
      src/views/numsGoodsShelves/withdrawalManagement/list.vue
  43. 7 0
      src/views/productManagement/productInfo/edit.vue
  44. 5 5
      src/views/productManagement/productOnlineInfo/list.vue
  45. 1 1
      src/views/promotionManagement/promotionalProducts/list.vue
  46. 2 2
      src/views/purchasingManagement/purchaseOrder/edit.vue
  47. 2 2
      src/views/purchasingManagement/purchaseOrderNew/edit.vue
  48. 23 24
      src/views/purchasingManagement/purchaseReturnApplyForm/list.vue
  49. 17 19
      src/views/purchasingManagement/signWarehousing/list.vue
  50. 16 16
      src/views/reportData/bulkReturnReport/detailList.vue
  51. 10 10
      src/views/reportData/salesDetailReport/list.vue
  52. 12 12
      src/views/reportData/salesReport/list.vue
  53. 10 10
      src/views/reportData/stockImportReport/detailList.vue
  54. 5 5
      src/views/reportData/stockImportReport/list.vue
  55. 10 10
      src/views/reportData/storeTransferOutReport/detailList.vue
  56. 5 5
      src/views/reportData/storeTransferOutReport/list.vue
  57. 33 33
      src/views/salesManagement/salesQuery/list.vue
  58. 54 52
      src/views/salesManagement/salesQueryNew/list.vue
  59. 5 5
      src/views/salesManagement/salesReturn/list.vue
  60. 2 2
      vue.config.js

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1729066763516
+  "version": 1730171356402
 }

+ 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>

+ 20 - 13
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -39,14 +39,14 @@
                   <a-input id="iQWarehouseDetail-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入关联单据号"/>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="仓库">
+                  <a-select id="iQWarehouseDetail-warehouseSn" placeholder="请选择仓库" allowClear v-model="queryParam.warehouseSn" >
+                    <a-select-option v-for="item in warehouseList" :key="item.warehouseSn" :value="item.warehouseSn">{{ item.name }}</a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
               <template v-if="advanced">
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="仓库">
-                    <a-select id="iQWarehouseDetail-warehouseSn" placeholder="请选择仓库" allowClear v-model="queryParam.warehouseSn" >
-                      <a-select-option v-for="item in warehouseList" :key="item.warehouseSn" :value="item.warehouseSn">{{ item.name }}</a-select-option>
-                    </a-select>
-                  </a-form-item>
-                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="单据审核时间">
                     <rangeDate id="iQWarehouseDetail-time" ref="rangeDate" @change="dateChange" />
@@ -68,8 +68,13 @@
                       allowClear></v-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="批次号">
+                    <a-input id="iQWarehouseDetail-stockBatchNo" v-model.trim="queryParam.stockBatchNo" allowClear placeholder="请输入批次号"/>
+                  </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="iQWarehouseDetail-refresh">查询</a-button>
                 <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="iQWarehouseDetail-reset">重置</a-button>
                 <a @click="advanced=!advanced" style="margin-left: 8px" id="iQWarehouseDetail-advanced">
@@ -153,7 +158,8 @@ export default {
         flowType: undefined, // 入库or出库
         unitNameCurrent: '', // 单位名称
         warehouseSn: undefined, // 仓库sn
-        state: undefined// 单据状态
+        state: undefined, // 单据状态
+        stockBatchNo: ''// 批次号
       },
       disabled: false, //  查询、重置按钮是否可操作
       // 加载数据方法 必须为 Promise 对象
@@ -194,12 +200,12 @@ export default {
         { title: '产品名称', dataIndex: 'product.name', width: '12%', align: 'left', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'product.origCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '批次号', dataIndex: 'stockBatchNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '关联单据号', dataIndex: 'bizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '关联单据号', dataIndex: 'bizNo', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据类型', dataIndex: 'bizTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据审核时间', dataIndex: 'auditTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位名称', scopedSlots: { customRender: 'newUnitName' }, width: '9%', align: 'center', ellipsis: true },
-        { title: '仓库', dataIndex: 'warehouseName', width: '9%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '仓位', dataIndex: 'warehouseLocationName', width: '9%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'warehouseLocationName', width: '8%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '数量', scopedSlots: { customRender: 'qty' }, width: '5%', align: 'center' },
         // { title: '总成本', dataIndex: 'totalCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总售价', dataIndex: 'totalPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
@@ -240,6 +246,7 @@ export default {
       this.queryParam.unitNameCurrent = ''
       this.queryParam.warehouseSn = undefined
       this.queryParam.state = undefined
+      this.queryParam.stockBatchNo = ''
       this.$refs.table.refresh(true)
     },
     //  返回列表
@@ -268,7 +275,7 @@ export default {
     // 表格计算高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 298
+      this.tableHeight = window.innerHeight - tableSearchH - 288
     }
   },
   watch: {

+ 1 - 1
src/views/numsGoodsShelves/accountManagement/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card size="small" :bordered="false" class="accountManagementList-wrap">
+  <a-card size="small" :bordered="false" class="accountManagementList-wrap jg-page-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">

+ 2 - 2
src/views/numsGoodsShelves/approveStore/authPass.vue

@@ -430,12 +430,12 @@ export default {
 }
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 .authPass-wrap {
   height: 100%;
   >.ant-spin-nested-loading{
+     overflow-y: auto;
     height: calc(100% - 52px);
-	  overflow-y: auto;
     .ant-spin-container{
       height: 100%;
     }

+ 6 - 6
src/views/numsGoodsShelves/approveStore/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card size="small" :bordered="false" class="approveStore-wrap">
+  <a-card size="small" :bordered="false" class="approveStore-wrap jg-page-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 提示 -->
       <a-alert type="info" style="margin-bottom: 10px">
@@ -9,22 +9,22 @@
       <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-col :md="5" :sm="24">
               <a-form-item label="联系人手机">
                 <a-input id="approveStore-contactPhone" allowClear placeholder="请输入联系人手机" v-model.trim="queryParam.contactPhone"/>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-item label="联系人姓名">
                 <a-input id="approveStore-contactName" allowClear placeholder="请输入联系人姓名" v-model.trim="queryParam.contactName"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-item label="门店名称">
                 <a-input id="approveStore-storeName" allowClear placeholder="请输入门店名称" v-model.trim="queryParam.storeName"/>
               </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.auditStatus"
@@ -35,7 +35,7 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <div>
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="approveStore-refresh">查询</a-button>
                 <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="approveStore-reset">重置</a-button>

+ 2 - 2
src/views/numsGoodsShelves/customerAnalysis/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="userd-baseInfo">
+  <div class="userd-baseInfo jg-page-wrap">
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <div ref="tableSearch" class="table-page-search-wrapper">
@@ -15,7 +15,7 @@
                   <shelfSList id="analysis-shelf" style="width: 100%;" v-model="queryParam.shelfSn"></shelfSList>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="8" :sm="24" style="margin-bottom: 10px;">
+              <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                 <a-button type="primary" @click="$refs.table.refresh(true)" id="userd-refresh">查询</a-button>
                 <a-button type="" @click="reset" style="margin-left: 10px;" id="userd-reset">重置</a-button>
                 <a-button

+ 6 - 6
src/views/numsGoodsShelves/easyPassShopping/index.vue

@@ -1,8 +1,8 @@
 <template>
-  <a-card size="small" :bordered="false" class="easyPassShopping-wrap">
+  <a-card size="small" :bordered="false" class="easyPassShopping-wrap jg-page-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 操作按钮 -->
-      <div class="table-operator">
+      <!-- <div class="table-operator">
         <a-button
           type="primary"
           class="button-info"
@@ -25,7 +25,7 @@
         <div style="margin:10px 0;color:gray;" v-if="$hasPermissions('B_openShopProduct')||$hasPermissions('B_closeShopProduct')">
           {{ shoppingMallStatus=='0'?'开启':'关闭' }}商城后,易码通{{ shoppingMallStatus=='0'?'会':'不会' }}显示商城
         </div>
-      </div>
+      </div> -->
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" id="easyPassShopping-form" @keyup.enter.native="$refs.table.refresh(true)">
@@ -202,7 +202,7 @@ export default {
       this.queryParam.categorySn1 = val[0] ? val[0] : ''
       this.queryParam.categorySn2 = val[1] ? val[1] : ''
     },
-    // 获取产品类目列表
+    // 获取商城类目列表
     getCategoryList () {
       const _this = this
       _this.spinning = true
@@ -267,12 +267,12 @@ export default {
     // 表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 280
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     },
     // 初始化页面
     pageInit () {
       const _this = this
-      this.getShoppingStatus()
+      // this.getShoppingStatus()
       this.getCategoryList()
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()

+ 1 - 1
src/views/numsGoodsShelves/recallManagement/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card size="small" :bordered="false" class="accountManagementList-wrap">
+  <a-card size="small" :bordered="false" class="accountManagementList-wrap jg-page-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <div ref="tableSearch" style="width:100%;overflow: hidden;" class="table-page-search-wrapper">

+ 1 - 1
src/views/numsGoodsShelves/recallStockManagement/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card size="small" :bordered="false" class="shelfSetList-wrap">
+  <a-card size="small" :bordered="false" class="shelfSetList-wrap jg-page-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">

+ 1 - 1
src/views/numsGoodsShelves/replenishmentManagement/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card size="small" :bordered="false" class="replenishmentManagementList-wrap">
+  <a-card size="small" :bordered="false" class="replenishmentManagementList-wrap jg-page-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">

+ 35 - 41
src/views/numsGoodsShelves/settlementManagement/list.vue

@@ -1,63 +1,57 @@
 <template>
-  <a-card size="small" :bordered="false" class="accountManagementList-wrap">
+  <a-card size="small" :bordered="false" class="accountManagementList-wrap jg-page-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row type="flex" :gutter="10">
-            <a-col flex="350px">
+          <a-row :gutter="15">
+            <a-col :md="5" :sm="24">
               <a-form-item label="货架名称">
                 <shelfList id="settle-shelfsn" style="max-width:300px;" v-model="queryParam.shelfSn"></shelfList>
               </a-form-item>
             </a-col>
-            <a-col flex="300px">
+            <a-col :md="5" :sm="24">
               <a-form-item label="关联客户">
                 <custList id="settle-customerName" ref="custList" @change="custChange" v-model="queryParam.customerName"></custList>
               </a-form-item>
             </a-col>
-            <a-col flex="300px">
+            <a-col :md="5" :sm="24">
               <a-form-item label="结算方式">
                 <v-select id="settle-settleType" code="SHELF_SETTLE_TYPE" v-model="queryParam.settleType" allowClear placeholder="请选择状态"></v-select>
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col flex="300px">
-                <a-form-item label="待结金额">
-                  <a-input-group>
-                    <a-row>
-                      <a-col :span="11">
-                        <a-input-number
-                          id="settle-beginAmount"
-                          v-model="queryParam.beginAmount"
-                          placeholder="起始金额"
-                          :precision="2"
-                          :min="0"
-                          :max="999999"
-                          style="width: 100%;display: inline-block;"/>
-                      </a-col>
-                      <a-col :span="2"><span style="display: block;text-align: center;line-height: 32px;">至</span></a-col>
-                      <a-col :span="11">
-                        <a-input-number
-                          id="settle-endAmount"
-                          placeholder="截止金额"
-                          :precision="2"
-                          :min="0"
-                          :max="999999"
-                          v-model="queryParam.endAmount"
-                          style="width: 100%;display: inline-block;"/>
-                      </a-col>
-                    </a-row>
-                  </a-input-group>
-                </a-form-item>
-              </a-col>
-            </template>
-            <a-col flex="200px">
+            <a-col :md="5" :sm="24">
+              <a-form-item label="待结金额">
+                <a-input-group>
+                  <a-row>
+                    <a-col :span="11">
+                      <a-input-number
+                        id="settle-beginAmount"
+                        v-model="queryParam.beginAmount"
+                        placeholder="起始金额"
+                        :precision="2"
+                        :min="0"
+                        :max="999999"
+                        style="width: 100%;display: inline-block;"/>
+                    </a-col>
+                    <a-col :span="2"><span style="display: block;text-align: center;line-height: 32px;">至</span></a-col>
+                    <a-col :span="11">
+                      <a-input-number
+                        id="settle-endAmount"
+                        placeholder="截止金额"
+                        :precision="2"
+                        :min="0"
+                        :max="999999"
+                        v-model="queryParam.endAmount"
+                        style="width: 100%;display: inline-block;"/>
+                    </a-col>
+                  </a-row>
+                </a-input-group>
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="settle-refresh" >查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="settle-reset">重置</a-button>
-              <!-- <a @click="advanced=!advanced" style="margin-left: 5px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a> -->
             </a-col>
           </a-row>
         </a-form>

+ 13 - 12
src/views/numsGoodsShelves/shelfMonitoring/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card size="small" :bordered="false" class="shelfMonitoringList-wrap">
+  <a-card size="small" :bordered="false" class="shelfMonitoringList-wrap jg-page-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
@@ -29,23 +29,24 @@
                 <a-input id="shelfMonitoringList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="货位产品状态">
+                <v-select
+                  v-model="queryParam.state"
+                  ref="state"
+                  id="shelfMonitoringList-state"
+                  code="SHELF_PRODUCT_STATE"
+                  placeholder="请选择货位产品状态"
+                  allowClear></v-select>
+              </a-form-model-item>
+            </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="产品名称">
                   <a-input id="shelfMonitoringList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="货位产品状态">
-                  <v-select
-                    v-model="queryParam.state"
-                    ref="state"
-                    id="shelfMonitoringList-state"
-                    code="SHELF_PRODUCT_STATE"
-                    placeholder="请选择货位产品状态"
-                    allowClear></v-select>
-                </a-form-model-item>
-              </a-col>
+
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="滞销天数">
                   <a-input-group>

+ 10 - 10
src/views/numsGoodsShelves/shelfOrder/list.vue

@@ -1,26 +1,21 @@
 <template>
-  <a-card size="small" :bordered="false" class="shelfOrder-wrap">
+  <a-card size="small" :bordered="false" class="shelfOrder-wrap jg-page-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <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-col :md="5" :sm="24">
               <a-form-item label="订单编号">
                 <a-input id="shelfOrder-orderBillNo" v-model.trim="queryParam.orderBillNo" allowClear placeholder="请输入订单编号" />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-item label="货架名称">
                 <shelfSList id="shelfOrder-shelfname" ref="shelfSList" :showAll="true" mode="multiple" v-model="queryParam.shelfSnList"></shelfSList>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="下单时间">
-                <rangeDate id="shelfOrder-time" ref="rangeDate" :value="time" @change="dateChange" />
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-item label="订单状态">
                 <v-select
                   v-model="queryParam.billState"
@@ -31,7 +26,12 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24" style="margin-bottom: 10px">
+            <a-col :md="5" :sm="24">
+              <a-form-item label="下单时间">
+                <rangeDate id="shelfOrder-time" ref="rangeDate" :value="time" @change="dateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24" style="margin-bottom: 10px">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shelfOrder-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm(0)" :disabled="disabled" id="shelfOrder-reset">重置</a-button>
             </a-col>

+ 1 - 1
src/views/numsGoodsShelves/shelfProductTempl/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card size="small" :bordered="false" class="shelfSetList-wrap">
+  <a-card size="small" :bordered="false" class="shelfSetList-wrap jg-page-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">

+ 1 - 1
src/views/numsGoodsShelves/shelfSet/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card size="small" :bordered="false" class="shelfSetList-wrap">
+  <a-card size="small" :bordered="false" class="shelfSetList-wrap jg-page-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">

+ 1 - 1
src/views/numsGoodsShelves/vinAnalysis/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="tabsReportList-wrap">
+  <div class="tabsReportList-wrap jg-page-wrap">
     <div style="background-color: #fff;margin-bottom: 5px;">
       <a-tabs default-active-key="1" v-model="curTab">
         <a-tab-pane key="1" tab="VIN扫描记录"></a-tab-pane>

+ 6 - 6
src/views/numsGoodsShelves/vinAnalysis/spList.vue

@@ -13,33 +13,33 @@
         :wrapperCol="wrapperCol"
         @keyup.enter.native="handleSearch" >
         <a-row :gutter="15">
-          <a-col :md="5" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-model-item label="货架名称" prop="shelfSn">
               <shelfSList id="vinAnaly-shelf" v-model="queryParam.shelfSn" @change="shelfChange"></shelfSList>
             </a-form-model-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-model-item label="产品编码">
               <a-input id="vinAnaly-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-model-item label="产品名称">
               <a-input id="vinAnaly-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-model-item label="原厂编码">
               <a-input id="vinAnaly-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
             </a-form-model-item>
           </a-col>
           <template v-if="advanced">
-            <a-col :md="5" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="产品品牌">
                 <ProductBrand id="vinAnaly-brandSn" placeholder="请选择产品品牌" v-model="queryParam.brandSn"></ProductBrand>
               </a-form-item>
             </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="产品分类">
                 <ProductType id="vinAnaly-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="productType"></ProductType>
               </a-form-item>

+ 1 - 1
src/views/numsGoodsShelves/withdrawalManagement/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card size="small" :bordered="false" class="accountManagementList-wrap">
+  <a-card size="small" :bordered="false" class="accountManagementList-wrap jg-page-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">

+ 7 - 0
src/views/productManagement/productInfo/edit.vue

@@ -354,6 +354,10 @@ export default {
         }
       })
     },
+    // 去除产品编码、产品名称、原厂编码  文字中间2个以上连续空格转化为一个空格
+    mergeSpaces (text) {
+      return text.replace(/\s+/g, ' ')
+    },
     //  保存
     handleSubmit (e) {
       e.preventDefault()
@@ -375,6 +379,9 @@ export default {
           form.carOwnersPrice = !form.carOwnersPrice ? '' : form.carOwnersPrice
           form.specialPrice = !form.specialPrice ? '' : form.specialPrice
           form.terminalPrice = !form.terminalPrice ? '' : form.terminalPrice
+          form.name = _this.mergeSpaces(form.name)
+          form.code = _this.mergeSpaces(form.code)
+          form.origCode = _this.mergeSpaces(form.origCode)
           dealerProductSave(form).then(res => {
             if (res.status == 200) {
               _this.$message.success(res.message)

+ 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>

+ 2 - 2
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -521,7 +521,7 @@ export default {
             params.qty = row.qty
             params.priceLevel = row.priceLevel
           } else {
-            this.$message.warning('成本价不能为空!')
+            this.$message.warning('成本价不能为空!(注:请联系【供应商】完善定价)')
             return
           }
         } else {
@@ -534,7 +534,7 @@ export default {
             params.qty = row.qty
             params.priceLevel = row.priceLevel
           } else {
-            this.$message.warning('成本价、终端会员价、车主零售价不能为空!')
+            this.$message.warning('成本价、终端会员价、车主零售价不能为空!(注:请联系【供应商】完善定价)')
             return
           }
         }

+ 2 - 2
src/views/purchasingManagement/purchaseOrderNew/edit.vue

@@ -441,7 +441,7 @@ export default {
             params.qty = row.qty
             params.priceLevel = row.priceLevel
           } else {
-            this.$message.warning('成本价不能为空!')
+            this.$message.warning('成本价不能为空!(注:请联系【供应商】完善定价)')
             this.$refs.chooseProduct.spinning = false
             return
           }
@@ -455,7 +455,7 @@ export default {
             params.qty = row.qty
             params.priceLevel = row.priceLevel
           } else {
-            this.$message.warning('成本价、终端会员价、车主零售价不能为空!')
+            this.$message.warning('成本价、终端会员价、车主零售价不能为空!(注:请联系【供应商】完善定价)')
             this.$refs.chooseProduct.spinning = false
             return
           }

+ 23 - 24
src/views/purchasingManagement/purchaseReturnApplyForm/list.vue

@@ -22,21 +22,25 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="退货类别">
-                <v-select
-                  v-model="queryParam.goodFlag"
-                  ref="goodFlag"
-                  id="purchaseReturnList-goodFlag"
-                  code="GOOD_FLAG"
-                  placeholder="请选择退货类别"
-                  allowClear></v-select>
+              <a-form-item label="采购退货申请单号">
+                <a-input id="purchaseReturnList-purchaseReturnApplyNo" v-model.trim="queryParam.purchaseReturnApplyNo" allowClear placeholder="请输入采购退货申请单号"/>
               </a-form-item>
             </a-col>
-
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="采购退货申请单号">
-                  <a-input id="purchaseReturnList-purchaseReturnApplyNo" v-model.trim="queryParam.purchaseReturnApplyNo" allowClear placeholder="请输入采购退货申请单号"/>
+                <a-form-item label="退货类别">
+                  <v-select
+                    v-model="queryParam.goodFlag"
+                    ref="goodFlag"
+                    id="purchaseReturnList-goodFlag"
+                    code="GOOD_FLAG"
+                    placeholder="请选择退货类别"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="客服审核时间">
+                  <rangeDate id="purchaseReturnList-auditTime" ref="auditDate" :value="auditTime" @change="auditDateChange" />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -52,11 +56,6 @@
                   ></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="客服审核时间">
-                  <rangeDate id="purchaseReturnList-auditTime" ref="auditDate" :value="auditTime" @change="auditDateChange" />
-                </a-form-item>
-              </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="purchaseReturnList-refresh">查询</a-button>
@@ -102,14 +101,6 @@
               v-if="record.billStatus == 'WAIT_SUBMIT'&&$hasPermissions('B_purchaseReturnApplyEdit')"
               @click="handleEdit(record)"
             >编辑</a-button>
-            <a-button
-              size="small"
-              type="link"
-              class="button-error"
-              :id="'purchaseReturnList-del-'+record.id"
-              v-if="record.billStatus == 'WAIT_SUBMIT'&&$hasPermissions('B_purchaseReturnApplyDel')"
-              @click="handleDel(record)"
-            >删除</a-button>
             <a-button
               size="small"
               type="link"
@@ -126,6 +117,14 @@
               @click="handleFinishBill(record)"
               class="button-primary"
             >再次编辑</a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-error"
+              :id="'purchaseReturnList-del-'+record.id"
+              v-if="(record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'CANCEL')&&$hasPermissions('B_purchaseReturnApplyDel')"
+              @click="handleDel(record)"
+            >删除</a-button>
           </div>
         </template>
       </s-table>

+ 17 - 19
src/views/purchasingManagement/signWarehousing/list.vue

@@ -5,41 +5,39 @@
       <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-col :md="5" :sm="24">
               <a-form-item label="创建时间">
                 <rangeDate id="signWarehousingList-time" ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-item label="采购单号">
                 <a-input id="signWarehousingList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-item label="发货单号">
                 <a-input id="signWarehousingList-sendBillNo" v-model.trim="queryParam.sendBillNo" allowClear placeholder="请输入发货单号"/>
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="业务状态">
-                  <v-select
-                    v-model="queryParam.auditState"
-                    ref="auditState"
-                    id="chainTransferOutList-auditState"
-                    code="RECEIVING_BILL_STATUS"
-                    placeholder="请选择业务状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-            </template>
-            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <a-col :md="5" :sm="24">
+              <a-form-item label="业务状态">
+                <v-select
+                  v-model="queryParam.auditState"
+                  ref="auditState"
+                  id="chainTransferOutList-auditState"
+                  code="RECEIVING_BILL_STATUS"
+                  placeholder="请选择业务状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="signWarehousingList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="signWarehousingList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 5px" id="signWarehousingList-advanced">
+            <!--  <a @click="advanced=!advanced" style="margin-left: 5px" id="signWarehousingList-advanced">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
+              </a> -->
             </a-col>
           </a-row>
         </a-form>

+ 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>

+ 33 - 33
src/views/salesManagement/salesQuery/list.vue

@@ -27,8 +27,15 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="审核时间">
-                <rangeDate id="salesManagementList-auditTime" ref="auditRangeDate" v-model="auditTime" @change="auditDateChange" />
+              <a-form-item label="单据来源">
+                <v-select
+                  style="width: 100%;"
+                  v-model="queryParam.sourceType"
+                  ref="sourceType"
+                  id="salesManagementList-sourceType"
+                  code="SALES_SOURCE"
+                  placeholder="请选择单据来源"
+                  allowClear></v-select>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
@@ -38,26 +45,13 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="单据来源">
-                  <v-select
-                    style="width: 100%;"
-                    v-model="queryParam.sourceType"
-                    ref="sourceType"
-                    id="salesManagementList-sourceType"
-                    code="SALES_SOURCE"
-                    placeholder="请选择单据来源"
-                    allowClear></v-select>
-                </a-form-item>
+                <a-form-model-item label="客户关系">
+                  <v-select code="CUSTOMER_RELATION_TYPE" id="chainTransferOutList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>
+                </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="收款方式">
-                  <v-select
-                    code="SETTLE_STYLE"
-                    id="salesManagementList-settleStyleSn"
-                    v-model="queryParam.settleStyleSn"
-                    allowClear
-                    placeholder="请选择收款方式"
-                  ></v-select>
+                <a-form-item label="采购单号">
+                  <a-input id="salesManagementList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -73,19 +67,19 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="财务状态">
-                  <v-select
-                    v-model="queryParam.financialStatus"
-                    ref="financialStatus"
-                    id="salesManagementList-financialStatus"
-                    code="FINANCIAL_RECEIVE_STATUS"
-                    placeholder="请选择财务状态"
-                    allowClear></v-select>
+                <a-form-item label="审核时间">
+                  <rangeDate id="salesManagementList-auditTime" ref="auditRangeDate" v-model="auditTime" @change="auditDateChange" />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="采购单号">
-                  <a-input id="salesManagementList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
+                <a-form-item label="收款方式">
+                  <v-select
+                    code="SETTLE_STYLE"
+                    id="salesManagementList-settleStyleSn"
+                    v-model="queryParam.settleStyleSn"
+                    allowClear
+                    placeholder="请选择收款方式"
+                  ></v-select>
                 </a-form-item>
               </a-col>
               <a-col :span="6">
@@ -94,9 +88,15 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="客户关系">
-                  <v-select code="CUSTOMER_RELATION_TYPE" id="chainTransferOutList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>
-                </a-form-model-item>
+                <a-form-item label="财务状态">
+                  <v-select
+                    v-model="queryParam.financialStatus"
+                    ref="financialStatus"
+                    id="salesManagementList-financialStatus"
+                    code="FINANCIAL_RECEIVE_STATUS"
+                    placeholder="请选择财务状态"
+                    allowClear></v-select>
+                </a-form-item>
               </a-col>
             </template>
             <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:center;">

+ 54 - 52
src/views/salesManagement/salesQueryNew/list.vue

@@ -21,69 +21,65 @@
                 <custList id="salesManagementList-custList" ref="custList" @change="custChange"></custList>
               </a-form-item>
             </a-col>
-            <a-col :span="6" v-if="advanced">
-              <a-form-item label="收款方式">
-                <v-select
-                  code="SETTLE_STYLE"
-                  id="salesManagementList-settleStyleSn"
-                  v-model="queryParam.settleStyleSn"
-                  allowClear
-                  placeholder="请选择收款方式"
-                ></v-select>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="销售单号">
+                <a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
               </a-form-item>
             </a-col>
-            <a-col :span="6" v-if="advanced">
-              <a-form-item label="业务状态">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="单据来源">
                 <v-select
-                  v-model="queryParam.billStatus"
-                  ref="billStatus"
-                  id="salesManagementList-billStatus"
-                  code="SALES_BILL_STATUS"
-                  placeholder="请选择业务状态"
+                  style="width: 100%;"
+                  v-model="queryParam.sourceType"
+                  ref="sourceType"
+                  id="salesManagementList-sourceType"
+                  code="SALES_SOURCE"
+                  placeholder="请选择单据来源"
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :span="6">
-              <a-form-item label="审核时间">
-                <rangeDate id="salesManagementList-auditDate" ref="auditRangeDate" v-model="auditTime" @change="auditDateChange" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="6">
-              <a-form-item label="销售单号">
-                <a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
-              </a-form-item>
-            </a-col>
             <template v-if="advanced">
-              <a-col :span="6" >
-                <a-form-item label="单据来源">
-                  <v-select
-                    v-model="queryParam.sourceType"
-                    ref="sourceType"
-                    id="salesManagementList-sourceType"
-                    code="SALES_SOURCE"
-                    placeholder="请选择单据来源"
-                    allowClear></v-select>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="出库时间">
+                  <rangeDate id="salesManagementList-outWareTime" ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
                 </a-form-item>
               </a-col>
-              <a-col :span="6">
-                <a-form-item label="财务状态">
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="客户关系">
+                  <v-select code="CUSTOMER_RELATION_TYPE" id="chainTransferOutList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="采购单号">
+                  <a-input id="salesManagementList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="业务状态">
                   <v-select
-                    v-model="queryParam.financialStatus"
-                    ref="financialStatus"
-                    id="salesManagementList-financialStatus"
-                    code="FINANCIAL_RECEIVE_STATUS"
-                    placeholder="请选择财务状态"
+                    v-model="queryParam.billStatus"
+                    @change="setIsHomeNav($route.name, null)"
+                    ref="billStatus"
+                    id="salesManagementList-billStatus"
+                    code="SALES_BILL_STATUS"
+                    placeholder="请选择业务状态"
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :span="6">
-                <a-form-item label="出库时间">
-                  <rangeDate ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
+              <a-col :md="6" :sm="24">
+                <a-form-item label="审核时间">
+                  <rangeDate id="salesManagementList-auditTime" ref="auditRangeDate" v-model="auditTime" @change="auditDateChange" />
                 </a-form-item>
               </a-col>
-              <a-col :span="6">
-                <a-form-item label="采购单号">
-                  <a-input id="salesManagementList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="收款方式">
+                  <v-select
+                    code="SETTLE_STYLE"
+                    id="salesManagementList-settleStyleSn"
+                    v-model="queryParam.settleStyleSn"
+                    allowClear
+                    placeholder="请选择收款方式"
+                  ></v-select>
                 </a-form-item>
               </a-col>
               <a-col :span="6">
@@ -91,10 +87,16 @@
                   <v-select code="FLAG" id="salesManagementList-distributionFlag" v-model="queryParam.distributionFlag" allowClear placeholder="请选择是否铺货出库"></v-select>
                 </a-form-model-item>
               </a-col>
-              <a-col :span="6">
-                <a-form-model-item label="客户关系">
-                  <v-select code="CUSTOMER_RELATION_TYPE" id="salesManagementList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>
-                </a-form-model-item>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="财务状态">
+                  <v-select
+                    v-model="queryParam.financialStatus"
+                    ref="financialStatus"
+                    id="salesManagementList-financialStatus"
+                    code="FINANCIAL_RECEIVE_STATUS"
+                    placeholder="请选择财务状态"
+                    allowClear></v-select>
+                </a-form-item>
               </a-col>
             </template>
             <a-col :span="24" style="display:flex;align-items: center;">

+ 5 - 5
src/views/salesManagement/salesReturn/list.vue

@@ -10,11 +10,6 @@
                 <rangeDate id="salesReturn-time" ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="审核时间">
-                <rangeDate id="salesReturn-aduditTime" ref="rangeExamineDate" @change="dateExamineChange" />
-              </a-form-item>
-            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
                 <custList id="salesReturn-buyerNameCurrent" ref="custList" v-model="queryParam.buyerNameCurrent"></custList>
@@ -38,6 +33,11 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="审核时间">
+                  <rangeDate id="salesReturn-aduditTime" ref="rangeExamineDate" @change="dateExamineChange" />
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="客户关系">
                   <v-select code="CUSTOMER_RELATION_TYPE" id="chainTransferOutList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>

+ 2 - 2
vue.config.js

@@ -209,8 +209,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.2.100:88/qpls-md',
-        // target: 'https://p.iscm.360arrow.com/qpls-md',
+        // target: 'http://192.168.2.100:88/qpls-md',
+        target: 'https://p.iscm.360arrow.com/qpls-md',
         // target: 'https://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,