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

zouyu

2023-08-31 675420f7779ccf72bf81df11c25ba2549c2fd89d

 src/views/experiment/inspectionApplication/index.vue

@@ -50,7 +50,8 @@
                  </div>
               </div>
               <div class="table-box">
                  <el-table ref="inspectionTable" style="width: 100%;overflow-y: auto;max-height: 600px;" :height="600" :cell-style="{textAlign: 'center'}"
                  <el-table ref="inspectionTable" style="width: 100%;overflow-y: auto;max-height: 600px;" :height="600"
                     :cell-style="{textAlign: 'center'}"
                     :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
                     :data="inspectionTable">
                     <el-table-column type="selection" min-width="30px" />
@@ -72,8 +73,10 @@
                     <el-table-column prop="createTime" label="登记日期" min-width="80px" />
                     <el-table-column prop="inspection_status" label="检验结果" min-width="80px">
                        <template slot-scope="scope">
                           <el-tag class="tag" type="danger" disable-transitions v-if="scope.row.inspection_status == 0">不合格</el-tag>
                           <el-tag class="tag" type="success" disable-transitions v-else-if="scope.row.inspection_status == 1">合格</el-tag>
                           <el-tag class="tag" type="danger" disable-transitions
                              v-if="scope.row.inspection_status == 0">不合格</el-tag>
                           <el-tag class="tag" type="success" disable-transitions
                              v-else-if="scope.row.inspection_status == 1">合格</el-tag>
                        </template>
                     </el-table-column>
                     <el-table-column prop="userName" label="登记人" min-width="80px" />
@@ -81,7 +84,7 @@
                     <el-table-column label="操作" min-width="150" fixed="right">
                        <template slot-scope="scope">
                           <el-button type="text" size="small" @click="handleClick(scope.row)">查看</el-button>
                           <el-button type="text" size="small">作废</el-button>
                           <el-button type="text" size="small" @click="delInspect(scope.row)">作废</el-button>
                        </template>
                     </el-table-column>
                  </el-table>
@@ -311,9 +314,8 @@
                  </el-select>
               </template>
            </el-card>
            <el-table :data="tableData" style="width: 100%; margin-bottom: 20px" row-key="id" border
                  height="calc(40vh)" default-expand-all ref="multipleTable"
                  :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
            <el-table :data="tableData" style="width: 100%; margin-bottom: 20px" row-key="id" border height="calc(40vh)"
               default-expand-all ref="multipleTable" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
                  <el-table-column type="index" width="50px" label="序号"></el-table-column>
                  <el-table-column prop="name" label="项目名称" sortable>
                  </el-table-column>
@@ -413,6 +415,7 @@
      addInspect,
      chooseVer,
      lookProByVer,
      delInspect
   } from '@/api/experiment/planAssignments'
   export default {
      data() {
@@ -496,8 +499,7 @@
      },
      watch: {
         $route: {
            handler(val, oldval) {
            },
            handler(val, oldval) {},
            // 深度观察监听
            deep: true
         }
@@ -776,13 +778,15 @@
         },
         //確定詳情頁
         async GOfrom() {
               // this.addInspect()
               this.addInspection()
                  // this.kk = res.data
                  console.log(this.kk)
                  // this.$router.push({name: 'Viewdetails',query: {id: res.data}})
                  // console.log(res);
			
         },
         delInspect(row){
            delInspect({
               id: row.id
            }).then(res=>{
               this.$message.success('已作废')
               this.selectInspectsList()
            })
         }
      }
   }