chenrui 3 anni fa
parent
commit
cea3f0b218

+ 4 - 0
src/views/allocationManagement/chainTransferIn/edit.vue

@@ -81,6 +81,7 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :dataSource="loadData"
+          :loading="loading"
           :scroll="{ x: 1415 }"
           bordered>
           <!-- 仓库仓位 -->
@@ -134,6 +135,7 @@ export default {
         productTypeSn3: '' //  产品分类3
       },
       disabled: false, //  查询、重置按钮是否可操作
+      loading: false, //  表格加载中
       productTypeList: [], //  产品分类  下拉数据
       productType: [],
       warehouseCascadeData: [], //  仓库仓位
@@ -202,9 +204,11 @@ export default {
     // 产品列表数据
     getProductList (pageNo) {
       this.disabled = true
+      this.loading = true
       this.pageNo = pageNo || this.pageNo
       const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam, { allocationLinkagePutSn: this.$route.params.sn })
       allocLinkagePutDetailList(params).then(res => {
+        this.loading = false
         if (res.status == 200) {
           this.getDetailCount(params)
           const data = res.data

+ 4 - 0
src/views/allocationManagement/chainTransferOut/edit.vue

@@ -97,6 +97,7 @@
               :columns="columns"
               :customRow="handleClickRow"
               :dataSource="loadData"
+              :loading="loading"
               :scroll="{ x: 1680, y: 300 }"
               bordered>
               <!-- 调出数量 -->
@@ -222,6 +223,7 @@ export default {
       productType: [],
       warehouseList: [], //  仓库  下拉数据
       disabled: false, //  查询、重置按钮是否可操作
+      loading: false, //  表格加载中
       chooseDisabled: false,
       advanced: false, // 高级搜索 展开/关闭
       // 表头
@@ -432,11 +434,13 @@ export default {
     // 产品列表数据
     getProductList (pageNo) {
       this.disabled = true
+      this.loading = true
       this.pageNo = pageNo || this.pageNo
       // 箭冠品牌 sysFlag传1,非箭冠品牌传0。与新增时所选调出产品类型有关
       this.queryParam.sysFlag = this.basicInfoData.allocationType == 'JIANGUAN' ? '1' : '0'
       const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
       productQuery(params).then(res => {
+        this.loading = false
         if (res.status == 200) {
           const data = res.data
           this.paginationProps.total = Number(res.data.count) || 0

+ 4 - 0
src/views/allocationManagement/storeTransferOut/edit.vue

@@ -151,6 +151,7 @@
               :rowKey="(record) => record.id"
               :columns="chooseColumns"
               :dataSource="chooseLoadData"
+              :loading="loading"
               :scroll="{ x: 1335, y: 300 }"
               :pagination="choosePaginationProps"
               bordered>
@@ -218,6 +219,7 @@ export default {
         productName: ''
       },
       disabled: false, //  查询、重置按钮是否可操作
+      loading: false, //  表格加载中
       chooseDisabled: false, //  查询、重置按钮是否可操作
       advanced: false, // 高级搜索 展开/关闭
       productBrandList: [], //  产品品牌  下拉数据
@@ -461,12 +463,14 @@ export default {
     getChooseProductList (pageNo) {
       this.choosePageNo = this.choosePageNo || pageNo
       this.chooseDisabled = true
+      this.loading = true
       const params = {
         pageNo: this.choosePageNo,
         pageSize: this.choosePageSize,
         storeCallOutSn: this.$route.params.sn
       }
       storeCallOutDetailList(Object.assign(params, this.chooseQueryParam)).then(res => {
+        this.loading = false
         if (res.status == 200) {
           //  合计
           this.getDetailCount(Object.assign(params, this.chooseQueryParam))

+ 2 - 0
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -34,6 +34,7 @@
               :columns="chooseColumns"
               :dataSource="chooseLoadData"
               :scroll="{ x: 1040, y: 300 }"
+              :loading="loading"
               :pagination="false"
               bordered>
               <!-- 序号 -->
@@ -154,6 +155,7 @@ export default {
   data () {
     return {
       spinning: false,
+      loading: false, //  表格加载中
       chooseQueryParam: {
         productCode: '',
         productName: ''

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

@@ -83,7 +83,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button type="primary" v-if="$hasPermissions('B_inventoryWarningBatchSave')" id="inventoryWarningList-update" :loading="loading" @click="handleupdate">批量更新</a-button>
+        <a-button type="primary" v-if="$hasPermissions('B_inventoryWarningBatchSave')" id="inventoryWarningList-update" @click="handleupdate">批量更新</a-button>
         <span style="margin-left: 8px" v-if="$hasPermissions('B_inventoryWarningBatchSave')">
           <template v-if="hasSelected">{{ `已选 ${selectedRowKeys.length} 项` }}</template>
         </span>
@@ -99,6 +99,7 @@
         :dataSource="loadData"
         :scroll="{ x: 2200, y: tableHeight }"
         :pagination="paginationProps"
+        :loading="loading"
         bordered>
         <!-- 产品分类 -->
         <template slot="productType" slot-scope="text, record">
@@ -249,9 +250,11 @@ export default {
         this.tableHeight = window.innerHeight - 380
       }
       this.disabled = true
+      this.loading = true
       this.pageNo = pageNo || this.pageNo
       const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
       stockWarnList(params).then(res => {
+        this.loading = false
         if (res.status == 200) {
           const data = res.data
           this.paginationProps.total = Number(res.data.count) || 0