提交

manifest.json

@@ -2,8 +2,8 @@
     "name" : "(测试)德迈仕数字生产管理平台",
     "appid" : "__UNI__54D8B02",
     "description" : "",
-    "versionName" : "1.0.24",
-    "versionCode" : 124,
+    "versionName" : "1.0.29",
+    "versionCode" : 129,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/addNewBatch/index.vue

@@ -66,7 +66,13 @@
 					<label for="HeatNo">炉号:</label>
 					<uni-data-select v-if="isWasteRecyclingFlag" id="incomingInfo" class="uni-input data-select"
 						v-model="basicInfo" :localdata="furnaceNumberInfoList" :clear="false"
-						@change="handleFurnaceNumberChange"></uni-data-select>
+						@change="handleFurnaceNumberChange">
+						<template v-slot:option="{item }">
+							<!-- 自定义下拉框每一项的显示内容 -->
+							<span>{{ item.text }}</span>
+							<span style="color: #b3b3b3;">{{ item.value.incomingDate }}</span>
+						</template>
+					</uni-data-select>
 					<text id="incomingInfo" v-else class="uni-input">废品回用</text>
 				</view>
 				<!-- <view class='segment' style="width: 90%;margin: 20rpx auto;"></view> -->
@@ -310,7 +316,9 @@
 					if (res.data.code == 200 && res.data.data.length > 0) {
 						for (let i = 0; i < res.data.data.length; i++) {
 							furnaceNumberInfoList.value[i] = {
-								text: res.data.data[i].furnaceNumber,
+								text: res.data.data[i].furnaceNumber + '  (' + res.data.data[i]
+									.incomingDate + ')',
+								// text: '2415800347000 (2024-05-06)',
 								value: res.data.data[i]
 							}
 						}

pages/fastProductionPlan/index.vue

@@ -383,9 +383,10 @@
 		// console.log(allData.value)
 		// console.log(workshop)
 		// console.log()
+		// console.log(allData.value.filter(v => v.lotCode == null || v.productDescription == null || v.carrierName == null))
 		listData.value = allData.value.filter(v => workshop.depts.some(e => e.deptId === v.quickInfo.deptId) && (v.lotCode
-			.includes(keyword.value) || v.productDescription.includes(keyword.value) || v.carrierName.includes(
-				keyword.value)))
+			.includes(keyword.value) || v.productDescription.includes(keyword.value) || (v.carrierName != null && v
+				.carrierName.includes(keyword.value))))
 		selection.value = []
 	}
 

pages/index/index.vue

@@ -118,8 +118,9 @@
 		//uni.clearStorageSync();
 		initBaseUrl();
 		getCurrentVersion()
-			//getUser();
-			!useInnerUrl.value && setTimeout(doCheckUpdata, 500)
+		//getUser();
+		// !useInnerUrl.value && 
+		setTimeout(doCheckUpdata, 500)
 		initPdfUrl();
 	})
 

utils/request.js

@@ -4,7 +4,7 @@ import {
 import {
 	store
 } from '@/store/index.js'
-import globalModal from "@/components/dialog-notification/dialog-notification.vue";
+// import globalModal from "@/components/dialog-notification/dialog-notification.vue";
 // import baseURL from '@/api/base/path.js'
 
 function behindRequist({