优化报表，增加条码查询

jshERP-web/src/views/report/BuyInReport.vue

@@ -14,7 +14,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="名称、规格、型号" v-model="queryParam.materialParam"></a-input>
+                  <a-input placeholder="条码、名称、规格、型号" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -87,6 +87,7 @@
               return parseInt(index)+1;
             }
           },
+          {title: '条码', dataIndex: 'barCode', width: 160},
           {title: '名称', dataIndex: 'materialName', width: 160},
           {title: '规格', dataIndex: 'materialStandard', width: 80},
           {title: '型号', dataIndex: 'materialModel', width: 80},

jshERP-web/src/views/report/InDetail.vue

@@ -31,7 +31,7 @@
               </a-col>
               <a-col :md="4" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="名称/规格/型号" v-model="queryParam.materialParam"></a-input>
+                  <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="5" :sm="24">
@@ -134,15 +134,16 @@
             title: '单据编号', dataIndex: 'number', width: 140,
             scopedSlots: { customRender: 'numberCustomRender' },
           },
+          {title: '条码', dataIndex: 'barCode', width: 120},
           {title: '名称', dataIndex: 'mname', width: 120},
           {title: '规格', dataIndex: 'standard', width: 100},
           {title: '型号', dataIndex: 'model', width: 100},
           {title: '单价', dataIndex: 'unitPrice', width: 60},
           {title: '入库数量', dataIndex: 'operNumber', width: 80},
           {title: '金额', dataIndex: 'allPrice', width: 60},
-          {title: '供应商', dataIndex: 'sname', width: 200},
+          {title: '供应商', dataIndex: 'sname', width: 120},
           {title: '仓库', dataIndex: 'dname', width: 120},
-          {title: '入库日期', dataIndex: 'operTime', width: 120}
+          {title: '入库日期', dataIndex: 'operTime', width: 100}
         ],
         url: {
           list: "/depotHead/findInDetail",

jshERP-web/src/views/report/InMaterialCount.vue

@@ -31,7 +31,7 @@
               </a-col>
               <a-col :md="4" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="名称/规格/型号" v-model="queryParam.materialParam"></a-input>
+                  <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="5" :sm="24">
@@ -123,7 +123,8 @@
               return parseInt(index)+1;
             }
           },
-          {title: '名称', dataIndex: 'mName', width: 150},
+          {title: '条码', dataIndex: 'barCode', width: 120},
+          {title: '名称', dataIndex: 'mName', width: 120},
           {title: '规格', dataIndex: 'standard', width: 100},
           {title: '型号', dataIndex: 'model', width: 100},
           {title: '类型', dataIndex: 'categoryName', width: 120},

jshERP-web/src/views/report/InOutStockReport.vue

@@ -27,7 +27,7 @@
               </a-col>
               <a-col :md="4" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="名称/规格/型号" v-model="queryParam.materialParam"></a-input>
+                  <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="4" :sm="24">
@@ -110,17 +110,18 @@
               return parseInt(index)+1;
             }
           },
-          {title: '名称', dataIndex: 'materialName', width: 160},
+          {title: '条码', dataIndex: 'barCode', width: 120},
+          {title: '名称', dataIndex: 'materialName', width: 120},
           {title: '规格', dataIndex: 'materialStandard', width: 80},
           {title: '型号', dataIndex: 'materialModel', width: 80},
           {title: '扩展信息', dataIndex: 'materialOther', width: 120},
           {title: '单位', dataIndex: 'unitName', width: 80},
           {title: '单价', dataIndex: 'unitPrice', width: 60},
