fix: bug

8 months ago · 9cf245d024
8 changed files with 27 additions and 65 deletions
--- 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",
--- a/src/pages/deviceReport/addForm.vue
+++ b/src/pages/deviceReport/addForm.vue
@ -5,22 +5,10 @@
 			<u-form-item label="故障描述" prop="describes" required>
 				<u-input v-model="form.describes" placeholder="请输入故障描述" />
 			</u-form-item>
-			<!-- <u-form-item label="所属厂区" prop="factoryAreaNumber" required>
-				<view class="select"
-					@click="openSingleColumn('factoryAreaNumber',form.factoryAreaNumber,factoryAreaList)">
-					<view class="input" v-if='form.factoryAreaNumber'>
-						{{selectFormat(form.factoryAreaNumber,factoryAreaList)}}
-					</view>
-					<view class="placeholder" v-else>
-						{{`请选择所属厂区`}}
-					</view>
-					<u-icon name="arrow-right" color="#aaaaaa" size="28"></u-icon>
-				</view>
-			</u-form-item> -->
 			<u-form-item label="类型" prop="type" required>
 				<view class="select" @click="openSingleColumn('type',form.type,appDeviceMoldType)">
 					<view class="input" v-if='form.type'>
-						{{selectFormat(form.type,appDeviceMoldType)}}
+						{{form.typeName}}
 					</view>
 					<view class="placeholder" v-else>
 						{{`请选择类型`}}
@ -28,17 +16,6 @@
 					<u-icon name="arrow-right" color="#aaaaaa" size="28"></u-icon>
 				</view>
 			</u-form-item>
-			<!-- <u-form-item :label="`${type=='DEVICE'||type == 'TECH'?'设备' : '模具'}`" prop="deviceNumber" required>
-				<view class="select" @click="openSingleColumn('deviceNumber',form.deviceNumber,deviceList)">
-					<view class="input" v-if='form.deviceNumber'>
-						{{selectFormat(form.deviceNumber,deviceList)}}
-					</view>
-					<view class="placeholder" v-else>
-						{{`请选择${type=='DEVICE'||type == 'TECH'?'设备' : '模具'}`}}
-					</view>
-					<u-icon name="arrow-right" color="#aaaaaa" size="28"></u-icon>
-				</view>
-			</u-form-item> -->
 			<u-form-item :label="`${type=='DEVICE'||type == 'TECH'?'设备' : '模具'}编码`" prop="deviceNumber" required>
 				<u-input v-model="form.deviceNumber" :placeholder="`请输入${type=='DEVICE'||type == 'TECH'?'设备' : '模具'}编码`"
 					@blur="blur()" />
@ -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()
 	})
 </script>
--- a/src/pages/overhaulOrder/addServiceRecord.vue
+++ b/src/pages/overhaulOrder/addServiceRecord.vue
@ -99,7 +99,7 @@
 					<u-form-item :label="`备件`" prop="number" required>
 						<view class="select" @click="openSingleColumn('number',form1.number,sparePartsList,'form1')">
 							<view class="input" v-if='form1.number'>
-								{{selectFormat(form1.number,sparePartsList)}}
+								{{form1.name}}
 							</view>
 							<view class="placeholder" v-else>
 								请选择备件
--- a/src/pages/repairOrder/addForm.vue
+++ b/src/pages/repairOrder/addForm.vue
@ -8,7 +8,7 @@
 			<u-form-item label="类型" prop="type" required>
 				<view class="select" @click="openSingleColumn('type',form.type,appDeviceMoldType)">
 					<view class="input" v-if='form.type'>
-						{{selectFormat(form.type,appDeviceMoldType)}}
+						{{form.typeName}}
 					</view>
 					<view class="placeholder" v-else>
 						{{`请选择类型`}}
@ -50,7 +50,7 @@
 			<u-form-item label="班次" prop="classes" required>
 				<view class="select" @click="openSingleColumn('classes',form.classes,maintenanceShift)">
 					<view class="input" v-if='(form.classes||form.classes==0)&&maintenanceShift.length>0'>
-						{{selectFormat(form.classes,maintenanceShift)}}
+						{{form.classesName}}
 					</view>
 					<view class="placeholder" v-else>
 						{{`请选择班次`}}
@ -61,7 +61,7 @@
 			<u-form-item label="故障类型" prop="classes" required>
 				<view class="select" @click="openSingleColumn('faultType',form.faultType,faultType)">
 					<view class="input" v-if='form.faultType'>
-						{{selectFormat(form.faultType,faultType)}}
+						{{form.faultTypeName}}
 					</view>
 					<view class="placeholder" v-else>
 						{{`请选择故障类型`}}
@ -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')
 	})
 </script>
--- 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;
--- 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) {
--- 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
--- a/src/pages/upkeepOrder/addServiceRecord.vue
+++ b/src/pages/upkeepOrder/addServiceRecord.vue
@ -1,7 +1,7 @@
 <template>
 	<!-- 添加维修工单 -->
 	<view class="add-form-container">
-		<u-form :model="form" ref="form1" label-width="160rpx">
+		<u-form :model="form" ref="formRef" label-width="160rpx">
 			<u-form-item label="保养内容" prop="contents" required  class="disabled">
 				<u-input v-model="form.contents"  placeholder="请输入保养内容" maxlength="50" disabled/>
 			</u-form-item>
@ -31,7 +31,7 @@
 			<u-form-item label="完成情况" prop="status" required>
 				<view class="select" @click="openSingleColumn('status',form.status,jxDetailsStatus,'form')">
 					<view class="input" v-if='form.status'>
-						{{selectFormat(form.status,jxDetailsStatus)}}
+						{{form.statusTxt}}
 					</view>
 					<view class="placeholder" v-else>
 						{{`请选择完成情况`}}
@ -98,11 +98,11 @@
 		<u-popup v-model="isPopupShow" mode="center" border-radius="14">
 			<view class="popup-title">添加备件</view>
 			<view class="popup">
-				<u-form :model="form1" ref="form1" label-width="160rpx">
+				<u-form :model="form1" ref="form1Ref" label-width="160rpx">
 					<u-form-item :label="`备件`" prop="number" required>
 						<view class="select" @click="openSingleColumn('number',form1.number,sparePartsList,'form1')">
 							<view class="input" v-if='form1.number'>
-								{{selectFormat(form1.number,sparePartsList)}}
+								{{form1.name}}
 							</view>
 							<view class="placeholder" v-else>
 								请选择备件
@ -354,7 +354,6 @@ const form = ref({
 	function chooseSingleColumn(e) {
 		if(whichForm.value == 'form'){
 			form.value[field.value] = e[0].value
-			
 			if(field.value=='status'){
 				form.value.statusTxt = e[0].label
 			}