Merge branch 'master' of http://192.168.218.113:9001/r/lims-before

zouyu

2023-09-06 b533c9cedb2252dfdc001f3d9358c7f082a3a9ae

 src/views/experiment/planAssignments/plan.vue

@@ -96,8 +96,10 @@
            </el-table-column>
            <el-table-column prop="testState" label="检验状态" width="100px">
               <template slot-scope="scope">
                  <el-tag type="success" v-if="scope.row.testState==1">已报检</el-tag>
                  <el-tag type="danger" v-else-if="scope.row.testState==0">未报检</el-tag>
                  <el-tag type="success" effect="dark" v-if="scope.row.children!=undefined&&scope.row.testState!=null">已上报</el-tag>
                  <el-tag type="danger" effect="dark" v-else-if="scope.row.children!=undefined&&scope.row.testState==null">未上报</el-tag>
                  <el-tag type="success" v-else-if="scope.row.children==undefined&&scope.row.testState!=null">已检验</el-tag>
                  <el-tag type="danger" v-else-if="scope.row.children==undefined&&scope.row.testState==null">未检验</el-tag>
               </template>
            </el-table-column>
            <el-table-column prop="startTime" label="检验开始" width="100px">
@@ -160,7 +162,7 @@
               <el-col :span="7">{{upData.internal}}</el-col>
            </el-row>
            <el-row style="line-height: 46px;">
               <el-col :span="5" style="font-size: 14px;text-align: right;">检验状态：</el-col>
               <el-col :span="5" style="font-size: 14px;text-align: right;">检验结果：</el-col>
               <el-col :span="7">
                  <el-tag type="success" v-if="upData.testState==1">合格</el-tag>
                  <el-tag type="danger" v-else-if="upData.testState==0">不合格</el-tag>
@@ -268,7 +270,6 @@
               .children.length
         },
         openUpDia(row) {
            console.log(row);
            // console.log(row);
            this.upDia = true
            this.upData = {