diff --git a/src/api/mes/qc/iqcdefect.js b/src/api/mes/qc/iqcdefect.js deleted file mode 100644 index 22a3038..0000000 --- a/src/api/mes/qc/iqcdefect.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询来料检验单缺陷记录列表 -export function listIqcdefect(query) { - return request({ - url: '/mes/qc/iqcdefect/list', - method: 'get', - params: query - }) -} - -// 查询来料检验单缺陷记录详细 -export function getIqcdefect(recordId) { - return request({ - url: '/mes/qc/iqcdefect/' + recordId, - method: 'get' - }) -} - -// 新增来料检验单缺陷记录 -export function addIqcdefect(data) { - return request({ - url: '/mes/qc/iqcdefect', - method: 'post', - data: data - }) -} - -// 修改来料检验单缺陷记录 -export function updateIqcdefect(data) { - return request({ - url: '/mes/qc/iqcdefect', - method: 'put', - data: data - }) -} - -// 删除来料检验单缺陷记录 -export function delIqcdefect(recordId) { - return request({ - url: '/mes/qc/iqcdefect/' + recordId, - method: 'delete' - }) -} diff --git a/src/views/mes/qc/defectrecord/index.vue b/src/views/mes/qc/defectrecord/index.vue index 52f6629..9eff8ac 100644 --- a/src/views/mes/qc/defectrecord/index.vue +++ b/src/views/mes/qc/defectrecord/index.vue @@ -180,7 +180,7 @@ export default { updateDefectrecord(this.defectrecordList).then(res => { this.$modal.msgSuccess(res.msg); if (res.code === 200) { - this.open = false; + this.showFlag = false; this.getList(); this.$parent.getList(); } diff --git a/src/views/mes/qc/ipqc/index.vue b/src/views/mes/qc/ipqc/index.vue index 229fc6c..760115b 100644 --- a/src/views/mes/qc/ipqc/index.vue +++ b/src/views/mes/qc/ipqc/index.vue @@ -151,6 +151,7 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" + v-if="scope.row.status =='PREPARE'" v-hasPermi="['mes:qc:ipqc:edit']" >修改 删除 @@ -211,9 +213,12 @@ - + + + + @@ -368,8 +373,9 @@ @@ -593,19 +599,39 @@ export default { if (this.form.ipqcId != null) { updateIpqc(this.form).then(response => { this.$modal.msgSuccess("修改成功"); - this.open = false; + //this.open = false; this.getList(); }); } else { addIpqc(this.form).then(response => { this.$modal.msgSuccess("新增成功"); - this.open = false; + this.form.ipqcId = response.data; //将返回的ID保存 + //this.open = false; this.getList(); }); } } }); }, + //点击完成 + handleFinish(){ + let that = this; + if(this.form.checkResult == null){ + this.$modal.msgError("请选择检测结果!"); + return; + } + + this.$refs["form"].validate(valid => { + if (valid) { + this.$modal.confirm('是否完成检验单编制?【完成后将不能更改】').then(function(){ + that.form.status = 'CONFIRMED'; + that.submitForm(); + that.open = false; + }); + } + }); + }, + /** 删除按钮操作 */ handleDelete(row) { const ipqcIds = row.ipqcId || this.ids; diff --git a/src/views/mes/qc/iqc/iqc.vue b/src/views/mes/qc/iqc/iqc.vue index bba474e..1f48d6d 100644 --- a/src/views/mes/qc/iqc/iqc.vue +++ b/src/views/mes/qc/iqc/iqc.vue @@ -247,9 +247,12 @@ - + + + + @@ -388,7 +391,7 @@ diff --git a/src/views/mes/qc/iqc/iqcdefect.vue b/src/views/mes/qc/iqc/iqcdefect.vue deleted file mode 100644 index 3c50db0..0000000 --- a/src/views/mes/qc/iqc/iqcdefect.vue +++ /dev/null @@ -1,265 +0,0 @@ - - - diff --git a/src/views/mes/qc/iqc/iqcline.vue b/src/views/mes/qc/iqc/iqcline.vue index 1dfb2c3..52925a1 100644 --- a/src/views/mes/qc/iqc/iqcline.vue +++ b/src/views/mes/qc/iqc/iqcline.vue @@ -37,13 +37,13 @@ :limit.sync="queryParams.pageSize" @pagination="getList" /> - +