diff --git a/src/api/device/equTeam.js b/src/api/device/equTeam.js new file mode 100644 index 00000000..1bd5d5d7 --- /dev/null +++ b/src/api/device/equTeam.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询设备班组维护列表 +export function listEquTeam(query) { + return request({ + url: '/device/equTeam/list', + method: 'get', + params: query + }); +} + +// 查询设备班组维护详细 +export function getEquTeam(id) { + return request({ + url: '/device/equTeam/' + id, + method: 'get' + }); +} + +// 新增设备班组维护 +export function addEquTeam(data) { + return request({ + url: '/device/equTeam', + method: 'post', + data: data + }); +} + +// 修改设备班组维护 +export function updateEquTeam(data) { + return request({ + url: '/device/equTeam', + method: 'put', + data: data + }); +} + +// 删除设备班组维护 +export function delEquTeam(id) { + return request({ + url: '/device/equTeam/' + id, + method: 'delete' + }); +} diff --git a/src/api/device/faultReport.js b/src/api/device/faultReport.js index 81cb2451..a89c5ead 100644 --- a/src/api/device/faultReport.js +++ b/src/api/device/faultReport.js @@ -70,9 +70,9 @@ export function checkFaultReport(data) { } // 查询报修人员列表 -export function getPersonList(query) { +export function getRepairPersonList(query) { return request({ - url: '/device/faultReport/getPersonList', + url: '/device/faultReport/getRepairPersonList', method: 'get', params: query }); diff --git a/src/api/device/repairOrder.js b/src/api/device/repairOrder.js index c096c36e..42ef4d8f 100644 --- a/src/api/device/repairOrder.js +++ b/src/api/device/repairOrder.js @@ -52,4 +52,22 @@ export function applyOutsource(data) { }); } +//填写维修记录 +export function writeRepairOrder(data) { + return request({ + url: '/device/repairOrder/write', + method: 'post', + data: data + }); +} + +// 查询维修人员列表 +export function getMaintenancePersonList(query) { + return request({ + url: '/device/repairOrder/getMaintenancePersonList', + method: 'get', + params: query + }); +} + diff --git a/src/views/device/equTeam/index.vue b/src/views/device/equTeam/index.vue new file mode 100644 index 00000000..e55295cc --- /dev/null +++ b/src/views/device/equTeam/index.vue @@ -0,0 +1,442 @@ + + + diff --git a/src/views/device/equTeam/selectSinglePerson.vue b/src/views/device/equTeam/selectSinglePerson.vue new file mode 100644 index 00000000..34ade194 --- /dev/null +++ b/src/views/device/equTeam/selectSinglePerson.vue @@ -0,0 +1,182 @@ + + + diff --git a/src/views/device/faultReport/selectSinglePerson.vue b/src/views/device/faultReport/selectSinglePerson.vue index 68cf559c..05f59b17 100644 --- a/src/views/device/faultReport/selectSinglePerson.vue +++ b/src/views/device/faultReport/selectSinglePerson.vue @@ -60,7 +60,7 @@ + + + diff --git a/src/views/device/repairOrder/selectSinglePerson.vue b/src/views/device/repairOrder/selectSinglePerson.vue index ceef0741..11fe0a92 100644 --- a/src/views/device/repairOrder/selectSinglePerson.vue +++ b/src/views/device/repairOrder/selectSinglePerson.vue @@ -38,9 +38,10 @@ - - + + + diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue index 83cdb18c..b5a91eca 100644 --- a/src/views/quality/qcIncome/checkProjectType.vue +++ b/src/views/quality/qcIncome/checkProjectType.vue @@ -143,6 +143,7 @@ export default { this.data=rowdata; this.queryParams.belongTo = this.data.recordId; this.typeCode = typeCode; + this.checkType = this.data.checkType; this.getList(); }, diff --git a/src/views/quality/qcIncome/index.vue b/src/views/quality/qcIncome/index.vue index ad0a2998..3cfe9c61 100644 --- a/src/views/quality/qcIncome/index.vue +++ b/src/views/quality/qcIncome/index.vue @@ -131,6 +131,7 @@ + @@ -636,6 +637,12 @@ export default { }, //检验项目弹窗 handleCheckProject(row){ + + if(row.checkStatus != '0'){ + this.$modal.msgSuccess("已经完成检验"); + return + } + this.$refs.itemSelectProject.showFlag = true; this.$refs.itemSelectProject.init(row,'material'); }, diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue index 3a06a6ef..b4c92d0f 100644 --- a/src/views/quality/qcProduce/index.vue +++ b/src/views/quality/qcProduce/index.vue @@ -41,9 +41,9 @@ @keyup.enter.native="handleQuery" /> - + - + + @@ -166,11 +167,11 @@ - - - + + + @@ -297,21 +298,21 @@ - - + + - - + + - + @@ -400,7 +401,7 @@ export default { open: false, // 查询参数 queryParams: { - produceDateArray: [], + incomeTimeArray: [], checkTimeArray: [], pageNum: 1, pageSize: 10, @@ -411,9 +412,9 @@ export default { materialName: null, quality: null, unit: null, - carCode: null, - carName: null, - produceDate: null, + supplierCode: null, + supplierName: null, + incomeTime: null, checkLoc: null, checkStatus: null, checkManCode: null, @@ -449,10 +450,10 @@ export default { unit: [ { required: true, message: "单位不能为空", trigger: "blur" } ], - carName: [ + supplierName: [ { required: true, message: "车间不能为空", trigger: "blur" } ], - produceDate: [ + incomeTime: [ { required: true, message: "生产时间不能为空", trigger: "blur" } ], checkManName: [ @@ -483,7 +484,7 @@ export default { getDate() { let start = this.Fungetdate (0) let end = this.Fungetdate (1) - this.queryParams.produceDateArray.push(start,end) + this.queryParams.incomeTimeArray.push(start,end) //this.queryParams.checkTimeArray.push(start,end) }, Fungetdate (num) { @@ -499,9 +500,9 @@ export default { getList() { this.loading = true; - if(this.queryParams.produceDateArray.length>0){ - this.queryParams.produceDateStart = moment(this.queryParams.produceDateArray[0]).format('YYYY-MM-DD HH:mm:ss'); - this.queryParams.produceDateEnd = moment(this.queryParams.produceDateArray[1]).format('YYYY-MM-DD HH:mm:ss'); + if(this.queryParams.incomeTimeArray.length>0){ + this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss'); + this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss'); } if(this.queryParams.checkTimeArray.length>0){ @@ -531,9 +532,9 @@ export default { materialName: null, quality: null, unit: null, - carCode: null, - carName: null, - produceDate: null, + supplierCode: null, + supplierName: null, + incomeTime: null, checkLoc: null, checkStatus: null, checkManCode: null, @@ -650,8 +651,8 @@ export default { }, //工作中心选择确认 onSelectWorkCenter(obj) { - this.form.carCode = obj.code; - this.form.carName = obj.name; + this.form.supplierCode = obj.code; + this.form.supplierName = obj.name; }, /**人员选择弹出框**/ @@ -665,6 +666,12 @@ export default { }, //检验项目弹窗 handleCheckProject(row){ + + if(row.checkStatus != '0'){ + this.$modal.msgSuccess("已经完成检验"); + return + } + this.$refs.itemSelectProject.showFlag = true; this.$refs.itemSelectProject.init(row,'produce'); }, diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue index fa7909df..ea5389fe 100644 --- a/src/views/quality/qcWarehousing/index.vue +++ b/src/views/quality/qcWarehousing/index.vue @@ -59,7 +59,6 @@ end-placeholder="结束日期"> - + @@ -659,6 +659,12 @@ export default { }, //检验项目弹窗 handleCheckProject(row){ + + if(row.checkStatus != '0'){ + this.$modal.msgSuccess("已经完成检验"); + return + } + this.$refs.itemSelectProject.showFlag = true; this.$refs.itemSelectProject.init(row,'product'); }, diff --git a/src/views/quality/unqualified/index.vue b/src/views/quality/unqualified/index.vue index bd29394c..77f1e65e 100644 --- a/src/views/quality/unqualified/index.vue +++ b/src/views/quality/unqualified/index.vue @@ -117,14 +117,7 @@ icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['quality:unqualified:edit']" - >修改 - 删除 + >处理 @@ -224,9 +217,6 @@ export default { form: {}, // 表单校验 rules: { - factoryCode: [ - { required: true, message: "工厂编码不能为空", trigger: "blur" } - ], } }; },