diff --git a/src/pages/deviceReport/addForm.vue b/src/pages/deviceReport/addForm.vue index 435f402..8129005 100644 --- a/src/pages/deviceReport/addForm.vue +++ b/src/pages/deviceReport/addForm.vue @@ -265,7 +265,6 @@ }, async onLoad(option) { if (option.type) this.type = option.type; - console.log(33,this.type) this.appDeviceMoldType = await dictApi.getDict('app_device_mold_type') if(this.type == 'DEVICE'){ this.appDeviceMoldType = this.appDeviceMoldType.filter((item => item.value != "MOLD")) diff --git a/src/pages/index.vue b/src/pages/index.vue index 20baeb0..2e8882f 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -44,6 +44,7 @@ 设备维护 + @@ -51,25 +52,25 @@ 设备报修 - + 维修工单 - + 检修工单 - + 点检工单 - + 保养工单 @@ -88,19 +89,19 @@ 模具报修 - + 维修工单 - + 检修工单 - + 保养工单 diff --git a/src/pages/repairOrder/detail.vue b/src/pages/repairOrder/detail.vue index f1775d0..69bb3f3 100644 --- a/src/pages/repairOrder/detail.vue +++ b/src/pages/repairOrder/detail.vue @@ -71,19 +71,19 @@ 设备编号: - {{data1.deviceNumber}} + {{data.deviceNumber}} 设备名称: - {{data1.name}} + {{data.name}} 所属厂区: - {{data1.factoryAreaName}} + {{data.factoryAreaName}} 设备类型: - {{data1.type == 'DEVICE'?'设备':data1.type == 'TECH'?'工艺':'模具'}} + {{data.type == 'DEVICE'?'设备':data1.type == 'TECH'?'工艺':'模具'}} @@ -360,7 +360,7 @@ }) }, transfer() { - this.$tab.navigateTo(`/pages/repairOrder/transfer?type=${this.type}&id=${this.data.id}`) + this.$tab.navigateTo(`/pages/repairOrder/transfer?type=${this.data.type}&id=${this.data.id}`) }, previewImage(current, array) { uni.previewImage({ diff --git a/src/pages/repairOrder/transfer.vue b/src/pages/repairOrder/transfer.vue index 2202ef4..54a5832 100644 --- a/src/pages/repairOrder/transfer.vue +++ b/src/pages/repairOrder/transfer.vue @@ -175,11 +175,13 @@ this.type = this.form[this.field] this.form.deviceName = '' this.form.deviceNumber = '' + this.form.receiverUserId = undefined this.getDeviceList() } else if (this.field == 'deviceNumber') { this.choosesingleColumnItem = this.singleColumnList.filter(item => item.number == e[0].value) this.form.factoryAreaName = this.choosesingleColumnItem[0].factoryAreaName this.form.factoryAreaNumber = this.choosesingleColumnItem[0].factoryAreaNumber + this.form.receiverUserId = undefined this.getSelecUser() } this.singleColumnShow = false @@ -252,7 +254,7 @@ async onLoad(option) { if (option.type) this.type = option.type; if (option.id) this.form.id = option.id; - this.deviceMoldType = await dictApi.getDict('device_mold_type') + this.deviceMoldType = await dictApi.getDict('app_device_mold_type') this.deviceMoldType = this.deviceMoldType.filter(item => item.value != this.type) } }