|
@@ -102,7 +102,8 @@ export default {
|
|
|
// { jianCeXiangMu: 'A', xianDingFanWei: '50%', fhl: '80%' },
|
|
// { jianCeXiangMu: 'A', xianDingFanWei: '50%', fhl: '80%' },
|
|
|
// { jianCeXiangMu: 'B', xianDingFanWei: '40%', fhl: '80%' },
|
|
// { jianCeXiangMu: 'B', xianDingFanWei: '40%', fhl: '80%' },
|
|
|
// { jianCeXiangMu: 'C', xianDingFanWei: '30%', fhl: '80%' }
|
|
// { jianCeXiangMu: 'C', xianDingFanWei: '30%', fhl: '80%' }
|
|
|
- ]
|
|
|
|
|
|
|
+ ],
|
|
|
|
|
+ ypFlag: false
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
computed: {
|
|
computed: {
|
|
@@ -111,10 +112,28 @@ export default {
|
|
|
'formData.sjghyzjlbxmcszb': {
|
|
'formData.sjghyzjlbxmcszb': {
|
|
|
handler (val) {
|
|
handler (val) {
|
|
|
this.ypData = []
|
|
this.ypData = []
|
|
|
|
|
+ this.ypFlag = false
|
|
|
val.forEach(item => {
|
|
val.forEach(item => {
|
|
|
|
|
+ // 判断“平行实验/留样再测”表是否全填
|
|
|
|
|
+ if (!item.jianCeXiangMu || !item.canShuMingCheng || !item.xianDingFanWei) {
|
|
|
|
|
+ this.ypFlag = true
|
|
|
|
|
+ }
|
|
|
this.ypData.push({ ...item, fhl: '80%' })
|
|
this.ypData.push({ ...item, fhl: '80%' })
|
|
|
})
|
|
})
|
|
|
console.log(val, 'watch')
|
|
console.log(val, 'watch')
|
|
|
|
|
+ // 处理表单”平行实验/留样再测“
|
|
|
|
|
+ if (val.length && !this.ypFlag) {
|
|
|
|
|
+ // 点完计算结果后再去编辑”平行实验/留样再测“表单,则给表格置空重新填写
|
|
|
|
|
+ if (this.disabled && this.reagentData.length) {
|
|
|
|
|
+ this.copyDialogData = []
|
|
|
|
|
+ this.reagentData = []
|
|
|
|
|
+ this.disabled = false
|
|
|
|
|
+ return this.$message.error('请重新配置样品')
|
|
|
|
|
+ }
|
|
|
|
|
+ if (!this.disabled && this.reagentData.length) {
|
|
|
|
|
+ this.initData()
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
},
|
|
},
|
|
|
deep: true,
|
|
deep: true,
|
|
|
immediate: true
|
|
immediate: true
|
|
@@ -126,8 +145,9 @@ export default {
|
|
|
methods: {
|
|
methods: {
|
|
|
// 配置样品
|
|
// 配置样品
|
|
|
openDialog () {
|
|
openDialog () {
|
|
|
- if (this.ypData.length <= 0) {
|
|
|
|
|
- return this.$message.error('请先配置留样再测')
|
|
|
|
|
|
|
+ // “平行实验/留样再测”表单校验是否是true
|
|
|
|
|
+ if (this.ypData.length <= 0 || this.ypFlag) {
|
|
|
|
|
+ return this.$message.error('请先配置好留样再测再配置')
|
|
|
}
|
|
}
|
|
|
this.centerDialogVisible = true
|
|
this.centerDialogVisible = true
|
|
|
if (this.copyDialogData.length > 0) {
|
|
if (this.copyDialogData.length > 0) {
|