Bläddra i källkod

Finish Hotfix-zh-356

zh 2 år sedan
förälder
incheckning
d25c685532
70 ändrade filer med 35 tillägg och 153 borttagningar
  1. 0 2
      src/mixin/index.js
  2. 0 2
      src/views/basic_data/dealer/dealer_list.vue
  3. 0 2
      src/views/basic_data/stock/Issue_list.vue
  4. 0 2
      src/views/basic_data/stock/customer_product_list.vue
  5. 0 2
      src/views/basic_data/stock/material_list.vue
  6. 0 2
      src/views/basic_data/stock/product_list.vue
  7. 0 2
      src/views/basic_data/stock/product_list_customer.vue
  8. 0 2
      src/views/basic_data/stock/stock_fee_list.vue
  9. 0 2
      src/views/basic_data/stock/warehousing_list.vue
  10. 0 2
      src/views/deposit_commerce/refund_list.vue
  11. 0 2
      src/views/deposit_home/refund_list.vue
  12. 0 2
      src/views/issue/index.vue
  13. 0 2
      src/views/merchant/merchant_list.vue
  14. 0 2
      src/views/notice/index.vue
  15. 0 2
      src/views/sales_region/sales_line.vue
  16. 0 2
      src/views/sales_region/sales_man.vue
  17. 0 2
      src/views/sales_region/sales_relation.vue
  18. 0 2
      src/views/setting/account.vue
  19. 0 2
      src/views/setting/api.vue
  20. 0 2
      src/views/setting/components/log-examine.vue
  21. 0 2
      src/views/setting/components/log-login.vue
  22. 0 2
      src/views/setting/components/log-operation.vue
  23. 0 2
      src/views/stock/reserved_stock.vue
  24. 0 2
      src/views/stock/stock_list.vue
  25. 0 2
      src/views/supply/adjust/adjust_list.vue
  26. 0 2
      src/views/supply/allot/allot_list.vue
  27. 0 2
      src/views/supply/apply/apply_list.vue
  28. 0 2
      src/views/supply/apply/components/apply_form.vue
  29. 0 2
      src/views/supply/apply/components/apply_return_form.vue
  30. 0 2
      src/views/supply/apply/components/engin_form.vue
  31. 0 2
      src/views/supply/apply/components/engin_return_form.vue
  32. 0 2
      src/views/supply/apply/engin_list.vue
  33. 0 2
      src/views/supply/apply/new_apply.vue
  34. 0 2
      src/views/supply/apply/new_engin.vue
  35. 0 2
      src/views/supply/deliver/commerce_list.vue
  36. 0 2
      src/views/supply/deliver/deliver_list.vue
  37. 0 2
      src/views/supply/deliver/home_list.vue
  38. 0 2
      src/views/supply/deliver/sum_list.vue
  39. 0 2
      src/views/supply/direct/direct_list.vue
  40. 0 2
      src/views/supply/displace/components/displace_form.vue
  41. 0 2
      src/views/supply/displace/displace_list copy.vue
  42. 0 2
      src/views/supply/engin/commerce_list.vue
  43. 1 3
      src/views/supply/engin/components/commerce_form.vue
  44. 0 2
      src/views/supply/engin/components/home_form.vue
  45. 0 2
      src/views/supply/engin/engin_list.vue
  46. 0 2
      src/views/supply/engin/home_list.vue
  47. 0 2
      src/views/supply/implement/commercial_implement_list.vue
  48. 0 2
      src/views/supply/implement/components/sales_return_form.vue
  49. 0 2
      src/views/supply/implement/implement_list.vue
  50. 0 2
      src/views/supply/implement/implement_total_list.vue
  51. 0 2
      src/views/supply/implement/nsales_list.vue
  52. 34 12
      src/views/supply/pickup/pickup_list.vue
  53. 0 2
      src/views/supply/pickup/sum_list.vue
  54. 0 2
      src/views/supply/policy/components/policy_list.vue
  55. 0 2
      src/views/supply/policy/components/retail_form.vue
  56. 0 2
      src/views/supply/policy/components/retail_form2.vue
  57. 0 2
      src/views/supply/policy/policy_list.vue
  58. 0 2
      src/views/supply/purchase/enter_list.vue
  59. 0 2
      src/views/supply/purchase/plan_list.vue
  60. 0 2
      src/views/supply/purchase/purchase_list.vue
  61. 0 2
      src/views/supply/purchase/sum_list.vue
  62. 0 4
      src/views/supply/reserve/components/reserve_form.vue
  63. 0 2
      src/views/supply/reserve/reserve_list.vue
  64. 0 2
      src/views/supply/retail/components/retail_form.vue
  65. 0 2
      src/views/supply/retail/retail_list.vue
  66. 0 2
      src/views/supply/return/components/return_form.vue
  67. 0 2
      src/views/supply/return/online_list.vue
  68. 0 2
      src/views/supply/return/return_list.vue
  69. 0 2
      src/views/supply/sales/components/sales_return_form.vue
  70. 0 2
      src/views/supply/sales/sales_list.vue

