diff --git a/manifest.json b/manifest.json index fcd6f66..80dd5ce 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "海亮铜箔", "appid" : "__UNI__3A002CD", "description" : "海亮铜箔二期手持系统", - "versionName" : "1.3.2", - "versionCode" : 132, + "versionName" : "1.3.3", + "versionCode" : 133, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/SecondPhase/production/ZjCheck.vue b/pages/SecondPhase/production/ZjCheck.vue index 81457bf..856b5f5 100644 --- a/pages/SecondPhase/production/ZjCheck.vue +++ b/pages/SecondPhase/production/ZjCheck.vue @@ -12,6 +12,12 @@ + + 管制点 + + + + 检验结果 @@ -22,7 +28,7 @@ - + @@ -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 = '' } } } diff --git a/utils/getData3.js b/utils/getData3.js index 9ef9d7e..7ca6b99 100644 --- a/utils/getData3.js +++ b/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} }) /** * 纸管绑定