Merge remote-tracking branch 'origin/master'

value

2023-09-05 9b26870265cbbc75bcd32529e46b229a49ec30a0

 src/views/experiment/inspectionApplication/index.vue

@@ -41,8 +41,8 @@
            <div class="library-table">
               <div class="table-box">
                  <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'}"
                     :cell-style="{textAlign: 'left'}"
                     :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
                     :data="inspectionTable">
                     <el-table-column type="selection" min-width="30px" />
                     <el-table-column prop="icode" label="申请单号" min-width="160px" />
@@ -338,10 +338,8 @@
                  <el-table-column prop="surveyor" label="检验人" min-width="8%" />
                  <el-table-column prop="startTime" label="检验日期" min-width="8%" />
                  <el-table-column prop="type" label="状态" min-width="8%">
                     <template slot-scope="scope">
                        <span :style="{ color: scope.row.state === type ? 'green' : 'red' }">
                           {{ scope.row.state===1 ? '已检测':'待检测' }}
                        </span>
                     <template>
                        <span style="color: red">待检验</span>
                     </template>
                  </el-table-column>
               </el-table>
@@ -649,7 +647,10 @@
                        checkdate.push(item['updateTime'])
                        item['checkdate'] = checkdate // 检验日期
                     })
                     this.rawMaterialTable = res.data
                     let arr = res.data.filter((val)=>{
                        return val.type === 0;
                     })
                     this.rawMaterialTable = arr
                  })
               } else if (this.type === 1) {
                  this.commisionVisible = true