From 9cf245d024a58a1af091c8218e5c0f58f6c69d04 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 18 Mar 2024 15:11:50 +0800 Subject: [PATCH] fix: bug --- package.json | 8 ++--- src/pages/deviceReport/addForm.vue | 35 ++++---------------- src/pages/overhaulOrder/addServiceRecord.vue | 2 +- src/pages/repairOrder/addForm.vue | 23 ++++++------- src/pages/repairOrder/addServiceRecord.vue | 4 --- src/pages/sparePartsApplication/addForm.vue | 6 ---- src/pages/spotCheckOrder/addForm.vue | 5 +-- src/pages/upkeepOrder/addServiceRecord.vue | 9 +++-- 8 files changed, 27 insertions(+), 65 deletions(-) diff --git a/package.json b/package.json index 4abe9a4..e9c769a 100644 --- a/package.json +++ b/package.json @@ -11,10 +11,10 @@ "test:mp-weixin": "uni build -p mp-weixin", "test:app": "uni build -p app", "test:custom": "uni build -p", - "build": "uni build --mode production", - "build:mp-weixin": "uni build -p mp-weixin --mode production", - "build:app": "uni build -p app --mode production", - "build:custom": "uni build -p --mode production" + "prod": "uni build --mode production", + "prod:mp-weixin": "uni build -p mp-weixin --mode production", + "prod:app": "uni build -p app --mode production", + "prod:custom": "uni build -p --mode production" }, "dependencies": { "@dcloudio/uni-app": "3.0.0-alpha-3060920221114001", diff --git a/src/pages/deviceReport/addForm.vue b/src/pages/deviceReport/addForm.vue index b1aaa17..c6d71ef 100644 --- a/src/pages/deviceReport/addForm.vue +++ b/src/pages/deviceReport/addForm.vue @@ -5,22 +5,10 @@ - - {{selectFormat(form.type,appDeviceMoldType)}} + {{form.typeName}} {{`请选择类型`}} @@ -28,17 +16,6 @@ - @@ -109,12 +86,14 @@ deviceName: '', factoryAreaName: '', factoryAreaNumber: '', - type: '' + type: '', + typeName:'' }) const singleColumnShow = ref(false) const singleColumnDefaultValue = ref([]) const singleColumnList = ref([]) const imgList = ref([]) + const field = ref('') function chickRightButton(field) { if (!form.value.type) { proxy.$modal.showToast('请先选择类型') @@ -249,10 +228,6 @@ console.log(res) form.value = {} imgList.value = [] } - function selectFormat(val, array) { - let str = array.filter(item => item.value == val)[0].label - return str - } // 单列模式 function openSingleColumn(fieldName, val, list) { singleColumnList.value = list @@ -274,6 +249,7 @@ console.log(res) } if (field.value == 'type') { type.value = form.value[field.value] + form.value.typeName = e[0].label getDetailsByNumber() } singleColumnShow.value = false @@ -320,6 +296,7 @@ console.log(res) appDeviceMoldTyp.value =appDeviceMoldType.value.filter((item => item.value == "MOLD")) } form.value.type = appDeviceMoldType.value[0].value + form.value.typeName = appDeviceMoldType.value[0].label getFactoryAreaList() }) diff --git a/src/pages/overhaulOrder/addServiceRecord.vue b/src/pages/overhaulOrder/addServiceRecord.vue index 1c63d00..7e685f1 100644 --- a/src/pages/overhaulOrder/addServiceRecord.vue +++ b/src/pages/overhaulOrder/addServiceRecord.vue @@ -99,7 +99,7 @@ - {{selectFormat(form1.number,sparePartsList)}} + {{form1.name}} 请选择备件 diff --git a/src/pages/repairOrder/addForm.vue b/src/pages/repairOrder/addForm.vue index f7979b6..26f1966 100644 --- a/src/pages/repairOrder/addForm.vue +++ b/src/pages/repairOrder/addForm.vue @@ -8,7 +8,7 @@ - {{selectFormat(form.type,appDeviceMoldType)}} + {{form.typeName}} {{`请选择类型`}} @@ -50,7 +50,7 @@ - {{selectFormat(form.classes,maintenanceShift)}} + {{form.classesName}} {{`请选择班次`}} @@ -61,7 +61,7 @@ - {{selectFormat(form.faultType,faultType)}} + {{form.faultTypeName}} {{`请选择故障类型`}} @@ -265,15 +265,7 @@ form.value = {} } } - // - function selectFormat(val, array) { - if (array.length > 0) { - let str = array.filter(item => item.value == val)[0].label - return str - } else { - return '' - } - } + // 单列模式 function openSingleColumn(fieldName, val, list) { if ((fieldName == 'deviceNumber' || fieldName == 'type') && form.value.id) return; @@ -294,6 +286,12 @@ form.value.factoryAreaName = choosesingleColumnItem.value[0].factoryAreaName form.value.factoryAreaNumber = choosesingleColumnItem.value[0].factoryAreaNumber form.value.deviceName = choosesingleColumnItem.value[0].name + }else if(field.value == 'classes'){ + form.value.classesName =e[0].label + }else if(field.value == 'faultType'){ + form.value.faultTypeName =e[0].label + }else if(field.value == 'type'){ + form.value.typeName =e[0].label } singleColumnShow.value = false } @@ -345,6 +343,7 @@ } form.value.type = appDeviceMoldType.value[0].value + form.value.typeName = appDeviceMoldType.value[0].label faultType.value = await dictApi.getDict('fault_type') }) diff --git a/src/pages/repairOrder/addServiceRecord.vue b/src/pages/repairOrder/addServiceRecord.vue index 974db59..deaf0c8 100644 --- a/src/pages/repairOrder/addServiceRecord.vue +++ b/src/pages/repairOrder/addServiceRecord.vue @@ -262,10 +262,6 @@ form.value.maintenances = chooseUserList.value.join(',') isShowSelecUser.value = false } - // function selectFormat(val, array) { - // let str = array.filter(item => item.value == val)[0].label - // return str - // } // 单列模式 function openSingleColumn(fieldName, val, list) { if (fieldName == 'deviceNumber' && form.value.id) return; diff --git a/src/pages/sparePartsApplication/addForm.vue b/src/pages/sparePartsApplication/addForm.vue index eccb9be..8fb0464 100644 --- a/src/pages/sparePartsApplication/addForm.vue +++ b/src/pages/sparePartsApplication/addForm.vue @@ -296,12 +296,6 @@ proxy.$modal.showToast('数量不可以大于库存') return; } - // if (form1.value.itemNumber) { - // form1.value.name = this.selectFormat(this.form1.itemNumber, this.sparePartsList) - // } - // if (this.form1.deviceNumber) { - // this.form1.deviceName = this.selectFormat(this.form1.deviceNumber, this.deviceList) - // } if (form.valuesubList && form.value.subList.length > 0) { let arr = form.value.subList.filter(item => item.itemNumber == form1.value.itemNumber) if (arr && arr.length > 0) { diff --git a/src/pages/spotCheckOrder/addForm.vue b/src/pages/spotCheckOrder/addForm.vue index 1da2c5f..e396626 100644 --- a/src/pages/spotCheckOrder/addForm.vue +++ b/src/pages/spotCheckOrder/addForm.vue @@ -206,10 +206,7 @@ classes: '' } } - function selectFormat(val, array) { - let str = array.filter(item => item.value == val)[0].label - return str - } + // 单列模式 function openSingleColumn(fieldName, val, list) { singleColumnList.value = list diff --git a/src/pages/upkeepOrder/addServiceRecord.vue b/src/pages/upkeepOrder/addServiceRecord.vue index d90fffd..bec9081 100644 --- a/src/pages/upkeepOrder/addServiceRecord.vue +++ b/src/pages/upkeepOrder/addServiceRecord.vue @@ -1,7 +1,7 @@