diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index 988c906..69f1807 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -352,6 +352,9 @@ t.quality.relaxedToNormal = '放宽转正常' t.quality.tightenedToNormal = '加严转正常' t.quality.productName = '检验产品' t.quality.transferTime = '转移时间' +t.quality.inspectionType = '检验类型' +t.quality.measuringTools = '量具' + diff --git a/src/views/modules/basic/components/control-add.vue b/src/views/modules/basic/components/control-add.vue index c1a5ed2..50d2482 100644 --- a/src/views/modules/basic/components/control-add.vue +++ b/src/views/modules/basic/components/control-add.vue @@ -1,7 +1,7 @@ @@ -71,6 +71,7 @@ export default { incomingInspection: null, outInspection: null, processInspection: null, + specification:null }, }; }, diff --git a/src/views/modules/quality/components/inspectionPositionSearch.vue b/src/views/modules/quality/components/inspectionPositionSearch.vue new file mode 100644 index 0000000..656c95e --- /dev/null +++ b/src/views/modules/quality/components/inspectionPositionSearch.vue @@ -0,0 +1,138 @@ + + + + diff --git a/src/views/modules/quality/components/transferRecords-add.vue b/src/views/modules/quality/components/transferRecords-add.vue index d14322d..2b6d8ae 100644 --- a/src/views/modules/quality/components/transferRecords-add.vue +++ b/src/views/modules/quality/components/transferRecords-add.vue @@ -1,7 +1,7 @@ @@ -13,8 +13,8 @@ - - + + @@ -155,6 +155,10 @@ export default { } ], visible: false, + listQuery: { + limit: 999, + page:1, + }, dataForm: { id: null, inspectionStage:null, @@ -196,6 +200,9 @@ export default { }; }, }, + mounted () { + this.getData(); + }, methods: { init(id, ) { this.dataForm.id = id || "" @@ -212,7 +219,9 @@ export default { }); }, getData() { - this.$http.post(this.urlOptions.getSupplierList) + this.$http.get(this.urlOptions.getSupplierList, { + params:this.listQuery + }) .then(({ data: res }) => { if (res.code === 0) { console.log(res); @@ -221,7 +230,9 @@ export default { }) .catch(() => { }) - this.$http.post(this.urlOptions.getProductList) + this.$http.get(this.urlOptions.getProductList, { + params: this.listQuery + }) .then(({ data: res }) => { if (res.code === 0) { console.log(res); @@ -230,7 +241,9 @@ export default { }) .catch(() => { }) - this.$http.post(this.urlOptions.getTransferSchemeListURL) + this.$http.get(this.urlOptions.getTransferSchemeListURL, { + params: this.listQuery + }) .then(({ data: res }) => { if (res.code === 0) { console.log(res); diff --git a/src/views/modules/quality/components/transferRecordsSearch.vue b/src/views/modules/quality/components/transferRecordsSearch.vue index 9bb476d..edf857b 100644 --- a/src/views/modules/quality/components/transferRecordsSearch.vue +++ b/src/views/modules/quality/components/transferRecordsSearch.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2023-01-04 10:29:40 * @LastEditors: zhp - * @LastEditTime: 2023-05-24 16:39:37 + * @LastEditTime: 2023-07-06 16:26:20 * @Description: --> diff --git a/src/views/modules/quality/components/transferSchemeSearch.vue b/src/views/modules/quality/components/transferSchemeSearch.vue index 486b562..689338f 100644 --- a/src/views/modules/quality/components/transferSchemeSearch.vue +++ b/src/views/modules/quality/components/transferSchemeSearch.vue @@ -2,16 +2,16 @@ * @Author: zwq * @Date: 2023-01-04 10:29:40 * @LastEditors: zhp - * @LastEditTime: 2023-05-24 16:01:06 + * @LastEditTime: 2023-07-06 16:32:10 * @Description: --> @@ -33,8 +33,8 @@ export default { visible: false, customerTypeList:{}, dataForm: { - transferSchemeName: null, - transferSchemeCode:null + name: null, + code:null } }; }, diff --git a/src/views/modules/quality/qmsCustomSampling.vue b/src/views/modules/quality/qmsCustomSampling.vue index 2c60844..68885fc 100644 --- a/src/views/modules/quality/qmsCustomSampling.vue +++ b/src/views/modules/quality/qmsCustomSampling.vue @@ -1,7 +1,7 @@ @@ -220,7 +220,7 @@ export default { // console.log(key); // console.log(key); // this.listQuery.key = key; - this.listQuery.customSamplingCode = dataForm.customSamplingCode + this.listQuery.key = dataForm.customSamplingCode // this.listQuery.name = dataForm.name // this.listQuery.failureTypeStatus = dataForm.failureTypeStatus this.listQuery.page = 1 @@ -267,7 +267,7 @@ export default { case "search": // this.listQuery.paramCode = val.paramCode; this.listQuery.page = 1; - this.listQuery.failureTypeStatus = null + this.listQuery.key = null this.getDataList(); break; case "add": diff --git a/src/views/modules/quality/qmsDisposalMethod.vue b/src/views/modules/quality/qmsDisposalMethod.vue index f78f554..d6610d5 100644 --- a/src/views/modules/quality/qmsDisposalMethod.vue +++ b/src/views/modules/quality/qmsDisposalMethod.vue @@ -1,7 +1,7 @@ @@ -23,12 +23,12 @@ - - + + - + @@ -145,11 +145,11 @@ export default { this.searchOrEditTitle = "搜索"; this.searchOrUpdateVisible = true; this.$nextTick(() => { - this.$refs.searchOrUpdate.init(); + this.$refs.searchOrUpdate.init() }); }, conditionSearchSubmit(dataForm) { - this.listQuery.disposalMethodStatus = dataForm.disposalMethodStatus + this.listQuery.key = dataForm.disposalMethodStatus this.listQuery.page = 1; this.getDataList(); this.searchOrUpdateVisible = false; @@ -194,7 +194,7 @@ export default { case "search": // this.listQuery.paramCode = val.paramCode; this.listQuery.page = 1; - this.listQuery.failureTypeStatus = null + this.listQuery.key = null this.getDataList(); break; case "add": diff --git a/src/views/modules/quality/qmsInspectionPosition.vue b/src/views/modules/quality/qmsInspectionPosition.vue index 1c54d8a..300648f 100644 --- a/src/views/modules/quality/qmsInspectionPosition.vue +++ b/src/views/modules/quality/qmsInspectionPosition.vue @@ -1,7 +1,7 @@ @@ -9,9 +9,9 @@
- + - - + + - + + @@ -50,7 +51,7 @@ import basicPage from "@/mixins/basic-page" import InspectionPositionAdd from "./components/InspectionPosition-add" // import AddOrUpdate from './params-add-or-update' -// import failureTypeSearch from "./components/failureTypeSearch" +import inspectionPositionSearch from "./components/inspectionPositionSearch" // import available from "./components/available.vue" import basicSearch from "@/mixins/basic-search" import i18n from "@/i18n" @@ -85,6 +86,7 @@ export default { mixins: [basicPage, basicSearch], components: { // failureTypeSearch, + inspectionPositionSearch, InspectionPositionAdd }, data() { @@ -144,6 +146,8 @@ export default { }, conditionSearchSubmit(dataForm) { this.listQuery.code = dataForm.code + this.listQuery.name = dataForm.name + this.listQuery.page = 1; this.getDataList(); this.searchOrUpdateVisible = false; @@ -188,7 +192,8 @@ export default { case "search": // this.listQuery.paramCode = val.paramCode; this.listQuery.page = 1; - this.listQuery.failureTypeStatus = null + this.listQuery.name = null + this.listQuery.code = null this.getDataList(); break; case "add": diff --git a/src/views/modules/quality/qmsTransferRecords.vue b/src/views/modules/quality/qmsTransferRecords.vue index 36a2c0e..d01ce0d 100644 --- a/src/views/modules/quality/qmsTransferRecords.vue +++ b/src/views/modules/quality/qmsTransferRecords.vue @@ -1,7 +1,7 @@ @@ -28,7 +28,7 @@ - + @@ -215,7 +215,12 @@ export default { case "search": // this.listQuery.paramCode = val.paramCode; this.listQuery.page = 1; - this.listQuery.failureTypeStatus = null + this.listQuery.startTime = null + this.listQuery.endTime = null + this.listQuery.inspectionStage = null + this.listQuery.inspectionTypeId = null + this.listQuery.productId = null + this.listQuery.supplierId = null this.getDataList(); break; case "add": diff --git a/src/views/modules/quality/qmsTransferScheme.vue b/src/views/modules/quality/qmsTransferScheme.vue index 285d834..524c224 100644 --- a/src/views/modules/quality/qmsTransferScheme.vue +++ b/src/views/modules/quality/qmsTransferScheme.vue @@ -1,7 +1,7 @@ @@ -28,7 +28,7 @@ - + @@ -168,9 +168,8 @@ export default { }); }, conditionSearchSubmit(dataForm) { - this.listQuery.transferSchemeCode = dataForm.transferSchemeCode - this.listQuery.transferSchemeName = dataForm.transferSchemeName - + this.listQuery.name = dataForm.name + this.listQuery.code = dataForm.code this.listQuery.page = 1; this.getDataList(); this.searchOrUpdateVisible = false; @@ -215,7 +214,8 @@ export default { case "search": // this.listQuery.paramCode = val.paramCode; this.listQuery.page = 1; - this.listQuery.failureTypeStatus = null + this.listQuery.code = null + this.listQuery.name = null this.getDataList(); break; case "add":