Merge remote-tracking branch 'origin/master'

王震

2023-12-13 67da82f0b0c24df5f19bbfcfec63801d9ae902d8

 src/views/quality/processInspect/index.vue

@@ -20,11 +20,12 @@
    import ttable from '@/views/common/ztt-table.vue'
    import * as fecha from 'element-ui/lib/utils/date'
   import processInspectForm from './processInspect-form'
    import { page,deleteById } from '@/api/quality/processInspect'
    import { transform } from '@/util/fileTransform'
    import { page,deleteById,exportProcessInsProduct } from '@/api/quality/processInspect'
   export default {
      components: {
         processInspectForm,
            ttable
            ttable,
      },
      data() {
         return {
@@ -55,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',
@@ -151,9 +160,10 @@
                        type: 'primary',
                        fun: this.addOrUpdateHandle
                    },
                    {
                        text: '导出',
                    }
                    // {
                    //     text: '导出',
                    //     fun: this.exportExcel
                    // }
                    ],
                    operator: [{
                        text: '作废',
@@ -172,6 +182,13 @@
      },
      created() { },
      methods: {
            exportExcel(){
                let queryParam=this.$refs.processInspect.getQueryParam();
                delete queryParam.criteria
                exportProcessInsProduct(queryParam).then((res)=>{
                    transform(res)
                })
            },
         deleteHandle(row){
            this.$confirm('确认删除该数据吗？', '提示', {
            confirmButtonText: '确定',