分支自 lims-before
src/views/experiment/inspectionApplication/index.vue
@@ -82,7 +82,7 @@ label="检验类型" min-width="80px"> <template slot-scope="scope"> <div v-if="scope.row.type === 0" ><span>原材料检验</span></div> <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> </template> @@ -180,16 +180,17 @@ title="新增检验单" :visible.sync="checkTypeVisible" width="50%" top="10vh" > <div class="check-box"> <el-radio-group v-model="type" @change="handleRadioChange"> <el-radio :label="0" border >原材料检验</el-radio> <el-radio :label="1" border>委托检验</el-radio> <el-radio :label="2" border>成品检验</el-radio> <el-radio :style="`background-color: ${type==0?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="0" border>原材料检验</el-radio> <el-radio :style="`background-color: ${type==1?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="1" border>委托检验</el-radio> <el-radio :style="`background-color: ${type==2?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="2" border>成品检验</el-radio> </el-radio-group> </div> <div v-if="type === 0 || type === ''"> <el-form :model="infoForm" ref="infoForm" class="checkTypeForm" label-position="top" label-width="200px" size="mini"> <div v-if="type === 0"> <el-form :model="infoForm" ref="infoForm" class="checkTypeForm" label-position="top" label-width="200px" size="medium"> <el-row :gutter="100"> <el-col :span="10"> <el-form-item label="来料日期："> @@ -251,44 +252,44 @@ <el-form :model="commisionSelection" ref="commisionTable" class="checkTypeForm" label-position="top" label-width="200px" size="mini"> <el-row :gutter="100"> <el-col :span="10"> <el-form-item label="来料日期："> <el-input style="width: 300px" type="text" :value="commisionSelection.formTime" placeholder="请输入来料日期" autocomplete="off" /> <el-form-item label="委托编号"> <el-input style="width: 300px" type="text" :value="commisionSelection.entrust_coding" placeholder="请输入来料日期" autocomplete="off" /> </el-form-item> </el-col> <el-col :span="10"> <el-form-item label="供应商名称："> <el-input style="width: 300px" type="text" :value="commisionSelection.supplier" placeholder="请输入委托单位" autocomplete="off" /> <el-form-item label="委托单位"> <el-input style="width: 300px" type="text" :value="commisionSelection.entrusted" placeholder="请输入委托单位" autocomplete="off" /> </el-form-item> </el-col> </el-row> <el-row :gutter="100"> <el-col :span="10"> <el-form-item label="委托编号："> <el-input style="width: 300px" type="text" :value="commisionSelection.mcode" placeholder="请输入样品编号" autocomplete="off" /> <el-form-item label="样品编号"> <el-input style="width: 300px" type="text" :value="commisionSelection.samples_number" placeholder="请输入样品编号" autocomplete="off" /> </el-form-item> </el-col> <el-col :span="10"> <el-form-item label="委托名称："> <el-input style="width: 300px" type="text" :value="commisionSelection.name" placeholder="请输入样品名称" autocomplete="off" /> <el-form-item label="样品名称"> <el-input style="width: 300px" type="text" :value="commisionSelection.sample_name" placeholder="请输入样品名称" autocomplete="off" /> </el-form-item> </el-col> </el-row> <el-row :gutter="100"> <el-col :span="10"> <el-form-item label="规格型号："> <el-input style="width: 300px" type="text" :value="commisionSelection.specifications" placeholder="请输入型号规格" autocomplete="off" /> <el-input style="width: 300px" type="text" :value="commisionSelection.specifications_models" placeholder="请输入型号规格" autocomplete="off" /> </el-form-item> </el-col> <el-col :span="10"> <el-form-item label="单位："> <el-input style="width: 300px" type="text" :value="commisionSelection.unit" placeholder="请输入单位" autocomplete="off" /> <el-form-item label="送达时间"> <el-input style="width: 300px" type="text" :value="commisionSelection.dateSurvey" placeholder="请输入单位" autocomplete="off" /> </el-form-item> </el-col> </el-row> <el-row :gutter="100"> <el-col :span="10"> <el-form-item label="数量："> <el-input style="width: 300px" type="text" :value="commisionSelection.num" placeholder="请输入数量" autocomplete="off" /> <el-form-item label="完成期限"> <el-input style="width: 300px" type="text" :value="commisionSelection.completionDeadline" placeholder="请输入数量" autocomplete="off" /> </el-form-item> </el-col> <el-col :span="10"> @@ -367,11 +368,86 @@ </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="addInspection">确 定</el-button> --> <el-button type="primary" @click="QUEding">确 定</el-button> </span> </el-dialog> </div> </div> <!-- 确定跳转基本库弹窗 --> <el-dialog title="标准库" :visible.sync="Standardframe" width="48%" > <!-- <el-form :model="form"> <el-form-item label="请选择审核结果:" :label-width="formLabelWidth"> </el-form-item> </el-form> --> <!-- <div slot="footer" class="dialog-footer"> --> <el-table :data="tableData" style="width: 100%; margin-bottom: 20px" row-key="name" border height="calc(100vh - 250px)" default-expand-all ref="multipleTable" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" > <el-table-column type="selection" label="序号"> </el-table-column> <el-table-column type="index" width="50px" label="序号" ></el-table-column> <el-table-column label="项目名称" sortable> <template scope="scope"> <el-tag ><div class="firstDiv" :style="`color: ${ scope.row.code == '[1]' ? '#16a7ff' : '#58c173' }`" > {{ scope.row.code == "[1]" ? "01" : "02" }} </div> <span style="color: black">{{ scope.row.name }}</span></el-tag > </template> </el-table-column> <el-table-column prop="unit" label="单位" sortable ></el-table-column> <el-table-column label="标准值" sortable> <template scope="scope"> <el-input v-if="scope.row.edit === true || scope.row.code === '[2]'" @blur="requiredOnfocus(scope)" v-model="scope.row.required" placeholder="请输入标准值" ></el-input> </template> </el-table-column> <el-table-column prop="internal" label="内控值" sortable> <template scope="scope"> <el-input v-if="scope.row.edit === true || scope.row.code === '[2]'" @blur="requiredOnfocus(scope)" v-model="scope.row.internal" placeholder="请输入内控值" ></el-input> </template> </el-table-column> </el-table> <!-- </div> --> </el-dialog> <!-- 原材料检验模态框 --> <el-dialog title="原材料检验" @@ -480,50 +556,32 @@ @selection-change="handleSelectionChange" style="width: 100%" > <el-table-column type="selection" min-width="10%" /> <el-table-column type="index" label="序号" min-width="10%" /> <el-table-column prop="formTime" label="来料日期" min-width="10%" /> <el-table-column prop="supplier" label="供应商名称" min-width="12%" /> <el-table-column prop="mcode" label="材料编码" min-width="8%" /> <el-table-column prop="specifications" label="规格型号" min-width="8%" /> <el-table-column prop="unit" label="单位" min-width="12%" /> <el-table-column prop="num" label="数量" min-width="8%" /> <el-table-column prop="checkdate_" label="检验日期" min-width="8%" /> <el-table-column type="selection" min-width="10%" /> <el-table-column type="index" label="序号" min-width="10%" /> <el-table-column prop="entrust_coding" label="委托编号" min-width="10%" /> <el-table-column prop="entrusted" label="委托单位" min-width="12%" /> <el-table-column prop="samples_number" label="样品编号" min-width="8%" /> <el-table-column prop="sample_name" label="样品名称" min-width="8%" /> <el-table-column prop="specifications_models" label="规格型号" min-width="12%" /> <el-table-column prop="dateSurvey" label="送达时间" min-width="8%" /> <el-table-column prop="completionDeadline" label="完成期限" min-width="8%" /> <el-table-column prop="contacts" label="委托编制人" min-width="8%" /> <el-table-column prop="inspectionTime" label="检验日期" min-width="8%" /> <el-table-column prop="inspection_status" label="状态" min-width="8%"> <template slot-scope="scope"> <div v-if="scope.row.inspection_status === 1"> <span style="color: green;">已检测</span> </div> <div v-else> <span style="color: red;">待检测</span> </div> </template> </el-table-column> <el-table-column label="操作" min-width="8%"> <template slot-scope="scope"> <el-button type="text" size="small">删除</el-button> </template> </el-table-column> </el-table> <span slot="footer" class="dialog-footer"> <el-button @click="commisionVisible = false">取 消</el-button> @@ -534,13 +592,12 @@ </template> <template v-else> <router-view /> </template> </div> </template> <script> import { selectInspectsList, selectAll, addInspect} from '@/api/experiment/planAssignments' import { selectInspectsList, selectAll, addInspect,getCommisionList} from '@/api/experiment/planAssignments' export default { data() { return { @@ -588,7 +645,7 @@ amount: '', checkdate: [] }, infoForm:'', infoForm:{}, commisionSelection:{ entrust_coding: '', entrusted: '', @@ -629,10 +686,12 @@ pageSize: 8, // 每页的数据条数 radioValue: '全部', checkTypeVisible: false, type: '', // 默认不选中的状态 type: 0, // 默认不选中的状态 rawmaterialVisible: false, commisionVisible: false, tmp: '' tmp: '', Standardframe: false, tableData: [] } }, watch: { @@ -647,6 +706,7 @@ }, created() { this.selectInspectsList() // this.getCommisionList() }, updated() { if (this.$route.name === 'ForInspectionDetail') this.showDetail = true @@ -662,14 +722,20 @@ // console.log(res); this.inspectionTable = row; console.log(row.icode); this.icode = row.icode this.$router.push({name:'Viewdetails',query: {icode:row.icode}}); console.log(row.id); this.id = row.id this.$router.push({name:'Viewdetails',query: {id:row.id}}); this.selectInspectsList() }, //委托检验 async getCommisionList() { const res = await getCommisionList({pageNo:1,pageSize:10 }) this.commisionTable = res.data console.log(this.commisionTable); }, async selectInspectsList() { // 获取分页列表 const res = await selectInspectsList({ countSize: this.pageSize, pageSize: this.currentPage,message:this.icode}) const res = await selectInspectsList({ countSize: this.pageSize, pageSize: this.currentPage,message:this.id}) // this.inspectionTable = data // console.log(res.data.row) const data = res.data.row @@ -745,19 +811,20 @@ async handleRadioChange(){ if(this.type === 0){ // 原材料报检 // this.rawmaterialVisible = true // const res = await selectAll({type: this.type}) // var data = res.data // data.forEach((item)=>{ // var checkdate = [] // checkdate.push(item['createTime']) // checkdate.push(item['updateTime']) // item['checkdate'] = checkdate // 检验日期 // }) this.$router.push({ name: 'ReportForInspection' }); this.rawmaterialVisible = true const res = await selectAll({type: this.type}) var data = res.data data.forEach((item)=>{ var checkdate = [] checkdate.push(item['createTime']) checkdate.push(item['updateTime']) item['checkdate'] = checkdate // 检验日期 }) // this.infoForm = res.data // this.$router.push({ name: 'ReportForInspection' }); }else if(this.type === 1){ // this.commisionVisible = true // const res = await selectAll({type: this.type}) this.commisionVisible = true const res = await getCommisionList({pageNo:1,pageSize:10}) // var data = res.data // data.forEach((item)=>{ // var checkdate = [] @@ -766,8 +833,8 @@ // item['checkdate_'] = item['startTime'] + '~' + item['endTime'] // item['checkdate'] = checkdate // 检验日期 // }) // this.commisionTable = res.data this.$router.push({ name: 'CommissionInspection' }); this.commisionTable = res.data // this.$router.push({ name: 'CommissionInspection' }); } }, // 新增检验 @@ -811,7 +878,7 @@ type: this.type, unit: this.finishedTable.unit }) } this.type = '' this.type = 0 this.checkTypeVisible = false this.$message({ message: '添加成功！', @@ -830,6 +897,10 @@ console.log(`当前页: ${val}`) this.currentPage = val this.selectInspectsList() }, //确定跳转 QUEding(){ this.Standardframe = true } } } @@ -854,7 +925,7 @@ } height: auto; font-size: 22px !important; padding: 20px 40px !important; padding: 40px 50px !important; ::v-deep .el-radio__label{ font-size: 22px !important; padding-left: 0px !important;
