Merge remote-tracking branch 'origin/master'

王震

2023-12-13 67da82f0b0c24df5f19bbfcfec63801d9ae902d8

 src/views/quality/processInspect/index.vue

@@ -12,19 +12,6 @@
                <template #toolbar></template>
                </ttable>
            </basic-container>
            <el-dialog
            top="10vh"
            title="打印预览"
            :visible.sync="printDialogVisible"
            width="60%">
            <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>
@@ -35,17 +22,13 @@
   import processInspectForm from './processInspect-form'
    import { transform } from '@/util/fileTransform'
    import { page,deleteById,exportProcessInsProduct } from '@/api/quality/processInspect'
    import printTemplate from './processInspect-print.vue'
   export default {
      components: {
         processInspectForm,
            ttable,
            printTemplate
      },
      data() {
         return {
                printFormData: null,
                printDialogVisible: false,
                result:[{label:'全部',value: ''},{label:'合格',value: '1'},{label:'不合格',value: '0'}],
                type: [1],
                prelang: 'processInspect',
@@ -73,12 +56,20 @@
                    column: [
                        {
                            minWidth: '120',
                            prop: 'orderNumber',
                            label: '订单编号',
                            prop: 'proInsNo',
                            label: '过程检验编号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text',
                            render: { fun: this.addOrUpdateHandle }
                        },
                        {
                            minWidth: '120',
                            prop: 'orderNumber',
                            label: '订单编号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '120',
@@ -169,17 +160,12 @@
                        type: 'primary',
                        fun: this.addOrUpdateHandle
                    },
                    {
                        text: '导出',
                        fun: this.exportExcel
                    }
                    // {
                    //     text: '导出',
                    //     fun: this.exportExcel
                    // }
                    ],
                    operator: [{
                        text: '打印',
                        type: 'text',
                        size: 'small',
                        fun: this.showPrint
                    },{
                        text: '作废',
                        type: 'text',
                        size: 'small',
@@ -196,13 +182,9 @@
      },
      created() { },
      methods: {
            showPrint(){
                this.printDialogVisible = true
            },
            exportExcel(){
                let queryParam=this.$refs.processInspect.getQueryParam();
                delete queryParam.criteria
                console.log(queryParam);
                exportProcessInsProduct(queryParam).then((res)=>{
                    transform(res)
                })