出入库统计页面

src/views/reportAnalysis/inoutStatistics.vue

@@ -23,6 +23,7 @@
       :queryList="queryList"
       :setRowList="setRowList"
       :tatolLabel="tatolLabel"
+
     />
     <el-pagination
       style="float: right;margin-top: 10px"
@@ -85,16 +86,24 @@ export default {
           checked: 0,
           width: 100,
           onabort: ''
-        },{
+        },
+        {
           surface: '3',
           label: 'fBillno',
+          name: '货物类别',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        },{
+          surface: '4',
+          label: 'fBillno',
           name: '产品名称',
           checked: 0,
           width: 100,
           onabort: ''
         },
         {
-          surface: '4',
+          surface: '5',
           label: 'fBillno',
           name: '规格',
           checked: 0,
@@ -102,7 +111,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '2',
+          surface: '6',
           label: 'fBillno',
           name: '数量',
           checked: 0,
@@ -110,7 +119,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '2',
+          surface: '7',
           label: 'fBillno',
           name: '供货商',
           checked: 0,
@@ -118,7 +127,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '2',
+          surface: '8',
           label: 'fBillno',
           name: '供货人',
           checked: 0,
@@ -126,7 +135,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '2',
+          surface: '9',
           label: 'fBillno',
           name: '联系电话',
           checked: 0,
@@ -134,7 +143,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '2',
+          surface: '10',
           label: 'fBillno',
           name: '生产日期或批号',
           checked: 0,
@@ -142,7 +151,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '2',
+          surface: '11',
           label: 'fBillno',
           name: '保质期限',
           checked: 0,
@@ -150,7 +159,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '2',
+          surface: '12',
           label: 'fBillno',
           name: '保存条件',
           checked: 0,
@@ -158,7 +167,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '2',
+          surface: '13',
           label: 'fBillno',
           name: '索证索票',
           checked: 0,
@@ -166,7 +175,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '2',
+          surface: '14',
           label: 'fBillno',
           name: '采购人',
           checked: 0,
@@ -174,7 +183,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '2',
+          surface: '15',
           label: 'fBillno',
           name: '感官',
           checked: 0,
@@ -182,7 +191,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '2',
+          surface: '16',
           label: 'fBillno',
           name: '数量',
           checked: 0,
@@ -190,7 +199,7 @@ export default {
           onabort: ''
         },
         {
-          surface: '2',
+          surface: '17',
           label: 'fBillno',
           name: '验收人',
           checked: 0,
@@ -202,11 +211,38 @@ export default {
         {
           span: 6,
           label: 'fBillno',
-          name: '申请编号',
+          name: '供应商',
+          inputType: 1,
+          width: 200,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
+        },
+        {
+          span: 6,
+          label: 'fBillno',
+          name: '物资类别',
+          inputType: 1,
+          width: 200,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
+        },
+        {
+          span: 6,
+          label: 'fBillno',
+          name: '产品名称',
           inputType: 2,
           width: 200,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
+        },
+        {
+          span: 6,
+          label: 'fBillno',
+          name: '进货时间',
+          inputType: 3,
+          width: 200,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
         }
       ]
     }

src/views/warehouse/outStock/index.vue

@@ -381,6 +381,7 @@ export default {
           name: "操作",
           checked: 0,
           width: 200,
+          fixed:'right',
           operation:1
         }