回退133

manifest.json

@@ -2,8 +2,8 @@
     "name" : "海亮铜箔",
     "appid" : "__UNI__3A002CD",
     "description" : "海亮铜箔二期手持系统",
-    "versionName" : "1.3.2",
+    "versionName" : "1.3.3",
-    "versionCode" : 132,
+    "versionCode" : 133,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/SecondPhase/production/ZjCheck.vue

@@ -12,6 +12,12 @@
 						<search-box v-model="val1" />
 					</view>
 				</view>
+				<view class="filter_item">
+					<view class="filter_label">管制点</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
 				<view class="filter_item">
 					<view class="filter_label">检验结果</view>
 					<view class="filter_input_wraper">
@@ -22,7 +28,7 @@
 		</view>
 		<view class="zd-row submitbar">
 			<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="_updatePackageInfo">确认</button>
+			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1 && !index1}" :disabled="disabled" @tap="_updatePackageInfo">确认</button>
 		</view>
 	</view>
 </template>
@@ -40,8 +46,10 @@
 			return {
 				title: '',
 				val1: '',
-				options: [{value: '3', text: '合格品'}, {value: '4', text: '管制品'}, {value: '5', text: '人工卷'}],
+				options: [{value: '3', text: '合格品'}, {value: '4', text: '管制品'}, {value: '0', text: '空点位'}, {value: '1', text: '有架子'}],
 				index: '',
+				options1: [{value: '1', text: '1'}, {value: '2', text: '2'}],
+				index1: '',
 				disabled: false
 			};
 		},
@@ -52,14 +60,17 @@
 			selectChange (e) {
 				this.index = e
 			},
+			selectChange1 (e) {
+				this.index1 = e
+			},
 			async _updatePackageInfo () {
 				this.disabled = true
-				if (!this.val1) {
+				if (!this.val1 && !this.index1) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await updatePackageInfo(this.index, this.val1)
+					let res = await updatePackageInfo(this.index, this.val1, this.index1)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
@@ -72,6 +83,7 @@
 			clearUp () {
 				this.val1 = ''
 				this.index = ''
+				this.index1 = ''
 			}
 		}
 	}

utils/getData3.js

@@ -156,9 +156,9 @@ export const doInitShaftPoint = (code, is) => request({
 /**
  * 子卷质检
  */
-export const updatePackageInfo = (ivt, cn) => request({
+export const updatePackageInfo = (ivt, cn, code) => request({
 	url:'api/twoPda/vehicle/updatePackageInfo',
-	data: {ivt_status: ivt, container_name: cn}
+	data: {ivt_status: ivt, container_name: cn, pointCode: code}
 })
 /**
  * 纸管绑定