修改bug

src/views/businessManagement/deliveryNotice/configuration/mainList.json

@@ -46,7 +46,7 @@
       "label": "客户名称",
       "prop": "corpId",
       "search": true,
-      "index": 1,
+      "index": 2,
       "width": 100,
       "overHidden": true
     },
@@ -54,7 +54,7 @@
       "label": "所属公司",
       "prop": "salesCompany",
       "search": true,
-      "index": 4,
+      "index": 3,
       "width": 100,
       "overHidden": true
     },
@@ -67,7 +67,7 @@
       "label": "出库日期",
       "prop": "businessDate",
       "search": true,
-      "index": 8,
+      "index": 4,
       "width": 100,
       "pickerOptions": {},
       "overHidden": true
@@ -76,7 +76,7 @@
       "label": "仓库",
       "prop": "storageId",
       "search": true,
-      "index": 6,
+      "index": 5,
       "width": 100,
       "overHidden": true
     },
@@ -84,7 +84,7 @@
       "label": "出库数量",
       "prop": "totalQuantity",
       "search": false,
-      "index": 8,
+      "index": 6,
       "width": 100,
       "overHidden": true
     },
@@ -92,7 +92,7 @@
       "label": "出库金额",
       "prop": "deliveryAmount",
       "search": false,
-      "index": 8,
+      "index": 7,
       "width": 100,
       "overHidden": true
     },
@@ -100,7 +100,7 @@
       "label": "收货地址",
       "prop": "arrivalAddress",
       "search": true,
-      "index": 14,
+      "index": 8,
       "width": 100,
       "overHidden": true
     },
@@ -108,7 +108,7 @@
       "label": "收货人",
       "prop": "arrivalContact",
       "search": true,
-      "index": 14,
+      "index": 9,
       "width": 100,
       "overHidden": true
     },
@@ -116,7 +116,7 @@
       "label": "收货电话",
       "prop": "arrivalTel",
       "search": true,
-      "index": 14,
+      "index": 10,
       "width": 100,
       "overHidden": true
     },
@@ -130,7 +130,7 @@
       "label": "制单人",
       "prop": "createUser",
       "search": true,
-      "index": 14,
+      "index": 11,
       "width": 100,
       "overHidden": true
     },
@@ -141,7 +141,7 @@
       "searchRange": true,
       "prop": "createTime",
       "search": true,
-      "index": 15,
+      "index": 12,
       "width": 100,
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -152,7 +152,7 @@
       "label": "系统编号",
       "prop": "sysNo",
       "search": false,
-      "index": 1,
+      "index": 13,
       "width": 100,
       "overHidden": true
     },
@@ -160,7 +160,23 @@
       "label": "匹配订单号",
       "prop": "srcOrderNo",
       "search": false,
-      "index": 5,
+      "index": 14,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "更改人",
+      "prop": "updateUserName",
+      "search": false,
+      "index": 15,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "更改时间",
+      "prop": "updateTime",
+      "search": false,
+      "index": 16,
       "width": 100,
       "overHidden": true
     }

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -72,7 +72,7 @@
     <div class="customer-main">
       <el-form :model="form" ref="form" label-width="130px" class="demo-ruleForm">
         <containerTitle title="基础资料"></containerTitle>
-        <basic-container style="margin-bottom: 10px">
+        <basic-container>
           <el-row>
             <el-col v-for="(item,index) in basicData.column" :key="index" :span="item.span?item.span:8">
               <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
@@ -129,7 +129,7 @@
           </el-row>
         </basic-container>
         <containerTitle title="商品信息"></containerTitle>
-        <basic-container style="margin-bottom: 10px">
+        <basic-container>
           <avue-crud
               :option="customerContact"
               v-model="contactsForm"

src/views/businessManagement/inventoryAccount/configuration/mainList.json

@@ -33,7 +33,7 @@
       "label": "名称",
       "prop": "cname",
       "search": true,
-      "index": 1,
+      "index": 2,
       "width": 100,
       "overHidden": true
     },
@@ -41,7 +41,7 @@
       "label": "花纹",
       "prop": "brandItem",
       "search": true,
-      "index": 1,
+      "index": 3,
       "width": 100,
       "overHidden": true
     },
@@ -49,7 +49,7 @@
       "label": "产地",
       "prop": "placeProduction",
       "search": true,
-      "index": 1,
+      "index": 4,
       "width": 100,
       "overHidden": true
     },
@@ -57,7 +57,7 @@
       "label": "规格",
       "prop": "typeno",
       "search": true,
-      "index": 1,
+      "index": 5,
       "width": 100,
       "overHidden": true
     },
@@ -65,7 +65,7 @@
       "label": "负荷指数",
       "prop": "typenoOne",
       "search": true,
-      "index": 1,
+      "index": 6,
       "width": 100,
       "overHidden": true
     },
