Prechádzať zdrojové kódy

修改字段 添加loading

Qukatie 8 mesiacov pred
rodič
commit
51b5b79c78

+ 7 - 3
src/views/tirePartsMall/financialManagement/purchaseDetail/index.vue

@@ -1,6 +1,6 @@
 <template>
     <basic-container>
-        <avue-crud :key="key" ref="crud" :option="option" :data="data" :search.sync="query" @on-load="onLoad"
+        <avue-crud :key="key" ref="crud" :option="option" :data="data" :search.sync="query" @on-load="onLoad"  :table-loading="loading"
             @search-reset="resetChange" :page.sync="page" :cell-style="cellStyle" @search-change="searchChange"
             @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 337.2)"
             @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 337.2)">
@@ -8,9 +8,9 @@
                 <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
             </template>
             <template slot="header">
-                <el-table :data="commodityData" border size="small" @header-click="cellClick" style="width: 100%">
+                <el-table :data="commodityData" border size="small" @header-click="cellClick" style="width: 100%"  v-loading="loading">
                     <el-table-column v-for="(item, index) in commodityLabel" :key="index" :prop="item.prop"
-                        show-overflow-tooltip :label="item.label" />
+                        show-overflow-tooltip :label="item.label"/>
                 </el-table>
             </template>
             <!-- <template slot="customerNameSearch">
@@ -91,6 +91,7 @@ export default {
     components: { SearchQuery },
     data() {
         return {
+            loading:false,
             key: 0,
             data: [],
             total: [],
@@ -465,6 +466,7 @@ export default {
                 // }
             ],
         }
+        
     },
     async created() {
         this.option = await this.getColumnData(this.getColumnName(337.2), this.optionList);
@@ -590,6 +592,7 @@ export default {
                 bsType: 'CG,TKCG',
                 ...Object.assign(params, this.query)
             }
+            this.loading = true;
             statisticsSaleDetail(queryParams).then(res => {
                 this.data = res.data.data.records
                 this.page.total = res.data.data.total
@@ -603,6 +606,7 @@ export default {
                 })
             }).finally(() => {
                 this.$refs.crud.doLayout();
+                this.loading = false;
             })
         },
         //自定义列保存

+ 5 - 2
src/views/tirePartsMall/financialManagement/saleDetail/index.vue

@@ -1,6 +1,6 @@
 <template>
     <basic-container>
-        <avue-crud :key="key" ref="crud" :option="option" :data="data" :search.sync="query" @on-load="onLoad"
+        <avue-crud :key="key" ref="crud" :option="option" :data="data" :search.sync="query" @on-load="onLoad" :table-loading="loading"
             @search-reset="resetChange" :page.sync="page" :cell-style="cellStyle" @search-change="searchChange"
             @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 337)"
             @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 337)">
@@ -8,7 +8,7 @@
                 <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
             </template>
             <template slot="header">
-                <el-table :data="commodityData" border size="small" @header-click="cellClick" style="width: 100%">
+                <el-table :data="commodityData" border size="small" @header-click="cellClick" style="width: 100%"  v-loading="loading">
                     <el-table-column v-for="(item, index) in commodityLabel" :key="index" :prop="item.prop"
                         show-overflow-tooltip :label="item.label" />
                 </el-table>
@@ -95,6 +95,7 @@ export default {
     components: { SearchQuery },
     data() {
         return {
+            loading:false,
             key: 0,
             data: [],
             total: [],
@@ -487,6 +488,7 @@ export default {
                 current: page.currentPage,
                 ...Object.assign(params, this.query)
             }
+            this.loading = true;
             statisticsSaleDetail(queryParams).then(res => {
                 this.data = res.data.data.records
                 this.page.total = res.data.data.total
@@ -504,6 +506,7 @@ export default {
                 })
             }).finally(() => {
                 this.$refs.crud.doLayout();
+                this.loading = false;
             })
         },
         //自定义列保存

+ 11 - 2
src/views/tirePartsMall/purchasingManagement/financingProcurement/detailsPage.vue

@@ -620,7 +620,7 @@ export default {
                 //     disabled: true
                 // },
                 {
-                    label: '金额',
+                    label: '订单金额',
                     prop: "totalMoney",
                     disabled: true
                 },
@@ -961,7 +961,16 @@ export default {
                         addDisplay: false
                     },
                     {
-                        label: '收货数量',
+                        label: '订单金额',
+                        prop: "primaryGoodsTotalAmount",
+                        overHidden: true,
+                        width: 100,
+                        disabled: true,
+                        editDisplay: false,
+                        addDisplay: false
+                    },
+                    {
+                        label: '入库数量',
                         prop: 'sendNum',
                         overHidden: true,
                         width: 100,

+ 4 - 11
src/views/tirePartsMall/purchasingManagement/financingProcurement/index.vue

@@ -384,12 +384,12 @@ export default {
             prop: "primaryGoodsTotalNum",
             overHidden: true,
           }, {
-            label: '总数量',
-            prop: "goodsTotalNum",
+            label: '订单金额',
+            prop: "totalMoney",
             overHidden: true,
           }, {
-            label: '总金额',
-            prop: "totalMoney",
+            label: '总数量',
+            prop: "goodsTotalNum",
             overHidden: true,
           }, {
             label: '配资比例',
@@ -503,13 +503,6 @@ export default {
             overHidden: true,
           },
           {
-            label: '原融资金额',
-            prop: "primaryFundingAmount",
-            search: true,
-            width: 100,
-            overHidden: true,
-          },
-          {
             label: "制单人",
             prop: "createUserName",
             searchProp: "createUser",