提交

components/dialog-Search/dialog-Search.vue

@@ -2,7 +2,7 @@
 	<dialog-base ref="baseDialog" title="搜索">
 		<view class="list-container">
 			<input class="input-control" v-model="keywork" placeholder='批次号或产品描述' />
-			<view class="login-btn uni-row" @click=""><text class="label">确认</text></view>
+			<view class="login-btn uni-row" @click="handleConfirm"><text class="label">确认</text></view>
 		</view>
 	</dialog-base>
 </template>
@@ -19,7 +19,8 @@
 
 	const baseDialog = ref(null)
 	const keywork = ref("");
-
+	
+	const emit = defineEmits(["search"]);
 
 	function open() {
 		resetPage();
@@ -28,7 +29,7 @@
 	}
 
 	function resetPage() {
-
+		keywork.value = ''
 	}
 
 	defineExpose({
@@ -37,9 +38,12 @@
 
 	function close() {
 		baseDialog.value.close()
-
 	}
-
+	function handleConfirm() {
+		emit('search', keywork.value)
+		close()
+	}
+	
 	function init() {
 
 	}

components/dialog-lotReporting/dialog-lotReporting.vue

@@ -166,6 +166,7 @@
 			daywork: {
 				...v.daywork,
 				processId: v.process.id,
+				processStepNumber: v.process.processStepNumber,
 				technologicalProcessDetailId: v.process.technologicalProcessDetailId
 			},
 			quickInfo: {

pages/fastProductionPlan/index.vue

@@ -38,8 +38,6 @@
 					<text class="label">下序</text>
 					<text class="label right">{{item['process']}}</text>
 				</view> -->
-
-
 				<view class="item-info uni-row">
 					<text class="label">当前序</text>
 					<text class="label right">{{item['process'].processAlias}}</text>
@@ -70,7 +68,7 @@
 			<button class='bottom-btn right-btn' type="primary" @click="handleContinue">继续扫码</button>
 		</view>
 		<dialog-lotReporting ref="lotReporting" :getList="init" @scan="handleAdd"></dialog-lotReporting>
-		<dialog-Search ref="searchRef"></dialog-Search>
+		<dialog-Search ref="searchRef" @search="refreshSearch"></dialog-Search>
 	</view>
 </template>
 
@@ -105,6 +103,7 @@
 	const lotReporting = ref(null)
 	const workshopId = ref(null);
 	const searchRef = ref(null);
+	const keyword = ref('')
 
 	const form = ref([]); //表单数据true
 	const checkAll = ref(false); //是否全选
@@ -156,6 +155,11 @@
 	function handleSearch() {
 		searchRef.value.open();
 	}
+	
+	function refreshSearch(keyword) {
+		keyword.value = keyword
+		handleChangeWorkshop(workshopId.value)
+	}
 
 	function handleAdd() {
 		const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
@@ -240,6 +244,7 @@
 	function handleContinue() {
 		handleAdd()
 	}
+	
 	// 全选按钮操作
 	function handleAll() {
 		//清空选中数据
@@ -258,7 +263,7 @@
 		console.log(allData.value)
 		console.log(workshop)
 		// console.log()
-		listData.value = allData.value.filter(v => workshop.depts.some(e => e.deptId === v.quickInfo.deptId))
+		listData.value = allData.value.filter(v => workshop.depts.some(e => e.deptId === v.quickInfo.deptId) && (v.lotCode.includes(keyword.value) || v.productDescription.include(keyword.value)))
 	}
 
 

pages/processInspection/consultation.vue

@@ -77,6 +77,13 @@
 	})
 
 	const handleSubmit = () => {
+		if (lot.value.question == null || lot.value.question == '') {
+			uni.showToast({
+				icon: 'none',
+				title: '请输入问题描述'
+			})
+			return
+		}
 		store.processInspection = null;
 		uni.$emit('addWasteConsultationEvent', {
 			question: lot.value.question

pages/sortBatchReporting/index.vue

@@ -330,8 +330,8 @@
 
 	function handleScanCode() {
 		// 引入原生插件
-		// const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
-		const mpaasScanModule = null
+		const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
+		// const mpaasScanModule = null
 		if (mpaasScanModule) {
 			// 调用插件的 mpaasScan 方法
 			mpaasScanModule.mpaasScan({

pages/sorting/consultation.vue

@@ -10,6 +10,10 @@
 				<view class="label">产品描述</view>
 				<view class="value">{{ dayworkItem.productDescription }}</view>
 			</view>
+			<view class="info-row uni-row">
+				<view class="label">技术负责人</view>
+				<view class="value">{{ dayworkItem.technicianName }}</view>
+			</view>
 			<view class="info-row uni-column">
 				<view class="label" style="margin-bottom: 16rpx;">问题描述</view>
 				<view class="value uni-row">
@@ -59,6 +63,13 @@
 	})
 
 	const handleSubmit = () => {
+		if (data.value.content == null || data.value.content == '') {
+			uni.showToast({
+				icon: 'none',
+				title: '请输入问题描述'
+			})
+			return
+		}
 		uni.$emit('addConsulttationEvent', {
 			content: data.value.content
 		})

pages/sorting/form.vue

@@ -8,6 +8,9 @@
 			<view class="product-info">
 				产品描述: {{ dayworkItem.productDescription }}
 			</view>
+			<view class="product-info">
+				投产数量: {{ dayworkItem.prodNum }}
+			</view>
 		</view>
 
 		<!-- 不合格信息 -->
@@ -136,6 +139,7 @@
 			console.log(res)
 			if (res.code === 200) {
 				dayworkItem.value = res.data
+				dayworkItem.value.qualifiedNum = res.data.prodNum
 				consultations.value = res.data.consults
 				unfitInfos.value = res.data.rejectList
 			} else {
@@ -175,6 +179,7 @@
 			technologicalProcessDetailId: dayworkItem.value.technologicalProcessDetailId,
 			processId: dayworkItem.value.processId,
 			processAlias: dayworkItem.value.process.processAlias,
+			technicianId: dayworkItem.value.technicianId
 		}
 		saveConsult(info).then(res => {
 			if (res.code === 200) {