Commit 6b4a8935 authored by 张伯涛's avatar 张伯涛

修改

parent 4b4e9f0b
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
<el-option <el-option
v-for="dict in modelOption" v-for="dict in modelOption"
:key="dict.dictValue" :key="dict.dictValue"
:disabled="((dict.dictValue === '2' || dict.dictValue === '3') && (positionList.length > 1 || replaceNum > 0 || replaceNum1 > 1))" :disabled="(dict.dictValue === '2' && (positionList.length > 1 || replaceNum > 0 || replaceNum1 > 1)) ||
(dict.dictValue === '3' && (positionList.length > 2 || replaceNum > 0 || replaceNum1 > 1))"
:label="dict.dictLabel" :label="dict.dictLabel"
:value="dict.dictValue" :value="dict.dictValue"
/> />
...@@ -1256,6 +1257,10 @@ export default { ...@@ -1256,6 +1257,10 @@ export default {
this.$message.error('请至少添加一个工站') this.$message.error('请至少添加一个工站')
return return
} }
if (!(this.form.modelType === '3' && this.positionList[0].dictLabel === '扫描工站' && this.positionList[1].dictLabel === '测试工站')) {
this.$message.error('包装测试需要第一站为扫描站第二站为测试站')
return
}
const params = this.initData() const params = this.initData()
for (let i = 0; this.positionList.length > i; i++) { for (let i = 0; this.positionList.length > i; i++) {
// if (i === 0) continue // if (i === 0) continue
...@@ -1346,7 +1351,7 @@ export default { ...@@ -1346,7 +1351,7 @@ export default {
return return
} }
} }
console.log('aaaaaaaaaaaaa', this.form.modelType, this.addPositionListOne[0].staType,this.positionList) console.log('aaaaaaaaaaaaa', this.form.modelType, this.addPositionListOne[0].staType, this.positionList)
if (this.form.modelType === '3' && this.positionList.length === 1) { if (this.form.modelType === '3' && this.positionList.length === 1) {
if (this.addPositionListOne[0].staType !== '1') { if (this.addPositionListOne[0].staType !== '1') {
this.$message.error('包装测试的第二工站必须为测试工站') this.$message.error('包装测试的第二工站必须为测试工站')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment