diff --git a/src/pages/deviceReport/addForm.vue b/src/pages/deviceReport/addForm.vue index c6d71ef..b311ec9 100644 --- a/src/pages/deviceReport/addForm.vue +++ b/src/pages/deviceReport/addForm.vue @@ -137,7 +137,7 @@ type: type.value, flag:1 }).then((res) => { -console.log(res) + console.log(res) if (!res.data) { form.value.deviceName = '' form.value.factoryAreaName = '' @@ -241,6 +241,7 @@ console.log(res) } // 单列模式点击确定之后 function chooseSingleColumn(e) { + if(form.value[field.value] == e[0].value)return; form.value[field.value] = e[0].value if (field.value == 'factoryAreaNumber') { form.value.deviceNumber = '' @@ -250,7 +251,11 @@ console.log(res) if (field.value == 'type') { type.value = form.value[field.value] form.value.typeName = e[0].label - getDetailsByNumber() + form.value.deviceNumber = '' + form.value.deviceName = '' + form.value.factoryAreaName = '' + form.value.factoryAreaNumber = '' + // getDetailsByNumber() } singleColumnShow.value = false } @@ -293,7 +298,7 @@ console.log(res) uni.setNavigationBarTitle({ title: '模具报修' }) - appDeviceMoldTyp.value =appDeviceMoldType.value.filter((item => item.value == "MOLD")) + appDeviceMoldType.value =appDeviceMoldType.value.filter((item => item.value == "MOLD")) } form.value.type = appDeviceMoldType.value[0].value form.value.typeName = appDeviceMoldType.value[0].label diff --git a/src/pages/deviceReport/index.vue b/src/pages/deviceReport/index.vue index ad62bd5..a334171 100644 --- a/src/pages/deviceReport/index.vue +++ b/src/pages/deviceReport/index.vue @@ -173,6 +173,7 @@ font-size: 36rpx; width: 0px; flex: 1; + word-wrap: break-word; } .time { diff --git a/src/pages/deviceReport/myDeviceReport.vue b/src/pages/deviceReport/myDeviceReport.vue index 1de8a58..6a93083 100644 --- a/src/pages/deviceReport/myDeviceReport.vue +++ b/src/pages/deviceReport/myDeviceReport.vue @@ -129,6 +129,7 @@ font-size: 36rpx; width: 0px; flex: 1; + word-wrap: break-word; } .time { diff --git a/src/pages/mold/index.vue b/src/pages/mold/index.vue index 444a10e..d04e644 100644 --- a/src/pages/mold/index.vue +++ b/src/pages/mold/index.vue @@ -129,6 +129,7 @@ .title { font-size: 32rpx; font-weight: bold; + word-wrap: break-word; } .dec1 { diff --git a/src/pages/overhaulOrder/index.vue b/src/pages/overhaulOrder/index.vue index ed6dc55..fd6a857 100644 --- a/src/pages/overhaulOrder/index.vue +++ b/src/pages/overhaulOrder/index.vue @@ -142,6 +142,7 @@ font-size: 36rpx; width: 0px; flex: 1; + word-wrap: break-word; } .time { diff --git a/src/pages/overhaulOrder/reqairOrderList.vue b/src/pages/overhaulOrder/reqairOrderList.vue index 056f4dd..941c154 100644 --- a/src/pages/overhaulOrder/reqairOrderList.vue +++ b/src/pages/overhaulOrder/reqairOrderList.vue @@ -132,6 +132,7 @@ font-size: 36rpx; width: 0px; flex: 1; + word-wrap: break-word; } .time { diff --git a/src/pages/repairOrder/index.vue b/src/pages/repairOrder/index.vue index 7cfb513..825b7b8 100644 --- a/src/pages/repairOrder/index.vue +++ b/src/pages/repairOrder/index.vue @@ -144,6 +144,7 @@ font-size: 36rpx; width: 0px; flex: 1; + word-wrap: break-word; } .time { diff --git a/src/pages/repairOrder/myOrder.vue b/src/pages/repairOrder/myOrder.vue index 70fece8..9349950 100644 --- a/src/pages/repairOrder/myOrder.vue +++ b/src/pages/repairOrder/myOrder.vue @@ -138,6 +138,7 @@ font-size: 36rpx; width: 0px; flex: 1; + word-wrap: break-word; } .time { diff --git a/src/pages/repairOrder/transfer.vue b/src/pages/repairOrder/transfer.vue index 02aa830..d31ffbf 100644 --- a/src/pages/repairOrder/transfer.vue +++ b/src/pages/repairOrder/transfer.vue @@ -36,17 +36,17 @@ - - 扫描 - - @@ -150,7 +150,7 @@ } if (form.value.status == 0) { if (!form.value.deviceNumber) { - proxy.$modal.showToast(`请选择${type.value == 'DEVICE' || type.value == 'TECH' ? '设备' : '模具'}编码`) + proxy.$modal.showToast(`请选择${form.value.receiverType == 'DEVICE' || form.value.receiverType == 'TECH' ? '设备' : '模具'}编码`) return; } } @@ -258,16 +258,18 @@ form.value.factoryAreaName = '' form.value.factoryAreaNumber = '' selecUserList.value = [] + form.value.receiverUserId = '' }) } else if (form.value.receiverType == 'MOLD') { moldApi.getMoldDetailsByNumber({ - number: form.deviceNumber + number: form.value.deviceNumber, }).then(async (res) => { if (!res.data) { form.value.deviceName = '' form.value.factoryAreaName = '' form.value.factoryAreaNumber = '' selecUserList.value = [] + form.value.receiverUserId = '' return; } form.value.deviceName = res.data.name @@ -279,6 +281,7 @@ form.value.factoryAreaName = '' form.value.factoryAreaNumber = '' selecUserList.value = [] + form.value.receiverUserId = '' }) } } @@ -298,14 +301,16 @@ function chooseSingleColumn(e) { form.value[field.value] = e[0].value if (field.value == 'receiverType') { - type.value = form.value[field.value] form.value.deviceName = '' form.value.deviceNumber = '' form.value.receiverUserId = undefined form.value.receiverTypeTxt = e[0].label + selecUserList.value = [] + form.value.receiverUserId = '' getDeviceList() } else if (field.value == 'factoryAreaNumber') { form.value.factoryAreaName = e[0].label + form.value.receiverUserId = '' getSelecUser() } else if (field.value == 'status') { @@ -318,13 +323,15 @@ console.log(deviceMoldType.value) form.value.receiverType = deviceMoldType.value[0].value form.value.receiverTypeTxt = deviceMoldType.value[0].label + selecUserList.value = [] + form.value.receiverUserId = '' } singleColumnShow.value = false } // 获取设备/模具列表 async function getDeviceList() { - if (type.value == 'DEVICE' || type.value == 'TECH') { + if (form.value.receiverType == 'DEVICE' || form.value.receiverType == 'TECH') { await deviceApi.deviceList().then(res => { res.data.map(item => { item.value = item.number @@ -332,7 +339,7 @@ }) deviceList.value = res.data }) - } else if (type.value == 'MOLD') { + } else if (form.value.receiverType == 'MOLD') { await moldApi.moldList().then(res => { res.data.map(item => { item.value = item.number @@ -346,7 +353,7 @@ // 获取人员列表 async function getSelecUser() { let data = { - classType: type.value, + classType: form.value.receiverType, factoryAreaNumber: form.value.factoryAreaNumber, } let arr = [] diff --git a/src/pages/spareParts/index.vue b/src/pages/spareParts/index.vue index c395320..02e41b0 100644 --- a/src/pages/spareParts/index.vue +++ b/src/pages/spareParts/index.vue @@ -191,6 +191,7 @@ .title { font-size: 32rpx; font-weight: bold; + word-wrap: break-word; } .dec1 { diff --git a/src/pages/sparePartsApplication/index.vue b/src/pages/sparePartsApplication/index.vue index ca893b5..ce5158a 100644 --- a/src/pages/sparePartsApplication/index.vue +++ b/src/pages/sparePartsApplication/index.vue @@ -148,6 +148,7 @@ font-size: 36rpx; width: 0px; flex: 1; + word-wrap: break-word; } .time { diff --git a/src/pages/sparePartsApplication/mySparePartsApplication.vue b/src/pages/sparePartsApplication/mySparePartsApplication.vue index d40aed1..8be18e5 100644 --- a/src/pages/sparePartsApplication/mySparePartsApplication.vue +++ b/src/pages/sparePartsApplication/mySparePartsApplication.vue @@ -135,6 +135,7 @@ font-size: 36rpx; width: 0px; flex: 1; + word-wrap: break-word; } .time { diff --git a/src/pages/sparePartsApplicationApprove/index.vue b/src/pages/sparePartsApplicationApprove/index.vue index 2a8db30..eb9c9e6 100644 --- a/src/pages/sparePartsApplicationApprove/index.vue +++ b/src/pages/sparePartsApplicationApprove/index.vue @@ -164,6 +164,7 @@ font-size: 36rpx; width: 0px; flex: 1; + word-wrap: break-word; } .time { diff --git a/src/pages/sparePartsApplicationApprove/mySparePartsApplicationApprove.vue b/src/pages/sparePartsApplicationApprove/mySparePartsApplicationApprove.vue index e021abc..3fa5f10 100644 --- a/src/pages/sparePartsApplicationApprove/mySparePartsApplicationApprove.vue +++ b/src/pages/sparePartsApplicationApprove/mySparePartsApplicationApprove.vue @@ -135,6 +135,7 @@ font-size: 36rpx; width: 0px; flex: 1; + word-wrap: break-word; } .time { diff --git a/src/pages/sparePartsServiceWorkOrderList/mySparePartsService.vue b/src/pages/sparePartsServiceWorkOrderList/mySparePartsService.vue index 7e4dde8..9e5a000 100644 --- a/src/pages/sparePartsServiceWorkOrderList/mySparePartsService.vue +++ b/src/pages/sparePartsServiceWorkOrderList/mySparePartsService.vue @@ -131,6 +131,7 @@ font-size: 36rpx; width: 0px; flex: 1; + word-wrap: break-word; } .time { diff --git a/src/pages/spotCheckOrder/myOrder.vue b/src/pages/spotCheckOrder/myOrder.vue index 5e99a85..991070f 100644 --- a/src/pages/spotCheckOrder/myOrder.vue +++ b/src/pages/spotCheckOrder/myOrder.vue @@ -125,6 +125,7 @@ font-size: 36rpx; width: 0px; flex: 1; + word-wrap: break-word; } .time { diff --git a/src/pages/upkeepOrder/index.vue b/src/pages/upkeepOrder/index.vue index 75bfadb..11c5d52 100644 --- a/src/pages/upkeepOrder/index.vue +++ b/src/pages/upkeepOrder/index.vue @@ -133,6 +133,7 @@ font-size: 36rpx; width: 0px; flex: 1; + word-wrap: break-word; } .time { diff --git a/src/pages/upkeepOrder/myOrder.vue b/src/pages/upkeepOrder/myOrder.vue index dbbb6a8..4dfa7cc 100644 --- a/src/pages/upkeepOrder/myOrder.vue +++ b/src/pages/upkeepOrder/myOrder.vue @@ -137,6 +137,7 @@ font-size: 36rpx; width: 0px; flex: 1; + word-wrap: break-word; } .time {