Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

zouyu

2023-11-06 6b003c3d7ef58ef2c7a24b7668c74fd8f16f37d6

Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

 src/api/quality/finishedProduct.js

@@ -60,4 +60,13 @@
    method: 'post',
    params: obj
  })
}

export function exportExaminationProducts(query) {
  return request({
    url: '/mes/qualityFinishedInspect/exportExcel',
    method: 'get',
    responseType : 'blob',
    params: query
  })
}

 src/api/quality/unqualifiedprocess.js

@@ -208,3 +208,12 @@
    method: 'get'
  })
}

export function UnqualifiedDisposal(query) {
  return request({
    url: '/mes/qualityInspectUnaccepted/export',
    method: 'get',
    responseType : 'blob',
    params: query
  })
}

 src/views/quality/finishedProductInspection/index.vue

@@ -20,7 +20,8 @@
    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 } from '@/api/quality/finishedProduct'
    import { page,deletePro,exportExaminationProducts } from '@/api/quality/finishedProduct'
    import { transform } from '@/util/fileTransform'
    export default {
        components: {
            finishedProductInspectionAdd,
@@ -151,6 +152,8 @@
                    },
                    {
                        text: '导出',
                        type: 'primary',
                        fun: this.exportExcel
                    }
                    ],
                    operator: [{
@@ -174,6 +177,15 @@
        },
        created() { },
        methods: {
            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('确认删除该数据吗？', '提示', {

 src/views/quality/processconfiguration/index.vue

@@ -64,7 +64,7 @@
                </div>
            </el-form>
            <span slot="footer" >
                <el-button @click="dialogVisible = false">取 消</el-button>
                <el-button @click="WayCancel()">取 消</el-button>
                <el-button type="primary" @click="WaySure()">确 定</el-button>
            </span>
        </el-dialog>
@@ -82,6 +82,7 @@
import TableForm from './table-form'
import { mapGetters } from 'vuex'
// import { remote } from '@/api/admin/dict'
import { transform } from '@/util/fileTransform'
import ttable from '@/views/common/ztt-table.vue'
export default {
  data() {
@@ -262,36 +263,6 @@
          //     return this.processModeOptions
          //   }
          // },
          //发起人
            // {
            //   minWidth: '200',
            //   prop: 'originator',
            //   label: '发起人',
            //   sort: true,
            //   isTrue: true,
            //   isSearch: true,
            //   searchInfoType: 'text'
            // },
          // 审核人
          // {
          //   minWidth: '140',
          //   prop: 'examiner',
          //   label: '审核人',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // 处理人
          // {
          //   minWidth: '120',
          //   prop: 'handler',
          //   label: '处理人',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
        
        ],
        toolbar: [
@@ -378,6 +349,12 @@
      this.UserId = row.id
      this.type = row.type
      this.dialogVisible = true;

    },
    WayCancel(){
      this.dialogVisible = false
      this.checkList = null
      this.WayIdea = null
    },
    WaySure(){
      AuditSuggestion({id:this.UserId,way:this.checkList}).then(