@@ -73,7 +73,7 @@
       "label": "速级",
       "prop": "typenoTwo",
       "search": true,
-      "index": 1,
+      "index": 7,
       "width": 100,
       "overHidden": true
     },
@@ -81,7 +81,7 @@
       "label": "仓库名称",
       "prop": "stockName",
       "search": true,
-      "index": 1,
+      "index": 8,
       "width": 100,
       "overHidden": true
     },
@@ -89,7 +89,7 @@
       "label": "供应商",
       "prop": "corpName",
       "search": false,
-      "index": 1,
+      "index": 9,
       "width": 100,
       "overHidden": true
     },
@@ -97,7 +97,7 @@
       "label": "品牌",
       "prop": "brand",
       "search": true,
-      "index": 1,
+      "index": 10,
       "width": 100,
       "overHidden": true
     },
@@ -105,7 +105,7 @@
       "label": "总库存",
       "prop": "balanceQuantity",
       "search": false,
-      "index": 1,
+      "index": 11,
       "width": 100,
       "cell": true,
       "overHidden": true
@@ -114,7 +114,7 @@
       "label": "内贸锁定",
       "prop": "lockingQuantity",
       "search": false,
-      "index": 1,
+      "index": 12,
       "width": 100,
       "cell": true,
       "overHidden": true
@@ -123,7 +123,7 @@
       "label": "可用库存",
       "prop": "surplusRouteQuantity",
       "search": false,
-      "index": 1,
+      "index": 13,
       "width": 100,
       "cell": true,
       "overHidden": true
@@ -135,7 +135,7 @@
       "searchRange": true,
       "prop": "createTime",
       "search": false,
-      "index": 1,
+      "index": 14,
       "width": 100,
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -146,7 +146,7 @@
       "label": "创建人",
       "prop": "createUserName",
       "search": false,
-      "index": 1,
+      "index": 15,
       "width": 100,
       "overHidden": true
     },
@@ -154,7 +154,7 @@
       "label": "更新日期",
       "prop": "updateTime",
       "search": false,
-      "index": 1,
+      "index": 16,
       "width": 100,
       "overHidden": true
     },
@@ -162,7 +162,7 @@
       "label": "更新人",
       "prop": "updateUserName",
       "search": false,
-      "index": 1,
+      "index": 17,
       "width": 100,
       "overHidden": true
     }

src/views/businessManagement/purchaseOrder/configuration/mainList.json

@@ -196,6 +196,22 @@
       "valueFormat": "yyyy-MM-dd",
       "overHidden": true,
       "pickerOptions": {}
+    },
+    {
+      "label": "更改人",
+      "prop": "updateUserName",
+      "search": false,
+      "index": 17,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "更改时间",
+      "prop": "updateTime",
+      "search": false,
+      "index": 18,
+      "width": 100,
+      "overHidden": true
     }
   ]
 }

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -78,7 +78,7 @@
     <div class="customer-main">
       <el-form :model="form" ref="form" label-width="130px" class="demo-ruleForm">
         <containerTitle title="基础资料"></containerTitle>
-        <basic-container style="margin-bottom: 10px">
+        <basic-container :showBtn="true">
           <el-row>
             <el-col v-for="(item,index) in basicData.column" :key="index" :span="item.span?item.span:8">
               <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
@@ -136,7 +136,7 @@
           </el-row>
         </basic-container>
         <containerTitle title="商品信息"></containerTitle>
-        <basic-container style="margin-bottom: 10px">
+        <basic-container>
           <avue-crud
               :option="customerContact"
               v-model="contactsForm"

src/views/businessManagement/receipt/configuration/mainList.json

@@ -184,6 +184,22 @@
       "index": 1,
       "width": 100,
       "overHidden": true
+    },
+    {
+      "label": "更改人",
+      "prop": "updateUserName",
+      "search": false,
+      "index": 16,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "更改时间",
+      "prop": "updateTime",
+      "search": false,
+      "index": 17,
+      "width": 100,
+      "overHidden": true
     }
   ]
 }

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -56,7 +56,7 @@
     <div class="customer-main">
       <el-form :model="form" ref="form" label-width="130px" class="demo-ruleForm">
         <containerTitle title="基础资料"></containerTitle>
-        <basic-container style="margin-bottom: 10px">
+        <basic-container>
           <el-row>
             <el-col v-for="(item,index) in basicData.column" :key="index" :span="item.span?item.span:8">
               <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
@@ -120,7 +120,7 @@
           </el-row>
         </basic-container>
         <containerTitle title="商品信息"></containerTitle>
-        <basic-container style="margin-bottom: 10px">
+        <basic-container>
           <avue-crud
               :option="customerContact"
               v-model="contactsForm"

src/views/businessManagement/salesOrder/configuration/mainList.json

@@ -315,6 +315,22 @@
       "valueFormat": "yyyy-MM-dd",
       "overHidden": true,
       "pickerOptions": {}
