完善

src/views/preparation/report/PreparationReport.vue

@@ -195,10 +195,8 @@ export default {
       if (this.queryParam.endMonth) {
         this.queryParam.endMonth = this.BaseTool.Date.formatter(this.queryParam.endMonth, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
       }
-      Promise.all([getAllPreparationReport(this.queryParam), getPreparationReportGroupByStatus(this.queryParam)]).then(res => {
-        console.log(res)
-        this.chartsData1 = res[0].data
-        this.chartsData2 = res[1].data
+      getAllPreparationReport(this.queryParam).then(res => {
+        this.chartsData1 = res.data
       })
     },
     handleView (record) {

src/views/preparation/report/PreparationReportPie.vue

@@ -202,10 +202,8 @@ export default {
       if (this.queryParam.endMonth) {
         this.queryParam.endMonth = this.BaseTool.Date.formatter(this.queryParam.endMonth, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
       }
-      Promise.all([getAllPreparationReport(this.queryParam), getPreparationReportGroupByStatus(this.queryParam)]).then(res => {
-        console.log(res)
-        this.chartsData1 = res[0].data
-        this.chartsData2 = res[1].data
+      getPreparationReportGroupByStatus(this.queryParam).then(res => {
+        this.chartsData2 = res.data
       })
     },
     handleView (record) {

src/views/purchase/purchase-order-report/PurchaseOrderReportByFifity.vue

@@ -98,6 +98,7 @@ export default {
       defaultEndMonth: this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_DATE_PATTERN),
       queryParam: {
         // year: 2021,
+        pageSize: 50,
         startTime: this.BaseTool.Date.formatter(new Date(), this.BaseTool.Date.PICKER_NORM_YEAR) + '-01-01',
         endTime: this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
       },
@@ -107,25 +108,25 @@ export default {
       // 表头
       columns: [
         {
-          title: '时间',
+          title: '备件名称',
           width: 180,
-          dataIndex: 'month',
+          dataIndex: 'spareName',
           customRender: (text, record, index) => {
             return record.year + '-' + text
           }
         },
         {
-          title: '采购单总数',
+          title: '总数',
           width: 120,
-          dataIndex: 'num'
-        },
-        {
-          title: '操作',
-          key: 'action',
-          width: '200px',
-          align: 'center',
-          scopedSlots: { customRender: 'action' }
+          dataIndex: 'totalNum'
         }
+        // {
+        //   title: '操作',
+        //   key: 'action',
+        //   width: '200px',
+        //   align: 'center',
+        //   scopedSlots: { customRender: 'action' }
+        // }
       ],
       typeMap: {}
     }
@@ -152,13 +153,13 @@ export default {
         },
         xAxis: {
           type: 'category',
-          data: this.chartsData.map(item => (item.year + '-' + item.month))
+          data: this.chartsData.map(item => item.spareName)
         },
         series: [
           {
             name: '采购单总数',
             type: 'bar',
-            data: this.chartsData.map(item => item.num),
+            data: this.chartsData.map(item => item.totalNum),
             itemStyle: {
               normal: {
                 label: {
@@ -196,7 +197,7 @@ export default {
     getData () {
       getPurchaseFifityReportQuery(this.queryParam)
         .then(res => {
-          this.chartsData = res.data
+          this.chartsData = res.data.rows
         })
     },
     doExport () {

src/views/store/outstoreform/modules/TicketForm.vue

@@ -7,7 +7,7 @@
     <div id="print-container2">
       <div class="title">
         <div style="font-size:26px;"><span style="font-size:30px;font-weight:700;vertical-align: middle;letter-spacing:.2em;">时代思康新材料有限公司</span></div>
-        <div style="font-size:26px;font-weight:700">{{ BaseTool.Object.getField(typeMap,model.type) }}</div>
+        <div style="font-size:26px;font-weight:700">{{ type? BaseTool.Object.getField(typeMap,model.type):'材料退库' }}</div>
       </div>
       <div style="display:flex;justify-content:space-between; margin: 10px auto;width: 1030px;">
         <span>