fix(巡检): 优化巡检检查逻辑和界面显示，更新版本号至V1.0.3.40

manifest.json

@@ -2,7 +2,7 @@
     "name" : "智慧工厂",
     "appid" : "__UNI__45B3907",
     "description" : "",
-    "versionName" : "V1.0.3.39",
+    "versionName" : "V1.0.3.40",
     "versionCode" : "100",
     "transformPx" : false,
     "h5" : {

pages/maintenanceWorkorder/sparepart/sparepartList.vue

@@ -157,10 +157,7 @@
 					0: '未质检',
 					1: '已质检'
 				},
-				dimensionList: [{
-						name: '物料维度',
-						id: 4
-					},
+				dimensionList: [
 					{
 						name: '包装维度',
 						id: 3

pages/tour_tally/check/components/CheckCard.vue

@@ -29,7 +29,7 @@
 		<view class="card-cell">
 			<text class="label">结果</text>
 			<view class="cell-content">
-				<view class="content-status" v-if="type == 'view'">
+				<view class="content-status">
 					<!-- {{ item.executeStatus?'正常':'异常' }} -->
 
 					<div v-if="item.status == -1" style="color: red">异常</div>
@@ -131,7 +131,7 @@
 		},
 		methods: {
 			inputChange(obj, item) {
-				if (obj.target.value.length > 0) {
+				if (obj.target.value.length > 0&&obj.target.value!='正常') {
 					item.status = -1
 				} else {
 					item.status = 1

pages/tour_tally/check/index.vue

@@ -2,7 +2,7 @@
 	<view>
 		<uni-nav-bar fixed="true" statusBar="true" left-icon="back" title="检查中" @clickLeft="back"></uni-nav-bar>
 
-		<view class="top-wrapper">
+<!-- 		<view class="top-wrapper">
 			<uni-section>
 				<uni-easyinput prefixIcon="search" style="width: 460rpx" v-model="keyWords" placeholder="请输入">
 				</uni-easyinput>
@@ -13,7 +13,7 @@
 			<image class="menu_icon" src="~@/static/pda/menu.svg"></image>
 
 
-		</view>
+		</view> -->
 
 		<view class="check-content">
 			<view class="title">
@@ -106,6 +106,7 @@
 				let params = {
 					id: this.equipList[0].id,
 					executeStatus: isAllPass ? 1 : 2,
+					isAbnormal: isAllPass ? 1 : 0,
 					workItems: this.equipList.map(item => {
 						return {
 							content: item.content,
@@ -114,7 +115,7 @@
 							operationGuide: item.operationGuide,
 							result: item.result,
 							serialNum: item.serialNum,
-							status:item.status==-1?-1:1,
+							status: item.status == -1 ? -1 : 1,
 							photoList: item.photoList || []
 						}
 					})
@@ -238,6 +239,8 @@
 						return {
 							...item,
 							id: data.id,
+							status:1,
+							result:'正常',
 							executeStatus: 1
 						}
 					})

pages/tour_tally/detail/detail.vue

@@ -59,7 +59,7 @@
 						<template v-else-if="worksheetInfo.orderStatus === 2">
 							<button class="btn-execute" type="primary" @click="handleReport">报工</button>
 							<button class="btn-sparepart" type="warning" @click="handlbpbj">申请备品备件</button>
-							<button class="btn-reassignment" type="primary" @click="handleAssign">转派</button>
+							<button class="btn-reassignment" type="primary" @click="handleAssign" v-if="worksheetInfo.isGroup != 1">转派</button>
 						</template>
 						<button v-else-if="worksheetInfo.orderStatus === 3" :disabled="true" class="btn-execute"
 							type="primary">已报工</button>