Merge branch 'dev' of http://git.echepei.com/tubao/Smart_platform_ui into dev

src/api/financialManagement/paymentRequest.js

@@ -91,7 +91,8 @@ export const paymentCheck = (data) => {
 //账单明细列表
 export function getBillList(current,size,params) {
   return request({
-    url: '/api/trade-finance/acc/list',
+    // url: '/api/trade-finance/acc/list',
+    url: '/api/trade-finance/acc/billList',
     method: 'get',
     params: {
       ...params,

src/components/bill/config/application.json

@@ -9,7 +9,6 @@
   "cellBtn":false,
   "cancelBtn":false,
   "refreshBtn": false,
-  "searchBtn": false,
   "searchMenuPosition": "right",
   "searchMenuSpan": 24,
   "searchSpan": 8,

src/views/InventoryManagement/inventory/index.vue

@@ -276,7 +276,7 @@ export default {
       let data = this.deepClone(Object.assign({}, params, this.search2));
       delete data.stockTime;
       data.billType = "RK"
-      data.status = 3
+      data.statuss = 5
       this.loading2 = true;
       data.pdStatus = 'PD'
       getList(page.currentPage, page.pageSize, data)

src/views/maintenance/overpayment/config/mainList.json

@@ -21,7 +21,7 @@
   "column": [
     {
       "label": "编码",
-      "prop": "code",
+      "prop": "corpCode",
       "search": true,
       "index": 1,
       "minWidth": 80,

src/views/purchasingManagement/inStock/config/customerContact.json

@@ -29,7 +29,12 @@
     {
       "name": "balanceNumber",
       "type": "sum",
-      "decimals": 2
+      "decimals": 3
+    },
+    {
+      "name": "inventory",
+      "type": "sum",
+      "decimals": 3
     },
     {
       "name": "balanceMoney",

src/views/salesManagement/outStock/config/mainList.json

@@ -19,12 +19,12 @@
     {
       "name": "storageQuantity",
       "type": "sum",
-      "decimals": 2
+      "decimals": 3
     },
     {
       "name": "purchaseQuantity",
       "type": "sum",
-      "decimals": 2
+      "decimals": 3
     },
     {
       "name": "storageAmount",