分支自 lims-before
src/views/experiment/inspectionApplication/index.vue
@@ -41,37 +41,37 @@ <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="150px" /> <el-table-column prop="type" label="检验类型" min-width="80px"> <el-table-column prop="icode" label="申请单号" min-width="160px" /> <el-table-column prop="type" label="检验类型" min-width="100px"> <template slot-scope="scope"> <div v-if="scope.row.type === 0"><span>原材料检验</span></div> <div v-if="scope.row.type === 1"><span>委托检验</span></div> <div v-if="scope.row.type === 2"><span>成品检验</span></div> <div v-if="scope.row.type === 0"><el-tag type="success">原材料检验</el-tag></div> <div v-if="scope.row.type === 2"><el-tag>委托检验</el-tag></div> <div v-if="scope.row.type === 1"><el-tag type="warning">成品检验</el-tag></div> </template> </el-table-column> <el-table-column prop="formTime" label="来料日期" min-width="90px" /> <el-table-column prop="supplier" label="供应商名称" min-width="150px" show-overflow-tooltip /> <el-table-column prop="mcode" label="原材料编码" min-width="170px" /> <el-table-column prop="name" label="原材料名称" min-width="80px" /> <el-table-column prop="name" label="原材料名称" min-width="90px" /> <el-table-column prop="specifications" label="规格型号" min-width="160px" /> <el-table-column prop="unit" label="单位" min-width="50px" /> <el-table-column prop="num" label="数量" min-width="50px" /> <el-table-column prop="createTime" label="登记日期" min-width="80px" /> <el-table-column prop="inspection_status" label="检验结果" min-width="80px"> <el-table-column prop="createTime" label="登记日期" min-width="90px" /> <el-table-column prop="inspection_status" label="检验结果" min-width="95px"> <template slot-scope="scope"> <el-tag class="tag" type="danger" disable-transitions <el-tag class="tag" effect="dark" type="danger" disable-transitions v-if="scope.row.inspection_status == 0">不合格</el-tag> <el-tag class="tag" type="success" disable-transitions <el-tag class="tag" effect="dark" 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" /> <el-table-column prop="checkdate" label="检验日期" min-width="160px" /> <el-table-column label="操作" min-width="150" fixed="right"> <el-table-column prop="checkdate" label="检验日期" min-width="170px" /> <el-table-column label="操作" min-width="120" fixed="right"> <template slot-scope="scope"> <el-button type="text" size="small" @click="handleClick(scope.row)">查看</el-button> <el-button type="text" size="small" @click="delInspect(scope.row)">作废</el-button> @@ -288,7 +288,6 @@ </div> <span slot="footer" class="dialog-footer"> <el-button @click="checkTypeVisible = false">取 消</el-button> <!-- <el-button type="primary" @click="addInspection">确 定</el-button> --> <el-button type="primary" @click="QUEding">确 定</el-button> </span> </el-dialog> @@ -304,7 +303,7 @@ </el-select> </template> </el-card> <el-table :data="tableData" style="width: 100%; margin-bottom: 20px" row-key="id" border height="calc(40vh)" <el-table :data="tableData" style="width: 100%; margin-bottom: 20px;overflow-y: auto;" row-key="id" border height="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> @@ -321,9 +320,9 @@ </span> </el-dialog> <!-- 原材料检验模态框 --> <el-dialog title="原材料检验" :visible.sync="rawmaterialVisible" width="60%"> <el-dialog title="原材料检验" :visible.sync="rawmaterialVisible" width="60%" top="100px"> <div class="table-box"> <el-table ref="multipleTable" :max-height="800" :cell-style="{textAlign: 'center'}" <el-table ref="multipleTable" :max-height="600" :cell-style="{textAlign: 'center'}" :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}" :data="rawMaterialTable" style="width: 100%" @selection-change="handleSelectionChange"> <el-table-column type="selection" min-width="10%" /> @@ -339,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> @@ -610,8 +607,12 @@ }, reset() { this.countSize = 1; this.pageSize = 8; this.searchData = {}; this.pageSize = 10; this.searchData = { applicationnumber: '', type: '', state: '', }; this.selectInspectsList(); }, //被选中的信息 单选 @@ -646,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 @@ -771,12 +775,18 @@ this.addInspection() }, delInspect(row){ delInspect({ id: row.id }).then(res=>{ this.$message.success('已作废') this.selectInspectsList() }) this.$confirm('您确认删除这条数据吗?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { delInspect({ id: row.id }).then(()=>{ this.$message.success('已作废') this.selectInspectsList() }) }).catch(() => {}); } } }
