Merge remote-tracking branch 'origin/master'

86134

2023-11-09 5710f6d9a5ac5998d8368bec99b41c58fa3c4ab2

 src/views/quality/finishedProductInspection/index.vue

@@ -12,6 +12,19 @@
                <template #toolbar></template>
                </ttable>
            </basic-container>
            <el-dialog
            top="10vh"
            title="打印预览"
            :visible.sync="printDialogVisible"
            width="65%">
            <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 type="primary" @click="printFun()">打 印</el-button>
            </span>
            </el-dialog>
      </div>
   </div>
</template>
@@ -20,15 +33,20 @@
    import ttable from '@/views/common/ztt-table.vue'
    import * as fecha from 'element-ui/lib/utils/date'
   import finishedProductInspectionAdd from './finishedProduct-form'
    import { page,deletePro,exportExaminationProducts } from '@/api/quality/finishedProduct'
    import { page,deletePro,exportExaminationProducts,queryById } from '@/api/quality/finishedProduct'
    import { transform } from '@/util/fileTransform'
    import printTemplate from './finishedProduct-print.vue'
    import PrintJS from 'print-js'
   export default {
      components: {
         finishedProductInspectionAdd,
            ttable
            ttable,
            printTemplate
      },
      data() {
         return {
                printFormData: null,
                printDialogVisible: false,
                result:[{label:'全部',value: ''},{label:'合格',value: '1'},{label:'不合格',value: '0'}],
                type: [1],
                prelang: 'finishedProduct',
@@ -160,6 +178,7 @@
                        text: '打印',
                        type: 'text',
                        size: 'small',
                        fun: this.showPrint
                    },{
                        text: '作废',
                        type: 'text',
@@ -177,6 +196,27 @@
      },
      created() { },
      methods: {
            //打印按钮
            printFun() {
            this.printDialogVisible = false;
                PrintJS({
                    printable: "printRaw",
                    type: "html",
                    maxWidth: 700,
                    style: '@page {margin: 0 5mm}',
                    targetStyles: ["*"],
                    ignoreElements: ["no-ignore"],
                    orientation: 'portrait'
                });
            },
            showPrint(row){
                queryById(row.id).then(res=>{
                    console.log(res);
                    this.printDialogVisible = true
                }).catch(error=>{
                    console.log(error);
                })
            },
            exportExcel(){
                console.log("============");
                let queryParam=this.$refs.finishedProduct.getQueryParam();