+ 0 - 2
src/mixin/index.js

@@ -33,9 +33,7 @@ export default {
     },
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/basic_data/dealer/dealer_list.vue

@@ -166,9 +166,7 @@ export default {
     },
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/basic_data/stock/Issue_list.vue

@@ -290,9 +290,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/basic_data/stock/customer_product_list.vue

@@ -254,9 +254,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/basic_data/stock/material_list.vue

@@ -282,9 +282,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/basic_data/stock/product_list.vue

@@ -232,9 +232,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/basic_data/stock/product_list_customer.vue

@@ -224,9 +224,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/basic_data/stock/stock_fee_list.vue

@@ -480,9 +480,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/basic_data/stock/warehousing_list.vue

@@ -283,9 +283,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/deposit_commerce/refund_list.vue

@@ -863,9 +863,7 @@ export default {
     resetFn() {
       this.screenForm.startInstallTime = ''
       this.screenForm.endInstallTime = ''
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       // this.screenForm.endSpecification = "";
       // this.screenForm.endSpecialNo = "";
       // this.screenForm.endRefFactoryNo = "";

+ 0 - 2
src/views/deposit_home/refund_list.vue

@@ -908,9 +908,7 @@ export default {
     resetFn() {
       this.screenForm.startInstallTime = ''
       this.screenForm.endInstallTime = ''
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.getDataList({
         pageSize: this.pageSize,
         pageNum: 1,

+ 0 - 2
src/views/issue/index.vue

@@ -274,9 +274,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/merchant/merchant_list.vue

@@ -512,9 +512,7 @@ export default {
     },
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/notice/index.vue

@@ -453,9 +453,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/sales_region/sales_line.vue

@@ -239,9 +239,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/sales_region/sales_man.vue

@@ -258,9 +258,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/sales_region/sales_relation.vue

@@ -212,9 +212,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/setting/account.vue

@@ -691,9 +691,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/setting/api.vue

@@ -183,9 +183,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     }

+ 0 - 2
src/views/setting/components/log-examine.vue

@@ -187,9 +187,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/setting/components/log-login.vue

@@ -179,9 +179,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/setting/components/log-operation.vue

@@ -188,9 +188,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     }

+ 0 - 2
src/views/stock/reserved_stock.vue

@@ -236,9 +236,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/stock/stock_list.vue

@@ -342,9 +342,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/adjust/adjust_list.vue

@@ -325,9 +325,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/allot/allot_list.vue

@@ -293,9 +293,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/apply/apply_list.vue

@@ -725,9 +725,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/apply/components/apply_form.vue

@@ -600,9 +600,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.tableGoodsList = []
       // this.getGoodsList();

+ 0 - 2
src/views/supply/apply/components/apply_return_form.vue

@@ -647,9 +647,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       // this.tableGoodsList = [];
       this.getSalesGoodsList()

+ 0 - 2
src/views/supply/apply/components/engin_form.vue

@@ -808,9 +808,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.tableGoodsList = []
       // this.getGoodsList();

+ 0 - 2
src/views/supply/apply/components/engin_return_form.vue

@@ -814,9 +814,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       // this.tableGoodsList = [];
       this.getGoodsList()

+ 0 - 2
src/views/supply/apply/engin_list.vue

@@ -763,9 +763,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/apply/new_apply.vue

@@ -662,9 +662,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/apply/new_engin.vue

@@ -701,9 +701,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/deliver/commerce_list.vue

@@ -559,9 +559,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/deliver/deliver_list.vue

@@ -463,9 +463,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/deliver/home_list.vue

@@ -520,9 +520,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/deliver/sum_list.vue

@@ -1099,9 +1099,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/direct/direct_list.vue

@@ -434,9 +434,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/displace/components/displace_form.vue

@@ -1081,9 +1081,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getGoodsList()
     },

+ 0 - 2
src/views/supply/displace/displace_list copy.vue

@@ -381,9 +381,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/engin/commerce_list.vue

@@ -713,9 +713,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 1 - 3
src/views/supply/engin/components/commerce_form.vue

@@ -856,9 +856,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-      this.$nextTick(() => {
-        this.$refs.screenForm.resetFields()
-      })
+      this.$refs.screenForm.resetFields()
       this.dialogTable_currentPage = 1
       this.getComLoginList()
     },

+ 0 - 2
src/views/supply/engin/components/home_form.vue

@@ -1061,9 +1061,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.dialogTable_currentPage = 1
       this.getHomeLoginList()
     },

+ 0 - 2
src/views/supply/engin/engin_list.vue

@@ -670,9 +670,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/engin/home_list.vue

@@ -875,9 +875,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/implement/commercial_implement_list.vue

@@ -413,9 +413,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/implement/components/sales_return_form.vue

@@ -563,9 +563,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.tableGoodsList = []
       // this.getSalesGoodsList();

+ 0 - 2
src/views/supply/implement/implement_list.vue

@@ -648,9 +648,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/implement/implement_total_list.vue

@@ -667,9 +667,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/implement/nsales_list.vue

@@ -715,9 +715,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 34 - 12
src/views/supply/pickup/pickup_list.vue

@@ -27,8 +27,20 @@
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="仓库" prop="warehouse">
-                    <el-input v-model="screenForm.warehouse" placeholder="请输入仓库" />
+                  <el-form-item label="仓库" prop="correspondId">
+                    <el-select
+                      v-model="screenForm.correspondId"
+                      placeholder="请选择发货仓库"
+                      size="mini"
+                      style="margin-right: 10px"
+                    >
+                      <el-option
+                        v-for="(item, index) in warehouseList"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.id"
+                      />
+                    </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
@@ -66,7 +78,7 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
-:default-time="['00:00:00','23:59:59']"
+                      :default-time="['00:00:00', '23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -80,7 +92,7 @@
                     <el-date-picker
                       v-model="screenForm.printTime"
                       type="datetimerange"
-:default-time="['00:00:00','23:59:59']"
+                      :default-time="['00:00:00', '23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -299,7 +311,7 @@
 
 <script>
 import { getPickupList, cancelData, getPickupManList } from '@/api/supply/pickup'
-
+import { getWarehouseList } from '@/api/supply/engin'
 import PickupForm from '@/views/supply/pickup/components/pickup_form'
 
 export default {
@@ -318,7 +330,7 @@ export default {
         orderNum: '',
         jxsName: '',
         jxsNum: '',
-        warehouse: '',
+        correspondId: '',
         date: '',
         status: '',
         takerPhone: '',
@@ -331,7 +343,8 @@ export default {
       flag: false,
       isCollapse: true,
       queryItem: {},
-      isShowForm: false
+      isShowForm: false,
+      warehouseList: []
     }
   },
 
@@ -344,7 +357,7 @@ export default {
         invoiceId: this.screenForm.orderNum,
         customerName: this.screenForm.jxsName,
         customerNumber: this.screenForm.jxsNum,
-        stockName: this.screenForm.warehouse,
+        correspondId: this.screenForm.correspondId,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         status: this.screenForm.status,
@@ -360,10 +373,21 @@ export default {
 
   created() {
     this.getList()
+    this.getWarehouseList()
     this.getPickupManList()
   },
 
   methods: {
+    // 获取仓库列表
+    getWarehouseList() {
+      getWarehouseList({
+        pageNum: 1,
+        pageSize: -1
+      }).then(res => {
+        this.warehouseList = res.data.records
+      })
+    },
+
     // 查询按钮权限
     checkBtnRole(value) {
       // let btnRole = this.$route.meta.roles;
@@ -387,7 +411,7 @@ export default {
         invoiceId: this.screenForm.orderNum,
         customerName: this.screenForm.jxsName,
         customerNumber: this.screenForm.jxsNum,
-        stockName: this.screenForm.warehouse,
+        correspondId: this.screenForm.correspondId,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         status: this.screenForm.status,
@@ -414,9 +438,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
-        this.$refs.screenForm.resetFields()
-      })
+      this.$refs.screenForm.resetFields()
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/pickup/sum_list.vue

@@ -359,9 +359,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/policy/components/policy_list.vue

@@ -399,9 +399,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/policy/components/retail_form.vue

@@ -1713,9 +1713,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getGoodsList()
     },

+ 0 - 2
src/views/supply/policy/components/retail_form2.vue

@@ -1062,9 +1062,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getGoodsList()
     },

+ 0 - 2
src/views/supply/policy/policy_list.vue

@@ -771,9 +771,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/purchase/enter_list.vue

@@ -313,9 +313,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/purchase/plan_list.vue

@@ -251,9 +251,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/purchase/purchase_list.vue

@@ -326,9 +326,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/purchase/sum_list.vue

@@ -297,9 +297,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 4
src/views/supply/reserve/components/reserve_form.vue

@@ -695,9 +695,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.dialogGoodsList = []
       this.getGoodsList()
@@ -714,9 +712,7 @@ export default {
 
     // 关闭 弹窗
     closeDialog() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.isShowDialog = false
     },
 

+ 0 - 2
src/views/supply/reserve/reserve_list.vue

@@ -472,9 +472,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/retail/components/retail_form.vue

@@ -910,9 +910,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getGoodsList()
     },

+ 0 - 2
src/views/supply/retail/retail_list.vue

@@ -722,9 +722,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/return/components/return_form.vue

@@ -487,9 +487,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.tableGoodsList = []
       // this.getGoodsList();

+ 0 - 2
src/views/supply/return/online_list.vue

@@ -291,9 +291,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/return/return_list.vue

@@ -286,9 +286,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },

+ 0 - 2
src/views/supply/sales/components/sales_return_form.vue

@@ -576,9 +576,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.tableGoodsList = []
       // this.getSalesGoodsList();

+ 0 - 2
src/views/supply/sales/sales_list.vue

@@ -759,9 +759,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$nextTick(()=>{
         this.$refs.screenForm.resetFields()
-      })
       this.currentPage = 1
       this.getList()
     },