diff --git a/jshERP-web/src/views/report/AllocationDetail.vue b/jshERP-web/src/views/report/AllocationDetail.vue index adf0acfd..1ef63a6d 100644 --- a/jshERP-web/src/views/report/AllocationDetail.vue +++ b/jshERP-web/src/views/report/AllocationDetail.vue @@ -11,10 +11,11 @@
- + @@ -24,10 +25,11 @@ - + @@ -37,6 +39,11 @@ + + + + + @@ -133,6 +140,7 @@ // 查询条件 queryParam: { organId: '', + number: '', materialParam:'', depotId: '', depotIdF: '', @@ -162,11 +170,11 @@ title: '单据编号', dataIndex: 'number', width: 100, scopedSlots: { customRender: 'numberCustomRender' }, }, - {title: '条码', dataIndex: 'barCode', width: 100}, + {title: '条码', dataIndex: 'barCode', width: 80}, {title: '名称', dataIndex: 'mname', width: 120}, - {title: '规格', dataIndex: 'standard', width: 50}, - {title: '型号', dataIndex: 'model', width: 50}, - {title: '单位', dataIndex: 'mUnit', width: 50}, + {title: '规格', dataIndex: 'standard', width: 60}, + {title: '型号', dataIndex: 'model', width: 60}, + {title: '单位', dataIndex: 'mUnit', width: 60}, {title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber, width: 60}, {title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.unitPrice - b.unitPrice, width: 60}, {title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice, width: 60}, diff --git a/jshERP-web/src/views/report/InDetail.vue b/jshERP-web/src/views/report/InDetail.vue index 483bcc8b..994e714c 100644 --- a/jshERP-web/src/views/report/InDetail.vue +++ b/jshERP-web/src/views/report/InDetail.vue @@ -7,7 +7,7 @@
- + @@ -17,10 +17,11 @@ - + @@ -30,6 +31,11 @@ + + + + + @@ -126,6 +132,7 @@ // 查询条件 queryParam: { organId: '', + number: '', materialParam:'', depotId: '', beginTime: getNowFormatMonth() + '-01', @@ -154,11 +161,11 @@ title: '单据编号', dataIndex: 'number', width: 100, scopedSlots: { customRender: 'numberCustomRender' }, }, - {title: '条码', dataIndex: 'barCode', width: 100}, + {title: '条码', dataIndex: 'barCode', width: 80}, {title: '名称', dataIndex: 'mname', width: 120}, - {title: '规格', dataIndex: 'standard', width: 50}, - {title: '型号', dataIndex: 'model', width: 50}, - {title: '单位', dataIndex: 'mUnit', width: 50}, + {title: '规格', dataIndex: 'standard', width: 60}, + {title: '型号', dataIndex: 'model', width: 60}, + {title: '单位', dataIndex: 'mUnit', width: 60}, {title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber, width: 60}, {title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.unitPrice - b.unitPrice, width: 60}, {title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice, width: 60}, diff --git a/jshERP-web/src/views/report/OutDetail.vue b/jshERP-web/src/views/report/OutDetail.vue index a39060dd..bcb44b36 100644 --- a/jshERP-web/src/views/report/OutDetail.vue +++ b/jshERP-web/src/views/report/OutDetail.vue @@ -7,7 +7,7 @@
- + @@ -17,10 +17,11 @@ - + @@ -30,6 +31,11 @@ + + + + + @@ -126,6 +132,7 @@ // 查询条件 queryParam: { organId: '', + number: '', materialParam:'', depotId: '', beginTime: getNowFormatMonth() + '-01', @@ -154,11 +161,11 @@ title: '单据编号', dataIndex: 'number', width: 100, scopedSlots: { customRender: 'numberCustomRender' }, }, - {title: '条码', dataIndex: 'barCode', width: 100}, + {title: '条码', dataIndex: 'barCode', width: 80}, {title: '名称', dataIndex: 'mname', width: 120}, - {title: '规格', dataIndex: 'standard', width: 50}, - {title: '型号', dataIndex: 'model', width: 50}, - {title: '单位', dataIndex: 'mUnit', width: 50}, + {title: '规格', dataIndex: 'standard', width: 60}, + {title: '型号', dataIndex: 'model', width: 60}, + {title: '单位', dataIndex: 'mUnit', width: 60}, {title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber, width: 60}, {title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.operNumber - b.operNumber, width: 60}, {title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.operNumber - b.operNumber, width: 60},