Browse Source

bug3711/task4086

wangxiaoyi 1 year ago
parent
commit
1523c4d9c2

+ 9 - 13
src/views/component/reagent/reagentChange.vue

@@ -183,21 +183,17 @@ export default {
                 if (this.formData.zuJianShuJu) {
                     const data = JSON.parse(this.formData.zuJianShuJu)
                     this.spanLength = data[1] || 0
-                    if (val.length && this.reagentData.length <= 0) {
-                        const arry = []
-                        val.forEach(item => {
-                            arry.push({ jyxm: item.jianCeXiangMu, nd: item.nongDu, ypbh: item.biaoBenHao, jsjcdjg: item.jiuJieGuo, xsjcdjg: item.xinJieGuo, pq: item.jieGuo, fhl: item.biaoZhun, sfxf: item.xiangFu, jl: item.jieLun, xdfw: item.zuiXiaoFanWei, xmfhl: item.xiangMuFuHeLv, sjcz: item.shiJiChaZhi, yxpq: item.yunXuPianYi })
-                        })
-                        setTimeout(() => {
-                            this.reagentData = arry
-                            this.$nextTick(() => {
-                                this.$refs.reagent && this.$refs.reagent.$forceUpdate()
-                            })
-                        })
-                    }
+                }
+                if (val.length && this.reagentData.length <= 0) {
+                    const arry = []
+                    val.forEach(item => {
+                        arry.push({ jyxm: item.jianCeXiangMu, nd: item.nongDu, ypbh: item.biaoBenHao, jsjcdjg: item.jiuJieGuo, xsjcdjg: item.xinJieGuo, pq: item.jieGuo, fhl: item.biaoZhun, sfxf: item.xiangFu, jl: item.jieLun, xdfw: item.zuiXiaoFanWei, xmfhl: item.xiangMuFuHeLv, sjcz: item.shiJiChaZhi, yxpq: item.yunXuPianYi })
+                    })
+                    this.reagentData = arry
                 }
             },
-            deep: true
+            deep: true,
+            immediate: true
         },
         'formData.fangAn': {
             handler (val) {

+ 2 - 1
src/views/component/reagentBatchNumber/reagentBatchNumber.vue

@@ -135,7 +135,8 @@ export default {
                 if (value && value.length) {
                     this.reagentBatchData = JSON.parse(JSON.stringify(value))
                 }
-            }
+            },
+            immediate: true
         }
     },
     mounted () {

+ 2 - 1
src/views/component/reagentQualitative/reagentQualitative.vue

@@ -103,7 +103,8 @@ export default {
                 if (value && value.length) {
                     this.reagentBatchData = value
                 }
-            }
+            },
+            immediate: true
         },
         reagentBatchData: {
             handler (value, old) {

+ 7 - 3
src/views/component/sop/xueQingXueShiYan.vue

@@ -71,13 +71,13 @@
                 </el-table-column>
                 <el-table-column label="血清学鉴定结果" prop="xieQingXueJianDin">
                     <template slot-scope="{row}">
-                        <el-input v-if="!readonly && !shiFouGuoShen" v-model="row.xieQingXueJianDin" size="mini" placeholder="请输入" />
+                        <el-input v-if="!readonly&& !shiFouGuoShen" v-model="row.xieQingXueJianDin" size="mini" placeholder="请输入" />
                         <span v-else>{{ row.xieQingXueJianDin || '/' }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="比对结果判断" prop="biDuiJieGuoPanDua">
                     <template slot-scope="{row}">
-                        <template v-if="!readonly && !shiFouGuoShen">
+                        <template v-if="!readonly">
                             <el-radio v-model="row.biDuiJieGuoPanDua" label="通过">通过</el-radio>
                             <el-radio v-model="row.biDuiJieGuoPanDua" label="不通过">不通过</el-radio>
                         </template>
@@ -88,7 +88,7 @@
                 </el-table-column>
                 <el-table-column label="备注" prop="beiZhu">
                     <template slot-scope="{row}">
-                        <el-input v-if="!readonly && !shiFouGuoShen" v-model="row.beiZhu" size="mini" placeholder="请输入" type="textarea" />
+                        <el-input v-if="!readonly" v-model="row.beiZhu" size="mini" placeholder="请输入" type="textarea" />
                         <span v-else>{{ row.beiZhu || '/' }}</span>
                     </template>
                 </el-table-column>
@@ -130,6 +130,10 @@ export default {
                 if (val && val.length) {
                     // console.log(this.formData)
                     this.tableData = val
+                } else {
+                    if (this.tableData.length !== 0) {
+                        this.tableData = []
+                    }
                 }
             }
         },