Browse Source

批量bug处理

lilei 3 years ago
parent
commit
4c8b6f4e47

+ 1 - 1
public/version.json

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

+ 4 - 4
src/config/router.config.js

@@ -501,24 +501,24 @@ export const asyncRouterMap = [
           {
             path: '/numsGoodsShelves/withdrawalManagement',
             redirect: '/numsGoodsShelves/withdrawalManagement/list',
-            name: 'withdrawalManagement',
+            name: 'ngsWithdrawalManagement',
             component: BlankLayout,
             meta: {
               title: '提现管理',
               icon: 'monitor',
-              permission: 'M_withdrawalManagement'
+              permission: 'M_NGS_withdrawalManagement'
             },
             hideChildrenInMenu: true,
             children: [
               {
                 path: 'list',
-                name: 'withdrawalManagementList',
+                name: 'ngsWithdrawalManagementList',
                 component: () => import(/* webpackChunkName: "numsGoodsShelves" */ '@/views/numsGoodsShelves/withdrawalManagement/list.vue'),
                 meta: {
                   title: '提现管理列表',
                   icon: 'monitor',
                   hidden: true
-                  // permission: 'M_salesQueryList'
+                  // permission: 'M_ngsWithdrawalManagementList'
                 }
               }
             ]

+ 3 - 2
src/views/common/outInDetialModal.vue

@@ -78,9 +78,10 @@ export default {
         if (this.outBizType == 'SHOP_CALL_OUT') {
           queryParams.outBizSn = params.storeCallOutSn
           queryParams.outBizNo = params.storeCallOutNo
-          queryParams.warehouseSn = params.warehouseSn
-          queryParams.warehouseLocationSn = params.warehouseLocationSn
         }
+        // 仓库仓位
+        queryParams.warehouseSn = params.warehouseSn
+        queryParams.warehouseLocationSn = params.warehouseLocationSn
         return stockOutDetailList(queryParams).then(res => {
           let data
           if (res.status == 200) {

+ 8 - 2
src/views/financialManagement/financialCollection/list.vue

@@ -48,7 +48,7 @@
             </template>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
-                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="financialCollectionList-refresh">查询</a-button>
+                <a-button type="primary" @click="searchForm()" :disabled="disabled" id="financialCollectionList-refresh">查询</a-button>
                 <a-button style="margin-left: 5px" @click="resetSearchForm()" :disabled="disabled" id="financialCollectionList-reset">重置</a-button>
                 <a @click="advanced = !advanced" style="margin-left: 5px">
                   {{ advanced ? '收起' : '展开' }}
@@ -396,12 +396,18 @@ export default {
       this.resetData()
       this.$refs.table.refresh(true)
     },
-    // 重置数据
+    // 查询
+    searchForm () {
+      this.$refs.table.clearSelected() // 清空表格选中项
+      this.$refs.table.refresh(true)
+    },
+    // 重置查询条件数据
     resetData () {
       if (this.advanced) {
         this.$refs.rangeDate.resetDate()
         // this.$refs.createDate.resetDate()
       }
+      this.$refs.table.clearSelected() // 清空表格选中项
       this.queryParam = {
         bizType: this.curBizType,
         settleNo: '',

+ 7 - 1
src/views/financialManagement/financialPayment/list.vue

@@ -47,7 +47,7 @@
             </template>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
-                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="finacialPay-refresh">查询</a-button>
+                <a-button type="primary" @click="searchForm()" :disabled="disabled" id="finacialPay-refresh">查询</a-button>
                 <a-button style="margin-left: 5px" @click="resetSearchForm()" :disabled="disabled" id="finacialPay-reset">重置</a-button>
                 <a @click="advanced = !advanced" style="margin-left: 5px">
                   {{ advanced ? '收起' : '展开' }}
@@ -331,6 +331,11 @@ export default {
         }
       })
     },
+    // 查询
+    searchForm () {
+      this.$refs.table.clearSelected() // 清空表格选中项
+      this.$refs.table.refresh(true)
+    },
     //  重置
     resetSearchForm () {
       this.resetData()
@@ -342,6 +347,7 @@ export default {
         this.$refs.rangeDate.resetDate()
         // this.$refs.createDate.resetDate()
       }
+      this.$refs.table.clearSelected() // 清空表格选中项
       this.queryParam = {
         bizType: this.curBizType,
         settleNo: '',

+ 8 - 2
src/views/inventoryManagement/inventoryChecking/selfDisk.vue

@@ -32,7 +32,7 @@
               <a-button size="small" type="primary" class="button-info" @click.stop="handleBatchAdd('batch')" id="chainTransferOutEdit-del-all-btn">批量添加</a-button>
             </a-col>
             <a-col :md="20" :sm="24">
-              <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+              <a-form layout="inline" @keyup.enter.native="searchForm">
                 <a-row :gutter="15">
                   <a-col :md="6" :sm="24">
                     <a-form-item label="产品编码" prop="productCode">
@@ -64,7 +64,7 @@
                     </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="inventoryCheckSelfDiskList-refresh">查询</a-button>
+                    <a-button type="primary" @click="searchForm" :disabled="disabled" id="inventoryCheckSelfDiskList-refresh">查询</a-button>
                     <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryCheckSelfDiskList-reset">重置</a-button>
                     <a @click="advanced=!advanced" style="margin-left: 5px">
                       {{ advanced ? '收起' : '展开' }}
@@ -348,8 +348,14 @@ export default {
     rowChooseSelectionFun (obj) {
       this.rowChooseSelectionInfo = obj || null
     },
+    // 查询
+    searchForm () {
+      this.$refs.table.clearSelected() // 清空表格选中项
+      this.$refs.table.refresh(true)
+    },
     //  重置
     resetSearchForm () {
+      this.$refs.table.clearSelected() // 清空表格选中项
       this.queryParam.productCode = ''
       this.queryParam.productName = ''
       this.queryParam.warehouseSn = undefined

+ 8 - 2
src/views/outboundOrderManagement/outboundOrder/list.vue

@@ -39,8 +39,8 @@
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="6" :md="6" :sm="8">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="outboundOrderList-refresh" style="margin-bottom: 10px;">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="outboundOrderList-reset">重置</a-button>
+              <a-button type="primary" @click="searchForm()" :disabled="disabled" id="outboundOrderList-refresh" style="margin-bottom: 10px;">查询</a-button>
+              <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="outboundOrderList-reset">重置</a-button>
             </a-col>
           </a-row>
         </a-form>
@@ -230,6 +230,11 @@ export default {
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     },
+    // 查询
+    searchForm () {
+      this.$refs.table.clearSelected() // 清空表格选中项
+      this.$refs.table.refresh(true)
+    },
     //  重置
     resetSearchForm () {
       this.resetData()
@@ -237,6 +242,7 @@ export default {
     },
     // 重置数据
     resetData (flag) {
+      this.$refs.table.clearSelected()
       this.$refs.rangeDate.resetDate(flag ? '' : this.time)
       this.queryParam.beginDate = flag ? '' : getDate.getCurrMonthDays().starttime
       this.queryParam.endDate = flag ? '' : getDate.getCurrMonthDays().endtime

+ 7 - 2
src/views/productManagement/productInfo/list.vue

@@ -32,8 +32,8 @@
               </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="productInfoList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productInfoList-reset">重置</a-button>
+              <a-button type="primary" @click="searchForm()" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm()" :disabled="disabled" id="productInfoList-reset">重置</a-button>
               <!-- <a-button
                 style="margin: 0 0 18px 8px"
                 type="danger"
@@ -282,6 +282,11 @@ export default {
     }
   },
   methods: {
+    // 查询
+    searchForm () {
+      this.$refs.table.clearSelected() // 清空表格选中项
+      this.$refs.table.refresh(true)
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.code = ''

+ 6 - 1
src/views/productManagement/productInfoJg/list.vue

@@ -38,7 +38,7 @@
             </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="productInfoList-refresh">查询</a-button>
+            <a-button type="primary" @click="searchForm" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productInfoList-reset">重置</a-button>
             <a @click="advanced=!advanced" style="margin-left: 5px">
               {{ advanced ? '收起' : '展开' }}
@@ -194,6 +194,11 @@ export default {
     handleDetail (row) {
       this.$router.push({ name: 'viewProduct', params: { sn: row.productSn } })
     },
+    // 查询
+    searchForm () {
+      this.$refs.table.clearSelected() // 清空表格选中项
+      this.$refs.table.refresh(true)
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.code = ''