Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before into ...

licp

2024-03-29 f48478135272fa9c3b60ac53434097d225820fa3

 src/views/quality/rawMaterial/index.vue

@@ -187,12 +187,13 @@
                    },
                    {
                        minWidth: '120',
                        prop: 'createTime',
                        prop: 'startTime',
                        label: '报检日期',
                        isTrue: true,
                        sort: true,
                        isSearch: true,
                        searchInfoType: 'text',
                        searchInfoType: 'datetimerange',
                        formatter: this.formatDateTime,
                    },
                    {
@@ -210,6 +211,7 @@
                        isTrue: true,
                        isSearch: true,
                        searchInfoType: 'text',
                        searchInfoType: 'datetimerange',
                        formatter: this.formatDateTime,
                    },
                    {
@@ -235,6 +237,14 @@
                        optList: () => {
                                return this.StateList
                            }
                    },
                    {
                        minWidth: '120',
                        prop: 'remark',
                        label: '备注',
                        isTrue: true,
                        isSearch: true,
                        searchInfoType: 'text',
                    },
                ],
                toolbar: [],
@@ -381,7 +391,7 @@
                type: "html",
                // header: "原材料检测报告",
                targetStyles: ["*"],
                style: `@page {margin: 0mm 5mm;size: A4;}
                style: `@page {margin: 0mm 5mm;size: A4 landscape;}
                    html {zoom:100%;}
                    @media print {
                 html,body{