diff --git a/src/pages/repairOrder/addServiceRecord.vue b/src/pages/repairOrder/addServiceRecord.vue index 53a6c11..4379d1c 100644 --- a/src/pages/repairOrder/addServiceRecord.vue +++ b/src/pages/repairOrder/addServiceRecord.vue @@ -224,8 +224,7 @@ async getSelecUser() { let data = { classType: this.type, - factoryAreaNumber: this.factoryAreaNumber, - flag: 1 + factoryAreaNumber: this.factoryAreaNumber } let arr = [] if (this.form.maintenances) { diff --git a/src/pages/repairOrder/detail.vue b/src/pages/repairOrder/detail.vue index 4a299a9..e104a4e 100644 --- a/src/pages/repairOrder/detail.vue +++ b/src/pages/repairOrder/detail.vue @@ -18,7 +18,7 @@ {{data.describes}} - + @@ -42,11 +42,11 @@ - + 班次: {{data.classesName}} - + 故障类型: {{data.faultTypeName}} @@ -141,7 +141,7 @@ {{item.describes}} - @@ -174,7 +174,7 @@ + v-if="(data.status == 'PENDING' || data.status == 'PECEIVED')"> 添加维修内容 @@ -182,11 +182,11 @@ - + 接单 - + 修改工单 完成 @@ -292,10 +292,6 @@ orderClickSuccess() { // 如果点击完成是否与接单人员一致 if (this.data.status == 'PECEIVED') { - if (this.$store.state.user.id != this.data.maintenance) { - this.$modal.showToast('当前人员与接单人员不一致') - return; - } if (!this.serviceList || this.serviceList && this.serviceList.length == 0) { this.$modal.showToast('请添加维修内容') diff --git a/src/pages/repairOrder/index.vue b/src/pages/repairOrder/index.vue index ed54711..3423e55 100644 --- a/src/pages/repairOrder/index.vue +++ b/src/pages/repairOrder/index.vue @@ -4,7 +4,7 @@ diff --git a/src/pages/repairOrder/transfer.vue b/src/pages/repairOrder/transfer.vue index dac0772..1b918f7 100644 --- a/src/pages/repairOrder/transfer.vue +++ b/src/pages/repairOrder/transfer.vue @@ -218,8 +218,7 @@ if (this.type == 'DEVICE'||this.type == 'TECH') { deviceApi.getDeviceDetailsByNumber({ number:this.form.deviceNumber, - type:this.type, - flag:1 + type:this.type }).then(async (res) => { if(!res.data){ this.$modal.showToast('找不到该设备') @@ -242,8 +241,7 @@ }) } else if (this.type == 'MOLD') { moldApi.getMoldDetailsByNumber({ - number:this.form.deviceNumber, - flag:1 + number:this.form.deviceNumber }).then(async (res) => { if(!res.data){ this.$modal.showToast('找不到该设备') @@ -388,7 +386,7 @@ this.deviceMoldType = await dictApi.getDict('app_device_mold_type') this.form.receiverType = this.deviceMoldType[0].value - // this.deviceMoldType = this.deviceMoldType.filter(item => item.value != this.type) + this.deviceMoldType = this.deviceMoldType.filter(item => item.value != this.type) this.getFactoryAreaList() } }