| src/api/experiment/planAssignments.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/api/inspection/commisioninspection.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/experiment/inspectionApplication/Viewdetails/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/experiment/inspectionApplication/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/experiment/reportAuditing/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/inspectionManagement/commissionInspection/addCommision.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/api/experiment/planAssignments.js
@@ -47,3 +47,11 @@ params }) } // 委托检验列表 export function getCommisionList(params) { return request({ url: '/link-basic-table/page', method: 'get', params }) } src/api/inspection/commisioninspection.js
@@ -25,7 +25,7 @@ }) } //规格型号 export function getModelSpecification(params){ return request({ url: '/link-basic/specification', src/views/experiment/inspectionApplication/Viewdetails/index.vue
@@ -114,8 +114,8 @@ </el-table-column> <el-table-column prop="userName" label="经验人"> <template slot-scope="scope"> <el-select v-model="ZERENren" size="small" slot="append" style="width: 220px;"> <el-option v-for="item in ZERENren" :key="item.id" :label="item.name">{{ item}}</el-option> <el-select v-model="value" size="small" slot="append" style="width: 220px;"> <el-option v-for="item in ZERENren" :key="item.id" :label="item.name" :value="item.name"></el-option> </el-select> </template> </el-table-column> @@ -142,16 +142,15 @@ return { searchData:{ }, insProducts:[], ZERENren:{ }, uu:'' uu:'', value:'' } }, created(){ console.log(this.$route.query.id); this.uu = this.$route.query.id; this.selectInspectsListById() // this.selectUser() this.selectUser() }, methods: { //返回 @@ -162,6 +161,7 @@ async selectUser(){ const res = await selectUser() this.ZERENren = res.data // console.log(this.ZERENren); }, //检验单表 async selectInspectsListById() { src/views/experiment/inspectionApplication/index.vue
@@ -184,8 +184,8 @@ <div class="check-box"> <el-radio-group v-model="type" @change="handleRadioChange"> <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="0" border >原材料检验</el-radio> <el-radio :label="1" border>委托检验</el-radio> <el-radio :label="2" border>成品检验</el-radio> <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="1" border>委托检验</el-radio> <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="2" border>成品检验</el-radio> </el-radio-group> </div> <div v-if="type === 0 || type === ''"> @@ -367,11 +367,88 @@ </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" @select="selectTr" @select-all="selectAll" :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="原材料检验" @@ -491,7 +568,7 @@ /> <el-table-column prop="formTime" label="来料日期" label="委托bian'ha" min-width="10%" /> <el-table-column @@ -540,7 +617,7 @@ </template> <script> import { selectInspectsList, selectAll, addInspect} from '@/api/experiment/planAssignments' import { selectInspectsList, selectAll, addInspect,getCommisionList} from '@/api/experiment/planAssignments' export default { data() { return { @@ -632,7 +709,8 @@ type: '', // 默认不选中的状态 rawmaterialVisible: false, commisionVisible: false, tmp: '' tmp: '', Standardframe: false } }, watch: { @@ -666,6 +744,12 @@ 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() { // 获取分页列表 @@ -744,20 +828,22 @@ }, 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 +852,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' }); } }, // 新增检验 @@ -830,6 +916,10 @@ console.log(`当前页: ${val}`) this.currentPage = val this.selectInspectsList() }, //确定跳转 QUEding(){ this.Standardframe = true } } } src/views/experiment/reportAuditing/index.vue
@@ -201,9 +201,13 @@ //通过 async checkskip(row) { console.log(this.tableRow); this.reportTable[this.tableRow.$index].status=2 this.reportTable[this.tableRow.$index].status=1 this.transmitData(this.tableRow.row.id) this.checkskipvisible= false this.$message({ message: '通过成功', type: 'success' }); }, //不通过 @@ -212,6 +216,10 @@ this.reportTable[this.tableRow.$index].status=0 this.transmitData(this.tableRow.row.id) this.checkskipvisible= false this.$message({ message: '待通过', type: 'warning' }); }, //审核 src/views/inspectionManagement/commissionInspection/addCommision.vue
@@ -22,7 +22,9 @@ :data="detectionInfo" style="width: 100%;margin-bottom: 20px;"> <el-table-column type="index" label="序号" min-width="10%" /> <el-table-column prop="sampleNumber" label="样品编号" min-width="8%" /> <el-table-column prop="sampleName" label="样品名称" min-width="10%" /> <el-table-column prop="specificationsModels" label="规格型号" min-width="10%" /> <el-table-column prop="unit" label="单位" min-width="8%" /> <el-table-column prop="samplesNumber" label="数量" min-width="8%" /> @@ -165,6 +167,14 @@ </el-row> <el-row :gutter="50"> <el-col :span="11"> <el-form-item label="评定标准："> <el-select v-model="addPointerForm.addway" size="small" placeholder="请选择评定标准"> <el-option v-for="options in model_spe_options" :value="options.value" :key="options.key">{{ options.value }}</el-option> </el-select> </el-form-item> </el-col> <el-col :span="11"> <el-form-item label="规格型号："> <el-select v-model="addPointerForm.specificationsModels" size="small" placeholder="请先选择样品名称"> <el-option v-for="options in model_spe_options" :value="options.value" @@ -172,31 +182,35 @@ </el-select> </el-form-item> </el-col> </el-row> <el-row :gutter="50"> <el-col :span="11"> <el-form-item label="样品单位："> <el-input type="text" v-model="addPointerForm.unit" placeholder="请输入单位" autocomplete="off" /> </el-form-item> </el-col> </el-row> <el-row :gutter="50"> <el-col :span="11"> <el-form-item label="样品数量："> <el-input type="text" v-model="addPointerForm.samplesNumber" placeholder="请输入数量" autocomplete="off" /> </el-form-item> </el-col> <el-col :span="11"> <el-form-item label="备注："> <el-input type="text" v-model="addPointerForm.remarks" placeholder="请输入备注" autocomplete="off" /> </el-form-item> </el-col> </el-row> <el-row :gutter="50"> <el-col :span="10"> <el-col :span="9"> <el-form-item label="添加项目："> <el-checkbox-group v-model="addPointerForm.experiment" style="display: flex; flex-direction: column;"> <el-checkbox v-for="expers in experList" :label="expers.label" :key="expers.key">{{ expers.label }}</el-checkbox> </el-checkbox-group> </el-form-item> </el-col> <el-col :span="41"> <el-form-item label="备注："> <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 20}" style="width: 200px;" v-model="addPointerForm.remarks" placeholder="请输入备注" autocomplete="off" /> </el-form-item> </el-col> </el-row> @@ -337,6 +351,7 @@ for (let i = 1; i < this.addPointerForm.experiment.length; i++) { exper += ',' + this.addPointerForm.experiment[i] } // console.log(exper) this.addPointerForm.experiment = exper let tmp = this.addPointerForm