+    },
+    {
+      "label": "更改人",
+      "prop": "updateUserName",
+      "search": false,
+      "index": 26,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "更改时间",
+      "prop": "updateTime",
+      "search": false,
+      "index": 27,
+      "width": 100,
+      "overHidden": true
     }
   ]
 }

src/views/dealer/purchase/config/mainList.json

@@ -133,6 +133,22 @@
       "index": 11,
       "width": 100,
       "overHidden": true
+    },
+    {
+      "label": "更改人",
+      "prop": "updateUserName",
+      "search": false,
+      "index": 13,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "更改时间",
+      "prop": "updateTime",
+      "search": false,
+      "index": 14,
+      "width": 100,
+      "overHidden": true
     }
   ]
 }

src/views/dealer/sales/config/mainList.json

@@ -169,6 +169,22 @@
       "index": 15,
       "width": 100,
       "overHidden": true
+    },
+    {
+      "label": "更改人",
+      "prop": "updateUserName",
+      "search": false,
+      "index": 16,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "更改时间",
+      "prop": "updateTime",
+      "search": false,
+      "index": 17,
+      "width": 100,
+      "overHidden": true
     }
   ]
 }

src/views/dealer/stock/config/mainList.json

@@ -47,7 +47,7 @@
       "label": "名称",
       "prop": "cname",
       "search": true,
-      "index": 1,
+      "index": 2,
       "width": 100,
       "overHidden": true
     },
@@ -55,7 +55,7 @@
       "label": "批次号",
       "prop": "lotNo",
       "search": true,
-      "index": 1,
+      "index": 3,
       "width": 120,
       "overHidden": true
     },
@@ -63,7 +63,7 @@
       "label": "花纹",
       "prop": "brandItem",
       "search": true,
-      "index": 1,
+      "index": 4,
       "width": 100,
       "overHidden": true
     },
@@ -71,7 +71,7 @@
       "label": "产地",
       "prop": "placeProduction",
       "search": true,
-      "index": 1,
+      "index": 5,
       "width": 100,
       "overHidden": true
     },
@@ -79,7 +79,7 @@
       "label": "规格",
       "prop": "typeno",
       "search": true,
-      "index": 1,
+      "index": 6,
       "width": 100,
       "overHidden": true
     },
@@ -87,7 +87,7 @@
       "label": "负荷指数",
       "prop": "typenoOne",
       "search": true,
-      "index": 1,
+      "index": 7,
       "width": 100,
       "overHidden": true
     },
@@ -95,7 +95,7 @@
       "label": "速级",
       "prop": "typenoTwo",
       "search": true,
-      "index": 1,
+      "index": 8,
       "width": 100,
       "overHidden": true
     },
@@ -103,7 +103,7 @@
       "label": "仓库名称",
       "prop": "storageId",
       "search": true,
-      "index": 1,
+      "index": 9,
       "width": 100,
       "overHidden": true
     },
@@ -111,7 +111,7 @@
       "label": "供应商",
       "prop": "corpName",
       "search": false,
-      "index": 1,
+      "index": 10,
       "width": 100,
       "overHidden": true
     },
@@ -119,7 +119,7 @@
       "label": "品牌",
       "prop": "brand",
       "search": true,
-      "index": 1,
+      "index": 11,
       "width": 100,
       "overHidden": true
     },
@@ -127,7 +127,7 @@
       "label": "总库存",
       "prop": "balanceQuantity",
       "search": false,
-      "index": 1,
+      "index": 12,
       "width": 100,
       "cell": true,
       "overHidden": true
@@ -136,7 +136,7 @@
       "label": "内贸锁定",
       "prop": "lockingQuantity",
       "search": false,
-      "index": 1,
+      "index": 13,
       "width": 100,
       "cell": true,
       "overHidden": true
@@ -145,7 +145,7 @@
       "label": "可用库存",
       "prop": "surplusRouteQuantity",
       "search": false,
-      "index": 1,
+      "index": 14,
       "width": 100,
       "cell": true,
       "overHidden": true
@@ -157,7 +157,7 @@
       "searchRange": true,
       "prop": "createTime",
       "search": false,
-      "index": 1,
+      "index": 15,
       "width": 100,
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -168,7 +168,7 @@
       "label": "创建人",
       "prop": "createUserName",
       "search": false,
-      "index": 1,
+      "index": 16,
       "width": 100,
       "overHidden": true
     },
@@ -176,7 +176,7 @@
       "label": "更新日期",
       "prop": "updateTime",
       "search": false,
-      "index": 1,
+      "index": 17,
       "width": 100,
       "overHidden": true
     },
@@ -184,7 +184,7 @@
       "label": "更新人",
       "prop": "updateUserName",
       "search": false,
-      "index": 1,
+      "index": 18,
       "width": 100,
       "overHidden": true
     }