Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!428

src/utils/init.js

@@ -50,5 +50,5 @@ export const initDicts = (prop) => {
 };
 
 export const initPage = () => {
-  return { pageNum: 1, pageSize: 100, total: 0 };
+  return { pageNum: 1, pageSize: 50, total: 0 };
 };

src/views/material/basicFile/index.vue

@@ -242,7 +242,7 @@
         // 查询参数
         queryParams: {
           pageNum: 1,
-          pageSize: 100,
+          pageSize: 50,
           code: null,
           name: null
         },

src/views/material/changeApply/index.vue

@@ -99,7 +99,7 @@ export default {
       size:'mini',
       tableList: [],
       TableColumns:TableColumns,
-      page: { pageNum: 1, pageSize: 100, total: 0 },
+      page: { pageNum: 1, pageSize: 50, total: 0 },
       params:params,
       SearchColumns:SearchColumns,
       optionType:'add',

src/views/material/requisition/index.vue

@@ -156,7 +156,7 @@
         params:params,
         SearchColumns:SearchColumns,
         TableColumns:TableColumns,
-        pageStatus: { pageNum: 1, pageSize: 100, total: 0 },
+        pageStatus: { pageNum: 1, pageSize: 50, total: 0 },
         queryParams: {
           billCode: '',
           name: '',

src/views/purchase/DemandSummary/index.vue

@@ -379,7 +379,7 @@
           @current-change="handleCurrentChange"
           :current-page="queryParams.pageNum"
           :page-sizes="[10, 20, 50, 100, 200, 500]"
-          :page-size="100"
+          :page-size="50"
           layout="total, sizes, prev, pager, next, jumper"
           :total=total>
         </el-pagination>
@@ -502,7 +502,7 @@ export default {
         isCustomerSpecified: '',
         isUrgency: '',
         pageNum: 1,
-        pageSize: 100
+        pageSize: 50
       },
       personOptions: [],
       classOptions: [],
@@ -604,7 +604,7 @@ export default {
         isCustomerSpecified: '',
         isUrgency: '',
         pageNum: 1,
-        pageSize: 100
+        pageSize: 50
       }
       this.getList(this.queryParams)
     },

src/views/purchase/PurchaseDemandList/index.vue

@@ -221,7 +221,7 @@
           @current-change="handleCurrentChange"
           :current-page="queryParams.pageNum"
           :page-sizes="[10, 20, 50, 100, 200, 500]"
-          :page-size="100"
+          :page-size="50"
           layout="total, sizes, prev, pager, next, jumper"
           :total=total>
         </el-pagination>
@@ -382,7 +382,7 @@ export default {
         materialCode: '',
         status: '',
         pageNum: 1,
-        pageSize: 100
+        pageSize: 50
       },
       referCondition: {
         type: '',
@@ -483,7 +483,7 @@ export default {
         materialCode: '',
         status: '',
         pageNum: 1,
-        pageSize: 100
+        pageSize: 50
       }
       this.getList(this.queryParams)
     },

src/views/purchase/apply/columns.js

@@ -2,7 +2,7 @@ import CONFIG from "@/config";
 
 export default function useColumns() {
   const TableColumns = [
-    { item: { key: "priceCode", title: "价格编码1", width: 150 }, attr: {} },
+    { item: { key: "priceCode", title: "价格编码", width: 150 }, attr: {} },
     {
       item: { key: "status", title: "状态", width: 100 },
       attr: { is: "el-dict-tag", dictName: "sys_status", width: 100 },

src/views/purchase/catalogue/index.vue

@@ -25,7 +25,7 @@ export default {
       selectData: [],
       TableColumns: TableColumns,
       SearchColumns: SearchColumns,
-      page: { pageNum: 1, pageSize: 20, total: 0 },
+      page: { pageNum: 1, pageSize: 50, total: 0 },
     };
   },
   computed: {},

src/views/purchase/transferOrder/index.vue

@@ -146,7 +146,7 @@
           @current-change="handleCurrentChange"
           :current-page="queryParams.pageNum"
           :page-sizes="[10, 20, 50, 100, 200, 500]"
-          :page-size="100"
+          :page-size="50"
           layout="total, sizes, prev, pager, next, jumper"
           :total=total>
         </el-pagination>
@@ -359,7 +359,7 @@ export default {
         code: this.$route.query.billCode,
         createBy:'',
         pageNum: 1,
-        pageSize: 100
+        pageSize: 50
       },
       //单据日期查询范围
       dateRange:[],
@@ -464,7 +464,7 @@ export default {
         code: '',
         createBy:'',
         pageNum: 1,
-        pageSize: 100
+        pageSize: 50
       }
       this.getList(this.queryParams)
     },