Browse Source

Merge branch 'deploy' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy

lilei 4 years ago
parent
commit
39889348b7

+ 5 - 1
src/views/financialManagement/financialCollection/list.vue

@@ -65,7 +65,7 @@
       </div>
       </div>
     </a-alert>
     </a-alert>
     <div style="margin-bottom: 15px">
     <div style="margin-bottom: 15px">
-      <a-button type="primary" id="financialCollectionList-export" :disabled="!hasSelected" :loading="loading" @click="handleCollection">批量收款</a-button>
+      <a-button type="primary" id="financialCollectionList-export" :loading="loading" @click="handleCollection">批量收款</a-button>
       <span style="margin-left: 8px">
       <span style="margin-left: 8px">
         <template v-if="hasSelected">
         <template v-if="hasSelected">
           {{ `已选 ${selectedRowKeys.length} 项` }}
           {{ `已选 ${selectedRowKeys.length} 项` }}
@@ -310,6 +310,10 @@ export default {
     },
     },
     // 批量收款
     // 批量收款
     handleCollection () {
     handleCollection () {
+      if (this.selectedRowKeys.length < 1) {
+        this.$message.warning('请在列表勾选后再进行批量操作!')
+        return
+      }
       this.loading = true
       this.loading = true
       settleReceiptMoney({ settleChangeIds: this.selectedRowKeys }).then(res => {
       settleReceiptMoney({ settleChangeIds: this.selectedRowKeys }).then(res => {
         this.loading = false
         this.loading = false

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

@@ -64,7 +64,7 @@
       </div>
       </div>
     </a-alert>
     </a-alert>
     <div style="margin-bottom: 15px">
     <div style="margin-bottom: 15px">
-      <a-button type="primary" id="finacialPay-export" :disabled="!hasSelected" :loading="loading" @click="handlePayment">批量付款</a-button>
+      <a-button type="primary" id="finacialPay-export" :loading="loading" @click="handlePayment">批量付款</a-button>
       <span style="margin-left: 8px">
       <span style="margin-left: 8px">
         <template v-if="hasSelected">
         <template v-if="hasSelected">
           {{ `已选 ${selectedRowKeys.length} 项` }}
           {{ `已选 ${selectedRowKeys.length} 项` }}
@@ -310,6 +310,10 @@ export default {
     },
     },
     // 批量付款
     // 批量付款
     handlePayment () {
     handlePayment () {
+      if (this.selectedRowKeys.length < 1) {
+        this.$message.warning('请在列表勾选后再进行批量操作!')
+        return
+      }
       this.loading = true
       this.loading = true
       settlePayMoney({ settleChangeIds: this.selectedRowKeys }).then(res => {
       settlePayMoney({ settleChangeIds: this.selectedRowKeys }).then(res => {
         this.loading = false
         this.loading = false

+ 2 - 1
src/views/financialManagement/warehousingAudit/list.vue

@@ -153,7 +153,8 @@ export default {
           this.getTotal(params)
           this.getTotal(params)
           return data
           return data
         })
         })
-      }
+      },
+      productTotal: null
     }
     }
   },
   },
   methods: {
   methods: {

+ 5 - 1
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -81,7 +81,7 @@
     </div>
     </div>
     <!-- 操作按钮 -->
     <!-- 操作按钮 -->
     <div class="table-operator">
     <div class="table-operator">
-      <a-button type="primary" id="inventoryWarningList-update" :disabled="!hasSelected" :loading="loading" @click="handleupdate">批量更新</a-button>
+      <a-button type="primary" id="inventoryWarningList-update" :loading="loading" @click="handleupdate">批量更新</a-button>
       <span style="margin-left: 8px">
       <span style="margin-left: 8px">
         <template v-if="hasSelected">{{ `已选 ${selectedRowKeys.length} 项` }}</template>
         <template v-if="hasSelected">{{ `已选 ${selectedRowKeys.length} 项` }}</template>
       </span>
       </span>
@@ -326,6 +326,10 @@ export default {
     },
     },
     //  批量更新
     //  批量更新
     handleupdate () {
     handleupdate () {
+      if (this.selectedRowKeys.length < 1) {
+        this.$message.warning('请在列表勾选后再进行批量操作!')
+        return
+      }
       const _this = this
       const _this = this
       this.$confirm({
       this.$confirm({
         title: '提示',
         title: '提示',

+ 4 - 0
src/views/salesManagement/outboundOrder/list.vue

@@ -256,6 +256,10 @@ export default {
     },
     },
     // 批量出库
     // 批量出库
     handleOutbounds () {
     handleOutbounds () {
+      if (this.selectedRowKeys.length < 1) {
+        this.$message.warning('请在列表勾选后再进行批量操作!')
+        return
+      }
       this.loading = true
       this.loading = true
       // ajax request after empty completing
       // ajax request after empty completing
       setTimeout(() => {
       setTimeout(() => {