change

pages/hdyy/tygn/kc-query.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="zd_container">
 		<!-- 库存查询 -->
-		<nav-bar :title="title" :inner="true"></nav-bar>
+		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
@@ -9,7 +9,7 @@
 						<span class="filter_label">查询类型</span>
 					</view>
 					<view class="zd-col-18 filter_select">
-						<uni-data-select v-model="index1" :localdata="options1"></uni-data-select>
+						<uni-data-select v-model="index1" :localdata="options1" :clear="false"></uni-data-select>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
@@ -26,7 +26,7 @@
 					</view>
 					<view class="zd-col-13">
 						<!-- <search-box v-model="materialData.material_code"/> -->
-						<input type="text" class="filter_input" v-model="materialData.material_code" disabled>
+						<input type="text" class="filter_input" v-model="materialData.material_code">
 					</view>
 					<button class="mini-btn" type="primary" @tap="toJump('mater-save?title=物料维护')">查询</button>
 				</view>

pages/hdyy/tygn/pt-update.vue

@@ -56,8 +56,8 @@
 		<view class="zd-row submit-bar">
 			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
 			<button class="zd-col-6 button-primary" :class="{'button-info': !pointCode || !vehicleCode}" :disabled="disabled" @tap="_bind">绑定</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !pointCode || !vehicleCode}" :disabled="disabled" @tap="_clearVehicle">清载具</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !pointCode}" :disabled="disabled" @tap="_clearVehicle">清载具</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !pointCode || !vehicleCode}" :disabled="disabled" @tap="_clearMaterial">清物料</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !pointCode}" :disabled="disabled" @tap="_clearMaterial">清物料</button>
 		</view>
 	</view>
 </template>

pages/hdyy/tygn/work-manage.vue

@@ -30,7 +30,7 @@
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.task_id === pkId}">
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.task_code === pkId}">
 								<td>{{e.vehicle_code}}</td>
 								<td>{{e.point_code1}}</td>
 								<td>{{e.point_code2}}</td>
@@ -46,7 +46,7 @@
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-8 button-primary" :class="{'button-info': !pkId}" :disabled="disabled1" @tap="_taskOperation">重新下发</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !pkId}" :disabled="disabled1" @tap="_againSendTask">重新下发</button>
 			<button class="zd-col-8 button-primary" :class="{'button-info': !pkId}" :disabled="disabled2" @tap="_forceConfirmTask">强制完成</button>
 			<button class="zd-col-6 button-primary" @tap="toJump('ls-search?title=历史查询')">历史查询</button>
 		</view>
@@ -56,7 +56,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryTask, taskOperation, forceConfirmTask} from '@/utils/getData3.js'
+	import {queryTask, againSendTask, forceConfirmTask} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -99,14 +99,14 @@
 					this.dataList = []
 				}
 			},
-			async _taskOperation () {
+			async _againSendTask () {
 				this.disabled1 = true
 				if (!this.pkId) {
 					this.disabled1 = false
 					return
 				}
 				try {
-					let res = await taskOperation(this.pkObj)
+					let res = await againSendTask(this.pkObj)
 					if (res) {
 						this._queryTask()
 						uni.showToast({
@@ -152,8 +152,8 @@
 				}
 			},
 			toCheck (e) {
-				this.pkId = this.pkId === e.task_id ? '' : e.task_id
+				this.pkId = this.pkId === e.task_code ? '' : e.task_code
-				this.pkObj = this.pkId === e.task_id ? e : {}
+				this.pkObj = this.pkId === e.task_code ? e : {}
 			}
 		}
 	}