-          {title: '上月结存数量', dataIndex: 'prevSum', width: 120},
-          {title: '入库数量', dataIndex: 'inSum', width: 80},
-          {title: '出库数量', dataIndex: 'outSum', width: 80},
-          {title: '本月结存数量', dataIndex: 'thisSum', width: 120},
-          {title: '结存金额', dataIndex: 'thisAllPrice', width: 80}
+          {title: '上月结存数量', dataIndex: 'prevSum', width: 80},
+          {title: '入库数量', dataIndex: 'inSum', width: 60},
+          {title: '出库数量', dataIndex: 'outSum', width: 60},
+          {title: '本月结存数量', dataIndex: 'thisSum', width: 80},
+          {title: '结存金额', dataIndex: 'thisAllPrice', width: 60}
         ],
         url: {
           list: "/depotItem/findByAll",

jshERP-web/src/views/report/OutDetail.vue

@@ -31,7 +31,7 @@
               </a-col>
               <a-col :md="4" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="名称/规格/型号" v-model="queryParam.materialParam"></a-input>
+                  <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="5" :sm="24">
@@ -134,15 +134,16 @@
             title: '单据编号', dataIndex: 'number', width: 140,
             scopedSlots: { customRender: 'numberCustomRender' },
           },
+          {title: '条码', dataIndex: 'barCode', width: 120},
           {title: '名称', dataIndex: 'mname', width: 120},
           {title: '规格', dataIndex: 'standard', width: 100},
           {title: '型号', dataIndex: 'model', width: 100},
           {title: '单价', dataIndex: 'unitPrice', width: 60},
           {title: '出库数量', dataIndex: 'operNumber', width: 80},
           {title: '金额', dataIndex: 'allPrice', width: 60},
-          {title: '客户', dataIndex: 'sname', width: 200},
+          {title: '客户', dataIndex: 'sname', width: 120},
           {title: '仓库', dataIndex: 'dname', width: 120},
-          {title: '出库日期', dataIndex: 'operTime', width: 120}
+          {title: '出库日期', dataIndex: 'operTime', width: 100}
         ],
         url: {
           list: "/depotHead/findInDetail",

jshERP-web/src/views/report/OutMaterialCount.vue

@@ -31,7 +31,7 @@
               </a-col>
               <a-col :md="4" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="名称/规格/型号" v-model="queryParam.materialParam"></a-input>
+                  <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="5" :sm="24">
@@ -123,7 +123,8 @@
               return parseInt(index)+1;
             }
           },
-          {title: '名称', dataIndex: 'mName', width: 150},
+          {title: '条码', dataIndex: 'barCode', width: 120},
+          {title: '名称', dataIndex: 'mName', width: 120},
           {title: '规格', dataIndex: 'standard', width: 100},
           {title: '型号', dataIndex: 'model', width: 100},
           {title: '类型', dataIndex: 'categoryName', width: 120},

jshERP-web/src/views/report/SaleOutReport.vue

@@ -14,7 +14,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="名称、规格、型号" v-model="queryParam.materialParam"></a-input>
+                  <a-input placeholder="条码、名称、规格、型号" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -87,6 +87,7 @@
               return parseInt(index)+1;
             }
           },
+          {title: '条码', dataIndex: 'barCode', width: 160},
           {title: '名称', dataIndex: 'materialName', width: 160},
           {title: '规格', dataIndex: 'materialStandard', width: 80},
           {title: '型号', dataIndex: 'materialModel', width: 80},

jshERP-web/src/views/report/StockWarningReport.vue

@@ -21,7 +21,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="名称、规格、型号" v-model="queryParam.materialParam"></a-input>
+                  <a-input placeholder="条码、名称、规格、型号" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -94,7 +94,8 @@
               return parseInt(index)+1;
             }
           },
-          {title: '名称', dataIndex: 'mname', width: 160},
+          {title: '条码', dataIndex: 'barCode', width: 120},
+          {title: '名称', dataIndex: 'mname', width: 120},
           {title: '规格', dataIndex: 'mstandard', width: 80},
           {title: '型号', dataIndex: 'mmodel', width: 80},
           {title: '扩展信息', dataIndex: 'materialOther', width: 150},