Merge remote-tracking branch 'origin/master'

zss

2023-12-11 c880739ec4cd5ede33b31eb98ad5f7628ea288e5

 src/views/quality/rawMaterial/index.vue

@@ -38,11 +38,11 @@
            @refreshDataList="getData"
        ></RawMaterialForm>
        <el-dialog
        top="10vh"
        top="7vh"
        title="打印预览"
        :visible.sync="printDialogVisible"
        width="60%">
        <div style="width:100%;height: 60vh;overflow-y: scroll;">
        width="70%">
        <div style="width:90%;margin-left:5%;height: 60vh;overflow-y: scroll;">
            <printTemplate id="printRaw" :formData="printFormData"></printTemplate>
        </div>
        <span slot="footer" class="dialog-footer">
@@ -54,11 +54,12 @@
</template>
<script>
import ttable from '@/views/common/ztt-table.vue'
import { getRawInspectList,delObj,exportRawMaterial,getObj } from '@/api/quality/rawMaterial'
import { getRawInspectList,delObj,exportRawMaterial,getObj,downloadReport } from '@/api/quality/rawMaterial'
import RawMaterialForm from './rawMaterial-form'
import * as fecha from 'element-ui/lib/utils/date'
import { mapGetters } from 'vuex'
import PrintJS from 'print-js'
import { transformZip } from '@/util/fileTransform'
import printTemplate from './rawMaterial-print.vue'
  export default {
    data() {
@@ -95,12 +96,20 @@
                column: [
                    {
                        minWidth: '120',
                        prop: 'code',
                        label: '原材料编码',
                        prop: 'rawInsNo',
                        label: '原材料检验编号',
                        isTrue: true,
                        isSearch: true,
                        searchInfoType: 'text',
                        render: { fun: this.addOrUpdateHandle }
                    },
                    {
                        minWidth: '120',
                        prop: 'code',
                        label: '原材料编码',
                        isTrue: true,
                        isSearch: true,
                        searchInfoType: 'text'
                    },
                    {
                        minWidth: '120',
@@ -217,19 +226,20 @@
                        fun: this.downloadReport
                    }
                ],
                operator: [{
                    text: '打印',
                    type: 'text',
                    size: 'small',
                    fun: this.previewFun,
                    show: {
                        val: [
                            '1',
                            '0'
                        ],
                        key: 'judgeState'
                    }
                },
                operator: [
                //     {
                //     text: '打印',
                //     type: 'text',
                //     size: 'small',
                //     fun: this.previewFun,
                //     show: {
                //         val: [
                //             '1',
                //             '0'
                //         ],
                //         key: 'judgeState'
                //     }
                // },
                {
                    text: '作废',
                    type: 'text',
@@ -277,7 +287,15 @@
                    this.$message.error("只能选择已检测的数据")
                    return
                }
                console.log(selection)
                let ids = []
                selection.forEach(ele=>{
                    ids.push(ele.id)
                })
                downloadReport({ids : ids}).then(res=>{
                    transformZip(res)
                }).catch(error=>{
                    console.log(error)
                })
            }
        },
        //查看报告按钮
@@ -297,13 +315,12 @@
                type: "html",
                // header: "原材料检测报告",
                targetStyles: ["*"],
                style: `@page {margin: 0mm 5mm;size: A4;};
                    html {zoom:100%;};
                style: `@page {margin: 0mm 5mm;size: A4;}
                    html {zoom:100%;}
                    @media print {
                 html,body{
                   width:880pt;
                   height:900pt;
                   margin:0;
                   width:200mm;
                   height:297mm;
                 }
               }`,
                ignoreElements: ["no-ignore"],
@@ -315,7 +332,6 @@
        },
        exportRawMaterial(){
            exportRawMaterial(this.queryParam).then(res=>{
                console.log(res)
                this.downloadFun(res)
            }).catch(error=>{
                console.log(error);