Merge remote-tracking branch 'origin/master'

zss

2023-12-11 c880739ec4cd5ede33b31eb98ad5f7628ea288e5

 src/views/quality/finishedProductInspection/index.vue

@@ -16,12 +16,12 @@
            top="10vh"
            title="打印预览"
            :visible.sync="printDialogVisible"
            width="65%">
            width="70%">
            <div style="width:100%;height: 60vh;overflow-y: scroll;">
                <printTemplate id="printRaw" :formData="printFormData"></printTemplate>
            </div>
            <span slot="footer" class="dialog-footer">
                <el-button @click="()=>{printDialogVisible = false;this.printFormData=null}">取 消</el-button>
                <el-button @click="()=>{printDialogVisible = false;printFormData=null}">取 消</el-button>
                <el-button type="primary" @click="printFun()">打 印</el-button>
            </span>
            </el-dialog>
@@ -35,8 +35,9 @@
   import finishedProductInspectionAdd from './finishedProduct-form'
    import { page,deletePro,exportExaminationProducts,queryById } from '@/api/quality/finishedProduct'
    import { transform } from '@/util/fileTransform'
    import printTemplate from './finishedProduct-print.vue'
    import printTemplate from './finishedProducter-print.vue'
    import PrintJS from 'print-js'
    import { title } from 'process'
   export default {
      components: {
         finishedProductInspectionAdd,
@@ -72,14 +73,30 @@
                    data: [],
                    // 标题
                    column: [
                         {
                            minWidth: '120',
                            prop: 'finInsNo',
                            label: '产品检验编号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text',
                            render: { fun: this.addOrUpdateHandle }
                        },
                        {
                            minWidth: '120',
                            prop: 'productNo',
                            label: '报工单号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '120',
                            prop: 'orderNumber',
                            label: '订单号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text',
                            render: { fun: this.addOrUpdateHandle }
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '120',
@@ -98,6 +115,14 @@
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text',
                        },
                        {
                            minWidth: '120',
                            prop: 'outBatchNo',
                            label: '批次号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '120',
@@ -163,11 +188,11 @@
                        },
                    ],
                    toolbar: [
                    {
                    /* {
                        text: '新增',
                        type: 'primary',
                        fun: this.addOrUpdateHandle
                    },
                    }, */
                    {
                        text: '导出',
                        type: 'primary',
@@ -178,7 +203,14 @@
                        text: '打印',
                        type: 'text',
                        size: 'small',
                        fun: this.showPrint
                        fun: this.showPrint,
                        show: {
                            val: [
                                '1',
                                '0'
                            ],
                            key: 'result'
                        }
                    },{
                        text: '作废',
                        type: 'text',
@@ -203,50 +235,40 @@
        }
    },
      methods: {
            //查看报告按钮
            // showPrint(row){
            //     queryById(row.id).then(res=>{
            //     console.log(res);
            //     this.printFormData = res.data.data
            //     this.printDialogVisible = true
            // })
            // .catch(error=>{
            //     console.log(error);
            // })
            // },
            //打印按钮
            printFun() {
            this.printDialogVisible = false;
                const style = '@page {margin: 10mm 5mm; margin-bottom: 0;margin-top:0;} ' +'@media print {.title{font-size:30pt;font-weight: 400;font-family: 黑体;!important;}' ;
                PrintJS({
                    printable: "printRaw",
                    type: "html",
                    maxWidth: 700,
                    style: '@page {margin: 0 5mm}',
                    scanStyles: false,
                    maxWidth: 1200,
                    header: "产品检测报告",
                    style:style,
                    css:'./title.css',
                    targetStyles: ["*"],
                    ignoreElements: ["no-ignore"],
                    orientation: 'portrait'
                });
            },
            //查看报告按钮
            showPrint(row){
                queryById(row.id).then(res=>{
                    console.log(res);
                this.printFormData = res.data.data
                    this.printFormData = res.data.data
                    this.printFormData.createTime = row.createTime
                    this.printFormData.updateTime = row.updateTime
                    this.printDialogVisible = true
                }).catch(error=>{
                    console.log(error);
                })
            },
            exportExcel(){
                console.log("============");
                let queryParam=this.$refs.finishedProduct.getQueryParam();
                delete queryParam.criteria
                console.log(queryParam);
                exportExaminationProducts(queryParam).then((res)=>{
                    transform(res)
                })
            },
         deleteHandle(row){
            console.log(row.id)
            this.$confirm('确认删除该数据吗？', '提示', {
            confirmButtonText: '确定',
            cancelButtonText: '取消',
@@ -268,6 +290,8 @@
               name: 'finishedProductForm',
               query: { 
                        id: row == null ? null : row.id,
                    },
                    params: {
                        resultVal: row == null ? null : row.result 
                    }
            })